diff options
| author | Xianzhong <b07117@freescale.com> | 2014-05-13 13:41:26 -0400 |
|---|---|---|
| committer | Xianzhong <b07117@freescale.com> | 2014-05-21 11:26:53 -0400 |
| commit | 1693ec27912b56f77c10108fd84af3a2713a8cc6 (patch) | |
| tree | 4b781cbeeedd749f1205ab50da11ae5ea580c28d | |
| parent | 13b97fd98fb5006c02b2e90cb535c9f502676d64 (diff) | |
ENGR00312563-1 [#1183] fixed gpu database mutex issue
system hang in webGL conformance test with the following log
galcore daemon D 807430b4 0 105 2 0x00000000
[<807430b4>] (__schedule+0x34c/0x720) from [<807438c8>] (schedule_preempt_disabled+0x14/0x20)
[<807438c8>] (schedule_preempt_disabled+0x14/0x20) from [<80742328>] (__mutex_lock_slowpath+0x158/0x21c)
[<80742328>] (__mutex_lock_slowpath+0x158/0x21c) from [<80742434>] (mutex_lock+0x48/0x4c)
[<80742434>] (mutex_lock+0x48/0x4c) from [<8052aa68>] (gckOS_AcquireMutex+0x64/0x6c)
[<8052aa68>] (gckOS_AcquireMutex+0x64/0x6c) from [<80534e0c>] (gckKERNEL_AddProcessDB+0x30/0x37c)
[<80534e0c>] (gckKERNEL_AddProcessDB+0x30/0x37c) from [<8052d628>] (gckOS_Broadcast+0xe0/0xe8)
[<8052d628>] (gckOS_Broadcast+0xe0/0xe8) from [<80536fa8>] (_TryToIdleGPU+0x124/0x12c)
[<80536fa8>] (_TryToIdleGPU+0x124/0x12c) from [<8053887c>] (gckEVENT_Notify+0x520/0x574)
[<8053887c>] (gckEVENT_Notify+0x520/0x574) from [<80540468>] (gckHARDWARE_Interrupt+0x60/0x70)
[<80540468>] (gckHARDWARE_Interrupt+0x60/0x70) from [<805271cc>] (threadRoutine2D+0x20/0x78)
[<805271cc>] (threadRoutine2D+0x20/0x78) from [<80045728>] (kthread+0xa4/0xb0)
[<80045728>] (kthread+0xa4/0xb0) from [<8000e158>] (ret_from_fork+0x14/0x3c)
this is integration issue introduced by database mutex enhancement,
remove duplicated mutex unlock when remove database
Date: May 15, 2014
Signed-off-by: Xianzhong <b07117@freescale.com>
Acked-by: Jason Liu
| -rw-r--r-- | drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_db.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_db.c b/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_db.c index 733e45060673..7a68ced4fb71 100644 --- a/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_db.c +++ b/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_db.c | |||
| @@ -320,9 +320,6 @@ gckKERNEL_DeleteDatabase( | |||
| 320 | Database->mmu = gcvNULL; | 320 | Database->mmu = gcvNULL; |
| 321 | #endif | 321 | #endif |
| 322 | 322 | ||
| 323 | /* Release the database mutex. */ | ||
| 324 | gcmkONERROR(gckOS_ReleaseMutex(Kernel->os, Kernel->db->dbMutex)); | ||
| 325 | |||
| 326 | /* Success. */ | 323 | /* Success. */ |
| 327 | gcmkFOOTER_NO(); | 324 | gcmkFOOTER_NO(); |
| 328 | return gcvSTATUS_OK; | 325 | return gcvSTATUS_OK; |