diff options
Diffstat (limited to 'drivers/gpu/drm/omapdrm/omap_irq.c')
-rw-r--r-- | drivers/gpu/drm/omapdrm/omap_irq.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/gpu/drm/omapdrm/omap_irq.c b/drivers/gpu/drm/omapdrm/omap_irq.c index d5c73c534586..1982759a1c27 100644 --- a/drivers/gpu/drm/omapdrm/omap_irq.c +++ b/drivers/gpu/drm/omapdrm/omap_irq.c | |||
@@ -130,7 +130,7 @@ int omap_irq_enable_vblank(struct drm_device *dev, unsigned int pipe) | |||
130 | DBG("dev=%p, crtc=%u", dev, pipe); | 130 | DBG("dev=%p, crtc=%u", dev, pipe); |
131 | 131 | ||
132 | spin_lock_irqsave(&list_lock, flags); | 132 | spin_lock_irqsave(&list_lock, flags); |
133 | priv->irq_mask |= pipe2vbl(crtc); | 133 | priv->irq_mask |= dispc_mgr_get_vsync_irq(omap_crtc_channel(crtc)); |
134 | omap_irq_update(dev); | 134 | omap_irq_update(dev); |
135 | spin_unlock_irqrestore(&list_lock, flags); | 135 | spin_unlock_irqrestore(&list_lock, flags); |
136 | 136 | ||
@@ -155,7 +155,7 @@ void omap_irq_disable_vblank(struct drm_device *dev, unsigned int pipe) | |||
155 | DBG("dev=%p, crtc=%u", dev, pipe); | 155 | DBG("dev=%p, crtc=%u", dev, pipe); |
156 | 156 | ||
157 | spin_lock_irqsave(&list_lock, flags); | 157 | spin_lock_irqsave(&list_lock, flags); |
158 | priv->irq_mask &= ~pipe2vbl(crtc); | 158 | priv->irq_mask &= ~dispc_mgr_get_vsync_irq(omap_crtc_channel(crtc)); |
159 | omap_irq_update(dev); | 159 | omap_irq_update(dev); |
160 | spin_unlock_irqrestore(&list_lock, flags); | 160 | spin_unlock_irqrestore(&list_lock, flags); |
161 | } | 161 | } |
@@ -228,7 +228,7 @@ static irqreturn_t omap_irq_handler(int irq, void *arg) | |||
228 | struct drm_crtc *crtc = priv->crtcs[id]; | 228 | struct drm_crtc *crtc = priv->crtcs[id]; |
229 | enum omap_channel channel = omap_crtc_channel(crtc); | 229 | enum omap_channel channel = omap_crtc_channel(crtc); |
230 | 230 | ||
231 | if (irqstatus & pipe2vbl(crtc)) { | 231 | if (irqstatus & dispc_mgr_get_vsync_irq(channel)) { |
232 | drm_handle_vblank(dev, id); | 232 | drm_handle_vblank(dev, id); |
233 | omap_crtc_vblank_irq(crtc); | 233 | omap_crtc_vblank_irq(crtc); |
234 | } | 234 | } |