summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorXianzhong <b07117@freescale.com>2014-09-18 15:24:18 +0800
committerLoren Huang <b02279@freescale.com>2014-09-18 17:53:58 +0800
commit5c823af0549c3207f6b8bfc1b7771a74d540238a (patch)
tree578347a249a8545d46438d4e7731fa4068574f95
parentae20a4870e652ba55bb6f0b9528cdaf3ad8321d1 (diff)
ENGR00332071 Revert "ENGR00322632 [#1243] fix invalid data access over memory mapping"
This reverts commit 321862cbad506707fe9d0ae4dcca24a865a5feea. this patch is from Vivante without test, it causes X issue Date: Sep 18, 2014 Signed-off-by: Xianzhong <b07117@freescale.com> Acked-by: Jason Liu (cherry picked from commit 7cc50eb75efb4c8d41e48577dc020a700ddb1039)
-rw-r--r--drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel.c b/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel.c
index 63ed89e00d27..ea69d81d5e67 100644
--- a/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel.c
+++ b/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel.c
@@ -1192,7 +1192,7 @@ gckKERNEL_Dispatch(
break;
case gcvHAL_ALLOCATE_LINEAR_VIDEO_MEMORY:
- type = Interface->u.AllocateLinearVideoMemory.type & 0xFF;
+ type = Interface->u.AllocateLinearVideoMemory.type;
/* Allocate memory. */
gcmkONERROR(
@@ -1200,7 +1200,7 @@ gckKERNEL_Dispatch(
&Interface->u.AllocateLinearVideoMemory.pool,
Interface->u.AllocateLinearVideoMemory.bytes,
Interface->u.AllocateLinearVideoMemory.alignment,
- type,
+ Interface->u.AllocateLinearVideoMemory.type,
&node));
if (node->VidMem.memory->object.type == gcvOBJ_VIDMEM)