diff options
author | Daniel Vetter <daniel.vetter@ffwll.ch> | 2016-03-30 05:40:43 -0400 |
---|---|---|
committer | Dave Airlie <airlied@redhat.com> | 2016-03-31 23:22:33 -0400 |
commit | 72b9ff0612ad8fc969b910cd00ac16b57a1a9ba4 (patch) | |
tree | b0c5c2b02a3db9c204dd12524da445cf20ecaf83 /drivers/gpu/drm/udl | |
parent | 7779c5e23c5132c22a219f1f5554ef81dd15ee91 (diff) |
drm/udl: Use unlocked gem unreferencing
For drm_gem_object_unreference callers are required to hold
dev->struct_mutex, which these paths don't. Enforcing this requirement
has become a bit more strict with
commit ef4c6270bf2867e2f8032e9614d1a8cfc6c71663
Author: Daniel Vetter <daniel.vetter@ffwll.ch>
Date: Thu Oct 15 09:36:25 2015 +0200
drm/gem: Check locking in drm_gem_object_unreference
Cc: stable@vger.kernel.org
Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/udl')
-rw-r--r-- | drivers/gpu/drm/udl/udl_fb.c | 2 | ||||
-rw-r--r-- | drivers/gpu/drm/udl/udl_gem.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/udl/udl_fb.c b/drivers/gpu/drm/udl/udl_fb.c index 33239a2b264a..fd1eb9d03f0b 100644 --- a/drivers/gpu/drm/udl/udl_fb.c +++ b/drivers/gpu/drm/udl/udl_fb.c | |||
@@ -536,7 +536,7 @@ static int udlfb_create(struct drm_fb_helper *helper, | |||
536 | out_destroy_fbi: | 536 | out_destroy_fbi: |
537 | drm_fb_helper_release_fbi(helper); | 537 | drm_fb_helper_release_fbi(helper); |
538 | out_gfree: | 538 | out_gfree: |
539 | drm_gem_object_unreference(&ufbdev->ufb.obj->base); | 539 | drm_gem_object_unreference_unlocked(&ufbdev->ufb.obj->base); |
540 | out: | 540 | out: |
541 | return ret; | 541 | return ret; |
542 | } | 542 | } |
diff --git a/drivers/gpu/drm/udl/udl_gem.c b/drivers/gpu/drm/udl/udl_gem.c index 2a0a784ab6ee..d7528e0d8442 100644 --- a/drivers/gpu/drm/udl/udl_gem.c +++ b/drivers/gpu/drm/udl/udl_gem.c | |||
@@ -52,7 +52,7 @@ udl_gem_create(struct drm_file *file, | |||
52 | return ret; | 52 | return ret; |
53 | } | 53 | } |
54 | 54 | ||
55 | drm_gem_object_unreference(&obj->base); | 55 | drm_gem_object_unreference_unlocked(&obj->base); |
56 | *handle_p = handle; | 56 | *handle_p = handle; |
57 | return 0; | 57 | return 0; |
58 | } | 58 | } |