intel-gfx.lists.freedesktop.org archive mirror
 help / color / mirror / Atom feed
From: Keith Packard <keithp@keithp.com>
To: Ben Widawsky <ben@bwidawsk.net>, Chris Wilson <chris@chris-wilson.co.uk>
Cc: intel-gfx@lists.freedesktop.org
Subject: Re: [PATCH] drm/i915: Use chipset-specific irq installers
Date: Tue, 28 Jun 2011 10:56:53 -0700	[thread overview]
Message-ID: <yunei2dhmai.fsf@aiko.keithp.com> (raw)
In-Reply-To: <20110628174857.GA3022@snipes.kumite>


[-- Attachment #1.1: Type: text/plain, Size: 749 bytes --]

On Tue, 28 Jun 2011 10:48:57 -0700, Ben Widawsky <ben@bwidawsk.net> wrote:

> I'm very nitpicky when it comes to the work assert :p

I pushed a much simpler patch:

----------------------- drivers/gpu/drm/i915/i915_gem.c -----------------------
index c6389de..e81dbe5 100644
@@ -2080,8 +2080,8 @@ i915_wait_request(struct intel_ring_buffer *ring,
 		if (!ier) {
 			DRM_ERROR("something (likely vbetool) disabled "
 				  "interrupts, re-enabling\n");
-			i915_driver_irq_preinstall(ring->dev);
-			i915_driver_irq_postinstall(ring->dev);
+			ring->dev->driver->irq_preinstall(ring->dev);
+			ring->dev->driver->irq_postinstall(ring->dev);
 		}
 
 		trace_i915_gem_request_wait_begin(ring, seqno);

-- 
keith.packard@intel.com

[-- Attachment #1.2: Type: application/pgp-signature, Size: 189 bytes --]

[-- Attachment #2: Type: text/plain, Size: 159 bytes --]

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx

  reply	other threads:[~2011-06-28 17:56 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-06-28 10:48 [PATCH] drm/i915: Use chipset-specific irq installers Chris Wilson
2011-06-28 17:48 ` Ben Widawsky
2011-06-28 17:56   ` Keith Packard [this message]
2011-06-28 18:01   ` Chris Wilson

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=yunei2dhmai.fsf@aiko.keithp.com \
    --to=keithp@keithp.com \
    --cc=ben@bwidawsk.net \
    --cc=chris@chris-wilson.co.uk \
    --cc=intel-gfx@lists.freedesktop.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).