Skip to content

Commit 6836985

Browse files
mripardpopcornmix
authored andcommitted
drm/vc4: tests: Switch generation mockup to a switch
Testing whether the VideoCore generation we want to mock is vc5 or vc4 worked so far, but will be difficult to extend to support BCM2712 (VC6). Convert to a switch. Signed-off-by: Maxime Ripard <maxime@cerno.tech>
1 parent 86a3746 commit 6836985

File tree

1 file changed

+16
-2
lines changed

1 file changed

+16
-2
lines changed

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

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -157,13 +157,27 @@ KUNIT_DEFINE_ACTION_WRAPPER(kunit_action_drm_dev_unregister,
157157

158158
static struct vc4_dev *__mock_device(struct kunit *test, enum vc4_gen gen)
159159
{
160+
const struct vc4_mock_desc *desc;
161+
const struct drm_driver *drv;
160162
struct drm_device *drm;
161-
const struct drm_driver *drv = (gen == VC4_GEN_5) ? &vc5_drm_driver : &vc4_drm_driver;
162-
const struct vc4_mock_desc *desc = (gen == VC4_GEN_5) ? &vc5_mock : &vc4_mock;
163163
struct vc4_dev *vc4;
164164
struct device *dev;
165165
int ret;
166166

167+
switch (gen) {
168+
case VC4_GEN_4:
169+
drv = &vc4_drm_driver;
170+
desc = &vc4_mock;
171+
break;
172+
case VC4_GEN_5:
173+
drv = &vc5_drm_driver;
174+
desc = &vc5_mock;
175+
break;
176+
177+
default:
178+
return NULL;
179+
}
180+
167181
dev = drm_kunit_helper_alloc_device(test);
168182
KUNIT_ASSERT_NOT_ERR_OR_NULL(test, dev);
169183

0 commit comments

Comments
 (0)