Skip to content

Commit a585c7e

Browse files
kmaincentdianders
authored andcommitted
drm/tilcdc: Fix removal actions in case of failed probe
The drm_kms_helper_poll_fini() and drm_atomic_helper_shutdown() helpers should only be called when the device has been successfully registered. Currently, these functions are called unconditionally in tilcdc_fini(), which causes warnings during probe deferral scenarios. [ 7.972317] WARNING: CPU: 0 PID: 23 at drivers/gpu/drm/drm_atomic_state_helper.c:175 drm_atomic_helper_crtc_duplicate_state+0x60/0x68 ... [ 8.005820] drm_atomic_helper_crtc_duplicate_state from drm_atomic_get_crtc_state+0x68/0x108 [ 8.005858] drm_atomic_get_crtc_state from drm_atomic_helper_disable_all+0x90/0x1c8 [ 8.005885] drm_atomic_helper_disable_all from drm_atomic_helper_shutdown+0x90/0x144 [ 8.005911] drm_atomic_helper_shutdown from tilcdc_fini+0x68/0xf8 [tilcdc] [ 8.005957] tilcdc_fini [tilcdc] from tilcdc_pdev_probe+0xb0/0x6d4 [tilcdc] Fix this by rewriting the failed probe cleanup path using the standard goto error handling pattern, which ensures that cleanup functions are only called on successfully initialized resources. Additionally, remove the now-unnecessary is_registered flag. Cc: stable@vger.kernel.org Fixes: 3c4baba ("drm: Call drm_atomic_helper_shutdown() at shutdown/remove time for misc drivers") Signed-off-by: Kory Maincent (TI.com) <kory.maincent@bootlin.com> Reviewed-by: Douglas Anderson <dianders@chromium.org> Reviewed-by: Luca Ceresoli <luca.ceresoli@bootlin.com> Signed-off-by: Douglas Anderson <dianders@chromium.org> Link: https://patch.msgid.link/20251125090546.137193-1-kory.maincent@bootlin.com
1 parent 491adc6 commit a585c7e

3 files changed

Lines changed: 37 additions & 20 deletions

File tree

drivers/gpu/drm/tilcdc/tilcdc_crtc.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -586,7 +586,7 @@ static void tilcdc_crtc_recover_work(struct work_struct *work)
586586
drm_modeset_unlock(&crtc->mutex);
587587
}
588588

