01 Nov, 2011

1 commit


19 Aug, 2011

1 commit


07 Aug, 2011

1 commit

  • Two additional savage4 variants were added, but the S3_SAVAGE4_SERIES
    macro was incompletely modified, resulting in a false positive detection
    of a savage4 card regardless of which savage card is actually present.

    For non-savage4 series cards, such as a Savage/IX-MV card, this results
    in garbled video and/or a hard-hang at boot time. Fix this by changing
    an '||' to an '&&' in the S3_SAVAGE4_SERIES macro.

    Signed-off-by: John P. Stanley
    Reviewed-by: Tormod Volden
    [ The macros have incomplete parenthesis too, but whatever .. -Linus ]
    Signed-off-by: Linus Torvalds

    John Stanley
     

02 Jun, 2011

1 commit


24 May, 2011

2 commits


08 Apr, 2011

1 commit

  • …l/git/lethal/fbdev-2.6

    * 'fbdev-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/fbdev-2.6:
    efifb: Add override for 11" Macbook Air 3,1
    efifb: Support overriding fields FW tells us with the DMI data.
    fb: Reduce priority of resource conflict message
    savagefb: Remove obsolete else clause in savage_setup_i2c_bus
    savagefb: Set up I2C based on chip family instead of card id
    savagefb: Replace magic register address with define
    drivers/video/bfin-lq035q1-fb.c: introduce missing kfree
    video: s3c-fb: fix checkpatch errors and warning
    efifb: support AMD Radeon HD 6490
    s3fb: fix Virge/GX2
    fbcon: Remove unused 'display *p' variable from fb_flashcursor()
    fbdev: sh_mobile_lcdcfb: fix module lock acquisition
    fbdev: sh_mobile_lcdcfb: add blanking support
    viafb: initialize margins correct
    viafb: refresh rate bug collection
    sh: mach-ap325rxa: move backlight control code
    sh: mach-ecovec24: support for main lcd backlight

    Linus Torvalds
     

07 Apr, 2011

3 commits


31 Mar, 2011

1 commit


26 Jan, 2011

1 commit

  • The -rt patches change the console_semaphore to console_mutex. As a
    result, a quite large chunk of the patches changes all
    acquire/release_console_sem() to acquire/release_console_mutex()

    This commit makes things use more neutral function names which dont make
    implications about the underlying lock.

    The only real change is the return value of console_trylock which is
    inverted from try_acquire_console_sem()

    This patch also paves the way to switching console_sem from a semaphore to
    a mutex.

    [akpm@linux-foundation.org: coding-style fixes]
    [akpm@linux-foundation.org: make console_trylock return 1 on success, per Geert]
    Signed-off-by: Torben Hohn
    Cc: Thomas Gleixner
    Cc: Greg KH
    Cc: Ingo Molnar
    Cc: Geert Uytterhoeven
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Torben Hohn
     

28 Oct, 2010

