public inbox for intel-gfx@lists.freedesktop.org
 help / color / mirror / Atom feed
From: Ben Widawsky <benjamin.widawsky@intel.com>
To: Intel GFX <intel-gfx@lists.freedesktop.org>
Cc: Ben Widawsky <benjamin.widawsky@linux.intel.com>,
	Ben Widawsky <ben@bwidawsk.net>
Subject: [PATCH 05/10] drm/i915: Implement MI decode for gen8
Date: Wed,  7 May 2014 10:27:01 -0700	[thread overview]
Message-ID: <1399483626-7540-6-git-send-email-benjamin.widawsky@intel.com> (raw)
In-Reply-To: <1399483626-7540-1-git-send-email-benjamin.widawsky@intel.com>

From: Ben Widawsky <benjamin.widawsky@linux.intel.com>

This is needed to implement ipehr_is_semaphore_wait

Signed-off-by: Ben Widawsky <ben@bwidawsk.net>
---
 drivers/gpu/drm/i915/i915_irq.c | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c
index 2d76183..bfd21c7 100644
--- a/drivers/gpu/drm/i915/i915_irq.c
+++ b/drivers/gpu/drm/i915/i915_irq.c
@@ -2561,12 +2561,9 @@ static bool
 ipehr_is_semaphore_wait(struct drm_device *dev, u32 ipehr)
 {
 	if (INTEL_INFO(dev)->gen >= 8) {
-		/*
-		 * FIXME: gen8 semaphore support - currently we don't emit
-		 * semaphores on bdw anyway, but this needs to be addressed when
-		 * we merge that code.
-		 */
-		return false;
+		/* Broadwell's semaphore wait is 3 dwords. We hope IPEHR is the
+		 * first dword. */
+		return (ipehr >> 23) == 0x1c;
 	} else {
 		ipehr &= ~MI_SEMAPHORE_SYNC_MASK;
 		return ipehr == (MI_SEMAPHORE_MBOX | MI_SEMAPHORE_COMPARE |
@@ -2586,6 +2583,8 @@ semaphore_wait_to_signaller_ring(struct intel_ring_buffer *ring, u32 ipehr)
 		 * FIXME: gen8 semaphore support - currently we don't emit
 		 * semaphores on bdw anyway, but this needs to be addressed when
 		 * we merge that code.
+		 *
+		 * XXX: Gen8 needs more than just IPEHR.
 		 */
 		return NULL;
 	} else {
-- 
1.9.2

  parent reply	other threads:[~2014-05-07 17:27 UTC|newest]

Thread overview: 14+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-05-07 17:26 [PATCH 00/10] Semaphores again. Needs shepherd Ben Widawsky
2014-05-07 17:26 ` [PATCH 01/10] drm/i915: Make semaphore updates more precise Ben Widawsky
2014-05-07 17:26 ` [PATCH 02/10] drm/i915: gen specific ring init Ben Widawsky
2014-05-07 17:26 ` [PATCH 03/10] drm/i915/bdw: implement semaphore signal Ben Widawsky
2014-05-07 17:27 ` [PATCH 04/10] drm/i915/bdw: implement semaphore wait Ben Widawsky
2014-05-07 17:27 ` Ben Widawsky [this message]
2014-05-07 17:27 ` [PATCH 06/10] drm/i915: Extract semaphore error collection Ben Widawsky
2014-05-07 17:27 ` [PATCH 07/10] drm/i915/bdw: collect semaphore error state Ben Widawsky
2014-05-07 17:27 ` [PATCH 08/10] drm/i915: semaphore debugfs Ben Widawsky
2014-05-07 17:27 ` [PATCH 09/10] drm/i915/bdw: poll semaphores Ben Widawsky
2014-05-07 17:27 ` [PATCH 10/10] DONT_MERGE drm/i915: FORCE_RESTORE for gen8 semaphores Ben Widawsky
  -- strict thread matches above, loose matches on Subject: below --
2014-06-30 16:53 [PATCH 01/10] drm/i915: Make semaphore updates more precise Rodrigo Vivi
2014-06-30 16:53 ` [PATCH 05/10] drm/i915: Implement MI decode for gen8 Rodrigo Vivi
2014-07-01  0:13   ` Ben Widawsky
2014-07-07 21:17   ` Daniel Vetter

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=1399483626-7540-6-git-send-email-benjamin.widawsky@intel.com \
    --to=benjamin.widawsky@intel.com \
    --cc=ben@bwidawsk.net \
    --cc=benjamin.widawsky@linux.intel.com \
    --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