Deleted Added
full compact
i915_irq.c (189054) i915_irq.c (189130)
1/* i915_irq.c -- IRQ support for the I915 -*- linux-c -*-
2 */
3/*-
4 * Copyright 2003 Tungsten Graphics, Inc., Cedar Park, Texas.
5 * All Rights Reserved.
6 *
7 * Permission is hereby granted, free of charge, to any person obtaining a
8 * copy of this software and associated documentation files (the

--- 13 unchanged lines hidden (view full) ---

22 * IN NO EVENT SHALL TUNGSTEN GRAPHICS AND/OR ITS SUPPLIERS BE LIABLE FOR
23 * ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
24 * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
25 * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
26 *
27 */
28
29#include <sys/cdefs.h>
1/* i915_irq.c -- IRQ support for the I915 -*- linux-c -*-
2 */
3/*-
4 * Copyright 2003 Tungsten Graphics, Inc., Cedar Park, Texas.
5 * All Rights Reserved.
6 *
7 * Permission is hereby granted, free of charge, to any person obtaining a
8 * copy of this software and associated documentation files (the

--- 13 unchanged lines hidden (view full) ---

22 * IN NO EVENT SHALL TUNGSTEN GRAPHICS AND/OR ITS SUPPLIERS BE LIABLE FOR
23 * ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
24 * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
25 * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
26 *
27 */
28
29#include <sys/cdefs.h>
30__FBSDID("$FreeBSD: head/sys/dev/drm/i915_irq.c 189054 2009-02-25 20:24:13Z rnoland $");
30__FBSDID("$FreeBSD: head/sys/dev/drm/i915_irq.c 189130 2009-02-28 02:37:55Z rnoland $");
31
32#include "dev/drm/drmP.h"
33#include "dev/drm/drm.h"
34#include "dev/drm/i915_drm.h"
35#include "dev/drm/i915_drv.h"
36
37#define MAX_NOPID ((u32)~0)
38

--- 440 unchanged lines hidden (view full) ---

479 I915_WRITE(IMR, 0xffffffff);
480 I915_WRITE(IER, 0x0);
481 (void) I915_READ(IER);
482}
483
484int i915_driver_irq_postinstall(struct drm_device *dev)
485{
486 drm_i915_private_t *dev_priv = (drm_i915_private_t *) dev->dev_private;
31
32#include "dev/drm/drmP.h"
33#include "dev/drm/drm.h"
34#include "dev/drm/i915_drm.h"
35#include "dev/drm/i915_drv.h"
36
37#define MAX_NOPID ((u32)~0)
38

--- 440 unchanged lines hidden (view full) ---

479 I915_WRITE(IMR, 0xffffffff);
480 I915_WRITE(IER, 0x0);
481 (void) I915_READ(IER);
482}
483
484int i915_driver_irq_postinstall(struct drm_device *dev)
485{
486 drm_i915_private_t *dev_priv = (drm_i915_private_t *) dev->dev_private;
487 int ret, num_pipes = 2;
488
487
489 ret = drm_vblank_init(dev, num_pipes);
490 if (ret)
491 return ret;
492
493 dev_priv->vblank_pipe = DRM_I915_VBLANK_PIPE_A | DRM_I915_VBLANK_PIPE_B;
494
495 dev->max_vblank_count = 0xffffff; /* only 24 bits of frame count */
496
497 /* Unmask the interrupts that we always want on. */
498 dev_priv->irq_mask_reg = ~I915_INTERRUPT_ENABLE_FIX;
499
500 dev_priv->pipestat[0] = 0;

--- 42 unchanged lines hidden ---
488 dev_priv->vblank_pipe = DRM_I915_VBLANK_PIPE_A | DRM_I915_VBLANK_PIPE_B;
489
490 dev->max_vblank_count = 0xffffff; /* only 24 bits of frame count */
491
492 /* Unmask the interrupts that we always want on. */
493 dev_priv->irq_mask_reg = ~I915_INTERRUPT_ENABLE_FIX;
494
495 dev_priv->pipestat[0] = 0;

--- 42 unchanged lines hidden ---