From 7aa0f1d9af03908cff72ea51ccdf1db51ab76c1d Mon Sep 17 00:00:00 2001 From: Zhenyu Wang Date: Sat, 19 Sep 2009 14:54:08 +0800 Subject: [PATCH] --- yaml --- r: 165999 b: refs/heads/master c: 730915d65f9e763de9dc26c5f1b8abaae775b243 h: refs/heads/master i: 165997: f0f51ec310cf48d7aee93d35dc73f21660258beb 165995: 178f11521df1de94554c59b103bdec383efecd6c 165991: bdfed9c1a4f597512ff815f15cd1ffcf76648471 165983: 0c575d892d84b5e2f10d7cba57fc1033de655a00 v: v3 --- [refs] | 2 +- trunk/drivers/gpu/drm/i915/intel_crt.c | 9 ++------- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/[refs] b/[refs] index e04d720a90d1..ac18eb40c29c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 339e5a4c78041cd7b473ddf0a81eb06a131127bb +refs/heads/master: 730915d65f9e763de9dc26c5f1b8abaae775b243 diff --git a/trunk/drivers/gpu/drm/i915/intel_crt.c b/trunk/drivers/gpu/drm/i915/intel_crt.c index 88814fa2dfd2..212e22740fc1 100644 --- a/trunk/drivers/gpu/drm/i915/intel_crt.c +++ b/trunk/drivers/gpu/drm/i915/intel_crt.c @@ -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; @@ -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; }