Merge branch 'gpu-switcher' of /ssd/git//linux-2.6 into drm-next-stage

[safe/jmp/linux-2.6] / 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 cb2f16a..8fccbf2 100644 (file)
--- a/drivers/gpu/drm/radeon/radeon_fb.c
+++ b/drivers/gpu/drm/radeon/radeon_fb.c
@@ -39,6 +39,8 @@
 
 #include "drm_fb_helper.h"
 
+#include <linux/vga_switcheroo.h>
+
 struct radeon_fb_device {
        struct drm_fb_helper helper;
        struct radeon_framebuffer       *rfb;
@@ -59,7 +61,7 @@ static struct fb_ops radeonfb_ops = {
 };
 
 /**
- * Curretly it is assumed that the old framebuffer is reused.
+ * Currently it is assumed that the old framebuffer is reused.
  *
  * LOCKING
  * caller should hold the mode config lock.
@@ -140,7 +142,7 @@ int radeonfb_create(struct drm_device *dev,
        struct radeon_framebuffer *rfb;
        struct drm_mode_fb_cmd mode_cmd;
        struct drm_gem_object *gobj = NULL;
-       struct radeon_object *robj = NULL;
+       struct radeon_bo *rbo = NULL;
        struct device *device = &rdev->pdev->dev;
        int size, aligned_size, ret;
        u64 fb_gpuaddr;
@@ -148,7 +150,6 @@ int radeonfb_create(struct drm_device *dev,
        unsigned long tmp;
        bool fb_tiled = false; /* useful for testing */
        u32 tiling_flags = 0;
-       int crtc_count;
 
        mode_cmd.width = surface_width;
        mode_cmd.height = surface_height;
@@ -168,14 +169,14 @@ int radeonfb_create(struct drm_device *dev,
        ret = radeon_gem_object_create(rdev, aligned_size, 0,
                        RADEON_GEM_DOMAIN_VRAM,
                        false, ttm_bo_type_kernel,
-                       false, &gobj);
+                       &gobj);
        if (ret) {
                printk(KERN_ERR "failed to allocate framebuffer (%d %d)\n",
                       surface_width, surface_height);
                ret = -ENOMEM;
                goto out;
        }
-       robj = gobj->driver_private;
+       rbo = gobj->driver_private;
 
        if (fb_tiled)
                tiling_flags = RADEON_TILING_MACRO;
@@ -192,8 +193,13 @@ int radeonfb_create(struct drm_device *dev,
        }
 #endif
 
-       if (tiling_flags)
-               radeon_object_set_tiling_flags(robj, tiling_flags | RADEON_TILING_SURFACE, mode_cmd.pitch);
+       if (tiling_flags) {
+               ret = radeon_bo_set_tiling_flags(rbo,
+                                       tiling_flags | RADEON_TILING_SURFACE,
+                                       mode_cmd.pitch);
+               if (ret)
+                       dev_err(rdev->dev, "FB failed to set tiling flags\n");
+       }
        mutex_lock(&rdev->ddev->struct_mutex);
        fb = radeon_framebuffer_create(rdev->ddev, &mode_cmd, gobj);
        if (fb == NULL) {
@@ -201,10 +207,19 @@ int radeonfb_create(struct drm_device *dev,
                ret = -ENOMEM;
                goto out_unref;
        }
-       ret = radeon_object_pin(robj, RADEON_GEM_DOMAIN_VRAM, &fb_gpuaddr);
+       ret = radeon_bo_reserve(rbo, false);
+       if (unlikely(ret != 0))
+               goto out_unref;
+       ret = radeon_bo_pin(rbo, RADEON_GEM_DOMAIN_VRAM, &fb_gpuaddr);
+       if (ret) {
+               radeon_bo_unreserve(rbo);
+               goto out_unref;
+       }
+       if (fb_tiled)
+               radeon_bo_check_tiling(rbo, 0, 0);
+       ret = radeon_bo_kmap(rbo, &fbptr);
+       radeon_bo_unreserve(rbo);
        if (ret) {
-               printk(KERN_ERR "failed to pin framebuffer\n");
-               ret = -ENOMEM;
                goto out_unref;
        }
 
@@ -213,7 +228,7 @@ int radeonfb_create(struct drm_device *dev,
        *fb_p = fb;
        rfb = to_radeon_framebuffer(fb);
        rdev->fbdev_rfb = rfb;
-       rdev->fbdev_robj = robj;
+       rdev->fbdev_rbo = rbo;
 
        info = framebuffer_alloc(sizeof(struct radeon_fb_device), device);
        if (info == NULL) {
@@ -225,24 +240,12 @@ int radeonfb_create(struct drm_device *dev,
        rfbdev = info->par;
        rfbdev->helper.funcs = &radeon_fb_helper_funcs;
        rfbdev->helper.dev = dev;
-       if (rdev->flags & RADEON_SINGLE_CRTC)
-               crtc_count = 1;
-       else
-               crtc_count = 2;
-       ret = drm_fb_helper_init_crtc_count(&rfbdev->helper, crtc_count,
+       ret = drm_fb_helper_init_crtc_count(&rfbdev->helper, rdev->num_crtc,
                                            RADEONFB_CONN_LIMIT);
        if (ret)
                goto out_unref;
 
-       if (fb_tiled)
-               radeon_object_check_tiling(robj, 0, 0);
-
-       ret = radeon_object_kmap(robj, &fbptr);
-       if (ret) {
-               goto out_unref;
-       }
-
-       memset_io(fbptr, 0, aligned_size);
+       memset_io(fbptr, 0x0, aligned_size);
 
        strcpy(info->fix.id, "radeondrmfb");
 
@@ -251,7 +254,7 @@ int radeonfb_create(struct drm_device *dev,
        info->flags = FBINFO_DEFAULT;
        info->fbops = &radeonfb_ops;
 
-       tmp = fb_gpuaddr - rdev->mc.vram_location;
+       tmp = fb_gpuaddr - rdev->mc.vram_start;
        info->fix.smem_start = rdev->mc.aper_base + tmp;
        info->fix.smem_len = size;
        info->screen_base = fbptr;
@@ -285,11 +288,16 @@ int radeonfb_create(struct drm_device *dev,
        rfbdev->rdev = rdev;
 
        mutex_unlock(&rdev->ddev->struct_mutex);
+       vga_switcheroo_client_fb_set(rdev->ddev->pdev, info);
        return 0;
 
 out_unref:
-       if (robj) {
-               radeon_object_kunmap(robj);
+       if (rbo) {
+               ret = radeon_bo_reserve(rbo, false);
+               if (likely(ret == 0)) {
+                       radeon_bo_kunmap(rbo);
+                       radeon_bo_unreserve(rbo);
+               }
        }
        if (fb && ret) {
                list_del(&fb->filp_head);
@@ -335,7 +343,8 @@ int radeonfb_remove(struct drm_device *dev, struct drm_framebuffer *fb)
 {
        struct fb_info *info;
        struct radeon_framebuffer *rfb = to_radeon_framebuffer(fb);
-       struct radeon_object *robj;
+       struct radeon_bo *rbo;
+       int r;
 
        if (!fb) {
                return -EINVAL;
@@ -343,10 +352,14 @@ int radeonfb_remove(struct drm_device *dev, struct drm_framebuffer *fb)
        info = fb->fbdev;
        if (info) {
                struct radeon_fb_device *rfbdev = info->par;
-               robj = rfb->obj->driver_private;
+               rbo = rfb->obj->driver_private;
                unregister_framebuffer(info);
-               radeon_object_kunmap(robj);
-               radeon_object_unpin(robj);
+               r = radeon_bo_reserve(rbo, false);
+               if (likely(r == 0)) {
+                       radeon_bo_kunmap(rbo);
+                       radeon_bo_unpin(rbo);
+                       radeon_bo_unreserve(rbo);
+               }
                drm_fb_helper_free(&rfbdev->helper);
                framebuffer_release(info);
        }