summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/bridge/dw-hdmi.c
diff options
context:
space:
mode:
authorLaurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>2017-01-17 09:28:56 +0100
committerArchit Taneja <architt@codeaurora.org>2017-01-18 04:59:31 +0100
commitba5d7e6160b7aed4df92d1764aa90790db0e7996 (patch)
tree64b2099bc56077c901e4249af9ecfc983e5fc6ab /drivers/gpu/drm/bridge/dw-hdmi.c
parentdrm: bridge: dw-hdmi: Remove encoder field from struct dw_hdmi (diff)
downloadlinux-ba5d7e6160b7aed4df92d1764aa90790db0e7996.tar.xz
linux-ba5d7e6160b7aed4df92d1764aa90790db0e7996.zip
drm: bridge: dw-hdmi: Don't forward HPD events to DRM core before attach
Hotplug events should only be forwarded to the DRM core by the interrupt handler when the bridge has been attached, otherwise the DRM device pointer will be NULL, resulting in a crash. Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com> Reviewed-by: Jose Abreu <joabreu@synopsys.com> Signed-off-by: Archit Taneja <architt@codeaurora.org> Link: http://patchwork.freedesktop.org/patch/msgid/20170117082910.27023-7-laurent.pinchart+renesas@ideasonboard.com
Diffstat (limited to 'drivers/gpu/drm/bridge/dw-hdmi.c')
-rw-r--r--drivers/gpu/drm/bridge/dw-hdmi.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/gpu/drm/bridge/dw-hdmi.c b/drivers/gpu/drm/bridge/dw-hdmi.c
index ef10bb866b2f..488dc1a9204f 100644
--- a/drivers/gpu/drm/bridge/dw-hdmi.c
+++ b/drivers/gpu/drm/bridge/dw-hdmi.c
@@ -1805,7 +1805,8 @@ static irqreturn_t dw_hdmi_irq(int irq, void *dev_id)
if (intr_stat & HDMI_IH_PHY_STAT0_HPD) {
dev_dbg(hdmi->dev, "EVENT=%s\n",
phy_int_pol & HDMI_PHY_HPD ? "plugin" : "plugout");
- drm_helper_hpd_irq_event(hdmi->bridge.dev);
+ if (hdmi->bridge.dev)
+ drm_helper_hpd_irq_event(hdmi->bridge.dev);
}
hdmi_writeb(hdmi, intr_stat, HDMI_IH_PHY_STAT0);