[PATCH i-g-t 1/5] tests/kms_plane_scaling: Update the single plane scaling function arguments
Naladala Ramanaidu
ramanaidu.naladala at intel.com
Mon Jul 15 09:34:21 UTC 2024
This patch remove the unused function arguments for plane1
subtests. It will not impact any functionality.
v2: Update the function arguments (Ankit)
Signed-off-by: Naladala Ramanaidu <ramanaidu.naladala at intel.com>
---
tests/kms_plane_scaling.c | 60 +++++++++++++++++++++------------------
1 file changed, 33 insertions(+), 27 deletions(-)
diff --git a/tests/kms_plane_scaling.c b/tests/kms_plane_scaling.c
index 3f63d3cf4..2d9acbb58 100644
--- a/tests/kms_plane_scaling.c
+++ b/tests/kms_plane_scaling.c
@@ -569,7 +569,8 @@ static void cleanup_crtc(data_t *data)
static void check_scaling_pipe_plane_rot(data_t *d, igt_plane_t *plane,
uint32_t pixel_format,
uint64_t modifier,
- int width, int height,
+ double sf_plane1,
+ bool flag,
bool is_upscale,
enum pipe pipe,
igt_output_t *output,
@@ -579,9 +580,18 @@ static void check_scaling_pipe_plane_rot(data_t *d, igt_plane_t *plane,
drmModeModeInfo *mode;
int commit_ret;
int w, h;
+ int width, height;
mode = igt_output_get_mode(output);
+ if (flag == true) {
+ width = mode->hdisplay + 100;
+ height = mode->vdisplay + 100;
+ } else {
+ width = get_width(mode, sf_plane1);
+ height = get_height(mode, sf_plane1);
+ }
+
if (is_upscale) {
w = width;
h = height;
@@ -693,7 +703,8 @@ static const uint64_t modifiers[] = {
};
static void test_scaler_with_modifier_pipe(data_t *d,
- int width, int height,
+ double sf_plane1,
+ bool flag,
bool is_upscale,
enum pipe pipe,
igt_output_t *output)
@@ -716,7 +727,7 @@ static void test_scaler_with_modifier_pipe(data_t *d,
if (igt_plane_has_format_mod(plane, format, modifier))
check_scaling_pipe_plane_rot(d, plane,
format, modifier,
- width, height,
+ sf_plane1, flag,
is_upscale,
pipe, output,
IGT_ROTATION_0);
@@ -725,7 +736,8 @@ static void test_scaler_with_modifier_pipe(data_t *d,
}
static void test_scaler_with_rotation_pipe(data_t *d,
- int width, int height,
+ double sf_plane1,
+ bool flag,
bool is_upscale,
enum pipe pipe,
igt_output_t *output)
@@ -749,16 +761,16 @@ static void test_scaler_with_rotation_pipe(data_t *d,
if (igt_plane_has_rotation(plane, rot))
check_scaling_pipe_plane_rot(d, plane,
format, modifier,
- width, height,
- is_upscale,
+ sf_plane1,
+ flag, is_upscale,
pipe, output,
rot);
}
}
}
-static void test_scaler_with_pixel_format_pipe(data_t *d, int width, int height, bool is_upscale,
- enum pipe pipe, igt_output_t *output)
+static void test_scaler_with_pixel_format_pipe(data_t *d, double sf_plane1, bool flag,
+ bool is_upscale, enum pipe pipe, igt_output_t *output)
{
igt_display_t *display = &d->display;
uint64_t modifier = DRM_FORMAT_MOD_LINEAR;
@@ -787,7 +799,7 @@ static void test_scaler_with_pixel_format_pipe(data_t *d, int width, int height,
can_scale(d, format))
check_scaling_pipe_plane_rot(d, plane,
format, modifier,
- width, height,
+ sf_plane1, flag,
is_upscale,
pipe, output, IGT_ROTATION_0);
}
@@ -1307,11 +1319,10 @@ igt_main_args("", long_opts, help_str, opt_handler, &data)
continue;
igt_dynamic_f("pipe-%s-%s", kmstest_pipe_name(pipe), igt_output_name(output)) {
- drmModeModeInfo *mode = igt_output_get_mode(output);
test_scaler_with_pixel_format_pipe(&data,
- get_width(mode, scaler_with_pixel_format_tests[index].sf),
- get_height(mode, scaler_with_pixel_format_tests[index].sf),
+ scaler_with_pixel_format_tests[index].sf,
+ false,
scaler_with_pixel_format_tests[index].is_upscale,
pipe, output);
}
@@ -1332,11 +1343,10 @@ igt_main_args("", long_opts, help_str, opt_handler, &data)
continue;
igt_dynamic_f("pipe-%s-%s", kmstest_pipe_name(pipe), igt_output_name(output)) {
- drmModeModeInfo *mode = igt_output_get_mode(output);
test_scaler_with_rotation_pipe(&data,
- get_width(mode, scaler_with_rotation_tests[index].sf),
- get_height(mode, scaler_with_rotation_tests[index].sf),
+ scaler_with_rotation_tests[index].sf,
+ false,
scaler_with_rotation_tests[index].is_upscale,
pipe, output);
}
@@ -1357,11 +1367,10 @@ igt_main_args("", long_opts, help_str, opt_handler, &data)
continue;
igt_dynamic_f("pipe-%s-%s", kmstest_pipe_name(pipe), igt_output_name(output)) {
- drmModeModeInfo *mode = igt_output_get_mode(output);
test_scaler_with_modifier_pipe(&data,
- get_width(mode, scaler_with_modifiers_tests[index].sf),
- get_height(mode, scaler_with_modifiers_tests[index].sf),
+ scaler_with_modifiers_tests[index].sf,
+ false,
scaler_with_modifiers_tests[index].is_upscale,
pipe, output);
}
@@ -1381,10 +1390,9 @@ igt_main_args("", long_opts, help_str, opt_handler, &data)
continue;
igt_dynamic_f("pipe-%s-%s", kmstest_pipe_name(pipe), igt_output_name(output)) {
- drmModeModeInfo *mode = igt_output_get_mode(output);
- test_scaler_with_pixel_format_pipe(&data, mode->hdisplay + 100,
- mode->vdisplay + 100, false, pipe, output);
+ test_scaler_with_pixel_format_pipe(&data, 0.0, true,
+ false, pipe, output);
}
break;
}
@@ -1401,10 +1409,9 @@ igt_main_args("", long_opts, help_str, opt_handler, &data)
continue;
igt_dynamic_f("pipe-%s-%s", kmstest_pipe_name(pipe), igt_output_name(output)) {
- drmModeModeInfo *mode = igt_output_get_mode(output);
- test_scaler_with_rotation_pipe(&data, mode->hdisplay + 100,
- mode->vdisplay + 100, false, pipe, output);
+ test_scaler_with_rotation_pipe(&data, 0.0, true,
+ false, pipe, output);
}
break;
}
@@ -1421,9 +1428,8 @@ igt_main_args("", long_opts, help_str, opt_handler, &data)
continue;
igt_dynamic_f("pipe-%s-%s", kmstest_pipe_name(pipe), igt_output_name(output)) {
- drmModeModeInfo *mode = igt_output_get_mode(output);
- test_scaler_with_modifier_pipe(&data, mode->hdisplay + 100,
- mode->vdisplay + 100, false, pipe, output);
+ test_scaler_with_modifier_pipe(&data, 0.0, true,
+ false, pipe, output);
}
break;
}
--
2.43.0
More information about the Intel-gfx-trybot
mailing list