From: Maxime Ripard <mripard@kernel.org>
To: "Maarten Lankhorst" <maarten.lankhorst@linux.intel.com>,
"Thomas Zimmermann" <tzimmermann@suse.de>,
"David Airlie" <airlied@gmail.com>,
"Daniel Vetter" <daniel@ffwll.ch>,
"Jonathan Corbet" <corbet@lwn.net>,
"Sandy Huang" <hjc@rock-chips.com>,
"Heiko Stübner" <heiko@sntech.de>, "Chen-Yu Tsai" <wens@csie.org>,
"Jernej Skrabec" <jernej.skrabec@gmail.com>,
"Samuel Holland" <samuel@sholland.org>,
"Andy Yan" <andy.yan@rock-chips.com>
Cc: "Hans Verkuil" <hverkuil@xs4all.nl>,
"Sebastian Wick" <sebastian.wick@redhat.com>,
"Ville Syrjälä" <ville.syrjala@linux.intel.com>,
dri-devel@lists.freedesktop.org,
linux-arm-kernel@lists.infradead.org, linux-doc@vger.kernel.org,
linux-kernel@vger.kernel.org, linux-media@vger.kernel.org,
linux-rockchip@lists.infradead.org, linux-sunxi@lists.linux.dev,
"Maxime Ripard" <mripard@kernel.org>,
"Maíra Canal" <mcanal@igalia.com>
Subject: [PATCH v12 25/28] drm/vc4: tests: Remove vc4_dummy_plane structure
Date: Tue, 23 Apr 2024 12:45:54 +0200 [thread overview]
Message-ID: <20240423-kms-hdmi-connector-state-v12-25-3338e4c0b189@kernel.org> (raw)
In-Reply-To: <20240423-kms-hdmi-connector-state-v12-0-3338e4c0b189@kernel.org>
The vc4_dummy_plane structure was introduced as a mean to add
mock-specific fields.
However, we never really used it and it's still strictly equivalent to
vc4_plane (which is in the same situation vs drm_plane), so we can
simply remove the vc4_dummy_plane structure and make the mock code
cleaner.
Reviewed-by: Maíra Canal <mcanal@igalia.com>
Signed-off-by: Maxime Ripard <mripard@kernel.org>
---
drivers/gpu/drm/vc4/tests/vc4_mock.c | 6 ++----
drivers/gpu/drm/vc4/tests/vc4_mock.h | 9 ++-------
drivers/gpu/drm/vc4/tests/vc4_mock_plane.c | 14 +++++---------
3 files changed, 9 insertions(+), 20 deletions(-)
diff --git a/drivers/gpu/drm/vc4/tests/vc4_mock.c b/drivers/gpu/drm/vc4/tests/vc4_mock.c
index becb3dbaa548..0731a7d85d7a 100644
--- a/drivers/gpu/drm/vc4/tests/vc4_mock.c
+++ b/drivers/gpu/drm/vc4/tests/vc4_mock.c
@@ -107,20 +107,18 @@ static const struct vc4_mock_desc vc5_mock =
);
static int __build_one_pipe(struct kunit *test, struct drm_device *drm,
const struct vc4_mock_pipe_desc *pipe)
{
- struct vc4_dummy_plane *dummy_plane;
struct drm_plane *plane;
struct vc4_dummy_crtc *dummy_crtc;
struct drm_crtc *crtc;
unsigned int i;
- dummy_plane = vc4_dummy_plane(test, drm, DRM_PLANE_TYPE_PRIMARY);
- KUNIT_ASSERT_NOT_ERR_OR_NULL(test, dummy_plane);
+ plane = vc4_dummy_plane(test, drm, DRM_PLANE_TYPE_PRIMARY);
+ KUNIT_ASSERT_NOT_ERR_OR_NULL(test, plane);
- plane = &dummy_plane->plane.base;
dummy_crtc = vc4_mock_pv(test, drm, plane, pipe->data);
KUNIT_ASSERT_NOT_ERR_OR_NULL(test, dummy_crtc);
crtc = &dummy_crtc->crtc.base;
for (i = 0; i < pipe->noutputs; i++) {
diff --git a/drivers/gpu/drm/vc4/tests/vc4_mock.h b/drivers/gpu/drm/vc4/tests/vc4_mock.h
index 2d0b339bd9f3..002b6218960c 100644
--- a/drivers/gpu/drm/vc4/tests/vc4_mock.h
+++ b/drivers/gpu/drm/vc4/tests/vc4_mock.h
@@ -19,17 +19,12 @@ struct drm_crtc *vc4_find_crtc_for_encoder(struct kunit *test,
return crtc;
return NULL;
}
-struct vc4_dummy_plane {
- struct vc4_plane plane;
-};
-
-struct vc4_dummy_plane *vc4_dummy_plane(struct kunit *test,
- struct drm_device *drm,
- enum drm_plane_type type);
+struct drm_plane *vc4_dummy_plane(struct kunit *test, struct drm_device *drm,
+ enum drm_plane_type type);
struct vc4_dummy_crtc {
struct vc4_crtc crtc;
};
diff --git a/drivers/gpu/drm/vc4/tests/vc4_mock_plane.c b/drivers/gpu/drm/vc4/tests/vc4_mock_plane.c
index 62b18f5f41db..973f5f929097 100644
--- a/drivers/gpu/drm/vc4/tests/vc4_mock_plane.c
+++ b/drivers/gpu/drm/vc4/tests/vc4_mock_plane.c
@@ -20,28 +20,24 @@ static const struct drm_plane_funcs vc4_dummy_plane_funcs = {
static const uint32_t vc4_dummy_plane_formats[] = {
DRM_FORMAT_XRGB8888,
};
-struct vc4_dummy_plane *vc4_dummy_plane(struct kunit *test,
- struct drm_device *drm,
- enum drm_plane_type type)
+struct drm_plane *vc4_dummy_plane(struct kunit *test, struct drm_device *drm,
+ enum drm_plane_type type)
{
- struct vc4_dummy_plane *dummy_plane;
struct drm_plane *plane;
- dummy_plane = drmm_universal_plane_alloc(drm,
- struct vc4_dummy_plane, plane.base,
+ plane = __drmm_universal_plane_alloc(drm, sizeof(struct drm_plane), 0,
0,
&vc4_dummy_plane_funcs,
vc4_dummy_plane_formats,
ARRAY_SIZE(vc4_dummy_plane_formats),
NULL,
DRM_PLANE_TYPE_PRIMARY,
NULL);
- KUNIT_ASSERT_NOT_ERR_OR_NULL(test, dummy_plane);
+ KUNIT_ASSERT_NOT_ERR_OR_NULL(test, plane);
- plane = &dummy_plane->plane.base;
drm_plane_helper_add(plane, &vc4_dummy_plane_helper_funcs);
- return dummy_plane;
+ return plane;
}
--
2.44.0
next prev parent reply other threads:[~2024-04-23 10:46 UTC|newest]
Thread overview: 35+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-04-23 10:45 [PATCH v12 00/28] drm/connector: Create HDMI Connector infrastructure Maxime Ripard
2024-04-23 10:45 ` [PATCH v12 01/28] drm/connector: Introduce an HDMI connector initialization function Maxime Ripard
2024-04-23 10:45 ` [PATCH v12 02/28] drm/mode_object: Export drm_mode_obj_find_prop_id for tests Maxime Ripard
2024-04-23 10:45 ` [PATCH v12 03/28] drm/tests: connector: Add tests for drmm_connector_hdmi_init Maxime Ripard
2024-04-23 10:45 ` [PATCH v12 04/28] drm/connector: hdmi: Create an HDMI sub-state Maxime Ripard
2024-04-23 10:45 ` [PATCH v12 05/28] drm/connector: hdmi: Add output BPC to the connector state Maxime Ripard
2024-04-23 10:45 ` [PATCH v12 06/28] drm/tests: Add output bpc tests Maxime Ripard
2024-04-23 10:45 ` [PATCH v12 07/28] drm/connector: hdmi: Add support for output format Maxime Ripard
2024-04-23 10:45 ` [PATCH v12 08/28] drm/tests: Add output formats tests Maxime Ripard
2024-04-23 10:45 ` [PATCH v12 09/28] drm/display: hdmi: Add HDMI compute clock helper Maxime Ripard
2024-04-23 10:45 ` [PATCH v12 10/28] drm/tests: Add HDMI TDMS character rate tests Maxime Ripard
2024-04-23 10:45 ` [PATCH v12 11/28] drm/connector: hdmi: Calculate TMDS character rate Maxime Ripard
2024-04-23 10:45 ` [PATCH v12 12/28] drm/tests: Add TDMS character rate connector state tests Maxime Ripard
2024-04-23 10:45 ` [PATCH v12 13/28] drm/connector: hdmi: Add custom hook to filter TMDS character rate Maxime Ripard
2024-04-23 10:45 ` [PATCH v12 14/28] drm/tests: Add HDMI connector rate filter hook tests Maxime Ripard
2024-04-23 10:45 ` [PATCH v12 15/28] drm/connector: hdmi: Compute bpc and format automatically Maxime Ripard
2024-04-23 10:45 ` [PATCH v12 16/28] drm/tests: Add HDMI connector bpc and format tests Maxime Ripard
2024-04-23 10:45 ` [PATCH v12 17/28] drm/connector: hdmi: Add Broadcast RGB property Maxime Ripard
2024-04-23 10:45 ` [PATCH v12 18/28] drm/tests: Add tests for " Maxime Ripard
2024-04-23 10:45 ` [PATCH v12 19/28] drm/connector: hdmi: Add RGB Quantization Range to the connector state Maxime Ripard
2024-04-23 10:45 ` [PATCH v12 20/28] drm/tests: Add RGB Quantization tests Maxime Ripard
2024-04-23 10:45 ` [PATCH v12 21/28] drm/connector: hdmi: Add Infoframes generation Maxime Ripard
2024-04-23 10:45 ` [PATCH v12 22/28] drm/tests: Add infoframes test Maxime Ripard
2024-04-23 10:45 ` [PATCH v12 23/28] drm/connector: hdmi: Create Infoframe DebugFS entries Maxime Ripard
2024-04-23 10:45 ` [PATCH v12 24/28] drm/vc4: hdmi: Switch to HDMI connector Maxime Ripard
2024-04-23 10:45 ` Maxime Ripard [this message]
2024-04-23 10:45 ` [PATCH v12 26/28] drm/vc4: tests: Convert to plane creation helper Maxime Ripard
2024-04-23 10:45 ` [PATCH v12 27/28] drm/rockchip: inno_hdmi: Switch to HDMI connector Maxime Ripard
2024-04-27 10:12 ` Andy Yan
2024-05-06 7:49 ` Maxime Ripard
2024-04-27 10:44 ` Andy Yan
2024-05-06 7:59 ` Maxime Ripard
2024-05-06 8:22 ` Andy Yan
2024-05-07 1:32 ` Andy Yan
2024-04-23 10:45 ` [PATCH v12 28/28] drm/sun4i: hdmi: " Maxime Ripard
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=20240423-kms-hdmi-connector-state-v12-25-3338e4c0b189@kernel.org \
--to=mripard@kernel.org \
--cc=airlied@gmail.com \
--cc=andy.yan@rock-chips.com \
--cc=corbet@lwn.net \
--cc=daniel@ffwll.ch \
--cc=dri-devel@lists.freedesktop.org \
--cc=heiko@sntech.de \
--cc=hjc@rock-chips.com \
--cc=hverkuil@xs4all.nl \
--cc=jernej.skrabec@gmail.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-doc@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-media@vger.kernel.org \
--cc=linux-rockchip@lists.infradead.org \
--cc=linux-sunxi@lists.linux.dev \
--cc=maarten.lankhorst@linux.intel.com \
--cc=mcanal@igalia.com \
--cc=samuel@sholland.org \
--cc=sebastian.wick@redhat.com \
--cc=tzimmermann@suse.de \
--cc=ville.syrjala@linux.intel.com \
--cc=wens@csie.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;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).