iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

drm/i915: Remove return type from i915_drm_client_remove_object

Browse Source 
There is no need to return anything in the version which was merged and
also the implementation of the !CONFIG_PROC_FS wasn't returning anything,
causing a build failure there.

Signed-off-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Fixes: e4ae85e364fc ("drm/i915: Add ability for tracking buffer objects per client")
Cc: Aravind Iddamsetty <aravind.iddamsetty@intel.com>
Reported-by: kernel test robot <lkp@intel.com>
Closes: https://lore.kernel.org/oe-kbuild-all/202311110104.8TlHVxUI-lkp@intel.com/
Reviewed-by: Jani Nikula <jani.nikula@intel.com>
Reviewed-by: Andi Shyti <andi.shyti@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20231113085457.199053-1-tvrtko.ursulin@linux.intel.com
This commit is contained in:
Tvrtko Ursulin 2023-11-13 08:54:56 +00:00
parent 3c7a5eb700
commit 44eea8d080
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/gpu/drm/i915/i915_drm_client.c
View File

@ -191,22 +191,20 @@ void i915_drm_client_add_object(struct i915_drm_client *client,
spin_unlock_irqrestore(&client->objects_lock, flags);
}
bool i915_drm_client_remove_object(struct drm_i915_gem_object *obj)
void i915_drm_client_remove_object(struct drm_i915_gem_object *obj)
{
struct i915_drm_client *client = fetch_and_zero(&obj->client);
unsigned long flags;
/* Object may not be associated with a client. */
if (!client)
return false;
return;
spin_lock_irqsave(&client->objects_lock, flags);
list_del_rcu(&obj->client_link);
spin_unlock_irqrestore(&client->objects_lock, flags);
i915_drm_client_put(client);
return true;
}
void i915_drm_client_add_context_objects(struct i915_drm_client *client,

5
drivers/gpu/drm/i915/i915_drm_client.h
View File

@ -70,7 +70,7 @@ void i915_drm_client_fdinfo(struct drm_printer *p, struct drm_file *file);
#ifdef CONFIG_PROC_FS
void i915_drm_client_add_object(struct i915_drm_client *client,
struct drm_i915_gem_object *obj);
bool i915_drm_client_remove_object(struct drm_i915_gem_object *obj);
void i915_drm_client_remove_object(struct drm_i915_gem_object *obj);
void i915_drm_client_add_context_objects(struct i915_drm_client *client,
struct intel_context *ce);
#else
@ -79,7 +79,8 @@ static inline void i915_drm_client_add_object(struct i915_drm_client *client,
{
}
static inline bool i915_drm_client_remove_object(struct drm_i915_gem_object *obj)
static inline void
i915_drm_client_remove_object(struct drm_i915_gem_object *obj)
{
}