[igt-dev] [i-g-t V2 2/6] tests/i915/kms_big_joiner: Fix Bigjoiner checks
Karthik B S
karthik.b.s at intel.com
Wed Apr 5 07:38:09 UTC 2023
On 3/28/2023 6:02 PM, Bhanuprakash Modem wrote:
> Bigjoiner will come in the picture when the resolution > 5K or
> clock > max dot-clock. Add a support to check the selected mode
> clock is greater than the max dot-clock.
>
> Signed-off-by: Bhanuprakash Modem <bhanuprakash.modem at intel.com>
> ---
> tests/i915/kms_big_joiner.c | 67 +++++++++++++++++++++----------------
> 1 file changed, 38 insertions(+), 29 deletions(-)
>
> diff --git a/tests/i915/kms_big_joiner.c b/tests/i915/kms_big_joiner.c
> index 8be60ea1176..adc37be719d 100644
> --- a/tests/i915/kms_big_joiner.c
> +++ b/tests/i915/kms_big_joiner.c
> @@ -26,10 +26,13 @@
>
> #include "igt.h"
>
> -#define MAX_HDISPLAY_PER_PIPE 5120
> -
> IGT_TEST_DESCRIPTION("Test big joiner");
>
> +typedef struct {
> + uint32_t output;
Hi,
Could you please rename this as output_id, just to make it clear. Not a
must have change, just a suggestion.
> + drmModeModeInfo mode;
> +} big_joiner;
> +
> typedef struct {
> int drm_fd;
> igt_display_t display;
> @@ -37,7 +40,7 @@ typedef struct {
> int n_pipes;
> enum pipe pipe1;
> enum pipe pipe2;
> - uint32_t big_joiner_output[2];
> + big_joiner big_joiner_output[2];
> } data_t;
>
> static void test_invalid_modeset(data_t *data)
> @@ -91,7 +94,7 @@ static void test_basic_modeset(data_t *data)
> igt_display_reset(display);
>
> for_each_connected_output(display, output) {
> - if (data->big_joiner_output[0] == output->id) {
> + if (data->big_joiner_output[0].output == output->id) {
> big_joiner_output = output;
> break;
> }
> @@ -99,9 +102,7 @@ static void test_basic_modeset(data_t *data)
>
> igt_output_set_pipe(big_joiner_output, data->pipe1);
>
> - igt_sort_connector_modes(big_joiner_output->config.connector,
> - sort_drm_modes_by_res_dsc);
> - mode = &big_joiner_output->config.connector->modes[0];
> + mode = &data->big_joiner_output[0].mode;
> igt_output_override_mode(big_joiner_output, mode);
>
> pipe = &display->pipes[data->pipe1];
> @@ -130,7 +131,7 @@ static void test_dual_display(data_t *data)
> igt_display_reset(display);
>
> for_each_connected_output(display, output) {
> - if (data->big_joiner_output[count] == output->id) {
> + if (data->big_joiner_output[count].output == output->id) {
> big_joiner_output[count] = output;
> count++;
> }
> @@ -143,9 +144,7 @@ static void test_dual_display(data_t *data)
> igt_output_set_pipe(big_joiner_output[1], data->pipe2);
>
> /* Set up first big joiner output on Pipe A*/
> - igt_sort_connector_modes(big_joiner_output[0]->config.connector,
> - sort_drm_modes_by_res_dsc);
> - mode = &big_joiner_output[0]->config.connector->modes[0];
> + mode = &data->big_joiner_output[0].mode;
> igt_output_override_mode(big_joiner_output[0], mode);
>
> pipe = &display->pipes[data->pipe1];
> @@ -156,9 +155,7 @@ static void test_dual_display(data_t *data)
> igt_plane_set_size(plane1, mode->hdisplay, mode->vdisplay);
>
> /* Set up second big joiner output on Pipe C*/
> - igt_sort_connector_modes(big_joiner_output[1]->config.connector,
> - sort_drm_modes_by_res_dsc);
> - mode = &big_joiner_output[1]->config.connector->modes[0];
> + mode = &data->big_joiner_output[1].mode;
> igt_output_override_mode(big_joiner_output[1], mode);
>
> pipe = &display->pipes[data->pipe2];
> @@ -186,6 +183,8 @@ igt_main
> int valid_output = 0, i, count = 0, j = 0;
> uint16_t width = 0, height = 0;
> enum pipe pipe_seq[IGT_MAX_PIPES];
> + int max_dotclock;
> + bool retry = false;
>
> igt_fixture {
> data.drm_fd = drm_open_driver_master(DRIVER_INTEL);
> @@ -194,13 +193,22 @@ igt_main
> igt_display_require(&data.display, data.drm_fd);
> igt_require(data.display.is_atomic);
>
> + max_dotclock = igt_get_max_dotclock(data.drm_fd);
> +retry:
> for_each_connected_output(&data.display, output) {
> + /*
> + * Bigjoiner will come in the picture when
> + * the resolution > 5K or clock > max-dot-clock.
> + */
> igt_sort_connector_modes(output->config.connector,
> - sort_drm_modes_by_res_dsc);
> + retry ? sort_drm_modes_by_clk_dsc :
> + sort_drm_modes_by_res_dsc);
>
> mode = &output->config.connector->modes[0];
> - if (mode->hdisplay > MAX_HDISPLAY_PER_PIPE) {
> - data.big_joiner_output[count++] = output->id;
> + if (igt_bigjoiner_possible(mode, max_dotclock)) {
> + data.big_joiner_output[count].output = output->id;
> + memcpy(&data.big_joiner_output[count].mode, mode, sizeof(drmModeModeInfo));
> + count++;
>
> width = max(width, mode->hdisplay);
> height = max(height, mode->vdisplay);
> @@ -208,6 +216,11 @@ igt_main
> valid_output++;
> }
>
> + if (!count && !retry) {
> + retry = true;
> + goto retry;
> + }
> +
I think this retry mechanism will fail in a case where two big joiner
displays are connected.
Say we've the first display being 8k at 30 and the second display being
4k at 120. Since count would've already incremented with the first display,
we wouldn't do a retry and hence not detect the second display as a big
joiner capable display. Could you please check this.
Instead of having a retry mechanism, I would suggest to have a check
inside the for loop to try out both highest clk and res modes.
Thanks,
Karthik.B.S
> data.n_pipes = 0;
> for_each_pipe(&data.display, i) {
> data.n_pipes++;
> @@ -215,7 +228,7 @@ igt_main
> j++;
> }
>
> - igt_require_f(count > 0, "No output with 5k+ mode found\n");
> + igt_require_f(count > 0, "No output with 5k+ mode (or) clock > max-dot-clock found\n");
>
> igt_create_pattern_fb(data.drm_fd, width, height, DRM_FORMAT_XRGB8888,
> DRM_FORMAT_MOD_LINEAR, &data.fb);
> @@ -237,14 +250,12 @@ igt_main
>
> igt_display_reset(&data.display);
> for_each_connected_output(&data.display, output) {
> - if (data.big_joiner_output[0] != output->id)
> + if (data.big_joiner_output[0].output != output->id)
> continue;
>
> - igt_sort_connector_modes(output->config.connector,
> - sort_drm_modes_by_res_dsc);
> -
> + mode = &data.big_joiner_output[0].mode;
> igt_output_set_pipe(output, data.pipe1);
> - igt_output_override_mode(output, &output->config.connector->modes[0]);
> + igt_output_override_mode(output, mode);
>
> igt_dynamic_f("pipe-%s-%s",
> kmstest_pipe_name(data.pipe1),
> @@ -261,17 +272,15 @@ igt_main
>
> igt_display_reset(&data.display);
> for_each_connected_output(&data.display, output) {
> - igt_sort_connector_modes(output->config.connector,
> - sort_drm_modes_by_res_dsc);
> -
> - if (data.big_joiner_output[0] == output->id) {
> + if (data.big_joiner_output[0].output == output->id) {
> first_output = output;
> + mode = &data.big_joiner_output[0].mode;
> +
> igt_output_set_pipe(output, data.pipe1);
> - igt_output_override_mode(output, &output->config.connector->modes[0]);
> + igt_output_override_mode(output, mode);
> } else if (second_output == NULL) {
> second_output = output;
> igt_output_set_pipe(output, data.pipe2);
> - igt_output_override_mode(output, &output->config.connector->modes[0]);
>
> break;
> }
More information about the igt-dev
mailing list