[Intel-gfx] [PATCH 1/2] drm/i915: Clean up the mess around hdmi_12bpc_possible()

Chris Wilson chris at chris-wilson.co.uk
Thu Oct 26 15:47:38 UTC 2017


Quoting Ville Syrjala (2017-10-26 16:14:04)
> From: Ville Syrjälä <ville.syrjala at linux.intel.com>
> 
> Move the crtc state related 12bpc checks into hdmi_12bpc_possible()
> since that one already examines other parts of the crtc state.
> 
> Note that we can drop the !force_dvi check since
> crtc_state->has_hdmi_sink already accounts for that.
> 
> Signed-off-by: Ville Syrjälä <ville.syrjala at linux.intel.com>
> ---
>  drivers/gpu/drm/i915/intel_hdmi.c | 11 ++++++++---
>  1 file changed, 8 insertions(+), 3 deletions(-)
> 
> diff --git a/drivers/gpu/drm/i915/intel_hdmi.c b/drivers/gpu/drm/i915/intel_hdmi.c
> index 5132dc814788..aa486b8925cf 100644
> --- a/drivers/gpu/drm/i915/intel_hdmi.c
> +++ b/drivers/gpu/drm/i915/intel_hdmi.c
> @@ -1336,6 +1336,12 @@ static bool hdmi_12bpc_possible(const struct intel_crtc_state *crtc_state)
>         if (HAS_GMCH_DISPLAY(dev_priv))
>                 return false;
>  
> +       if (crtc_state->pipe_bpp <= 8*3)
> +               return false;

Ok.

> +
> +       if (!crtc_state->has_hdmi_sink)
> +               return false;

Ok.

Now just for force_dvi...

intel_hdmi_compute_config():
        bool force_dvi = intel_conn_state->force_audio == HDMI_AUDIO_OFF_DVI;

	pipe_config->has_hdmi_sink = !force_dvi && intel_hdmi->has_hdmi_sink;

and we follow on from that has_hdmi_sink, so ok.

Reviewed-by: Chris Wilson <chris at chris-wilson.co.uk>
-Chris


More information about the Intel-gfx mailing list