linux.git/drivers/gpu/drm/i915, branch v2.6.32

drm/i915: Fix CRT hotplug detect by checking really no channels attached

2009-11-25T20:10:18+00:00

For CRT hotplug detect status, we have four test results as blue
channel only, green channel only, both blue and green channel, and
no channel attached. Origin code only marks both blue and green channel
case as connected, but ignore other possible connected states. This one
trys to detect CRT by checking no channel attached case instead.

Signed-off-by: Zhenyu Wang 
Signed-off-by: Eric Anholt

drm/i915: Add more registers save/restore for Ironlake suspend

2009-11-12T19:21:14+00:00

Add more display registers save/restore to fix unstable issues
during S4 testing on Ironlake. And DPLL_B_MD should not be restored
on Ironlake.

Signed-off-by: Zhenyu Wang 
Signed-off-by: Eric Anholt

drm/i915: Fix IRQ stall issue on Ironlake

2009-11-12T19:16:33+00:00

The master irq control in DE must be disabled before irq handling,
and enable after the process. This fixes the irq stall issue on
Ironlake.

Cc: Stable Team 
Signed-off-by: Zou, Nanhai 
Signed-off-by: Zhenyu Wang 
Signed-off-by: Eric Anholt

drm/i915: HDMI hardware workaround for Ironlake

2009-11-05T22:03:28+00:00

This brings some hardware workaround for HDMI port on PCH (Ibex Peak),
which fixes unstable issues like during rotation.

Signed-off-by: Zhenyu Wang 
Signed-off-by: Eric Anholt

drm/i915: Fix and cleanup DPLL calculation for Ironlake

2009-11-05T22:00:32+00:00

When the ideal error range can't be reached, this will safely use
a most closed one. Clean up some dumb codes in DPLL function too.

This fixes DPLL clock issue against one monitor at 1680x1050@60hz.

Signed-off-by: Zhenyu Wang 
Signed-off-by: Eric Anholt

drm/i915: Avoid potential sleep whilst holding spinlock

2009-11-05T21:33:22+00:00

Miles Lane reported the following error:
2 locks held by cat/4179:
  #0:  (&p->lock){+.+.+.}, at: [] seq_read+0x25/0x315
  #1:  (&dev_priv->mm.active_list_lock){+.+...}, at: []
i915_batchbuffer_info+0x2b/0x124
Pid: 4179, comm: cat Not tainted 2.6.32-rc5-git1 #2
Call Trace:
  [] ? __debug_show_held_locks+0x1e/0x20
  [] __might_sleep+0xf0/0xf7
  [] kmap+0x17/0x58
  [] i915_batchbuffer_info+0xad/0x124
  [] seq_read+0x160/0x315
  [] ? rw_verify_area+0x98/0xbb
  [] ? seq_read+0x0/0x315
  [] vfs_read+0x75/0xa9
  [] sys_read+0x3b/0x5d
  [] sysenter_do_call+0x12/0x36

The fix is relatively simple, use the atomic variants of kmap() that
avoid the potential sleep.

Signed-off-by: Chris Wilson 
Cc: Miles Lane 
Signed-off-by: Eric Anholt

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/anholt/drm-intel

2009-11-04T15:05:43+00:00

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/anholt/drm-intel:
  drm/i915: Ironlake suspend/resume support
  drm/i915: kill warning in intel_find_pll_g4x_dp
  drm/i915: update watermarks before enabling PLLs
  drm/i915: add FIFO watermark support for G4x
  drm/i915: quiet DP i2c init
  drm/i915: fix panel fitting filter coefficient select for Ironlake
  drm/i915: fix to setup display reference clock control on Ironlake
  drm/i915: Install a fence register for fbc on g4x
  drm/i915: save/restore BLC histogram control reg across suspend/resume
  drm/i915: Fix FDI M/N setting according with correct color depth
  drm/i915: disable powersave feature for Ironlake currently
  drm/i915: Fix render reclock availability detection.
  drm/i915: Save and restore the GM45 FBC regs on suspend and resume.
  drm/i915: Set the LVDS_BORDER when using LVDS scaling mode
  drm/i915: disable FBC for Pineview, fixing a boot hang.

i915: fix intel graphics suspend breakage due to resume/lid event confusion

2009-11-02T17:29:55+00:00

In commit c1c7af60892070e4b82ad63bbfb95ae745056de0 ("drm/i915: force
mode set at lid open time") the intel graphics driver was taught to
restore the LVDS mode on lid open.

That caused problems with interaction with the suspend/resume code,
which commonly runs at the same time (suspend is often caused by the lid
close event, while lid open is commonly a resume event), which was
worked around with in commit 06891e27a9b5dba5268bb80e41a283f51335afe7
("drm/i915: fix suspend/resume breakage in lid notifier").

However, in the meantime the lid event code had also grown a user event
notifier (commit 06324194eee97a51b5f172270df49ec39192d6cc: "drm/i915:
generate a KMS uevent at lid open/close time"), and now _that_ causes
problems with suspend/resume and some versions of Xorg reacting to those
uevents by setting the mode.

So this effectively reverts that commit 06324194ee, and makes the lid
open protection logic against suspend/resume more explicit.  This fixes
at least one laptop. See

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

for more details.

Acked-by: Jesse Barnes 
Cc: Riccardo Magliocchetti 
Cc: Eric Anholt 
Signed-off-by: Linus Torvalds

drm/i915: Ironlake suspend/resume support

2009-10-23T18:31:26+00:00

This adds registers save/restore for Ironlake to make suspend work.

Signed-off-by: Guo, Chaohong 
[zhenyuw: some code re-orgnization, and add more save/restore for
FDI link and transcoder registers, also fix palette register for Ironlake]
Signed-off-by: Zhenyu Wang 
Signed-off-by: Eric Anholt

drm/i915: kill warning in intel_find_pll_g4x_dp

2009-10-23T18:31:25+00:00

Initialize clock.vco to silence gcc.

Signed-off-by: Jesse Barnes 
Signed-off-by: Eric Anholt