1 commit

  • I tested savagefb on 3 different Savage 4 cards:
    Diamond Stealth III S520
    Number Nine SR9
    Datapath Horizon 2S (two savage chips on a PCI card)

    it worked except the DDC which did not work on any of them.

    Looking at the BIOS code, it does not use MMIO register 0xff20 but CRT
    register 0xa0 or 0xb1 - depending on the chip revision and something in
    register 0xa6. With this patch, DDC works fine on all 3 cards (even on
    the second head of Horizon 2S - although it does not display anything as
    it's misconfigured because of missing BIOS).

    Signed-off-by: Ondrej Zary
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Ondrej Zary
     

25 Oct, 2010

1 commit


30 Mar, 2010

1 commit

  • …it slab.h inclusion from percpu.h

    percpu.h is included by sched.h and module.h and thus ends up being
    included when building most .c files. percpu.h includes slab.h which
    in turn includes gfp.h making everything defined by the two files
    universally available and complicating inclusion dependencies.

    percpu.h -> slab.h dependency is about to be removed. Prepare for
    this change by updating users of gfp and slab facilities include those
    headers directly instead of assuming availability. As this conversion
    needs to touch large number of source files, the following script is
    used as the basis of conversion.

    http://userweb.kernel.org/~tj/misc/slabh-sweep.py

    The script does the followings.

    * Scan files for gfp and slab usages and update includes such that
    only the necessary includes are there. ie. if only gfp is used,
    gfp.h, if slab is used, slab.h.

    * When the script inserts a new include, it looks at the include
    blocks and try to put the new include such that its order conforms
    to its surrounding. It's put in the include block which contains
    core kernel includes, in the same order that the rest are ordered -
    alphabetical, Christmas tree, rev-Xmas-tree or at the end if there
    doesn't seem to be any matching order.

    * If the script can't find a place to put a new include (mostly
    because the file doesn't have fitting include block), it prints out
    an error message indicating which .h file needs to be added to the
    file.

    The conversion was done in the following steps.

    1. The initial automatic conversion of all .c files updated slightly
    over 4000 files, deleting around 700 includes and adding ~480 gfp.h
    and ~3000 slab.h inclusions. The script emitted errors for ~400
    files.

    2. Each error was manually checked. Some didn't need the inclusion,
    some needed manual addition while adding it to implementation .h or
    embedding .c file was more appropriate for others. This step added
    inclusions to around 150 files.

    3. The script was run again and the output was compared to the edits
    from #2 to make sure no file was left behind.

    4. Several build tests were done and a couple of problems were fixed.
    e.g. lib/decompress_*.c used malloc/free() wrappers around slab
    APIs requiring slab.h to be added manually.

    5. The script was run on all .h files but without automatically
    editing them as sprinkling gfp.h and slab.h inclusions around .h
    files could easily lead to inclusion dependency hell. Most gfp.h
    inclusion directives were ignored as stuff from gfp.h was usually
    wildly available and often used in preprocessor macros. Each
    slab.h inclusion directive was examined and added manually as
    necessary.

    6. percpu.h was updated not to include slab.h.

    7. Build test were done on the following configurations and failures
    were fixed. CONFIG_GCOV_KERNEL was turned off for all tests (as my
    distributed build env didn't work with gcov compiles) and a few
    more options had to be turned off depending on archs to make things
    build (like ipr on powerpc/64 which failed due to missing writeq).

    * x86 and x86_64 UP and SMP allmodconfig and a custom test config.
    * powerpc and powerpc64 SMP allmodconfig
    * sparc and sparc64 SMP allmodconfig
    * ia64 SMP allmodconfig
    * s390 SMP allmodconfig
    * alpha SMP allmodconfig
    * um on x86_64 SMP allmodconfig

    8. percpu.h modifications were reverted so that it could be applied as
    a separate patch and serve as bisection point.

    Given the fact that I had only a couple of failures from tests on step
    6, I'm fairly confident about the coverage of this conversion patch.
    If there is a breakage, it's likely to be something in one of the arch
    headers which should be easily discoverable easily on most builds of
    the specific arch.

    Signed-off-by: Tejun Heo <tj@kernel.org>
    Guess-its-ok-by: Christoph Lameter <cl@linux-foundation.org>
    Cc: Ingo Molnar <mingo@redhat.com>
    Cc: Lee Schermerhorn <Lee.Schermerhorn@hp.com>

    Tejun Heo
     

12 Nov, 2009

2 commits

  • Fix wrong bit mask for blanking register. Due to the error a CRT monitor
    blanks off due to wrong frequency (out of range) instead of PM signal
    (vertical and horizontal frequencies cut off).

    Just compare the mask with bits set in the switch(blank) clause below the
    changed line.

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

    Krzysztof Helt
     
  • Remove fb_save_state() and fb_restore_state operations from frame buffer layer.
    They are used only in two drivers:
    1. savagefb - and cause bug #11248
    2. uvesafb

    Usage of these operations is misunderstood in both drivers so kill these
    operations, fix the bug #11248 and avoid confusion in the future.

    Tested on Savage 3D/MV card and the patch fixes the bug #11248.

    The frame buffer layer uses these funtions during switch between graphics
    and text mode of the console, but these drivers saves state before
    switching of the frame buffer (in the fb_open) and after releasing it (in
    the fb_release). This defeats the purpose of these operations.

    Addresses http://bugzilla.kernel.org/show_bug.cgi?id=11248

    Signed-off-by: Krzysztof Helt
    Reported-by: Jochen Hein
    Tested-by: Jochen Hein
    Cc: Geert Uytterhoeven
    Cc: Michal Januszewski
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Krzysztof Helt
     

27 Jan, 2009

1 commit


28 Apr, 2008

1 commit

  • There is no reason to drive the savagefb I2C bus at such a low speed, so bump
    it from 12.5 kbps to 50 kbps. The Intel (i810) and Matrox framebuffer drivers
    already run their I2C bus at this speed, and so are the legacy i2c-savage4 and
    i2c-prosavage drivers.

    Signed-off-by: Jean Delvare
    Cc: "Antonino A. Daplas"
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Jean Delvare
     

17 Oct, 2007

1 commit


20 Jul, 2007

1 commit

  • Transform some calls to kmalloc/memset to a single kzalloc (or kcalloc).

    Here is a short excerpt of the semantic patch performing
    this transformation:

    @@
    type T2;
    expression x;
    identifier f,fld;
    expression E;
    expression E1,E2;
    expression e1,e2,e3,y;
    statement S;
    @@

    x =
    - kmalloc
    + kzalloc
    (E1,E2)
    ... when != \(x->fld=E;\|y=f(...,x,...);\|f(...,x,...);\|x=E;\|while(...) S\|for(e1;e2;e3) S\)
    - memset((T2)x,0,E1);

    @@
    expression E1,E2,E3;
    @@

    - kzalloc(E1 * E2,E3)
    + kcalloc(E1,E2,E3)

    [akpm@linux-foundation.org: get kcalloc args the right way around]
    Signed-off-by: Yoann Padioleau
    Cc: Richard Henderson
    Cc: Ivan Kokshaysky
    Acked-by: Russell King
    Cc: Bryan Wu
    Acked-by: Jiri Slaby
    Cc: Dave Airlie
    Acked-by: Roland Dreier
    Cc: Jiri Kosina
    Acked-by: Dmitry Torokhov
    Cc: Benjamin Herrenschmidt
    Acked-by: Mauro Carvalho Chehab
    Acked-by: Pierre Ossman
    Cc: Jeff Garzik
    Cc: "David S. Miller"
    Acked-by: Greg KH
    Cc: James Bottomley
    Cc: "Antonino A. Daplas"
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Yoann Padioleau
     

09 May, 2007

2 commits

  • Allow the saving and restoration of VGA text mode. The state is saved on the
    first open and restored on the last close. Because of the VGA registers are
    linearly mapped to the MMIO space, MMIO access is used which is not limited to
    X86 platforms nor to the primary display device.

    An echo 0 > /sys/class/vtconsole/vtcon1/bind will convert the display from
    graphics to text mode.

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

    Antonino A. Daplas
     
  • Use already defined VGAwCR/VGArCR functions to access the i2c bus.

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

    Antonino A. Daplas
     

17 Mar, 2007

2 commits


15 Feb, 2007

1 commit

  • After Al Viro (finally) succeeded in removing the sched.h #include in module.h
    recently, it makes sense again to remove other superfluous sched.h includes.
    There are quite a lot of files which include it but don't actually need
    anything defined in there. Presumably these includes were once needed for
    macros that used to live in sched.h, but moved to other header files in the
    course of cleaning it up.

    To ease the pain, this time I did not fiddle with any header files and only
    removed #includes from .c-files, which tend to cause less trouble.

    Compile tested against 2.6.20-rc2 and 2.6.20-rc2-mm2 (with offsets) on alpha,
    arm, i386, ia64, mips, powerpc, and x86_64 with allnoconfig, defconfig,
    allmodconfig, and allyesconfig as well as a few randconfigs on x86_64 and all
    configs in arch/arm/configs on arm. I also checked that no new warnings were
    introduced by the patch (actually, some warnings are removed that were emitted
    by unnecessarily included header files).

    Signed-off-by: Tim Schmielau
    Acked-by: Russell King
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Tim Schmielau
     

13 Feb, 2007

1 commit


11 Dec, 2006

1 commit


09 Dec, 2006

1 commit


03 Oct, 2006

1 commit


27 Sep, 2006

1 commit

  • i2c-algo-bit: Discard the mdelay data struct member

    The i2c_algo_bit_data structure has an mdelay member, which is not
    used by the algorithm code (the code has always been ifdef'd out.)
    Let's discard it to save some code and memory.

    Signed-off-by: Jean Delvare
    Acked-by: Mauro Carvalho Chehab
    Cc: Adrian Bunk
    Signed-off-by: Greg Kroah-Hartman

    Jean Delvare
     

26 Sep, 2006

1 commit

  • Video drivers which explicitly test for messages reporting PM_EVENT_FREEZE
    will now handle PM_EVENT_PRETHAW the same way.

    Signed-off-by: David Brownell
    Cc: "Rafael J. Wysocki"
    Cc: Pavel Machek
    Signed-off-by: Andrew Morton
    Signed-off-by: Greg Kroah-Hartman

    David Brownell
     

11 Jul, 2006

1 commit

  • MAX_NR_CONSOLES, fg_console, want_console and last_console are more of a
    function of the VT layer than the TTY one. Moving these to vt.h and vt_kern.h
    allows all of the framebuffer and VT console drivers to remove their
    dependency on tty.h.

    [akpm@osdl.org: fix alpha build]
    Signed-off-by: Jon Smirl
    Signed-off-by: Antonino Daplas
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Jon Smirl
     

01 Jul, 2006

1 commit


27 Jun, 2006

3 commits

  • Whitespace cleanup

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

    Antonino A. Daplas
     
  • Reported by: Rich (Bugzilla Bug 6417)

    "if savage driver is used in x.org together with savagefb, it results in
    seriously garbled and distorted screen - coupled with severe slowdowns."

    This bug is the result of Xorg unable to handle savagefb altering the
    hardware which results in X failing to start properly and/or failed console
    switching.

    Add savagefb_state_save and savagefb_state_restore. These hooks will only
    save and restore the extended VGA registers. Standard VGA registers will be
    left alone. This is enough to make savagefb play nicely with the latest
    Xorg savage driver, and perhaps with savage DRI. (Transient screen artifacts
    may appear before X loads and during console switches).

    (Unfortunately, blanking the screen also leaves Xorg in a blanked state, so I
    have to unblank the screen before Xorg loads. So I doubt if the transient
    screen artifacts will be completely invisible but hopefully it will only be
    for a shorter duration (not much).)

    [akpm@osdl.org: cleanups]
    Signed-off-by: Antonino Daplas
    Cc:
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Antonino A. Daplas
     
  • Allocate space for 2 register states: 'current' for the current state of
    the hardware, and 'saved', to be used for restoring the hardware to a sane
    state. This is in preparation for the addition of state save and restore
    hooks to make savagefb work together with the latest Xorg savage driver.

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

    Antonino A. Daplas
     

20 Apr, 2006

2 commits

  • Fix modpost section mismatch warnings in savagefb driver:

    WARNING: drivers/video/savage/savagefb.o - Section mismatch: reference to .init.text: from .exit.text after 'savagefb_remove' (at offset 0x66)
    WARNING: drivers/video/savage/savagefb.o - Section mismatch: reference to .init.text: from .exit.text after 'savagefb_remove' (at offset 0x6e)
    WARNING: drivers/video/savage/savagefb.o - Section mismatch: reference to .init.text: from .text.savagefb_resume after 'savagefb_resume' (at offset 0x70)

    Signed-off-by: Randy Dunlap
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Randy Dunlap
     
  • Fix the following section mismatch:

    WARNING: drivers/video/savage/savagefb.o - Section mismatch: reference to .init.data: from .text.savagefb_probe after 'savagefb_probe' (at offset 0x5e2)

    Signed-off-by: Jean Delvare
    Cc: "Antonino A. Daplas"
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Jean Delvare
     

28 Mar, 2006

1 commit