diff mbox

[igt,1/2] lib: Acquire master for pollable spinbatch on gen4/5

Message ID 20180405184757.15907-1-chris@chris-wilson.co.uk (mailing list archive)
State New, archived
Headers show

Commit Message

Chris Wilson April 5, 2018, 6:47 p.m. UTC 
gen4/5 require a DRM_MASTER to use MI_STORE_DW, make it so.

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
---
 lib/igt_dummyload.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

Comments

Tvrtko Ursulin April 6, 2018, 8:24 a.m. UTC | #1 
On 05/04/2018 19:47, Chris Wilson wrote:
> gen4/5 require a DRM_MASTER to use MI_STORE_DW, make it so.
> 
> Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
> Cc: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
> ---
>   lib/igt_dummyload.c | 5 ++++-
>   1 file changed, 4 insertions(+), 1 deletion(-)
> 
> diff --git a/lib/igt_dummyload.c b/lib/igt_dummyload.c
> index 98ab7ac2..ba917ba5 100644
> --- a/lib/igt_dummyload.c
> +++ b/lib/igt_dummyload.c
> @@ -31,6 +31,7 @@
>   
>   #include "igt_core.h"
>   #include "drmtest.h"
> +#include "igt_device.h"
>   #include "igt_dummyload.h"
>   #include "igt_gt.h"
>   #include "intel_chipset.h"
> @@ -144,8 +145,10 @@ emit_recursive_batch(igt_spin_t *spin, int fd, uint32_t ctx, unsigned engine,
>   
>   		igt_assert(!dep);
>   
> -		if (gen == 4 || gen == 5)
> +		if (gen == 4 || gen == 5) {
>   			execbuf->flags |= I915_EXEC_SECURE;
> +			igt_require(__igt_device_set_master(fd) == 0);
> +		}
>   
>   		spin->poll_handle = gem_create(fd, 4096);
>   
> 

Reviewed-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>

Regards,

Tvrtko
diff mbox

Patch

diff --git a/lib/igt_dummyload.c b/lib/igt_dummyload.c
index 98ab7ac2..ba917ba5 100644
--- a/lib/igt_dummyload.c
+++ b/lib/igt_dummyload.c
@@ -31,6 +31,7 @@ 
 
 #include "igt_core.h"
 #include "drmtest.h"
+#include "igt_device.h"
 #include "igt_dummyload.h"
 #include "igt_gt.h"
 #include "intel_chipset.h"
@@ -144,8 +145,10 @@  emit_recursive_batch(igt_spin_t *spin, int fd, uint32_t ctx, unsigned engine,
 
 		igt_assert(!dep);
 
-		if (gen == 4 || gen == 5)
+		if (gen == 4 || gen == 5) {
 			execbuf->flags |= I915_EXEC_SECURE;
+			igt_require(__igt_device_set_master(fd) == 0);
+		}
 
 		spin->poll_handle = gem_create(fd, 4096);