On Sunday 23 January 2011, Chris Wilson wrote:
> If the driver calls into the kernel to wait for a breadcrumb to pass,
> but hasn't enabled interrupts, fallback to polling the breadcrumb value.
>
> Reported-by: Chris Clayton <chris2553@xxxxxxxxxxxxxx>
> Signed-off-by: Chris Wilson <chris@xxxxxxxxxxxxxxxxxx>
> ---
> drivers/gpu/drm/i915/i915_irq.c | 4 ++--
> 1 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/i915_irq.c
> b/drivers/gpu/drm/i915/i915_irq.c index 98106b7..4b5a35c 100644
> --- a/drivers/gpu/drm/i915/i915_irq.c
> +++ b/drivers/gpu/drm/i915/i915_irq.c
> @@ -1293,12 +1293,12 @@ static int i915_wait_irq(struct drm_device * dev,
> int irq_nr) if (master_priv->sarea_priv)
> master_priv->sarea_priv->perf_boxes |= I915_BOX_WAIT;
>
> - ret = -ENODEV;
> if (ring->irq_get(ring)) {
> DRM_WAIT_ON(ret, ring->irq_queue, 3 * DRM_HZ,
> READ_BREADCRUMB(dev_priv) >= irq_nr);
> ring->irq_put(ring);
> - }
> + } else if (wait_for(READ_BREADCRUMB(dev_priv) >= irq_nr, 3000))
> + ret = -EBUSY;
>
> if (ret == -EBUSY) {
> DRM_ERROR("EBUSY -- rec: %d emitted: %d\n",
That's done it. With all three patches applied, X and KDE are starting now.
Thanks for your work on this.
A couple of points though.
1. The latest patch applied but the following warning was spat out:
patching file drivers/gpu/drm/i915/i915_irq.c
Hunk #1 succeeded at 1288 (offset -5 lines).
I guess we may be working with slightly different versions of the source.
2. The kernel log now contains the following:
r8169 0000:02:00.0: eth0: link up
[drm] Initialized drm 1.1.0 20060810
irq 16: nobody cared (try booting with the "irqpoll" option)
Pid: 0, comm: kworker/0:1 Not tainted 2.6.38-rc2+ #502
Call Trace:
[<c1070a54>] ? __report_bad_irq.clone.2+0x24/0x90
[<c1070c17>] ? note_interrupt+0x157/0x190
[<c101b1cd>] ? ack_apic_level+0x5d/0x1e0
[<c107175b>] ? handle_fasteoi_irq+0xab/0xd0
[<c10716b0>] ? handle_fasteoi_irq+0x0/0xd0
<IRQ> [<c1004ddd>] ? do_IRQ+0x3d/0xc0
[<c1037f27>] ? irq_exit+0x57/0x70
[<c1019173>] ? smp_apic_timer_interrupt+0x53/0x90
[<c1003229>] ? common_interrupt+0x29/0x30
[<c119fbe9>] ? acpi_safe_halt+0x19/0x26
[<c119fc50>] ? acpi_idle_enter_c1+0x5a/0xa9
[<c1244d98>] ? cpuidle_idle_call+0x68/0xf0
[<c1001726>] ? cpu_idle+0x46/0x80
handlers:
[<c129dd60>] (azx_interrupt+0x0/0x180)
[<c12210d0>] (usb_hcd_irq+0x0/0x60)
Disabling IRQ #16
pci 0000:00:02.0: PCI INT A -> GSI 16 (level, low) -> IRQ 16
pci 0000:00:02.0: setting latency timer to 64
ioremap error for 0xbdce0000-0xbdce3000, requested 0x10, got 0x0
[drm] Supports vblank timestamp caching Rev 1 (10.10.2010).
[drm] No driver support for vblank timestamp query.
[drm] Initialized i915 1.6.0 20080730 for 0000:00:02.0 on minor 0
Is this likely to be related the the irq issues your patch addressed or is it a
separate thing that I should report separately?
Thanks again.
Chris
--
The more I see, the more I know. The more I know, the less I understand.
Changing Man - Paul Weller
_______________________________________________
dri-devel mailing list
dri-devel@xxxxxxxxxxxxxxxxxxxxx
http://lists.freedesktop.org/mailman/listinfo/dri-devel
