drm/client: Add client free callback to unprepare fb_helper

Add free callback to struct drm_client_funcs. Invoke function to
free the client memory as part of the release process. Implement
free for fbdev emulation.

Fbdev emulation allocates and prepares client memory in
drm_fbdev_client_setup(). The release happens in fb_destroy from
struct fb_ops. Multiple implementations of this callback exist in
the various drivers that provide an fbdev implementation. Each of
them needs to follow the implementation details of the fbdev setup
code.

Adding a free callback for the client puts the unprepare and release
of the fbdev client in a single place.

Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de>
Reviewed-by: Dmitry Baryshkov <dmitry.baryshkov@oss.qualcomm.com> # core, msm
Acked-by: Tomi Valkeinen <tomi.valkeinen@ideasonboard.com> # omapdrm
Acked-by: Patrik Jakobsson <patrik.r.jakobsson@gmail.com> # gma500
Acked-by: Alex Deucher <alexander.deucher@amd.com>
Link: https://lore.kernel.org/r/20251009132006.45834-2-tzimmermann@suse.de

diff --git a/drivers/gpu/drm/armada/armada_fbdev.c b/drivers/gpu/drm/armada/armada_fbdev.c
index cb53cc91bafb058946d53b98f1bf82182c97559f..22e2081bfa04d1887103b199e7c5f6b4fc5f9f82 100644 (file)
--- a/drivers/gpu/drm/armada/armada_fbdev.c
+++ b/drivers/gpu/drm/armada/armada_fbdev.c
@@ -28,8 +28,6 @@ static void armada_fbdev_fb_destroy(struct fb_info *info)
        fbh->fb->funcs->destroy(fbh->fb);
 
        drm_client_release(&fbh->client);
-       drm_fb_helper_unprepare(fbh);
-       kfree(fbh);
 }
 
 static const struct fb_ops armada_fb_ops = {

diff --git a/drivers/gpu/drm/clients/drm_fbdev_client.c b/drivers/gpu/drm/clients/drm_fbdev_client.c
index ec5ab9f305471976038392779503d5aad0afb15e..47e5f27eee58724959fec3b38bda338189f54880 100644 (file)
--- a/drivers/gpu/drm/clients/drm_fbdev_client.c
+++ b/drivers/gpu/drm/clients/drm_fbdev_client.c
@@ -13,16 +13,28 @@
  * struct drm_client_funcs
  */
 
+static void drm_fbdev_client_free(struct drm_client_dev *client)
+{
+       struct drm_fb_helper *fb_helper = drm_fb_helper_from_client(client);
+
+       drm_fb_helper_unprepare(fb_helper);
+       kfree(fb_helper);
+}
+
 static void drm_fbdev_client_unregister(struct drm_client_dev *client)
 {
        struct drm_fb_helper *fb_helper = drm_fb_helper_from_client(client);
 
        if (fb_helper->info) {
+               /*
+                * Fully probed framebuffer device
+                */
                drm_fb_helper_unregister_info(fb_helper);
        } else {
+               /*
+                * Partially initialized client, no framebuffer device yet
+                */
                drm_client_release(&fb_helper->client);
-               drm_fb_helper_unprepare(fb_helper);
-               kfree(fb_helper);
        }
 }
 
@@ -82,6 +94,7 @@ static int drm_fbdev_client_resume(struct drm_client_dev *client)
 
 static const struct drm_client_funcs drm_fbdev_client_funcs = {
        .owner          = THIS_MODULE,
+       .free           = drm_fbdev_client_free,
        .unregister     = drm_fbdev_client_unregister,
        .restore        = drm_fbdev_client_restore,
        .hotplug        = drm_fbdev_client_hotplug,

diff --git a/drivers/gpu/drm/drm_client.c b/drivers/gpu/drm/drm_client.c
index 3fa38d4ac70b6323f3e5f38c57fedf1b33a29de6..fe9c6d7083ea2d94c3900b443813328451510c50 100644 (file)
--- a/drivers/gpu/drm/drm_client.c
+++ b/drivers/gpu/drm/drm_client.c
@@ -168,6 +168,10 @@ void drm_client_release(struct drm_client_dev *client)
 
        drm_client_modeset_free(client);
        drm_client_close(client);
+
+       if (client->funcs && client->funcs->free)
+               client->funcs->free(client);
+
        drm_dev_put(dev);
 }
 EXPORT_SYMBOL(drm_client_release);

diff --git a/drivers/gpu/drm/drm_fbdev_dma.c b/drivers/gpu/drm/drm_fbdev_dma.c
index 8bd626ef16c71704a0b204a6e5db33eb46dc372e..c6196293e4240db579f45d2720fab20fcd96f981 100644 (file)
--- a/drivers/gpu/drm/drm_fbdev_dma.c
+++ b/drivers/gpu/drm/drm_fbdev_dma.c
@@ -57,8 +57,6 @@ static void drm_fbdev_dma_fb_destroy(struct fb_info *info)
        drm_client_buffer_vunmap(fb_helper->buffer);
        drm_client_framebuffer_delete(fb_helper->buffer);
        drm_client_release(&fb_helper->client);
-       drm_fb_helper_unprepare(fb_helper);
-       kfree(fb_helper);
 }
 
 static const struct fb_ops drm_fbdev_dma_fb_ops = {
@@ -92,8 +90,6 @@ static void drm_fbdev_dma_shadowed_fb_destroy(struct fb_info *info)
        drm_client_buffer_vunmap(fb_helper->buffer);
        drm_client_framebuffer_delete(fb_helper->buffer);
        drm_client_release(&fb_helper->client);
-       drm_fb_helper_unprepare(fb_helper);
-       kfree(fb_helper);
 }
 
 static const struct fb_ops drm_fbdev_dma_shadowed_fb_ops = {

diff --git a/drivers/gpu/drm/drm_fbdev_shmem.c b/drivers/gpu/drm/drm_fbdev_shmem.c
index 1e827bf8b815d4354661b16ebbf272c4f4db1f54..51573058df6f878b5ce100a2ab17d32db802b5e6 100644 (file)
--- a/drivers/gpu/drm/drm_fbdev_shmem.c
+++ b/drivers/gpu/drm/drm_fbdev_shmem.c
@@ -65,8 +65,6 @@ static void drm_fbdev_shmem_fb_destroy(struct fb_info *info)
        drm_client_buffer_vunmap(fb_helper->buffer);
        drm_client_framebuffer_delete(fb_helper->buffer);
        drm_client_release(&fb_helper->client);
-       drm_fb_helper_unprepare(fb_helper);
-       kfree(fb_helper);
 }
 
 static const struct fb_ops drm_fbdev_shmem_fb_ops = {

diff --git a/drivers/gpu/drm/drm_fbdev_ttm.c b/drivers/gpu/drm/drm_fbdev_ttm.c
index 85feb55bba113d76c2da56c622a4d795e708c861..ccf460fbc1f0ce1105fbb3cb82b6dc11188e5d65 100644 (file)
--- a/drivers/gpu/drm/drm_fbdev_ttm.c
+++ b/drivers/gpu/drm/drm_fbdev_ttm.c
@@ -53,8 +53,6 @@ static void drm_fbdev_ttm_fb_destroy(struct fb_info *info)
        drm_client_framebuffer_delete(fb_helper->buffer);
 
        drm_client_release(&fb_helper->client);
-       drm_fb_helper_unprepare(fb_helper);
-       kfree(fb_helper);
 }
 
 static const struct fb_ops drm_fbdev_ttm_fb_ops = {

diff --git a/drivers/gpu/drm/exynos/exynos_drm_fbdev.c b/drivers/gpu/drm/exynos/exynos_drm_fbdev.c
index 93de25b77e68616a759f6b6696f5ae13a69c011f..a3bd21a827ad5ca79bb153e1c0820c41c745bcc4 100644 (file)
--- a/drivers/gpu/drm/exynos/exynos_drm_fbdev.c
+++ b/drivers/gpu/drm/exynos/exynos_drm_fbdev.c
@@ -42,8 +42,6 @@ static void exynos_drm_fb_destroy(struct fb_info *info)
        drm_framebuffer_remove(fb);
 
        drm_client_release(&fb_helper->client);
-       drm_fb_helper_unprepare(fb_helper);
-       kfree(fb_helper);
 }
 
 static const struct fb_ops exynos_drm_fb_ops = {

diff --git a/drivers/gpu/drm/gma500/fbdev.c b/drivers/gpu/drm/gma500/fbdev.c
index a6af21514cff7343ca6654b8d07893a5afaf22ef..bc92fa24a1e279ac1a90b52a1f60f0efdc15de19 100644 (file)
--- a/drivers/gpu/drm/gma500/fbdev.c
+++ b/drivers/gpu/drm/gma500/fbdev.c
@@ -84,9 +84,6 @@ static void psb_fbdev_fb_destroy(struct fb_info *info)
        drm_gem_object_put(obj);
 
        drm_client_release(&fb_helper->client);
-
-       drm_fb_helper_unprepare(fb_helper);
-       kfree(fb_helper);
 }
 
 static const struct fb_ops psb_fbdev_fb_ops = {

diff --git a/drivers/gpu/drm/i915/display/intel_fbdev.c b/drivers/gpu/drm/i915/display/intel_fbdev.c
index 7c4709d58aa345fe6dba6a2b768350327b1ae52f..bf5721856f3cfd9c5991d1ccbb86d8bf9d7708a5 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_fbdev.c
+++ b/drivers/gpu/drm/i915/display/intel_fbdev.c
@@ -146,8 +146,6 @@ static void intel_fbdev_fb_destroy(struct fb_info *info)
        drm_framebuffer_remove(fb_helper->fb);
 
        drm_client_release(&fb_helper->client);
-       drm_fb_helper_unprepare(fb_helper);
-       kfree(fb_helper);
 }
 
 __diag_push();

