[PATCH] tests/drv_hangman: Adjust to 64bit bb offsets

[PATCH] tests/drv_hangman: Adjust to 64bit bb offsets

[Mika Kuoppala]

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

Re: [PATCH] tests/drv_hangman: Adjust to 64bit bb offsets

[Michel Thierry]

On 8/18/2015 10:56 PM, Mika Kuoppala wrote:
> 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;
>
>

Right, the error state now looks like:
  --- gtt_offset = 0x00000000 00000000

And
  --- ringbuffer = 0x00000000
will have the lower 32-bits.

Reviewed-by: Michel Thierry <michel.thierry@intel.com>


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