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

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

Merge "disp: msm: dp: perform host_init/deinit to reset abort"

parents 1b99045a e7780e75

msm/dp/dp_ctrl.c

+5 −2
Original line number Diff line number Diff line
@@ -1280,11 +1280,14 @@ static int dp_ctrl_on(struct dp_ctrl *dp_ctrl, bool mst_mode, 


	ctrl = container_of(dp_ctrl, struct dp_ctrl_private, dp_ctrl);



	atomic_set(&ctrl->aborted, 0);



	if (ctrl->power_on)

		goto end;



	if (atomic_read(&ctrl->aborted)) {

		rc = -EPERM;

		goto end;

	}



	ctrl->mst_mode = mst_mode;

	if (fec_mode) {

		ctrl->fec_mode = fec_mode;

msm/dp/dp_display.c

+2 −5
Original line number Diff line number Diff line
@@ -859,7 +859,7 @@ static int dp_display_process_hpd_high(struct dp_display_private *dp) 


	dp->dp_display.max_pclk_khz = min(dp->parser->max_pclk_khz,

					dp->debug->max_pclk_khz);



	dp_display_host_init(dp);

	dp_display_host_ready(dp);



	dp->link->psm_config(dp->link, &dp->panel->link_info, false);
@@ -1084,6 +1084,7 @@ static int dp_display_handle_disconnect(struct dp_display_private *dp) 
		dp_display_clean(dp);



	dp_display_host_unready(dp);

	dp_display_host_deinit(dp);



	mutex_unlock(&dp->session_lock);
@@ -1131,10 +1132,6 @@ static int dp_display_usbpd_disconnect_cb(struct device *dev) 


	dp_display_disconnect_sync(dp);



	mutex_lock(&dp->session_lock);

	dp_display_host_deinit(dp);

	mutex_unlock(&dp->session_lock);



	if (!dp->debug->sim_mode && !dp->parser->no_aux_switch

	    && !dp->parser->gpio_aux_switch)

		dp->aux->aux_switch(dp->aux, false, ORIENTATION_NONE);