1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
|
From 14e97c5765579eaab3c8372701750ffa30e4c7da Mon Sep 17 00:00:00 2001
From: Maxime Ripard <maxime@cerno.tech>
Date: Fri, 24 Mar 2023 10:02:59 +0100
Subject: [PATCH] drm/vc4: tests: Return the allocated output
Some tests will need to retrieve the output that was just allocated by
vc4_mock_atomic_add_output().
Instead of making them look them up in the DRM device, we can simply
make vc4_mock_atomic_add_output() return an error pointer that holds the
allocated output instead of the error code.
Signed-off-by: Maxime Ripard <maxime@cerno.tech>
---
drivers/gpu/drm/vc4/tests/vc4_mock.h | 7 ++--
drivers/gpu/drm/vc4/tests/vc4_mock_output.c | 9 +++--
.../gpu/drm/vc4/tests/vc4_test_pv_muxing.c | 37 +++++++++++--------
3 files changed, 30 insertions(+), 23 deletions(-)
--- a/drivers/gpu/drm/vc4/tests/vc4_mock.h
+++ b/drivers/gpu/drm/vc4/tests/vc4_mock.h
@@ -53,9 +53,10 @@ struct vc4_dummy_output *vc4_dummy_outpu
struct vc4_dev *vc4_mock_device(struct kunit *test);
struct vc4_dev *vc5_mock_device(struct kunit *test);
-int vc4_mock_atomic_add_output(struct kunit *test,
- struct drm_atomic_state *state,
- enum vc4_encoder_type type);
+struct vc4_dummy_output *
+vc4_mock_atomic_add_output(struct kunit *test,
+ struct drm_atomic_state *state,
+ enum vc4_encoder_type type);
int vc4_mock_atomic_del_output(struct kunit *test,
struct drm_atomic_state *state,
enum vc4_encoder_type type);
--- a/drivers/gpu/drm/vc4/tests/vc4_mock_output.c
+++ b/drivers/gpu/drm/vc4/tests/vc4_mock_output.c
@@ -61,9 +61,10 @@ static const struct drm_display_mode def
DRM_SIMPLE_MODE(640, 480, 64, 48)
};
-int vc4_mock_atomic_add_output(struct kunit *test,
- struct drm_atomic_state *state,
- enum vc4_encoder_type type)
+struct vc4_dummy_output *
+vc4_mock_atomic_add_output(struct kunit *test,
+ struct drm_atomic_state *state,
+ enum vc4_encoder_type type)
{
struct drm_device *drm = state->dev;
struct drm_connector_state *conn_state;
@@ -96,7 +97,7 @@ int vc4_mock_atomic_add_output(struct ku
crtc_state->active = true;
- return 0;
+ return output;
}
int vc4_mock_atomic_del_output(struct kunit *test,
--- a/drivers/gpu/drm/vc4/tests/vc4_test_pv_muxing.c
+++ b/drivers/gpu/drm/vc4/tests/vc4_test_pv_muxing.c
@@ -683,10 +683,11 @@ static void drm_vc4_test_pv_muxing(struc
int ret;
for (i = 0; i < params->nencoders; i++) {
+ struct vc4_dummy_output *output;
enum vc4_encoder_type enc_type = params->encoders[i];
- ret = vc4_mock_atomic_add_output(test, state, enc_type);
- KUNIT_ASSERT_EQ(test, ret, 0);
+ output = vc4_mock_atomic_add_output(test, state, enc_type);
+ KUNIT_ASSERT_NOT_ERR_OR_NULL(test, output);
}
ret = drm_atomic_check_only(state);
@@ -712,10 +713,11 @@ static void drm_vc4_test_pv_muxing_inval
int ret;
for (i = 0; i < params->nencoders; i++) {
+ struct vc4_dummy_output *output;
enum vc4_encoder_type enc_type = params->encoders[i];
- ret = vc4_mock_atomic_add_output(test, state, enc_type);
- KUNIT_ASSERT_EQ(test, ret, 0);
+ output = vc4_mock_atomic_add_output(test, state, enc_type);
+ KUNIT_ASSERT_NOT_ERR_OR_NULL(test, output);
}
ret = drm_atomic_check_only(state);
@@ -804,6 +806,7 @@ static void drm_test_vc5_pv_muxing_bugs_
{
struct drm_modeset_acquire_ctx ctx;
struct drm_atomic_state *state;
+ struct vc4_dummy_output *output;
struct vc4_crtc_state *new_vc4_crtc_state;
struct vc4_hvs_state *new_hvs_state;
unsigned int hdmi0_channel;
@@ -823,8 +826,8 @@ static void drm_test_vc5_pv_muxing_bugs_
state->acquire_ctx = &ctx;
- ret = vc4_mock_atomic_add_output(test, state, VC4_ENCODER_TYPE_HDMI0);
- KUNIT_ASSERT_EQ(test, ret, 0);
+ output = vc4_mock_atomic_add_output(test, state, VC4_ENCODER_TYPE_HDMI0);
+ KUNIT_ASSERT_NOT_ERR_OR_NULL(test, output);
ret = drm_atomic_check_only(state);
KUNIT_ASSERT_EQ(test, ret, 0);
@@ -850,8 +853,8 @@ static void drm_test_vc5_pv_muxing_bugs_
state->acquire_ctx = &ctx;
- ret = vc4_mock_atomic_add_output(test, state, VC4_ENCODER_TYPE_HDMI1);
- KUNIT_ASSERT_EQ(test, ret, 0);
+ output = vc4_mock_atomic_add_output(test, state, VC4_ENCODER_TYPE_HDMI1);
+ KUNIT_ASSERT_NOT_ERR_OR_NULL(test, output);
ret = drm_atomic_check_only(state);
KUNIT_ASSERT_EQ(test, ret, 0);
@@ -880,6 +883,7 @@ static void drm_test_vc5_pv_muxing_bugs_
{
struct drm_modeset_acquire_ctx ctx;
struct drm_atomic_state *state;
+ struct vc4_dummy_output *output;
struct vc4_crtc_state *new_vc4_crtc_state;
struct vc4_hvs_state *new_hvs_state;
unsigned int old_hdmi0_channel;
@@ -899,11 +903,11 @@ static void drm_test_vc5_pv_muxing_bugs_
state->acquire_ctx = &ctx;
- ret = vc4_mock_atomic_add_output(test, state, VC4_ENCODER_TYPE_HDMI0);
- KUNIT_ASSERT_EQ(test, ret, 0);
+ output = vc4_mock_atomic_add_output(test, state, VC4_ENCODER_TYPE_HDMI0);
+ KUNIT_ASSERT_NOT_ERR_OR_NULL(test, output);
- ret = vc4_mock_atomic_add_output(test, state, VC4_ENCODER_TYPE_HDMI1);
- KUNIT_ASSERT_EQ(test, ret, 0);
+ output = vc4_mock_atomic_add_output(test, state, VC4_ENCODER_TYPE_HDMI1);
+ KUNIT_ASSERT_NOT_ERR_OR_NULL(test, output);
ret = drm_atomic_check_only(state);
KUNIT_ASSERT_EQ(test, ret, 0);
@@ -971,6 +975,7 @@ drm_test_vc5_pv_muxing_bugs_subsequent_c
{
struct drm_modeset_acquire_ctx ctx;
struct drm_atomic_state *state;
+ struct vc4_dummy_output *output;
struct vc4_crtc_state *new_vc4_crtc_state;
struct drm_device *drm;
struct vc4_dev *vc4;
@@ -987,8 +992,8 @@ drm_test_vc5_pv_muxing_bugs_subsequent_c
state->acquire_ctx = &ctx;
- ret = vc4_mock_atomic_add_output(test, state, VC4_ENCODER_TYPE_HDMI0);
- KUNIT_ASSERT_EQ(test, ret, 0);
+ output = vc4_mock_atomic_add_output(test, state, VC4_ENCODER_TYPE_HDMI0);
+ KUNIT_ASSERT_NOT_ERR_OR_NULL(test, output);
ret = drm_atomic_check_only(state);
KUNIT_ASSERT_EQ(test, ret, 0);
@@ -1003,8 +1008,8 @@ drm_test_vc5_pv_muxing_bugs_subsequent_c
state->acquire_ctx = &ctx;
- ret = vc4_mock_atomic_add_output(test, state, VC4_ENCODER_TYPE_HDMI1);
- KUNIT_ASSERT_EQ(test, ret, 0);
+ output = vc4_mock_atomic_add_output(test, state, VC4_ENCODER_TYPE_HDMI1);
+ KUNIT_ASSERT_NOT_ERR_OR_NULL(test, output);
ret = drm_atomic_check_only(state);
KUNIT_ASSERT_EQ(test, ret, 0);
|
