[patch for 2.6.30? 1/1] drm: ignore LVDS on intel graphics systems that lie about having it

From: Jarod Wilson There are a number of small form factor desktop systems with Intel mobile graphics chips that lie and say they have an LVDS. With kernel mode-setting, this becomes a problem, and makes native resolution boot go haywire -- for example, my Dell Studio Hybrid, hooked to a 1920x10

[patch 3/4] intelfb: fix spelling of "CLOCK"

From: Pavel Roskin Signed-off-by: Pavel Roskin Cc: Eric Anholt Cc: Dave Airlie Signed-off-by: Andrew Morton --- drivers/gpu/drm/i915/intel_fb.c |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff -puN drivers/gpu/drm/i915/intel_fb.c~intelfb-fix-spelling-of-clock drivers/gpu/drm/

[patch 1/4] drm: fix LOCK_TEST_WITH_RETURN macro

From: Roel Kluin When this macro isn't called with 'file_priv' this will result in a build failure. Signed-off-by: Roel Kluin Signed-off-by: Andrew Morton --- include/drm/drmP.h | 16 1 file changed, 8 insertions(+), 8 deletions(-) diff -puN include/drm/drmP.h~drm-fix-loc

[patch 4/4] drm: simplify kcalloc() call to kzalloc().

From: "Robert P. J. Day" Calls to kcalloc() for a single element can be simplified to calls to kzalloc(). Signed-off-by: Robert P. J. Day Cc: Dave Airlie Cc: Eric Anholt Signed-off-by: Andrew Morton --- drivers/gpu/drm/drm_gem.c |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) dif

[patch 2/4] drivers/gpu/drm/i915/intel_fb.c: remove sysrq-g handler

From: Andrew Morton Addresses http://bugzilla.kernel.org/show_bug.cgi?id=13130 Just remove this sysrq handler - it's doing various bad things from hardirq context and clearly isn't used much at all. Reported-by: Darren Salt Cc: Eric Anholt Cc: Dave Airlie Cc: Hannes Eder Signed-off-by: Andr

[patch 1/4] drm: fix LOCK_TEST_WITH_RETURN macro

From: Roel Kluin When this macro isn't called with 'file_priv' this will result in a build failure. Signed-off-by: Roel Kluin Signed-off-by: Andrew Morton --- include/drm/drmP.h | 16 1 file changed, 8 insertions(+), 8 deletions(-) diff -puN include/drm/drmP.h~drm-fix-loc

[patch 3/4] drm: simplify kcalloc() call to kzalloc().

From: "Robert P. J. Day" Calls to kcalloc() for a single element can be simplified to calls to kzalloc(). Signed-off-by: Robert P. J. Day Cc: Dave Airlie Cc: Eric Anholt Signed-off-by: Andrew Morton --- drivers/gpu/drm/drm_gem.c |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) dif

[patch 2/4] intelfb: fix spelling of "CLOCK"

From: Pavel Roskin Signed-off-by: Pavel Roskin Cc: Eric Anholt Cc: Dave Airlie Signed-off-by: Andrew Morton --- drivers/gpu/drm/i915/intel_fb.c |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff -puN drivers/gpu/drm/i915/intel_fb.c~intelfb-fix-spelling-of-clock drivers/gpu/drm/

[patch 4/4] drm: intel: add ignore lvds quirk info for AOpen Mini PC

From: Jarod Wilson Fix a FIXME in the intel LVDS bring-up code, adding the appropriate blacklist entry for the AOpen Mini PC, courtesy of a dmidecode dump from Florian Demmer. Signed-off-by: Jarod Wilson Cc: Florian Demmer Acked-by: Jesse Barnes Signed-off-by: Andrew Morton --- drivers/gpu

[patch for 2.6.31? 1/1] i915: fix read outside array bounds

From: Roel Kluin dev_priv->saveSWF1 is a 16 element array, but this reads up to index 22 Signed-off-by: Roel Kluin Cc: Pavel Machek Cc: Dave Airlie Acked-by: Jesse Barnes Signed-off-by: Andrew Morton --- drivers/gpu/drm/i915/i915_suspend.c |2 +- 1 file changed, 1 insertion(+), 1 dele

