Re: [PATCH i-g-t] lib/ioctl_wrappers: Separate ring BSD1 from BSD2 checks

From: Daniel Vetter <daniel@ffwll.ch>
To: Gabriel Feceoru <gabriel.feceoru@intel.com>
Cc: intel-gfx@lists.freedesktop.org
Subject: Re: [PATCH i-g-t] lib/ioctl_wrappers: Separate ring BSD1 from BSD2 checks
Date: Tue, 16 Feb 2016 16:30:32 +0100	[thread overview]
Message-ID: <20160216153032.GK32705@phenom.ffwll.local> (raw)
In-Reply-To: <1454957766-25207-1-git-send-email-gabriel.feceoru@intel.com>

On Mon, Feb 08, 2016 at 08:56:06PM +0200, Gabriel Feceoru wrote:
> Some platforms have ring BSD available but no BSD2.
> Because of the current verification, tests involving ring BSD1
> will be skipped if no BSD2 is available.
> 
> Decoupling the checks will allow running the BSD1 specific tests
> on these platforms.
> 
> Signed-off-by: Gabriel Feceoru <gabriel.feceoru@intel.com>

Applied, thanks.
-Daniel

> ---
>  lib/ioctl_wrappers.c | 4 +++-
>  1 file changed, 3 insertions(+), 1 deletion(-)
> 
> diff --git a/lib/ioctl_wrappers.c b/lib/ioctl_wrappers.c
> index f371bf0..dfabde7 100644
> --- a/lib/ioctl_wrappers.c
> +++ b/lib/ioctl_wrappers.c
> @@ -1348,8 +1348,10 @@ void gem_require_ring(int fd, int ring_id)
>  
>  	/* silly ABI, the kernel thinks everyone who has BSD also has BSD2 */
>  	if ((ring_id & ~(3<<13)) == I915_EXEC_BSD) {
> -		if (ring_id & (3 << 13))
> +		if (ring_id & (2 << 13))
>  			igt_require(gem_has_bsd2(fd));
> +		if (ring_id & (1 << 13))
> +			igt_require(gem_has_bsd(fd))
>  	}
>  }
>  
> -- 
> 1.9.1
> 
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/intel-gfx

-- 
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx