GitHub-Mirror/Star64_linux
2
0
Fork 0
mirror of https://github.com/Fishwaldo/Star64_linux.git synced 2025-07-22 23:04:43 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

drm/mga200g: Hold a proper reference for cursor_set

Browse source 
Looking up an obj, immediate dropping the acquired reference and then
continuing to use it isn't how this is supposed to work. Fix this by
holding a reference for the entire function.

While at it stop grabbing dev->struct_mutex, it doesn't protect
anything here.

Reviewed-by: Thierry Reding <treding@nvidia.com>
Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
This commit is contained in:
Daniel Vetter 2015-07-09 23:32:39 +02:00
parent 34c294f5a6
commit bf89209a6d
1 changed files with 10 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

22
drivers/gpu/drm/mgag200/mgag200_cursor.c
View file

@ -70,18 +70,22 @@ int mga_crtc_cursor_set(struct drm_crtc *crtc,
BUG_ON(pixels_2 != pixels_current && pixels_2 != pixels_prev); BUG_ON(pixels_2 != pixels_current && pixels_2 != pixels_prev);
BUG_ON(pixels_current == pixels_prev); BUG_ON(pixels_current == pixels_prev);
obj = drm_gem_object_lookup(dev, file_priv, handle);
if (!obj)
return -ENOENT;
ret = mgag200_bo_reserve(pixels_1, true); ret = mgag200_bo_reserve(pixels_1, true);
if (ret) { if (ret) {
WREG8(MGA_CURPOSXL, 0); WREG8(MGA_CURPOSXL, 0);
WREG8(MGA_CURPOSXH, 0); WREG8(MGA_CURPOSXH, 0);
return ret; goto out_unref;
} }
ret = mgag200_bo_reserve(pixels_2, true); ret = mgag200_bo_reserve(pixels_2, true);
if (ret) { if (ret) {
WREG8(MGA_CURPOSXL, 0); WREG8(MGA_CURPOSXL, 0);
WREG8(MGA_CURPOSXH, 0); WREG8(MGA_CURPOSXH, 0);
mgag200_bo_unreserve(pixels_1); mgag200_bo_unreserve(pixels_1);
return ret; goto out_unreserve1;
} }
if (!handle) { if (!handle) {
@ -106,16 +110,6 @@ int mga_crtc_cursor_set(struct drm_crtc *crtc,
} }
} }
mutex_lock(&dev->struct_mutex);
obj = drm_gem_object_lookup(dev, file_priv, handle);
if (!obj) {
mutex_unlock(&dev->struct_mutex);
ret = -ENOENT;
goto out1;
}
drm_gem_object_unreference(obj);
mutex_unlock(&dev->struct_mutex);
bo = gem_to_mga_bo(obj); bo = gem_to_mga_bo(obj);
ret = mgag200_bo_reserve(bo, true); ret = mgag200_bo_reserve(bo, true);
if (ret) { if (ret) {
@ -252,7 +246,11 @@ int mga_crtc_cursor_set(struct drm_crtc *crtc,
if (ret) if (ret)
mga_hide_cursor(mdev); mga_hide_cursor(mdev);
mgag200_bo_unreserve(pixels_1); mgag200_bo_unreserve(pixels_1);
out_unreserve1:
mgag200_bo_unreserve(pixels_2); mgag200_bo_unreserve(pixels_2);
out_unref:
drm_gem_object_unreference_unlocked(obj);
return ret; return ret;
} }