diff mbox

[IGT,v2,5/6] tests/kms_frontbuffer_tracking: Fix multidraw subtest

Message ID 1498849944-26404-6-git-send-email-jim.bride@linux.intel.com (mailing list archive)
State New, archived
Headers show

Commit Message

jim.bride@linux.intel.com June 30, 2017, 7:12 p.m. UTC
The multidraw subtest was not taking whether or not the GEM buffer had
ever been in write-combining mode when checking for PSR state, so fix
that.

Signed-off-by: Jim Bride <jim.bride@linux.intel.com>
---
 tests/kms_frontbuffer_tracking.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

Comments

Rodrigo Vivi June 30, 2017, 8:21 p.m. UTC | #1
cc: Paulo Zanoni...

On Fri, Jun 30, 2017 at 12:12 PM, Jim Bride <jim.bride@linux.intel.com> wrote:
> The multidraw subtest was not taking whether or not the GEM buffer had
> ever been in write-combining mode when checking for PSR state, so fix
> that.
>
> Signed-off-by: Jim Bride <jim.bride@linux.intel.com>
> ---
>  tests/kms_frontbuffer_tracking.c | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/tests/kms_frontbuffer_tracking.c b/tests/kms_frontbuffer_tracking.c
> index 3a8b754..c52d7a0 100644
> --- a/tests/kms_frontbuffer_tracking.c
> +++ b/tests/kms_frontbuffer_tracking.c
> @@ -2059,7 +2059,8 @@ static void multidraw_subtest(const struct test_mode *t)
>                                 assertions = used_method != IGT_DRAW_MMAP_GTT ?
>                                              ASSERT_LAST_ACTION_CHANGED :
>                                              ASSERT_NO_ACTION_CHANGE;
> -                               if (op_disables_psr(t, used_method))
> +                               if (op_disables_psr(t, used_method) &&
> +                                   !wc_used)
>                                         assertions |= ASSERT_PSR_DISABLED;
>
>                                 do_assertions(assertions);
> --
> 2.7.4
>
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Zanoni, Paulo R July 7, 2017, 7:43 p.m. UTC | #2
Em Sex, 2017-06-30 às 12:12 -0700, Jim Bride escreveu:
> The multidraw subtest was not taking whether or not the GEM buffer
> had
> ever been in write-combining mode when checking for PSR state, so fix
> that.

Reviewed-by: Paulo Zanoni <paulo.r.zanoni@intel.com>

> 
> Signed-off-by: Jim Bride <jim.bride@linux.intel.com>
> ---
>  tests/kms_frontbuffer_tracking.c | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
> 
> diff --git a/tests/kms_frontbuffer_tracking.c
> b/tests/kms_frontbuffer_tracking.c
> index 3a8b754..c52d7a0 100644
> --- a/tests/kms_frontbuffer_tracking.c
> +++ b/tests/kms_frontbuffer_tracking.c
> @@ -2059,7 +2059,8 @@ static void multidraw_subtest(const struct
> test_mode *t)
>  				assertions = used_method !=
> IGT_DRAW_MMAP_GTT ?
>  					     ASSERT_LAST_ACTION_CHAN
> GED :
>  					     ASSERT_NO_ACTION_CHANGE
> ;
> -				if (op_disables_psr(t, used_method))
> +				if (op_disables_psr(t, used_method)
> &&
> +				    !wc_used)
>  					assertions |=
> ASSERT_PSR_DISABLED;
>  
>  				do_assertions(assertions);
diff mbox

Patch

diff --git a/tests/kms_frontbuffer_tracking.c b/tests/kms_frontbuffer_tracking.c
index 3a8b754..c52d7a0 100644
--- a/tests/kms_frontbuffer_tracking.c
+++ b/tests/kms_frontbuffer_tracking.c
@@ -2059,7 +2059,8 @@  static void multidraw_subtest(const struct test_mode *t)
 				assertions = used_method != IGT_DRAW_MMAP_GTT ?
 					     ASSERT_LAST_ACTION_CHANGED :
 					     ASSERT_NO_ACTION_CHANGE;
-				if (op_disables_psr(t, used_method))
+				if (op_disables_psr(t, used_method) &&
+				    !wc_used)
 					assertions |= ASSERT_PSR_DISABLED;
 
 				do_assertions(assertions);