From 16c1a87580af89be02e7e6c1898f18b36829e007 Mon Sep 17 00:00:00 2001 From: Robert Noland Date: Wed, 13 Aug 2008 17:05:59 -0400 Subject: i915: Move spinlock init / destroy to load / unload time. This resolves the panic on FreeBSD during VT switch, without attempting any of the more lofty goals for the time being. --- shared-core/i915_irq.c | 2 -- 1 file changed, 2 deletions(-) (limited to 'shared-core/i915_irq.c') diff --git a/shared-core/i915_irq.c b/shared-core/i915_irq.c index 418e0ae9..89264ae2 100644 --- a/shared-core/i915_irq.c +++ b/shared-core/i915_irq.c @@ -948,11 +948,9 @@ int i915_driver_irq_postinstall(struct drm_device * dev) drm_i915_private_t *dev_priv = (drm_i915_private_t *) dev->dev_private; int ret, num_pipes = 2; - DRM_SPININIT(&dev_priv->swaps_lock, "swap"); INIT_LIST_HEAD(&dev_priv->vbl_swaps.head); dev_priv->swaps_pending = 0; - DRM_SPININIT(&dev_priv->user_irq_lock, "userirq"); dev_priv->user_irq_refcount = 0; dev_priv->irq_mask_reg = ~0; -- cgit v1.2.3 From d0acbe4553d27df3fdc217c956c609c54ebb51e6 Mon Sep 17 00:00:00 2001 From: Robert Noland Date: Fri, 22 Aug 2008 21:32:37 -0400 Subject: i915: Convert vblank on disabled pipe DRM_ERROR to DRM_DEBUG. --- shared-core/i915_irq.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'shared-core/i915_irq.c') diff --git a/shared-core/i915_irq.c b/shared-core/i915_irq.c index 89264ae2..8bd2804f 100644 --- a/shared-core/i915_irq.c +++ b/shared-core/i915_irq.c @@ -402,7 +402,7 @@ u32 i915_get_vblank_counter(struct drm_device *dev, int plane) low_frame = pipe ? PIPEBFRAMEPIXEL : PIPEAFRAMEPIXEL; if (!i915_pipe_enabled(dev, pipe)) { - DRM_ERROR("trying to get vblank count for disabled pipe %d\n", pipe); + DRM_DEBUG("trying to get vblank count for disabled pipe %d\n", pipe); return 0; } -- cgit v1.2.3 From c8fd8d3a0d37dc09165ac77c7d38938ef9942011 Mon Sep 17 00:00:00 2001 From: Robert Noland Date: Sun, 24 Aug 2008 15:53:17 -0400 Subject: i915: Fix i915 build on FreeBSD ifdef out all the gem stuff for now. Also, the msi stuff isn't portable the way it is... I'll try and fix that up sometime soon. --- shared-core/i915_irq.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) (limited to 'shared-core/i915_irq.c') diff --git a/shared-core/i915_irq.c b/shared-core/i915_irq.c index 8bd2804f..693e9429 100644 --- a/shared-core/i915_irq.c +++ b/shared-core/i915_irq.c @@ -432,19 +432,22 @@ irqreturn_t i915_driver_irq_handler(DRM_IRQ_ARGS) u32 iir; u32 pipea_stats = 0, pipeb_stats = 0; int vblank = 0; - +#ifdef __linux__ if (dev->pdev->msi_enabled) I915_WRITE(IMR, ~0); +#endif iir = I915_READ(IIR); #if 0 DRM_DEBUG("flag=%08x\n", iir); #endif atomic_inc(&dev_priv->irq_received); if (iir == 0) { +#ifdef __linux__ if (dev->pdev->msi_enabled) { I915_WRITE(IMR, dev_priv->irq_mask_reg); (void) I915_READ(IMR); } +#endif return IRQ_NONE; } @@ -499,12 +502,16 @@ irqreturn_t i915_driver_irq_handler(DRM_IRQ_ARGS) dev_priv->sarea_priv->last_dispatch = READ_BREADCRUMB(dev_priv); I915_WRITE(IIR, iir); +#ifdef __linux__ if (dev->pdev->msi_enabled) I915_WRITE(IMR, dev_priv->irq_mask_reg); +#endif (void) I915_READ(IIR); /* Flush posted writes */ if (iir & I915_USER_INTERRUPT) { +#ifdef I915_HAVE_GEM dev_priv->mm.irq_gem_seqno = i915_get_gem_seqno(dev); +#endif DRM_WAKEUP(&dev_priv->irq_queue); #ifdef I915_HAVE_FENCE i915_fence_handler(dev); @@ -549,7 +556,9 @@ void i915_user_irq_on(drm_i915_private_t *dev_priv) void i915_user_irq_off(drm_i915_private_t *dev_priv) { DRM_SPINLOCK(&dev_priv->user_irq_lock); +#ifdef __linux__ BUG_ON(dev_priv->irq_enabled && dev_priv->user_irq_refcount <= 0); +#endif if (dev_priv->irq_enabled && (--dev_priv->user_irq_refcount == 0)) i915_disable_irq(dev_priv, I915_USER_INTERRUPT); DRM_SPINUNLOCK(&dev_priv->user_irq_lock); -- cgit v1.2.3