Merge branch 'irq-threaded-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

[pandora-kernel.git] / drivers / gpu / drm / radeon / radeon_gem.c

diff --git a/drivers/gpu/drm/radeon/radeon_gem.c b/drivers/gpu/drm/radeon/radeon_gem.c
index d4ceff1..d880edf 100644 (file)
--- a/drivers/gpu/drm/radeon/radeon_gem.c
+++ b/drivers/gpu/drm/radeon/radeon_gem.c
@@ -274,16 +274,22 @@ int radeon_gem_busy_ioctl(struct drm_device *dev, void *data,
        }
        robj = gobj->driver_private;
        r = radeon_object_busy_domain(robj, &cur_placement);
-       if (cur_placement == TTM_PL_VRAM)
+       switch (cur_placement) {
+       case TTM_PL_VRAM:
                args->domain = RADEON_GEM_DOMAIN_VRAM;
-       if (cur_placement == TTM_PL_FLAG_TT)
+               break;
+       case TTM_PL_TT:
                args->domain = RADEON_GEM_DOMAIN_GTT;
-       if (cur_placement == TTM_PL_FLAG_SYSTEM)
+               break;
+       case TTM_PL_SYSTEM:
                args->domain = RADEON_GEM_DOMAIN_CPU;
+       default:
+               break;
+       }
        mutex_lock(&dev->struct_mutex);
        drm_gem_object_unreference(gobj);
        mutex_unlock(&dev->struct_mutex);
-       return 0;
+       return r;
 }
 
 int radeon_gem_wait_idle_ioctl(struct drm_device *dev, void *data,