[Intel-gfx] [PATCH v5 10/14] drm/i915/display: Add helper function to check if sink_format is 420

[Ankit Nautiyal]

Add an inline helper function to check if the sink_format is set to
YCBCR420 format.

Signed-off-by: Ankit Nautiyal <ankit.k.nauti...@intel.com>
---
 drivers/gpu/drm/i915/display/intel_display_types.h | 6 ++++++
 drivers/gpu/drm/i915/display/intel_dp.c            | 4 ++--
 drivers/gpu/drm/i915/display/intel_hdmi.c          | 6 +++---
 3 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/drivers/gpu/drm/i915/display/intel_display_types.h 
b/drivers/gpu/drm/i915/display/intel_display_types.h
index 212f4aa8fba1..883cab869e1a 100644
--- a/drivers/gpu/drm/i915/display/intel_display_types.h
+++ b/drivers/gpu/drm/i915/display/intel_display_types.h
@@ -2064,4 +2064,10 @@ to_intel_frontbuffer(struct drm_framebuffer *fb)
        return fb ? to_intel_framebuffer(fb)->frontbuffer : NULL;
 }
 
+static inline bool
+intel_crtc_has_420_sink_format(const struct intel_crtc_state *crtc_state)
+{
+       return crtc_state->sink_format == INTEL_OUTPUT_FORMAT_YCBCR420;
+}
+
 #endif /*  __INTEL_DISPLAY_TYPES_H__ */
diff --git a/drivers/gpu/drm/i915/display/intel_dp.c 
b/drivers/gpu/drm/i915/display/intel_dp.c
index 920be0fd39c1..8c5480cd2f65 100644
--- a/drivers/gpu/drm/i915/display/intel_dp.c
+++ b/drivers/gpu/drm/i915/display/intel_dp.c
@@ -2134,7 +2134,7 @@ intel_dp_compute_output_format(struct intel_encoder 
*encoder,
        ret = intel_dp_compute_link_config(encoder, crtc_state, conn_state,
                                           respect_downstream_limits, with_dsc);
        if (ret) {
-               if (crtc_state->sink_format == INTEL_OUTPUT_FORMAT_YCBCR420 ||
+               if (intel_crtc_has_420_sink_format(crtc_state) ||
                    !drm_mode_is_420_also(info, adjusted_mode))
                        return ret;
 
@@ -2846,7 +2846,7 @@ void intel_dp_configure_protocol_converter(struct 
intel_dp *intel_dp,
                drm_dbg_kms(&i915->drm, "Failed to %s protocol converter HDMI 
mode\n",
                            str_enable_disable(intel_dp->has_hdmi_sink));
 
-       if (crtc_state->sink_format == INTEL_OUTPUT_FORMAT_YCBCR420) {
+       if (intel_crtc_has_420_sink_format(crtc_state)) {
                switch (crtc_state->output_format) {
                case INTEL_OUTPUT_FORMAT_YCBCR420:
                        /*
diff --git a/drivers/gpu/drm/i915/display/intel_hdmi.c 
b/drivers/gpu/drm/i915/display/intel_hdmi.c
index 3f9450ed5241..3de2416f70ce 100644
--- a/drivers/gpu/drm/i915/display/intel_hdmi.c
+++ b/drivers/gpu/drm/i915/display/intel_hdmi.c
@@ -2067,7 +2067,7 @@ static bool hdmi_bpc_possible(const struct 
intel_crtc_state *crtc_state, int bpc
                return false;
 
        /* Display Wa_1405510057:icl,ehl */
-       if (crtc_state->sink_format == INTEL_OUTPUT_FORMAT_YCBCR420 &&
+       if (intel_crtc_has_420_sink_format(crtc_state) &&
            bpc == 10 && DISPLAY_VER(dev_priv) == 11 &&
            (adjusted_mode->crtc_hblank_end -
             adjusted_mode->crtc_hblank_start) % 8 == 2)
@@ -2229,7 +2229,7 @@ static int intel_hdmi_compute_output_format(struct 
intel_encoder *encoder,
        crtc_state->output_format = intel_hdmi_output_format(crtc_state, 
connector);
        ret = intel_hdmi_compute_clock(encoder, crtc_state, 
respect_downstream_limits);
        if (ret) {
-               if (crtc_state->sink_format == INTEL_OUTPUT_FORMAT_YCBCR420 ||
+               if (intel_crtc_has_420_sink_format(crtc_state) ||
                    !drm_mode_is_420_also(info, adjusted_mode))
                        return ret;
 
@@ -2289,7 +2289,7 @@ int intel_hdmi_compute_config(struct intel_encoder 
*encoder,
                return ret;
        }
 
-       if (pipe_config->sink_format == INTEL_OUTPUT_FORMAT_YCBCR420) {
+       if (intel_crtc_has_420_sink_format(pipe_config)) {
                ret = intel_panel_fitting(pipe_config, conn_state);
                if (ret)
                        return ret;
-- 
2.25.1