13 Aug, 2008

1 commit


12 Aug, 2008

1 commit

  • This reverts commit 2d04a4a72d7e1519b4838f24bdd4b5d0f3f426dc, which made
    it impossible to make the softcursor use the highlight colors.

    Yes, the fourth bit should be "blinking", but since we cannot reasonably
    blink in fbcon, highlighting it with a bright background is preferable.

    Reported-by: Pavel Machek
    Cc: Stefano Stabellini
    Cc: Krzysztof Helt
    Cc: Antonino A. Daplas
    Signed-off-by: Linus Torvalds

    Linus Torvalds
     

06 Aug, 2008

1 commit

  • If the 'clear' command is used on the frame buffer with a logo the upper
    area is filled by few lines but not scrolled anymore.

    Fix this by removing the protected area for the logo if any part of the
    logo is cleared.

    Signed-off-by: Krzysztof Helt
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Krzysztof Helt
     

03 Aug, 2008

1 commit

  • * git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6:
    sparc64: Do not clobber %g7 in setcontext() trap.
    sparc64: Kill __show_regs().
    sparc: Add __KERNEL__ ifdef protection to pt_regs helpers.
    sparc64: Kill smp_report_regs().
    sparc64: Kill VERBOSE_SHOWREGS code.
    sparc64: Hook up trigger_all_cpu_backtrace().
    sparc64: Make global reg dumping even more useful.
    sparc: Ignore drivers/video/console/promcon_tbl.c conmakehash generated file
    sparc64: FUTEX_OP_ANDN fix
    sparc: merge of_platform_{32,64}.h
    sparc64: Kill isa_bus_type.
    sparc64: Fix global reg snapshotting on self-cpu.

    Linus Torvalds
     

31 Jul, 2008

2 commits

  • Add drivers/video/console/promcon_tbl.c to the list of ignored files.
    This file is generated by conmakehash against drivers/video/console/prom.uni.

    Signed-off-by: Florian Fainelli
    Signed-off-by: David S. Miller

    Florian Fainelli
     
  • On HPPA there exists some older GSC graphics cards, which need special
    graphic-card-BIOS patching to become supported. Since we don't have yet
    implemented the patching, it's better to detect such cards in advance,
    inform to the user that there are known problems and to not activate the
    card.

    Problematic GSC cards and BIOS versions are:
    * Hyperdrive/Hyperbowl (A4071A) graphics card series:
    * ID = 0x2BCB015A (Version 8.04/8)
    * ID = 0x2BCB015A (Version 8.04/11)
    * Thunder 1 VISUALIZE 48 card:
    * ID = 0x2F23E5FC (Version 8.05/9)
    * Thunder 2 VISUALIZE 48 XP card:
    * ID = 0x2F8D570E (Version 8.05/12)
    * Some Hyperion and ThunderHawk GSC cards

    Further details are described here:
    http://parisc-linux.org/faq/graphics-howto.html

    Signed-off-by: Helge Deller
    Cc: Kyle McMartin
    Cc: Krzysztof Helt
    Cc: "Antonino A. Daplas"
    Cc: Grant Grundler
    Cc: Matthew Wilcox
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Helge Deller
     

27 Jul, 2008

1 commit

  • This patch makes the following needlessly global code static:
    - sticon.c: sticonsole_init()
    - sticore.c: struct default_sti
    - sticore.c: sti_init_graph()
    - sticore.c: sti_inq_conf()
    - sticore.c: sti_rom_copy()
    - sticore.c: sti_select_fbfont()
    - sticore.c: sti_select_font()
    - sticore.c: sti_get_wmode_rom()
    - sticore.c: sti_read_rom()

    [akpm@linux-foundation.org: coding-style fixes]
    Signed-off-by: Adrian Bunk
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Adrian Bunk
     

25 Jul, 2008

