[Openchrome-devel] xf86-video-openchrome: src/via_drm.h src/via_memmgr.c

[James Simmons]

 src/via_drm.h    |    4 ++--
 src/via_memmgr.c |    4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 9355bc487e12aa7af2edd13dbfcaf9c8752ae954
Author: James Simmons <jsimmons at infradead.org>
Date:   Wed Mar 20 20:26:19 2013 -0400

    Rename GEM data structure in the fashion of other drm driver apis

diff --git a/src/via_drm.h b/src/via_drm.h
index 64d3f17..f8939be 100644
--- a/src/via_drm.h
+++ b/src/via_drm.h
@@ -82,7 +82,7 @@
 #define DRM_IOCTL_VIA_FB_INIT	  DRM_IOWR(DRM_COMMAND_BASE + DRM_VIA_FB_INIT, drm_via_fb_t)
 #define DRM_IOCTL_VIA_MAP_INIT	  DRM_IOWR(DRM_COMMAND_BASE + DRM_VIA_MAP_INIT, drm_via_init_t)
 #define DRM_IOCTL_VIA_DEC_FUTEX   DRM_IOW( DRM_COMMAND_BASE + DRM_VIA_DEC_FUTEX, drm_via_futex_t)
-#define DRM_IOCTL_VIA_GEM_CREATE  DRM_IOWR(DRM_COMMAND_BASE + DRM_VIA_GEM_CREATE, struct drm_gem_create)
+#define DRM_IOCTL_VIA_GEM_CREATE  DRM_IOWR(DRM_COMMAND_BASE + DRM_VIA_GEM_CREATE, struct drm_via_gem_create)
 #define DRM_IOCTL_VIA_DMA_INIT	  DRM_IOWR(DRM_COMMAND_BASE + DRM_VIA_DMA_INIT, drm_via_dma_init_t)
 #define DRM_IOCTL_VIA_CMDBUFFER	  DRM_IOW( DRM_COMMAND_BASE + DRM_VIA_CMDBUFFER, drm_via_cmdbuffer_t)
 #define DRM_IOCTL_VIA_FLUSH	  DRM_IO(  DRM_COMMAND_BASE + DRM_VIA_FLUSH)
@@ -272,7 +272,7 @@ typedef struct drm_via_dmablit {
 	drm_via_blitsync_t sync;
 } drm_via_dmablit_t;
 
-struct drm_gem_create {
+struct drm_via_gem_create {
 	/**
 	 * Requested size for the object.
 	 *
diff --git a/src/via_memmgr.c b/src/via_memmgr.c
index 73bc53e..187e3a8 100644
--- a/src/via_memmgr.c
+++ b/src/via_memmgr.c
@@ -119,7 +119,7 @@ drm_bo_alloc(ScrnInfoPtr pScrn, unsigned int size, unsigned int alignment, int d
                                 obj->size, obj->offset, obj->handle));
                 }
             } else if (pVia->directRenderingType == DRI_2) {
-                struct drm_gem_create args;
+                struct drm_via_gem_create args;
 
                 /* Some day this will be moved to libdrm. */
                 args.domains = domain;
@@ -127,7 +127,7 @@ drm_bo_alloc(ScrnInfoPtr pScrn, unsigned int size, unsigned int alignment, int d
                 args.pitch = 0;
                 args.size = size;
                 ret = drmCommandWriteRead(pVia->drmmode.fd, DRM_VIA_GEM_CREATE,
-                                        &args, sizeof(struct drm_gem_create));
+                                        &args, sizeof(struct drm_via_gem_create));
                 if (!ret) {
                     /* Okay the X server expects to know the offset because
                      * of non-KMS. Once we have KMS working the offset