8f9e91ad03
These patches were generated from: https://github.com/raspberrypi/linux/commits/rpi-6.12.y With the following command: git format-patch -N v6.12.27..HEAD (HEAD -> 8d3206ee456a5ecdf9ddbfd8e5e231e4f0cd716e) Exceptions: - (def)configs patches - github workflows patches - applied & reverted patches - readme patches - wireless patches Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
47 lines
1.4 KiB
Diff
47 lines
1.4 KiB
Diff
From 7e768ab6d415d6ee6d71fa3d67f29c08df155356 Mon Sep 17 00:00:00 2001
|
|
From: Maxime Ripard <maxime@cerno.tech>
|
|
Date: Fri, 17 Feb 2023 13:35:16 +0100
|
|
Subject: [PATCH] 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>
|
|
---
|
|
drivers/gpu/drm/vc4/tests/vc4_mock.c | 18 ++++++++++++++++--
|
|
1 file changed, 16 insertions(+), 2 deletions(-)
|
|
|
|
--- a/drivers/gpu/drm/vc4/tests/vc4_mock.c
|
|
+++ b/drivers/gpu/drm/vc4/tests/vc4_mock.c
|
|
@@ -157,13 +157,27 @@ KUNIT_DEFINE_ACTION_WRAPPER(kunit_action
|
|
|
|
static struct vc4_dev *__mock_device(struct kunit *test, enum vc4_gen gen)
|
|
{
|
|
+ const struct vc4_mock_desc *desc;
|
|
+ const struct drm_driver *drv;
|
|
struct drm_device *drm;
|
|
- const struct drm_driver *drv = (gen == VC4_GEN_5) ? &vc5_drm_driver : &vc4_drm_driver;
|
|
- const struct vc4_mock_desc *desc = (gen == VC4_GEN_5) ? &vc5_mock : &vc4_mock;
|
|
struct vc4_dev *vc4;
|
|
struct device *dev;
|
|
int ret;
|
|
|
|
+ switch (gen) {
|
|
+ case VC4_GEN_4:
|
|
+ drv = &vc4_drm_driver;
|
|
+ desc = &vc4_mock;
|
|
+ break;
|
|
+ case VC4_GEN_5:
|
|
+ drv = &vc5_drm_driver;
|
|
+ desc = &vc5_mock;
|
|
+ break;
|
|
+
|
|
+ default:
|
|
+ return NULL;
|
|
+ }
|
|
+
|
|
dev = drm_kunit_helper_alloc_device(test);
|
|
KUNIT_ASSERT_NOT_ERR_OR_NULL(test, dev);
|
|
|