aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/omapdrm/omap_irq.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/gpu/drm/omapdrm/omap_irq.c')
-rw-r--r--drivers/gpu/drm/omapdrm/omap_irq.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/gpu/drm/omapdrm/omap_irq.c b/drivers/gpu/drm/omapdrm/omap_irq.c
index 7afe4b90befd..013b0bba712f 100644
--- a/drivers/gpu/drm/omapdrm/omap_irq.c
+++ b/drivers/gpu/drm/omapdrm/omap_irq.c
@@ -182,12 +182,13 @@ static void omap_irq_fifo_underflow(struct omap_drm_private *priv,
182 pr_cont("(0x%08x)\n", irqstatus); 182 pr_cont("(0x%08x)\n", irqstatus);
183} 183}
184 184
185static void omap_irq_ocp_error_handler(u32 irqstatus) 185static void omap_irq_ocp_error_handler(struct drm_device *dev,
186 u32 irqstatus)
186{ 187{
187 if (!(irqstatus & DISPC_IRQ_OCP_ERR)) 188 if (!(irqstatus & DISPC_IRQ_OCP_ERR))
188 return; 189 return;
189 190
190 DRM_ERROR("OCP error\n"); 191 dev_err_ratelimited(dev->dev, "OCP error\n");
191} 192}
192 193
193static irqreturn_t omap_irq_handler(int irq, void *arg) 194static irqreturn_t omap_irq_handler(int irq, void *arg)
@@ -218,7 +219,7 @@ static irqreturn_t omap_irq_handler(int irq, void *arg)
218 omap_crtc_error_irq(crtc, irqstatus); 219 omap_crtc_error_irq(crtc, irqstatus);
219 } 220 }
220 221
221 omap_irq_ocp_error_handler(irqstatus); 222 omap_irq_ocp_error_handler(dev, irqstatus);
222 omap_irq_fifo_underflow(priv, irqstatus); 223 omap_irq_fifo_underflow(priv, irqstatus);
223 224
224 spin_lock_irqsave(&priv->wait_lock, flags); 225 spin_lock_irqsave(&priv->wait_lock, flags);