diff options
| author | Xianzhong <b07117@freescale.com> | 2014-04-17 11:41:18 -0400 |
|---|---|---|
| committer | Nitin Garg <nitin.garg@freescale.com> | 2014-04-17 22:18:43 -0400 |
| commit | b2c52c7d1aa3882083cee1f31b44cef3fd9a8967 (patch) | |
| tree | 32efe64c5abc4e963792f980e01a915a826a83fa | |
| parent | b85cd26e3e5f2bd2953fbd8ea8dcced3a014fbc6 (diff) | |
ENGR00309070 [#1136] fixed GPU kernel random crash in 5.x driver
database list corruption is caused by the extensive surface type(>=0x100)
some random kernel crash issues will be introduced by data corruption
this fix is to clear the extensive surface type with 0xFF mask, referring to
gcvSURF_NUM_TYPES, /* Make sure this is the last one! */
/* Combinations. */
gcvSURF_NO_TILE_STATUS = 0x100,
gcvSURF_NO_VIDMEM = 0x200, /* Used to allocate surfaces with no underlying vidmem node.
In Android, vidmem node is allocated by another process. */
gcvSURF_CACHEABLE = 0x400, /* Used to allocate a cacheable surface */
Date: Apr 17, 2014
Signed-off-by: Xianzhong <b07117@freescale.com>
Acked-by: Jason Liu
(cherry picked from commit 0f79bbd805402a8dcdf22bb119f99f05d8b9e4c3)
| -rw-r--r-- | drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel.c | 4 | ||||
| -rw-r--r-- | drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_command_vg.c | 2 |
2 files changed, 3 insertions, 3 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 092ba444b3db..61ea344c12df 100644 --- a/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel.c +++ b/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel.c | |||
| @@ -993,7 +993,7 @@ _AllocateMemory_Retry: | |||
| 993 | 993 | ||
| 994 | /* Encode surface type and pool to database type. */ | 994 | /* Encode surface type and pool to database type. */ |
| 995 | type = gcvDB_VIDEO_MEMORY | 995 | type = gcvDB_VIDEO_MEMORY |
| 996 | | (Type << gcdDB_VIDEO_MEMORY_TYPE_SHIFT) | 996 | | ((Type & 0xFF) << gcdDB_VIDEO_MEMORY_TYPE_SHIFT) |
| 997 | | (pool << gcdDB_VIDEO_MEMORY_POOL_SHIFT); | 997 | | (pool << gcdDB_VIDEO_MEMORY_POOL_SHIFT); |
| 998 | 998 | ||
| 999 | /* Record in process db. */ | 999 | /* Record in process db. */ |
| @@ -1066,7 +1066,7 @@ gckKERNEL_ReleaseVideoMemory( | |||
| 1066 | gckVIDMEM_HANDLE_Lookup(Kernel, ProcessID, Handle, &nodeObject)); | 1066 | gckVIDMEM_HANDLE_Lookup(Kernel, ProcessID, Handle, &nodeObject)); |
| 1067 | 1067 | ||
| 1068 | type = gcvDB_VIDEO_MEMORY | 1068 | type = gcvDB_VIDEO_MEMORY |
| 1069 | | (nodeObject->type << gcdDB_VIDEO_MEMORY_TYPE_SHIFT) | 1069 | | ((nodeObject->type & 0xFF) << gcdDB_VIDEO_MEMORY_TYPE_SHIFT) |
| 1070 | | (nodeObject->pool << gcdDB_VIDEO_MEMORY_POOL_SHIFT); | 1070 | | (nodeObject->pool << gcdDB_VIDEO_MEMORY_POOL_SHIFT); |
| 1071 | 1071 | ||
| 1072 | gcmkONERROR( | 1072 | gcmkONERROR( |
diff --git a/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_command_vg.c b/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_command_vg.c index c3e0201c2b81..a54929742962 100644 --- a/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_command_vg.c +++ b/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_command_vg.c | |||
| @@ -647,7 +647,7 @@ _RemoveRecordFromProcesDB( | |||
| 647 | freeVideoMemory->node = gcmALL_TO_UINT32(nodeObject); | 647 | freeVideoMemory->node = gcmALL_TO_UINT32(nodeObject); |
| 648 | 648 | ||
| 649 | type = gcvDB_VIDEO_MEMORY | 649 | type = gcvDB_VIDEO_MEMORY |
| 650 | | (nodeObject->type << gcdDB_VIDEO_MEMORY_TYPE_SHIFT) | 650 | | ((nodeObject->type & 0xFF) << gcdDB_VIDEO_MEMORY_TYPE_SHIFT) |
| 651 | | (nodeObject->pool << gcdDB_VIDEO_MEMORY_POOL_SHIFT); | 651 | | (nodeObject->pool << gcdDB_VIDEO_MEMORY_POOL_SHIFT); |
| 652 | 652 | ||
| 653 | /* Remove record from process db. */ | 653 | /* Remove record from process db. */ |