<div dir="ltr">Thanks for revising these. The changes look good to me.<div> </div><div>FWIW,</div><div> </div><div>Reviewed-by: Sean Paul <<a href="mailto:seanpaul@chromium.org">seanpaul@chromium.org</a>></div></div> <div class="gmail_quote"><div dir="ltr" class="gmail_attr">On Tue, Jan 30, 2024 at 12:49 AM Bhanuprakash Modem <<a href="mailto:bhanuprakash.modem@intel.com">bhanuprakash.modem@intel.com</a>> wrote: </div><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex">From: Sean Paul <<a href="mailto:seanpaul@chromium.org" target="_blank">seanpaul@chromium.org</a>> Consolidate the 2 fb variables into an array. No functional changes. v2: - Clarified commit msg (Bhanu) v3: (Bhanu) - Rebase Cc: Mark Yacoub <<a href="mailto:markyacoub@chromium.org" target="_blank">markyacoub@chromium.org</a>> Reviewed-by: Bhanuprakash Modem <<a href="mailto:bhanuprakash.modem@intel.com" target="_blank">bhanuprakash.modem@intel.com</a>> Signed-off-by: Sean Paul <<a href="mailto:seanpaul@chromium.org" target="_blank">seanpaul@chromium.org</a>> Signed-off-by: Bhanuprakash Modem <<a href="mailto:bhanuprakash.modem@intel.com" target="_blank">bhanuprakash.modem@intel.com</a>> --- tests/kms_vrr.c | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/tests/kms_vrr.c b/tests/kms_vrr.c index 9de0ffc85..a9fcde821 100644 --- a/tests/kms_vrr.c +++ b/tests/kms_vrr.c @@ -104,8 +104,7 @@ typedef struct data { igt_display_t display; int drm_fd; igt_plane_t *primary; - igt_fb_t fb0; - igt_fb_t fb1; + igt_fb_t fb[2]; range_t range; drmModeModeInfo switch_modes[RR_MODES_COUNT]; } data_t; @@ -280,13 +279,13 @@ static void prepare_test(data_t *data, igt_output_t *output, enum pipe pipe) /* Prepare resources */ igt_create_color_fb(data->drm_fd, mode.hdisplay, mode.vdisplay, DRM_FORMAT_XRGB8888, DRM_FORMAT_MOD_LINEAR, - 0.50, 0.50, 0.50, &data->fb0); + 0.50, 0.50, 0.50, &data->fb[0]); igt_create_color_fb(data->drm_fd, mode.hdisplay, mode.vdisplay, DRM_FORMAT_XRGB8888, DRM_FORMAT_MOD_LINEAR, - 0.50, 0.50, 0.50, &data->fb1); + 0.50, 0.50, 0.50, &data->fb[1]); - cr = igt_get_cairo_ctx(data->drm_fd, &data->fb0); + cr = igt_get_cairo_ctx(data->drm_fd, &data->fb[0]); igt_paint_color(cr, 0, 0, mode.hdisplay / 10, mode.vdisplay / 10, 1.00, 0.00, 0.00); @@ -295,7 +294,7 @@ static void prepare_test(data_t *data, igt_output_t *output, enum pipe pipe) /* Take care of any required modesetting before the test begins. */ data->primary = igt_output_get_plane_type(output, DRM_PLANE_TYPE_PRIMARY); - igt_plane_set_fb(data->primary, &data->fb0); + igt_plane_set_fb(data->primary, &data->fb[0]); /* Clear vrr_enabled state before enabling it, because * it might be left enabled if the previous test fails. @@ -358,7 +357,7 @@ flip_and_measure(data_t *data, igt_output_t *output, enum pipe pipe, rate_ns, threshold_hi, threshold_lo); /* Align with the flip completion event to speed up convergence. */ - do_flip(data, &data->fb0); + do_flip(data, &data->fb[0]); start_ns = last_event_ns = target_ns = get_kernel_event_ns(data, DRM_EVENT_FLIP_COMPLETE); @@ -367,7 +366,7 @@ flip_and_measure(data_t *data, igt_output_t *output, enum pipe pipe, int64_t diff_ns; front = !front; - do_flip(data, front ? &data->fb1 : &data->fb0); + do_flip(data, front ? &data->fb[1] : &data->fb[0]); /* We need to cpture flip event instead of vblank event, * because vblank is triggered after each frame, but depending @@ -573,8 +572,8 @@ static void test_cleanup(data_t *data, enum pipe pipe, igt_output_t *output) igt_output_override_mode(output, NULL); igt_display_commit2(&data->display, COMMIT_ATOMIC); - igt_remove_fb(data->drm_fd, &data->fb1); - igt_remove_fb(data->drm_fd, &data->fb0); + igt_remove_fb(data->drm_fd, &data->fb[1]); + igt_remove_fb(data->drm_fd, &data->fb[0]); } static bool output_constraint(data_t *data, igt_output_t *output, uint32_t flags) -- 2.43.0 </blockquote></div>