aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRichard Zhao <richard.zhao@freescale.com>2011-03-16 10:37:52 +0800
committerRichard Zhao <richard.zhao@freescale.com>2011-04-20 15:22:29 +0800
commit249e9a770f075845d0634b984a7e959d0c96acad (patch)
treebadf3bb3eb4ec4b4c6cf9b65a627d87da400c5ef
parenta56f8b32b75996e04b109243e9ad678b28295622 (diff)
downloadlinux-linaro-natty-249e9a770f075845d0634b984a7e959d0c96acad.tar.gz
ENGR00140700 GPU: fix tiger run the second time causing system hang
The root cause is endless GSL_INTR_BLOCK_YDX_CP interrupt. Apply interrupt status read work around only when yamato started. Signed-off-by: Richard Zhao <richard.zhao@freescale.com>
-rw-r--r--drivers/mxc/amd-gpu/common/gsl_intrmgr.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/mxc/amd-gpu/common/gsl_intrmgr.c b/drivers/mxc/amd-gpu/common/gsl_intrmgr.c
index cba9fc32ab8c..ae2eb4a0b864 100644
--- a/drivers/mxc/amd-gpu/common/gsl_intrmgr.c
+++ b/drivers/mxc/amd-gpu/common/gsl_intrmgr.c
@@ -59,7 +59,7 @@ kgsl_intr_decode(gsl_device_t *device, gsl_intrblock_t block_id)
// read the block's interrupt status bits
/* exclude CP block here to avoid hang in heavy loading with VPU+GPU */
- if (block_id == GSL_INTR_BLOCK_YDX_CP) {
+ if ((block_id == GSL_INTR_BLOCK_YDX_CP) && (device->flags & GSL_FLAGS_STARTED)) {
status = 0x80000000;
} else {
device->ftbl.device_regread(device, block->status_reg, &status);