Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a07cdfe5 authored by Daniel Vetter's avatar Daniel Vetter Committed by Thierry Reding
Browse files

drm/tegra: Use drm_gem_object_unreference_unlocked() 



This only grabs the mutex when really needed, but still has a might-
acquire lockdep check to make sure that's always possible. With this
patch Tegra DRM is officially struct_mutex free, yay!

v2: refernce_unlocked doesn't exist as kbuild spotted.

Cc: Thierry Reding <thierry.reding@gmail.com>
Acked-by: default avatarThierry Reding <thierry.reding@gmail.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@intel.com>
[treding@nvidia.com: remove unused variables]
Signed-off-by: default avatarThierry Reding <treding@nvidia.com>
parent d849c82f

drivers/gpu/drm/tegra/drm.c

+1 −3
Original line number Original line Diff line number Diff line
@@ -277,9 +277,7 @@ host1x_bo_lookup(struct drm_device *drm, struct drm_file *file, u32 handle) 
	if (!gem)

	if (!gem)

		return NULL;

		return NULL;





	mutex_lock(&drm->struct_mutex);

	drm_gem_object_unreference_unlocked(gem);

	drm_gem_object_unreference(gem);

	mutex_unlock(&drm->struct_mutex);





	bo = to_tegra_bo(gem);

	bo = to_tegra_bo(gem);

	return &bo->base;

	return &bo->base;

drivers/gpu/drm/tegra/gem.c

+1 −7
Original line number Original line Diff line number Diff line
@@ -28,11 +28,8 @@ static inline struct tegra_bo *host1x_to_tegra_bo(struct host1x_bo *bo) 
static void tegra_bo_put(struct host1x_bo *bo)

static void tegra_bo_put(struct host1x_bo *bo)

{

{

	struct tegra_bo *obj = host1x_to_tegra_bo(bo);

	struct tegra_bo *obj = host1x_to_tegra_bo(bo);

	struct drm_device *drm = obj->gem.dev;





	mutex_lock(&drm->struct_mutex);

	drm_gem_object_unreference_unlocked(&obj->gem);

	drm_gem_object_unreference(&obj->gem);

	mutex_unlock(&drm->struct_mutex);

}

}





static dma_addr_t tegra_bo_pin(struct host1x_bo *bo, struct sg_table **sgt)

static dma_addr_t tegra_bo_pin(struct host1x_bo *bo, struct sg_table **sgt)
@@ -72,11 +69,8 @@ static void tegra_bo_kunmap(struct host1x_bo *bo, unsigned int page, 
static struct host1x_bo *tegra_bo_get(struct host1x_bo *bo)

static struct host1x_bo *tegra_bo_get(struct host1x_bo *bo)

{

{

	struct tegra_bo *obj = host1x_to_tegra_bo(bo);

	struct tegra_bo *obj = host1x_to_tegra_bo(bo);

	struct drm_device *drm = obj->gem.dev;





	mutex_lock(&drm->struct_mutex);

	drm_gem_object_reference(&obj->gem);

	drm_gem_object_reference(&obj->gem);

	mutex_unlock(&drm->struct_mutex);





	return bo;

	return bo;

}

}