On Tue, 2019-11-12 at 18:38 +0200, Ville Syrjala wrote:
> From: Ville Syrjälä <ville.syrj...@linux.intel.com>
> 
> Let's start to eliminate intel_pipe_to_cpu_transcoder() so that
> we can get rid of one more crtc->config usage (which we will want
> to nuke as well).
> 
> In the case of assert_fdi_tx() we know that we're never
> dealing with the EDP transcoder so we can simply replace
> this with a cast.

There still one EDP transcoder case when running in a HSW:

haswell_crtc_enable()
        lpt_pch_enable()
                lpt_enable_pch_transcoder()
                        assert_fdi_tx_enabled()

> 
> Signed-off-by: Ville Syrjälä <ville.syrj...@linux.intel.com>
> ---
>  drivers/gpu/drm/i915/display/intel_display.c | 10 +++++++---
>  1 file changed, 7 insertions(+), 3 deletions(-)
> 
> diff --git a/drivers/gpu/drm/i915/display/intel_display.c
> b/drivers/gpu/drm/i915/display/intel_display.c
> index e7e5497e6f2e..cabd88337822 100644
> --- a/drivers/gpu/drm/i915/display/intel_display.c
> +++ b/drivers/gpu/drm/i915/display/intel_display.c
> @@ -1141,11 +1141,15 @@ static void assert_fdi_tx(struct
> drm_i915_private *dev_priv,
>                         enum pipe pipe, bool state)
>  {
>       bool cur_state;
> -     enum transcoder cpu_transcoder =
> intel_pipe_to_cpu_transcoder(dev_priv,
> -                                                                   p
> ipe);
>  
>       if (HAS_DDI(dev_priv)) {
> -             /* DDI does not have a specific FDI_TX register */
> +             /*
> +              * DDI does not have a specific FDI_TX register.
> +              *
> +              * FDI is never hooked fed from EDP transcoder
> +              * so pipe->transcoder cast is fine here.
> +              */
> +             enum transcoder cpu_transcoder = (enum transcoder)pipe;
>               u32 val =
> I915_READ(TRANS_DDI_FUNC_CTL(cpu_transcoder));
>               cur_state = !!(val & TRANS_DDI_FUNC_ENABLE);
>       } else {
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

Reply via email to