drm/i915: introduce intel_ring_buffer structure (V2)

[net-next-2.6.git] / drivers / gpu / drm / i915 / intel_overlay.c

diff --git a/drivers/gpu/drm/i915/intel_overlay.c b/drivers/gpu/drm/i915/intel_overlay.c
index 6d524a1fc271331939c0e3625e75e08e45376d61..93da83782e5ed50e1cd4e15dbd23ed0666e604a4 100644 (file)
--- a/drivers/gpu/drm/i915/intel_overlay.c
+++ b/drivers/gpu/drm/i915/intel_overlay.c
@@ -211,9 +211,7 @@ static void intel_overlay_unmap_regs_atomic(struct intel_overlay *overlay)
 static int intel_overlay_on(struct intel_overlay *overlay)
 {
        struct drm_device *dev = overlay->dev;
-        drm_i915_private_t *dev_priv = dev->dev_private;
        int ret;
-       RING_LOCALS;
 
        BUG_ON(overlay->active);
 
@@ -248,7 +246,6 @@ static void intel_overlay_continue(struct intel_overlay *overlay,
         drm_i915_private_t *dev_priv = dev->dev_private;
        u32 flip_addr = overlay->flip_addr;
        u32 tmp;
-       RING_LOCALS;
 
        BUG_ON(!overlay->active);
 
@@ -274,7 +271,6 @@ static int intel_overlay_wait_flip(struct intel_overlay *overlay)
         drm_i915_private_t *dev_priv = dev->dev_private;
        int ret;
        u32 tmp;
-       RING_LOCALS;
 
        if (overlay->last_flip_req != 0) {
                ret = i915_do_wait_request(dev, overlay->last_flip_req, 1);
@@ -314,9 +310,7 @@ static int intel_overlay_off(struct intel_overlay *overlay)
 {
        u32 flip_addr = overlay->flip_addr;
        struct drm_device *dev = overlay->dev;
-        drm_i915_private_t *dev_priv = dev->dev_private;
        int ret;
-       RING_LOCALS;
 
        BUG_ON(!overlay->active);
 
@@ -373,7 +367,7 @@ static void intel_overlay_off_tail(struct intel_overlay *overlay)
 
        /* never have the overlay hw on without showing a frame */
        BUG_ON(!overlay->vid_bo);
-       obj = overlay->vid_bo->obj;
+       obj = &overlay->vid_bo->base;
 
        i915_gem_object_unpin(obj);
        drm_gem_object_unreference(obj);
@@ -390,11 +384,9 @@ int intel_overlay_recover_from_interrupt(struct intel_overlay *overlay,
                                         int interruptible)
 {
        struct drm_device *dev = overlay->dev;
-        drm_i915_private_t *dev_priv = dev->dev_private;
        struct drm_gem_object *obj;
        u32 flip_addr;
        int ret;
-       RING_LOCALS;
 
        if (overlay->hw_wedged == HW_WEDGED)
                return -EIO;
@@ -411,7 +403,7 @@ int intel_overlay_recover_from_interrupt(struct intel_overlay *overlay,
 
        switch (overlay->hw_wedged) {
                case RELEASE_OLD_VID:
-                       obj = overlay->old_vid_bo->obj;
+                       obj = &overlay->old_vid_bo->base;
                        i915_gem_object_unpin(obj);
                        drm_gem_object_unreference(obj);
                        overlay->old_vid_bo = NULL;
@@ -467,7 +459,7 @@ static int intel_overlay_release_old_vid(struct intel_overlay *overlay)
        if (ret != 0)
                return ret;
 
-       obj = overlay->old_vid_bo->obj;
+       obj = &overlay->old_vid_bo->base;
        i915_gem_object_unpin(obj);
        drm_gem_object_unreference(obj);
        overlay->old_vid_bo = NULL;
@@ -1341,7 +1333,7 @@ void intel_setup_overlay(struct drm_device *dev)
                return;
        overlay->dev = dev;
 
-       reg_bo = drm_gem_object_alloc(dev, PAGE_SIZE);
+       reg_bo = i915_gem_alloc_object(dev, PAGE_SIZE);
        if (!reg_bo)
                goto out_free;
        overlay->reg_bo = to_intel_bo(reg_bo);