tests/drv_hangman: Adjust to 64bit bb offsets
PATCH 1/1 tests/drv_hangman: Adjust to 64bit bb offsets
commit e1f123257a1f7d3af36a31a0fb2d4c6f40039fed
Author: Michel Thierry <[email protected]> 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
--- tests/drv_hangman.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-)
tests/drv_hangman.c +8 -5
@@ -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" , - >t_offset); -if (bb_matched ==1 ) { + bb_matched =sscanf (dashes,"--- gtt_offset = 0x%08x %08x\n" , + >t_offset_upper, >t_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" , - >t_offset); + >t_offset_lower);if (ringbuf_matched ==1 ) {unsigned int offset, command, expected_addr =0 ;
Signature · 6 lines
2.1.4 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 48 lines · Mika Kuoppala
commit
e1f123257a1f7d3af36a31a0fb2d4c6f40039fedAuthor: Michel Thierry <[email protected]> Date: Wed Jul 29 17:23:56 2015 +0100drm/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 <[email protected]>Cc Michel Thierry <[email protected]>Signed-off-by Mika Kuoppala <[email protected]>--- tests/drv_hangman.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-)tests/drv_hangman.c +7
-4@@ -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" , - >t_offset); -if (bb_matched ==1 ) { + bb_matched =sscanf (dashes,"--- gtt_offset = 0x%08x %08x\n" , + >t_offset_upper, >t_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));
tests/drv_hangman.c static void check_error_state(const int gen, · line 314
Quoted 8 lines
tests/drv_hangman.c +1
-1@@ -305,7 +308,7 @@ static void check_error_state(const int gen, } ringbuf_matched =sscanf (dashes,"--- ringbuffer = 0x%08x\n" , - >t_offset); + >t_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.
_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx