[igt-dev] [PATCH v4 i-g-t] tests/i915/kms_dsc: To test modeset on dsc with highest mode
Kulkarni, Vandita
vandita.kulkarni at intel.com
Wed Nov 17 04:35:26 UTC 2021
> -----Original Message-----
> From: Patnana, Venkata Sai <venkata.sai.patnana at intel.com>
> Sent: Tuesday, November 16, 2021 1:55 PM
> To: igt-dev at lists.freedesktop.org
> Cc: Patnana, Venkata Sai <venkata.sai.patnana at intel.com>; Kulkarni,
> Vandita <vandita.kulkarni at intel.com>; B S, Karthik <karthik.b.s at intel.com>;
> Modem, Bhanuprakash <bhanuprakash.modem at intel.com>; Sharma,
> Swati2 <swati2.sharma at intel.com>
> Subject: [PATCH v4 i-g-t] tests/i915/kms_dsc: To test modeset on dsc with
> highest mode
>
> From: Patnana Venkata Sai <venkata.sai.patnana at intel.com>
>
> Force dsc enable supports resolutions above 5K in DP.
> Bigjoiner does not support dsc force bpp, also due to this bigjoiner limitation
> we need to skip all subtests on pipe D.
>
> This patch will pick the mode with highest resolution rather the default
> mode.
It looks ok to me wrt the functionality.
Acked-by: Vandita Kulkarni <vandita.kulkarni at intel.com>
>
> v2: Updated indentation.
> v3: Split the restructuring the subtests logic.
> v4: Updated igt_skip_on_f condition.
>
> Cc: Vandita Kulkarni <vandita.kulkarni at intel.com>
> Cc: Karthik B S <karthik.b.s at intel.com>
> Cc: Bhanuprakash Modem <bhanuprakash.modem at intel.com>
> Cc: Swati Sharma <swati2.sharma at intel.com>
>
> Signed-off-by: Patnana Venkata Sai <venkata.sai.patnana at intel.com>
> ---
> tests/i915/kms_dsc.c | 66 ++++++++++++++++++++++++++++++++++-------
> ---
> 1 file changed, 51 insertions(+), 15 deletions(-)
>
> diff --git a/tests/i915/kms_dsc.c b/tests/i915/kms_dsc.c index
> dcfe8b9669..25f7676a4c 100644
> --- a/tests/i915/kms_dsc.c
> +++ b/tests/i915/kms_dsc.c
> @@ -63,6 +63,7 @@ typedef struct {
> drmModeEncoder *encoder;
> int crtc;
> int compression_bpp;
> + int n_pipes;
> enum pipe pipe;
> char conn_name[128];
> } data_t;
> @@ -151,6 +152,13 @@ static bool is_external_panel(drmModeConnector
> *connector)
> }
> }
>
> +static int sort_drm_modes(const void *a, const void *b) {
> + const drmModeModeInfo *mode1 = a, *mode2 = b;
> +
> + return (mode1->clock < mode2->clock) - (mode2->clock < mode1-
> >clock);
> +}
> +
> static bool check_dsc_on_connector(data_t *data, uint32_t drmConnector)
> {
> drmModeConnector *connector;
> @@ -162,6 +170,19 @@ static bool check_dsc_on_connector(data_t *data,
> uint32_t drmConnector)
> return false;
>
> output = igt_output_from_connector(&data->display, connector);
> +
> + /*
> + * As dsc supports >= 5k modes, we need to suppress lower
> + * resolutions.
> + */
> + qsort(output->config.connector->modes,
> + output->config.connector->count_modes,
> + sizeof(drmModeModeInfo),
> + sort_drm_modes);
> + if (output->config.connector->connector_type ==
> DRM_MODE_CONNECTOR_DisplayPort &&
> + output->config.connector->modes[0].hdisplay < 5120)
> + return NULL;
> +
> sprintf(data->conn_name, "%s-%d",
> kmstest_connector_type_str(connector->connector_type),
> connector->connector_type_id);
> @@ -203,6 +224,11 @@ static void update_display(data_t *data, enum
> dsc_test_type test_type)
> }
>
> igt_output_set_pipe(data->output, data->pipe);
> + qsort(data->output->config.connector->modes,
> + data->output->config.connector->count_modes,
> + sizeof(drmModeModeInfo),
> + sort_drm_modes);
> + igt_output_override_mode(data->output,
> +&data->output->config.connector->modes[0]);
> primary = igt_output_get_plane_type(data->output,
> DRM_PLANE_TYPE_PRIMARY);
>
> @@ -219,11 +245,9 @@ static void update_display(data_t *data, enum
> dsc_test_type test_type)
> enabled = igt_is_dsc_enabled(data->drm_fd,
> data->output->config.connector);
> restore_force_dsc_en();
> - if (test_type == test_dsc_compression_bpp) {
> - igt_debug("Rest compression BPP \n");
> - data->compression_bpp = 0;
> - force_dsc_enable_bpp(data);
> - }
> + igt_debug("Reset compression BPP\n");
> + data->compression_bpp = 0;
> + force_dsc_enable_bpp(data);
>
> igt_assert_f(enabled,
> "Default DSC enable failed on Connector: %s Pipe: %s\n",
> @@ -235,10 +259,14 @@ static void run_test(data_t *data, enum
> dsc_test_type test_type) {
> enum pipe pipe;
> char test_name[10];
> - drmModeModeInfo *mode = igt_output_get_mode(data->output);
>
> - igt_create_pattern_fb(data->drm_fd, mode->hdisplay,
> - mode->vdisplay,
> + igt_skip_on_f(test_type == test_dsc_compression_bpp &&
> + data->output->config.connector->modes[0].hdisplay >=
> 5120,
> + "bigjoiner does not support force bpp\n");
> +
> + igt_create_pattern_fb(data->drm_fd,
> + data->output->config.connector-
> >modes[0].hdisplay,
> + data->output->config.connector-
> >modes[0].vdisplay,
> DRM_FORMAT_XRGB8888,
> DRM_FORMAT_MOD_LINEAR,
> &data->fb_test_pattern);
> @@ -253,16 +281,21 @@ static void run_test(data_t *data, enum
> dsc_test_type test_type)
> }
>
> snprintf(test_name, sizeof(test_name), "-%dbpp", data-
> >compression_bpp);
> - if (igt_pipe_connector_valid(pipe, data->output)) {
> + if (!igt_pipe_connector_valid(pipe, data->output))
> + continue;
> +
> + igt_dynamic_f("%s-pipe-%s%s", data->output->name,
> + kmstest_pipe_name(pipe),
> + (test_type == test_dsc_compression_bpp) ?
> + test_name : "") {
> data->pipe = pipe;
> + igt_skip_on_f((data->output->config.connector-
> >modes[0].hdisplay >= 5120) &&
> + (pipe == (data->n_pipes - 1)),
> + "pipe-%s not supported due to bigjoiner
> limitation\n",
> + kmstest_pipe_name(pipe));
> + update_display(data, test_type);
>
> - igt_dynamic_f("%s-pipe-%s%s", data->output-
> >name,
> - kmstest_pipe_name(pipe),
> - (test_type ==
> test_dsc_compression_bpp) ?
> - test_name : "")
> - update_display(data, test_type);
> }
> -
> if (test_type == test_dsc_compression_bpp)
> break;
> }
> @@ -283,6 +316,9 @@ igt_main
> igt_install_exit_handler(kms_dsc_exit_handler);
> igt_display_require(&data.display, data.drm_fd);
> igt_require(res = drmModeGetResources(data.drm_fd));
> + data.n_pipes = 0;
> + for_each_pipe(&data.display, i)
> + data.n_pipes++;
> }
> igt_subtest_with_dynamic("basic-dsc-enable") {
> for (j = 0; j < res->count_connectors; j++) {
> --
> 2.25.1
More information about the igt-dev
mailing list