589-
static void tilcdc_crtc_destroy(struct drm_crtc *crtc)
589+
void tilcdc_crtc_destroy(struct drm_crtc *crtc)
590590
{
591591
struct tilcdc_drm_private *priv = crtc->dev->dev_private;
592592

drivers/gpu/drm/tilcdc/tilcdc_drv.c

Lines changed: 35 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -172,8 +172,7 @@ static void tilcdc_fini(struct drm_device *dev)
172172
if (priv->crtc)
173173
tilcdc_crtc_shutdown(priv->crtc);
174174

175-
if (priv->is_registered)
176-
drm_dev_unregister(dev);
175+
drm_dev_unregister(dev);
177176

178177
drm_kms_helper_poll_fini(dev);
179178
drm_atomic_helper_shutdown(dev);
@@ -220,21 +219,21 @@ static int tilcdc_init(const struct drm_driver *ddrv, struct device *dev)
220219
priv->wq = alloc_ordered_workqueue("tilcdc", 0);
221220
if (!priv->wq) {
222221
ret = -ENOMEM;
223-
goto init_failed;
222+
goto put_drm;
224223
}
225224

226225
priv->mmio = devm_platform_ioremap_resource(pdev, 0);
227226
if (IS_ERR(priv->mmio)) {
228227
dev_err(dev, "failed to request / ioremap\n");
229228
ret = PTR_ERR(priv->mmio);
230-
goto init_failed;
229+
goto free_wq;
231230
}
232231

233232
priv->clk = clk_get(dev, "fck");
234233
if (IS_ERR(priv->clk)) {
235234
dev_err(dev, "failed to get functional clock\n");
236235
ret = -ENODEV;
237-
goto init_failed;
236+
goto free_wq;
238237
}
239238

240239
pm_runtime_enable(dev);
@@ -313,7 +312,7 @@ static int tilcdc_init(const struct drm_driver *ddrv, struct device *dev)
313312
ret = tilcdc_crtc_create(ddev);
314313
if (ret < 0) {
315314
dev_err(dev, "failed to create crtc\n");
316-
goto init_failed;
315+
goto disable_pm;
317316
}
318317
modeset_init(ddev);
319318

@@ -324,46 +323,46 @@ static int tilcdc_init(const struct drm_driver *ddrv, struct device *dev)
324323
if (ret) {
325324
dev_err(dev, "failed to register cpufreq notifier\n");
326325
priv->freq_transition.notifier_call = NULL;
327-
goto init_failed;
326+
goto destroy_crtc;
328327
}
329328
#endif
330329

331330
if (priv->is_componentized) {
332331
ret = component_bind_all(dev, ddev);
333332
if (ret < 0)
334-
goto init_failed;
333+
goto unregister_cpufreq_notif;
335334

336335
ret = tilcdc_add_component_encoder(ddev);
337336
if (ret < 0)
338-
goto init_failed;
337+
goto unbind_component;
339338
} else {
340339
ret = tilcdc_attach_external_device(ddev);
341340
if (ret)
342-
goto init_failed;
341+
goto unregister_cpufreq_notif;
343342
}
344343

345344
if (!priv->external_connector &&
346345
((priv->num_encoders == 0) || (priv->num_connectors == 0))) {
347346
dev_err(dev, "no encoders/connectors found\n");
348347
ret = -EPROBE_DEFER;
349-
goto init_failed;
348+
goto unbind_component;
350349
}
351350

352351
ret = drm_vblank_init(ddev, 1);
353352
if (ret < 0) {
354353
dev_err(dev, "failed to initialize vblank\n");
355-
goto init_failed;
354+
goto unbind_component;
356355
}
357356

358357
ret = platform_get_irq(pdev, 0);
359358
if (ret < 0)
360-
goto init_failed;
359+
goto unbind_component;
361360
priv->irq = ret;
362361

363362
ret = tilcdc_irq_install(ddev, priv->irq);
364363
if (ret < 0) {
365364
dev_err(dev, "failed to install IRQ handler\n");
366-
goto init_failed;
365+
goto unbind_component;
367366
}
368367

369368
drm_mode_config_reset(ddev);
@@ -372,16 +371,34 @@ static int tilcdc_init(const struct drm_driver *ddrv, struct device *dev)
372371

373372
ret = drm_dev_register(ddev, 0);
374373
if (ret)
375-
goto init_failed;
376-
priv->is_registered = true;
374+
goto stop_poll;
377375

378376
drm_client_setup_with_color_mode(ddev, bpp);
379377

380378
return 0;
381379

382-
init_failed:
383-
tilcdc_fini(ddev);
380+
stop_poll:
381+
drm_kms_helper_poll_fini(ddev);
382+
tilcdc_irq_uninstall(ddev);
383+
unbind_component:
384+
if (priv->is_componentized)
385+
component_unbind_all(dev, ddev);
386+
unregister_cpufreq_notif:
387+
#ifdef CONFIG_CPU_FREQ
388+
cpufreq_unregister_notifier(&priv->freq_transition,
389+
CPUFREQ_TRANSITION_NOTIFIER);
390+
destroy_crtc:
391+
#endif
392+
tilcdc_crtc_destroy(priv->crtc);
393+
disable_pm:
394+
pm_runtime_disable(dev);
395+
clk_put(priv->clk);
396+
free_wq:
397+
destroy_workqueue(priv->wq);
398+
put_drm:
384399
platform_set_drvdata(pdev, NULL);
400+
ddev->dev_private = NULL;
401+
drm_dev_put(ddev);
385402

386403
return ret;
387404
}

drivers/gpu/drm/tilcdc/tilcdc_drv.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,6 @@ struct tilcdc_drm_private {
8282
struct drm_encoder *external_encoder;
8383
struct drm_connector *external_connector;
8484

85-
bool is_registered;
8685
bool is_componentized;
8786
bool irq_enabled;
8887
};
@@ -164,6 +163,7 @@ void tilcdc_crtc_set_panel_info(struct drm_crtc *crtc,
164163
void tilcdc_crtc_set_simulate_vesa_sync(struct drm_crtc *crtc,
165164
bool simulate_vesa_sync);
166165
void tilcdc_crtc_shutdown(struct drm_crtc *crtc);
166+
void tilcdc_crtc_destroy(struct drm_crtc *crtc);
167167
int tilcdc_crtc_update_fb(struct drm_crtc *crtc,
168168
struct drm_framebuffer *fb,
169169
struct drm_pending_vblank_event *event);

0 commit comments

Comments
 (0)