drm/radeon/kms: move panel mode setup into encoder mode set

Needs to happen earlier in the mode set.

Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Cc: stable@vger.kernel.org
Signed-off-by: Dave Airlie <airlied@redhat.com>

3 files changed, 24 insertions, 12 deletions

diff --git a/drivers/gpu/drm/radeon/atombios_dp.c b/drivers/gpu/drm/radeon/atombios_dp.c
index 6fb335a4fdda..a71557ce01dc 100644
--- a/drivers/gpu/drm/radeon/atombios_dp.c
+++ b/drivers/gpu/drm/radeon/atombios_dp.c
@@ -549,8 +549,8 @@ bool radeon_dp_getdpcd(struct radeon_connector *radeon_connector)
         return false;
 }
 
-static void radeon_dp_set_panel_mode(struct drm_encoder *encoder,
-                                     struct drm_connector *connector)
+int radeon_dp_get_panel_mode(struct drm_encoder *encoder,
+                             struct drm_connector *connector)
 {
         struct drm_device *dev = encoder->dev;
         struct radeon_device *rdev = dev->dev_private;
@@ -558,7 +558,7 @@ static void radeon_dp_set_panel_mode(struct drm_encoder *encoder,
         int panel_mode = DP_PANEL_MODE_EXTERNAL_DP_MODE;
 
         if (!ASIC_IS_DCE4(rdev))
-                return;
+                return panel_mode;
 
         if (radeon_connector_encoder_get_dp_bridge_encoder_id(connector) ==
             ENCODER_OBJECT_ID_NUTMEG)
@@ -572,14 +572,7 @@ static void radeon_dp_set_panel_mode(struct drm_encoder *encoder,
                         panel_mode = DP_PANEL_MODE_INTERNAL_DP2_MODE;
         }
 
-        atombios_dig_encoder_setup(encoder,
-                                   ATOM_ENCODER_CMD_SETUP_PANEL_MODE,
-                                   panel_mode);
-
-        if ((connector->connector_type == DRM_MODE_CONNECTOR_eDP) &&
-            (panel_mode == DP_PANEL_MODE_INTERNAL_DP2_MODE)) {
-                radeon_write_dpcd_reg(radeon_connector, DP_EDP_CONFIGURATION_SET, 1);
-        }
+        return panel_mode;
 }
 
 void radeon_dp_set_link_config(struct drm_connector *connector,
@@ -717,6 +710,8 @@ static void radeon_dp_set_tp(struct radeon_dp_link_train_info *dp_info, int tp)
 
 static int radeon_dp_link_train_init(struct radeon_dp_link_train_info *dp_info)
 {
+        struct radeon_encoder *radeon_encoder = to_radeon_encoder(dp_info->encoder);
+        struct radeon_encoder_atom_dig *dig = radeon_encoder->enc_priv;
         u8 tmp;
 
         /* power up the sink */
@@ -732,7 +727,10 @@ static int radeon_dp_link_train_init(struct radeon_dp_link_train_info *dp_info)
                 radeon_write_dpcd_reg(dp_info->radeon_connector,
                                       DP_DOWNSPREAD_CTRL, 0);
 
-        radeon_dp_set_panel_mode(dp_info->encoder, dp_info->connector);
+        if ((dp_info->connector->connector_type == DRM_MODE_CONNECTOR_eDP) &&
+            (dig->panel_mode == DP_PANEL_MODE_INTERNAL_DP2_MODE)) {
+                radeon_write_dpcd_reg(dp_info->radeon_connector, DP_EDP_CONFIGURATION_SET, 1);
+        }
 
         /* set the lane count on the sink */
         tmp = dp_info->dp_lane_count;
diff --git a/drivers/gpu/drm/radeon/atombios_encoders.c b/drivers/gpu/drm/radeon/atombios_encoders.c
index f1f06ca9f1f5..a3a9166f1ecb 100644
--- a/drivers/gpu/drm/radeon/atombios_encoders.c
+++ b/drivers/gpu/drm/radeon/atombios_encoders.c
@@ -1811,10 +1811,21 @@ radeon_atom_encoder_mode_set(struct drm_encoder *encoder,
         case ENCODER_OBJECT_ID_INTERNAL_UNIPHY2:
         case ENCODER_OBJECT_ID_INTERNAL_KLDSCP_LVTMA:
                 if (ASIC_IS_DCE4(rdev)) {
+                        struct drm_connector *connector = radeon_get_connector_for_encoder(encoder);
+                        struct radeon_encoder_atom_dig *dig = radeon_encoder->enc_priv;
+
+                        if (!connector)
+                                dig->panel_mode = DP_PANEL_MODE_EXTERNAL_DP_MODE;
+                        else
+                                dig->panel_mode = radeon_dp_get_panel_mode(encoder, connector);
+
                         /* disable the transmitter */
                         atombios_dig_transmitter_setup(encoder, ATOM_TRANSMITTER_ACTION_DISABLE, 0, 0);
                         /* setup and enable the encoder */
                         atombios_dig_encoder_setup(encoder, ATOM_ENCODER_CMD_SETUP, 0);
+                        atombios_dig_encoder_setup(encoder,
+                                                   ATOM_ENCODER_CMD_SETUP_PANEL_MODE,
+                                                   dig->panel_mode);
 
                         /* enable the transmitter */
                         atombios_dig_transmitter_setup(encoder, ATOM_TRANSMITTER_ACTION_ENABLE, 0, 0);
diff --git a/drivers/gpu/drm/radeon/radeon_mode.h b/drivers/gpu/drm/radeon/radeon_mode.h
index 8cb19f38f8da..d34dcb6ac384 100644
--- a/drivers/gpu/drm/radeon/radeon_mode.h
+++ b/drivers/gpu/drm/radeon/radeon_mode.h
@@ -362,6 +362,7 @@ struct radeon_encoder_atom_dig {
         struct backlight_device *bl_dev;
         int dpms_mode;
         uint8_t backlight_level;
+        int panel_mode;
 };
 
 struct radeon_encoder_atom_dac {
@@ -482,6 +483,8 @@ extern void radeon_dp_link_train(struct drm_encoder *encoder,
 extern bool radeon_dp_needs_link_train(struct radeon_connector *radeon_connector);
 extern u8 radeon_dp_getsinktype(struct radeon_connector *radeon_connector);
 extern bool radeon_dp_getdpcd(struct radeon_connector *radeon_connector);
+extern int radeon_dp_get_panel_mode(struct drm_encoder *encoder,
+                                    struct drm_connector *connector);
 extern void atombios_dig_encoder_setup(struct drm_encoder *encoder, int action, int panel_mode);
 extern void radeon_atom_encoder_init(struct radeon_device *rdev);
 extern void radeon_atom_dcpll_init(struct radeon_device *rdev);