4 commits

  • [akpm@linux-foundation.org: coding-style fixes]
    Signed-off-by: Jan Beulich
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Jan Beulich
     
  • The fourth bit of the background color is the blink property bit, not the
    intensity bit, as for the foreground color. Therefore it shouldn't be
    included in the background color.

    Signed-off-by: Stefano Stabellini
    Cc: Krzysztof Helt
    Cc: "Antonino A. Daplas"
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Stefano Stabellini
     
  • Make logo_height variable local in the only function it is used.

    Signed-off-by: Krzysztof Helt
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Krzysztof Helt
     
  • mdacon incorrectly detects MDA hardware on systems without such graphics card.

    One may load this module by chance, for example when doing some systematical
    module-testing, and if there is no Monochrome Display Adapter attached ,
    module init renders vc1-16 completely unusable.

    I and others have run into this more than once. see [Bug 224522 - modprobe
    mdacon freezes machine -> https://bugzilla.novell.com/show_bug.cgi?id=224522 ]
    for example

    Apparently proper MDA detection seems to be broken for a long time - seems to
    be related to those #ifdef TEST_MDA_B statements added by Edward Betts.

    this commit back in 2002 made things even worse :
    http://git.kernel.org/?p=linux/kernel/git/tglx/history.git;a=commit;h=c72757b49c88914433244757fb4967fc63546685

    It changed default vc allocation from 13-16 to 1-16 for no apparent reason
    (!?) , and with that (and without X), mdacon grabs the vc you`re currently
    sitting on and locks you out.

    this is from Kconfig :
    >config MDA_CONSOLE
    > depends on !M68K && !PARISC && ISA
    > tristate "MDA text console (dual-headed) (EXPERIMENTAL)"
    > ---help---
    > Say Y here if you have an old MDA or monochrome Hercules graphics
    > adapter in your system acting as a second head ( = video card). You
    > will then be able to use two monitors with your Linux system. Do not
    > say Y here if your MDA card is the primary card in your system; the
    > normal VGA driver will handle it.

    As we can see mdacon is just meant as an additional driver for dual-head
    setup, and since kernel 2.4.36 still defaults to vc13-16 , setting the default
    back to that value again shouldn`t do any harm.

    Hereby i'm reverting that change, setting default back to to vc13-16 again.

    Besides the fact that mdacon may be rarely or never be used these days and
    could perhaps put to trash anyway (pre-dinosaur hardware!), indeed this is not
    a real solution, but at least it removes the unfortunate side-effect of
    messing up the vc you`re working on.

    Signed-off-by: Roland Kletzing
    Cc: James Simmons
    Cc: "Antonino A. Daplas"
    Cc: Tim Schmielau
    Cc: Jan Engelhardt
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Roland Kletzing
     

22 Jul, 2008

1 commit


07 Jun, 2008

1 commit

  • The interlaced and double line mode bits should not be copied to new
    console when the console is switched. Otherwise, the new console may be
    set to incorrect refresh rate.

    Also, the x and y offsets does not need to be copied.

    Signed-off-by: Krzysztof Helt
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Krzysztof Helt
     

13 May, 2008

2 commits

  • Another addendum to commit c9e587abfdec2c2aaa55fab83bcb4972e2f84f9b
    ("vt: fix background color on line feed").

    fbcon still was not doing the right thing (read: continued to do old
    behavior). fbcon_clear() seems to clear the new line (e.g. where your new
    prompt appears after doing echo -en "\e[42mfoo\n"), while scr_memsetw clears
    the previous one only (where "foo" appears). So just temporarily set the
    video_erase_char to the scrl_erase_char so that fbcon_clear does the right
    thing.

    Signed-off-by: Jan Engelhardt
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Jan Engelhardt
     
  • Addendum to commit c9e587abfdec2c2aaa55fab83bcb4972e2f84f9b ("vt: fix
    background color on line feed").

    vc->vc_scrl_erase_char was not updated when fbcon switches between
    256- and 512-glyph fonts.

    Signed-off-by: Jan Engelhardt
    Acked-by: David S. Miller
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Jan Engelhardt
     

29 Apr, 2008

1 commit

  • A command that causes a line feed while a background color is active,
    such as

    perl -e 'print "x" x 60, "\e[44m", "x" x 40, "\e[0m\n"'
    and
    perl -e 'print "x" x 40, "\e[44m\n", "x" x 40, "\e[0m\n"'

    causes the line that was started as a result of the line feed to be completely
    filled with the currently active background color instead of the default
    color.

    When scrolling, part of the current screen is memcpy'd/memmove'd to the new
    region, and the new line(s) that will appear as a result are cleared using
    memset. However, the lines are cleared with vc->vc_video_erase_char, causing
    them to be colored with the currently active background color. This is
    different from X11 terminal emulators which always paint the new lines with
    the default background color (e.g. `xterm -bg black`).

    The clear operation (\e[1J and \e[2J) also use vc_video_erase_char, so a new
    vc->vc_scrl_erase_char is introduced with contains the erase character used
    for scrolling, which is built from vc->vc_def_color instead of vc->vc_color.

    Signed-off-by: Jan Engelhardt
    Cc: "Antonino A. Daplas"
    Cc: "H. Peter Anvin"
    Cc: Alan Cox
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Jan Engelhardt
     

28 Apr, 2008

3 commits

  • __FUNCTION__ is gcc-specific, use __func__

    Signed-off-by: Harvey Harrison
    Cc: "Antonino A. Daplas"
    Cc: Krzysztof Helt
    Cc: Antonino Daplas
    Cc: Antonino A. Daplas
    Cc: Antonino Daplas
    Cc: Richard Purdie
    Cc: Jean Delvare
    Cc: Adrian Bunk
    Cc: Russell King
    Cc: Benjamin Herrenschmidt
    Cc: Ben Dooks
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Harvey Harrison
     
  • Use __u32 for max_len to match the declaration of length in the struct
    fb_bitfield.

    Suppresses sparse shadowed variable warnings from the nested max()
    macros:
    drivers/video/console/fbcon.h:130:8: warning: symbol '_x' shadows an earlier one
    drivers/video/console/fbcon.h:130:8: originally declared here
    drivers/video/console/fbcon.h:130:8: warning: symbol '_x' shadows an earlier one
    drivers/video/console/fbcon.h:130:8: originally declared here
    drivers/video/console/fbcon.h:130:8: warning: symbol '_y' shadows an earlier one
    drivers/video/console/fbcon.h:130:8: originally declared here

    [akpm@linux-foundation.org: fix constness]
    Signed-off-by: Harvey Harrison
    Cc: "Antonino A. Daplas"
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Harvey Harrison
     
  • The kernel.h macro DIV_ROUND_UP performs the computation (((n) + (d) - 1) /
    (d)) but is perhaps more readable.

    An extract of the semantic patch that makes this change is as follows:
    (http://www.emn.fr/x-info/coccinelle/)

    //
    @haskernel@
    @@

    #include

    @depends on haskernel@
    expression n,d;
    @@

    (
    - (n + d - 1) / d
    + DIV_ROUND_UP(n,d)
    |
    - (n + (d - 1)) / d
    + DIV_ROUND_UP(n,d)
    )

    @depends on haskernel@
    expression n,d;
    @@

    - DIV_ROUND_UP((n),d)
    + DIV_ROUND_UP(n,d)

    @depends on haskernel@
    expression n,d;
    @@

    - DIV_ROUND_UP(n,(d))
    + DIV_ROUND_UP(n,d)
    //

    Signed-off-by: Julia Lawall
    Cc: "Antonino A. Daplas"
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Julia Lawall
     

09 Feb, 2008

1 commit

  • Add architecture support for the MN10300/AM33 CPUs produced by MEI to the
    kernel.

    This patch also adds board support for the ASB2303 with the ASB2308 daughter
    board, and the ASB2305. The only processor supported is the MN103E010, which
    is an AM33v2 core plus on-chip devices.

    [akpm@linux-foundation.org: nuke cvs control strings]
    Signed-off-by: Masakazu Urade
    Signed-off-by: Koichi Yasutake
    Signed-off-by: David Howells
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    David Howells
     

07 Feb, 2008

5 commits


25 Jan, 2008

1 commit


23 Nov, 2007

1 commit


20 Oct, 2007

1 commit

  • Most of these fixes were already submitted for old kernel versions, and were
    approved, but for some reason they never made it into the releases.

    Because this is a consolidation of a couple old missed patches, it touches both
    Kconfigs and documentation texts.

    Signed-off-by: Matt LaPlante
    Acked-by: Randy Dunlap
    Signed-off-by: Adrian Bunk

    Matt LaPlante
     

19 Oct, 2007

1 commit

  • Fix build broken by accaa24c492f1aa3b9c37226d868dc59c3007531:

    CC drivers/video/console/newport_con.o
    drivers/video/console/newport_con.c: In function 'newport_show_logo':
    drivers/video/console/newport_con.c:111: error: assignment of read-only location
    drivers/video/console/newport_con.c:111: warning: assignment makes integer from pointer without a cast
    drivers/video/console/newport_con.c:112: error: assignment of read-only location
    drivers/video/console/newport_con.c:112: warning: assignment makes integer from pointer without a cast

    Signed-off-by: Ralf Baechle
    Cc: "Randy.Dunlap"
    Cc: "Antonino A. Daplas"
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Ralf Baechle
     

17 Oct, 2007

8 commits

  • Stop using magic macros for screen_info structure members.

    Signed-off-by: H. Peter Anvin

    H. Peter Anvin
     
  • Instead of using magic macros for boot_params access, simply use the
    boot_params structure.

    Signed-off-by: H. Peter Anvin

    H. Peter Anvin
     
  • As reported in Bugzilla Bug 9093, upon switching to X, a small rectangular
    cursor can still be seen blinking in the upper left part of the screen. It is
    fbcon's text cursor. This is caused by a strange ioctl(..., KDSETMODE,
    KD_TEXT) call done by something in userspace, perhaps by X itself, while the
    tty is still in graphics mode. And when the tty is in KD_TEXT mode, the
    cursor timer is restarted.

    Although this is a userspace problem, we can work around it by delaying the
    restart of the cursor timer until an fbcon_switch() is called. In other
    words, the cursor timer will not be restarted even if a KD_TEXT mode switch is
    requested.

    Regression potential: Present but low

    Signed-off-by: Antonino Daplas
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Antonino Daplas
     
  • Add logo.nologo kernel boot option to disable the logo in order to provide
    more screen space for kernel messages; especially useful when debugging and
    screen space is more critical.

    newport_con driver changes are untested.

    [akpm@linux-foundation.org: cleanups, coding-style fixes]
    Signed-off-by: Randy Dunlap
    Signed-off-by: Antonino Daplas
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Randy Dunlap
     
  • Various console drivers are able to resize the screen via the con_resize()
    hook. This hook is also visible in userspace via the TIOCWINSZ, VT_RESIZE and
    VT_RESIZEX ioctl's. One particular utility, SVGATextMode, expects that
    con_resize() of the VGA console will always return success even if the
    resulting screen is not compatible with the hardware. However, this
    particular behavior of the VGA console, as reported in Kernel Bugzilla Bug
    7513, can cause undefined behavior if the user starts with a console size
    larger than 80x25.

    To work around this problem, add an extra parameter to con_resize(). This
    parameter is ignored by drivers except for vgacon. If this parameter is
    non-zero, then the resize request came from a VT_RESIZE or VT_RESIZEX ioctl
    and vgacon will always return success. If this parameter is zero, vgacon will
    return -EINVAL if the requested size is not compatible with the hardware. The
    latter is the more correct behavior.

    With this change, SVGATextMode should still work correctly while in-kernel and
    stty resize calls can expect correct behavior from vgacon.

    Signed-off-by: Antonino Daplas
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Antonino A. Daplas
     
  • mips allmodconfig:

    ERROR: "font_vga_8x16" [drivers/video/console/newport_con.ko] undefined!

    Cc: Ralf Baechle
    Cc: "Antonino A. Daplas"
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Andrew Morton
     
  • This patch replaces with after the
    checkpatch.pl hint. The include of is removed if the driver
    does not use it.

    Signed-off-by: Krzysztof Helt
    Signed-off-by: Antonino Daplas
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Krzysztof Helt
     
  • Akpm's patch "newport_con warning fix" got me to look at the console drivers
    again and one thing that I noticed was that none of the fonts was using ISO
    initializers for it's fonts.

    Signed-off-by: Ralf Baechle
    Signed-off-by: Antonino Daplas
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Ralf Baechle
     

31 Aug, 2007

1 commit


28 Aug, 2007

1 commit


27 Aug, 2007

1 commit