commit 848741a5ec938089cdc92feb3748174e336beea2
author Jason <jasonv@codeaurora.org> Tue Jul 12 10:24:25 2011 -0700
committer Bryan Huntsman <bryanh@codeaurora.org> Mon Oct 03 09:59:03 2011 -0700
tree 09cccd72fd19423ba11bec5e4ec83cfc4d89e687
parent 26512dea431f8347a8bbce561982df939225e2c6

msm: kgsl: make map_user_mem accept sharedmem_from_pmem struct

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 e4add0d..b26646e 100644
--- a/drivers/gpu/msm/kgsl.c
+++ b/drivers/gpu/msm/kgsl.c
@@ -1381,6 +1381,7 @@
 	struct kgsl_map_user_mem *param = data;
 	struct kgsl_mem_entry *entry = NULL;
 	struct kgsl_process_private *private = dev_priv->process_priv;
+	enum kgsl_user_mem_type memtype;
 
 	entry = kgsl_mem_entry_create();
 
@@ -1389,7 +1390,12 @@
 
 	kgsl_memqueue_drain_unlocked(dev_priv->device);
 
-	switch (param->memtype) {
+	if (_IOC_SIZE(cmd) == sizeof(struct kgsl_sharedmem_from_pmem))
+		memtype = KGSL_USER_MEM_TYPE_PMEM;
+	else
+		memtype = param->memtype;
+
+	switch (memtype) {
 	case KGSL_USER_MEM_TYPE_PMEM:
 		if (param->fd == 0 || param->len == 0)
 			break;
@@ -1431,7 +1437,7 @@
 					   param->len);
 		break;
 	default:
-		KGSL_CORE_ERR("Invalid memory type: %x\n", param->memtype);
+		KGSL_CORE_ERR("Invalid memory type: %x\n", memtype);
 		break;
 	}