From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ville =?iso-8859-1?Q?Syrj=E4l=E4?= Subject: Re: [PATCH 1/1] kms_cursor_crc/Enabling this test for variable cursor width and heights Date: Mon, 24 Feb 2014 17:48:16 +0200 Message-ID: <20140224154816.GT3852@intel.com> References: <1393256225-31904-1-git-send-email-sagar.a.kamble@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable Return-path: Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by gabe.freedesktop.org (Postfix) with ESMTP id CB4EBFAB0C for ; Mon, 24 Feb 2014 07:48:19 -0800 (PST) Content-Disposition: inline In-Reply-To: <1393256225-31904-1-git-send-email-sagar.a.kamble@intel.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: intel-gfx-bounces@lists.freedesktop.org Errors-To: intel-gfx-bounces@lists.freedesktop.org To: sagar.a.kamble@intel.com Cc: intel-gfx@lists.freedesktop.org List-Id: intel-gfx@lists.freedesktop.org On Mon, Feb 24, 2014 at 09:07:05PM +0530, sagar.a.kamble@intel.com wrote: > From: Sagar Kamble > = > Signed-off-by: Sagar Kamble > --- > tests/kms_cursor_crc.c | 51 ++++++++++++++++++++++++++++++--------------= ------ > 1 file changed, 31 insertions(+), 20 deletions(-) > = > diff --git a/tests/kms_cursor_crc.c b/tests/kms_cursor_crc.c > index 38aa1ab..4458248 100644 > --- a/tests/kms_cursor_crc.c > +++ b/tests/kms_cursor_crc.c > @@ -34,6 +34,8 @@ > #include "igt_debugfs.h" > #include "igt_kms.h" > = > +int w =3D 0, h =3D 0; > + > enum cursor_type { > WHITE_VISIBLE, > WHITE_INVISIBLE, > @@ -170,7 +172,7 @@ static void test_crc(test_data_t *test_data, enum cur= sor_type cursor_type, > = > /* enable cursor */ > igt_assert(drmModeSetCursor(data->drm_fd, test_data->crtc_id, > - data->fb[cursor_type].gem_handle, 64, 64) =3D=3D 0); > + data->fb[cursor_type].gem_handle, w, h) =3D=3D 0); > = > if (onscreen) { > /* cursor onscreen, crc should match, except when white visible cursor= is used */ > @@ -180,32 +182,32 @@ static void test_crc(test_data_t *test_data, enum c= ursor_type cursor_type, > do_test(test_data, left, right, top, bottom); > = > /* 2 pixels inside */ > - do_test(test_data, left - 62, right + 62, top , bottom ); > - do_test(test_data, left , right , top - 62, bottom + 62); > - do_test(test_data, left - 62, right + 62, top - 62, bottom + 62); > + do_test(test_data, left - (w - 2), right + (w - 2), top , bottom = ); > + do_test(test_data, left , right , top - (w - 2), bottom + (w -= 2)); > + do_test(test_data, left - (w - 2), right + (w - 2), top - (w - 2), bot= tom + (w - 2)); > = > /* 1 pixel inside */ > - do_test(test_data, left - 63, right + 63, top , bottom ); > - do_test(test_data, left , right , top - 63, bottom + 63); > - do_test(test_data, left - 63, right + 63, top - 63, bottom + 63); > + do_test(test_data, left - (w - 1), right + (w - 1), top , bottom = ); > + do_test(test_data, left , right , top - (w - 1), bottom + (w -= 1)); > + do_test(test_data, left - (w - 1), right + (w - 1), top - (w - 1), bot= tom + (w - 1)); > } else { > /* cursor offscreen, crc should always match */ > test_data->crc_must_match =3D true; > = > /* fully outside */ > - do_test(test_data, left - 64, right + 64, top , bottom ); > - do_test(test_data, left , right , top - 64, bottom + 64); > - do_test(test_data, left - 64, right + 64, top - 64, bottom + 64); > + do_test(test_data, left - w, right + w, top , bottom ); > + do_test(test_data, left , right , top - w, bottom + w); > + do_test(test_data, left - w, right + w, top - w, bottom + w); > = > /* fully outside by 1 extra pixels */ > - do_test(test_data, left - 65, right + 65, top , bottom ); > - do_test(test_data, left , right , top - 65, bottom + 65); > - do_test(test_data, left - 65, right + 65, top - 65, bottom + 65); > + do_test(test_data, left - (w + 1), right + (w + 1), top , bottom = ); > + do_test(test_data, left , right , top - (w + 1), bottom + (w += 1)); > + do_test(test_data, left - (w + 1), right + (w + 1), top - (w + 1), bot= tom + (w + 1)); > = > /* fully outside by 2 extra pixels */ > - do_test(test_data, left - 66, right + 66, top , bottom ); > - do_test(test_data, left , right , top - 66, bottom + 66); > - do_test(test_data, left - 66, right + 66, top - 66, bottom + 66); > + do_test(test_data, left - (w + 2), right + (w + 2), top , bottom = ); > + do_test(test_data, left , right , top - (w + 2), bottom + (w += 2)); > + do_test(test_data, left - (w + 2), right + (w + 2), top - (w + 2), bot= tom + (w + 2)); > = > /* fully outside by a lot of extra pixels */ > do_test(test_data, left - 512, right + 512, top , bottom ); > @@ -251,9 +253,9 @@ static bool prepare_crtc(test_data_t *test_data, uint= 32_t connector_id) > = > /* x/y position where the cursor is still fully visible */ > test_data->left =3D 0; > - test_data->right =3D connector.config.default_mode.hdisplay - 64; > + test_data->right =3D connector.config.default_mode.hdisplay - w; > test_data->top =3D 0; > - test_data->bottom =3D connector.config.default_mode.vdisplay - 64; > + test_data->bottom =3D connector.config.default_mode.vdisplay - h; > = > /* make sure cursor is disabled */ > igt_assert(drmModeSetCursor(data->drm_fd, test_data->crtc_id, 0, 0, 0) = =3D=3D 0); > @@ -314,20 +316,29 @@ static void create_cursor_fb(data_t *data, > { > cairo_t *cr; > = > - data->fb_id[cursor_type] =3D kmstest_create_fb2(data->drm_fd, 64, 64, > + data->fb_id[cursor_type] =3D kmstest_create_fb2(data->drm_fd, w, h, > DRM_FORMAT_ARGB8888, false, > &data->fb[cursor_type]); > igt_assert(data->fb_id[cursor_type]); > = > cr =3D kmstest_get_cairo_ctx(data->drm_fd, > &data->fb[cursor_type]); > - kmstest_paint_color_alpha(cr, 0, 0, 64, 64, r, g, b, a); > + kmstest_paint_color_alpha(cr, 0, 0, w, h, r, g, b, a); > igt_assert(cairo_status(cr) =3D=3D 0); > } > = > igt_main > { > data_t data =3D {}; > + int c; > + char args[10]; > + > + printf("\nEnter Width and Height of Cursor Plane (64x64, 128x128):"); > + scanf("%s", args); > + if (sscanf(args, "%dx%d", &w, &h) !=3D 2) { > + printf("\nInvalid arguments"); > + return -1; > + } These tests are meant to run without user interaction, so reading from stdin isn't something we want to be doing. What you should do is add more subtests for the different cursors sizes. And you should make the 128x128 and 256x256 subtests skip if the kernel refuses the specific cursor size. By using igt_subtest_f() you can avoid a bunch of duplicated code for iterating the subtests. > = > igt_skip_on_simulation(); > = > -- = > 1.8.5 > = > _______________________________________________ > Intel-gfx mailing list > Intel-gfx@lists.freedesktop.org > http://lists.freedesktop.org/mailman/listinfo/intel-gfx -- = Ville Syrj=E4l=E4 Intel OTC