diff options
| author | Haibo Huang <hhb@google.com> | 2019-08-22 11:30:45 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-08-22 11:30:45 -0700 |
| commit | 206a8e3febc313c234301319fe1591dc3f92d812 (patch) | |
| tree | 5d6743a29d41d23b45ed604e4b3b9e87e7cfc25c /tests/kms_hdmi_inject.c | |
| parent | 4a12edecbca8c11abd6520a664e300f370d41397 (diff) | |
| parent | 9149125daf306cd5b3b2688b53a779052fc88d93 (diff) | |
| download | platform_external_igt-gpu-tools-206a8e3febc313c234301319fe1591dc3f92d812.tar.gz platform_external_igt-gpu-tools-206a8e3febc313c234301319fe1591dc3f92d812.tar.bz2 platform_external_igt-gpu-tools-206a8e3febc313c234301319fe1591dc3f92d812.zip | |
Upgrade igt-gpu-tools to 357dbe1869d88a2f08bcee4eebceff4ee9014424 am: 22248ce8b1 am: 141ed12fec am: daa144e503
am: 9149125daf
Change-Id: I704bd17efd512086961060e0757d3274dfd94798
Diffstat (limited to 'tests/kms_hdmi_inject.c')
| -rw-r--r-- | tests/kms_hdmi_inject.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/tests/kms_hdmi_inject.c b/tests/kms_hdmi_inject.c index 78684241..52110506 100644 --- a/tests/kms_hdmi_inject.c +++ b/tests/kms_hdmi_inject.c @@ -65,8 +65,7 @@ get_connector(int drm_fd, drmModeRes *res) connector = drmModeGetConnectorCurrent(drm_fd, res->connectors[i]); - if (connector->connector_type == DRM_MODE_CONNECTOR_HDMIA && - connector->connection == DRM_MODE_DISCONNECTED) + if (connector->connector_type == DRM_MODE_CONNECTOR_HDMIA) break; drmModeFreeConnector(connector); @@ -79,7 +78,7 @@ get_connector(int drm_fd, drmModeRes *res) static void hdmi_inject_4k(int drm_fd, drmModeConnector *connector) { - const unsigned char *edid; + const struct edid *edid; struct kmstest_connector_config config; int ret, cid, i, crtc_mask = -1; int fb_id; @@ -140,7 +139,7 @@ hdmi_inject_4k(int drm_fd, drmModeConnector *connector) static void hdmi_inject_audio(int drm_fd, drmModeConnector *connector) { - const unsigned char *edid; + const struct edid *edid; int fb_id, cid, ret, crtc_mask = -1; struct igt_fb fb; struct kmstest_connector_config config; @@ -203,6 +202,8 @@ igt_main connector = get_connector(drm_fd, res); igt_require(connector); + + kmstest_unset_all_crtcs(drm_fd, res); } igt_describe("Make sure that 4K modes exposed by DRM match the " |