diff options
Diffstat (limited to 'drivers/char/drm/i915_irq.c')
-rw-r--r-- | drivers/char/drm/i915_irq.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/char/drm/i915_irq.c b/drivers/char/drm/i915_irq.c index a443f4a202e3..3f02ff593bbd 100644 --- a/drivers/char/drm/i915_irq.c +++ b/drivers/char/drm/i915_irq.c | |||
@@ -291,7 +291,7 @@ static int i915_emit_irq(struct drm_device * dev) | |||
291 | OUT_RING(0); | 291 | OUT_RING(0); |
292 | OUT_RING(GFX_OP_USER_INTERRUPT); | 292 | OUT_RING(GFX_OP_USER_INTERRUPT); |
293 | ADVANCE_LP_RING(); | 293 | ADVANCE_LP_RING(); |
294 | 294 | ||
295 | return dev_priv->counter; | 295 | return dev_priv->counter; |
296 | } | 296 | } |
297 | 297 | ||
@@ -336,7 +336,7 @@ static int i915_driver_vblank_do_wait(struct drm_device *dev, unsigned int *sequ | |||
336 | DRM_WAIT_ON(ret, dev->vbl_queue, 3 * DRM_HZ, | 336 | DRM_WAIT_ON(ret, dev->vbl_queue, 3 * DRM_HZ, |
337 | (((cur_vblank = atomic_read(counter)) | 337 | (((cur_vblank = atomic_read(counter)) |
338 | - *sequence) <= (1<<23))); | 338 | - *sequence) <= (1<<23))); |
339 | 339 | ||
340 | *sequence = cur_vblank; | 340 | *sequence = cur_vblank; |
341 | 341 | ||
342 | return ret; | 342 | return ret; |
@@ -423,7 +423,7 @@ int i915_vblank_pipe_set(struct drm_device *dev, void *data, | |||
423 | } | 423 | } |
424 | 424 | ||
425 | if (pipe->pipe & ~(DRM_I915_VBLANK_PIPE_A|DRM_I915_VBLANK_PIPE_B)) { | 425 | if (pipe->pipe & ~(DRM_I915_VBLANK_PIPE_A|DRM_I915_VBLANK_PIPE_B)) { |
426 | DRM_ERROR("%s called with invalid pipe 0x%x\n", | 426 | DRM_ERROR("%s called with invalid pipe 0x%x\n", |
427 | __FUNCTION__, pipe->pipe); | 427 | __FUNCTION__, pipe->pipe); |
428 | return -EINVAL; | 428 | return -EINVAL; |
429 | } | 429 | } |