drm/msm/dp: support setting the DP subconnector type

Read the downstream port info and set the subconnector type accordingly.

Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
Reviewed-by: Stephen Boyd <swboyd@chromium.org>
Patchwork: https://patchwork.freedesktop.org/patch/555531/
Link: https://lore.kernel.org/r/20230903222432.2894093-1-dmitry.baryshkov@linaro.org

diff --git a/drivers/gpu/drm/msm/dp/dp_display.c b/drivers/gpu/drm/msm/dp/dp_display.c
index 2a5f1ab9a65b08aa7ffcc4f00e9954ab2c622ab6..397bc19f408dcdd31989ee90940ee4f7285810a3 100644 (file)
--- a/drivers/gpu/drm/msm/dp/dp_display.c
+++ b/drivers/gpu/drm/msm/dp/dp_display.c
@@ -364,8 +364,12 @@ static int dp_display_send_hpd_notification(struct dp_display_private *dp,
        }
 
        /* reset video pattern flag on disconnect */
-       if (!hpd)
+       if (!hpd) {
                dp->panel->video_test = false;
+               drm_dp_set_subconnector_property(dp->dp_display.connector,
+                                                connector_status_disconnected,
+                                                dp->panel->dpcd, dp->panel->downstream_ports);
+       }
 
        dp->dp_display.is_connected = hpd;
 
@@ -393,6 +397,9 @@ static int dp_display_process_hpd_high(struct dp_display_private *dp)
 
        dp_link_process_request(dp->link);
 
+       drm_dp_set_subconnector_property(dp->dp_display.connector, connector_status_connected,
+                                        dp->panel->dpcd, dp->panel->downstream_ports);
+
        edid = dp->panel->edid;
 
        dp->dp_display.psr_supported = dp->panel->psr_cap.version && psr_enabled;

diff --git a/drivers/gpu/drm/msm/dp/dp_panel.c b/drivers/gpu/drm/msm/dp/dp_panel.c
index 0871ef42933e3ab229ca1c66b389618f99c0c08e..127f6af995cd106ca5d581744cc8517d032c627e 100644 (file)
--- a/drivers/gpu/drm/msm/dp/dp_panel.c
+++ b/drivers/gpu/drm/msm/dp/dp_panel.c
@@ -161,6 +161,11 @@ int dp_panel_read_sink_caps(struct dp_panel *dp_panel,
                }
        }
 
+       rc = drm_dp_read_downstream_info(panel->aux, dp_panel->dpcd,
+                                        dp_panel->downstream_ports);
+       if (rc)
+               return rc;
+
        kfree(dp_panel->edid);
        dp_panel->edid = NULL;
 

diff --git a/drivers/gpu/drm/msm/dp/dp_panel.h b/drivers/gpu/drm/msm/dp/dp_panel.h
index 3cb1f8dcfd3b05f18037f76083085757631654d7..a0dfc579c5f9f4475c0553c16cacef760a4f5571 100644 (file)
--- a/drivers/gpu/drm/msm/dp/dp_panel.h
+++ b/drivers/gpu/drm/msm/dp/dp_panel.h
@@ -36,6 +36,7 @@ struct dp_panel_psr {
 struct dp_panel {
        /* dpcd raw data */
        u8 dpcd[DP_RECEIVER_CAP_SIZE];
+       u8 downstream_ports[DP_MAX_DOWNSTREAM_PORTS];
 
        struct dp_link_info link_info;
        struct drm_dp_desc desc;