summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/ipu-v3/ipu-common.c
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@arm.linux.org.uk>2015-06-16 23:29:41 +0100
committerPhilipp Zabel <p.zabel@pengutronix.de>2015-07-10 11:02:46 +0200
commit510e6426d32baf46b6df929e6689ef65fcb58a2c (patch)
treeb22572de17b81e2d32e5f8409eeab77aad11c436 /drivers/gpu/ipu-v3/ipu-common.c
parent553a59fc8f5d51c3824c0b7d4ca61e780157defa (diff)
downloadlinux-stable-510e6426d32baf46b6df929e6689ef65fcb58a2c.tar.gz
linux-stable-510e6426d32baf46b6df929e6689ef65fcb58a2c.tar.bz2
linux-stable-510e6426d32baf46b6df929e6689ef65fcb58a2c.zip
GPU: ipu: fix lockup caused by pending chained interrupts
Even with the oops fixed by a previous patch, the system still fails to kexec, due to a stuck chained interrupt locking the system. We must disable the child interrupts prior to setting up the irq chip to ensure we don't get stuck here. Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk> Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
Diffstat (limited to 'drivers/gpu/ipu-v3/ipu-common.c')
-rw-r--r--drivers/gpu/ipu-v3/ipu-common.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/gpu/ipu-v3/ipu-common.c b/drivers/gpu/ipu-v3/ipu-common.c
index 6d2f39d36e44..00f2058944e5 100644
--- a/drivers/gpu/ipu-v3/ipu-common.c
+++ b/drivers/gpu/ipu-v3/ipu-common.c
@@ -1107,6 +1107,9 @@ static int ipu_irq_init(struct ipu_soc *ipu)
return ret;
}
+ for (i = 0; i < IPU_NUM_IRQS; i += 32)
+ ipu_cm_write(ipu, 0, IPU_INT_CTRL(i / 32));
+
for (i = 0; i < IPU_NUM_IRQS; i += 32) {
gc = irq_get_domain_generic_chip(ipu->domain, i);
gc->reg_base = ipu->cm_reg;