[patch 1/1] drm/radeon/kms: fix caching mode selection for GTT object

From: Jerome Glisse GTT object can either be cached, uncached or wc just let core ttm pick the best mode according to how the bo driver and GTT memory type was initialized. Signed-off-by: Jerome Glisse Signed-off-by: Andrew Morton --- drivers/gpu/drm/radeon/radeon_object.c |2 +- 1 file

[patch for 2.6.32? 3/3] drm/radeon/kms: fix oops when set_base is call with no FB

From: Jerome Glisse Just do nothing if crct_set_base() is called with no FB. The oops happens when the user switches between X & vt or in some case when changing mode. Signed-off-by: Jerome Glisse Cc: Dave Airlie Signed-off-by: Andrew Morton --- drivers/gpu/drm/radeon/atombios_crtc.c

[patch for 2.6.32? 2/3] drm: make sure page protections are updated after changing vm_flags

From: Jeremy Fitzhardinge Some architectures compute ->vm_page_prot depending on ->vm_flags, so we need to update the protections after adjusting the flags. AFAIK this only affects running X under Xen; without this patch you get lots of coloured blobs on the screen, or maybe a complete lockup.

[patch for 2.6.32? 1/3] drivers/gpu/drm/i915/i915_dma.c: fix unused var

From: Andrew Morton drivers/gpu/drm/i915/i915_dma.c: In function 'i915_driver_load': drivers/gpu/drm/i915/i915_dma.c:1114: warning: 'll_base' may be used uninitialized in this function Partly this is because gcc isn't smart enough. But `ll_base' does get used uninitialised in the DRM_DEBUG() c

[patch 1/5] drm/via: add pci id for VIA VX800 chipset

From: Thomas Schlichter The VIA DRM module is able to accelerate 2D video on the VX800 chipset, thus add the corresponding PCI ID. Accelerated 3D video is not implemented. The modified VIA DRM module was tested with X.Org openchrome driver on a Samsung NC20 netbook. Video playback with xine re

[patch 3/5] drm: kill more unused DRM macros

From: Andres Salomon There are a few more macros in drmP.h that are unused; DRM_GET_PRIV_SAREA, DRM_ARRAY_SIZE, and DRM_WAITCOUNT can go away completely. Unfortunately, DRM_COPY is still used in one place, but we can at least move it to where it's used. It's an awful looking macr

[patch 2/5] drm: kill some unused DRM_PROC macros from drmP.h

From: Andres Salomon i915_gem_proc.c appears to have been the last user of the DRM_PROC_* macros, and it has gone away. The macros should die as well. Signed-off-by: Andres Salomon Cc: Dave Airlie Signed-off-by: Andrew Morton --- include/drm/drmP.h | 10 -- 1 file changed, 10 del

[patch 4/5] drm: replace DRM_COPY macro w/ a function

From: Andres Salomon Don't inline it; the compiler can figure it out. Comments added that are based upon my interpretation of the code. Hopefully they're correct. :) Signed-off-by: Andres Salomon Cc: Dave Airlie Signed-off-by: Andrew Morton --- drivers/gpu/drm/drm_drv.c | 34 +++

[patch 5/5] drm: check return values in drm_version

From: Andres Salomon In drm_version, actually check the results from function calls so that we're not potentially passing garbage back to userspace. Signed-off-by: Andres Salomon Cc: Dave Airlie Signed-off-by: Andrew Morton --- drivers/gpu/drm/drm_drv.c | 14 ++ 1 file changed

[patch 2/2] drm: fix build error in include/drm/ttm/ttm_memory.h

From: Ralf Baechle include/drm/ttm/ttm_memory.h uses struct page * without having included the required headers or a forward declaration resulting in the following build error for mtx1_defconfig on Linus' master branch, possibly others: CC [M] drivers/gpu/drm/ttm/ttm_memory.o In file included

[patch 1/2] drivers/gpu/drm/radeon/radeon_combios.c: fix warning

