[Bug 71267] sna: (Haswell) X-server freezes when enabling DP at docking station

[bugzilla-daemon at freedesktop.org]

https://bugs.freedesktop.org/show_bug.cgi?id=71267

--- Comment #11 from Chris Wilson <chris at chris-wilson.co.uk> ---
And now compiles:

diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c
index bf961698f847..8c2b744b03a3 100644
--- a/drivers/gpu/drm/i915/intel_dp.c
+++ b/drivers/gpu/drm/i915/intel_dp.c
@@ -1161,9 +1161,16 @@ void ironlake_edp_panel_vdd_off(struct intel_dp
*intel_dp, bool sync)
                return;

        WARN(!intel_dp->want_panel_vdd, "eDP VDD not forced on");
-
        intel_dp->want_panel_vdd = false;

+       if (cancel_delayed_work(&intel_dp->panel_vdd_work)) {
+               struct drm_device *dev = intel_dp_to_dev(intel_dp);
+
+               mutex_unlock(&dev->mode_config.mutex);
+               cancel_delayed_work_sync(&intel_dp->panel_vdd_work);
+               mutex_lock(&dev->mode_config.mutex);
+       }
+
        if (sync) {
                ironlake_panel_vdd_off_sync(intel_dp);
        } else {

-- 
You are receiving this mail because:
You are the QA Contact for the bug.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.freedesktop.org/archives/intel-gfx-bugs/attachments/20131108/8b94307b/attachment-0001.html>