Merge tag 'drm-intel-next-2021-01-04' of git://anongit.freedesktop.org/drm/drm-intel...
[platform/kernel/linux-starfive.git] / drivers / gpu / drm / i915 / display / intel_dp.c
index 98c2aea..8a00e60 100644 (file)
@@ -651,6 +651,10 @@ intel_dp_output_format(struct drm_connector *connector,
            !drm_mode_is_420_only(info, mode))
                return INTEL_OUTPUT_FORMAT_RGB;
 
+       if (intel_dp->dfp.rgb_to_ycbcr &&
+           intel_dp->dfp.ycbcr_444_to_420)
+               return INTEL_OUTPUT_FORMAT_RGB;
+
        if (intel_dp->dfp.ycbcr_444_to_420)
                return INTEL_OUTPUT_FORMAT_YCBCR444;
        else
@@ -716,6 +720,25 @@ intel_dp_mode_valid_downstream(struct intel_connector *connector,
        const struct drm_display_info *info = &connector->base.display_info;
        int tmds_clock;
 
+       /* If PCON supports FRL MODE, check FRL bandwidth constraints */
+       if (intel_dp->dfp.pcon_max_frl_bw) {
+               int target_bw;
+               int max_frl_bw;
+               int bpp = intel_dp_mode_min_output_bpp(&connector->base, mode);
+
+               target_bw = bpp * target_clock;
+
+               max_frl_bw = intel_dp->dfp.pcon_max_frl_bw;
+
+               /* converting bw from Gbps to Kbps*/
+               max_frl_bw = max_frl_bw * 1000000;
+
+               if (target_bw > max_frl_bw)
+                       return MODE_CLOCK_HIGH;
+
+               return MODE_OK;
+       }
+
        if (intel_dp->dfp.max_dotclock &&
            target_clock > intel_dp->dfp.max_dotclock)
                return MODE_CLOCK_HIGH;
@@ -3903,6 +3926,8 @@ static void intel_disable_dp(struct intel_atomic_state *state,
        intel_edp_backlight_off(old_conn_state);
        intel_dp_set_power(intel_dp, DP_SET_POWER_D3);
        intel_edp_panel_off(intel_dp);
+       intel_dp->frl.is_trained = false;
+       intel_dp->frl.trained_rate_gbps = 0;
 }
 
 static void g4x_disable_dp(struct intel_atomic_state *state,
@@ -3998,6 +4023,280 @@ cpt_set_link_train(struct intel_dp *intel_dp,
        intel_de_posting_read(dev_priv, intel_dp->output_reg);
 }
 
+static void intel_dp_get_pcon_dsc_cap(struct intel_dp *intel_dp)
+{
+       struct drm_i915_private *i915 = dp_to_i915(intel_dp);
+
+       /* Clear the cached register set to avoid using stale values */
+
+       memset(intel_dp->pcon_dsc_dpcd, 0, sizeof(intel_dp->pcon_dsc_dpcd));
+
+       if (drm_dp_dpcd_read(&intel_dp->aux, DP_PCON_DSC_ENCODER,
+                            intel_dp->pcon_dsc_dpcd,
+                            sizeof(intel_dp->pcon_dsc_dpcd)) < 0)
+               drm_err(&i915->drm, "Failed to read DPCD register 0x%x\n",
+                       DP_PCON_DSC_ENCODER);
+
+       drm_dbg_kms(&i915->drm, "PCON ENCODER DSC DPCD: %*ph\n",
+                   (int)sizeof(intel_dp->pcon_dsc_dpcd), intel_dp->pcon_dsc_dpcd);
+}
+
+static int intel_dp_pcon_get_frl_mask(u8 frl_bw_mask)
+{
+       int bw_gbps[] = {9, 18, 24, 32, 40, 48};
+       int i;
+
+       for (i = ARRAY_SIZE(bw_gbps) - 1; i >= 0; i--) {
+               if (frl_bw_mask & (1 << i))
+                       return bw_gbps[i];
+       }
+       return 0;
+}
+
+static int intel_dp_pcon_set_frl_mask(int max_frl)
+{
+       switch (max_frl) {
+       case 48:
+               return DP_PCON_FRL_BW_MASK_48GBPS;
+       case 40:
+               return DP_PCON_FRL_BW_MASK_40GBPS;
+       case 32:
+               return DP_PCON_FRL_BW_MASK_32GBPS;
+       case 24:
+               return DP_PCON_FRL_BW_MASK_24GBPS;
+       case 18:
+               return DP_PCON_FRL_BW_MASK_18GBPS;
+       case 9:
+               return DP_PCON_FRL_BW_MASK_9GBPS;
+       }
+
+       return 0;
+}
+
+static int intel_dp_hdmi_sink_max_frl(struct intel_dp *intel_dp)
+{
+       struct intel_connector *intel_connector = intel_dp->attached_connector;
+       struct drm_connector *connector = &intel_connector->base;
+       int max_frl_rate;
+       int max_lanes, rate_per_lane;
+       int max_dsc_lanes, dsc_rate_per_lane;
+
+       max_lanes = connector->display_info.hdmi.max_lanes;
+       rate_per_lane = connector->display_info.hdmi.max_frl_rate_per_lane;
+       max_frl_rate = max_lanes * rate_per_lane;
+
+       if (connector->display_info.hdmi.dsc_cap.v_1p2) {
+               max_dsc_lanes = connector->display_info.hdmi.dsc_cap.max_lanes;
+               dsc_rate_per_lane = connector->display_info.hdmi.dsc_cap.max_frl_rate_per_lane;
+               if (max_dsc_lanes && dsc_rate_per_lane)
+                       max_frl_rate = min(max_frl_rate, max_dsc_lanes * dsc_rate_per_lane);
+       }
+
+       return max_frl_rate;
+}
+
+static int intel_dp_pcon_start_frl_training(struct intel_dp *intel_dp)
+{
+#define PCON_EXTENDED_TRAIN_MODE (1 > 0)
+#define PCON_CONCURRENT_MODE (1 > 0)
+#define PCON_SEQUENTIAL_MODE !PCON_CONCURRENT_MODE
+#define PCON_NORMAL_TRAIN_MODE !PCON_EXTENDED_TRAIN_MODE
+#define TIMEOUT_FRL_READY_MS 500
+#define TIMEOUT_HDMI_LINK_ACTIVE_MS 1000
+
+       struct drm_i915_private *i915 = dp_to_i915(intel_dp);
+       int max_frl_bw, max_pcon_frl_bw, max_edid_frl_bw, ret;
+       u8 max_frl_bw_mask = 0, frl_trained_mask;
+       bool is_active;
+
+       ret = drm_dp_pcon_reset_frl_config(&intel_dp->aux);
+       if (ret < 0)
+               return ret;
+
+       max_pcon_frl_bw = intel_dp->dfp.pcon_max_frl_bw;
+       drm_dbg(&i915->drm, "PCON max rate = %d Gbps\n", max_pcon_frl_bw);
+
+       max_edid_frl_bw = intel_dp_hdmi_sink_max_frl(intel_dp);
+       drm_dbg(&i915->drm, "Sink max rate from EDID = %d Gbps\n", max_edid_frl_bw);
+
+       max_frl_bw = min(max_edid_frl_bw, max_pcon_frl_bw);
+
+       if (max_frl_bw <= 0)
+               return -EINVAL;
+
+       ret = drm_dp_pcon_frl_prepare(&intel_dp->aux, false);
+       if (ret < 0)
+               return ret;
+       /* Wait for PCON to be FRL Ready */
+       wait_for(is_active = drm_dp_pcon_is_frl_ready(&intel_dp->aux) == true, TIMEOUT_FRL_READY_MS);
+
+       if (!is_active)
+               return -ETIMEDOUT;
+
+       max_frl_bw_mask = intel_dp_pcon_set_frl_mask(max_frl_bw);
+       ret = drm_dp_pcon_frl_configure_1(&intel_dp->aux, max_frl_bw, PCON_SEQUENTIAL_MODE);
+       if (ret < 0)
+               return ret;
+       ret = drm_dp_pcon_frl_configure_2(&intel_dp->aux, max_frl_bw_mask, PCON_NORMAL_TRAIN_MODE);
+       if (ret < 0)
+               return ret;
+       ret = drm_dp_pcon_frl_enable(&intel_dp->aux);
+       if (ret < 0)
+               return ret;
+       /*
+        * Wait for FRL to be completed
+        * Check if the HDMI Link is up and active.
+        */
+       wait_for(is_active = drm_dp_pcon_hdmi_link_active(&intel_dp->aux) == true, TIMEOUT_HDMI_LINK_ACTIVE_MS);
+
+       if (!is_active)
+               return -ETIMEDOUT;
+
+       /* Verify HDMI Link configuration shows FRL Mode */
+       if (drm_dp_pcon_hdmi_link_mode(&intel_dp->aux, &frl_trained_mask) !=
+           DP_PCON_HDMI_MODE_FRL) {
+               drm_dbg(&i915->drm, "HDMI couldn't be trained in FRL Mode\n");
+               return -EINVAL;
+       }
+       drm_dbg(&i915->drm, "MAX_FRL_MASK = %u, FRL_TRAINED_MASK = %u\n", max_frl_bw_mask, frl_trained_mask);
+
+       intel_dp->frl.trained_rate_gbps = intel_dp_pcon_get_frl_mask(frl_trained_mask);
+       intel_dp->frl.is_trained = true;
+       drm_dbg(&i915->drm, "FRL trained with : %d Gbps\n", intel_dp->frl.trained_rate_gbps);
+
+       return 0;
+}
+
+static bool intel_dp_is_hdmi_2_1_sink(struct intel_dp *intel_dp)
+{
+       if (drm_dp_is_branch(intel_dp->dpcd) &&
+           intel_dp->has_hdmi_sink &&
+           intel_dp_hdmi_sink_max_frl(intel_dp) > 0)
+               return true;
+
+       return false;
+}
+
+void intel_dp_check_frl_training(struct intel_dp *intel_dp)
+{
+       struct drm_i915_private *dev_priv = dp_to_i915(intel_dp);
+
+       /* Always go for FRL training if supported */
+       if (!intel_dp_is_hdmi_2_1_sink(intel_dp) ||
+           intel_dp->frl.is_trained)
+               return;
+
+       if (intel_dp_pcon_start_frl_training(intel_dp) < 0) {
+               int ret, mode;
+
+               drm_dbg(&dev_priv->drm, "Couldnt set FRL mode, continuing with TMDS mode\n");
+               ret = drm_dp_pcon_reset_frl_config(&intel_dp->aux);
+               mode = drm_dp_pcon_hdmi_link_mode(&intel_dp->aux, NULL);
+
+               if (ret < 0 || mode != DP_PCON_HDMI_MODE_TMDS)
+                       drm_dbg(&dev_priv->drm, "Issue with PCON, cannot set TMDS mode\n");
+       } else {
+               drm_dbg(&dev_priv->drm, "FRL training Completed\n");
+       }
+}
+
+static int
+intel_dp_pcon_dsc_enc_slice_height(const struct intel_crtc_state *crtc_state)
+{
+       int vactive = crtc_state->hw.adjusted_mode.vdisplay;
+
+       return intel_hdmi_dsc_get_slice_height(vactive);
+}
+
+static int
+intel_dp_pcon_dsc_enc_slices(struct intel_dp *intel_dp,
+                            const struct intel_crtc_state *crtc_state)
+{
+       struct intel_connector *intel_connector = intel_dp->attached_connector;
+       struct drm_connector *connector = &intel_connector->base;
+       int hdmi_throughput = connector->display_info.hdmi.dsc_cap.clk_per_slice;
+       int hdmi_max_slices = connector->display_info.hdmi.dsc_cap.max_slices;
+       int pcon_max_slices = drm_dp_pcon_dsc_max_slices(intel_dp->pcon_dsc_dpcd);
+       int pcon_max_slice_width = drm_dp_pcon_dsc_max_slice_width(intel_dp->pcon_dsc_dpcd);
+
+       return intel_hdmi_dsc_get_num_slices(crtc_state, pcon_max_slices,
+                                            pcon_max_slice_width,
+                                            hdmi_max_slices, hdmi_throughput);
+}
+
+static int
+intel_dp_pcon_dsc_enc_bpp(struct intel_dp *intel_dp,
+                         const struct intel_crtc_state *crtc_state,
+                         int num_slices, int slice_width)
+{
+       struct intel_connector *intel_connector = intel_dp->attached_connector;
+       struct drm_connector *connector = &intel_connector->base;
+       int output_format = crtc_state->output_format;
+       bool hdmi_all_bpp = connector->display_info.hdmi.dsc_cap.all_bpp;
+       int pcon_fractional_bpp = drm_dp_pcon_dsc_bpp_incr(intel_dp->pcon_dsc_dpcd);
+       int hdmi_max_chunk_bytes =
+               connector->display_info.hdmi.dsc_cap.total_chunk_kbytes * 1024;
+
+       return intel_hdmi_dsc_get_bpp(pcon_fractional_bpp, slice_width,
+                                     num_slices, output_format, hdmi_all_bpp,
+                                     hdmi_max_chunk_bytes);
+}
+
+void
+intel_dp_pcon_dsc_configure(struct intel_dp *intel_dp,
+                           const struct intel_crtc_state *crtc_state)
+{
+       u8 pps_param[6];
+       int slice_height;
+       int slice_width;
+       int num_slices;
+       int bits_per_pixel;
+       int ret;
+       struct intel_connector *intel_connector = intel_dp->attached_connector;
+       struct drm_i915_private *i915 = dp_to_i915(intel_dp);
+       struct drm_connector *connector;
+       bool hdmi_is_dsc_1_2;
+
+       if (!intel_dp_is_hdmi_2_1_sink(intel_dp))
+               return;
+
+       if (!intel_connector)
+               return;
+       connector = &intel_connector->base;
+       hdmi_is_dsc_1_2 = connector->display_info.hdmi.dsc_cap.v_1p2;
+
+       if (!drm_dp_pcon_enc_is_dsc_1_2(intel_dp->pcon_dsc_dpcd) ||
+           !hdmi_is_dsc_1_2)
+               return;
+
+       slice_height = intel_dp_pcon_dsc_enc_slice_height(crtc_state);
+       if (!slice_height)
+               return;
+
+       num_slices = intel_dp_pcon_dsc_enc_slices(intel_dp, crtc_state);
+       if (!num_slices)
+               return;
+
+       slice_width = DIV_ROUND_UP(crtc_state->hw.adjusted_mode.hdisplay,
+                                  num_slices);
+
+       bits_per_pixel = intel_dp_pcon_dsc_enc_bpp(intel_dp, crtc_state,
+                                                  num_slices, slice_width);
+       if (!bits_per_pixel)
+               return;
+
+       pps_param[0] = slice_height & 0xFF;
+       pps_param[1] = slice_height >> 8;
+       pps_param[2] = slice_width & 0xFF;
+       pps_param[3] = slice_width >> 8;
+       pps_param[4] = bits_per_pixel & 0xFF;
+       pps_param[5] = (bits_per_pixel >> 8) & 0x3;
+
+       ret = drm_dp_pcon_pps_override_param(&intel_dp->aux, pps_param);
+       if (ret < 0)
+               drm_dbg_kms(&i915->drm, "Failed to set pcon DSC\n");
+}
+
 static void
 g4x_set_link_train(struct intel_dp *intel_dp,
                   const struct intel_crtc_state *crtc_state,
@@ -4053,7 +4352,8 @@ static void intel_dp_enable_port(struct intel_dp *intel_dp,
        intel_de_posting_read(dev_priv, intel_dp->output_reg);
 }
 
-void intel_dp_configure_protocol_converter(struct intel_dp *intel_dp)
+void intel_dp_configure_protocol_converter(struct intel_dp *intel_dp,
+                                          const struct intel_crtc_state *crtc_state)
 {
        struct drm_i915_private *i915 = dp_to_i915(intel_dp);
        u8 tmp;
@@ -4082,12 +4382,42 @@ void intel_dp_configure_protocol_converter(struct intel_dp *intel_dp)
                            enableddisabled(intel_dp->dfp.ycbcr_444_to_420));
 
        tmp = 0;
+       if (intel_dp->dfp.rgb_to_ycbcr) {
+               bool bt2020, bt709;
 
-       if (drm_dp_dpcd_writeb(&intel_dp->aux,
-                              DP_PROTOCOL_CONVERTER_CONTROL_2, tmp) <= 0)
+               /*
+                * FIXME: Currently if userspace selects BT2020 or BT709, but PCON supports only
+                * RGB->YCbCr for BT601 colorspace, we go ahead with BT601, as default.
+                *
+                */
+               tmp = DP_CONVERSION_BT601_RGB_YCBCR_ENABLE;
+
+               bt2020 = drm_dp_downstream_rgb_to_ycbcr_conversion(intel_dp->dpcd,
+                                                                  intel_dp->downstream_ports,
+                                                                  DP_DS_HDMI_BT2020_RGB_YCBCR_CONV);
+               bt709 = drm_dp_downstream_rgb_to_ycbcr_conversion(intel_dp->dpcd,
+                                                                 intel_dp->downstream_ports,
+                                                                 DP_DS_HDMI_BT709_RGB_YCBCR_CONV);
+               switch (crtc_state->infoframes.vsc.colorimetry) {
+               case DP_COLORIMETRY_BT2020_RGB:
+               case DP_COLORIMETRY_BT2020_YCC:
+                       if (bt2020)
+                               tmp = DP_CONVERSION_BT2020_RGB_YCBCR_ENABLE;
+                       break;
+               case DP_COLORIMETRY_BT709_YCC:
+               case DP_COLORIMETRY_XVYCC_709:
+                       if (bt709)
+                               tmp = DP_CONVERSION_BT709_RGB_YCBCR_ENABLE;
+                       break;
+               default:
+                       break;
+               }
+       }
+
+       if (drm_dp_pcon_convert_rgb_to_ycbcr(&intel_dp->aux, tmp) < 0)
                drm_dbg_kms(&i915->drm,
-                           "Failed to set protocol converter YCbCr 4:2:2 conversion mode to %s\n",
-                           enableddisabled(false));
+                          "Failed to set protocol converter RGB->YCbCr conversion mode to %s\n",
+                          enableddisabled(tmp ? true : false));
 }
 
 static void intel_enable_dp(struct intel_atomic_state *state,
@@ -4127,7 +4457,9 @@ static void intel_enable_dp(struct intel_atomic_state *state,
        }
 
        intel_dp_set_power(intel_dp, DP_SET_POWER_D0);
-       intel_dp_configure_protocol_converter(intel_dp);
+       intel_dp_configure_protocol_converter(intel_dp, pipe_config);
+       intel_dp_check_frl_training(intel_dp);
+       intel_dp_pcon_dsc_configure(intel_dp, pipe_config);
        intel_dp_start_link_train(intel_dp, pipe_config);
        intel_dp_stop_link_train(intel_dp, pipe_config);
 
@@ -5882,6 +6214,28 @@ intel_dp_check_mst_status(struct intel_dp *intel_dp)
        return link_ok;
 }
 
+static void
+intel_dp_handle_hdmi_link_status_change(struct intel_dp *intel_dp)
+{
+       bool is_active;
+       u8 buf = 0;
+
+       is_active = drm_dp_pcon_hdmi_link_active(&intel_dp->aux);
+       if (intel_dp->frl.is_trained && !is_active) {
+               if (drm_dp_dpcd_readb(&intel_dp->aux, DP_PCON_HDMI_LINK_CONFIG_1, &buf) < 0)
+                       return;
+
+               buf &=  ~DP_PCON_ENABLE_HDMI_LINK;
+               if (drm_dp_dpcd_writeb(&intel_dp->aux, DP_PCON_HDMI_LINK_CONFIG_1, buf) < 0)
+                       return;
+
+               drm_dp_pcon_hdmi_frl_link_error_count(&intel_dp->aux, &intel_dp->attached_connector->base);
+
+               /* Restart FRL training or fall back to TMDS mode */
+               intel_dp_check_frl_training(intel_dp);
+       }
+}
+
 static bool
 intel_dp_needs_link_retrain(struct intel_dp *intel_dp)
 {
@@ -6055,6 +6409,8 @@ int intel_dp_retrain_link(struct intel_encoder *encoder,
                    !intel_dp_mst_is_master_trans(crtc_state))
                        continue;
 
+               intel_dp_check_frl_training(intel_dp);
+               intel_dp_pcon_dsc_configure(intel_dp, crtc_state);
                intel_dp_start_link_train(intel_dp, crtc_state);
                intel_dp_stop_link_train(intel_dp, crtc_state);
                break;
@@ -6246,7 +6602,7 @@ intel_dp_hotplug(struct intel_encoder *encoder,
        return state;
 }
 
-static void intel_dp_check_service_irq(struct intel_dp *intel_dp)
+static void intel_dp_check_device_service_irq(struct intel_dp *intel_dp)
 {
        struct drm_i915_private *i915 = dp_to_i915(intel_dp);
        u8 val;
@@ -6270,6 +6626,30 @@ static void intel_dp_check_service_irq(struct intel_dp *intel_dp)
                drm_dbg_kms(&i915->drm, "Sink specific irq unhandled\n");
 }
 
+static void intel_dp_check_link_service_irq(struct intel_dp *intel_dp)
+{
+       struct drm_i915_private *i915 = dp_to_i915(intel_dp);
+       u8 val;
+
+       if (intel_dp->dpcd[DP_DPCD_REV] < 0x11)
+               return;
+
+       if (drm_dp_dpcd_readb(&intel_dp->aux,
+                             DP_LINK_SERVICE_IRQ_VECTOR_ESI0, &val) != 1 || !val) {
+               drm_dbg_kms(&i915->drm, "Error in reading link service irq vector\n");
+               return;
+       }
+
+       if (drm_dp_dpcd_writeb(&intel_dp->aux,
+                              DP_LINK_SERVICE_IRQ_VECTOR_ESI0, val) != 1) {
+               drm_dbg_kms(&i915->drm, "Error in writing link service irq vector\n");
+               return;
+       }
+
+       if (val & HDMI_LINK_STATUS_CHANGED)
+               intel_dp_handle_hdmi_link_status_change(intel_dp);
+}
+
 /*
  * According to DP spec
  * 5.1.2:
@@ -6309,7 +6689,8 @@ intel_dp_short_pulse(struct intel_dp *intel_dp)
                return false;
        }
 
-       intel_dp_check_service_irq(intel_dp);
+       intel_dp_check_device_service_irq(intel_dp);
+       intel_dp_check_link_service_irq(intel_dp);
 
        /* Handle CEC interrupts, if any */
        drm_dp_cec_irq(&intel_dp->aux);
@@ -6529,13 +6910,20 @@ intel_dp_update_dfp(struct intel_dp *intel_dp,
                                                 intel_dp->downstream_ports,
                                                 edid);
 
+       intel_dp->dfp.pcon_max_frl_bw =
+               drm_dp_get_pcon_max_frl_bw(intel_dp->dpcd,
+                                          intel_dp->downstream_ports);
+
        drm_dbg_kms(&i915->drm,
-                   "[CONNECTOR:%d:%s] DFP max bpc %d, max dotclock %d, TMDS clock %d-%d\n",
+                   "[CONNECTOR:%d:%s] DFP max bpc %d, max dotclock %d, TMDS clock %d-%d, PCON Max FRL BW %dGbps\n",
                    connector->base.base.id, connector->base.name,
                    intel_dp->dfp.max_bpc,
                    intel_dp->dfp.max_dotclock,
                    intel_dp->dfp.min_tmds_clock,
-                   intel_dp->dfp.max_tmds_clock);
+                   intel_dp->dfp.max_tmds_clock,
+                   intel_dp->dfp.pcon_max_frl_bw);
+
+       intel_dp_get_pcon_dsc_cap(intel_dp);
 }
 
 static void
