Menu
▾
▴
drm: Branch 'drm-gem' - 4 commits
|
From: <ke...@ke...> - 2008-06-21 07:50:05
|
linux-core/i915_gem.c | 51 +++++++++++++++++++++++++++++++++++++++++++------
shared-core/i915_drv.h | 1
shared-core/i915_irq.c | 19 +++++++++++-------
3 files changed, 57 insertions(+), 14 deletions(-)
New commits:
commit a369bf0e575697308690f532576caf652e42b4cb
Author: Keith Packard <ke...@ke...>
Date: Sat Jun 21 00:33:07 2008 -0700
[intel] Use IMR instead of IER to pend interrupts during ISR
Noting that the interrupt mask register was more reliable than the interrupt
enable register for managing interrupts in user_irq_on/user_irq_off, this
patch replaces the remaining IER frobbing with IMR instead.
The test which exposes IER related failures is:
$ glxgears & glxgears & glxgears
(reposition the glxgears windows away from the upper left corner)
$ while :; do x11perf -rect100 -reps 800 -repeat 1; sleep 1; done &
$ while :; do runoa; runet; done &
diff --git a/shared-core/i915_irq.c b/shared-core/i915_irq.c
index c0abcbd..a55497a 100644
--- a/shared-core/i915_irq.c
+++ b/shared-core/i915_irq.c
@@ -451,7 +451,7 @@ irqreturn_t i915_driver_irq_handler(DRM_IRQ_ARGS)
int vblank = 0;
if (dev->pdev->msi_enabled)
- I915_WRITE(I915REG_INT_ENABLE_R, 0);
+ I915_WRITE(I915REG_INT_MASK_R, ~0);
iir = I915_READ(I915REG_INT_IDENTITY_R);
#if 0
DRM_DEBUG("flag=%08x\n", iir);
@@ -464,9 +464,11 @@ irqreturn_t i915_driver_irq_handler(DRM_IRQ_ARGS)
I915_READ(I915REG_INT_ENABLE_R),
I915_READ(I915REG_PIPEASTAT),
I915_READ(I915REG_PIPEBSTAT));
- if (dev->pdev->msi_enabled)
- I915_WRITE(I915REG_INT_ENABLE_R,
- I915_INTERRUPT_ENABLE_MASK);
+ if (dev->pdev->msi_enabled) {
+ I915_WRITE(I915REG_INT_MASK_R,
+ dev_priv->irq_mask_reg);
+ (void) I915_READ(I915REG_INT_MASK_R);
+ }
return IRQ_NONE;
}
@@ -484,6 +486,8 @@ irqreturn_t i915_driver_irq_handler(DRM_IRQ_ARGS)
}
I915_WRITE(I915REG_INT_IDENTITY_R, iir);
+ if (dev->pdev->msi_enabled)
+ I915_WRITE(I915REG_INT_MASK_R, dev_priv->irq_mask_reg);
(void) I915_READ(I915REG_INT_IDENTITY_R); /* Flush posted writes */
if (dev_priv->sarea_priv)
@@ -512,8 +516,6 @@ irqreturn_t i915_driver_irq_handler(DRM_IRQ_ARGS)
drm_locked_tasklet(dev, i915_vblank_tasklet);
}
- if (dev->pdev->msi_enabled)
- I915_WRITE(I915REG_INT_ENABLE_R, I915_INTERRUPT_ENABLE_MASK);
return IRQ_HANDLED;
}
@@ -543,6 +545,7 @@ void i915_user_irq_on(drm_i915_private_t *dev_priv)
if ((dev_priv->irq_mask_reg & I915_USER_INTERRUPT) != 0) {
dev_priv->irq_mask_reg &= ~I915_USER_INTERRUPT;
I915_WRITE(I915REG_INT_MASK_R, dev_priv->irq_mask_reg);
+ I915_WRITE(I915REG_INT_IDENTITY_R, I915_USER_INTERRUPT);
(void) I915_READ (I915REG_INT_MASK_R);
}
}
@@ -740,7 +743,7 @@ static void i915_enable_interrupt (struct drm_device *dev)
{
drm_i915_private_t *dev_priv = (drm_i915_private_t *) dev->dev_private;
- dev_priv->irq_mask_reg = I915_INTERRUPT_ENABLE_MASK;
+ dev_priv->irq_mask_reg = ~0;
I915_WRITE(I915REG_INT_MASK_R, dev_priv->irq_mask_reg);
I915_WRITE(I915REG_INT_ENABLE_R, I915_INTERRUPT_ENABLE_MASK);
(void) I915_READ (I915REG_INT_ENABLE_R);
commit 8be6ec491f7b9c633a426a34006ea4ff5a3f8392
Author: Keith Packard <ke...@ke...>
Date: Sat Jun 21 00:13:18 2008 -0700
[intel-gem] Add /proc/dri/*/i915_gem_interrupt
This tracks most of the interrupt-related status, including the
interrupt registers in the chip and the sequence number variables.
diff --git a/linux-core/i915_gem.c b/linux-core/i915_gem.c
index dc88df5..4361b06 100644
--- a/linux-core/i915_gem.c
+++ b/linux-core/i915_gem.c
@@ -2486,15 +2486,55 @@ static int i915_gem_seqno_info(char *buf, char **start, off_t offset,
}
+static int i915_interrupt_info(char *buf, char **start, off_t offset,
+ int request, int *eof, void *data)
+{
+ struct drm_minor *minor = (struct drm_minor *) data;
+ struct drm_device *dev = minor->dev;
+ drm_i915_private_t *dev_priv = dev->dev_private;
+ int len = 0;
+
+ if (offset > DRM_PROC_LIMIT) {
+ *eof = 1;
+ return 0;
+ }
+
+ *start = &buf[offset];
+ *eof = 0;
+ DRM_PROC_PRINT("Interrupt enable: %08x\n",
+ I915_READ(I915REG_INT_ENABLE_R));
+ DRM_PROC_PRINT("Interrupt identity: %08x\n",
+ I915_READ(I915REG_INT_IDENTITY_R));
+ DRM_PROC_PRINT("Interrupt mask: %08x\n",
+ I915_READ(I915REG_INT_MASK_R));
+ DRM_PROC_PRINT("Pipe A stat: %08x\n",
+ I915_READ(I915REG_PIPEASTAT));
+ DRM_PROC_PRINT("Pipe B stat: %08x\n",
+ I915_READ(I915REG_PIPEBSTAT));
+ DRM_PROC_PRINT("Interrupts received: %d\n",
+ atomic_read(&dev_priv->irq_received));
+ DRM_PROC_PRINT("Current sequence: %d\n",
+ i915_get_gem_seqno(dev));
+ DRM_PROC_PRINT("Waiter sequence: %d\n",
+ dev_priv->mm.waiting_gem_seqno);
+ DRM_PROC_PRINT("IRQ sequence: %d\n",
+ dev_priv->mm.irq_gem_seqno);
+ if (len > request + offset)
+ return request;
+ *eof = 1;
+ return len - offset;
+}
+
static struct drm_proc_list {
const char *name; /**< file name */
int (*f) (char *, char **, off_t, int, int *, void *); /**< proc callback*/
} i915_gem_proc_list[] = {
- {"gem_active", i915_gem_active_info},
- {"gem_flushing", i915_gem_flushing_info},
- {"gem_inactive", i915_gem_inactive_info},
- {"gem_request", i915_gem_request_info},
- {"gem_seqno", i915_gem_seqno_info},
+ {"i915_gem_active", i915_gem_active_info},
+ {"i915_gem_flushing", i915_gem_flushing_info},
+ {"i915_gem_inactive", i915_gem_inactive_info},
+ {"i915_gem_request", i915_gem_request_info},
+ {"i915_gem_seqno", i915_gem_seqno_info},
+ {"i915_gem_interrupt", i915_interrupt_info},
};
#define I915_GEM_PROC_ENTRIES ARRAY_SIZE(i915_gem_proc_list)
commit 33114e4a1167ac79cb53043e77c16cc7fe40a640
Author: Keith Packard <ke...@ke...>
Date: Sat Jun 21 00:12:21 2008 -0700
[intel] Count received interrupts
Another patch adds this to a /proc/dri file for debugging and monitoring.
diff --git a/shared-core/i915_drv.h b/shared-core/i915_drv.h
index 8777650..9f50033 100644
--- a/shared-core/i915_drv.h
+++ b/shared-core/i915_drv.h
@@ -119,7 +119,6 @@ typedef struct drm_i915_private {
wait_queue_head_t irq_queue;
atomic_t irq_received;
- atomic_t irq_emitted;
int tex_lru_log_granularity;
int allow_batchbuffer;
diff --git a/shared-core/i915_irq.c b/shared-core/i915_irq.c
index 767181c..c0abcbd 100644
--- a/shared-core/i915_irq.c
+++ b/shared-core/i915_irq.c
@@ -456,6 +456,7 @@ irqreturn_t i915_driver_irq_handler(DRM_IRQ_ARGS)
#if 0
DRM_DEBUG("flag=%08x\n", iir);
#endif
+ atomic_inc(&dev_priv->irq_received);
if (iir == 0) {
DRM_DEBUG ("iir 0x%08x im 0x%08x ie 0x%08x pipea 0x%08x pipeb 0x%08x\n",
iir,
@@ -963,6 +964,7 @@ void i915_driver_irq_preinstall(struct drm_device * dev)
{
drm_i915_private_t *dev_priv = (drm_i915_private_t *) dev->dev_private;
+ atomic_set(&dev_priv->irq_received, 0);
I915_WRITE(I915REG_HWSTAM, 0xffff);
I915_WRITE(I915REG_INT_ENABLE_R, 0x0);
I915_WRITE(I915REG_INT_MASK_R, 0xffffffff);
commit f4bd566e0bead0904c38bb3a526eb9b35b215ff5
Author: Keith Packard <ke...@ke...>
Date: Sat Jun 21 00:10:10 2008 -0700
[intel-gem] Remove unused variable.
diff --git a/linux-core/i915_gem.c b/linux-core/i915_gem.c
index 27b6ddb..dc88df5 100644
--- a/linux-core/i915_gem.c
+++ b/linux-core/i915_gem.c
@@ -2140,7 +2140,6 @@ i915_gem_idle(struct drm_device *dev)
{
drm_i915_private_t *dev_priv = dev->dev_private;
uint32_t seqno, cur_seqno, last_seqno;
- int ret;
int stuck;
if (dev_priv->mm.suspended)
|