| Message ID | 1409910729-13485-6-git-send-email-thomas.wood@intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Fri, Sep 05, 2014 at 10:52:08AM +0100, Thomas Wood wrote: > 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@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))) This catches too many platforms, since on ivb, vlv and chv we _can_ already use this. As well as on earlier platforms at least. And since those platforms are under active testing by QA I think we really want that. So the right check for now is IS_HSW || IS_BDW || IS_SKL (if Damien pushed the igt/libdrm stuff already). -Daniel > + return false; > > switch (state) { > case FORCE_CONNECTOR_ON: > -- > 1.9.3 > > _______________________________________________ > Intel-gfx mailing list > Intel-gfx@lists.freedesktop.org > http://lists.freedesktop.org/mailman/listinfo/intel-gfx
On Fri, Sep 05, 2014 at 02:15:08PM +0200, Daniel Vetter wrote: > On Fri, Sep 05, 2014 at 10:52:08AM +0100, Thomas Wood wrote: > > 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@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))) > > This catches too many platforms, since on ivb, vlv and chv we _can_ > already use this. That's a bit of an overstatement. Maybe someone wants to review this? http://lists.freedesktop.org/archives/intel-gfx/2014-May/045564.html
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:
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@intel.com> --- lib/igt_kms.c | 12 ++++++++++++ 1 file changed, 12 insertions(+)