[igt-dev] [Intel-gfx] [PATCH igt 2/2] igt/gem_eio: Drop DRM_MASTER so we can reacquire it in the subtests

Tvrtko Ursulin tvrtko.ursulin at linux.intel.com
Fri Apr 6 08:35:41 UTC 2018


On 05/04/2018 19:47, Chris Wilson wrote:
> As we reopen the fd for each subtest, and we need a DRM_MASTER, we need
> to drop master on the original before we are allowed to claim DRM_MASTER
> on the second.
> 
> Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>
> Cc: Tvrtko Ursulin <tvrtko.ursulin at intel.com>
> ---
>   tests/gem_eio.c | 2 ++
>   1 file changed, 2 insertions(+)
> 
> diff --git a/tests/gem_eio.c b/tests/gem_eio.c
> index 9599e73d..66d8c18a 100644
> --- a/tests/gem_eio.c
> +++ b/tests/gem_eio.c
> @@ -41,6 +41,7 @@
>   #include <drm.h>
>   
>   #include "igt.h"
> +#include "igt_device.h"
>   #include "igt_sysfs.h"
>   #include "sw_sync.h"
>   
> @@ -674,6 +675,7 @@ igt_main
>   
>   	igt_fixture {
>   		fd = drm_open_driver(DRIVER_INTEL);
> +		igt_device_drop_master(fd);


Is it master by default? I can't spot a place which would set master 
either in igt/lib/ or in drm.

But in any case, should we have gem_reopen_driver attempt to drop master 
before re-opening? And if it was successful, drop it again after 
re-opening to end up in the same state?

Regards,

Tvrtko

>   
>   		igt_require(i915_reset_control(true));
>   		igt_force_gpu_reset(fd);
> 



More information about the igt-dev mailing list