From: Andrew Morton drivers/gpu/drm/radeon/radeon_combios.c: In function 'radeon_combios_get_lvds_info': drivers/gpu/drm/radeon/radeon_combios.c:893: warning: comparison is always false due to limited range of data type Cc: Dave Airlie Signed-off-by: Andrew Morton --- drivers/gpu/drm/radeo

[patch for 2.6.33? 1/2] drivers/gpu/vga/vgaarb.c: fix userspace pointer dereference

From: Andy Getzendanner This patch corrects a userspace pointer dereference in the VGA arbiter in 2.6.32.1. copy_from_user() is used at line 822 to copy the contents of buf into kbuf, but a call to strncmp() on line 964 uses buf rather than kbuf. This problem led to a GPF in strncmp() when X wa

[patch for 2.6.33? 2/2] drivers/gpu/drm/i915/intel_display.c: disable SR when more than one pipe is enabled

From: David John Self Refresh should be disabled on dual plane configs. Otherwise, as the SR watermark is not calculated for such configs, switching to non VGA mode causes FIFO underrun and display flicker. Addresses http://bugzilla.kernel.org/show_bug.cgi?id=14897 Signed-off-by: David John A

[patch 1/6] drivers/gpu/drm/radeon/radeon_combios.c: fix warning

From: Andrew Morton drivers/gpu/drm/radeon/radeon_combios.c: In function 'radeon_combios_get_lvds_info': drivers/gpu/drm/radeon/radeon_combios.c:893: warning: comparison is always false due to limited range of data type Cc: Dave Airlie Signed-off-by: Andrew Morton --- drivers/gpu/drm/radeo

[patch 5/6] drivers/gpu/drm/drm_crtc_helper.c: fix setting of fb_changed in drm_crtc_helper_set_config()

From: Roel Kluin Only set fb_changed if bits_per_pixel or depth changed. Signed-off-by: Roel Kluin Cc: David Airlie Cc: Zhao Yakui Cc: Jesse Barnes Signed-off-by: Andrew Morton --- drivers/gpu/drm/drm_crtc_helper.c |2 -- 1 file changed, 2 deletions(-) diff -puN drivers/gpu/drm/drm_

[patch 2/6] drivers/gpu/drm/nouveau/nouveau_grctx.c: correct NULL test

