Messages in this thread Patch in this message | | | Date | Thu, 01 Oct 2009 18:16:50 -0700 | From | Greg KH <> | Subject | [062/136] drm/i915: Remove DAC disable in CRT force detect on IGDNG |
| |
2.6.31-stable review patch. If anyone has any objections, please let us know.
------------------ From: Zhenyu Wang <zhenyuw@linux.intel.com>
commit 730915d65f9e763de9dc26c5f1b8abaae775b243 upstream.
This is not required on newer stepping hardware to get reliable force detect status. Removing this fixes screen blank flicker in CRT detect on IGDNG.
Signed-off-by: Zhenyu Wang <zhenyuw@linux.intel.com> Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
--- drivers/gpu/drm/i915/intel_crt.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-)
--- a/drivers/gpu/drm/i915/intel_crt.c +++ b/drivers/gpu/drm/i915/intel_crt.c @@ -151,13 +151,10 @@ static bool intel_igdng_crt_detect_hotpl { struct drm_device *dev = connector->dev; struct drm_i915_private *dev_priv = dev->dev_private; - u32 adpa, temp; + u32 adpa; bool ret; - temp = adpa = I915_READ(PCH_ADPA); - - adpa &= ~ADPA_DAC_ENABLE; - I915_WRITE(PCH_ADPA, adpa); + adpa = I915_READ(PCH_ADPA); adpa &= ~ADPA_CRT_HOTPLUG_MASK; @@ -184,8 +181,6 @@ static bool intel_igdng_crt_detect_hotpl else ret = false; - /* restore origin register */ - I915_WRITE(PCH_ADPA, temp); return ret; }
| |