mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
synced 2026-05-14 08:51:46 -04:00
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: bfcc3d8f94 ("drm/msm/dp: support setting the DP subconnector type")
Signed-off-by: Abel Vesa <abel.vesa@linaro.org>
Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
Reviewed-by: Abhinav Kumar <quic_abhinavk@quicinc.com>
Tested-by: Jessica Zhang <quic_jesszhan@quicinc.com> # SC7280
Reviewed-by: Johan Hovold <johan+linaro@kernel.org>
Tested-by: Johan Hovold <johan+linaro@kernel.org>
Patchwork: https://patchwork.freedesktop.org/patch/564284/
Link: https://lore.kernel.org/r/20231025092711.851168-2-dmitry.baryshkov@linaro.org
Signed-off-by: Abhinav Kumar <quic_abhinavk@quicinc.com>
This commit is contained in:
@@ -365,9 +365,11 @@ static int dp_display_send_hpd_notification(struct dp_display_private *dp,
|
||||
/* reset video pattern flag on disconnect */
|
||||
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);
|
||||
if (!dp->dp_display.is_edp)
|
||||
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;
|
||||
@@ -396,8 +398,11 @@ 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);
|
||||
if (!dp->dp_display.is_edp)
|
||||
drm_dp_set_subconnector_property(dp->dp_display.connector,
|
||||
connector_status_connected,
|
||||
dp->panel->dpcd,
|
||||
dp->panel->downstream_ports);
|
||||
|
||||
edid = dp->panel->edid;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user