[Intel-gfx] [i-g-t PATCH v1 04/14] lib: Have intel_get_drm_devid call igt_require_intel

Tomeu Vizoso tomeu.vizoso at collabora.com
Wed Mar 2 14:00:11 UTC 2016


I915_PARAM_CHIPSET_ID is a i915-only thing, so if a subtest ends up
calling it when testing another driver, let's skip it.

Signed-off-by: Tomeu Vizoso <tomeu.vizoso at collabora.com>
---

 lib/intel_chipset.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/lib/intel_chipset.c b/lib/intel_chipset.c
index 0e5b016cdb3d..9056cbf57811 100644
--- a/lib/intel_chipset.c
+++ b/lib/intel_chipset.c
@@ -38,6 +38,7 @@
 #include <sys/mman.h>
 #include "i915_drm.h"
 
+#include "drmtest.h"
 #include "intel_chipset.h"
 #include "igt_core.h"
 
@@ -129,6 +130,7 @@ intel_get_drm_devid(int fd)
 {
 	const char *override;
 
+	igt_require_intel(fd);
 	igt_assert(__drm_device_id);
 
 	override = getenv("INTEL_DEVID_OVERRIDE");
-- 
2.5.0



More information about the Intel-gfx mailing list