diff mbox

[PACTH,i-g-t,v1] lib/drmtest: Change DRIVER_INTEL check to avoid running GEM on non-Intel

Message ID 1467049993-1038-1-git-send-email-robert.foss@collabora.com (mailing list archive)
State New, archived
Headers show

Commit Message

Robert Foss June 27, 2016, 5:53 p.m. UTC 
From: Robert Foss <robert.foss@collabora.com>

Avoid running gem_quiescent_gpu() on non-Intel hardware.

Signed-off-by: Robert Foss <robert.foss@collabora.com>
---
 lib/drmtest.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Chris Wilson June 28, 2016, 9:06 a.m. UTC | #1 
On Mon, Jun 27, 2016 at 01:53:13PM -0400, robert.foss@collabora.com wrote:
> From: Robert Foss <robert.foss@collabora.com>
> 
> Avoid running gem_quiescent_gpu() on non-Intel hardware.
> 
> Signed-off-by: Robert Foss <robert.foss@collabora.com>
> ---
>  lib/drmtest.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/lib/drmtest.c b/lib/drmtest.c
> index 632fec4..6427657 100644
> --- a/lib/drmtest.c
> +++ b/lib/drmtest.c
> @@ -338,7 +338,7 @@ int drm_open_driver(int chipset)
>  	if (__sync_fetch_and_add(&open_count, 1))
>  		return fd;
>  
> -	if(chipset & DRIVER_INTEL){
> +	if(chipset == DRIVER_INTEL){

That doesn't work. You need an is_i915_device()
Took the liberty of making that change and pushing with your credit.
-Chris
Robert Foss June 28, 2016, 9:46 a.m. UTC | #2 
Thanks Chris!

On 2016-06-28 05:06 AM, Chris Wilson wrote:
> On Mon, Jun 27, 2016 at 01:53:13PM -0400, robert.foss@collabora.com wrote:
>> From: Robert Foss <robert.foss@collabora.com>
>>
>> Avoid running gem_quiescent_gpu() on non-Intel hardware.
>>
>> Signed-off-by: Robert Foss <robert.foss@collabora.com>
>> ---
>>   lib/drmtest.c | 2 +-
>>   1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/lib/drmtest.c b/lib/drmtest.c
>> index 632fec4..6427657 100644
>> --- a/lib/drmtest.c
>> +++ b/lib/drmtest.c
>> @@ -338,7 +338,7 @@ int drm_open_driver(int chipset)
>>   	if (__sync_fetch_and_add(&open_count, 1))
>>   		return fd;
>>
>> -	if(chipset & DRIVER_INTEL){
>> +	if(chipset == DRIVER_INTEL){
>
> That doesn't work. You need an is_i915_device()
> Took the liberty of making that change and pushing with your credit.
> -Chris
>
diff mbox

Patch

diff --git a/lib/drmtest.c b/lib/drmtest.c
index 632fec4..6427657 100644
--- a/lib/drmtest.c
+++ b/lib/drmtest.c
@@ -338,7 +338,7 @@  int drm_open_driver(int chipset)
 	if (__sync_fetch_and_add(&open_count, 1))
 		return fd;
 
-	if(chipset & DRIVER_INTEL){
+	if(chipset == DRIVER_INTEL){
 		gem_quiescent_gpu(fd);
 		igt_install_exit_handler(quiescent_gpu_at_exit);
 	}