Message ID | 1444894601-5200-16-git-send-email-daniel.vetter@ffwll.ch (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
On Thu, Oct 15, 2015 at 9:36 AM, Daniel Vetter <daniel.vetter@ffwll.ch> wrote: > Simply forgotten about this when I was doing my general cleansing of > simple gem mmap offset functions. There's nothing but core functions > called here, and they all have their own protection already. > > Signed-off-by: Daniel Vetter <daniel.vetter@intel.com> +1 for removing that stale comment as well Signed-off-by: Patrik Jakobsson <patrik.r.jakobsson@gmail.com> > --- > drivers/gpu/drm/gma500/gem.c | 13 +++---------- > 1 file changed, 3 insertions(+), 10 deletions(-) > > diff --git a/drivers/gpu/drm/gma500/gem.c b/drivers/gpu/drm/gma500/gem.c > index e3bdc8b1c32c..f0357f525f56 100644 > --- a/drivers/gpu/drm/gma500/gem.c > +++ b/drivers/gpu/drm/gma500/gem.c > @@ -62,15 +62,10 @@ int psb_gem_dumb_map_gtt(struct drm_file *file, struct drm_device *dev, > int ret = 0; > struct drm_gem_object *obj; > > - mutex_lock(&dev->struct_mutex); > - > /* GEM does all our handle to object mapping */ > obj = drm_gem_object_lookup(dev, file, handle); > - if (obj == NULL) { > - ret = -ENOENT; > - goto unlock; > - } > - /* What validation is needed here ? */ > + if (obj == NULL) > + return -ENOENT; > > /* Make it mmapable */ > ret = drm_gem_create_mmap_offset(obj); > @@ -78,9 +73,7 @@ int psb_gem_dumb_map_gtt(struct drm_file *file, struct drm_device *dev, > goto out; > *offset = drm_vma_node_offset_addr(&obj->vma_node); > out: > - drm_gem_object_unreference(obj); > -unlock: > - mutex_unlock(&dev->struct_mutex); > + drm_gem_object_unreference_unlocked(obj); > return ret; > } > > -- > 2.5.1 > > _______________________________________________ > dri-devel mailing list > dri-devel@lists.freedesktop.org > http://lists.freedesktop.org/mailman/listinfo/dri-devel
diff --git a/drivers/gpu/drm/gma500/gem.c b/drivers/gpu/drm/gma500/gem.c index e3bdc8b1c32c..f0357f525f56 100644 --- a/drivers/gpu/drm/gma500/gem.c +++ b/drivers/gpu/drm/gma500/gem.c @@ -62,15 +62,10 @@ int psb_gem_dumb_map_gtt(struct drm_file *file, struct drm_device *dev, int ret = 0; struct drm_gem_object *obj; - mutex_lock(&dev->struct_mutex); - /* GEM does all our handle to object mapping */ obj = drm_gem_object_lookup(dev, file, handle); - if (obj == NULL) { - ret = -ENOENT; - goto unlock; - } - /* What validation is needed here ? */ + if (obj == NULL) + return -ENOENT; /* Make it mmapable */ ret = drm_gem_create_mmap_offset(obj); @@ -78,9 +73,7 @@ int psb_gem_dumb_map_gtt(struct drm_file *file, struct drm_device *dev, goto out; *offset = drm_vma_node_offset_addr(&obj->vma_node); out: - drm_gem_object_unreference(obj); -unlock: - mutex_unlock(&dev->struct_mutex); + drm_gem_object_unreference_unlocked(obj); return ret; }
Simply forgotten about this when I was doing my general cleansing of simple gem mmap offset functions. There's nothing but core functions called here, and they all have their own protection already. Signed-off-by: Daniel Vetter <daniel.vetter@intel.com> --- drivers/gpu/drm/gma500/gem.c | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-)