Merge "disp: msm: dp: disable aux switch at the start of the disconnect path" into display-kernel.lnx.1.0
This commit is contained in:

committed by
Gerrit - the friendly Code Review server

commit
78456d91bb
@@ -1646,6 +1646,10 @@ static void dp_display_disconnect_sync(struct dp_display_private *dp)
|
|||||||
cancel_work_sync(&dp->attention_work);
|
cancel_work_sync(&dp->attention_work);
|
||||||
flush_workqueue(dp->wq);
|
flush_workqueue(dp->wq);
|
||||||
|
|
||||||
|
if (!dp->debug->sim_mode && !dp->no_aux_switch
|
||||||
|
&& !dp->parser->gpio_aux_switch)
|
||||||
|
dp->aux->aux_switch(dp->aux, false, ORIENTATION_NONE);
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Delay the teardown of the mainlink for better interop experience.
|
* Delay the teardown of the mainlink for better interop experience.
|
||||||
* It is possible that certain sinks can issue an HPD high immediately
|
* It is possible that certain sinks can issue an HPD high immediately
|
||||||
@@ -1703,10 +1707,6 @@ static int dp_display_usbpd_disconnect_cb(struct device *dev)
|
|||||||
dp_display_state_remove(DP_STATE_CONFIGURED);
|
dp_display_state_remove(DP_STATE_CONFIGURED);
|
||||||
mutex_unlock(&dp->session_lock);
|
mutex_unlock(&dp->session_lock);
|
||||||
|
|
||||||
if (!dp->debug->sim_mode && !dp->no_aux_switch
|
|
||||||
&& !dp->parser->gpio_aux_switch)
|
|
||||||
dp->aux->aux_switch(dp->aux, false, ORIENTATION_NONE);
|
|
||||||
|
|
||||||
SDE_EVT32_EXTERNAL(SDE_EVTLOG_FUNC_EXIT, dp->state);
|
SDE_EVT32_EXTERNAL(SDE_EVTLOG_FUNC_EXIT, dp->state);
|
||||||
end:
|
end:
|
||||||
return rc;
|
return rc;
|
||||||
|
Reference in New Issue
Block a user