aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xdrivers/staging/ice4100/sgx535/include/env/linux/pvr_drm_shared.h12
-rwxr-xr-xdrivers/staging/ice4100/sgx535/pvr_drm.c13
-rwxr-xr-xdrivers/staging/ice4100/sgx535/pvr_drm.h8
3 files changed, 16 insertions, 17 deletions
diff --git a/drivers/staging/ice4100/sgx535/include/env/linux/pvr_drm_shared.h b/drivers/staging/ice4100/sgx535/include/env/linux/pvr_drm_shared.h
index 522d6649bc3..251d3df2463 100755
--- a/drivers/staging/ice4100/sgx535/include/env/linux/pvr_drm_shared.h
+++ b/drivers/staging/ice4100/sgx535/include/env/linux/pvr_drm_shared.h
@@ -37,12 +37,12 @@
#define PVR_DRM_UNPRIV_CMD DRM_PVR_RESERVED5
#define PVR_DRM_DBGDRV_CMD DRM_PVR_RESERVED6
#else
-#define PVR_DRM_SRVKM_CMD 0
-#define PVR_DRM_DISP_CMD 1
-#define PVR_DRM_BC_CMD 2
-#define PVR_DRM_IS_MASTER_CMD 3
-#define PVR_DRM_UNPRIV_CMD 4
-#define PVR_DRM_DBGDRV_CMD 5
+#define DRM_PVR_SRVKM 0
+#define DRM_PVR_DISP 1
+#define DRM_PVR_BC 2
+#define DRM_PVR_IS_MASTER 3
+#define DRM_PVR_UNPRIV 4
+#define DRM_PVR_DBGDRV 5
#endif
#define PVR_DRM_UNPRIV_INIT_SUCCESFUL 0
diff --git a/drivers/staging/ice4100/sgx535/pvr_drm.c b/drivers/staging/ice4100/sgx535/pvr_drm.c
index 6468a09c595..c89ef52cb8c 100755
--- a/drivers/staging/ice4100/sgx535/pvr_drm.c
+++ b/drivers/staging/ice4100/sgx535/pvr_drm.c
@@ -228,16 +228,15 @@ PVRDRMUnprivCmd(struct drm_device *dev, void *arg, struct drm_file *pFile)
}
#define PVR_DRM_FOPS_IOCTL .unlocked_ioctl
-#define PVR_DRM_UNLOCKED DRM_UNLOCKED
struct drm_ioctl_desc sPVRDrmIoctls[] = {
- DRM_IOCTL_DEF(PVR_DRM_SRVKM_IOCTL, PVRSRV_BridgeDispatchKM,
- PVR_DRM_UNLOCKED),
- DRM_IOCTL_DEF(PVR_DRM_IS_MASTER_IOCTL, PVRDRMIsMaster,
- DRM_MASTER | PVR_DRM_UNLOCKED),
- DRM_IOCTL_DEF(PVR_DRM_UNPRIV_IOCTL, PVRDRMUnprivCmd, PVR_DRM_UNLOCKED),
+ DRM_IOCTL_DEF_DRV(PVR_SRVKM, PVRSRV_BridgeDispatchKM,
+ DRM_UNLOCKED),
+ DRM_IOCTL_DEF_DRV(PVR_IS_MASTER, PVRDRMIsMaster,
+ DRM_MASTER | DRM_UNLOCKED),
+ DRM_IOCTL_DEF_DRV(PVR_UNPRIV, PVRDRMUnprivCmd, DRM_UNLOCKED),
#if defined(PDUMP)
- DRM_IOCTL_DEF(PVR_DRM_DBGDRV_IOCTL, dbgdrv_ioctl, PVR_DRM_UNLOCKED),
+ DRM_IOCTL_DEF_DRV(PVR_DBGDRV, dbgdrv_ioctl, DRM_UNLOCKED),
#endif
};
diff --git a/drivers/staging/ice4100/sgx535/pvr_drm.h b/drivers/staging/ice4100/sgx535/pvr_drm.h
index ac92162ec4b..f1f1aa9b4dd 100755
--- a/drivers/staging/ice4100/sgx535/pvr_drm.h
+++ b/drivers/staging/ice4100/sgx535/pvr_drm.h
@@ -74,10 +74,10 @@ int dbgdrv_ioctl(struct drm_device *dev, void *arg, struct drm_file *pFile);
#endif
#if !defined(SUPPORT_DRI_DRM_EXT)
-#define PVR_DRM_SRVKM_IOCTL _IO(0, PVR_DRM_SRVKM_CMD)
-#define PVR_DRM_IS_MASTER_IOCTL _IO(0, PVR_DRM_IS_MASTER_CMD)
-#define PVR_DRM_UNPRIV_IOCTL _IO(0, PVR_DRM_UNPRIV_CMD)
-#define PVR_DRM_DBGDRV_IOCTL _IO(0, PVR_DRM_DBGDRV_CMD)
+#define DRM_IOCTL_PVR_SRVKM _IO(0, DRM_PVR_SRVKM)
+#define DRM_IOCTL_PVR_IS_MASTER _IO(0, DRM_PVR_IS_MASTER)
+#define DRM_IOCTL_PVR_UNPRIV _IO(0, DRM_PVR_UNPRIV)
+#define DRM_IOCTL_PVR_DBGDRV _IO(0, DRM_PVR_DBGDRV)
#endif
#endif