revert android-tegra-2.6.36-honeycomb-mr1-9001adc to v2.6.36

[firefly-linux-kernel-4.4.55.git] / drivers / gpu / drm / i915 / intel_crt.c

diff --git a/drivers/gpu/drm/i915/intel_crt.c b/drivers/gpu/drm/i915/intel_crt.c
index 0f950e74db3c06e2f9bb42539cf580ed0f2b7c83..197d4f32585a59b5b336328b470fa038bc922781 100644 (file)
--- a/drivers/gpu/drm/i915/intel_crt.c
+++ b/drivers/gpu/drm/i915/intel_crt.c
@@ -191,8 +191,7 @@ static bool intel_ironlake_crt_detect_hotplug(struct drm_connector *connector)
                DRM_DEBUG_KMS("timed out waiting for FORCE_TRIGGER");
 
        if (turn_off_dac) {
-               /* Make sure hotplug is enabled */
-               I915_WRITE(PCH_ADPA, temp | ADPA_CRT_HOTPLUG_ENABLE);
+               I915_WRITE(PCH_ADPA, temp);
                (void)I915_READ(PCH_ADPA);
        }