diff --git a/drivers/gpu/drm/i915/intel_crt.c b/drivers/gpu/drm/i915/intel_crt.c index 212e227..e505144 100644 --- a/drivers/gpu/drm/i915/intel_crt.c +++ b/drivers/gpu/drm/i915/intel_crt.c @@ -262,8 +262,8 @@ static bool intel_crt_detect_hotplug(struct drm_connector *connector) } while (time_after(timeout, jiffies)); }
- if ((I915_READ(PORT_HOTPLUG_STAT) & CRT_HOTPLUG_MONITOR_MASK) == - CRT_HOTPLUG_MONITOR_COLOR) + if ((I915_READ(PORT_HOTPLUG_STAT) & CRT_HOTPLUG_MONITOR_MASK) != + CRT_HOTPLUG_MONITOR_NONE) return true;
return false;
I post zhenyu's patch here that works for manu. Jordi, would you please have a try?
Note this is a patch against KMS driver, i.e. kernel.
diff --git a/drivers/ gpu/drm/ i915/intel_ crt.c b/drivers/ gpu/drm/ i915/intel_ crt.c gpu/drm/ i915/intel_ crt.c gpu/drm/ i915/intel_ crt.c detect_ hotplug( struct drm_connector *connector) timeout, jiffies));
index 212e227..e505144 100644
--- a/drivers/
+++ b/drivers/
@@ -262,8 +262,8 @@ static bool intel_crt_
} while (time_after(
}
- if ((I915_ READ(PORT_ HOTPLUG_ STAT) & CRT_HOTPLUG_ MONITOR_ MASK) == MONITOR_ COLOR) READ(PORT_ HOTPLUG_ STAT) & CRT_HOTPLUG_ MONITOR_ MASK) != MONITOR_ NONE)
- CRT_HOTPLUG_
+ if ((I915_
+ CRT_HOTPLUG_
return true;
return false;
I post zhenyu's patch here that works for manu. Jordi, would you please have a try?
Note this is a patch against KMS driver, i.e. kernel.