Skip to content

Commit c3d4d18

Browse files
mripardpopcornmix
authored andcommitted
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 <maxime@cerno.tech>
1 parent 5152e1d commit c3d4d18

File tree

4 files changed

+34
-2
lines changed

4 files changed

+34
-2
lines changed

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

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -106,6 +106,26 @@ static const struct vc4_mock_desc vc5_mock =
106106
DRM_MODE_CONNECTOR_HDMIA)),
107107
);
108108

109+
static const struct vc4_mock_desc vc6_mock =
110+
VC4_MOCK_DESC(
111+
VC4_MOCK_CRTC_DESC(&bcm2712_mop_data.base,
112+
VC4_MOCK_OUTPUT_DESC(VC4_ENCODER_TYPE_TXP0,
113+
DRM_MODE_ENCODER_VIRTUAL,
114+
DRM_MODE_CONNECTOR_WRITEBACK)),
115+
VC4_MOCK_CRTC_DESC(&bcm2712_moplet_data.base,
116+
VC4_MOCK_OUTPUT_DESC(VC4_ENCODER_TYPE_TXP1,
117+
DRM_MODE_ENCODER_VIRTUAL,
118+
DRM_MODE_CONNECTOR_WRITEBACK)),
119+
VC4_MOCK_PIXELVALVE_DESC(&bcm2712_pv0_data,
120+
VC4_MOCK_OUTPUT_DESC(VC4_ENCODER_TYPE_HDMI0,
121+
DRM_MODE_ENCODER_TMDS,
122+
DRM_MODE_CONNECTOR_HDMIA)),
123+
VC4_MOCK_PIXELVALVE_DESC(&bcm2712_pv1_data,
124+
VC4_MOCK_OUTPUT_DESC(VC4_ENCODER_TYPE_HDMI1,
125+
DRM_MODE_ENCODER_TMDS,
126+
DRM_MODE_CONNECTOR_HDMIA)),
127+
);
128+
109129
static int __build_one_pipe(struct kunit *test, struct drm_device *drm,
110130
const struct vc4_mock_pipe_desc *pipe)
111131
{
@@ -173,6 +193,10 @@ static struct vc4_dev *__mock_device(struct kunit *test, enum vc4_gen gen)
173193
drv = &vc5_drm_driver;
174194
desc = &vc5_mock;
175195
break;
196+
case VC4_GEN_6_C:
197+
drv = &vc5_drm_driver;
198+
desc = &vc6_mock;
199+
break;
176200

177201
default:
178202
return NULL;
@@ -219,3 +243,8 @@ struct vc4_dev *vc5_mock_device(struct kunit *test)
219243
{
220244
return __mock_device(test, VC4_GEN_5);
221245
}
246+
247+
struct vc4_dev *vc6_mock_device(struct kunit *test)
248+
{
249+
return __mock_device(test, VC4_GEN_6_C);
250+
}

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,7 @@ struct vc4_dummy_output *vc4_dummy_output(struct kunit *test,
5050

5151
struct vc4_dev *vc4_mock_device(struct kunit *test);
5252
struct vc4_dev *vc5_mock_device(struct kunit *test);
53+
struct vc4_dev *vc6_mock_device(struct kunit *test);
5354

5455
struct vc4_dummy_output *
5556
vc4_mock_atomic_add_output(struct kunit *test,

drivers/gpu/drm/vc4/vc4_drv.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -562,6 +562,8 @@ struct vc4_txp_data {
562562
unsigned int supports_40bit_addresses:1;
563563
};
564564

565+
extern const struct vc4_txp_data bcm2712_mop_data;
566+
extern const struct vc4_txp_data bcm2712_moplet_data;
565567
extern const struct vc4_txp_data bcm2835_txp_data;
566568

567569
struct vc4_pv_data {

drivers/gpu/drm/vc4/vc4_txp.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -519,7 +519,7 @@ static irqreturn_t vc4_txp_interrupt(int irq, void *data)
519519
return IRQ_HANDLED;
520520
}
521521

522-
static const struct vc4_txp_data bcm2712_mop_data = {
522+
const struct vc4_txp_data bcm2712_mop_data = {
523523
.base = {
524524
.name = "mop",
525525
.debugfs_name = "mop_regs",
@@ -533,7 +533,7 @@ static const struct vc4_txp_data bcm2712_mop_data = {
533533
.supports_40bit_addresses = true,
534534
};
535535

536-
static const struct vc4_txp_data bcm2712_moplet_data = {
536+
const struct vc4_txp_data bcm2712_moplet_data = {
537537
.base = {
538538
.name = "moplet",
539539
.debugfs_name = "moplet_regs",

0 commit comments

Comments
 (0)