On Wed, Oct 21, 2015 at 10:06:31AM +0200, Daniel Vetter wrote: > 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 is officially struct_mutex free, yay! > > Cc: Thierry Reding <thierry.reding@xxxxxxxxx> > Signed-off-by: Daniel Vetter <daniel.vetter@xxxxxxxxx> Please disregard this, wrong patch. -Daniel > --- > drivers/gpu/drm/tegra/drm.c | 4 +--- > drivers/gpu/drm/tegra/gem.c | 8 ++------ > 2 files changed, 3 insertions(+), 9 deletions(-) > > diff --git a/drivers/gpu/drm/tegra/drm.c b/drivers/gpu/drm/tegra/drm.c > index 159ef515cab1..5de9a4ead463 100644 > --- a/drivers/gpu/drm/tegra/drm.c > +++ b/drivers/gpu/drm/tegra/drm.c > @@ -277,9 +277,7 @@ host1x_bo_lookup(struct drm_device *drm, struct drm_file *file, u32 handle) > if (!gem) > return NULL; > > - mutex_lock(&drm->struct_mutex); > - drm_gem_object_unreference(gem); > - mutex_unlock(&drm->struct_mutex); > + drm_gem_object_unreference_unlocked(gem); > > bo = to_tegra_bo(gem); > return &bo->base; > diff --git a/drivers/gpu/drm/tegra/gem.c b/drivers/gpu/drm/tegra/gem.c > index fb712316c522..1146fbe523d5 100644 > --- a/drivers/gpu/drm/tegra/gem.c > +++ b/drivers/gpu/drm/tegra/gem.c > @@ -30,9 +30,7 @@ static void tegra_bo_put(struct host1x_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(&obj->gem); > - mutex_unlock(&drm->struct_mutex); > + drm_gem_object_unreference_unlocked(&obj->gem); > } > > static dma_addr_t tegra_bo_pin(struct host1x_bo *bo, struct sg_table **sgt) > @@ -74,9 +72,7 @@ static struct host1x_bo *tegra_bo_get(struct host1x_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); > - mutex_unlock(&drm->struct_mutex); > + drm_gem_object_reference_unlocked(&obj->gem); > > return bo; > } > -- > 2.5.1 > -- Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch _______________________________________________ Intel-gfx mailing list Intel-gfx@xxxxxxxxxxxxxxxxxxxxx http://lists.freedesktop.org/mailman/listinfo/intel-gfx
