diff options
| author |   Samuel Holland <samuel@sholland.org> | 2020-02-17 00:09:06 -0600 |
|---|---|---|
| committer |   Maxime Ripard <maxime@cerno.tech> | 2020-02-19 16:56:57 +0100 |
| commit | 80579bf36c11a01c618d43ec6eb8056ef974c9cb (patch) | |
| tree | 4b6c8229d0153acc3955d27553f6803b81d37fe9 /drivers/gpu/drm/sun4i/sun6i_mipi_dsi.c | |
| parent | drm/bridge: Fix the bridge kernel doc (diff) | |
| download | linux-dev-80579bf36c11a01c618d43ec6eb8056ef974c9cb.tar.xz linux-dev-80579bf36c11a01c618d43ec6eb8056ef974c9cb.zip | |
drm/sun4i: dsi: Avoid hotplug race with DRM driver bind
We need to make sure that the DRM driver is fully registered before
allowing the panel to be attached. Otherwise, we may trigger a hotplug
event before sun4i_framebuffer_init() sets up drm->mode_config.funcs,
causing a NULL pointer dereference.
Fixes: 1a2703bd7356 ("drm/sun4i: dsi: Allow binding the host without a panel")
Signed-off-by: Samuel Holland <samuel@sholland.org>
Signed-off-by: Maxime Ripard <maxime@cerno.tech>
Link: https://patchwork.freedesktop.org/patch/msgid/20200217060906.15152-1-samuel@sholland.org
Diffstat (limited to 'drivers/gpu/drm/sun4i/sun6i_mipi_dsi.c')
| -rw-r--r-- | drivers/gpu/drm/sun4i/sun6i_mipi_dsi.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/sun4i/sun6i_mipi_dsi.c b/drivers/gpu/drm/sun4i/sun6i_mipi_dsi.c index b7174d515188..059939789730 100644 --- a/drivers/gpu/drm/sun4i/sun6i_mipi_dsi.c +++ b/drivers/gpu/drm/sun4i/sun6i_mipi_dsi.c @@ -970,7 +970,7 @@ static int sun6i_dsi_attach(struct mipi_dsi_host *host, if (IS_ERR(panel)) return PTR_ERR(panel); - if (!dsi->drm) + if (!dsi->drm || !dsi->drm->registered) return -EPROBE_DEFER; dsi->panel = panel; |