diff mbox

[i-g-t] lib/chipset: Properly skip on non-Intel

Message ID 20161011093608.30453-1-daniel.vetter@ffwll.ch (mailing list archive)
State New, archived
Headers show

Commit Message

Daniel Vetter Oct. 11, 2016, 9:36 a.m. UTC
Random drive-by I noticed while hacking on piglit.

Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
---
 lib/intel_chipset.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

Comments

Petri Latvala Oct. 11, 2016, 11:26 a.m. UTC | #1
On Tue, Oct 11, 2016 at 11:36:08AM +0200, Daniel Vetter wrote:
> Random drive-by I noticed while hacking on piglit.
> 
> Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
> ---
>  lib/intel_chipset.c | 3 +--
>  1 file changed, 1 insertion(+), 2 deletions(-)
> 
> diff --git a/lib/intel_chipset.c b/lib/intel_chipset.c
> index 777dfa73da80..ab35fa70c167 100644
> --- a/lib/intel_chipset.c
> +++ b/lib/intel_chipset.c
> @@ -100,8 +100,7 @@ intel_get_pci_device(void)
>  		pci_dev = pci_device_next(iter);
>  		pci_iterator_destroy(iter);
>  	}
> -	if (pci_dev == NULL)
> -		errx(1, "Couldn't find graphics card");
> +	igt_require_f(pci_dev, "Couldn't find Intel graphics card\n");
>  
>  	error = pci_device_probe(pci_dev);
>  	igt_fail_on_f(error != 0,


Reviewed-by: Petri Latvala <petri.latvala@intel.com>

There's a check for vendor_id equaling 0x8086 some lines below, and I
debated on IRC for changing it to igt_require as well. Then again it's
quite impossible to reach, so might as well leave it as a noisy
failure. I'll change it to igt_fail_on_f later.


--
Petri Latvala
diff mbox

Patch

diff --git a/lib/intel_chipset.c b/lib/intel_chipset.c
index 777dfa73da80..ab35fa70c167 100644
--- a/lib/intel_chipset.c
+++ b/lib/intel_chipset.c
@@ -100,8 +100,7 @@  intel_get_pci_device(void)
 		pci_dev = pci_device_next(iter);
 		pci_iterator_destroy(iter);
 	}
-	if (pci_dev == NULL)
-		errx(1, "Couldn't find graphics card");
+	igt_require_f(pci_dev, "Couldn't find Intel graphics card\n");
 
 	error = pci_device_probe(pci_dev);
 	igt_fail_on_f(error != 0,