From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from NAM11-BN8-obe.outbound.protection.outlook.com (mail-bn8nam11on2040.outbound.protection.outlook.com [40.107.236.40]) by gabe.freedesktop.org (Postfix) with ESMTPS id 4E2C810E4AB for ; Thu, 23 Mar 2023 17:36:26 +0000 (UTC) Message-ID: Date: Thu, 23 Mar 2023 13:36:21 -0400 To: Bhawanpreet Lakha , igt-dev@lists.freedesktop.org, rodrigo.siqueira@amd.com, harry.wentland@amd.com, nicholas.kazlauskas@amd.com References: <19e60197-21e2-c121-195c-bfd2d30af9ad@amd.com> <20230323172911.589434-1-Bhawanpreet.Lakha@amd.com> Content-Language: en-US From: Leo Li In-Reply-To: <20230323172911.589434-1-Bhawanpreet.Lakha@amd.com> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit MIME-Version: 1.0 Subject: Re: [igt-dev] [PATCH 1/2] amdgpu/amd_plane: Add multi MPO XRGB8888 test List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: igt-dev-bounces@lists.freedesktop.org Sender: "igt-dev" List-ID: On 3/23/23 13:29, Bhawanpreet Lakha wrote: > [Why] > Some of our ASICs support multiple overlay planes, so create > a test to test them > > [How] > Create a plane with two holes and fill them up with 2 overlay planes > > *v2 > - Create a overlap/non overlap test instead of using rand() > - Update test description > - Formatting fixes > > Signed-off-by: Bhawanpreet Lakha > --- > tests/amdgpu/amd_plane.c | 115 ++++++++++++++++++++++++++++++++++++++- > 1 file changed, 114 insertions(+), 1 deletion(-) > > diff --git a/tests/amdgpu/amd_plane.c b/tests/amdgpu/amd_plane.c > index b9eec677..4115d692 100644 > --- a/tests/amdgpu/amd_plane.c > +++ b/tests/amdgpu/amd_plane.c > @@ -42,6 +42,7 @@ typedef struct data { > igt_plane_t *primary[MAX_PIPES]; > igt_plane_t *cursor[MAX_PIPES]; > igt_plane_t *overlay[MAX_PIPES]; > + igt_plane_t *overlay2[MAX_PIPES]; > igt_output_t *output[MAX_PIPES]; > igt_pipe_t *pipe[MAX_PIPES]; > igt_pipe_crc_t *pipe_crc[MAX_PIPES]; > @@ -144,7 +145,8 @@ static void lut_free(lut_t *lut) > enum test { > MPO_SINGLE_PAN, > MPO_MULTI_PAN, > - MPO_SCALE > + MPO_SCALE, > + MPO_MULTI_OVERLAY > }; > > static void test_init(data_t *data) > @@ -159,6 +161,8 @@ static void test_init(data_t *data) > data->pipe[i], DRM_PLANE_TYPE_PRIMARY); > data->overlay[i] = igt_pipe_get_plane_type_index( > data->pipe[i], DRM_PLANE_TYPE_OVERLAY, 0); > + data->overlay2[i] = igt_pipe_get_plane_type_index( > + data->pipe[i], DRM_PLANE_TYPE_OVERLAY, 1); > data->cursor[i] = igt_pipe_get_plane_type( > data->pipe[i], DRM_PLANE_TYPE_CURSOR); > data->pipe_crc[i] = > @@ -252,6 +256,7 @@ struct fbc { > igt_fb_t ref_primary; > igt_fb_t test_primary; > igt_fb_t test_overlay; > + igt_fb_t test_overlay2; > igt_crc_t ref_crc; > }; > > @@ -264,6 +269,102 @@ static void set_regamma_lut(data_t *data, lut_t const *lut, int n) > size); > } > > +/* > + * Compares the result of white background with white window with and without MPO > + * > + * Reference crc: > + * Draws a White background of size (pw,ph). > + * > + * Test crc: > + * Draws a White Overlay of size (pw,ph) then creates a cutout of size (w,h) at location (x1, y1) and (x2, y2) > + * Draws a White Primary plane of size (w, h) at location (x1,y1) (under the overlay) > + * Draws a White Overlay of size (w, h) at location (x2,y2) > + * > + * NOTE: The reason for using White+White is to speed up the crc (reuse the ref crc for all cases vs taking > + * a ref crc per flip) > + */ > +static void test_plane2(data_t *data, int n, int x1, int y1, int x2, int y2, int w, int h, int pw, int ph, struct fbc *fbc) > +{ > + > + igt_crc_t test_crc; > + igt_display_t *display = &data->display; > + > + /* Reference: */ > + > + igt_plane_set_fb(data->primary[n], &fbc[n].ref_primary); > + > + igt_plane_set_position(data->primary[n], 0, 0); > + igt_plane_set_size(data->primary[n], pw, ph); > + > + igt_display_commit_atomic(display, 0, 0); > + > + /* Test: */ > + /* Draw a white overlay with two cutouts at (x1,y1) and (x2,y2) */ > + draw_color_alpha(&fbc[n].test_overlay2, 0, 0, pw, ph, 1.0, 1.0, 1.0, 1.0); > + draw_color_alpha(&fbc[n].test_overlay2, x1, y1, w, h, 0.0, 0.0, 0.0, 0.0); > + draw_color_alpha(&fbc[n].test_overlay2, x2, y2, w, h, 0.0, 0.0, 0.0, 0.0); > + > + /* Draw a overlay to cover up one hole */ > + draw_color_alpha(&fbc[n].test_overlay, 0, 0, pw, ph, 0.0, 0.0, 0.0, 0.0); > + draw_color_alpha(&fbc[n].test_overlay, x2, y2, w, h, 1.0, 1.0, 1.0, 1.0); > + > + /* Draw a primary to cover up the other hole */ > + draw_color_alpha(&fbc[n].test_primary, 0, 0, w, h, 0.0, 0.0, 0.0, 0.0); > + draw_color_alpha(&fbc[n].test_primary, 0, 0, w, h, 1.0, 1.0, 1.0, 1.0); > + > + igt_plane_set_fb(data->primary[n], &fbc[n].test_primary); > + igt_plane_set_fb(data->overlay[n], &fbc[n].test_overlay); > + igt_plane_set_fb(data->overlay2[n], &fbc[n].test_overlay2); > + > + /* Move the primary to cover one of the holes*/ > + igt_plane_set_position(data->primary[n], x1, y1); > + igt_plane_set_size(data->primary[n], w, h); > + > + > + igt_display_commit_atomic(display, 0, 0); > + igt_pipe_crc_collect_crc(data->pipe_crc[n], &test_crc); > + igt_plane_set_fb(data->overlay[n], NULL); > + igt_plane_set_fb(data->overlay2[n], NULL); > + > + igt_assert_crc_equal(&fbc[n].ref_crc, &test_crc); > + > + /* Set window to white, this is to avoid flashing between black/white after each flip */ > + draw_color_alpha(&fbc[n].ref_primary, 0, 0, w, h, 1.0, 1.0, 1.0, 1.00); > + igt_plane_set_fb(data->primary[n], &fbc[n].ref_primary); > + igt_plane_set_position(data->primary[n], 0, 0); > + igt_plane_set_size(data->primary[n], pw, ph); > + igt_display_commit_atomic(display, 0, 0); > +} > + > +/* > + * MPO_MULTI_OVERLAY: This test takes the plane sizes and assigns random position within the screen With "random" removed, Reviewed-by: Leo Li Thanks, leo > + * > + * The test creates a white screen with 2 cutouts which are to be filled with 2 overlay planes. > + * Testing multiple overlay planes > + */ > +static void test_multi_overlay(data_t *data, int display_count, int w, int h, struct fbc *fb) > +{ > + > + for (int n = 0; n < display_count; n++) { > + > + int pw = data->w[n]; > + int ph = data->h[n]; > + > + if (pw <= w && ph <= h) > + break; > + > + /* Don't overlap the planes */ > + test_plane2(data, n, 0, 0, pw - w, ph - h, w, h, pw, ph, fb); > + > + if (w/2 > pw - w || h/2 > ph - h) > + break; > + > + /* Overlap the planes */ > + test_plane2(data, n, 0, 0, w/2, h/2, w, h, pw, ph, fb); > + } > + > +} > + > /* > * Compares the result of white backgroud with white window with and without MPO > * > @@ -467,6 +568,10 @@ static void test_display_mpo(data_t *data, enum test test, uint32_t format, int > > test_init(data); > > + /* Skip test if we don't have 2 overlay planes */ > + if (test == MPO_MULTI_OVERLAY) > + igt_skip_on(!data->overlay2[0]); > + > /* Skip if there is less valid outputs than the required. */ > for_each_connected_output(display, output) > valid_outputs++; > @@ -494,6 +599,7 @@ static void test_display_mpo(data_t *data, enum test test, uint32_t format, int > igt_create_fb(data->fd, w, h, DRM_FORMAT_XRGB8888, 0, &fb[n].ref_primary); > igt_create_color_fb(data->fd, w, h, DRM_FORMAT_XRGB8888, 0, 1.0, 1.0, 1.0, &fb[n].ref_primary); > igt_create_fb(data->fd, w, h, DRM_FORMAT_ARGB8888, 0, &fb[n].test_overlay); > + igt_create_fb(data->fd, w, h, DRM_FORMAT_ARGB8888, 0, &fb[n].test_overlay2); > > igt_plane_set_fb(data->primary[n], &fb[n].ref_primary); > > @@ -520,6 +626,8 @@ static void test_display_mpo(data_t *data, enum test test, uint32_t format, int > > if (test == MPO_SINGLE_PAN) > test_panning_1_display(data, display_count, videos[i][0], videos[i][1], fb); > + if (test == MPO_MULTI_OVERLAY) > + test_multi_overlay(data, display_count, videos[i][0], videos[i][1], fb); > if (test == MPO_MULTI_PAN) > test_panning_2_display(data, videos[i][0], videos[i][1], fb); > if(test == MPO_SCALE) > @@ -536,6 +644,7 @@ static void test_display_mpo(data_t *data, enum test test, uint32_t format, int > for (int n = 0; n < display_count; n++) { > igt_remove_fb(data->fd, &fb[n].ref_primary); > igt_remove_fb(data->fd, &fb[n].test_overlay); > + igt_remove_fb(data->fd, &fb[n].test_overlay2); > } > } > /* > @@ -798,6 +907,10 @@ igt_main > igt_subtest("mpo-pan-multi-p010") > test_display_mpo(&data, MPO_MULTI_PAN, DRM_FORMAT_P010, DISPLAYS_TO_TEST); > > + igt_describe("MPO with 2 overlay planes and a primary plane"); > + igt_subtest("multi-overlay") > + test_display_mpo(&data, MPO_MULTI_OVERLAY, DRM_FORMAT_NV12, 1); > + > igt_describe("MPO and scaling RGB primary plane"); > igt_subtest("mpo-scale-rgb") > test_display_mpo(&data, MPO_SCALE, DRM_FORMAT_XRGB8888, 1);