Skip to content

Commit 73d934d

Browse files
Jessica Zhanglumag
Jessica Zhang
authored and
lumag
committed
drm/tests: Add test for drm_atomic_helper_commit_modeset_disables()
Add a subtest to check that modeset is called when the connector is changed Signed-off-by: Jessica Zhang <[email protected]> Reviewed-by: Dmitry Baryshkov <[email protected]> Reviewed-by: Maxime Ripard <[email protected]> Link: https://patchwork.freedesktop.org/patch/msgid/[email protected] Signed-off-by: Dmitry Baryshkov <[email protected]>
1 parent 7e182cb commit 73d934d

File tree

2 files changed

+245
-0
lines changed

2 files changed

+245
-0
lines changed

‎drivers/gpu/drm/tests/Makefile‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ obj-$(CONFIG_DRM_KUNIT_TEST_HELPERS) += \
44
drm_kunit_helpers.o
55

66
obj-$(CONFIG_DRM_KUNIT_TEST) += \
7+
drm_atomic_state_test.o \
78
drm_buddy_test.o \
89
drm_cmdline_parser_test.o \
910
drm_connector_test.o \

‎drivers/gpu/drm/tests/drm_atomic_state_test.c‎

Lines changed: 244 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,244 @@
1+
// SPDX-License-Identifier: GPL-2.0
2+
/*
3+
* Test cases for the drm_atomic_state helpers
4+
*
5+
* Copyright (c) 2024 Qualcomm Innovation Center, Inc. All rights reserved.
6+
*/
7+
8+
#include <drm/drm_atomic.h>
9+
#include <drm/drm_atomic_helper.h>
10+
#include <drm/drm_atomic_uapi.h>
11+
#include <drm/drm_kunit_helpers.h>
12+
#include <drm/drm_probe_helper.h>
13+
14+
#define DRM_TEST_ENC_0 BIT(0)
15+
#define DRM_TEST_ENC_1 BIT(1)
16+
#define DRM_TEST_ENC_2 BIT(2)
17+
18+
#define DRM_TEST_CONN_0 BIT(0)
19+
20+
static const struct drm_display_mode drm_atomic_test_mode = {
21+
DRM_MODE("1024x768", 0, 65000, 1024, 1048,
22+
1184, 1344, 0, 768, 771, 777, 806, 0,
23+
DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_NVSYNC)
24+
};
25+
26+
struct drm_atomic_test_priv {
27+
struct drm_device drm;
28+
struct drm_plane *plane;
29+
struct drm_crtc *crtc;
30+
struct drm_encoder encoders[3];
31+
struct drm_connector connectors[2];
32+
};
33+
34+
static int modeset_counter;
35+
36+
static void drm_test_encoder_mode_set(struct drm_encoder *encoder,
37+
struct drm_crtc_state *crtc_state,
38+
struct drm_connector_state *conn_state)
39+
{
40+
modeset_counter++;
41+
}
42+
43+
static const struct drm_encoder_helper_funcs drm_atomic_test_encoder_funcs = {
44+
.atomic_mode_set = drm_test_encoder_mode_set,
45+
};
46+
47+
static const struct drm_connector_funcs dummy_connector_funcs = {
48+
.atomic_destroy_state = drm_atomic_helper_connector_destroy_state,
49+
.atomic_duplicate_state = drm_atomic_helper_connector_duplicate_state,
50+
.reset = drm_atomic_helper_connector_reset,
51+
};
52+
53+
static int drm_atomic_test_dummy_get_modes(struct drm_connector *connector)
54+
{
55+
return drm_connector_helper_get_modes_fixed(connector,
56+
&drm_atomic_test_mode);
57+
}
58+
59+
static const struct drm_connector_helper_funcs dummy_connector_helper_funcs = {
60+
.get_modes = drm_atomic_test_dummy_get_modes,
61+
};
62+
63+
static struct drm_atomic_test_priv *
64+
drm_atomic_test_init_drm_components(struct kunit *test, bool has_connectors)
65+
{
66+
struct drm_atomic_test_priv *priv;
67+
struct drm_encoder *enc;
68+
struct drm_connector *conn;
69+
struct drm_device *drm;
70+
struct device *dev;
71+
int ret;
72+
73+
dev = drm_kunit_helper_alloc_device(test);
74+
KUNIT_ASSERT_NOT_ERR_OR_NULL(test, dev);
75+
76+
priv = drm_kunit_helper_alloc_drm_device(test, dev,
77+
struct drm_atomic_test_priv,
78+
drm,
79+
DRIVER_MODESET | DRIVER_ATOMIC);
80+
KUNIT_ASSERT_NOT_ERR_OR_NULL(test, priv);
81+
test->priv = priv;
82+
83+
drm = &priv->drm;
84+
priv->plane = drm_kunit_helper_create_primary_plane(test, drm,
85+
NULL,
86+
NULL,
87+
NULL, 0,
88+
NULL);
89+
KUNIT_ASSERT_NOT_ERR_OR_NULL(test, priv->plane);
90+
91+
priv->crtc = drm_kunit_helper_create_crtc(test, drm,
92+
priv->plane, NULL,
93+
NULL,
94+
NULL);
95+
KUNIT_ASSERT_NOT_ERR_OR_NULL(test, priv->crtc);
96+
97+
for (int i = 0; i < ARRAY_SIZE(priv->encoders); i++) {
98+
enc = &priv->encoders[i];
99+
100+
ret = drmm_encoder_init(drm, enc, NULL,
101+
DRM_MODE_ENCODER_DSI, NULL);
102+
KUNIT_ASSERT_EQ(test, ret, 0);
103+
104+
enc->possible_crtcs = drm_crtc_mask(priv->crtc);
105+
}
106+
107+
priv->encoders[0].possible_clones = DRM_TEST_ENC_0 | DRM_TEST_ENC_1;
108+
priv->encoders[1].possible_clones = DRM_TEST_ENC_0 | DRM_TEST_ENC_1;
109+
priv->encoders[2].possible_clones = DRM_TEST_ENC_2;
110+
111+
if (!has_connectors)
112+
goto done;
113+
114+
BUILD_BUG_ON(ARRAY_SIZE(priv->connectors) > ARRAY_SIZE(priv->encoders));
115+
116+
for (int i = 0; i < ARRAY_SIZE(priv->connectors); i++) {
117+
conn = &priv->connectors[i];
118+
119+
ret = drmm_connector_init(drm, conn, &dummy_connector_funcs,
120+
DRM_MODE_CONNECTOR_DSI, NULL);
121+
KUNIT_ASSERT_EQ(test, ret, 0);
122+
123+
drm_connector_helper_add(conn, &dummy_connector_helper_funcs);
124+
drm_encoder_helper_add(&priv->encoders[i],
125+
&drm_atomic_test_encoder_funcs);
126+
127+
drm_connector_attach_encoder(conn, &priv->encoders[i]);
128+
}
129+
130+
done:
131+
drm_mode_config_reset(drm);
132+
133+
return priv;
134+
}
135+
136+
static int set_up_atomic_state(struct kunit *test,
137+
struct drm_atomic_test_priv *priv,
138+
struct drm_connector *connector,
139+
struct drm_modeset_acquire_ctx *ctx)
140+
{
141+
struct drm_device *drm = &priv->drm;
142+
struct drm_crtc *crtc = priv->crtc;
143+
struct drm_atomic_state *state;
144+
struct drm_connector_state *conn_state;
145+
struct drm_crtc_state *crtc_state;
146+
int ret;
147+
148+
state = drm_kunit_helper_atomic_state_alloc(test, drm, ctx);
149+
KUNIT_ASSERT_NOT_ERR_OR_NULL(test, state);
150+
151+
if (connector) {
152+
conn_state = drm_atomic_get_connector_state(state, connector);
153+
KUNIT_ASSERT_NOT_ERR_OR_NULL(test, conn_state);
154+
155+
ret = drm_atomic_set_crtc_for_connector(conn_state, crtc);
156+
KUNIT_EXPECT_EQ(test, ret, 0);
157+
}
158+
159+
crtc_state = drm_atomic_get_crtc_state(state, crtc);
160+
KUNIT_ASSERT_NOT_ERR_OR_NULL(test, crtc_state);
161+
162+
ret = drm_atomic_set_mode_for_crtc(crtc_state, &drm_atomic_test_mode);
163+
KUNIT_EXPECT_EQ(test, ret, 0);
164+
165+
crtc_state->enable = true;
166+
crtc_state->active = true;
167+
168+
if (connector) {
169+
ret = drm_atomic_commit(state);
170+
KUNIT_ASSERT_EQ(test, ret, 0);
171+
} else {
172+
// dummy connector mask
173+
crtc_state->connector_mask = DRM_TEST_CONN_0;
174+
}
175+
176+
return 0;
177+
}
178+
179+
/*
180+
* Test that the DRM encoder mode_set() is called when the atomic state
181+
* connectors are changed but the CRTC mode is not.
182+
*/
183+
static void drm_test_check_connector_changed_modeset(struct kunit *test)
184+
{
185+
struct drm_atomic_test_priv *priv;
186+
struct drm_modeset_acquire_ctx *ctx;
187+
struct drm_connector *old_conn, *new_conn;
188+
struct drm_atomic_state *state;
189+
struct drm_device *drm;
190+
struct drm_connector_state *new_conn_state, *old_conn_state;
191+
int ret, initial_modeset_count;
192+
193+
priv = drm_atomic_test_init_drm_components(test, true);
194+
KUNIT_ASSERT_NOT_NULL(test, priv);
195+
196+
drm = &priv->drm;
197+
old_conn = &priv->connectors[0];
198+
new_conn = &priv->connectors[1];
199+
200+
ctx = drm_kunit_helper_acquire_ctx_alloc(test);
201+
KUNIT_ASSERT_NOT_ERR_OR_NULL(test, ctx);
202+
203+
// first modeset to enable
204+
ret = set_up_atomic_state(test, priv, old_conn, ctx);
205+
KUNIT_ASSERT_EQ(test, ret, 0);
206+
207+
state = drm_kunit_helper_atomic_state_alloc(test, drm, ctx);
208+
KUNIT_ASSERT_NOT_ERR_OR_NULL(test, state);
209+
210+
new_conn_state = drm_atomic_get_connector_state(state, new_conn);
211+
KUNIT_ASSERT_NOT_ERR_OR_NULL(test, new_conn_state);
212+
213+
old_conn_state = drm_atomic_get_connector_state(state, old_conn);
214+
KUNIT_ASSERT_NOT_ERR_OR_NULL(test, old_conn_state);
215+
216+
ret = drm_atomic_set_crtc_for_connector(old_conn_state, NULL);
217+
KUNIT_EXPECT_EQ(test, ret, 0);
218+
219+
ret = drm_atomic_set_crtc_for_connector(new_conn_state, priv->crtc);
220+
KUNIT_EXPECT_EQ(test, ret, 0);
221+
222+
initial_modeset_count = modeset_counter;
223+
224+
// modeset_disables is called as part of the atomic commit tail
225+
ret = drm_atomic_commit(state);
226+
KUNIT_ASSERT_EQ(test, ret, 0);
227+
KUNIT_ASSERT_EQ(test, modeset_counter, initial_modeset_count + 1);
228+
}
229+
230+
static struct kunit_case drm_test_check_modeset_test[] = {
231+
KUNIT_CASE(drm_test_check_connector_changed_modeset),
232+
{}
233+
};
234+
235+
static struct kunit_suite drm_test_check_modeset_test_suite = {
236+
.name = "drm_validate_modeset",
237+
.test_cases = drm_test_check_modeset_test,
238+
};
239+
240+
kunit_test_suite(drm_test_check_modeset_test_suite);
241+
242+
MODULE_AUTHOR("Jessica Zhang <[email protected]");
243+
MODULE_DESCRIPTION("Test cases for the drm_atomic_helper functions");
244+
MODULE_LICENSE("GPL");

0 commit comments

Comments
 (0)