aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPhilipp Zabel <p.zabel@pengutronix.de>2017-05-15 10:31:37 -0400
committerPhilipp Zabel <p.zabel@pengutronix.de>2017-06-08 02:57:19 -0400
commitffb40733fe432b00fa12ff486364dcfe6d7f247c (patch)
tree6d9e618c4d79bf2bf1b7973e7229e59c2e13274f
parent93adc8b5705c14d16be382d43699d2ba71248a4b (diff)
gpu: ipu-v3: remove interrupt busy waiting routine
This is not used anymore since commit eb8c88808c83 ("drm/imx: add deferred plane disabling"), remove it. Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
-rw-r--r--drivers/gpu/ipu-v3/ipu-common.c16
-rw-r--r--drivers/gpu/ipu-v3/ipu-prv.h1
2 files changed, 0 insertions, 17 deletions
diff --git a/drivers/gpu/ipu-v3/ipu-common.c b/drivers/gpu/ipu-v3/ipu-common.c
index 61310f8be309..22e0a3eca7b1 100644
--- a/drivers/gpu/ipu-v3/ipu-common.c
+++ b/drivers/gpu/ipu-v3/ipu-common.c
@@ -597,22 +597,6 @@ int ipu_idmac_wait_busy(struct ipuv3_channel *channel, int ms)
597} 597}
598EXPORT_SYMBOL_GPL(ipu_idmac_wait_busy); 598EXPORT_SYMBOL_GPL(ipu_idmac_wait_busy);
599 599
600int ipu_wait_interrupt(struct ipu_soc *ipu, int irq, int ms)
601{
602 unsigned long timeout;
603
604 timeout = jiffies + msecs_to_jiffies(ms);
605 ipu_cm_write(ipu, BIT(irq % 32), IPU_INT_STAT(irq / 32));
606 while (!(ipu_cm_read(ipu, IPU_INT_STAT(irq / 32) & BIT(irq % 32)))) {
607 if (time_after(jiffies, timeout))
608 return -ETIMEDOUT;
609 cpu_relax();
610 }
611
612 return 0;
613}
614EXPORT_SYMBOL_GPL(ipu_wait_interrupt);
615
616int ipu_idmac_disable_channel(struct ipuv3_channel *channel) 600int ipu_idmac_disable_channel(struct ipuv3_channel *channel)
617{ 601{
618 struct ipu_soc *ipu = channel->ipu; 602 struct ipu_soc *ipu = channel->ipu;
diff --git a/drivers/gpu/ipu-v3/ipu-prv.h b/drivers/gpu/ipu-v3/ipu-prv.h
index b6e22d64159f..ac4b8d658500 100644
--- a/drivers/gpu/ipu-v3/ipu-prv.h
+++ b/drivers/gpu/ipu-v3/ipu-prv.h
@@ -225,7 +225,6 @@ int ipu_module_enable(struct ipu_soc *ipu, u32 mask);
225int ipu_module_disable(struct ipu_soc *ipu, u32 mask); 225int ipu_module_disable(struct ipu_soc *ipu, u32 mask);
226 226
227bool ipu_idmac_channel_busy(struct ipu_soc *ipu, unsigned int chno); 227bool ipu_idmac_channel_busy(struct ipu_soc *ipu, unsigned int chno);
228int ipu_wait_interrupt(struct ipu_soc *ipu, int irq, int ms);
229 228
230int ipu_csi_init(struct ipu_soc *ipu, struct device *dev, int id, 229int ipu_csi_init(struct ipu_soc *ipu, struct device *dev, int id,
231 unsigned long base, u32 module, struct clk *clk_ipu); 230 unsigned long base, u32 module, struct clk *clk_ipu);