From: José Roberto de Souza Date: Fri, 6 Nov 2020 22:55:26 +0000 (-0800) Subject: drm/i915/display: Do not reset display when there is none X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=2c5688057f7011a0d75b2e1189695912e232b64c;p=linux.git drm/i915/display: Do not reset display when there is none Display is always disabled and enabled when resetting any engine, but if there is no display it should not do anything with display and only reset the needed engines. Cc: Jani Nikula Signed-off-by: José Roberto de Souza Signed-off-by: Lucas De Marchi Reviewed-by: Jani Nikula Link: https://patchwork.freedesktop.org/patch/msgid/20201106225531.920641-3-lucas.demarchi@intel.com --- diff --git a/drivers/gpu/drm/i915/display/intel_display.c b/drivers/gpu/drm/i915/display/intel_display.c index 3e0b2849ec2a6..3bf3088b0091a 100644 --- a/drivers/gpu/drm/i915/display/intel_display.c +++ b/drivers/gpu/drm/i915/display/intel_display.c @@ -4858,6 +4858,9 @@ void intel_display_prepare_reset(struct drm_i915_private *dev_priv) struct drm_atomic_state *state; int ret; + if (!HAS_DISPLAY(dev_priv)) + return; + /* reset doesn't touch the display */ if (!dev_priv->params.force_reset_modeset_test && !gpu_reset_clobbers_display(dev_priv)) @@ -4918,6 +4921,9 @@ void intel_display_finish_reset(struct drm_i915_private *dev_priv) struct drm_atomic_state *state; int ret; + if (!HAS_DISPLAY(dev_priv)) + return; + /* reset doesn't touch the display */ if (!test_bit(I915_RESET_MODESET, &dev_priv->gt.reset.flags)) return;