[igt-dev] [PATCH i-g-t v3 2/5] [intel-gfx] tests/pm_dc: Added new test to verify Display C States.
Imre Deak
imre.deak at intel.com
Wed Nov 21 17:39:36 UTC 2018
On Sat, Nov 03, 2018 at 07:36:03AM -0400, Jyoti Yadav wrote:
> Currently this test validates DC5 upon PSR entry for supported platforms.
> Added new file for compilation inside Makefile and Meson.
Please always list the changes for the new revision here to make review
easier. In particular it would be good to know how the crash during
cleanup in the previous version got fixed.
>
> Signed-off-by: Jyoti Yadav <jyoti.r.yadav at intel.com>
> ---
> tests/Makefile.sources | 1 +
> tests/meson.build | 1 +
> tests/pm_dc.c | 212 +++++++++++++++++++++++++++++++++++++++++++++++++
> 3 files changed, 214 insertions(+)
> create mode 100644 tests/pm_dc.c
>
> diff --git a/tests/Makefile.sources b/tests/Makefile.sources
> index c84933f..d491420 100644
> --- a/tests/Makefile.sources
> +++ b/tests/Makefile.sources
> @@ -214,6 +214,7 @@ TESTS_progs = \
> pm_lpsp \
> pm_rc6_residency \
> pm_rpm \
> + pm_dc \
> pm_rps \
> pm_sseu \
> prime_busy \
> diff --git a/tests/meson.build b/tests/meson.build
> index 17deb94..50b0687 100644
> --- a/tests/meson.build
> +++ b/tests/meson.build
> @@ -188,6 +188,7 @@ test_progs = [
> 'pm_lpsp',
> 'pm_rc6_residency',
> 'pm_rpm',
> + 'pm_dc',
> 'pm_rps',
> 'pm_sseu',
> 'prime_busy',
> diff --git a/tests/pm_dc.c b/tests/pm_dc.c
> new file mode 100644
> index 0000000..671c0f5
> --- /dev/null
> +++ b/tests/pm_dc.c
> @@ -0,0 +1,212 @@
> +/*
> + * Copyright © 2018 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"
> +#include "igt_sysfs.h"
> +#include "igt_psr.h"
> +#include <errno.h>
> +#include <stdbool.h>
> +#include <stdio.h>
> +#include <string.h>
> +#include "intel_bufmgr.h"
> +#include "intel_io.h"
> +#include "limits.h"
> +
> +
> +typedef struct {
> + int drm_fd;
> + int debugfs_fd;
> + uint32_t devid;
> + igt_display_t display;
> + struct igt_fb fb_white;
> + drmModeModeInfo *mode;
> + igt_output_t *output;
> +} data_t;
> +
> +/* DC State Flags */
> +#define CHECK_DC5 1
> +#define CHECK_DC6 2
> +
> +static void setup_output(data_t *data)
> +{
> + igt_display_t *display = &data->display;
> + igt_output_t *output;
> + enum pipe pipe;
> +
> + for_each_pipe_with_valid_output(display, pipe, output) {
> + drmModeConnectorPtr c = output->config.connector;
> +
> + if (c->connector_type != DRM_MODE_CONNECTOR_eDP)
> + continue;
> +
> + igt_output_set_pipe(output, pipe);
> + data->output = output;
> + data->mode = igt_output_get_mode(output);
> +
> + return;
> + }
> +}
> +
> +static void display_init(data_t *data)
> +{
> + igt_display_init(&data->display, data->drm_fd);
> + setup_output(data);
> +}
This function isn't used.
> +
> +static void display_fini(data_t *data)
> +{
> + igt_display_fini(&data->display);
> +}
> +
> +static bool edp_psr_sink_support(data_t *data)
> +{
> + char buf[512];
> +
> + igt_debugfs_simple_read(data->debugfs_fd, "i915_edp_psr_status",
> + buf, sizeof(buf));
> +
> + return strstr(buf, "Sink_Support: yes\n");
> +}
> +
> +static void cleanup(data_t *data)
> +{
> + igt_plane_t *primary;
> +
> + primary = igt_output_get_plane_type(data->output,
> + DRM_PLANE_TYPE_PRIMARY);
> + igt_plane_set_fb(primary, NULL);
> + igt_display_commit(&data->display);
> + igt_remove_fb(data->drm_fd, &data->fb_white);
> +}
This function isn't used either by the end of the patchset.
> +
> +static void setup_primary(data_t *data)
> +{
> + igt_plane_t *primary;
> +
> + primary = igt_output_get_plane_type(data->output,
> + DRM_PLANE_TYPE_PRIMARY);
> + igt_plane_set_fb(primary, NULL);
> + igt_create_color_fb(data->drm_fd,
> + data->mode->hdisplay, data->mode->vdisplay,
> + DRM_FORMAT_XRGB8888,
> + LOCAL_I915_FORMAT_MOD_X_TILED,
> + 1.0, 1.0, 1.0,
> + &data->fb_white);
> + igt_display_commit(&data->display);
Why do we need this separate commit?
> +
> + igt_plane_set_fb(primary, &data->fb_white);
I can't see this FB getting freed anywhere (cleanup() vansihes by the
end).
> + igt_display_commit(&data->display);
> +}
> +
> +static uint32_t get_dc_counter(char *dc_data)
> +{
> + char *e;
> + long ret;
> + char *s = strchr(dc_data, ':');
> +
> + assert(s);
> + s++;
> + ret = strtol(s, &e, 10);
> + assert(((ret != LONG_MIN && ret != LONG_MAX) || errno != ERANGE) &&
> + e > s && *e == '\n' && ret >= 0);
> + return ret;
> +}
> +
> +static uint32_t read_dc_counter(uint32_t drm_fd, int dc_flag)
> +{
> + char buf[4096];
> + char *str;
> +
> + igt_debugfs_read(drm_fd, "i915_dmc_info", buf);
> + if (dc_flag & CHECK_DC5)
> + str = strstr(buf, "DC3 -> DC5 count");
> + else if (dc_flag & CHECK_DC6)
> + str = strstr(buf, "DC5 -> DC6 count");
> + igt_skip_on_f(str == NULL, "DC%d counter is not availble\n",
> + dc_flag & CHECK_DC5 ? 5 : 6);
> + return get_dc_counter(str);
> +}
> +
> +bool dc_state_wait_entry(int drm_fd, int dc_flag, int prev_dc_count)
> +{
> + return igt_wait(read_dc_counter(drm_fd, dc_flag) > prev_dc_count, 1000, 100);
> +}
> +
> +void check_dc_counter(int drm_fd, int dc_flag, uint32_t prev_dc_count)
> +{
> + igt_assert_f(dc_state_wait_entry(drm_fd, dc_flag, prev_dc_count),
> + "DC%d state is not achieved\n",
> + dc_flag & CHECK_DC5 ? 5 : 6);
> +}
> +
> +static void test_dc_state_psr(data_t *data, int dc_flag)
> +{
> + uint32_t dc_counter_before_psr;
> +
> + dc_counter_before_psr = read_dc_counter(data->drm_fd, dc_flag);
> + setup_output(data);
> + setup_primary(data);
> + igt_assert(psr_wait_entry(data->debugfs_fd));
> + check_dc_counter(data->drm_fd, dc_flag, dc_counter_before_psr);
> +}
> +
> +int main(int argc, char *argv[])
> +{
> + bool has_runtime_pm;
> + data_t data = {};
> +
> + igt_skip_on_simulation();
> + igt_subtest_init(argc, argv);
> + igt_fixture {
> + data.drm_fd = drm_open_driver_master(DRIVER_INTEL);
> + data.debugfs_fd = igt_debugfs_dir(data.drm_fd);
> + igt_require(data.debugfs_fd != -1);
> + kmstest_set_vt_graphics_mode();
> + data.devid = intel_get_drm_devid(data.drm_fd);
> + has_runtime_pm = igt_setup_runtime_pm();
> + igt_info("Runtime PM support: %d\n", has_runtime_pm);
> + igt_require(has_runtime_pm);
> + igt_require(igt_pm_dmc_loaded(data.debugfs_fd));
> + igt_display_init(&data->display, data->drm_fd);
> + //display_init(&data);
Leftover code.
> + }
> +
> + igt_subtest("dc5-psr") {
> + psr_enable(data.debugfs_fd);
> + igt_require_f(edp_psr_sink_support(&data),
> + "Sink does not support PSR\n");
> + /* Check DC5 counter is available for the platform.
> + * Skip the test if counter is not available.
> + */
> + read_dc_counter(data.drm_fd, CHECK_DC5);
> + test_dc_state_psr(&data, CHECK_DC5);
> + cleanup(&data);
This one you'll remove in a later patch, so could be removed already
here.
> + }
> + igt_fixture {
> + close(data.debugfs_fd);
> + display_fini(&data);
> + }
> +
> + igt_exit();
> +}
> --
> 1.9.1
>
More information about the igt-dev
mailing list