[Intel-gfx] [PATCH i-g-t v2 5/6] lib: don't force HDMI or DP connectors on gen 7 and 8

[Thomas Wood]

Forcing HDMI or DP connectors on gen 7 and 8 doesn't currently work, so
fail early to allow the test to skip if required.

Signed-off-by: Thomas Wood <thomas.wood at intel.com>
---
 lib/igt_kms.c | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/lib/igt_kms.c b/lib/igt_kms.c
index 0dc46f9..e9455aa 100644
--- a/lib/igt_kms.c
+++ b/lib/igt_kms.c
@@ -41,6 +41,7 @@
 #include "drmtest.h"
 #include "igt_kms.h"
 #include "igt_aux.h"
+#include "intel_chipset.h"
 
 /*
  * There hasn't been a release of libdrm containing these #define's yet, so
@@ -344,6 +345,17 @@ bool kmstest_force_connector(int drm_fd, drmModeConnector *connector,
 	char *path;
 	const char *value;
 	int debugfs_fd, ret;
+	uint32_t devid;
+
+	devid = intel_get_drm_devid(drm_fd);
+
+	/* forcing hdmi or dp connectors on gen 7 and 8 doesn't currently work,
+	 * so fail early to allow the test to skip if required */
+	if ((connector->connector_type == DRM_MODE_CONNECTOR_HDMIA ||
+	    connector->connector_type == DRM_MODE_CONNECTOR_HDMIB ||
+	    connector->connector_type == DRM_MODE_CONNECTOR_DisplayPort)
+		&& (IS_GEN7(devid) || IS_GEN8(devid)))
+		return false;
 
 	switch (state) {
 	case FORCE_CONNECTOR_ON:
-- 
1.9.3