gma500: Rename the ioctls to avoid clashing with the legacy drivers

Signed-off-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>

diff --git a/drivers/gpu/drm/gma500/gem.c b/drivers/gpu/drm/gma500/gem.c
index 65fdd6b8ab1689f749e48de44f62b75c7f775e75..d743679939892347b2b0663fadb01fdc40bc890e 100644 (file)
--- a/drivers/gpu/drm/gma500/gem.c
+++ b/drivers/gpu/drm/gma500/gem.c
@@ -274,13 +274,13 @@ int psb_gem_create_ioctl(struct drm_device *dev, void *data,
 {
        struct drm_psb_gem_create *args = data;
        int ret;
-       if (args->flags & PSB_GEM_CREATE_STOLEN) {
+       if (args->flags & GMA_GEM_CREATE_STOLEN) {
                ret = psb_gem_create_stolen(file, dev, args->size,
                                                        &args->handle);
                if (ret == 0)
                        return 0;
                /* Fall throguh */
-               args->flags &= ~PSB_GEM_CREATE_STOLEN;
+               args->flags &= ~GMA_GEM_CREATE_STOLEN;
        }
        return psb_gem_create(file, dev, args->size, &args->handle);
 }

diff --git a/drivers/gpu/drm/gma500/psb_drm.h b/drivers/gpu/drm/gma500/psb_drm.h
index 72eeb7a9d4be501e638c507b77e5a78bf0663b99..6ded3439614d113656be5d84623c9b015d1d000d 100644 (file)
--- a/drivers/gpu/drm/gma500/psb_drm.h
+++ b/drivers/gpu/drm/gma500/psb_drm.h
@@ -63,7 +63,7 @@ struct drm_psb_gem_create {
        __u64 size;
        __u32 handle;
        __u32 flags;
-#define PSB_GEM_CREATE_STOLEN          1       /* Stolen memory can be used */
+#define GMA_GEM_CREATE_STOLEN          1       /* Stolen memory can be used */
 };
 
 struct drm_psb_gem_mmap {
@@ -79,15 +79,15 @@ struct drm_psb_gem_mmap {
 
 /* Controlling the kernel modesetting buffers */
 
-#define DRM_PSB_GEM_CREATE     0x00            /* Create a GEM object */
-#define DRM_PSB_GEM_MMAP       0x01            /* Map GEM memory */
-#define DRM_PSB_STOLEN_MEMORY  0x02            /* Report stolen memory */
-#define DRM_PSB_2D_OP          0x03            /* Will be merged later */
-#define DRM_PSB_GAMMA          0x04            /* Set gamma table */
-#define DRM_PSB_ADB            0x05            /* Get backlight */
-#define DRM_PSB_DPST_BL                0x06            /* Set backlight */
-#define DRM_PSB_GET_PIPE_FROM_CRTC_ID 0x1      /* CRTC to physical pipe# */
-#define DRM_PSB_MODE_OPERATION 0x07            /* Mode validation/DC set */
+#define DRM_GMA_GEM_CREATE     0x00            /* Create a GEM object */
+#define DRM_GMA_GEM_MMAP       0x01            /* Map GEM memory */
+#define DRM_GMA_STOLEN_MEMORY  0x02            /* Report stolen memory */
+#define DRM_GMA_2D_OP          0x03            /* Will be merged later */
+#define DRM_GMA_GAMMA          0x04            /* Set gamma table */
+#define DRM_GMA_ADB            0x05            /* Get backlight */
+#define DRM_GMA_DPST_BL                0x06            /* Set backlight */
+#define DRM_GMA_GET_PIPE_FROM_CRTC_ID 0x1      /* CRTC to physical pipe# */
+#define DRM_GMA_MODE_OPERATION 0x07            /* Mode validation/DC set */
 #define        PSB_MODE_OPERATION_MODE_VALID   0x01
 
 

diff --git a/drivers/gpu/drm/gma500/psb_drv.c b/drivers/gpu/drm/gma500/psb_drv.c
index c65a8725b1547fd93a765a8c2589bfd02e645236..062df075a717f78feed56ac56760dedca6e85f2b 100644 (file)
--- a/drivers/gpu/drm/gma500/psb_drv.c
+++ b/drivers/gpu/drm/gma500/psb_drv.c
@@ -81,27 +81,27 @@ MODULE_DEVICE_TABLE(pci, pciidlist);
  */
 
 #define DRM_IOCTL_PSB_ADB      \
-               DRM_IOWR(DRM_PSB_ADB + DRM_COMMAND_BASE, uint32_t)
+               DRM_IOWR(DRM_GMA_ADB + DRM_COMMAND_BASE, uint32_t)
 #define DRM_IOCTL_PSB_MODE_OPERATION   \
-               DRM_IOWR(DRM_PSB_MODE_OPERATION + DRM_COMMAND_BASE, \
+               DRM_IOWR(DRM_GMA_MODE_OPERATION + DRM_COMMAND_BASE, \
                         struct drm_psb_mode_operation_arg)
 #define DRM_IOCTL_PSB_STOLEN_MEMORY    \
-               DRM_IOWR(DRM_PSB_STOLEN_MEMORY + DRM_COMMAND_BASE, \
+               DRM_IOWR(DRM_GMA_STOLEN_MEMORY + DRM_COMMAND_BASE, \
                         struct drm_psb_stolen_memory_arg)
 #define DRM_IOCTL_PSB_GAMMA    \
-               DRM_IOWR(DRM_PSB_GAMMA + DRM_COMMAND_BASE, \
+               DRM_IOWR(DRM_GMA_GAMMA + DRM_COMMAND_BASE, \
                         struct drm_psb_dpst_lut_arg)
 #define DRM_IOCTL_PSB_DPST_BL  \
-               DRM_IOWR(DRM_PSB_DPST_BL + DRM_COMMAND_BASE, \
+               DRM_IOWR(DRM_GMA_DPST_BL + DRM_COMMAND_BASE, \
                         uint32_t)
 #define DRM_IOCTL_PSB_GET_PIPE_FROM_CRTC_ID    \
-               DRM_IOWR(DRM_PSB_GET_PIPE_FROM_CRTC_ID + DRM_COMMAND_BASE, \
+               DRM_IOWR(DRM_GMA_GET_PIPE_FROM_CRTC_ID + DRM_COMMAND_BASE, \
                         struct drm_psb_get_pipe_from_crtc_id_arg)
 #define DRM_IOCTL_PSB_GEM_CREATE       \
-               DRM_IOWR(DRM_PSB_GEM_CREATE + DRM_COMMAND_BASE, \
+               DRM_IOWR(DRM_GMA_GEM_CREATE + DRM_COMMAND_BASE, \
                         struct drm_psb_gem_create)
 #define DRM_IOCTL_PSB_GEM_MMAP \
-               DRM_IOWR(DRM_PSB_GEM_MMAP + DRM_COMMAND_BASE, \
+               DRM_IOWR(DRM_GMA_GEM_MMAP + DRM_COMMAND_BASE, \
                         struct drm_psb_gem_mmap)
 
 static int psb_adb_ioctl(struct drm_device *dev, void *data,