Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a638a94f authored by qctecmdr Service's avatar qctecmdr Service Committed by Gerrit - the friendly Code Review server
Browse files

Merge "drm/msm/dp: clear panel data on notification failure"

parents e6da8838 3da63cde

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

+32 −26
Original line number Diff line number Diff line
@@ -768,6 +768,31 @@ static int dp_display_usbpd_configure_cb(struct device *dev) 
	return rc;

}



static int dp_display_stream_pre_disable(struct dp_display_private *dp,

			struct dp_panel *dp_panel)

{

	dp->ctrl->stream_pre_off(dp->ctrl, dp_panel);



	return 0;

}



static void dp_display_stream_disable(struct dp_display_private *dp,

			struct dp_panel *dp_panel)

{

	if (!dp->active_stream_cnt) {

		pr_err("invalid active_stream_cnt (%d)\n",

				dp->active_stream_cnt);

		return;

	}



	pr_debug("stream_id=%d, active_stream_cnt=%d\n",

			dp_panel->stream_id, dp->active_stream_cnt);



	dp->ctrl->stream_off(dp->ctrl, dp_panel);

	dp->active_panels[dp_panel->stream_id] = NULL;

	dp->active_stream_cnt--;

}



static void dp_display_clean(struct dp_display_private *dp)

{

	int idx;
@@ -787,11 +812,16 @@ static void dp_display_clean(struct dp_display_private *dp) 


		dp_panel = dp->active_panels[idx];



		dp->ctrl->stream_pre_off(dp->ctrl, dp_panel);

		dp->ctrl->stream_off(dp->ctrl, dp_panel);

		dp_display_stream_pre_disable(dp, dp_panel);

		dp_display_stream_disable(dp, dp_panel);

		dp_panel->deinit(dp_panel);

	}



	dp->power_on = false;



	mutex_lock(&dp->session_lock);

	dp->ctrl->off(dp->ctrl);

	mutex_unlock(&dp->session_lock);

}



static int dp_display_handle_disconnect(struct dp_display_private *dp)
@@ -864,22 +894,6 @@ static int dp_display_usbpd_disconnect_cb(struct device *dev) 
	return rc;

}



static void dp_display_stream_disable(struct dp_display_private *dp,

			struct dp_panel *dp_panel)

{

	if (!dp->active_stream_cnt) {

		pr_err("invalid active_stream_cnt (%d)\n");

		return;

	}



	pr_debug("stream_id=%d, active_stream_cnt=%d\n",

			dp_panel->stream_id, dp->active_stream_cnt);



	dp->ctrl->stream_off(dp->ctrl, dp_panel);

	dp->active_panels[dp_panel->stream_id] = NULL;

	dp->active_stream_cnt--;

}



static int dp_display_stream_enable(struct dp_display_private *dp,

			struct dp_panel *dp_panel)

{
@@ -1467,14 +1481,6 @@ static int dp_display_post_enable(struct dp_display *dp_display, void *panel) 
	return 0;

}



static int dp_display_stream_pre_disable(struct dp_display_private *dp,

			struct dp_panel *dp_panel)

{

	dp->ctrl->stream_pre_off(dp->ctrl, dp_panel);



	return 0;

}



static int dp_display_pre_disable(struct dp_display *dp_display, void *panel)

{

	struct dp_display_private *dp;