Skip to content

Commit 27655b9

Browse files
author
Thomas Zimmermann
committed
drm/client: Send hotplug event after registering a client
Generate a hotplug event after registering a client to allow the client to configure its display. Remove the hotplug calls from the existing clients for fbdev emulation. This change fixes a concurrency bug between registering a client and receiving events from the DRM core. The bug is present in the fbdev emulation of all drivers. The fbdev emulation currently generates a hotplug event before registering the client to the device. For each new output, the DRM core sends an additional hotplug event to each registered client. If the DRM core detects first output between sending the artificial hotplug and registering the device, the output's hotplug event gets lost. If this is the first output, the fbdev console display remains dark. This has been observed with amdgpu and fbdev-generic. Fix this by adding hotplug generation directly to the client's register helper drm_client_register(). Registering the client and receiving events are serialized by struct drm_device.clientlist_mutex. So an output is either configured by the initial hotplug event, or the client has already been registered. The bug was originally added in commit 6e3f17e ("drm/fb-helper: generic: Call drm_client_add() after setup is done"), in which adding a client and receiving a hotplug event switched order. It was hidden, as most hardware and drivers have at least on static output configured. Other drivers didn't use the internal DRM client or still had struct drm_mode_config_funcs.output_poll_changed set. That callback handled hotplug events as well. After not setting the callback in amdgpu in commit 0e3172b ("drm/amdgpu: Don't set struct drm_driver.output_poll_changed"), amdgpu did not show a framebuffer console if output events got lost. The bug got copy-pasted from fbdev-generic into the other fbdev emulation. Reported-by: Moritz Duge <MoritzDuge@kolahilft.de> Closes: https://gitlab.freedesktop.org/drm/amd/-/issues/2649 Fixes: 6e3f17e ("drm/fb-helper: generic: Call drm_client_add() after setup is done") Fixes: 8ab59da ("drm/fb-helper: Move generic fbdev emulation into separate source file") Fixes: b79fe9a ("drm/fbdev-dma: Implement fbdev emulation for GEM DMA helpers") Fixes: 63c3815 ("drm/armada: Implement fbdev emulation as in-kernel client") Fixes: 49953b7 ("drm/exynos: Implement fbdev emulation as in-kernel client") Fixes: 8f1aacc ("drm/gma500: Implement client-based fbdev emulation") Fixes: 940b869 ("drm/msm: Implement fbdev emulation as in-kernel client") Fixes: 9e69bcd ("drm/omapdrm: Implement fbdev emulation as in-kernel client") Fixes: e317a69 ("drm/radeon: Implement client-based fbdev emulation") Fixes: 71ec16f ("drm/tegra: Implement fbdev emulation as in-kernel client") Fixes: 0e3172b ("drm/amdgpu: Don't set struct drm_driver.output_poll_changed") Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de> Tested-by: Moritz Duge <MoritzDuge@kolahilft.de> Tested-by: Torsten Krah <krah.tm@gmail.com> Tested-by: Paul Schyska <pschyska@gmail.com> Cc: Daniel Vetter <daniel.vetter@ffwll.ch> Cc: David Airlie <airlied@gmail.com> Cc: Noralf Trønnes <noralf@tronnes.org> Cc: Maarten Lankhorst <maarten.lankhorst@linux.intel.com> Cc: Maxime Ripard <mripard@kernel.org> Cc: Javier Martinez Canillas <javierm@redhat.com> Cc: Russell King <linux@armlinux.org.uk> Cc: Inki Dae <inki.dae@samsung.com> Cc: Seung-Woo Kim <sw0312.kim@samsung.com> Cc: Kyungmin Park <kyungmin.park@samsung.com> Cc: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org> Cc: Patrik Jakobsson <patrik.r.jakobsson@gmail.com> Cc: Rob Clark <robdclark@gmail.com> Cc: Abhinav Kumar <quic_abhinavk@quicinc.com> Cc: Dmitry Baryshkov <dmitry.baryshkov@linaro.org> Cc: Tomi Valkeinen <tomi.valkeinen@ideasonboard.com> Cc: Alex Deucher <alexander.deucher@amd.com> Cc: "Christian König" <christian.koenig@amd.com> Cc: "Pan, Xinhui" <Xinhui.Pan@amd.com> Cc: Thierry Reding <thierry.reding@gmail.com> Cc: Mikko Perttunen <mperttunen@nvidia.com> Cc: dri-devel@lists.freedesktop.org Cc: linux-kernel@vger.kernel.org Cc: linux-arm-kernel@lists.infradead.org Cc: linux-samsung-soc@vger.kernel.org Cc: linux-arm-msm@vger.kernel.org Cc: freedreno@lists.freedesktop.org Cc: amd-gfx@lists.freedesktop.org Cc: linux-tegra@vger.kernel.org Cc: dri-devel@lists.freedesktop.org Cc: <stable@vger.kernel.org> # v5.2+ Reviewed-by: Javier Martinez Canillas <javierm@redhat.com> Reviewed-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org> # msm Link: https://patchwork.freedesktop.org/patch/msgid/20230710091029.27503-1-tzimmermann@suse.de
1 parent 2f98e68 commit 27655b9

File tree

10 files changed

+21
-36
lines changed

10 files changed

+21
-36
lines changed

drivers/gpu/drm/armada/armada_fbdev.c

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -209,10 +209,6 @@ void armada_fbdev_setup(struct drm_device *dev)
209209
goto err_drm_client_init;
210210
}
211211

212-
ret = armada_fbdev_client_hotplug(&fbh->client);
213-
if (ret)
214-
drm_dbg_kms(dev, "client hotplug ret=%d\n", ret);
215-
216212
drm_client_register(&fbh->client);
217213

