diff options
| author | Heiko Stübner <heiko@sntech.de> | 2015-06-02 16:41:45 +0200 |
|---|---|---|
| committer | Mark Yao <mark.yao@rock-chips.com> | 2015-07-13 13:50:52 +0800 |
| commit | 765c35bbd267e93eabe15a94534688ddaa0b9dc7 (patch) | |
| tree | 25e7ac3cfe80ac95a26b9682062e3e8ae0453d54 /drivers/gpu | |
| parent | 85a359f2538882ec2a02f2331ad56a2cae3bb014 (diff) | |
| download | blackbird-op-linux-765c35bbd267e93eabe15a94534688ddaa0b9dc7.tar.gz blackbird-op-linux-765c35bbd267e93eabe15a94534688ddaa0b9dc7.zip | |
drm/rockchip: only call drm_fb_helper_hotplug_event if fb_helper present
Add a check for the presence of fb_helper to rockchip_drm_output_poll_changed()
to only call drm_fb_helper_hotplug_event if there is actually a fb_helper
available. Without this check I see NULL pointer dereferences when the
hdmi hotplug irq fires before the fb_helper got initialized.
Signed-off-by: Heiko Stuebner <heiko@sntech.de>
Diffstat (limited to 'drivers/gpu')
| -rw-r--r-- | drivers/gpu/drm/rockchip/rockchip_drm_fb.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_fb.c b/drivers/gpu/drm/rockchip/rockchip_drm_fb.c index 77d52893d40f..002645bb5bbf 100644 --- a/drivers/gpu/drm/rockchip/rockchip_drm_fb.c +++ b/drivers/gpu/drm/rockchip/rockchip_drm_fb.c @@ -162,7 +162,8 @@ static void rockchip_drm_output_poll_changed(struct drm_device *dev) struct rockchip_drm_private *private = dev->dev_private; struct drm_fb_helper *fb_helper = &private->fbdev_helper; - drm_fb_helper_hotplug_event(fb_helper); + if (fb_helper) + drm_fb_helper_hotplug_event(fb_helper); } static const struct drm_mode_config_funcs rockchip_drm_mode_config_funcs = { |
