Attachment 719161 Details for Bug 1029634

[patch] A tentative fix patch for 4.11-rc4

skl-mst-resume-crash-fix.diff (text/plain), 2.71 KB, created by Takashi Iwai on 2017-03-29 12:45:21 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Takashi Iwai

Created: 2017-03-29 12:45:21 UTC

Size: 2.71 KB

patch

obsolete

>diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c
>index 1c75402a59c1..62c40090ceed 100644
>--- a/drivers/gpu/drm/i915/i915_drv.c
>+++ b/drivers/gpu/drm/i915/i915_drv.c
>@@ -1559,6 +1559,7 @@ static int i915_suspend_switcheroo(struct drm_device *dev, pm_message_t state)
> static int i915_drm_resume(struct drm_device *dev)
> {
> 	struct drm_i915_private *dev_priv = to_i915(dev);
>+	int mst_pending;
> 	int ret;
> 
> 	disable_rpm_wakeref_asserts(dev_priv);
>@@ -1608,10 +1609,12 @@ static int i915_drm_resume(struct drm_device *dev)
> 		dev_priv->display.hpd_irq_setup(dev_priv);
> 	spin_unlock_irq(&dev_priv->irq_lock);
> 
>-	intel_dp_mst_resume(dev);
>+	mst_pending = intel_dp_mst_resume(dev);
> 
> 	intel_display_resume(dev);
> 
>+	intel_dp_mst_resume_post(dev, mst_pending);
>+
> 	drm_kms_helper_poll_enable(dev);
> 
> 	/*
>diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c
>index d1670b8afbf5..fc5ea900e6f3 100644
>--- a/drivers/gpu/drm/i915/intel_dp.c
>+++ b/drivers/gpu/drm/i915/intel_dp.c
>@@ -6027,9 +6027,10 @@ void intel_dp_mst_suspend(struct drm_device *dev)
> 	}
> }
> 
>-void intel_dp_mst_resume(struct drm_device *dev)
>+int intel_dp_mst_resume(struct drm_device *dev)
> {
> 	struct drm_i915_private *dev_priv = to_i915(dev);
>+	int pending = 0;
> 	int i;
> 
> 	for (i = 0; i < I915_MAX_PORTS; i++) {
>@@ -6041,6 +6042,23 @@ void intel_dp_mst_resume(struct drm_device *dev)
> 
> 		ret = drm_dp_mst_topology_mgr_resume(&intel_dig_port->dp.mst_mgr);
> 		if (ret)
>+			pending |= 1 << i;
>+	}
>+
>+	return pending;
>+}
>+
>+void intel_dp_mst_resume_post(struct drm_device *dev, int pending)
>+{
>+	struct drm_i915_private *dev_priv = to_i915(dev);
>+	int i;
>+
>+	for (i = 0; i < I915_MAX_PORTS; i++) {
>+		struct intel_digital_port *intel_dig_port =
>+			dev_priv->hotplug.irq_port[i];
>+		if (!intel_dig_port || !intel_dig_port->dp.can_mst)
>+			continue;
>+		if (pending & (1 << i))
> 			intel_dp_check_mst_status(&intel_dig_port->dp);
> 	}
> }
>diff --git a/drivers/gpu/drm/i915/intel_drv.h b/drivers/gpu/drm/i915/intel_drv.h
>index 344f238b283f..2025aafdcd26 100644
>--- a/drivers/gpu/drm/i915/intel_drv.h
>+++ b/drivers/gpu/drm/i915/intel_drv.h
>@@ -1447,7 +1447,8 @@ void intel_edp_panel_on(struct intel_dp *intel_dp);
> void intel_edp_panel_off(struct intel_dp *intel_dp);
> void intel_dp_add_properties(struct intel_dp *intel_dp, struct drm_connector *connector);
> void intel_dp_mst_suspend(struct drm_device *dev);
>-void intel_dp_mst_resume(struct drm_device *dev);
>+int intel_dp_mst_resume(struct drm_device *dev);
>+void intel_dp_mst_resume_post(struct drm_device *dev, int pending);
> int intel_dp_max_link_rate(struct intel_dp *intel_dp);
> int intel_dp_rate_select(struct intel_dp *intel_dp, int rate);
> void intel_dp_hot_plug(struct intel_encoder *intel_encoder);

Actions: View | Diff

Attachments on bug 1029634: 717661 | 717861 | 717883 | 719148 | 719149 | 719161 | 719189 | 721808