Message ID | 1454418218-10346-2-git-send-email-marius.c.vlad@intel.com (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
On Tue, Feb 02, 2016 at 03:03:37PM +0200, Marius Vlad wrote: > Signed-off-by: Marius Vlad <marius.c.vlad@intel.com> > --- > tests/Makefile.sources | 1 + > tests/kms_hdmi_inject.c | 165 ++++++++++++++++++++++++++++++++++++++++++++++++ > 2 files changed, 166 insertions(+) > create mode 100644 tests/kms_hdmi_inject.c > > diff --git a/tests/Makefile.sources b/tests/Makefile.sources > index d431ebf..13c2552 100644 Some of this should be bat tests I think, and then probably in kms_force_connector_basic. -Daniel > --- a/tests/Makefile.sources > +++ b/tests/Makefile.sources > @@ -170,6 +170,7 @@ TESTS_progs = \ > gen3_render_tiledy_blits \ > gen7_forcewake_mt \ > kms_3d \ > + kms_hdmi_inject \ > kms_fence_pin_leak \ > kms_force_connector_basic \ > kms_pwrite_crc \ > diff --git a/tests/kms_hdmi_inject.c b/tests/kms_hdmi_inject.c > new file mode 100644 > index 0000000..8f75116 > --- /dev/null > +++ b/tests/kms_hdmi_inject.c > @@ -0,0 +1,165 @@ > +/* > + * Copyright © 2016 Intel Corporation > + * > + * Permission is hereby granted, free of charge, to any person obtaining a > + * copy of this software and associated documentation files (the "Software"), > + * to deal in the Software without restriction, including without limitation > + * the rights to use, copy, modify, merge, publish, distribute, sublicense, > + * and/or sell copies of the Software, and to permit persons to whom the > + * Software is furnished to do so, subject to the following conditions: > + * > + * The above copyright notice and this permission notice (including the next > + * paragraph) shall be included in all copies or substantial portions of the > + * Software. > + * > + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR > + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, > + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL > + * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER > + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING > + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS > + * IN THE SOFTWARE. > + * > + */ > + > +#include "igt.h" > + > +#define HDISPLAY_4K 3840 > +#define VDISPLAY_4K 2160 > + > +IGT_TEST_DESCRIPTION("Tests 4K and audio HDMI injection."); > + > +static drmModeConnector * > +get_connector(int drm_fd, drmModeRes *res) > +{ > + int i; > + drmModeConnector *connector; > + > + for (i = 0; i < res->count_connectors; i++) { > + > + connector = > + drmModeGetConnectorCurrent(drm_fd, res->connectors[i]); > + > + if (connector->connector_type == DRM_MODE_CONNECTOR_HDMIA && > + connector->connection == DRM_MODE_DISCONNECTED) > + break; > + > + drmModeFreeConnector(connector); > + connector = NULL; > + } > + > + return connector; > +} > + > +static void > +hdmi_inject_4k(int drm_fd, drmModeConnector *connector) > +{ > + unsigned char *edid; > + size_t length; > + struct kmstest_connector_config config; > + int ret, cid, i, crtc_mask = -1; > + int fb_id; > + struct igt_fb fb; > + uint8_t found_4k_mode = 0; > + uint32_t devid; > + > + devid = intel_get_drm_devid(drm_fd); > + > + /* 4K requires at least HSW */ > + igt_require(IS_HASWELL(devid) || IS_BROADWELL(devid)); > + > + kmstest_edid_add_4k(igt_kms_get_base_edid(), EDID_LENGTH, &edid, > + &length); > + > + kmstest_force_edid(drm_fd, connector, edid, length); > + > + if (!kmstest_force_connector(drm_fd, connector, FORCE_CONNECTOR_ON)) > + igt_skip("Could not force connector on\n"); > + > + cid = connector->connector_id; > + > + connector = drmModeGetConnectorCurrent(drm_fd, cid); > + > + for (i = 0; i < connector->count_modes; i++) { > + if (connector->modes[i].hdisplay == HDISPLAY_4K && > + connector->modes[i].vdisplay == VDISPLAY_4K) { > + found_4k_mode++; > + break; > + } > + } > + > + igt_assert(found_4k_mode); > + > + /* create a configuration */ > + ret = kmstest_get_connector_config(drm_fd, cid, crtc_mask, &config); > + igt_assert(ret); > + > + igt_info(" "); > + kmstest_dump_mode(&connector->modes[i]); > + > + /* create framebuffer */ > + fb_id = igt_create_fb(drm_fd, connector->modes[i].hdisplay, > + connector->modes[i].vdisplay, > + DRM_FORMAT_XRGB8888, > + LOCAL_DRM_FORMAT_MOD_NONE, &fb); > + > + ret = drmModeSetCrtc(drm_fd, config.crtc->crtc_id, fb_id, 0, 0, > + &connector->connector_id, 1, > + &connector->modes[i]); > + > + igt_assert(ret == 0); > + > + igt_remove_fb(drm_fd, &fb); > + > + kmstest_force_connector(drm_fd, connector, FORCE_CONNECTOR_UNSPECIFIED); > + kmstest_force_edid(drm_fd, connector, NULL, 0); > + > + free(edid); > +} > + > +static void > +hdmi_inject_audio(int drm_fd, drmModeConnector *connector) > +{ > + unsigned char *edid; > + size_t length; > + > + kmstest_edid_add_audio(igt_kms_get_base_edid(), EDID_LENGTH, &edid, > + &length); > + > + kmstest_force_edid(drm_fd, connector, edid, length); > + > + if (!kmstest_force_connector(drm_fd, connector, FORCE_CONNECTOR_ON)) > + igt_skip("Could not force connector on\n"); > + > + kmstest_force_connector(drm_fd, connector, FORCE_CONNECTOR_UNSPECIFIED); > + kmstest_force_edid(drm_fd, connector, NULL, 0); > + > + free(edid); > +} > + > +igt_main > +{ > + int drm_fd; > + drmModeRes *res; > + drmModeConnector *connector; > + > + igt_fixture { > + drm_fd = drm_open_driver_master(DRIVER_INTEL); > + res = drmModeGetResources(drm_fd); > + > + connector = get_connector(drm_fd, res); > + igt_require(connector); > + > + > + } > + > + igt_subtest("inject-4k") > + hdmi_inject_4k(drm_fd, connector); > + > + igt_subtest("inject-audio") > + hdmi_inject_audio(drm_fd, connector); > + > + igt_fixture { > + drmModeFreeConnector(connector); > + } > +} > -- > 2.7.0.rc3 > > _______________________________________________ > Intel-gfx mailing list > Intel-gfx@lists.freedesktop.org > http://lists.freedesktop.org/mailman/listinfo/intel-gfx
diff --git a/tests/Makefile.sources b/tests/Makefile.sources index d431ebf..13c2552 100644 --- a/tests/Makefile.sources +++ b/tests/Makefile.sources @@ -170,6 +170,7 @@ TESTS_progs = \ gen3_render_tiledy_blits \ gen7_forcewake_mt \ kms_3d \ + kms_hdmi_inject \ kms_fence_pin_leak \ kms_force_connector_basic \ kms_pwrite_crc \ diff --git a/tests/kms_hdmi_inject.c b/tests/kms_hdmi_inject.c new file mode 100644 index 0000000..8f75116 --- /dev/null +++ b/tests/kms_hdmi_inject.c @@ -0,0 +1,165 @@ +/* + * Copyright © 2016 Intel Corporation + * + * Permission is hereby granted, free of charge, to any person obtaining a + * copy of this software and associated documentation files (the "Software"), + * to deal in the Software without restriction, including without limitation + * the rights to use, copy, modify, merge, publish, distribute, sublicense, + * and/or sell copies of the Software, and to permit persons to whom the + * Software is furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice (including the next + * paragraph) shall be included in all copies or substantial portions of the + * Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL + * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS + * IN THE SOFTWARE. + * + */ + +#include "igt.h" + +#define HDISPLAY_4K 3840 +#define VDISPLAY_4K 2160 + +IGT_TEST_DESCRIPTION("Tests 4K and audio HDMI injection."); + +static drmModeConnector * +get_connector(int drm_fd, drmModeRes *res) +{ + int i; + drmModeConnector *connector; + + for (i = 0; i < res->count_connectors; i++) { + + connector = + drmModeGetConnectorCurrent(drm_fd, res->connectors[i]); + + if (connector->connector_type == DRM_MODE_CONNECTOR_HDMIA && + connector->connection == DRM_MODE_DISCONNECTED) + break; + + drmModeFreeConnector(connector); + connector = NULL; + } + + return connector; +} + +static void +hdmi_inject_4k(int drm_fd, drmModeConnector *connector) +{ + unsigned char *edid; + size_t length; + struct kmstest_connector_config config; + int ret, cid, i, crtc_mask = -1; + int fb_id; + struct igt_fb fb; + uint8_t found_4k_mode = 0; + uint32_t devid; + + devid = intel_get_drm_devid(drm_fd); + + /* 4K requires at least HSW */ + igt_require(IS_HASWELL(devid) || IS_BROADWELL(devid)); + + kmstest_edid_add_4k(igt_kms_get_base_edid(), EDID_LENGTH, &edid, + &length); + + kmstest_force_edid(drm_fd, connector, edid, length); + + if (!kmstest_force_connector(drm_fd, connector, FORCE_CONNECTOR_ON)) + igt_skip("Could not force connector on\n"); + + cid = connector->connector_id; + + connector = drmModeGetConnectorCurrent(drm_fd, cid); + + for (i = 0; i < connector->count_modes; i++) { + if (connector->modes[i].hdisplay == HDISPLAY_4K && + connector->modes[i].vdisplay == VDISPLAY_4K) { + found_4k_mode++; + break; + } + } + + igt_assert(found_4k_mode); + + /* create a configuration */ + ret = kmstest_get_connector_config(drm_fd, cid, crtc_mask, &config); + igt_assert(ret); + + igt_info(" "); + kmstest_dump_mode(&connector->modes[i]); + + /* create framebuffer */ + fb_id = igt_create_fb(drm_fd, connector->modes[i].hdisplay, + connector->modes[i].vdisplay, + DRM_FORMAT_XRGB8888, + LOCAL_DRM_FORMAT_MOD_NONE, &fb); + + ret = drmModeSetCrtc(drm_fd, config.crtc->crtc_id, fb_id, 0, 0, + &connector->connector_id, 1, + &connector->modes[i]); + + igt_assert(ret == 0); + + igt_remove_fb(drm_fd, &fb); + + kmstest_force_connector(drm_fd, connector, FORCE_CONNECTOR_UNSPECIFIED); + kmstest_force_edid(drm_fd, connector, NULL, 0); + + free(edid); +} + +static void +hdmi_inject_audio(int drm_fd, drmModeConnector *connector) +{ + unsigned char *edid; + size_t length; + + kmstest_edid_add_audio(igt_kms_get_base_edid(), EDID_LENGTH, &edid, + &length); + + kmstest_force_edid(drm_fd, connector, edid, length); + + if (!kmstest_force_connector(drm_fd, connector, FORCE_CONNECTOR_ON)) + igt_skip("Could not force connector on\n"); + + kmstest_force_connector(drm_fd, connector, FORCE_CONNECTOR_UNSPECIFIED); + kmstest_force_edid(drm_fd, connector, NULL, 0); + + free(edid); +} + +igt_main +{ + int drm_fd; + drmModeRes *res; + drmModeConnector *connector; + + igt_fixture { + drm_fd = drm_open_driver_master(DRIVER_INTEL); + res = drmModeGetResources(drm_fd); + + connector = get_connector(drm_fd, res); + igt_require(connector); + + + } + + igt_subtest("inject-4k") + hdmi_inject_4k(drm_fd, connector); + + igt_subtest("inject-audio") + hdmi_inject_audio(drm_fd, connector); + + igt_fixture { + drmModeFreeConnector(connector); + } +}
Signed-off-by: Marius Vlad <marius.c.vlad@intel.com> --- tests/Makefile.sources | 1 + tests/kms_hdmi_inject.c | 165 ++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 166 insertions(+) create mode 100644 tests/kms_hdmi_inject.c