diff options
| author | Xianzhong <xianzhong.li@nxp.com> | 2017-04-05 19:56:40 +0800 |
|---|---|---|
| committer | Leonard Crestez <leonard.crestez@nxp.com> | 2018-08-24 12:41:33 +0300 |
| commit | b11e3840373b7dca49eb6aa6b1961c311491a97c (patch) | |
| tree | 36f6cd5bbd9e54586cecac8f7fe6936ac37ea04d /drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel.c | |
| parent | f4ce2ce3de755ca8495f60479ff462829b87cf02 (diff) | |
MGS-2811: gpu: integrate 6.2.2 official release
Include some bug-fixings for critical gpu issue.
source repo: gpu-viv6
source branch: fsl_6.2.2
Source commit: ef725bcb98733bfe640e814c6ca2b1aa7412402b
Signed-off-by: Xianzhong <xianzhong.li@nxp.com>
Diffstat (limited to 'drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel.c')
| -rw-r--r-- | drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel.c | 8 |
1 files changed, 7 insertions, 1 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 e3b403a77c2d..1238e1babe40 100644 --- a/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel.c +++ b/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel.c @@ -5266,7 +5266,7 @@ gckKERNEL_WriteShBuffer( ) { gceSTATUS status; - gcsSHBUF_PTR shBuf; + gcsSHBUF_PTR shBuf = gcvNULL; gctBOOL acquired = gcvFALSE; gcmkHEADER_ARG("Kernel=0x%X ShBuf=%u UserData=0x%X ByteCount=%u", @@ -5321,6 +5321,12 @@ gckKERNEL_WriteShBuffer( return gcvSTATUS_OK; OnError: + if (shBuf && shBuf->data) + { + gcmkOS_SAFE_FREE(Kernel->os, shBuf->data); + shBuf->data = gcvNULL; + } + if (acquired) { /* Release the mutex. */ |