All of lore.kernel.org
 help / color / mirror / Atom feed
From: Mika Kuoppala <mika.kuoppala@linux.intel.com>
To: intel-gfx@lists.freedesktop.org
Cc: Akash Goel <akash.goel@intel.com>
Subject: [PATCH] tests/drv_hangman: Adjust to 64bit bb offsets
Date: Tue, 18 Aug 2015 17:56:46 +0300	[thread overview]
Message-ID: <1439909806-25142-1-git-send-email-mika.kuoppala@intel.com> (raw)

commit e1f123257a1f7d3af36a31a0fb2d4c6f40039fed
Author: Michel Thierry <michel.thierry@intel.com>
Date:   Wed Jul 29 17:23:56 2015 +0100

    drm/i915: Expand error state's address width to 64b

changed the batch buffer address to be 64b. Fix the parsing
of gtt offset accordingly.

Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=91638
Cc: Akash Goel <akash.goel@intel.com>
Cc: Michel Thierry <michel.thierry@intel.com>
Signed-off-by: Mika Kuoppala <mika.kuoppala@intel.com>
---
 tests/drv_hangman.c | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/tests/drv_hangman.c b/tests/drv_hangman.c
index d93bef3..070c7cf 100644
--- a/tests/drv_hangman.c
+++ b/tests/drv_hangman.c
@@ -252,7 +252,8 @@ static void check_error_state(const int gen,
 	while (getline(&line, &line_size, file) > 0) {
 		char *dashes = NULL;
 		int bb_matched = 0;
-		uint32_t gtt_offset;
+		uint32_t gtt_offset_upper, gtt_offset_lower;
+		uint64_t gtt_offset;
 		int req_matched = 0;
 		int requests;
 		uint32_t tail;
@@ -267,9 +268,11 @@ static void check_error_state(const int gen,
 		strncpy(ring_name, line, dashes - line);
 		ring_name[dashes - line - 1] = '\0';
 
-		bb_matched = sscanf(dashes, "--- gtt_offset = 0x%08x\n",
-				    &gtt_offset);
-		if (bb_matched == 1) {
+		bb_matched = sscanf(dashes, "--- gtt_offset = 0x%08x %08x\n",
+				    &gtt_offset_upper, &gtt_offset_lower);
+		gtt_offset = ((uint64_t)gtt_offset_upper << 32) | gtt_offset_lower;
+
+		if (bb_matched == 2) {
 			char expected_line[32];
 
 			igt_assert(strstr(ring_name, expected_ring_name));
@@ -305,7 +308,7 @@ static void check_error_state(const int gen,
 		}
 
 		ringbuf_matched = sscanf(dashes, "--- ringbuffer = 0x%08x\n",
-					 &gtt_offset);
+					 &gtt_offset_lower);
 		if (ringbuf_matched == 1) {
 			unsigned int offset, command, expected_addr = 0;
 
-- 
2.1.4

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

             reply	other threads:[~2015-08-18 14:56 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-08-18 14:56 Mika Kuoppala [this message]
2015-08-18 15:16 ` [PATCH] tests/drv_hangman: Adjust to 64bit bb offsets Michel Thierry

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=1439909806-25142-1-git-send-email-mika.kuoppala@intel.com \
    --to=mika.kuoppala@linux.intel.com \
    --cc=akash.goel@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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.