linux/drivers/gpu, branch v2.6.30.6

drm/i915: Set SSC frequency for 8xx chips correctly

2009-08-16T21:18:24Z

(cherry picked from commit 6ff4fd05676bc5b5c930bef25901e489f7843660) All 8xx class chips have the 66/48 split, not just 855. Signed-off-by: Ma Ling Reviewed-by: Jesse Barnes Signed-off-by: Eric Anholt Signed-off-by: Greg Kroah-Hartman

drm/i915: initialize fence registers to zero when loading GEM

2009-08-16T21:18:23Z

(cherry picked from commit b5aa8a0fc132dd512c33e7c2621d075e3b77a65e) Unitialized fence register could leads to corrupted display. Problem encountered on MacBooks (revision 1 and 2), directly booting from EFI or through BIOS emulation. (bug #21710 at freedestop.org) Signed-off-by: Grégoire Henry Signed-off-by: Eric Anholt Signed-off-by: Greg Kroah-Hartman

drm/i915: Hook connector to encoder during load detection (fixes tv/vga detect)

2009-08-16T21:18:22Z

(cherry picked from commit 03d6069912babc07a3da20e715dd6a5dc8f0f867) With the DRM-driven DPMS code, encoders are considered idle unless a connector is hooked to them, so mode setting is skipped. This makes load detection fail as none of the hardware is enabled. Signed-off-by: Keith Packard Signed-off-by: Eric Anholt Signed-off-by: Greg Kroah-Hartman

drm/i915: Skip lvds with Aopen i945GTt-VFA

2009-08-16T21:18:21Z

(cherry picked from commit fa0864b26b4bfa1dd4bb78eeffbc1f398cb56425) Signed-off-by: Michael Cousin Signed-off-by: Eric Anholt Signed-off-by: Greg Kroah-Hartman

drm/i915: avoid non-atomic sysrq execution

2009-08-16T21:18:20Z

(cherry picked from commit b66d18ddb16603d1e1ec39cb2ff3abf3fd212180) The sysrq functions are executed in hardirq context, so we shouldn't be calling sleeping functions from them, like mutex_locks or memory allocations. Fix up the i915 sysrq handler to avoid this. Signed-off-by: Jesse Barnes Signed-off-by: Eric Anholt Signed-off-by: Greg Kroah-Hartman

drm/i915: apply G45 vblank count code to all G4x chips and fix max_frame_count

2009-08-16T21:18:20Z

(cherry picked from commit 42c2798b35b95c471877133e19ccc3cab00e9b65) All G4x and newer chips use the new style frame count register, with a full 32 bit frame count. Update the code to reflect this. Signed-off-by: Jesse Barnes Signed-off-by: Eric Anholt Signed-off-by: Greg Kroah-Hartman

drm/i915: add ignore lvds quirk info for AOpen Mini PC

2009-08-16T21:18:19Z

(cherry picked from commit 70aa96ca2d8d938fc036ef8fd189b0151f4fc3ba) 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 Signed-off-by: Eric Anholt Signed-off-by: Greg Kroah-Hartman

drm/i915: Save/restore cursor state on suspend/resume.

2009-08-16T21:18:18Z

(cherry picked from commit 1fd1c624362819ecc36db2458c6a972c48ae92d6) This may fix cursor corruption in X on resume, which would persist until the cursor was hidden and then shown again. V2: Also include the cursor control regs. Signed-off-by: Eric Anholt Reviewed-by: Jesse Barnes Signed-off-by: Greg Kroah-Hartman

drm/i915: correct suspend/resume ordering

2009-07-02T23:51:06Z

commit 9e06dd39f2b6d7e35981e0d7aded618686b32ccb upstream. We need to save register state *after* idling GEM, clearing the ring, and uninstalling the IRQ handler, or we might end up saving bogus fence regs, for one. Our restore ordering should already be correct, since we do GEM, ring and IRQ init after restoring the last register state, which prevents us from clobbering things. I put this together to potentially address a bug, but I haven't heard back if it fixes it yet. However I think it stands on its own, so I'm sending it in. Signed-off-by: Jesse Barnes Signed-off-by: Eric Anholt Cc: Jie Luo Signed-off-by: Greg Kroah-Hartman

Revert "drm: don't associate _DRM_DRIVER maps with a master"

2009-06-05T17:21:52Z

This reverts commit 6c51d1cfa0a370b48a157163340190cf5fd2346b, which apparently causes DRI initialization failures on Radeons. Reported-by: Markus Trippelsdorf Requested-by: Dave Airlie Signed-off-by: Linus Torvalds