drm/vc4: hdmi: Only call into DRM framework if registered
authorMaxime Ripard <maxime@cerno.tech>
Wed, 7 Jul 2021 09:51:12 +0000 (11:51 +0200)
committerMaxime Ripard <maxime@cerno.tech>
Thu, 15 Jul 2021 08:50:09 +0000 (10:50 +0200)
Our hotplug handler will currently call the drm_kms_helper_hotplug_event
every time a hotplug interrupt is called.

However, since the device is registered after all the drivers have
finished their bind callback, we have a window between when we install
our interrupt handler and when drm_dev_register() is eventually called
where our handler can run and call drm_kms_helper_hotplug_event but the
device hasn't been registered yet, causing a null pointer dereference.

Fix this by making sure we only call drm_kms_helper_hotplug_event if our
device has been properly registered.

Fixes: f4790083c7c2 ("drm/vc4: hdmi: Rely on interrupts to handle hotplug")
Signed-off-by: Maxime Ripard <maxime@cerno.tech>
Reviewed-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20210707095112.1469670-4-maxime@cerno.tech
drivers/gpu/drm/vc4/vc4_hdmi.c

index 7f384b7dee6eb095e389e443a69f95bf9feaf436..e4fcc107e450bfb4b6afec7dcfb308d95d079032 100644 (file)
@@ -1580,7 +1580,7 @@ static irqreturn_t vc4_hdmi_hpd_irq_thread(int irq, void *priv)
        struct vc4_hdmi *vc4_hdmi = priv;
        struct drm_device *dev = vc4_hdmi->connector.dev;
 
-       if (dev)
+       if (dev && dev->registered)
                drm_kms_helper_hotplug_event(dev);
 
        return IRQ_HANDLED;