drm: update VIA driver to 2.7.2

Add PCI DMA blitengine to VIA DRM
Add portability code for porting VIA to FreeBSD.
Sync via_drm.h with 3d driver

From: Thomas Hellstrom <unichrome@shipmail.org>, Eric Anholt <anholt@freebsd.org>
Signed-off-by: Dave Airlie <airlied@linux.ie>

1 files changed, 8 insertions, 8 deletions

diff --git a/drivers/char/drm/via_mm.c b/drivers/char/drm/via_mm.c
index 3baddacdff26..62e692556a1d 100644
--- a/drivers/char/drm/via_mm.c
+++ b/drivers/char/drm/via_mm.c
@@ -199,13 +199,13 @@ int via_mem_alloc(DRM_IOCTL_ARGS)
                                  sizeof(mem));
 
         switch (mem.type) {
-        case VIDEO:
+        case VIA_MEM_VIDEO:
                 if (via_fb_alloc(&mem) < 0)
                         return -EFAULT;
                 DRM_COPY_TO_USER_IOCTL((drm_via_mem_t __user *) data, mem,
                                        sizeof(mem));
                 return 0;
-        case AGP:
+        case VIA_MEM_AGP:
                 if (via_agp_alloc(&mem) < 0)
                         return -EFAULT;
                 DRM_COPY_TO_USER_IOCTL((drm_via_mem_t __user *) data, mem,
@@ -232,7 +232,7 @@ static int via_fb_alloc(drm_via_mem_t * mem)
         if (block) {
                 fb.offset = block->ofs;
                 fb.free = (unsigned long)block;
-                if (!add_alloc_set(fb.context, VIDEO, fb.free)) {
+                if (!add_alloc_set(fb.context, VIA_MEM_VIDEO, fb.free)) {
                         DRM_DEBUG("adding to allocation set fails\n");
                         via_mmFreeMem((PMemBlock) fb.free);
                         retval = -1;
@@ -269,7 +269,7 @@ static int via_agp_alloc(drm_via_mem_t * mem)
         if (block) {
                 agp.offset = block->ofs;
                 agp.free = (unsigned long)block;
-                if (!add_alloc_set(agp.context, AGP, agp.free)) {
+                if (!add_alloc_set(agp.context, VIA_MEM_AGP, agp.free)) {
                         DRM_DEBUG("adding to allocation set fails\n");
                         via_mmFreeMem((PMemBlock) agp.free);
                         retval = -1;
@@ -297,11 +297,11 @@ int via_mem_free(DRM_IOCTL_ARGS)
 
         switch (mem.type) {
 
-        case VIDEO:
+        case VIA_MEM_VIDEO:
                 if (via_fb_free(&mem) == 0)
                         return 0;
                 break;
-        case AGP:
+        case VIA_MEM_AGP:
                 if (via_agp_free(&mem) == 0)
                         return 0;
                 break;
@@ -329,7 +329,7 @@ static int via_fb_free(drm_via_mem_t * mem)
 
         via_mmFreeMem((PMemBlock) fb.free);
 
-        if (!del_alloc_set(fb.context, VIDEO, fb.free)) {
+        if (!del_alloc_set(fb.context, VIA_MEM_VIDEO, fb.free)) {
                 retval = -1;
         }
 
@@ -352,7 +352,7 @@ static int via_agp_free(drm_via_mem_t * mem)
 
         via_mmFreeMem((PMemBlock) agp.free);
 
-        if (!del_alloc_set(agp.context, AGP, agp.free)) {
+        if (!del_alloc_set(agp.context, VIA_MEM_AGP, agp.free)) {
                 retval = -1;
         }