Changeset 18879 for src/linux/universal/linux-3.3/drivers/gpu/drm/radeon/radeon_cursor.c

Timestamp:

03/31/12 01:43:19 (14 months ago)

Author:

BrainSlayer

Message:

update kernels

File:

• src/linux/universal/linux-3.3/drivers/gpu/drm/radeon/radeon_cursor.c (modified) (3 diffs)

src/linux/universal/linux-3.3/drivers/gpu/drm/radeon/radeon_cursor.c

@@ -152 +152 @@
 {
         struct radeon_crtc *radeon_crtc = to_radeon_crtc(crtc);
+        struct radeon_device *rdev = crtc->dev->dev_private;
         struct drm_gem_object *obj;
+        struct radeon_bo *robj;
         uint64_t gpu_addr;
         int ret;
@@ -174 +176 @@
         }
 
-        ret = radeon_gem_object_pin(obj, RADEON_GEM_DOMAIN_VRAM, &gpu_addr);
+        robj = gem_to_radeon_bo(obj);
+        ret = radeon_bo_reserve(robj, false);
+        if (unlikely(ret != 0))
+                goto fail;
+        /* Only 27 bit offset for legacy cursor */
+        ret = radeon_bo_pin_restricted(robj, RADEON_GEM_DOMAIN_VRAM,
+                                       ASIC_IS_AVIVO(rdev) ? 0 : 1 << 27,
+                                       &gpu_addr);
+        radeon_bo_unreserve(robj);
         if (ret)
                 goto fail;
@@ -182 +192 @@
 
         radeon_lock_cursor(crtc, true);
-        /* XXX only 27 bit offset for legacy cursor */
         radeon_set_cursor(crtc, obj, gpu_addr);
         radeon_show_cursor(crtc);