aboutsummaryrefslogtreecommitdiff
path: root/drivers/gpu/drm
diff options
context:
space:
mode:
authorArchit Taneja <architt@codeaurora.org>2015-09-07 13:34:15 +0530
committerSrinivas Kandagatla <srinivas.kandagatla@linaro.org>2015-11-17 09:23:14 +0000
commitc55aa4ff029e422dceea11d3285797de6885d007 (patch)
tree9be9cad9edb42df2d67ec1d31f2730f0184c9fc4 /drivers/gpu/drm
parent8af03849481a6fa9bf5911c25a2789765da49121 (diff)
drm/msm/dsi: Don't call hpd helper unconditionally
Currently, msm dsi_host's attach/detach ops call drm_helper_hpd_irq_event unconditionally. Calling it makes sense if we have a drm_panel connected (in this case, we created the connector), but not when we have a bridge chip connected. For bridges, the driver (or someone else in the encoder chain) should call the hpd handler. Call it in the attach/detach ops only if we're connected to a panel. Signed-off-by: Archit Taneja <architt@codeaurora.org>
Diffstat (limited to 'drivers/gpu/drm')
-rw-r--r--drivers/gpu/drm/msm/dsi/dsi_host.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/msm/dsi/dsi_host.c b/drivers/gpu/drm/msm/dsi/dsi_host.c
index c8935d9ca8dc..15e5a43dd824 100644
--- a/drivers/gpu/drm/msm/dsi/dsi_host.c
+++ b/drivers/gpu/drm/msm/dsi/dsi_host.c
@@ -1296,7 +1296,7 @@ static int dsi_host_attach(struct mipi_dsi_host *host,
return ret;
DBG("id=%d", msm_host->id);
- if (msm_host->dev)
+ if (msm_host->dev && of_drm_find_panel(msm_host->device_node))
drm_helper_hpd_irq_event(msm_host->dev);
return 0;
@@ -1310,7 +1310,7 @@ static int dsi_host_detach(struct mipi_dsi_host *host,
msm_host->device_node = NULL;
DBG("id=%d", msm_host->id);
- if (msm_host->dev)
+ if (msm_host->dev && of_drm_find_panel(msm_host->device_node))
drm_helper_hpd_irq_event(msm_host->dev);
return 0;