From d6855b3372e945e9a33f821cbb02788134ff3d39 Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Fri, 17 Feb 2023 13:38:10 +0100 Subject: [PATCH 670/697] drm/vc4: tests: Add BCM2712 mock driver The BCM2712 has a simpler pipeline that can only output to a writeback connector and two HDMI controllers. Let's allow our kunit tests to create a mock of that pipeline. Signed-off-by: Maxime Ripard --- drivers/gpu/drm/vc4/tests/vc4_mock.c | 29 ++++++++++++++++++++++++++++ drivers/gpu/drm/vc4/tests/vc4_mock.h | 1 + drivers/gpu/drm/vc4/vc4_drv.h | 2 ++ drivers/gpu/drm/vc4/vc4_txp.c | 4 ++-- 4 files changed, 34 insertions(+), 2 deletions(-) --- a/drivers/gpu/drm/vc4/tests/vc4_mock.c +++ b/drivers/gpu/drm/vc4/tests/vc4_mock.c @@ -106,6 +106,26 @@ static const struct vc4_mock_desc vc5_mo DRM_MODE_CONNECTOR_HDMIA)), ); +static const struct vc4_mock_desc vc6_mock = + VC4_MOCK_DESC( + VC4_MOCK_CRTC_DESC(&bcm2712_mop_data.base, + VC4_MOCK_OUTPUT_DESC(VC4_ENCODER_TYPE_TXP0, + DRM_MODE_ENCODER_VIRTUAL, + DRM_MODE_CONNECTOR_WRITEBACK)), + VC4_MOCK_CRTC_DESC(&bcm2712_moplet_data.base, + VC4_MOCK_OUTPUT_DESC(VC4_ENCODER_TYPE_TXP1, + DRM_MODE_ENCODER_VIRTUAL, + DRM_MODE_CONNECTOR_WRITEBACK)), + VC4_MOCK_PIXELVALVE_DESC(&bcm2712_pv0_data, + VC4_MOCK_OUTPUT_DESC(VC4_ENCODER_TYPE_HDMI0, + DRM_MODE_ENCODER_TMDS, + DRM_MODE_CONNECTOR_HDMIA)), + VC4_MOCK_PIXELVALVE_DESC(&bcm2712_pv1_data, + VC4_MOCK_OUTPUT_DESC(VC4_ENCODER_TYPE_HDMI1, + DRM_MODE_ENCODER_TMDS, + DRM_MODE_CONNECTOR_HDMIA)), +); + static int __build_one_pipe(struct kunit *test, struct drm_device *drm, const struct vc4_mock_pipe_desc *pipe) { @@ -173,6 +193,10 @@ static struct vc4_dev *__mock_device(str drv = &vc5_drm_driver; desc = &vc5_mock; break; + case VC4_GEN_6_C: + drv = &vc5_drm_driver; + desc = &vc6_mock; + break; default: return NULL; @@ -219,3 +243,8 @@ struct vc4_dev *vc5_mock_device(struct k { return __mock_device(test, VC4_GEN_5); } + +struct vc4_dev *vc6_mock_device(struct kunit *test) +{ + return __mock_device(test, VC4_GEN_6_C); +} --- a/drivers/gpu/drm/vc4/tests/vc4_mock.h +++ b/drivers/gpu/drm/vc4/tests/vc4_mock.h @@ -50,6 +50,7 @@ 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); +struct vc4_dev *vc6_mock_device(struct kunit *test); struct vc4_dummy_output * vc4_mock_atomic_add_output(struct kunit *test, --- a/drivers/gpu/drm/vc4/vc4_drv.h +++ b/drivers/gpu/drm/vc4/vc4_drv.h @@ -562,6 +562,8 @@ struct vc4_txp_data { unsigned int supports_40bit_addresses:1; }; +extern const struct vc4_txp_data bcm2712_mop_data; +extern const struct vc4_txp_data bcm2712_moplet_data; extern const struct vc4_txp_data bcm2835_txp_data; struct vc4_pv_data { --- a/drivers/gpu/drm/vc4/vc4_txp.c +++ b/drivers/gpu/drm/vc4/vc4_txp.c @@ -519,7 +519,7 @@ static irqreturn_t vc4_txp_interrupt(int return IRQ_HANDLED; } -static const struct vc4_txp_data bcm2712_mop_data = { +const struct vc4_txp_data bcm2712_mop_data = { .base = { .name = "mop", .debugfs_name = "mop_regs", @@ -533,7 +533,7 @@ static const struct vc4_txp_data bcm2712 .supports_40bit_addresses = true, }; -static const struct vc4_txp_data bcm2712_moplet_data = { +const struct vc4_txp_data bcm2712_moplet_data = { .base = { .name = "moplet", .debugfs_name = "moplet_regs",