From: Julia Lawall Test the just-allocated value for NULL rather than some other value. The semantic patch that makes this change is as follows: (http://coccinelle.lip6.fr/) // @@ expression x,y; statement S; @@ x = \(kmalloc\|kcalloc\|kzalloc\)(...); ( if ((x) == NULL) S | if ( - y + x

[patch 6/6] ati_pcigart: fix printk format warning

From: Randy Dunlap Fix ati_pcigart printk format warning: drivers/gpu/drm/ati_pcigart.c:115: warning: format '%Lx' expects type 'long long unsigned int', but argument 3 has type 'dma_addr_t' Signed-off-by: Randy Dunlap Cc: Zhenyu Wang Cc: Dave Airlie Signed-off-by: Andrew Morton --- driv

[patch 3/6] gpu: drm/i915, fix potential null dereference

From: Jiri Slaby Stanse found a potential null dereference in i915_suspend. There is a check for dev and dev_priv being NULL, but dev is dereferenced earlier. Move the dereference after the check. Signed-off-by: Jiri Slaby Cc: David Airlie Cc: Eric Anholt Cc: Jesse Barnes Signed-off-by: An

[patch 4/6] drivers/gpu/drm/drm_fb_helper.c: don't use private implementation of atoi()

From: Andy Shevchenko Kernel has simple_strtol() which would be used as atoi(). This is quite the same fix as in 2cb96f86628d6e97fcbda5fe4d8d74876239834c ("fbdev: drop custom atoi from drivers/video/modedb.c") because code in drivers/gpu/drm/drm_fb_helper.c is based on drivers/video/modedb.c. S

[patch 2/3] vmwgfx: depends on FB

From: Randy Dunlap vmwfgx uses framebuffer interfaces, so it should depend on FB. Otherwise it has these build errors (e.g., when CONFIG_FB=m): drivers/built-in.o: In function `vmw_fb_close': (.text+0x97713): undefined reference to `unregister_framebuffer' drivers/built-in.o: In function `vmw_fb

[patch 3/3] drm/i915: blacklist lid status: Sony VGN-BX196VP, Dell Inspiron 700m

From: Surbhi Palande Sony VGN-BX196VP and Dell Inspiron 700m report lid status as closed when it is open. This leads to a "no connectors reported" error at startup. Blacklisting them, to always return a connected status for the default lvds connector. Addresses https://bugs.launchpad.net/bugs/

[patch 1/3] drivers/gpu/drm/i915/intel_bios.c: fix continuation line formats

From: Joe Perches String constants that are continued on subsequent lines with \ will cause spurious whitespace in the resulting output. Signed-off-by: Joe Perches Cc: Dave Airlie Cc: Eric Anholt Cc: Jesse Barnes Signed-off-by: Andrew Morton --- drivers/gpu/drm/i915/intel_bios.c |3 +-

[patch 2/5] drivers/gpu/drm/via/via_video.c: fix off by one issue

From: Dan Carpenter "fx->lock" is used as the index in "dev_priv->decoder_queue[fx->lock]" which is an array of "VIA_NR_XVMC_LOCKS" elements. Signed-off-by: Dan Carpenter Cc: David Airlie Signed-off-by: Andrew Morton --- drivers/gpu/drm/via/via_video.c |2 +- 1 file changed, 1 insertion

[patch 1/5] gpu: vga_switcheroo, fix lock imbalance

From: Jiri Slaby Stanse found that one error path in vga_switcheroo_debugfs_write omits to unlock vgasr_mutex. Fix that. Signed-off-by: Jiri Slaby Cc: Dave Airlie Signed-off-by: Andrew Morton --- drivers/gpu/vga/vga_switcheroo.c |6 -- 1 file changed, 4 insertions(+), 2 deletions(-

[patch 5/5] drivers/gpu/drm/drm_memory.c: fix check for end of loop

From: Dan Carpenter "agpmem" is never NULL here. Signed-off-by: Dan Carpenter Cc: David Airlie Cc: Eric Anholt Signed-off-by: Andrew Morton --- drivers/gpu/drm/drm_memory.c |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff -puN drivers/gpu/drm/drm_memory.c~drivers-gpu-drm-drm

[patch 3/5] drivers/gpu/drm/radeon/radeon_atombios.c: range check issues

From: Dan Carpenter This change makes the array larger, "MAX_SUPPORTED_TV_TIMING_V1_2" is 3 and the original size "MAX_SUPPORTED_TV_TIMING" is 2. Also there were checks that were off by one. Signed-off-by: Dan Carpenter Cc: David Airlie Acked-by: Alex Deucher Signed-off-by: Andrew Morton --

[patch 4/5] drivers/gpu/drm/drm_sysfs.c: sysfs files error handling

From: Dan Carpenter In the original code we used "j" as an iterator but we used "i" as an index. - for (j = 0; j < i; j++) - device_remove_file(&connector->kdev, - &connector_attrs[i]); Smatch complained about that bec

[patch 1/2] via-agp and drm: adding support for CX700(M2), P4M890 and VT3336 chipsets

From: Claas Langbehn <[EMAIL PROTECTED]> * Adds support for the VIA CX700(M2), P4M890 and VT3336 chipsets to via-agp.c * Adds PCI-IDs and DRM PCI_IDs for the VIA CX700(M2), P4M890 and VT3336 chipsets * Removes AGP-support and PCI-IDs of PT880 Ultra * Changes Kconfig explanation text for AGP and DR

[patch 2/2] Updates to VIA DRI

From: Claas Langbehn <[EMAIL PROTECTED]> This patch is based on the source code that VIA released here: http://www.viaarena.com/Driver/cle266cn400cn-cx700cn800xorg40072-kernel-src_20061226.tgz Signed-off-by: Claas Langbehn <[EMAIL PROTECTED]> Cc: Dave Airlie <[EMAIL PROTECTED]> Cc: Dave Jones <[E