Merge "disp: msm: dp: pass correct vdo value to the simulate_attention cb" into display-kernel.lnx.5.10

This commit is contained in:
Linux Build Service Account
2021-04-02 08:08:03 -07:00
committed by Gerrit - the friendly Code Review server
2 changed files with 11 additions and 4 deletions

View File

@@ -54,12 +54,19 @@ struct dp_debug_private {
static int dp_debug_sim_hpd_cb(void *arg, bool hpd, bool hpd_irq) static int dp_debug_sim_hpd_cb(void *arg, bool hpd, bool hpd_irq)
{ {
struct dp_debug_private *debug = arg; struct dp_debug_private *debug = arg;
int vdo = 0;
if (hpd_irq) if (hpd_irq) {
return debug->hpd->simulate_attention(debug->hpd, 0); vdo |= BIT(7);
else
if (hpd)
vdo |= BIT(8);
return debug->hpd->simulate_attention(debug->hpd, vdo);
} else {
return debug->hpd->simulate_connect(debug->hpd, hpd); return debug->hpd->simulate_connect(debug->hpd, hpd);
} }
}
static int dp_debug_attach_sim_bridge(struct dp_debug_private *debug) static int dp_debug_attach_sim_bridge(struct dp_debug_private *debug)
{ {

View File

@@ -341,7 +341,7 @@ static void dp_sim_host_hpd_irq(void *host_dev)
struct dp_sim_device *sim_dev = host_dev; struct dp_sim_device *sim_dev = host_dev;
if (sim_dev->hpd_cb) if (sim_dev->hpd_cb)
sim_dev->hpd_cb(sim_dev->host_dev, false, true); sim_dev->hpd_cb(sim_dev->host_dev, true, true);
} }
int dp_sim_set_sim_mode(struct dp_aux_bridge *bridge, u32 sim_mode) int dp_sim_set_sim_mode(struct dp_aux_bridge *bridge, u32 sim_mode)