summaryrefslogtreecommitdiff
path: root/drivers/mxc
diff options
context:
space:
mode:
authorXianzhong <xianzhong.li@nxp.com>2018-08-31 21:49:45 +0800
committerXianzhong <xianzhong.li@nxp.com>2018-09-01 00:46:58 +0800
commit280924d0e5a23bfa9cd01384e32d652ff19ab27d (patch)
tree1200dfc979050ba40b5f4cf6af4e08c8bfa8229a /drivers/mxc
parentcca4f5236e3cee98696cf5246acc9e8d9ab75f15 (diff)
MGS-4197 [#imx-1160] fix suspend failure with ctrl-C
do not set interruptable when from power management Signed-off-by: Xianzhong <xianzhong.li@nxp.com> (cherry picked from commit 751fbd840640ed4c9afcfca6d945bd941b50395a)
Diffstat (limited to 'drivers/mxc')
-rw-r--r--drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_command.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_command.c b/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_command.c
index a9cb300c72e1..2837a1c7a1e2 100644
--- a/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_command.c
+++ b/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_command.c
@@ -2996,7 +2996,7 @@ gckCOMMAND_Stall(
do
{
/* Wait for the signal. */
- status = gckOS_WaitSignal(os, signal, gcvTRUE, gcdGPU_ADVANCETIMER);
+ status = gckOS_WaitSignal(os, signal, !FromPower, gcdGPU_ADVANCETIMER);
if (status == gcvSTATUS_TIMEOUT)
{