From patchwork Tue Jul 18 18:17:23 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Carlos Eduardo Gallo Filho X-Patchwork-Id: 13317594 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 3965BC0015E for ; Tue, 18 Jul 2023 18:19:32 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 496D110E3BA; Tue, 18 Jul 2023 18:19:31 +0000 (UTC) Received: from knopi.disroot.org (knopi.disroot.org [178.21.23.139]) by gabe.freedesktop.org (Postfix) with ESMTPS id 4E1B410E3BA for ; Tue, 18 Jul 2023 18:19:29 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by disroot.org (Postfix) with ESMTP id 1656244EC0; Tue, 18 Jul 2023 20:19:28 +0200 (CEST) X-Virus-Scanned: SPAM Filter at disroot.org Received: from knopi.disroot.org ([127.0.0.1]) by localhost (disroot.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 7OxWR5sY9p9H; Tue, 18 Jul 2023 20:19:27 +0200 (CEST) From: Carlos Eduardo Gallo Filho DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail; t=1689704366; bh=3APKavHLl3ZkMGA6TxzMMhaHSrKm6w2x6zwKuukLtHU=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=SDZisZ4FxIHV2JQWLS2z36ESNavV9R64VM+L/Ad73enRMn5jlNf7op1DLqHJOq3Xm j37aOjNzT98y7gb4zu8TE/JRK5W7OgLw6NG9tHG3uM4McmINAES/tdzRogQGg08387 zEpQz1xs9rMDfk0V0t/6eFk1ivOGb4jlf9QzhMp+mkHF+mjZQj9zQw/gDHRP84Qm6g Vp+9zl0hVrCeYKSDxGfNipWy6s2SM+BDY6YgtFHakbbY2x/PkGuNDl7WSnxOiUf3Xx be9KShM3zlE8CYDmzWZHG0azq7AXGegD8L5JNiAav1jmsceM67TeRCalEzJ/X1Sdu6 Cgp0mtmgqH5hg== To: dri-devel@lists.freedesktop.org Subject: [PATCH v2 1/4] drm: Add kernel-doc for drm_framebuffer_check_src_coords() Date: Tue, 18 Jul 2023 15:17:23 -0300 Message-ID: <20230718181726.3799-2-gcarlos@disroot.org> In-Reply-To: <20230718181726.3799-1-gcarlos@disroot.org> References: <20230718181726.3799-1-gcarlos@disroot.org> MIME-Version: 1.0 X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: andrealmeid@igalia.com, tzimmermann@suse.de, tales.aparecida@gmail.com, mripard@kernel.org, mairacanal@riseup.net, Carlos Eduardo Gallo Filho , davidgow@google.com, michal.winiarski@intel.com, arthurgrillo@riseup.net Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" Signed-off-by: Carlos Eduardo Gallo Filho Acked-by: Maxime Ripard --- drivers/gpu/drm/drm_framebuffer.c | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/drm_framebuffer.c b/drivers/gpu/drm/drm_framebuffer.c index aff3746dedfb..49df3ca3b3ee 100644 --- a/drivers/gpu/drm/drm_framebuffer.c +++ b/drivers/gpu/drm/drm_framebuffer.c @@ -73,6 +73,21 @@ * drm_framebuffer. */ +/** + * drm_framebuffer_check_src_coords - check if the source with given + * coordinates and sizes is inside the framebuffer + * @src_x: source x coordinate + * @src_y: source y coordinate + * @src_w: source width + * @src_h: source height + * @fb: pointer to the framebuffer to check + * + * This function checks if an object with the given set of coordinates and + * sizes fits inside the framebuffer by looking at its size. + * + * Returns: + * Zero on success, negative errno on failure. + */ int drm_framebuffer_check_src_coords(uint32_t src_x, uint32_t src_y, uint32_t src_w, uint32_t src_h, const struct drm_framebuffer *fb) @@ -82,7 +97,6 @@ int drm_framebuffer_check_src_coords(uint32_t src_x, uint32_t src_y, fb_width = fb->width << 16; fb_height = fb->height << 16; - /* Make sure source coordinates are inside the fb. */ if (src_w > fb_width || src_x > fb_width - src_w || src_h > fb_height || From patchwork Tue Jul 18 18:17:24 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Carlos Eduardo Gallo Filho X-Patchwork-Id: 13317595 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id B6A8BEB64DC for ; Tue, 18 Jul 2023 18:19:39 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id CF4FA10E3BC; Tue, 18 Jul 2023 18:19:38 +0000 (UTC) Received: from knopi.disroot.org (knopi.disroot.org [178.21.23.139]) by gabe.freedesktop.org (Postfix) with ESMTPS id 5CF7810E3BE for ; Tue, 18 Jul 2023 18:19:36 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by disroot.org (Postfix) with ESMTP id 1B5CF44EBD; Tue, 18 Jul 2023 20:19:35 +0200 (CEST) X-Virus-Scanned: SPAM Filter at disroot.org Received: from knopi.disroot.org ([127.0.0.1]) by localhost (disroot.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id sU-d-WpO4tlV; Tue, 18 Jul 2023 20:19:33 +0200 (CEST) From: Carlos Eduardo Gallo Filho DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail; t=1689704373; bh=yo2f7TJTqdzCWC4vZ9PniiFq8G5bU+eddn7hXvpw53o=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=iaqi8Y2lJTAOM34I1Phh5nKSi5SMCLzlZqzkReUpzCPpJzPPkN2RPVnoiYihVbFXy sMuZUyspXgyYqoegzdH/+b8H0p4lgm1ey8WRPDucaQEUV6wz7vV2HeAH5mQdh/15mT D63/duVsmGoG9ltTsqJbdmbxGCjrzr5uYNPQ3W3DgjZkQqADlZ7k/yCc5OvKOPbaI6 ik4TBsqHueSV4JczI1sxaM6G4jzBxxz+jKPurqTPChjg4teBHp5T37HNkG3qA9Wzv8 tO4cbSvOHsp0QYbdwUTj9t5yYe1+pQNONE+zdnoTmdX7Erqq/N1aO/bRtoZsHBDRdF 3Ndnx0cYl13pw== To: dri-devel@lists.freedesktop.org Subject: [PATCH v2 2/4] drm/tests: Add test for drm_framebuffer_check_src_coords() Date: Tue, 18 Jul 2023 15:17:24 -0300 Message-ID: <20230718181726.3799-3-gcarlos@disroot.org> In-Reply-To: <20230718181726.3799-1-gcarlos@disroot.org> References: <20230718181726.3799-1-gcarlos@disroot.org> MIME-Version: 1.0 X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: andrealmeid@igalia.com, tzimmermann@suse.de, tales.aparecida@gmail.com, mripard@kernel.org, mairacanal@riseup.net, Carlos Eduardo Gallo Filho , davidgow@google.com, michal.winiarski@intel.com, arthurgrillo@riseup.net Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" Add a parametrized test for the drm_framebuffer_check_src_coords function. Signed-off-by: Carlos Eduardo Gallo Filho --- drivers/gpu/drm/tests/drm_framebuffer_test.c | 126 +++++++++++++++++++ 1 file changed, 126 insertions(+) diff --git a/drivers/gpu/drm/tests/drm_framebuffer_test.c b/drivers/gpu/drm/tests/drm_framebuffer_test.c index f759d9f3b76e..ee92120cd8e9 100644 --- a/drivers/gpu/drm/tests/drm_framebuffer_test.c +++ b/drivers/gpu/drm/tests/drm_framebuffer_test.c @@ -9,6 +9,7 @@ #include #include +#include #include #include @@ -366,7 +367,132 @@ static void drm_framebuffer_test_to_desc(const struct drm_framebuffer_test *t, c KUNIT_ARRAY_PARAM(drm_framebuffer_create, drm_framebuffer_create_cases, drm_framebuffer_test_to_desc); +/* Parameters for testing drm_framebuffer_check_src_coords function */ +struct check_src_coords_case { + const char *name; /* Description of the parameter case */ + const int expect; /* Expected returned value by the function */ + + /* All function args */ + const uint32_t src_x; + const uint32_t src_y; + const uint32_t src_w; + const uint32_t src_h; + const struct drm_framebuffer fb; +}; + +static const struct check_src_coords_case check_src_coords_cases[] = { + /* Regular case where the source just fit in the framebuffer */ + { .name = "source inside framebuffer with normal sizes and coordinates", + .expect = 0, + .src_x = 500 << 16, .src_y = 700 << 16, + .src_w = 100 << 16, .src_h = 100 << 16, + .fb = { .width = 600, .height = 800 } + }, + { .name = "out of bound by both x and y with normal sizes and coordinates", + .expect = -ENOSPC, + .src_x = (500 << 16) + 1, .src_y = (700 << 16) + 1, + .src_w = 100 << 16, .src_h = 100 << 16, + .fb = { .width = 600, .height = 800 } + }, + /* From here, cases involving only x axis */ + { .name = "out of bound by x with normal width and x", + .expect = -ENOSPC, + .src_x = (500 << 16) + 1, .src_y = 700 << 16, + .src_w = 100 << 16, .src_h = 100 << 16, + .fb = { .width = 600, .height = 800 } + }, + { .name = "out of bound by x due to source width higher than framebuffer width", + .expect = -ENOSPC, + .src_x = 0, .src_y = 700 << 16, + .src_w = (600 << 16) + 1, .src_h = 100 << 16, + .fb = { .width = 600, .height = 800 } + }, + /* Source fullfill framebuffer width just by its width */ + { .name = "source inside framebuffer with its width equal framebuffer width and zero x", + .expect = 0, + .src_x = 0, .src_y = 700 << 16, + .src_w = 600 << 16, .src_h = 100 << 16, + .fb = { .width = 600, .height = 800 } + }, + /* + * Source fullfill framebuffer with its width and get out of + * bound by having a non-zero x coordinate + */ + { .name = "out of bound by x due to source width equal framebuffer width and non-zero x", + .expect = -ENOSPC, + .src_x = 1, .src_y = 700 << 16, + .src_w = 600 << 16, .src_h = 100 << 16, + .fb = { .width = 600, .height = 800 } + }, + { .name = "out of bound by x due to x coordinate higher than framebuffer width", + .expect = -ENOSPC, + .src_x = (600 << 16) + 1, .src_y = 700 << 16, + .src_w = 0, .src_h = 100 << 16, + .fb = { .width = 600, .height = 800 } + }, + /* + * From here, the same of previous cases involving x axis but with + * src_x and src_w values swapped with src_y and src_h, so we can cover + * the same cases for the y axis + */ + { .name = "out of bound by y with normal height and y", + .expect = -ENOSPC, + .src_x = 700 << 16, .src_y = (500 << 16) + 1, + .src_w = 100 << 16, .src_h = 100 << 16, + .fb = { .width = 800, .height = 600 } + }, + { .name = "out of bound by y due to source height higher than framebuffer height", + .expect = -ENOSPC, + .src_x = 700 << 16, .src_y = 0, + .src_w = 100 << 16, .src_h = (600 << 16) + 1, + .fb = { .width = 800, .height = 600 } + }, + { .name = "source inside framebuffer with its height equal framebuffer height and zero y", + .expect = 0, + .src_x = 700 << 16, .src_y = 0, + .src_w = 100 << 16, .src_h = 600 << 16, + .fb = { .width = 800, .height = 600 } + }, + { .name = "out of bound by y due to source height equal framebuffer height and non-zero y", + .expect = -ENOSPC, + .src_x = 700 << 16, .src_y = 1, + .src_w = 100 << 16, .src_h = 600 << 16, + .fb = { .width = 800, .height = 600 } + }, + { .name = "out of bound by y due to y coordinate higher than framebuffer height", + .expect = -ENOSPC, + .src_x = 700 << 16, .src_y = (600 << 16) + 1, + .src_w = 100 << 16, .src_h = 0, + .fb = { .width = 800, .height = 600 } + }, +}; + +static void drm_test_framebuffer_check_src_coords(struct kunit *test) +{ + const struct check_src_coords_case *params = test->param_value; + int r; + + /* + * Just compare the expected value with the one returned by the + * function called with args from parameter + */ + r = drm_framebuffer_check_src_coords(params->src_x, params->src_y, + params->src_w, params->src_h, + ¶ms->fb); + KUNIT_EXPECT_EQ(test, r, params->expect); +} + +static void check_src_coords_test_to_desc(const struct check_src_coords_case *t, + char *desc) +{ + strscpy(desc, t->name, KUNIT_PARAM_DESC_SIZE); +} + +KUNIT_ARRAY_PARAM(check_src_coords, check_src_coords_cases, + check_src_coords_test_to_desc); + static struct kunit_case drm_framebuffer_tests[] = { + KUNIT_CASE_PARAM(drm_test_framebuffer_check_src_coords, check_src_coords_gen_params), KUNIT_CASE_PARAM(drm_test_framebuffer_create, drm_framebuffer_create_gen_params), { } }; From patchwork Tue Jul 18 18:17:25 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Carlos Eduardo Gallo Filho X-Patchwork-Id: 13317596 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 42451EB64DD for ; Tue, 18 Jul 2023 18:19:48 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 575C410E3BD; Tue, 18 Jul 2023 18:19:47 +0000 (UTC) Received: from knopi.disroot.org (knopi.disroot.org [178.21.23.139]) by gabe.freedesktop.org (Postfix) with ESMTPS id CB95210E3BD for ; Tue, 18 Jul 2023 18:19:44 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by disroot.org (Postfix) with ESMTP id 8827844EBE; Tue, 18 Jul 2023 20:19:43 +0200 (CEST) X-Virus-Scanned: SPAM Filter at disroot.org Received: from knopi.disroot.org ([127.0.0.1]) by localhost (disroot.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id GGPZUuehdjiU; Tue, 18 Jul 2023 20:19:39 +0200 (CEST) From: Carlos Eduardo Gallo Filho DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail; t=1689704379; bh=I4/QCtT8EAnJeFazDLXsxNI976Ga8yTSON+a+3kWwz4=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=ieFJV1heZzHbQKZn217Wgf6gkdGQRdoN678YDYNgK9j/7muGzBv5MQx/eMFiKGYIa CV82nycmb1w6b0/pPPUbwDhVocpkZtS7AbBl1S8yvC6LKagRTG+Rs6y0KKEtYuPPeH OkJebMuGU9EWDBnhlKaGuXrE5TzRXDZETiHQdgK0fbP5Gz1brV+ravXf2FnALLsIsC ks1gMkVaME2ZFcPVe3vlpX7cWQdMF+DdxyQOoU022H71BiZLk2HmHMicCEe5r9xUJi i0lo6oGtskZOMk5Bk4sMcuw3rFikHigQapdc7AqJO/sORCnZdf/Ah4i0tNL11fOCOS VrsnqCPZ1rRiw== To: dri-devel@lists.freedesktop.org Subject: [PATCH v2 3/4] drm/tests: Add parameters to the drm_test_framebuffer_create test Date: Tue, 18 Jul 2023 15:17:25 -0300 Message-ID: <20230718181726.3799-4-gcarlos@disroot.org> In-Reply-To: <20230718181726.3799-1-gcarlos@disroot.org> References: <20230718181726.3799-1-gcarlos@disroot.org> MIME-Version: 1.0 X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: andrealmeid@igalia.com, tzimmermann@suse.de, tales.aparecida@gmail.com, mripard@kernel.org, mairacanal@riseup.net, Carlos Eduardo Gallo Filho , davidgow@google.com, michal.winiarski@intel.com, arthurgrillo@riseup.net Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" Extend the existing test case to cover: 1. Invalid flag atribute in the struct drm_mode_fb_cmd2. 2. Pixel format which requires non-linear modifier with DRM_FORMAT_MOD_LINEAR set. 3. Non-zero buffer offset for an unused plane Also replace strcpy to strscpy on test_to_desc for improved security and reliability. Signed-off-by: Carlos Eduardo Gallo Filho --- drivers/gpu/drm/tests/drm_framebuffer_test.c | 23 +++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/tests/drm_framebuffer_test.c b/drivers/gpu/drm/tests/drm_framebuffer_test.c index ee92120cd8e9..cbab12503f5f 100644 --- a/drivers/gpu/drm/tests/drm_framebuffer_test.c +++ b/drivers/gpu/drm/tests/drm_framebuffer_test.c @@ -20,6 +20,8 @@ #define MIN_HEIGHT 4 #define MAX_HEIGHT 4096 +#define DRM_MODE_FB_INVALID BIT(2) + struct drm_framebuffer_test { int buffer_created; struct drm_mode_fb_cmd2 cmd; @@ -84,6 +86,18 @@ static const struct drm_framebuffer_test drm_framebuffer_create_cases[] = { .pitches = { 4 * MAX_WIDTH, 0, 0 }, } }, +{ .buffer_created = 0, .name = "ABGR8888 Non-zero buffer offset for unused plane", + .cmd = { .width = MAX_WIDTH, .height = MAX_HEIGHT, .pixel_format = DRM_FORMAT_ABGR8888, + .handles = { 1, 0, 0 }, .offsets = { UINT_MAX / 2, UINT_MAX / 2, 0 }, + .pitches = { 4 * MAX_WIDTH, 0, 0 }, .flags = DRM_MODE_FB_MODIFIERS, + } +}, +{ .buffer_created = 0, .name = "ABGR8888 Invalid flag", + .cmd = { .width = MAX_WIDTH, .height = MAX_HEIGHT, .pixel_format = DRM_FORMAT_ABGR8888, + .handles = { 1, 0, 0 }, .offsets = { UINT_MAX / 2, 0, 0 }, + .pitches = { 4 * MAX_WIDTH, 0, 0 }, .flags = DRM_MODE_FB_INVALID, + } +}, { .buffer_created = 1, .name = "ABGR8888 Set DRM_MODE_FB_MODIFIERS without modifiers", .cmd = { .width = MAX_WIDTH, .height = MAX_HEIGHT, .pixel_format = DRM_FORMAT_ABGR8888, .handles = { 1, 0, 0 }, .offsets = { UINT_MAX / 2, 0, 0 }, @@ -263,6 +277,13 @@ static const struct drm_framebuffer_test drm_framebuffer_create_cases[] = { .pitches = { MAX_WIDTH, DIV_ROUND_UP(MAX_WIDTH, 2), DIV_ROUND_UP(MAX_WIDTH, 2) }, } }, +{ .buffer_created = 0, .name = "YUV420_10BIT Invalid modifier(DRM_FORMAT_MOD_LINEAR)", + .cmd = { .width = MAX_WIDTH, .height = MAX_HEIGHT, .pixel_format = DRM_FORMAT_YUV420_10BIT, + .handles = { 1, 0, 0 }, .flags = DRM_MODE_FB_MODIFIERS, + .modifier = { DRM_FORMAT_MOD_LINEAR, 0, 0 }, + .pitches = { MAX_WIDTH, 0, 0 }, + } +}, { .buffer_created = 1, .name = "X0L2 Normal sizes", .cmd = { .width = 600, .height = 600, .pixel_format = DRM_FORMAT_X0L2, .handles = { 1, 0, 0 }, .pitches = { 1200, 0, 0 } @@ -361,7 +382,7 @@ static void drm_test_framebuffer_create(struct kunit *test) static void drm_framebuffer_test_to_desc(const struct drm_framebuffer_test *t, char *desc) { - strcpy(desc, t->name); + strscpy(desc, t->name, KUNIT_PARAM_DESC_SIZE); } KUNIT_ARRAY_PARAM(drm_framebuffer_create, drm_framebuffer_create_cases, From patchwork Tue Jul 18 18:17:26 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Carlos Eduardo Gallo Filho X-Patchwork-Id: 13317597 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 7BA23C0015E for ; Tue, 18 Jul 2023 18:19:51 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 890F810E3C5; Tue, 18 Jul 2023 18:19:50 +0000 (UTC) Received: from knopi.disroot.org (knopi.disroot.org [178.21.23.139]) by gabe.freedesktop.org (Postfix) with ESMTPS id 4936510E3BD for ; Tue, 18 Jul 2023 18:19:46 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by disroot.org (Postfix) with ESMTP id E2F8B44EBF; Tue, 18 Jul 2023 20:19:44 +0200 (CEST) X-Virus-Scanned: SPAM Filter at disroot.org Received: from knopi.disroot.org ([127.0.0.1]) by localhost (disroot.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id IaqFjBWqHy60; Tue, 18 Jul 2023 20:19:43 +0200 (CEST) From: Carlos Eduardo Gallo Filho DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail; t=1689704383; bh=YhUCbYUHFgY/A/B5JuF4w5fDDjji8xWqk5tX6lhk89w=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=k38By5c/jhkUY5DIP3jUVB13dn39xCi76vzAuvkgN215xIsZpkltbHAd/aXOJ6Z48 cY1yQLaNfxCyDBB0VaO94fHsAirvvp269iqV8bcF1cHkOdODd03FDPKVWrfkTrahMj rMzDPaYT0rqe97tqT63QMxPls4Q0/c5rV8WBuC7W427jfs7oA176XRP7yXcUvc1rCW haaltwNsrUjhY/AsDI5B7UW9r3UnSDshew8J4YeA4EKtPSgHFwDJDwHZDn56CkD/w1 QFJ9VywoZHYjYEr7Ylh31t8QB2lCVDiF37FCCaAivlytwu775y1fwi1dG5vVL6o5pt uIjM5V0V7+MXQ== To: dri-devel@lists.freedesktop.org Subject: [PATCH v2 4/4] drm/tests: Add test case for drm_internal_framebuffer_create() Date: Tue, 18 Jul 2023 15:17:26 -0300 Message-ID: <20230718181726.3799-5-gcarlos@disroot.org> In-Reply-To: <20230718181726.3799-1-gcarlos@disroot.org> References: <20230718181726.3799-1-gcarlos@disroot.org> MIME-Version: 1.0 X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: andrealmeid@igalia.com, tzimmermann@suse.de, tales.aparecida@gmail.com, mripard@kernel.org, mairacanal@riseup.net, Carlos Eduardo Gallo Filho , davidgow@google.com, michal.winiarski@intel.com, arthurgrillo@riseup.net Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" Introduce a test to cover the creation of framebuffer with modifier on a device that don't support it. Signed-off-by: Carlos Eduardo Gallo Filho --- drivers/gpu/drm/tests/drm_framebuffer_test.c | 29 ++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/drivers/gpu/drm/tests/drm_framebuffer_test.c b/drivers/gpu/drm/tests/drm_framebuffer_test.c index cbab12503f5f..0f1744b5d2c1 100644 --- a/drivers/gpu/drm/tests/drm_framebuffer_test.c +++ b/drivers/gpu/drm/tests/drm_framebuffer_test.c @@ -388,6 +388,34 @@ static void drm_framebuffer_test_to_desc(const struct drm_framebuffer_test *t, c KUNIT_ARRAY_PARAM(drm_framebuffer_create, drm_framebuffer_create_cases, drm_framebuffer_test_to_desc); +/* + * This test is very similar to drm_test_framebuffer_create, except that it + * set mock->mode_config.fb_modifiers_not_supported member to 1, covering + * the case of trying to create a framebuffer with modifiers without the + * device really supporting it. + */ +static void drm_test_framebuffer_modifiers_not_supported(struct kunit *test) +{ + /* A valid cmd with modifier */ + struct drm_mode_fb_cmd2 cmd = { + .width = MAX_WIDTH, .height = MAX_HEIGHT, + .pixel_format = DRM_FORMAT_ABGR8888, .handles = { 1, 0, 0 }, + .offsets = { UINT_MAX / 2, 0, 0 }, .pitches = { 4 * MAX_WIDTH, 0, 0 }, + .flags = DRM_MODE_FB_MODIFIERS, + }; + struct drm_device *mock = test->priv; + int buffer_created = 0; + + mock->dev_private = &buffer_created; + mock->mode_config.fb_modifiers_not_supported = 1; + + drm_internal_framebuffer_create(mock, &cmd, NULL); + KUNIT_EXPECT_EQ(test, 0, buffer_created); + + /* Restore original value */ + mock->mode_config.fb_modifiers_not_supported = 0; +} + /* Parameters for testing drm_framebuffer_check_src_coords function */ struct check_src_coords_case { const char *name; /* Description of the parameter case */ @@ -513,6 +541,7 @@ KUNIT_ARRAY_PARAM(check_src_coords, check_src_coords_cases, check_src_coords_test_to_desc); static struct kunit_case drm_framebuffer_tests[] = { + KUNIT_CASE(drm_test_framebuffer_modifiers_not_supported), KUNIT_CASE_PARAM(drm_test_framebuffer_check_src_coords, check_src_coords_gen_params), KUNIT_CASE_PARAM(drm_test_framebuffer_create, drm_framebuffer_create_gen_params), { }