Commit ebfa85c5 authored by Abel Vesa's avatar Abel Vesa Committed by Abhinav Kumar
Browse files

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: bfcc3d8f ("drm/msm/dp: support setting the DP subconnector type")
Signed-off-by: default avatarAbel Vesa <abel.vesa@linaro.org>
Signed-off-by: default avatarDmitry Baryshkov <dmitry.baryshkov@linaro.org>
Reviewed-by: default avatarAbhinav Kumar <quic_abhinavk@quicinc.com>
Tested-by: Jessica Zhang <quic_jesszhan@quicinc.com> # SC7280
Reviewed-by: default avatarJohan Hovold <johan+linaro@kernel.org>
Tested-by: default avatarJohan 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: default avatarAbhinav Kumar <quic_abhinavk@quicinc.com>
parent a33b2431

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

+10 −5
Original line number Diff line number Diff line
@@ -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;

		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->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;