218214
return;

drivers/gpu/drm/drm_client.c

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -122,13 +122,34 @@ EXPORT_SYMBOL(drm_client_init);
122122
* drm_client_register() it is no longer permissible to call drm_client_release()
123123
* directly (outside the unregister callback), instead cleanup will happen
124124
* automatically on driver unload.
125+
*
126+
* Registering a client generates a hotplug event that allows the client
127+
* to set up its display from pre-existing outputs. The client must have
128+
* initialized its state to able to handle the hotplug event successfully.
125129
*/
126130
void drm_client_register(struct drm_client_dev *client)
127131
{
128132
struct drm_device *dev = client->dev;
133+
int ret;
129134

130135
mutex_lock(&dev->clientlist_mutex);
131136
list_add(&client->list, &dev->clientlist);
137+
138+
if (client->funcs && client->funcs->hotplug) {
139+
/*
140+
* Perform an initial hotplug event to pick up the
141+
* display configuration for the client. This step
142+
* has to be performed *after* registering the client
143+
* in the list of clients, or a concurrent hotplug
144+
* event might be lost; leaving the display off.
145+
*
146+
* Hold the clientlist_mutex as for a regular hotplug
147+
* event.
148+
*/
149+
ret = client->funcs->hotplug(client);
150+
if (ret)
151+
drm_dbg_kms(dev, "client hotplug ret=%d\n", ret);
152+
}
132153
mutex_unlock(&dev->clientlist_mutex);
133154
}
134155
EXPORT_SYMBOL(drm_client_register);

drivers/gpu/drm/drm_fbdev_dma.c

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -252,10 +252,6 @@ void drm_fbdev_dma_setup(struct drm_device *dev, unsigned int preferred_bpp)
252252
goto err_drm_client_init;
253253
}
254254

255-
ret = drm_fbdev_dma_client_hotplug(&fb_helper->client);
256-
if (ret)
257-
drm_dbg_kms(dev, "client hotplug ret=%d\n", ret);
258-
259255
drm_client_register(&fb_helper->client);
260256

261257
return;

drivers/gpu/drm/drm_fbdev_generic.c

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -339,10 +339,6 @@ void drm_fbdev_generic_setup(struct drm_device *dev, unsigned int preferred_bpp)
339339
goto err_drm_client_init;
340340
}
341341

342-
ret = drm_fbdev_generic_client_hotplug(&fb_helper->client);
343-
if (ret)
344-
drm_dbg_kms(dev, "client hotplug ret=%d\n", ret);
345-
346342
drm_client_register(&fb_helper->client);
347343

348344
return;

drivers/gpu/drm/exynos/exynos_drm_fbdev.c

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -215,10 +215,6 @@ void exynos_drm_fbdev_setup(struct drm_device *dev)
215215
if (ret)
216216
goto err_drm_client_init;
217217

218-
ret = exynos_drm_fbdev_client_hotplug(&fb_helper->client);
219-
if (ret)
220-
drm_dbg_kms(dev, "client hotplug ret=%d\n", ret);
221-
222218
drm_client_register(&fb_helper->client);
223219

224220
return;

drivers/gpu/drm/gma500/fbdev.c

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -328,10 +328,6 @@ void psb_fbdev_setup(struct drm_psb_private *dev_priv)
328328
goto err_drm_fb_helper_unprepare;
329329
}
330330

331-
ret = psb_fbdev_client_hotplug(&fb_helper->client);
332-
if (ret)
333-
drm_dbg_kms(dev, "client hotplug ret=%d\n", ret);
334-
335331
drm_client_register(&fb_helper->client);
336332

337333
return;

drivers/gpu/drm/msm/msm_fbdev.c

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -246,10 +246,6 @@ void msm_fbdev_setup(struct drm_device *dev)
246246
goto err_drm_fb_helper_unprepare;
247247
}
248248

249-
ret = msm_fbdev_client_hotplug(&helper->client);
250-
if (ret)
251-
drm_dbg_kms(dev, "client hotplug ret=%d\n", ret);
252-
253249
drm_client_register(&helper->client);
254250

255251
return;

drivers/gpu/drm/omapdrm/omap_fbdev.c

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -318,10 +318,6 @@ void omap_fbdev_setup(struct drm_device *dev)
318318

319319
INIT_WORK(&fbdev->work, pan_worker);
320320

321-
ret = omap_fbdev_client_hotplug(&helper->client);
322-
if (ret)
323-
drm_dbg_kms(dev, "client hotplug ret=%d\n", ret);
324-
325321
drm_client_register(&helper->client);
326322

327323
return;

drivers/gpu/drm/radeon/radeon_fbdev.c

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -383,10 +383,6 @@ void radeon_fbdev_setup(struct radeon_device *rdev)
383383
goto err_drm_client_init;
384384
}
385385

386-
ret = radeon_fbdev_client_hotplug(&fb_helper->client);
387-
if (ret)
388-
drm_dbg_kms(rdev->ddev, "client hotplug ret=%d\n", ret);
389-
390386
drm_client_register(&fb_helper->client);
391387

392388
return;

drivers/gpu/drm/tegra/fbdev.c

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -225,10 +225,6 @@ void tegra_fbdev_setup(struct drm_device *dev)
225225
if (ret)
226226
goto err_drm_client_init;
227227

228-
ret = tegra_fbdev_client_hotplug(&helper->client);
229-
if (ret)
230-
drm_dbg_kms(dev, "client hotplug ret=%d\n", ret);
231-
232228
drm_client_register(&helper->client);
233229

234230
return;

0 commit comments

Comments
 (0)