drm/udl: Use unlocked gem unreferencing

danvet · airlied · commit 72b9ff0612ad · 2016-04-01T13:22:33.000+10:00
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 ef4c627 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>
diff --git 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,
 out_destroy_fbi:
 	drm_fb_helper_release_fbi(helper);
 out_gfree:
-	drm_gem_object_unreference(&ufbdev->ufb.obj->base);
+	drm_gem_object_unreference_unlocked(&ufbdev->ufb.obj->base);
 out:
 	return ret;
 }
diff --git 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,
 		return ret;
 	}
 
-	drm_gem_object_unreference(&obj->base);
+	drm_gem_object_unreference_unlocked(&obj->base);
 	*handle_p = handle;
 	return 0;
 }

Original file line number	Diff line number	Diff line change
`@@ -536,7 +536,7 @@ static int udlfb_create(struct drm_fb_helper *helper,`
`536`	`536`	`out_destroy_fbi:`
`537`	`537`	`drm_fb_helper_release_fbi(helper);`
`538`	`538`	`out_gfree:`
`539`		`- drm_gem_object_unreference(&ufbdev->ufb.obj->base);`
	`539`	`+ drm_gem_object_unreference_unlocked(&ufbdev->ufb.obj->base);`
`540`	`540`	`out:`
`541`	`541`	`return ret;`
`542`	`542`	`}`
Original file line number	Diff line number	Diff line change
`@@ -52,7 +52,7 @@ udl_gem_create(struct drm_file *file,`
`52`	`52`	`return ret;`
`53`	`53`	`}`
`54`	`54`
`55`		`- drm_gem_object_unreference(&obj->base);`
	`55`	`+ drm_gem_object_unreference_unlocked(&obj->base);`
`56`	`56`	`*handle_p = handle;`
`57`	`57`	`return 0;`
`58`	`58`	`}`