Skip to content

Commit

Permalink
drm/i915: Remove DAC disable in CRT force detect on IGDNG
Browse files Browse the repository at this point in the history
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.

Cc: Stable Team <stable@kernel.org>
Signed-off-by: Zhenyu Wang <zhenyuw@linux.intel.com>
Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
  • Loading branch information
Zhenyu Wang authored and Jesse Barnes committed Sep 17, 2009
1 parent 339e5a4 commit 730915d
Showing 1 changed file with 2 additions and 7 deletions.
9 changes: 2 additions & 7 deletions drivers/gpu/drm/i915/intel_crt.c
Original file line number Diff line number Diff line change
Expand Up @@ -179,13 +179,10 @@ static bool intel_igdng_crt_detect_hotplug(struct drm_connector *connector)
{
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;

Expand All @@ -212,8 +209,6 @@ static bool intel_igdng_crt_detect_hotplug(struct drm_connector *connector)
else
ret = false;

/* restore origin register */
I915_WRITE(PCH_ADPA, temp);
return ret;
}

Expand Down

0 comments on commit 730915d

Please sign in to comment.