diff options
| author | Thomas Wood <thomas.wood@intel.com> | 2014-09-04 16:56:17 +0100 |
|---|---|---|
| committer | Thomas Wood <thomas.wood@intel.com> | 2014-09-05 16:52:51 +0100 |
| commit | d3c83b203372a00f846a3858711aae7ba290d570 (patch) | |
| tree | db6833fa196d160e4eb807b4edff60250bf59aaf /lib | |
| parent | 3aac97107ed386885cfb78f16e0c15a1042fe8cc (diff) | |
lib: don't force HDMI or DP connectors on HSW and BDW
Forcing HDMI or DP connectors on these platforms doesn't currently work,
so fail early to allow the test to skip if required.
v2: restrict to HSW and BDW (Daniel Vetter)
Signed-off-by: Thomas Wood <thomas.wood@intel.com>
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/igt_kms.c | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/lib/igt_kms.c b/lib/igt_kms.c index 1f519ae0..c9d3a200 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 HSW and BDW 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_HASWELL(devid) || IS_BROADWELL(devid))) + return false; switch (state) { case FORCE_CONNECTOR_ON: |