@@ -6543,7 +6931,7 @@ intel_dp_update_420(struct intel_dp *intel_dp)
 {
        struct drm_i915_private *i915 = dp_to_i915(intel_dp);
        struct intel_connector *connector = intel_dp->attached_connector;
-       bool is_branch, ycbcr_420_passthrough, ycbcr_444_to_420;
+       bool is_branch, ycbcr_420_passthrough, ycbcr_444_to_420, rgb_to_ycbcr;
 
        /* No YCbCr output support on gmch platforms */
        if (HAS_GMCH(i915))
@@ -6565,14 +6953,26 @@ intel_dp_update_420(struct intel_dp *intel_dp)
                dp_to_dig_port(intel_dp)->lspcon.active ||
                drm_dp_downstream_444_to_420_conversion(intel_dp->dpcd,
                                                        intel_dp->downstream_ports);
+       rgb_to_ycbcr = drm_dp_downstream_rgb_to_ycbcr_conversion(intel_dp->dpcd,
+                                                                intel_dp->downstream_ports,
+                                                                DP_DS_HDMI_BT601_RGB_YCBCR_CONV ||
+                                                                DP_DS_HDMI_BT709_RGB_YCBCR_CONV ||
+                                                                DP_DS_HDMI_BT2020_RGB_YCBCR_CONV);
 
        if (INTEL_GEN(i915) >= 11) {
+               /* Let PCON convert from RGB->YCbCr if possible */
+               if (is_branch && rgb_to_ycbcr && ycbcr_444_to_420) {
+                       intel_dp->dfp.rgb_to_ycbcr = true;
+                       intel_dp->dfp.ycbcr_444_to_420 = true;
+                       connector->base.ycbcr_420_allowed = true;
+               } else {
                /* Prefer 4:2:0 passthrough over 4:4:4->4:2:0 conversion */
-               intel_dp->dfp.ycbcr_444_to_420 =
-                       ycbcr_444_to_420 && !ycbcr_420_passthrough;
+                       intel_dp->dfp.ycbcr_444_to_420 =
+                               ycbcr_444_to_420 && !ycbcr_420_passthrough;
 
-               connector->base.ycbcr_420_allowed =
-                       !is_branch || ycbcr_444_to_420 || ycbcr_420_passthrough;
+                       connector->base.ycbcr_420_allowed =
+                               !is_branch || ycbcr_444_to_420 || ycbcr_420_passthrough;
+               }
        } else {
                /* 4:4:4->4:2:0 conversion is the only way */
                intel_dp->dfp.ycbcr_444_to_420 = ycbcr_444_to_420;
@@ -6581,8 +6981,9 @@ intel_dp_update_420(struct intel_dp *intel_dp)
        }
 
        drm_dbg_kms(&i915->drm,
-                   "[CONNECTOR:%d:%s] YCbCr 4:2:0 allowed? %s, YCbCr 4:4:4->4:2:0 conversion? %s\n",
+                   "[CONNECTOR:%d:%s] RGB->YcbCr conversion? %s, YCbCr 4:2:0 allowed? %s, YCbCr 4:4:4->4:2:0 conversion? %s\n",
                    connector->base.base.id, connector->base.name,
+                   yesno(intel_dp->dfp.rgb_to_ycbcr),
                    yesno(connector->base.ycbcr_420_allowed),
                    yesno(intel_dp->dfp.ycbcr_444_to_420));
 }
@@ -6627,6 +7028,8 @@ intel_dp_unset_edid(struct intel_dp *intel_dp)
        intel_dp->dfp.min_tmds_clock = 0;
        intel_dp->dfp.max_tmds_clock = 0;
 
+       intel_dp->dfp.pcon_max_frl_bw = 0;
+
        intel_dp->dfp.ycbcr_444_to_420 = false;
        connector->base.ycbcr_420_allowed = false;
 }
@@ -6732,7 +7135,7 @@ intel_dp_detect(struct drm_connector *connector,
            to_intel_connector(connector)->detect_edid)
                status = connector_status_connected;
 
-       intel_dp_check_service_irq(intel_dp);
+       intel_dp_check_device_service_irq(intel_dp);
 
 out:
        if (status != connector_status_connected && !intel_dp->is_mst)
@@ -8221,6 +8624,9 @@ intel_dp_init_connector(struct intel_digital_port *dig_port,
                               (temp & ~0xf) | 0xd);
        }
 
+       intel_dp->frl.is_trained = false;
+       intel_dp->frl.trained_rate_gbps = 0;
+
        return true;
 
 fail: