drm/framebuffer: Acquire internal references on GEM handles

Acquire GEM handles in drm_framebuffer_init() and release them in
the corresponding drm_framebuffer_cleanup(). Ties the handle's
lifetime to the framebuffer. Not all GEM buffer objects have GEM
handles. If not set, no refcounting takes place. This is the case
for some fbdev emulation. This is not a problem as these GEM objects
do not use dma-bufs and drivers will not release them while fbdev
emulation is running. Framebuffer flags keep a bit per color plane
of which the framebuffer holds a GEM handle reference.

As all drivers use drm_framebuffer_init(), they will now all hold
dma-buf references as fixed in commit 5307dce878 ("drm/gem: Acquire
references on GEM handles for framebuffers").

In the GEM framebuffer helpers, restore the original ref counting
on buffer objects. As the helpers for handle refcounting are now
no longer called from outside the DRM core, unexport the symbols.

v3:
- don't mix internal flags with mode flags (Christian)
v2:
- track framebuffer handle refs by flag
- drop gma500 cleanup (Christian)

Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de>
Fixes: 5307dce878 ("drm/gem: Acquire references on GEM handles for framebuffers")
Reported-by: Bert Karwatzki <spasswolf@web.de>
Closes: https://lore.kernel.org/dri-devel/20250703115915.3096-1-spasswolf@web.de/
Tested-by: Bert Karwatzki <spasswolf@web.de>
Tested-by: Mario Limonciello <superm1@kernel.org>
Tested-by: Borislav Petkov (AMD) <bp@alien8.de>
Cc: Thomas Zimmermann <tzimmermann@suse.de>
Cc: Anusha Srivatsa <asrivats@redhat.com>
Cc: Christian König <christian.koenig@amd.com>
Cc: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Cc: Maxime Ripard <mripard@kernel.org>
Cc: Sumit Semwal <sumit.semwal@linaro.org>
Cc: "Christian König" <christian.koenig@amd.com>
Cc: linux-media@vger.kernel.org
Cc: dri-devel@lists.freedesktop.org
Cc: linaro-mm-sig@lists.linaro.org
Cc: <stable@vger.kernel.org>
Reviewed-by: Christian König <christian.koenig@amd.com>
Link: https://lore.kernel.org/r/20250707131224.249496-1-tzimmermann@suse.de
This commit is contained in:
Thomas Zimmermann 2025-07-07 15:11:55 +02:00
parent d88dfb756d
commit f6bfc9afc7
5 changed files with 68 additions and 26 deletions

View file

@ -862,11 +862,23 @@ EXPORT_SYMBOL_FOR_TESTS_ONLY(drm_framebuffer_free);
int drm_framebuffer_init(struct drm_device *dev, struct drm_framebuffer *fb, int drm_framebuffer_init(struct drm_device *dev, struct drm_framebuffer *fb,
const struct drm_framebuffer_funcs *funcs) const struct drm_framebuffer_funcs *funcs)
{ {
unsigned int i;
int ret; int ret;
bool exists;
if (WARN_ON_ONCE(fb->dev != dev || !fb->format)) if (WARN_ON_ONCE(fb->dev != dev || !fb->format))
return -EINVAL; return -EINVAL;
for (i = 0; i < fb->format->num_planes; i++) {
if (drm_WARN_ON_ONCE(dev, fb->internal_flags & DRM_FRAMEBUFFER_HAS_HANDLE_REF(i)))
fb->internal_flags &= ~DRM_FRAMEBUFFER_HAS_HANDLE_REF(i);
if (fb->obj[i]) {
exists = drm_gem_object_handle_get_if_exists_unlocked(fb->obj[i]);
if (exists)
fb->internal_flags |= DRM_FRAMEBUFFER_HAS_HANDLE_REF(i);
}
}
INIT_LIST_HEAD(&fb->filp_head); INIT_LIST_HEAD(&fb->filp_head);
fb->funcs = funcs; fb->funcs = funcs;
@ -875,7 +887,7 @@ int drm_framebuffer_init(struct drm_device *dev, struct drm_framebuffer *fb,
ret = __drm_mode_object_add(dev, &fb->base, DRM_MODE_OBJECT_FB, ret = __drm_mode_object_add(dev, &fb->base, DRM_MODE_OBJECT_FB,
false, drm_framebuffer_free); false, drm_framebuffer_free);
if (ret) if (ret)
goto out; goto err;
mutex_lock(&dev->mode_config.fb_lock); mutex_lock(&dev->mode_config.fb_lock);
dev->mode_config.num_fb++; dev->mode_config.num_fb++;
@ -883,7 +895,16 @@ int drm_framebuffer_init(struct drm_device *dev, struct drm_framebuffer *fb,
mutex_unlock(&dev->mode_config.fb_lock); mutex_unlock(&dev->mode_config.fb_lock);
drm_mode_object_register(dev, &fb->base); drm_mode_object_register(dev, &fb->base);
out:
return 0;
err:
for (i = 0; i < fb->format->num_planes; i++) {
if (fb->internal_flags & DRM_FRAMEBUFFER_HAS_HANDLE_REF(i)) {
drm_gem_object_handle_put_unlocked(fb->obj[i]);
fb->internal_flags &= ~DRM_FRAMEBUFFER_HAS_HANDLE_REF(i);
}
}
return ret; return ret;
} }
EXPORT_SYMBOL(drm_framebuffer_init); EXPORT_SYMBOL(drm_framebuffer_init);
@ -960,6 +981,12 @@ EXPORT_SYMBOL(drm_framebuffer_unregister_private);
void drm_framebuffer_cleanup(struct drm_framebuffer *fb) void drm_framebuffer_cleanup(struct drm_framebuffer *fb)
{ {
struct drm_device *dev = fb->dev; struct drm_device *dev = fb->dev;
unsigned int i;
for (i = 0; i < fb->format->num_planes; i++) {
if (fb->internal_flags & DRM_FRAMEBUFFER_HAS_HANDLE_REF(i))
drm_gem_object_handle_put_unlocked(fb->obj[i]);
}
mutex_lock(&dev->mode_config.fb_lock); mutex_lock(&dev->mode_config.fb_lock);
list_del(&fb->head); list_del(&fb->head);

View file

@ -223,23 +223,34 @@ static void drm_gem_object_handle_get(struct drm_gem_object *obj)
} }
/** /**
* drm_gem_object_handle_get_unlocked - acquire reference on user-space handles * drm_gem_object_handle_get_if_exists_unlocked - acquire reference on user-space handle, if any
* @obj: GEM object * @obj: GEM object
* *
* Acquires a reference on the GEM buffer object's handle. Required * Acquires a reference on the GEM buffer object's handle. Required to keep
* to keep the GEM object alive. Call drm_gem_object_handle_put_unlocked() * the GEM object alive. Call drm_gem_object_handle_put_if_exists_unlocked()
* to release the reference. * to release the reference. Does nothing if the buffer object has no handle.
*
* Returns:
* True if a handle exists, or false otherwise
*/ */
void drm_gem_object_handle_get_unlocked(struct drm_gem_object *obj) bool drm_gem_object_handle_get_if_exists_unlocked(struct drm_gem_object *obj)
{ {
struct drm_device *dev = obj->dev; struct drm_device *dev = obj->dev;
guard(mutex)(&dev->object_name_lock); guard(mutex)(&dev->object_name_lock);
drm_WARN_ON(dev, !obj->handle_count); /* first ref taken in create-tail helper */ /*
* First ref taken during GEM object creation, if any. Some
* drivers set up internal framebuffers with GEM objects that
* do not have a GEM handle. Hence, this counter can be zero.
*/
if (!obj->handle_count)
return false;
drm_gem_object_handle_get(obj); drm_gem_object_handle_get(obj);
return true;
} }
EXPORT_SYMBOL(drm_gem_object_handle_get_unlocked);
/** /**
* drm_gem_object_handle_free - release resources bound to userspace handles * drm_gem_object_handle_free - release resources bound to userspace handles
@ -272,7 +283,7 @@ static void drm_gem_object_exported_dma_buf_free(struct drm_gem_object *obj)
} }
/** /**
* drm_gem_object_handle_put_unlocked - releases reference on user-space handles * drm_gem_object_handle_put_unlocked - releases reference on user-space handle
* @obj: GEM object * @obj: GEM object
* *
* Releases a reference on the GEM buffer object's handle. Possibly releases * Releases a reference on the GEM buffer object's handle. Possibly releases
@ -283,14 +294,14 @@ void drm_gem_object_handle_put_unlocked(struct drm_gem_object *obj)
struct drm_device *dev = obj->dev; struct drm_device *dev = obj->dev;
bool final = false; bool final = false;
if (WARN_ON(READ_ONCE(obj->handle_count) == 0)) if (drm_WARN_ON(dev, READ_ONCE(obj->handle_count) == 0))
return; return;
/* /*
* Must bump handle count first as this may be the last * Must bump handle count first as this may be the last
* ref, in which case the object would disappear before we * ref, in which case the object would disappear before
* checked for a name * we checked for a name.
*/ */
mutex_lock(&dev->object_name_lock); mutex_lock(&dev->object_name_lock);
if (--obj->handle_count == 0) { if (--obj->handle_count == 0) {
@ -303,7 +314,6 @@ void drm_gem_object_handle_put_unlocked(struct drm_gem_object *obj)
if (final) if (final)
drm_gem_object_put(obj); drm_gem_object_put(obj);
} }
EXPORT_SYMBOL(drm_gem_object_handle_put_unlocked);
/* /*
* Called at device or object close to release the file's * Called at device or object close to release the file's

View file

@ -99,7 +99,7 @@ void drm_gem_fb_destroy(struct drm_framebuffer *fb)
unsigned int i; unsigned int i;
for (i = 0; i < fb->format->num_planes; i++) for (i = 0; i < fb->format->num_planes; i++)
drm_gem_object_handle_put_unlocked(fb->obj[i]); drm_gem_object_put(fb->obj[i]);
drm_framebuffer_cleanup(fb); drm_framebuffer_cleanup(fb);
kfree(fb); kfree(fb);
@ -182,10 +182,8 @@ int drm_gem_fb_init_with_funcs(struct drm_device *dev,
if (!objs[i]) { if (!objs[i]) {
drm_dbg_kms(dev, "Failed to lookup GEM object\n"); drm_dbg_kms(dev, "Failed to lookup GEM object\n");
ret = -ENOENT; ret = -ENOENT;
goto err_gem_object_handle_put_unlocked; goto err_gem_object_put;
} }
drm_gem_object_handle_get_unlocked(objs[i]);
drm_gem_object_put(objs[i]);
min_size = (height - 1) * mode_cmd->pitches[i] min_size = (height - 1) * mode_cmd->pitches[i]
+ drm_format_info_min_pitch(info, i, width) + drm_format_info_min_pitch(info, i, width)
@ -195,22 +193,22 @@ int drm_gem_fb_init_with_funcs(struct drm_device *dev,
drm_dbg_kms(dev, drm_dbg_kms(dev,
"GEM object size (%zu) smaller than minimum size (%u) for plane %d\n", "GEM object size (%zu) smaller than minimum size (%u) for plane %d\n",
objs[i]->size, min_size, i); objs[i]->size, min_size, i);
drm_gem_object_handle_put_unlocked(objs[i]); drm_gem_object_put(objs[i]);
ret = -EINVAL; ret = -EINVAL;
goto err_gem_object_handle_put_unlocked; goto err_gem_object_put;
} }
} }
ret = drm_gem_fb_init(dev, fb, mode_cmd, objs, i, funcs); ret = drm_gem_fb_init(dev, fb, mode_cmd, objs, i, funcs);
if (ret) if (ret)
goto err_gem_object_handle_put_unlocked; goto err_gem_object_put;
return 0; return 0;
err_gem_object_handle_put_unlocked: err_gem_object_put:
while (i > 0) { while (i > 0) {
--i; --i;
drm_gem_object_handle_put_unlocked(objs[i]); drm_gem_object_put(objs[i]);
} }
return ret; return ret;
} }

View file

@ -161,7 +161,7 @@ void drm_sysfs_lease_event(struct drm_device *dev);
/* drm_gem.c */ /* drm_gem.c */
int drm_gem_init(struct drm_device *dev); int drm_gem_init(struct drm_device *dev);
void drm_gem_object_handle_get_unlocked(struct drm_gem_object *obj); bool drm_gem_object_handle_get_if_exists_unlocked(struct drm_gem_object *obj);
void drm_gem_object_handle_put_unlocked(struct drm_gem_object *obj); void drm_gem_object_handle_put_unlocked(struct drm_gem_object *obj);
int drm_gem_handle_create_tail(struct drm_file *file_priv, int drm_gem_handle_create_tail(struct drm_file *file_priv,
struct drm_gem_object *obj, struct drm_gem_object *obj,

View file

@ -23,6 +23,7 @@
#ifndef __DRM_FRAMEBUFFER_H__ #ifndef __DRM_FRAMEBUFFER_H__
#define __DRM_FRAMEBUFFER_H__ #define __DRM_FRAMEBUFFER_H__
#include <linux/bits.h>
#include <linux/ctype.h> #include <linux/ctype.h>
#include <linux/list.h> #include <linux/list.h>
#include <linux/sched.h> #include <linux/sched.h>
@ -100,6 +101,8 @@ struct drm_framebuffer_funcs {
unsigned num_clips); unsigned num_clips);
}; };
#define DRM_FRAMEBUFFER_HAS_HANDLE_REF(_i) BIT(0u + (_i))
/** /**
* struct drm_framebuffer - frame buffer object * struct drm_framebuffer - frame buffer object
* *
@ -188,6 +191,10 @@ struct drm_framebuffer {
* DRM_MODE_FB_MODIFIERS. * DRM_MODE_FB_MODIFIERS.
*/ */
int flags; int flags;
/**
* @internal_flags: Framebuffer flags like DRM_FRAMEBUFFER_HAS_HANDLE_REF.
*/
unsigned int internal_flags;
/** /**
* @filp_head: Placed on &drm_file.fbs, protected by &drm_file.fbs_lock. * @filp_head: Placed on &drm_file.fbs, protected by &drm_file.fbs_lock.
*/ */