commit 80ba33d88f07caa74cf90721780f17f26fe9d236
author Jason Varbedian <jasonv@codeaurora.org> Mon Jul 11 17:29:05 2011 -0700
committer Bryan Huntsman <bryanh@codeaurora.org> Mon Oct 03 09:58:23 2011 -0700
tree 8f5514e1630dbcbdb9ce72bdec6d0a0fe8c72ef9
parent c5760300500abbf48d54daa86836890da276ea58

msm: kgsl: change readtimestamp from IOR to IOWR and keep legacy

Signed-off-by: Jason Varbedian <jasonv@codeaurora.org>

drivers/gpu/msm/kgsl.c

diff --git a/drivers/gpu/msm/kgsl.c b/drivers/gpu/msm/kgsl.c
index fef664b..ec9ff6b 100644
--- a/drivers/gpu/msm/kgsl.c
+++ b/drivers/gpu/msm/kgsl.c
@@ -1594,6 +1594,8 @@
 
 	if (cmd == IOCTL_KGSL_CMDSTREAM_FREEMEMONTIMESTAMP_OLD)
 		cmd = IOCTL_KGSL_CMDSTREAM_FREEMEMONTIMESTAMP;
+	else if (cmd == IOCTL_KGSL_CMDSTREAM_READTIMESTAMP_OLD)
+		cmd = IOCTL_KGSL_CMDSTREAM_READTIMESTAMP;
 
 	if (cmd & (IOC_IN | IOC_OUT)) {
 		if (_IOC_SIZE(cmd) < sizeof(ustack))

include/linux/msm_kgsl.h

diff --git a/include/linux/msm_kgsl.h b/include/linux/msm_kgsl.h
index 2a38d52..cc5bd8f 100644
--- a/include/linux/msm_kgsl.h
+++ b/include/linux/msm_kgsl.h
@@ -2,7 +2,7 @@
 #define _MSM_KGSL_H
 
 #define KGSL_VERSION_MAJOR        3
-#define KGSL_VERSION_MINOR        4
+#define KGSL_VERSION_MINOR        5
 
 /*context flags */
 #define KGSL_CONTEXT_SAVE_GMEM	1
@@ -238,9 +238,12 @@
 	unsigned int timestamp; /*output param */
 };
 
-#define IOCTL_KGSL_CMDSTREAM_READTIMESTAMP \
+#define IOCTL_KGSL_CMDSTREAM_READTIMESTAMP_OLD \
 	_IOR(KGSL_IOC_TYPE, 0x11, struct kgsl_cmdstream_readtimestamp)
 
+#define IOCTL_KGSL_CMDSTREAM_READTIMESTAMP \
+	_IOWR(KGSL_IOC_TYPE, 0x11, struct kgsl_cmdstream_readtimestamp)
+
 /* free memory when the GPU reaches a given timestamp.
  * gpuaddr specify a memory region created by a
  * IOCTL_KGSL_SHAREDMEM_FROM_PMEM call