[PULL] drm intel fixes

From: Keith Packard
Date: Thu Apr 21 2011 - 11:52:24 EST



Here's a couple of minor fixes for intel modesetting.

These should resolve the following bugs:

Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=35977
References: https://bugs.freedesktop.org/show_bug.cgi?id=35903
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=35796
Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=32612

These didn't uncover any regressions in testing compared with -rc2. We
have found an S4 resume regression in -rc2 compared with .38 on the
Piketon platform which we're still chasing.

the following changes since commit 6221f222c0ebf1acdf7abcf927178f40e1a65e2a:

Linux 2.6.39-rc2 (2011-04-05 18:30:43 -0700)

are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/keithp/linux-2.6.git drm-intel-fixes

Chris Wilson (2):
drm/i915: Sanitize the output registers after resume
drm/i915: Initialise g4x watermarks for disabled pipes

Mathew McKernan (2):
drm/i915/tv: Remember the detected TV type
drm/i915/tv: Only poll for TV connections

Sitsofe Wheeler (1):
drm/i915/tv: Fix modeset flickering introduced in 7f58aabc3

drivers/gpu/drm/i915/intel_display.c | 73 ++++++++++++++++++---------------
drivers/gpu/drm/i915/intel_tv.c | 9 ++--
2 files changed, 45 insertions(+), 37 deletions(-)

--
keith.packard@xxxxxxxxx

Attachment: pgp00000.pgp
Description: PGP signature