diff --git a/drivers/mxc/amd-gpu/kgsl.c b/drivers/mxc/amd-gpu/kgsl.c index 972879bf7df..18593369287 100644 --- a/drivers/mxc/amd-gpu/kgsl.c +++ b/drivers/mxc/amd-gpu/kgsl.c @@ -505,22 +505,6 @@ done: return status; } -/* not implemented in qcom kernel? */ -static int kgsl_ioctl_device_regwrite(struct file *fd, void __user *arg) -{ - int status = GSL_SUCCESS; - struct kgsl_device_regwrite param; - - if (copy_from_user(¶m, arg, sizeof(param))) { - pr_err("%s: copy_from_user error\n", __func__); - return GSL_FAILURE; - } - - status = kgsl_device_regwrite(param.device_id, param.offsetwords, param.value); - - return status; -} - /* device_waittimestamp in qcom */ static int kgsl_ioctl_cmdstream_waittimestamp(struct file *fd, void __user *arg) { @@ -954,27 +938,6 @@ static int kgsl_ioctl_drawctxt_bind_gmem_shadow(struct file *fd, void __user *ar return status; } -#if 0 -static int kgsl_ioctl_add_timestamp(struct file *fd, void __user *arg) -{ - struct kgsl_add_timestamp param; - unsigned int tmp; - - if (copy_from_user(¶m, arg, sizeof(param))) { - pr_err("%s: copy_from_user error\n", __func__); - return GSL_FAILURE; - } - - tmp = kgsl_add_timestamp(param.device_id, &tmp); - - if (copy_to_user(param.timestamp, &tmp, sizeof(unsigned int))) { - pr_err("%s: copy_to_user error\n", __func__); - return GSL_FAILURE; - } - return GSL_SUCCESS; -} -#endif - static int kgsl_ioctl(struct inode *inode, struct file *fd, unsigned int cmd, unsigned long arg) { int result = GSL_FAILURE; @@ -985,9 +948,6 @@ static int kgsl_ioctl(struct inode *inode, struct file *fd, unsigned int cmd, un case IOCTL_KGSL_DEVICE_REGREAD: result = kgsl_ioctl_device_regread(fd, (void __user *)arg); break; - case IOCTL_KGSL_DEVICE_REGWRITE: - result = kgsl_ioctl_device_regwrite(fd, (void __user *)arg); - break; case IOCTL_KGSL_DEVICE_GETPROPERTY: result = kgsl_ioctl_device_getproperty(fd, (void __user *)arg); break; diff --git a/include/linux/mxc_kgsl.h b/include/linux/mxc_kgsl.h index c6e051485bf..2e55c3f8837 100644 --- a/include/linux/mxc_kgsl.h +++ b/include/linux/mxc_kgsl.h @@ -245,15 +245,6 @@ struct kgsl_device_regread { #define IOCTL_KGSL_DEVICE_REGREAD \ _IOWR(KGSL_IOC_TYPE, 0x26, struct kgsl_device_regread) -struct kgsl_device_regwrite { - unsigned int device_id; - unsigned int offsetwords; - unsigned int value; -}; - -#define IOCTL_KGSL_DEVICE_REGWRITE \ - _IOW(KGSL_IOC_TYPE, 0x27, struct kgsl_device_regwrite) - /* * qcom: kgsl_ringbuffer_issueibcmds IOCNR=0x10 * all unsigned int (including timestamp!?) @@ -486,15 +477,6 @@ struct kgsl_sharedmem_fromhostpointer { #define IOCTL_KGSL_SHAREDMEM_FROMHOSTPOINTER \ _IOW(KGSL_IOC_TYPE, 0x38, struct kgsl_sharedmem_fromhostpointer) -/* NQ */ -//struct kgsl_add_timestamp { -// unsigned int device_id; -// unsigned int *timestamp; -//}; -// -//#define IOCTL_KGSL_ADD_TIMESTAMP \ -// _IOWR(KGSL_IOC_TYPE, 0x39, struct kgsl_add_timestamp) - /* NQ */ #define IOCTL_KGSL_DRIVER_EXIT \ _IOWR(KGSL_IOC_TYPE, 0x3A, NULL)