diff options
| author |   Dave Airlie <airlied@redhat.com> | 2025-07-29 16:52:49 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2025-07-29 16:53:20 +1000 |
| commit | 711fa2667d8b230ff31f1855d0f25e3263268d8a (patch) | |
| tree | 4bd24dd13867d72f757390b2d9cb49f2bd4823ed | |
| parent | Merge tag 'nova-next-v6.17-2025-07-18' of https://gitlab.freedesktop.org/drm/nova into drm-next (diff) | |
| parent | drm/tidss: oldi: convert to devm_drm_bridge_alloc() API (diff) | |
| download | wireguard-linux-711fa2667d8b230ff31f1855d0f25e3263268d8a.tar.xz wireguard-linux-711fa2667d8b230ff31f1855d0f25e3263268d8a.zip | |
Merge tag 'drm-misc-next-fixes-2025-07-24' of https://gitlab.freedesktop.org/drm/misc/kernel into drm-next
Two more bridge conversions to devm_drm_bridge_alloc that address a
warning now reported by the bridge core code.
Signed-off-by: Dave Airlie <airlied@redhat.com>
From: Maxime Ripard <mripard@redhat.com>
Link: https://lore.kernel.org/r/20250724-petite-gray-foxhound-b4fbb8@houat
| -rw-r--r-- | drivers/gpu/drm/tidss/tidss_encoder.c | 10 | ||||
| -rw-r--r-- | drivers/gpu/drm/tidss/tidss_oldi.c | 8 |
2 files changed, 11 insertions, 7 deletions
diff --git a/drivers/gpu/drm/tidss/tidss_encoder.c b/drivers/gpu/drm/tidss/tidss_encoder.c index 95b4aeff2775..81a04f767770 100644 --- a/drivers/gpu/drm/tidss/tidss_encoder.c +++ b/drivers/gpu/drm/tidss/tidss_encoder.c @@ -90,14 +90,18 @@ int tidss_encoder_create(struct tidss_device *tidss, struct drm_connector *connector; int ret; - t_enc = drmm_simple_encoder_alloc(&tidss->ddev, struct tidss_encoder, - encoder, encoder_type); + t_enc = devm_drm_bridge_alloc(tidss->dev, struct tidss_encoder, + bridge, &tidss_bridge_funcs); if (IS_ERR(t_enc)) return PTR_ERR(t_enc); + ret = drm_simple_encoder_init(&tidss->ddev, &t_enc->encoder, + encoder_type); + if (ret) + return ret; + t_enc->tidss = tidss; t_enc->next_bridge = next_bridge; - t_enc->bridge.funcs = &tidss_bridge_funcs; enc = &t_enc->encoder; enc->possible_crtcs = possible_crtcs; diff --git a/drivers/gpu/drm/tidss/tidss_oldi.c b/drivers/gpu/drm/tidss/tidss_oldi.c index 8223b8fec8ce..8f25159d0666 100644 --- a/drivers/gpu/drm/tidss/tidss_oldi.c +++ b/drivers/gpu/drm/tidss/tidss_oldi.c @@ -534,9 +534,10 @@ int tidss_oldi_init(struct tidss_device *tidss) continue; } - oldi = devm_kzalloc(tidss->dev, sizeof(*oldi), GFP_KERNEL); - if (!oldi) { - ret = -ENOMEM; + oldi = devm_drm_bridge_alloc(tidss->dev, struct tidss_oldi, bridge, + &tidss_oldi_bridge_funcs); + if (IS_ERR(oldi)) { + ret = PTR_ERR(oldi); goto err_put_node; } @@ -577,7 +578,6 @@ int tidss_oldi_init(struct tidss_device *tidss) /* Register the bridge. */ oldi->bridge.of_node = child; oldi->bridge.driver_private = oldi; - oldi->bridge.funcs = &tidss_oldi_bridge_funcs; oldi->bridge.timings = &default_tidss_oldi_timings; tidss->oldis[tidss->num_oldis++] = oldi; |