projects
/
linux-2.6-microblaze.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
drm/radeon: Add break to switch statement in radeonfb_create_pinned_object()
[linux-2.6-microblaze.git]
/
drivers
/
gpu
/
drm
/
radeon
/
radeon_fb.c
diff --git
a/drivers/gpu/drm/radeon/radeon_fb.c
b/drivers/gpu/drm/radeon/radeon_fb.c
index
0b206b0
..
ca382fb
100644
(file)
--- a/
drivers/gpu/drm/radeon/radeon_fb.c
+++ b/
drivers/gpu/drm/radeon/radeon_fb.c
@@
-54,6
+54,7
@@
radeonfb_open(struct fb_info *info, int user)
struct radeon_fbdev *rfbdev = info->par;
struct radeon_device *rdev = rfbdev->rdev;
int ret = pm_runtime_get_sync(rdev->ddev->dev);
struct radeon_fbdev *rfbdev = info->par;
struct radeon_device *rdev = rfbdev->rdev;
int ret = pm_runtime_get_sync(rdev->ddev->dev);
+
if (ret < 0 && ret != -EACCES) {
pm_runtime_mark_last_busy(rdev->ddev->dev);
pm_runtime_put_autosuspend(rdev->ddev->dev);
if (ret < 0 && ret != -EACCES) {
pm_runtime_mark_last_busy(rdev->ddev->dev);
pm_runtime_put_autosuspend(rdev->ddev->dev);
@@
-167,6
+168,7
@@
static int radeonfb_create_pinned_object(struct radeon_fbdev *rfbdev,
break;
case 2:
tiling_flags |= RADEON_TILING_SWAP_16BIT;
break;
case 2:
tiling_flags |= RADEON_TILING_SWAP_16BIT;
+ break;
default:
break;
}
default:
break;
}
@@
-196,9
+198,8
@@
static int radeonfb_create_pinned_object(struct radeon_fbdev *rfbdev,
radeon_bo_check_tiling(rbo, 0, 0);
ret = radeon_bo_kmap(rbo, NULL);
radeon_bo_unreserve(rbo);
radeon_bo_check_tiling(rbo, 0, 0);
ret = radeon_bo_kmap(rbo, NULL);
radeon_bo_unreserve(rbo);
- if (ret)
{
+ if (ret)
goto out_unref;
goto out_unref;
- }
*gobj_p = gobj;
return 0;
*gobj_p = gobj;
return 0;
@@
-294,9
+295,6
@@
static int radeonfb_create(struct drm_fb_helper *helper,
return 0;
out:
return 0;
out:
- if (rbo) {
-
- }
if (fb && ret) {
drm_gem_object_put(gobj);
drm_framebuffer_unregister_private(fb);
if (fb && ret) {
drm_gem_object_put(gobj);
drm_framebuffer_unregister_private(fb);