From ec4fc7d3c618219c2fd1858cbe14b7b5b920acf0 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Thu, 13 Feb 2025 12:38:15 +0000 Subject: [PATCH] drm/vc4: tests: Update pv muxing tests now DSI1 is more flexible The tests on vc4 (BCM2835-7) were checking for DSI1 muxing being to restricted channel 2, and therefore muxing with TXP was impossible. As we no longer have that restriction, update the capabilities defined for DSI1, move the tests that used to be impossible to the valid list, and extend for additional combinations that are now possible. Signed-off-by: Dave Stevenson --- .../gpu/drm/vc4/tests/vc4_test_pv_muxing.c | 24 +++++++++++++++---- 1 file changed, 20 insertions(+), 4 deletions(-) --- a/drivers/gpu/drm/vc4/tests/vc4_test_pv_muxing.c +++ b/drivers/gpu/drm/vc4/tests/vc4_test_pv_muxing.c @@ -91,7 +91,7 @@ static const struct encoder_constraint v ENCODER_CONSTRAINT(VC4_ENCODER_TYPE_HDMI0, 1), ENCODER_CONSTRAINT(VC4_ENCODER_TYPE_VEC, 1), ENCODER_CONSTRAINT(VC4_ENCODER_TYPE_TXP0, 2), - ENCODER_CONSTRAINT(VC4_ENCODER_TYPE_DSI1, 2), + ENCODER_CONSTRAINT(VC4_ENCODER_TYPE_DSI1, 0, 1, 2), }; static const struct encoder_constraint vc5_encoder_constraints[] = { @@ -258,6 +258,9 @@ static const struct pv_muxing_param vc4_ VC4_PV_MUXING_TEST("2 outputs: VEC, DSI1", VC4_ENCODER_TYPE_VEC, VC4_ENCODER_TYPE_DSI1), + VC4_PV_MUXING_TEST("2 outputs: TXP, DSI1", + VC4_ENCODER_TYPE_TXP0, + VC4_ENCODER_TYPE_DSI1), VC4_PV_MUXING_TEST("2 outputs: VEC, TXP", VC4_ENCODER_TYPE_VEC, VC4_ENCODER_TYPE_TXP0), @@ -293,6 +296,22 @@ static const struct pv_muxing_param vc4_ VC4_ENCODER_TYPE_DPI, VC4_ENCODER_TYPE_VEC, VC4_ENCODER_TYPE_TXP0), + VC4_PV_MUXING_TEST("3 outputs: DSI1, HDMI, TXP", + VC4_ENCODER_TYPE_DSI1, + VC4_ENCODER_TYPE_HDMI0, + VC4_ENCODER_TYPE_TXP0), + VC4_PV_MUXING_TEST("3 outputs: DSI1, VEC, TXP", + VC4_ENCODER_TYPE_DSI1, + VC4_ENCODER_TYPE_VEC, + VC4_ENCODER_TYPE_TXP0), + VC4_PV_MUXING_TEST("3 outputs: DSI1, DPI, TXP", + VC4_ENCODER_TYPE_DSI1, + VC4_ENCODER_TYPE_DPI, + VC4_ENCODER_TYPE_TXP0), + VC4_PV_MUXING_TEST("3 outputs: DSI1, DSI0, TXP", + VC4_ENCODER_TYPE_DSI1, + VC4_ENCODER_TYPE_DSI0, + VC4_ENCODER_TYPE_TXP0), }; KUNIT_ARRAY_PARAM(vc4_test_pv_muxing, @@ -303,9 +322,6 @@ static const struct pv_muxing_param vc4_ VC4_PV_MUXING_TEST("DPI/DSI0 Conflict", VC4_ENCODER_TYPE_DPI, VC4_ENCODER_TYPE_DSI0), - VC4_PV_MUXING_TEST("TXP/DSI1 Conflict", - VC4_ENCODER_TYPE_TXP0, - VC4_ENCODER_TYPE_DSI1), VC4_PV_MUXING_TEST("HDMI0/VEC Conflict", VC4_ENCODER_TYPE_HDMI0, VC4_ENCODER_TYPE_VEC),