Skip to content

Commit ebfa85c

Browse files
abelvesaAbhinav Kumar
authored andcommitted
drm/msm/dp: don't touch DP subconnector property in eDP case
In case of the eDP connection there is no subconnetor and as such no subconnector property. Put drm_dp_set_subconnector_property() calls under the !is_edp condition. Fixes: bfcc3d8 ("drm/msm/dp: support setting the DP subconnector type") Signed-off-by: Abel Vesa <[email protected]> Signed-off-by: Dmitry Baryshkov <[email protected]> Reviewed-by: Abhinav Kumar <[email protected]> Tested-by: Jessica Zhang <[email protected]> # SC7280 Reviewed-by: Johan Hovold <[email protected]> Tested-by: Johan Hovold <[email protected]> Patchwork: https://patchwork.freedesktop.org/patch/564284/ Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Abhinav Kumar <[email protected]>
1 parent a33b243 commit ebfa85c

File tree

1 file changed

+10
-5
lines changed

1 file changed

+10
-5
lines changed

drivers/gpu/drm/msm/dp/dp_display.c

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -365,9 +365,11 @@ static int dp_display_send_hpd_notification(struct dp_display_private *dp,
365365
/* reset video pattern flag on disconnect */
366366
if (!hpd) {
367367
dp->panel->video_test = false;
368-
drm_dp_set_subconnector_property(dp->dp_display.connector,
369-
connector_status_disconnected,
370-
dp->panel->dpcd, dp->panel->downstream_ports);
368+
if (!dp->dp_display.is_edp)
369+
drm_dp_set_subconnector_property(dp->dp_display.connector,
370+
connector_status_disconnected,
371+
dp->panel->dpcd,
372+
dp->panel->downstream_ports);
371373
}
372374

373375
dp->dp_display.is_connected = hpd;
@@ -396,8 +398,11 @@ static int dp_display_process_hpd_high(struct dp_display_private *dp)
396398

397399
dp_link_process_request(dp->link);
398400

399-
drm_dp_set_subconnector_property(dp->dp_display.connector, connector_status_connected,
400-
dp->panel->dpcd, dp->panel->downstream_ports);
401+
if (!dp->dp_display.is_edp)
402+
drm_dp_set_subconnector_property(dp->dp_display.connector,
403+
connector_status_connected,
404+
dp->panel->dpcd,
405+
dp->panel->downstream_ports);
401406

402407
edid = dp->panel->edid;
403408

0 commit comments

Comments
 (0)