[Intel-gfx] [PATCH 3/8] drm/i915/display: Do not reset display when there is none

[Jani Nikula]

On Fri, 06 Nov 2020, Lucas De Marchi <lucas.demarchi at intel.com> wrote:
> From: José Roberto de Souza <jose.souza at intel.com>
>
> 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 <jani.nikula at intel.com>
> Signed-off-by: José Roberto de Souza <jose.souza at intel.com>
> Signed-off-by: Lucas De Marchi <lucas.demarchi at intel.com>

Reviewed-by: Jani Nikula <jani.nikula at intel.com>

> ---
>  drivers/gpu/drm/i915/display/intel_display.c | 6 ++++++
>  1 file changed, 6 insertions(+)
>
> diff --git a/drivers/gpu/drm/i915/display/intel_display.c b/drivers/gpu/drm/i915/display/intel_display.c
> index ab04c89cdf05..b6a9d41a043e 100644
> --- a/drivers/gpu/drm/i915/display/intel_display.c
> +++ b/drivers/gpu/drm/i915/display/intel_display.c
> @@ -4958,6 +4958,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))
> @@ -5018,6 +5021,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;

-- 
Jani Nikula, Intel Open Source Graphics Center