From: Ananya Sharma <ananya.sharma@intel.com>
To: igt-dev@lists.freedesktop.org
Subject: [igt-dev] [PATCH i-g-t v4 1/7] tests/kms_color_helper: helper to enable MPO + pipe color test
Date: Thu, 10 Nov 2022 11:23:26 +0530 [thread overview]
Message-ID: <20221110055332.25302-2-ananya.sharma@intel.com> (raw)
In-Reply-To: <20221110055332.25302-1-ananya.sharma@intel.com>
Adding support of multiple planes in pipe color test by splitting the
screen into two parts i.e. one plane having RGB format and another
one having NV12 format. To add this support for multiple planes the
two functions paint_rectangle() and paint_gradient_rectangle() are
modified in kms_color_helper accordingly. This patch contains the
effected changes that will take place in kms_color and
kms_color_chamelium due to the changes in kms_color_helper.
Signed-off-by: Ananya Sharma <ananya.sharma@intel.com>
---
tests/chamelium/kms_color_chamelium.c | 23 +++++++++++++++--------
tests/kms_color.c | 24 ++++++++++++++++--------
tests/kms_color_helper.c | 26 +++++++++++++++-----------
tests/kms_color_helper.h | 10 ++++++++--
4 files changed, 54 insertions(+), 29 deletions(-)
diff --git a/tests/chamelium/kms_color_chamelium.c b/tests/chamelium/kms_color_chamelium.c
index 907f4dd5..4a8cb339 100644
--- a/tests/chamelium/kms_color_chamelium.c
+++ b/tests/chamelium/kms_color_chamelium.c
@@ -85,12 +85,14 @@ static bool test_pipe_degamma(data_t *data,
igt_display_commit(&data->display);
/* Draw solid colors with linear degamma transformation. */
- paint_rectangles(data, mode, red_green_blue, &fbref);
+ paint_rectangles(data, mode->vdisplay, mode->hdisplay,
+ 0, 0, red_green_blue, &fbref);
/* Draw a gradient with degamma LUT to remap all
* values to max red/green/blue.
*/
- paint_gradient_rectangles(data, mode, red_green_blue, &fb);
+ paint_gradient_rectangles(data, mode->vdisplay, mode->hdisplay,
+ 0, 0, red_green_blue, &fb);
igt_plane_set_fb(primary, &fb);
set_degamma(data, primary->pipe, degamma_full);
igt_display_commit(&data->display);
@@ -175,12 +177,14 @@ static bool test_pipe_gamma(data_t *data,
igt_display_commit(&data->display);
/* Draw solid colors with no gamma transformation. */
- paint_rectangles(data, mode, red_green_blue, &fbref);
+ paint_rectangles(data, mode->vdisplay, mode->hdisplay,
+ 0, 0, red_green_blue, &fbref);
/* Draw a gradient with gamma LUT to remap all values
* to max red/green/blue.
*/
- paint_gradient_rectangles(data, mode, red_green_blue, &fb);
+ paint_gradient_rectangles(data, mode->vdisplay, mode->hdisplay,
+ 0, 0, red_green_blue, &fb);
igt_plane_set_fb(primary, &fb);
igt_display_commit(&data->display);
chamelium_capture(data->chamelium, port, 0, 0, 0, 0, 1);
@@ -269,10 +273,11 @@ static bool test_pipe_ctm(data_t *data,
disable_ctm(primary->pipe);
igt_display_commit(&data->display);
- paint_rectangles(data, mode, after, &fbref);
+ paint_rectangles(data, mode->vdisplay, mode->hdisplay,
+ 0, 0, after, &fbref);
/* With CTM transformation. */
- paint_rectangles(data, mode, before, &fb);
+ paint_rectangles(data, mode->vdisplay, mode->hdisplay, 0, 0, before, &fb);
igt_plane_set_fb(primary, &fb);
set_ctm(primary->pipe, ctm_matrix);
igt_display_commit(&data->display);
@@ -367,7 +372,8 @@ static bool test_pipe_limited_range_ctm(data_t *data,
igt_output_set_prop_value(output,
IGT_CONNECTOR_BROADCAST_RGB,
BROADCAST_RGB_FULL);
- paint_rectangles(data, mode, red_green_blue_limited, &fb);
+ paint_rectangles(data, mode->vdisplay, mode->hdisplay,
+ 0, 0, red_green_blue_limited, &fb);
igt_plane_set_fb(primary, &fb);
igt_display_commit(&data->display);
@@ -375,7 +381,8 @@ static bool test_pipe_limited_range_ctm(data_t *data,
igt_output_set_prop_value(output,
IGT_CONNECTOR_BROADCAST_RGB,
BROADCAST_RGB_16_235);
- paint_rectangles(data, mode, red_green_blue_full, &fb);
+ paint_rectangles(data, mode->vdisplay, mode->hdisplay,
+ 0, 0, red_green_blue_full, &fb);
/* And reset.. */
igt_output_set_prop_value(output,
diff --git a/tests/kms_color.c b/tests/kms_color.c
index e4dc2465..cbe3c391 100644
--- a/tests/kms_color.c
+++ b/tests/kms_color.c
@@ -76,7 +76,8 @@ static bool test_pipe_degamma(data_t *data,
igt_display_commit(&data->display);
/* Draw solid colors with linear degamma transformation. */
- paint_rectangles(data, mode, red_green_blue, &fb);
+ paint_rectangles(data, mode->vdisplay, mode->hdisplay,
+ 0, 0, red_green_blue, &fb);
igt_plane_set_fb(primary, &fb);
igt_display_commit(&data->display);
igt_wait_for_vblank(data->drm_fd,
@@ -87,7 +88,8 @@ static bool test_pipe_degamma(data_t *data,
* Draw a gradient with degamma LUT to remap all
* values to max red/green/blue.
*/
- paint_gradient_rectangles(data, mode, red_green_blue, &fb);
+ paint_gradient_rectangles(data, mode->vdisplay, mode->hdisplay,
+ 0, 0, red_green_blue, &fb);
igt_plane_set_fb(primary, &fb);
set_degamma(data, primary->pipe, degamma_full);
igt_display_commit(&data->display);
@@ -166,7 +168,8 @@ static bool test_pipe_gamma(data_t *data,
igt_display_commit(&data->display);
/* Draw solid colors with no gamma transformation. */
- paint_rectangles(data, mode, red_green_blue, &fb);
+ paint_rectangles(data, mode->vdisplay, mode->hdisplay,
+ 0, 0, red_green_blue, &fb);
igt_plane_set_fb(primary, &fb);
igt_display_commit(&data->display);
igt_wait_for_vblank(data->drm_fd,
@@ -177,7 +180,8 @@ static bool test_pipe_gamma(data_t *data,
* Draw a gradient with gamma LUT to remap all values
* to max red/green/blue.
*/
- paint_gradient_rectangles(data, mode, red_green_blue, &fb);
+ paint_gradient_rectangles(data, mode->vdisplay, mode->hdisplay,
+ 0, 0, red_green_blue, &fb);
igt_plane_set_fb(primary, &fb);
igt_display_commit(&data->display);
igt_wait_for_vblank(data->drm_fd,
@@ -261,7 +265,8 @@ static bool test_pipe_legacy_gamma(data_t *data,
igt_display_commit(&data->display);
/* Draw solid colors with no gamma transformation. */
- paint_rectangles(data, mode, red_green_blue, &fb);
+ paint_rectangles(data, mode->vdisplay, mode->hdisplay,
+ 0, 0, red_green_blue, &fb);
igt_plane_set_fb(primary, &fb);
igt_display_commit(&data->display);
igt_wait_for_vblank(data->drm_fd,
@@ -272,7 +277,8 @@ static bool test_pipe_legacy_gamma(data_t *data,
* Draw a gradient with gamma LUT to remap all values
* to max red/green/blue.
*/
- paint_gradient_rectangles(data, mode, red_green_blue, &fb);
+ paint_gradient_rectangles(data, mode->vdisplay, mode->hdisplay,
+ 0, 0, red_green_blue, &fb);
igt_plane_set_fb(primary, &fb);
red_lut[0] = green_lut[0] = blue_lut[0] = 0;
@@ -513,7 +519,8 @@ static bool test_pipe_ctm(data_t *data,
disable_ctm(primary->pipe);
igt_display_commit(&data->display);
- paint_rectangles(data, mode, after, &fb);
+ paint_rectangles(data, mode->vdisplay, mode->hdisplay,
+ 0, 0, after, &fb);
igt_plane_set_fb(primary, &fb);
set_ctm(primary->pipe, ctm_identity);
igt_display_commit(&data->display);
@@ -522,7 +529,8 @@ static bool test_pipe_ctm(data_t *data,
igt_pipe_crc_collect_crc(data->pipe_crc, &crc_software);
/* With CTM transformation. */
- paint_rectangles(data, mode, before, &fb);
+ paint_rectangles(data, mode->vdisplay, mode->hdisplay,
+ 0, 0, before, &fb);
igt_plane_set_fb(primary, &fb);
set_ctm(primary->pipe, ctm_matrix);
igt_display_commit(&data->display);
diff --git a/tests/kms_color_helper.c b/tests/kms_color_helper.c
index 55f3e409..dbcb3f34 100644
--- a/tests/kms_color_helper.c
+++ b/tests/kms_color_helper.c
@@ -41,20 +41,22 @@ uint64_t get_max_bpc(igt_output_t *output)
}
void paint_gradient_rectangles(data_t *data,
- drmModeModeInfo *mode,
+ uint16_t vdisplay,
+ uint16_t hdisplay,
+ int x, int y,
color_t *colors,
struct igt_fb *fb)
{
cairo_t *cr = igt_get_cairo_ctx(data->drm_fd, fb);
- int i, l = mode->hdisplay / 3;
- int rows_remaining = mode->hdisplay % 3;
+ int i, l = hdisplay / 3;
+ int rows_remaining = hdisplay % 3;
/* Paint 3 gradient rectangles with red/green/blue between 1.0 and
* 0.5. We want to avoid 0 so each max LUTs only affect their own
* rectangle.
*/
for (i = 0 ; i < 3; i++) {
- igt_paint_color_gradient_range(cr, i * l, 0, l, mode->vdisplay,
+ igt_paint_color_gradient_range(cr, (x + (i * l)), y, l, vdisplay,
colors[i].r != 0 ? 0.2 : 0,
colors[i].g != 0 ? 0.2 : 0,
colors[i].b != 0 ? 0.2 : 0,
@@ -64,8 +66,8 @@ void paint_gradient_rectangles(data_t *data,
}
if (rows_remaining > 0)
- igt_paint_color_gradient_range(cr, i * l, 0, rows_remaining,
- mode->vdisplay,
+ igt_paint_color_gradient_range(cr, (x + (i * l)), y, rows_remaining,
+ vdisplay,
colors[i-1].r != 0 ? 0.2 : 0,
colors[i-1].g != 0 ? 0.2 : 0,
colors[i-1].b != 0 ? 0.2 : 0,
@@ -77,22 +79,24 @@ void paint_gradient_rectangles(data_t *data,
}
void paint_rectangles(data_t *data,
- drmModeModeInfo *mode,
+ uint16_t vdisplay,
+ uint16_t hdisplay,
+ int x, int y,
color_t *colors,
struct igt_fb *fb)
{
cairo_t *cr = igt_get_cairo_ctx(data->drm_fd, fb);
- int i, l = mode->hdisplay / 3;
- int rows_remaining = mode->hdisplay % 3;
+ int i, l = hdisplay / 3;
+ int rows_remaining = hdisplay % 3;
/* Paint 3 solid rectangles. */
for (i = 0 ; i < 3; i++) {
- igt_paint_color(cr, i * l, 0, l, mode->vdisplay,
+ igt_paint_color(cr, (x + (i * l)), y, l, vdisplay,
colors[i].r, colors[i].g, colors[i].b);
}
if (rows_remaining > 0)
- igt_paint_color(cr, i * l, 0, rows_remaining, mode->vdisplay,
+ igt_paint_color(cr, (x + (i * l)), y, rows_remaining, vdisplay,
colors[i-1].r, colors[i-1].g, colors[i-1].b);
igt_put_cairo_ctx(cr);
diff --git a/tests/kms_color_helper.h b/tests/kms_color_helper.h
index f0ae30e3..199d449c 100644
--- a/tests/kms_color_helper.h
+++ b/tests/kms_color_helper.h
@@ -51,9 +51,11 @@ typedef struct {
igt_pipe_crc_t *pipe_crc;
igt_output_t *output;
igt_plane_t *primary;
+ igt_plane_t *overlay;
drmModeModeInfo *mode;
uint32_t drm_format;
+ uint32_t drm_format_overlay;
uint32_t color_depth;
uint64_t degamma_lut_size;
uint64_t gamma_lut_size;
@@ -72,11 +74,15 @@ typedef struct {
bool panel_supports_deep_color(int fd, char *output_name);
uint64_t get_max_bpc(igt_output_t *output);
void paint_gradient_rectangles(data_t *data,
- drmModeModeInfo *mode,
+ uint16_t vdisplay,
+ uint16_t hdisplay,
+ int x, int y,
color_t *colors,
struct igt_fb *fb);
void paint_rectangles(data_t *data,
- drmModeModeInfo *mode,
+ uint16_t vdisplay,
+ uint16_t hdisplay,
+ int x, int y,
color_t *colors,
struct igt_fb *fb);
gamma_lut_t *alloc_lut(int lut_size);
--
2.25.1
next prev parent reply other threads:[~2022-11-10 5:54 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-11-10 5:53 [igt-dev] [PATCH i-g-t v4 0/7] MPO + pipe color test Ananya Sharma
2022-11-10 5:53 ` Ananya Sharma [this message]
2022-11-10 5:53 ` [igt-dev] [PATCH i-g-t v4 2/7] tests/kms_color: MPO + pipe color test for degamma Ananya Sharma
2022-11-10 5:53 ` [igt-dev] [PATCH i-g-t v4 3/7] tests/kms_color: MPO + pipe color test for gamma Ananya Sharma
2022-11-10 5:53 ` [igt-dev] [PATCH i-g-t v4 4/7] tests/kms_color: MPO + pipe color test for ctm Ananya Sharma
2022-11-10 5:53 ` [igt-dev] [PATCH i-g-t v4 5/7] tests/chamelium/kms_color_chamelium: MPO + pipe color test for degamma Ananya Sharma
2022-11-10 5:53 ` [igt-dev] [PATCH i-g-t v4 6/7] tests/chamelium/kms_color_chamelium: MPO + pipe color test for gamma Ananya Sharma
2022-11-10 5:53 ` [igt-dev] [PATCH i-g-t v4 7/7] tests/chamelium/kms_color_chamelium: MPO + pipe color test for ctm Ananya Sharma
-- strict thread matches above, loose matches on Subject: below --
2022-11-10 7:08 [igt-dev] [PATCH i-g-t v4 0/7] MPO + pipe color test Ananya Sharma
2022-11-10 7:08 ` [igt-dev] [PATCH i-g-t v4 1/7] tests/kms_color_helper: helper to enable " Ananya Sharma
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20221110055332.25302-2-ananya.sharma@intel.com \
--to=ananya.sharma@intel.com \
--cc=igt-dev@lists.freedesktop.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox