[PATCH resend 1/2] drm/i915/display: Add a intel_pipe_is_enabled() helper

[Jani Nikula]

On Tue, 02 Mar 2021, Hans de Goede <hdegoede at redhat.com> wrote:
> Factor the code to check if a pipe is currently enabled out of
> assert_pipe() and put it in a new intel_pipe_is_enabled() helper,
> so that it can be re-used without copy-pasting it.
>
> Signed-off-by: Hans de Goede <hdegoede at redhat.com>

Does what it says on the box.

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


> ---
>  drivers/gpu/drm/i915/display/intel_display.c | 20 ++++++++++++++------
>  drivers/gpu/drm/i915/display/intel_display.h |  2 ++
>  2 files changed, 16 insertions(+), 6 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/display/intel_display.c b/drivers/gpu/drm/i915/display/intel_display.c
> index e1060076ac83..9cb304aee285 100644
> --- a/drivers/gpu/drm/i915/display/intel_display.c
> +++ b/drivers/gpu/drm/i915/display/intel_display.c
> @@ -442,17 +442,13 @@ void assert_panel_unlocked(struct drm_i915_private *dev_priv, enum pipe pipe)
>  	     pipe_name(pipe));
>  }
>  
> -void assert_pipe(struct drm_i915_private *dev_priv,
> -		 enum transcoder cpu_transcoder, bool state)
> +bool intel_pipe_is_enabled(struct drm_i915_private *dev_priv,
> +			   enum transcoder cpu_transcoder)
>  {
>  	bool cur_state;
>  	enum intel_display_power_domain power_domain;
>  	intel_wakeref_t wakeref;
>  
> -	/* we keep both pipes enabled on 830 */
> -	if (IS_I830(dev_priv))
> -		state = true;
> -
>  	power_domain = POWER_DOMAIN_TRANSCODER(cpu_transcoder);
>  	wakeref = intel_display_power_get_if_enabled(dev_priv, power_domain);
>  	if (wakeref) {
> @@ -464,6 +460,18 @@ void assert_pipe(struct drm_i915_private *dev_priv,
>  		cur_state = false;
>  	}
>  
> +	return cur_state;
> +}
> +
> +void assert_pipe(struct drm_i915_private *dev_priv,
> +		 enum transcoder cpu_transcoder, bool state)
> +{
> +	bool cur_state = intel_pipe_is_enabled(dev_priv, cpu_transcoder);
> +
> +	/* we keep both pipes enabled on 830 */
> +	if (IS_I830(dev_priv))
> +		state = true;
> +
>  	I915_STATE_WARN(cur_state != state,
>  			"transcoder %s assertion failure (expected %s, current %s)\n",
>  			transcoder_name(cpu_transcoder),
> diff --git a/drivers/gpu/drm/i915/display/intel_display.h b/drivers/gpu/drm/i915/display/intel_display.h
> index 0e4c1481fa00..642cc87f3e38 100644
> --- a/drivers/gpu/drm/i915/display/intel_display.h
> +++ b/drivers/gpu/drm/i915/display/intel_display.h
> @@ -533,6 +533,8 @@ void intel_enable_pipe(const struct intel_crtc_state *new_crtc_state);
>  void intel_disable_pipe(const struct intel_crtc_state *old_crtc_state);
>  void i830_enable_pipe(struct drm_i915_private *dev_priv, enum pipe pipe);
>  void i830_disable_pipe(struct drm_i915_private *dev_priv, enum pipe pipe);
> +bool intel_pipe_is_enabled(struct drm_i915_private *dev_priv,
> +			   enum transcoder cpu_transcoder);
>  enum pipe intel_crtc_pch_transcoder(struct intel_crtc *crtc);
>  int vlv_get_hpll_vco(struct drm_i915_private *dev_priv);
>  int vlv_get_cck_clock(struct drm_i915_private *dev_priv,

-- 
Jani Nikula, Intel Open Source Graphics Center