diff --git a/drivers/gpu/drm/msm/msm_fbdev.c b/drivers/gpu/drm/msm/msm_fbdev.c
index b5969374d53fb373a3fc0419f714ba2aef2dae06..aad6fb77f0de2b0733cbfc54aeca086c7943bde5 100644 (file)
--- a/drivers/gpu/drm/msm/msm_fbdev.c
+++ b/drivers/gpu/drm/msm/msm_fbdev.c
@@ -52,8 +52,6 @@ static void msm_fbdev_fb_destroy(struct fb_info *info)
        drm_framebuffer_remove(fb);
 
        drm_client_release(&helper->client);
-       drm_fb_helper_unprepare(helper);
-       kfree(helper);
 }
 
 static const struct fb_ops msm_fb_ops = {

diff --git a/drivers/gpu/drm/omapdrm/omap_fbdev.c b/drivers/gpu/drm/omapdrm/omap_fbdev.c
index 948af7ec1130b9ce2f984e0df244a364a14e1f40..b5df2923d2a6b0fb8972606defe40b696ebc8e64 100644 (file)
--- a/drivers/gpu/drm/omapdrm/omap_fbdev.c
+++ b/drivers/gpu/drm/omapdrm/omap_fbdev.c
@@ -103,8 +103,6 @@ static void omap_fbdev_fb_destroy(struct fb_info *info)
        drm_framebuffer_remove(fb);
 
        drm_client_release(&helper->client);
-       drm_fb_helper_unprepare(helper);
-       kfree(helper);
 }
 
 /*

diff --git a/drivers/gpu/drm/radeon/radeon_fbdev.c b/drivers/gpu/drm/radeon/radeon_fbdev.c
index dc81b0c2dbff3fdf4f95d4b85865dbdc102a6c09..4df6c9167bf0f6cee7d7bc1be174820b92bd59c3 100644 (file)
--- a/drivers/gpu/drm/radeon/radeon_fbdev.c
+++ b/drivers/gpu/drm/radeon/radeon_fbdev.c
@@ -184,8 +184,6 @@ static void radeon_fbdev_fb_destroy(struct fb_info *info)
        radeon_fbdev_destroy_pinned_object(gobj);
 
        drm_client_release(&fb_helper->client);
-       drm_fb_helper_unprepare(fb_helper);
-       kfree(fb_helper);
 }
 
 static const struct fb_ops radeon_fbdev_fb_ops = {

diff --git a/drivers/gpu/drm/tegra/fbdev.c b/drivers/gpu/drm/tegra/fbdev.c
index 1b70f5e164afd5c17d0975958a3796e385fe9037..91aece6f34e08833278584cec2f4296ef2bd4d4a 100644 (file)
--- a/drivers/gpu/drm/tegra/fbdev.c
+++ b/drivers/gpu/drm/tegra/fbdev.c
@@ -53,8 +53,6 @@ static void tegra_fbdev_fb_destroy(struct fb_info *info)
        drm_framebuffer_remove(fb);
 
        drm_client_release(&helper->client);
-       drm_fb_helper_unprepare(helper);
-       kfree(helper);
 }
 
 static const struct fb_ops tegra_fb_ops = {

diff --git a/include/drm/drm_client.h b/include/drm/drm_client.h
index 3556928d39386554592cadce5908aaf13869111a..715b422952eebee19d00e0c5fcf793983a58a3a8 100644 (file)
--- a/include/drm/drm_client.h
+++ b/include/drm/drm_client.h
@@ -28,6 +28,16 @@ struct drm_client_funcs {
         */
        struct module *owner;
 
+       /**
+        * @free:
+        *
+        * Called when the client gets unregistered. Implementations should
+        * release all client-specific data and free the memory.
+        *
+        * This callback is optional.
+        */
+       void (*free)(struct drm_client_dev *client);
+
        /**
         * @unregister:
         *