drm/mgag200: Convert mgag200 driver to |struct drm_gem_vram_object|

[linux.git] / drivers / gpu / drm / mgag200 / mgag200_fb.c

diff --git a/drivers/gpu/drm/mgag200/mgag200_fb.c b/drivers/gpu/drm/mgag200/mgag200_fb.c
index 5b7e64cac004962a74c416be22db43d784d8a5c8..1bcf0d65868dc4fcdc01cc64e8440e0aa908f243 100644 (file)
--- a/drivers/gpu/drm/mgag200/mgag200_fb.c
+++ b/drivers/gpu/drm/mgag200/mgag200_fb.c
@@ -23,7 +23,7 @@ static void mga_dirty_update(struct mga_fbdev *mfbdev,
 {
        int i;
        struct drm_gem_object *obj;
-       struct mgag200_bo *bo;
+       struct drm_gem_vram_object *gbo;
        int src_offset, dst_offset;
        int bpp = mfbdev->mfb.base.format->cpp[0];
        int ret = -EBUSY;
@@ -33,7 +33,7 @@ static void mga_dirty_update(struct mga_fbdev *mfbdev,
        unsigned long flags;
 
        obj = mfbdev->mfb.obj;
-       bo = gem_to_mga_bo(obj);
+       gbo = drm_gem_vram_of_gem(obj);
 
        /*
         * try and reserve the BO, if we fail with busy
@@ -41,7 +41,7 @@ static void mga_dirty_update(struct mga_fbdev *mfbdev,
         * store up the damage until later.
         */
        if (drm_can_sleep())
-               ret = mgag200_bo_reserve(bo, true);
+               ret = drm_gem_vram_reserve(gbo, true);
        if (ret) {
                if (ret != -EBUSY)
                        return;
@@ -75,25 +75,27 @@ static void mga_dirty_update(struct mga_fbdev *mfbdev,
        mfbdev->x2 = mfbdev->y2 = 0;
        spin_unlock_irqrestore(&mfbdev->dirty_lock, flags);
 
-       if (!bo->kmap.virtual) {
-               ret = ttm_bo_kmap(&bo->bo, 0, bo->bo.num_pages, &bo->kmap);
+       if (!gbo->kmap.virtual) {
+               ret = ttm_bo_kmap(&gbo->bo, 0, gbo->bo.num_pages, &gbo->kmap);
                if (ret) {
                        DRM_ERROR("failed to kmap fb updates\n");
-                       mgag200_bo_unreserve(bo);
+                       drm_gem_vram_unreserve(gbo);
                        return;
                }
                unmap = true;
        }
        for (i = y; i <= y2; i++) {
                /* assume equal stride for now */
-               src_offset = dst_offset = i * mfbdev->mfb.base.pitches[0] + (x * bpp);
-               memcpy_toio(bo->kmap.virtual + src_offset, mfbdev->sysram + src_offset, (x2 - x + 1) * bpp);
+               src_offset = dst_offset =
+                       i * mfbdev->mfb.base.pitches[0] + (x * bpp);
+               memcpy_toio(gbo->kmap.virtual + src_offset,
+                           mfbdev->sysram + dst_offset, (x2 - x + 1) * bpp);
 
        }
        if (unmap)
-               ttm_bo_kunmap(&bo->kmap);
+               ttm_bo_kunmap(&gbo->kmap);
 
-       mgag200_bo_unreserve(bo);
+       drm_gem_vram_unreserve(gbo);
 }
 
 static void mga_fillrect(struct fb_info *info,