drm/i915/display: Use sink_format instead of ycbcr420_output flag

Start passing the sink_format, to all functions that take a bool
ycbcr420_output as parameter. This will make the functions generic,
and will serve as a slight step towards 4:2:2 support later.

v2: Rebased.

v3: Correct the checks in places concerned with pipe output. (Ville)
Other minor styling and refactoring fixes, as suggested by Ville.

Suggested-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: Ankit Nautiyal <ankit.k.nautiyal@intel.com>
Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20230427125605.487769-5-ankit.k.nautiyal@intel.com

diff --git a/drivers/gpu/drm/i915/display/intel_dp.c b/drivers/gpu/drm/i915/display/intel_dp.c
index 23bfa5e..012d7af 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_dp.c
+++ b/drivers/gpu/drm/i915/display/intel_dp.c
@@ -1005,7 +1005,8 @@ static int intel_dp_max_tmds_clock(struct intel_dp *intel_dp)
 
 static enum drm_mode_status
 intel_dp_tmds_clock_valid(struct intel_dp *intel_dp,
-                         int clock, int bpc, bool ycbcr420_output,
+                         int clock, int bpc,
+                         enum intel_output_format sink_format,
                          bool respect_downstream_limits)
 {
        int tmds_clock, min_tmds_clock, max_tmds_clock;
@@ -1013,7 +1014,7 @@ intel_dp_tmds_clock_valid(struct intel_dp *intel_dp,
        if (!respect_downstream_limits)
                return MODE_OK;
 
-       tmds_clock = intel_hdmi_tmds_clock(clock, bpc, ycbcr420_output);
+       tmds_clock = intel_hdmi_tmds_clock(clock, bpc, sink_format);
 
        min_tmds_clock = intel_dp->dfp.min_tmds_clock;
        max_tmds_clock = intel_dp_max_tmds_clock(intel_dp);
@@ -1036,6 +1037,7 @@ intel_dp_mode_valid_downstream(struct intel_connector *connector,
        const struct drm_display_info *info = &connector->base.display_info;
        enum drm_mode_status status;
        bool ycbcr_420_only;
+       enum intel_output_format sink_format;
 
        /* If PCON supports FRL MODE, check FRL bandwidth constraints */
        if (intel_dp->dfp.pcon_max_frl_bw) {
@@ -1062,18 +1064,23 @@ intel_dp_mode_valid_downstream(struct intel_connector *connector,
 
        ycbcr_420_only = drm_mode_is_420_only(info, mode);
 
+       if (ycbcr_420_only)
+               sink_format = INTEL_OUTPUT_FORMAT_YCBCR420;
+       else
+               sink_format = INTEL_OUTPUT_FORMAT_RGB;
+
        /* Assume 8bpc for the DP++/HDMI/DVI TMDS clock check */
        status = intel_dp_tmds_clock_valid(intel_dp, target_clock,
-                                          8, ycbcr_420_only, true);
+                                          8, sink_format, true);
 
        if (status != MODE_OK) {
-               if (ycbcr_420_only ||
+               if (sink_format == INTEL_OUTPUT_FORMAT_YCBCR420 ||
                    !connector->base.ycbcr_420_allowed ||
                    !drm_mode_is_420_also(info, mode))
                        return status;
-
+               sink_format = INTEL_OUTPUT_FORMAT_YCBCR420;
                status = intel_dp_tmds_clock_valid(intel_dp, target_clock,
-                                                  8, true, true);
+                                                  8, sink_format, true);
                if (status != MODE_OK)
                        return status;
        }
@@ -1309,19 +1316,10 @@ static bool intel_dp_supports_dsc(struct intel_dp *intel_dp,
                drm_dp_sink_supports_dsc(intel_dp->dsc_dpcd);
 }
 
-static bool intel_dp_is_ycbcr420(struct intel_dp *intel_dp,
-                                const struct intel_crtc_state *crtc_state)
-{
-       return crtc_state->output_format == INTEL_OUTPUT_FORMAT_YCBCR420 ||
-               (crtc_state->output_format == INTEL_OUTPUT_FORMAT_YCBCR444 &&
-                intel_dp->dfp.ycbcr_444_to_420);
-}
-
 static int intel_dp_hdmi_compute_bpc(struct intel_dp *intel_dp,
                                     const struct intel_crtc_state *crtc_state,
                                     int bpc, bool respect_downstream_limits)
 {
-       bool ycbcr420_output = intel_dp_is_ycbcr420(intel_dp, crtc_state);
        int clock = crtc_state->hw.adjusted_mode.crtc_clock;
 
        /*
@@ -1341,8 +1339,8 @@ static int intel_dp_hdmi_compute_bpc(struct intel_dp *intel_dp,
 
        for (; bpc >= 8; bpc -= 2) {
                if (intel_hdmi_bpc_possible(crtc_state, bpc,
-                                           intel_dp->has_hdmi_sink, ycbcr420_output) &&
-                   intel_dp_tmds_clock_valid(intel_dp, clock, bpc, ycbcr420_output,
+                                           intel_dp->has_hdmi_sink) &&
+                   intel_dp_tmds_clock_valid(intel_dp, clock, bpc, crtc_state->sink_format,
                                              respect_downstream_limits) == MODE_OK)
                        return bpc;
        }

diff --git a/drivers/gpu/drm/i915/display/intel_hdmi.c b/drivers/gpu/drm/i915/display/intel_hdmi.c
index dea45c2..7d796c0 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_hdmi.c
+++ b/drivers/gpu/drm/i915/display/intel_hdmi.c
@@ -1873,10 +1873,11 @@ hdmi_port_clock_valid(struct intel_hdmi *hdmi,
        return MODE_OK;
 }
 
-int intel_hdmi_tmds_clock(int clock, int bpc, bool ycbcr420_output)
+int intel_hdmi_tmds_clock(int clock, int bpc,
+                         enum intel_output_format sink_format)
 {
        /* YCBCR420 TMDS rate requirement is half the pixel clock */
-       if (ycbcr420_output)
+       if (sink_format == INTEL_OUTPUT_FORMAT_YCBCR420)
                clock /= 2;
 
        /*
@@ -1903,7 +1904,8 @@ static bool intel_hdmi_source_bpc_possible(struct drm_i915_private *i915, int bp
 }
 
 static bool intel_hdmi_sink_bpc_possible(struct drm_connector *connector,
-                                        int bpc, bool has_hdmi_sink, bool ycbcr420_output)
+                                        int bpc, bool has_hdmi_sink,
+                                        enum intel_output_format sink_format)
 {
        const struct drm_display_info *info = &connector->display_info;
        const struct drm_hdmi_info *hdmi = &info->hdmi;
@@ -1913,7 +1915,7 @@ static bool intel_hdmi_sink_bpc_possible(struct drm_connector *connector,
                if (!has_hdmi_sink)
                        return false;
 
-               if (ycbcr420_output)
+               if (sink_format == INTEL_OUTPUT_FORMAT_YCBCR420)
                        return hdmi->y420_dc_modes & DRM_EDID_YCBCR420_DC_36;
                else
                        return info->edid_hdmi_rgb444_dc_modes & DRM_EDID_HDMI_DC_36;
@@ -1921,7 +1923,7 @@ static bool intel_hdmi_sink_bpc_possible(struct drm_connector *connector,
                if (!has_hdmi_sink)
                        return false;
 
-               if (ycbcr420_output)
+               if (sink_format == INTEL_OUTPUT_FORMAT_YCBCR420)
                        return hdmi->y420_dc_modes & DRM_EDID_YCBCR420_DC_30;
                else
                        return info->edid_hdmi_rgb444_dc_modes & DRM_EDID_HDMI_DC_30;
@@ -1935,7 +1937,8 @@ static bool intel_hdmi_sink_bpc_possible(struct drm_connector *connector,
 
 static enum drm_mode_status
 intel_hdmi_mode_clock_valid(struct drm_connector *connector, int clock,
-                           bool has_hdmi_sink, bool ycbcr420_output)
+                           bool has_hdmi_sink,
+                           enum intel_output_format sink_format)
 {
        struct drm_i915_private *i915 = to_i915(connector->dev);
        struct intel_hdmi *hdmi = intel_attached_hdmi(to_intel_connector(connector));
@@ -1948,12 +1951,12 @@ intel_hdmi_mode_clock_valid(struct drm_connector *connector, int clock,
         * least one color depth is accepted.
         */
        for (bpc = 12; bpc >= 8; bpc -= 2) {
-               int tmds_clock = intel_hdmi_tmds_clock(clock, bpc, ycbcr420_output);
+               int tmds_clock = intel_hdmi_tmds_clock(clock, bpc, sink_format);
 
                if (!intel_hdmi_source_bpc_possible(i915, bpc))
                        continue;
 
-               if (!intel_hdmi_sink_bpc_possible(connector, bpc, has_hdmi_sink, ycbcr420_output))
+               if (!intel_hdmi_sink_bpc_possible(connector, bpc, has_hdmi_sink, sink_format))
                        continue;
 
                status = hdmi_port_clock_valid(hdmi, tmds_clock, true, has_hdmi_sink);
@@ -1978,6 +1981,7 @@ intel_hdmi_mode_valid(struct drm_connector *connector,
        int max_dotclk = to_i915(connector->dev)->max_dotclk_freq;
        bool has_hdmi_sink = intel_has_hdmi_sink(hdmi, connector->state);
        bool ycbcr_420_only;
+       enum intel_output_format sink_format;
 
        if ((mode->flags & DRM_MODE_FLAG_3D_MASK) == DRM_MODE_FLAG_3D_FRAME_PACKING)
                clock *= 2;
@@ -2002,14 +2006,20 @@ intel_hdmi_mode_valid(struct drm_connector *connector,
 
        ycbcr_420_only = drm_mode_is_420_only(&connector->display_info, mode);
 
-       status = intel_hdmi_mode_clock_valid(connector, clock, has_hdmi_sink, ycbcr_420_only);
+       if (ycbcr_420_only)
+               sink_format = INTEL_OUTPUT_FORMAT_YCBCR420;
+       else
+               sink_format = INTEL_OUTPUT_FORMAT_RGB;
+
+       status = intel_hdmi_mode_clock_valid(connector, clock, has_hdmi_sink, sink_format);
        if (status != MODE_OK) {
                if (ycbcr_420_only ||
                    !connector->ycbcr_420_allowed ||
                    !drm_mode_is_420_also(&connector->display_info, mode))
                        return status;
 
-               status = intel_hdmi_mode_clock_valid(connector, clock, has_hdmi_sink, true);
+               sink_format = INTEL_OUTPUT_FORMAT_YCBCR420;
+               status = intel_hdmi_mode_clock_valid(connector, clock, has_hdmi_sink, sink_format);
                if (status != MODE_OK)
                        return status;
        }
@@ -2018,7 +2028,7 @@ intel_hdmi_mode_valid(struct drm_connector *connector,
 }
 
 bool intel_hdmi_bpc_possible(const struct intel_crtc_state *crtc_state,
-                            int bpc, bool has_hdmi_sink, bool ycbcr420_output)
+                            int bpc, bool has_hdmi_sink)
 {
        struct drm_atomic_state *state = crtc_state->uapi.state;
        struct drm_connector_state *connector_state;
@@ -2029,7 +2039,8 @@ bool intel_hdmi_bpc_possible(const struct intel_crtc_state *crtc_state,
                if (connector_state->crtc != crtc_state->uapi.crtc)
                        continue;
 
-               if (!intel_hdmi_sink_bpc_possible(connector, bpc, has_hdmi_sink, ycbcr420_output))
+               if (!intel_hdmi_sink_bpc_possible(connector, bpc, has_hdmi_sink,
+                                                 crtc_state->sink_format))
                        return false;
        }
 
@@ -2053,8 +2064,7 @@ static bool hdmi_bpc_possible(const struct intel_crtc_state *crtc_state, int bpc
             adjusted_mode->crtc_hblank_start) % 8 == 2)
                return false;
 
-       return intel_hdmi_bpc_possible(crtc_state, bpc, crtc_state->has_hdmi_sink,
-                                      intel_hdmi_is_ycbcr420(crtc_state));
+       return intel_hdmi_bpc_possible(crtc_state, bpc, crtc_state->has_hdmi_sink);
 }
 
 static int intel_hdmi_compute_bpc(struct intel_encoder *encoder,
@@ -2062,7 +2072,6 @@ static int intel_hdmi_compute_bpc(struct intel_encoder *encoder,
                                  int clock, bool respect_downstream_limits)
 {
        struct intel_hdmi *intel_hdmi = enc_to_intel_hdmi(encoder);
-       bool ycbcr420_output = intel_hdmi_is_ycbcr420(crtc_state);
        int bpc;
 
        /*
@@ -2080,7 +2089,8 @@ static int intel_hdmi_compute_bpc(struct intel_encoder *encoder,
                bpc = 8;
 
        for (; bpc >= 8; bpc -= 2) {
-               int tmds_clock = intel_hdmi_tmds_clock(clock, bpc, ycbcr420_output);
+               int tmds_clock = intel_hdmi_tmds_clock(clock, bpc,
+                                                      crtc_state->sink_format);
 
                if (hdmi_bpc_possible(crtc_state, bpc) &&
                    hdmi_port_clock_valid(intel_hdmi, tmds_clock,
@@ -2110,7 +2120,7 @@ static int intel_hdmi_compute_clock(struct intel_encoder *encoder,
                return bpc;
 
        crtc_state->port_clock =
-               intel_hdmi_tmds_clock(clock, bpc, intel_hdmi_is_ycbcr420(crtc_state));
+               intel_hdmi_tmds_clock(clock, bpc, crtc_state->sink_format);
 
        /*
         * pipe_bpp could already be below 8bpc due to

diff --git a/drivers/gpu/drm/i915/display/intel_hdmi.h b/drivers/gpu/drm/i915/display/intel_hdmi.h
index 492bd39..08a2745 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_hdmi.h
+++ b/drivers/gpu/drm/i915/display/intel_hdmi.h
@@ -9,6 +9,7 @@
 #include <linux/types.h>
 
 enum hdmi_infoframe_type;
+enum intel_output_format;
 enum port;
 struct drm_connector;
 struct drm_connector_state;
@@ -45,8 +46,8 @@ void intel_read_infoframe(struct intel_encoder *encoder,
 bool intel_hdmi_limited_color_range(const struct intel_crtc_state *crtc_state,
                                    const struct drm_connector_state *conn_state);
 bool intel_hdmi_bpc_possible(const struct intel_crtc_state *crtc_state,
-                            int bpc, bool has_hdmi_sink, bool ycbcr420_output);
-int intel_hdmi_tmds_clock(int clock, int bpc, bool ycbcr420_output);
+                            int bpc, bool has_hdmi_sink);
+int intel_hdmi_tmds_clock(int clock, int bpc, enum intel_output_format sink_format);
 int intel_hdmi_dsc_get_bpp(int src_fractional_bpp, int slice_width,
                           int num_slices, int output_format, bool hdmi_all_bpp,
                           int hdmi_max_chunk_bytes);