Skip to content

Commit a7a584f

Browse files
committed
Revert "drm/vc4: tests: Drop drm parameter for vc4_find_crtc_for_encoder"
This reverts commit 90fccf2.
1 parent 304e1d5 commit a7a584f

3 files changed

Lines changed: 4 additions & 4 deletions

File tree

drivers/gpu/drm/vc4/tests/vc4_mock.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@
77

88
static inline
99
struct drm_crtc *vc4_find_crtc_for_encoder(struct kunit *test,
10+
struct drm_device *drm,
1011
struct drm_encoder *encoder)
1112
{
12-
struct drm_device *drm = encoder->dev;
1313
struct drm_crtc *crtc;
1414

1515
KUNIT_ASSERT_EQ(test, hweight32(encoder->possible_crtcs), 1);

drivers/gpu/drm/vc4/tests/vc4_mock_output.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ vc4_mock_atomic_add_output(struct kunit *test,
7878
encoder = vc4_find_encoder_by_type(drm, type);
7979
KUNIT_ASSERT_NOT_ERR_OR_NULL(test, encoder);
8080

81-
crtc = vc4_find_crtc_for_encoder(test, encoder);
81+
crtc = vc4_find_crtc_for_encoder(test, drm, encoder);
8282
KUNIT_ASSERT_NOT_ERR_OR_NULL(test, crtc);
8383

8484
output = encoder_to_vc4_dummy_output(encoder);
@@ -116,7 +116,7 @@ int vc4_mock_atomic_del_output(struct kunit *test,
116116
encoder = vc4_find_encoder_by_type(drm, type);
117117
KUNIT_ASSERT_NOT_ERR_OR_NULL(test, encoder);
118118

119-
crtc = vc4_find_crtc_for_encoder(test, encoder);
119+
crtc = vc4_find_crtc_for_encoder(test, drm, encoder);
120120
KUNIT_ASSERT_NOT_ERR_OR_NULL(test, crtc);
121121

122122
crtc_state = drm_atomic_get_crtc_state(state, crtc);

drivers/gpu/drm/vc4/tests/vc4_test_pv_muxing.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,7 @@ get_vc4_crtc_state_for_encoder(struct kunit *test,
145145
encoder = vc4_find_encoder_by_type(drm, type);
146146
KUNIT_ASSERT_NOT_ERR_OR_NULL(test, encoder);
147147

148-
crtc = vc4_find_crtc_for_encoder(test, encoder);
148+
crtc = vc4_find_crtc_for_encoder(test, drm, encoder);
149149
KUNIT_ASSERT_NOT_ERR_OR_NULL(test, crtc);
150150

151151
new_crtc_state = drm_atomic_get_new_crtc_state(state, crtc);

0 commit comments

Comments
 (0)