diff mbox series

[15/20] drm/i915: Do not reset display when display is disabled

Message ID 20180809001606.26876-15-jose.souza@intel.com (mailing list archive)
State New, archived
Headers show
Series [01/20] drm: Let userspace check if driver supports modeset | expand

Commit Message

Souza, Jose Aug. 9, 2018, 12:16 a.m. UTC 
Display is disabled in the beginning of the reset and re-enabled
afterreset each engine needed but if the display is disabled we
should not do it.

Signed-off-by: José Roberto de Souza <jose.souza@intel.com>
---
 drivers/gpu/drm/i915/i915_irq.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)
diff mbox series

Patch

diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c
index 8084e35b25c5..cb82f56cd7dc 100644
--- a/drivers/gpu/drm/i915/i915_irq.c
+++ b/drivers/gpu/drm/i915/i915_irq.c
@@ -3182,7 +3182,8 @@  static void i915_reset_device(struct drm_i915_private *dev_priv,
 
 	/* Use a watchdog to ensure that our reset completes */
 	i915_wedge_on_timeout(&w, dev_priv, 5*HZ) {
-		intel_prepare_reset(dev_priv);
+		if (INTEL_INFO(dev_priv)->num_pipes)
+			intel_prepare_reset(dev_priv);
 
 		error->reason = reason;
 		error->stalled_mask = engine_mask;
@@ -3208,7 +3209,8 @@  static void i915_reset_device(struct drm_i915_private *dev_priv,
 		error->stalled_mask = 0;
 		error->reason = NULL;
 
-		intel_finish_reset(dev_priv);
+		if (INTEL_INFO(dev_priv)->num_pipes)
+			intel_finish_reset(dev_priv);
 	}
 
 	if (!test_bit(I915_WEDGED, &error->flags))