drm/vc4: txp: Add a new TXP encoder type

Starting with BCM2712, we'll have a two TXP. Let's follow the HDMI
example and add two encoder types for TXP: TXP0 and TXP1.

Signed-off-by: Maxime Ripard <mripard@kernel.org>
Link: https://patchwork.freedesktop.org/patch/msgid/20241025-drm-vc4-2712-support-v2-19-35efa83c8fc0@raspberrypi.com
Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>

diff --git a/drivers/gpu/drm/vc4/tests/vc4_mock.c b/drivers/gpu/drm/vc4/tests/vc4_mock.c
index 372482fcd6c72f5b574eeda5ff59286280292d32..e276a957b01cc9ae3d380bfc511f0b6a9023b6cc 100644 (file)
--- a/drivers/gpu/drm/vc4/tests/vc4_mock.c
+++ b/drivers/gpu/drm/vc4/tests/vc4_mock.c
@@ -52,7 +52,7 @@ struct vc4_mock_desc {
 static const struct vc4_mock_desc vc4_mock =
        VC4_MOCK_DESC(
                VC4_MOCK_CRTC_DESC(&bcm2835_txp_data.base,
-                                  VC4_MOCK_OUTPUT_DESC(VC4_ENCODER_TYPE_TXP,
+                                  VC4_MOCK_OUTPUT_DESC(VC4_ENCODER_TYPE_TXP0,
                                                        DRM_MODE_ENCODER_VIRTUAL,
                                                        DRM_MODE_CONNECTOR_WRITEBACK)),
                VC4_MOCK_PIXELVALVE_DESC(&bcm2835_pv0_data,
@@ -78,7 +78,7 @@ static const struct vc4_mock_desc vc4_mock =
 static const struct vc4_mock_desc vc5_mock =
        VC4_MOCK_DESC(
                VC4_MOCK_CRTC_DESC(&bcm2835_txp_data.base,
-                                  VC4_MOCK_OUTPUT_DESC(VC4_ENCODER_TYPE_TXP,
+                                  VC4_MOCK_OUTPUT_DESC(VC4_ENCODER_TYPE_TXP0,
                                                        DRM_MODE_ENCODER_VIRTUAL,
                                                        DRM_MODE_CONNECTOR_WRITEBACK)),
                VC4_MOCK_PIXELVALVE_DESC(&bcm2711_pv0_data,

diff --git a/drivers/gpu/drm/vc4/tests/vc4_test_pv_muxing.c b/drivers/gpu/drm/vc4/tests/vc4_test_pv_muxing.c
index 61622e95103120247d03510f173a77f1461781c7..40a05869a50e854cc5076f6e8e3e8fd0f8c7039d 100644 (file)
--- a/drivers/gpu/drm/vc4/tests/vc4_test_pv_muxing.c
+++ b/drivers/gpu/drm/vc4/tests/vc4_test_pv_muxing.c
@@ -90,7 +90,7 @@ static const struct encoder_constraint vc4_encoder_constraints[] = {
        ENCODER_CONSTRAINT(VC4_ENCODER_TYPE_DSI0, 0),
        ENCODER_CONSTRAINT(VC4_ENCODER_TYPE_HDMI0, 1),
        ENCODER_CONSTRAINT(VC4_ENCODER_TYPE_VEC, 1),
-       ENCODER_CONSTRAINT(VC4_ENCODER_TYPE_TXP, 2),
+       ENCODER_CONSTRAINT(VC4_ENCODER_TYPE_TXP0, 2),
        ENCODER_CONSTRAINT(VC4_ENCODER_TYPE_DSI1, 2),
 };
 
@@ -98,7 +98,7 @@ static const struct encoder_constraint vc5_encoder_constraints[] = {
        ENCODER_CONSTRAINT(VC4_ENCODER_TYPE_DPI, 0),
        ENCODER_CONSTRAINT(VC4_ENCODER_TYPE_DSI0, 0),
        ENCODER_CONSTRAINT(VC4_ENCODER_TYPE_VEC, 1),
-       ENCODER_CONSTRAINT(VC4_ENCODER_TYPE_TXP, 0, 2),
+       ENCODER_CONSTRAINT(VC4_ENCODER_TYPE_TXP0, 0, 2),
        ENCODER_CONSTRAINT(VC4_ENCODER_TYPE_DSI1, 0, 1, 2),
        ENCODER_CONSTRAINT(VC4_ENCODER_TYPE_HDMI0, 0, 1, 2),
        ENCODER_CONSTRAINT(VC4_ENCODER_TYPE_HDMI1, 0, 1, 2),
@@ -207,7 +207,7 @@ static const struct pv_muxing_param vc4_test_pv_muxing_params[] = {
        VC4_PV_MUXING_TEST("1 output: DSI1",
                           VC4_ENCODER_TYPE_DSI1),
        VC4_PV_MUXING_TEST("1 output: TXP",
-                          VC4_ENCODER_TYPE_TXP),
+                          VC4_ENCODER_TYPE_TXP0),
        VC4_PV_MUXING_TEST("2 outputs: DSI0, HDMI0",
                           VC4_ENCODER_TYPE_DSI0,
                           VC4_ENCODER_TYPE_HDMI0),
@@ -219,7 +219,7 @@ static const struct pv_muxing_param vc4_test_pv_muxing_params[] = {
                           VC4_ENCODER_TYPE_DSI1),
        VC4_PV_MUXING_TEST("2 outputs: DSI0, TXP",
                           VC4_ENCODER_TYPE_DSI0,
-                          VC4_ENCODER_TYPE_TXP),
+                          VC4_ENCODER_TYPE_TXP0),
        VC4_PV_MUXING_TEST("2 outputs: DPI, HDMI0",
                           VC4_ENCODER_TYPE_DPI,
                           VC4_ENCODER_TYPE_HDMI0),
@@ -231,19 +231,19 @@ static const struct pv_muxing_param vc4_test_pv_muxing_params[] = {
                           VC4_ENCODER_TYPE_DSI1),
        VC4_PV_MUXING_TEST("2 outputs: DPI, TXP",
                           VC4_ENCODER_TYPE_DPI,
-                          VC4_ENCODER_TYPE_TXP),
+                          VC4_ENCODER_TYPE_TXP0),
        VC4_PV_MUXING_TEST("2 outputs: HDMI0, DSI1",
                           VC4_ENCODER_TYPE_HDMI0,
                           VC4_ENCODER_TYPE_DSI1),
        VC4_PV_MUXING_TEST("2 outputs: HDMI0, TXP",
                           VC4_ENCODER_TYPE_HDMI0,
-                          VC4_ENCODER_TYPE_TXP),
+                          VC4_ENCODER_TYPE_TXP0),
        VC4_PV_MUXING_TEST("2 outputs: VEC, DSI1",
                           VC4_ENCODER_TYPE_VEC,
                           VC4_ENCODER_TYPE_DSI1),
        VC4_PV_MUXING_TEST("2 outputs: VEC, TXP",
                           VC4_ENCODER_TYPE_VEC,
-                          VC4_ENCODER_TYPE_TXP),
+                          VC4_ENCODER_TYPE_TXP0),
        VC4_PV_MUXING_TEST("3 outputs: DSI0, HDMI0, DSI1",
                           VC4_ENCODER_TYPE_DSI0,
                           VC4_ENCODER_TYPE_HDMI0,
@@ -251,7 +251,7 @@ static const struct pv_muxing_param vc4_test_pv_muxing_params[] = {
        VC4_PV_MUXING_TEST("3 outputs: DSI0, HDMI0, TXP",
                           VC4_ENCODER_TYPE_DSI0,
                           VC4_ENCODER_TYPE_HDMI0,
-                          VC4_ENCODER_TYPE_TXP),
+                          VC4_ENCODER_TYPE_TXP0),
        VC4_PV_MUXING_TEST("3 outputs: DSI0, VEC, DSI1",
                           VC4_ENCODER_TYPE_DSI0,
                           VC4_ENCODER_TYPE_VEC,
@@ -259,7 +259,7 @@ static const struct pv_muxing_param vc4_test_pv_muxing_params[] = {
        VC4_PV_MUXING_TEST("3 outputs: DSI0, VEC, TXP",
                           VC4_ENCODER_TYPE_DSI0,
                           VC4_ENCODER_TYPE_VEC,
-                          VC4_ENCODER_TYPE_TXP),
+                          VC4_ENCODER_TYPE_TXP0),
        VC4_PV_MUXING_TEST("3 outputs: DPI, HDMI0, DSI1",
                           VC4_ENCODER_TYPE_DPI,
                           VC4_ENCODER_TYPE_HDMI0,
@@ -267,7 +267,7 @@ static const struct pv_muxing_param vc4_test_pv_muxing_params[] = {
        VC4_PV_MUXING_TEST("3 outputs: DPI, HDMI0, TXP",
                           VC4_ENCODER_TYPE_DPI,
                           VC4_ENCODER_TYPE_HDMI0,
-                          VC4_ENCODER_TYPE_TXP),
+                          VC4_ENCODER_TYPE_TXP0),
        VC4_PV_MUXING_TEST("3 outputs: DPI, VEC, DSI1",
                           VC4_ENCODER_TYPE_DPI,
                           VC4_ENCODER_TYPE_VEC,
@@ -275,7 +275,7 @@ static const struct pv_muxing_param vc4_test_pv_muxing_params[] = {
        VC4_PV_MUXING_TEST("3 outputs: DPI, VEC, TXP",
                           VC4_ENCODER_TYPE_DPI,
                           VC4_ENCODER_TYPE_VEC,
-                          VC4_ENCODER_TYPE_TXP),
+                          VC4_ENCODER_TYPE_TXP0),
 };
 
 KUNIT_ARRAY_PARAM(vc4_test_pv_muxing,
@@ -287,7 +287,7 @@ static const struct pv_muxing_param vc4_test_pv_muxing_invalid_params[] = {
                           VC4_ENCODER_TYPE_DPI,
                           VC4_ENCODER_TYPE_DSI0),
        VC4_PV_MUXING_TEST("TXP/DSI1 Conflict",
-                          VC4_ENCODER_TYPE_TXP,
+                          VC4_ENCODER_TYPE_TXP0,
                           VC4_ENCODER_TYPE_DSI1),
        VC4_PV_MUXING_TEST("HDMI0/VEC Conflict",
                           VC4_ENCODER_TYPE_HDMI0,
@@ -296,22 +296,22 @@ static const struct pv_muxing_param vc4_test_pv_muxing_invalid_params[] = {
                           VC4_ENCODER_TYPE_DSI0,
                           VC4_ENCODER_TYPE_HDMI0,
                           VC4_ENCODER_TYPE_DSI1,
-                          VC4_ENCODER_TYPE_TXP),
+                          VC4_ENCODER_TYPE_TXP0),
        VC4_PV_MUXING_TEST("More than 3 outputs: DSI0, VEC, DSI1, TXP",
                           VC4_ENCODER_TYPE_DSI0,
                           VC4_ENCODER_TYPE_VEC,
                           VC4_ENCODER_TYPE_DSI1,
-                          VC4_ENCODER_TYPE_TXP),
+                          VC4_ENCODER_TYPE_TXP0),
        VC4_PV_MUXING_TEST("More than 3 outputs: DPI, HDMI0, DSI1, TXP",
                           VC4_ENCODER_TYPE_DPI,
                           VC4_ENCODER_TYPE_HDMI0,
                           VC4_ENCODER_TYPE_DSI1,
-                          VC4_ENCODER_TYPE_TXP),
+                          VC4_ENCODER_TYPE_TXP0),
        VC4_PV_MUXING_TEST("More than 3 outputs: DPI, VEC, DSI1, TXP",
                           VC4_ENCODER_TYPE_DPI,
                           VC4_ENCODER_TYPE_VEC,
                           VC4_ENCODER_TYPE_DSI1,
-                          VC4_ENCODER_TYPE_TXP),
+                          VC4_ENCODER_TYPE_TXP0),
 };
 
 KUNIT_ARRAY_PARAM(vc4_test_pv_muxing_invalid,
@@ -342,7 +342,7 @@ static const struct pv_muxing_param vc5_test_pv_muxing_params[] = {
                           VC4_ENCODER_TYPE_HDMI1),
        VC5_PV_MUXING_TEST("2 outputs: DPI, TXP",
                           VC4_ENCODER_TYPE_DPI,
-                          VC4_ENCODER_TYPE_TXP),
+                          VC4_ENCODER_TYPE_TXP0),
        VC5_PV_MUXING_TEST("2 outputs: DPI, VEC",
                           VC4_ENCODER_TYPE_DPI,
                           VC4_ENCODER_TYPE_VEC),
@@ -360,7 +360,7 @@ static const struct pv_muxing_param vc5_test_pv_muxing_params[] = {
                           VC4_ENCODER_TYPE_HDMI1),
        VC5_PV_MUXING_TEST("2 outputs: DSI0, TXP",
                           VC4_ENCODER_TYPE_DSI0,
-                          VC4_ENCODER_TYPE_TXP),
+                          VC4_ENCODER_TYPE_TXP0),
        VC5_PV_MUXING_TEST("2 outputs: DSI0, VEC",
                           VC4_ENCODER_TYPE_DSI0,
                           VC4_ENCODER_TYPE_VEC),
@@ -372,7 +372,7 @@ static const struct pv_muxing_param vc5_test_pv_muxing_params[] = {
                           VC4_ENCODER_TYPE_VEC),
        VC5_PV_MUXING_TEST("2 outputs: DSI1, TXP",
                           VC4_ENCODER_TYPE_DSI1,
-                          VC4_ENCODER_TYPE_TXP),
+                          VC4_ENCODER_TYPE_TXP0),
        VC5_PV_MUXING_TEST("2 outputs: DSI1, HDMI0",
                           VC4_ENCODER_TYPE_DSI1,
                           VC4_ENCODER_TYPE_HDMI0),
@@ -384,7 +384,7 @@ static const struct pv_muxing_param vc5_test_pv_muxing_params[] = {
                           VC4_ENCODER_TYPE_VEC),
        VC5_PV_MUXING_TEST("2 outputs: HDMI0, TXP",
                           VC4_ENCODER_TYPE_HDMI0,
-                          VC4_ENCODER_TYPE_TXP),
+                          VC4_ENCODER_TYPE_TXP0),
        VC5_PV_MUXING_TEST("2 outputs: HDMI0, HDMI1",
                           VC4_ENCODER_TYPE_HDMI0,
                           VC4_ENCODER_TYPE_HDMI1),
@@ -393,14 +393,14 @@ static const struct pv_muxing_param vc5_test_pv_muxing_params[] = {
                           VC4_ENCODER_TYPE_VEC),
        VC5_PV_MUXING_TEST("2 outputs: HDMI1, TXP",
                           VC4_ENCODER_TYPE_HDMI1,
-                          VC4_ENCODER_TYPE_TXP),
+                          VC4_ENCODER_TYPE_TXP0),
        VC5_PV_MUXING_TEST("2 outputs: TXP, VEC",
-                          VC4_ENCODER_TYPE_TXP,
+                          VC4_ENCODER_TYPE_TXP0,
                           VC4_ENCODER_TYPE_VEC),
        VC5_PV_MUXING_TEST("3 outputs: DPI, VEC, TXP",
                           VC4_ENCODER_TYPE_DPI,
                           VC4_ENCODER_TYPE_VEC,
-                          VC4_ENCODER_TYPE_TXP),
+                          VC4_ENCODER_TYPE_TXP0),
        VC5_PV_MUXING_TEST("3 outputs: DPI, VEC, DSI1",
                           VC4_ENCODER_TYPE_DPI,
                           VC4_ENCODER_TYPE_VEC,
@@ -415,15 +415,15 @@ static const struct pv_muxing_param vc5_test_pv_muxing_params[] = {
                           VC4_ENCODER_TYPE_HDMI1),
        VC5_PV_MUXING_TEST("3 outputs: DPI, TXP, DSI1",
                           VC4_ENCODER_TYPE_DPI,
-                          VC4_ENCODER_TYPE_TXP,
+                          VC4_ENCODER_TYPE_TXP0,
                           VC4_ENCODER_TYPE_DSI1),
        VC5_PV_MUXING_TEST("3 outputs: DPI, TXP, HDMI0",
                           VC4_ENCODER_TYPE_DPI,
-                          VC4_ENCODER_TYPE_TXP,
+                          VC4_ENCODER_TYPE_TXP0,
                           VC4_ENCODER_TYPE_HDMI0),
        VC5_PV_MUXING_TEST("3 outputs: DPI, TXP, HDMI1",
                           VC4_ENCODER_TYPE_DPI,
-                          VC4_ENCODER_TYPE_TXP,
+                          VC4_ENCODER_TYPE_TXP0,
                           VC4_ENCODER_TYPE_HDMI1),
        VC5_PV_MUXING_TEST("3 outputs: DPI, DSI1, HDMI0",
                           VC4_ENCODER_TYPE_DPI,
@@ -440,7 +440,7 @@ static const struct pv_muxing_param vc5_test_pv_muxing_params[] = {
        VC5_PV_MUXING_TEST("3 outputs: DSI0, VEC, TXP",
                           VC4_ENCODER_TYPE_DSI0,
                           VC4_ENCODER_TYPE_VEC,
-                          VC4_ENCODER_TYPE_TXP),
+                          VC4_ENCODER_TYPE_TXP0),
        VC5_PV_MUXING_TEST("3 outputs: DSI0, VEC, DSI1",
                           VC4_ENCODER_TYPE_DSI0,
                           VC4_ENCODER_TYPE_VEC,
@@ -455,15 +455,15 @@ static const struct pv_muxing_param vc5_test_pv_muxing_params[] = {
                           VC4_ENCODER_TYPE_HDMI1),
        VC5_PV_MUXING_TEST("3 outputs: DSI0, TXP, DSI1",
                           VC4_ENCODER_TYPE_DSI0,
-                          VC4_ENCODER_TYPE_TXP,
+                          VC4_ENCODER_TYPE_TXP0,
                           VC4_ENCODER_TYPE_DSI1),
        VC5_PV_MUXING_TEST("3 outputs: DSI0, TXP, HDMI0",
                           VC4_ENCODER_TYPE_DSI0,
-                          VC4_ENCODER_TYPE_TXP,
+                          VC4_ENCODER_TYPE_TXP0,
                           VC4_ENCODER_TYPE_HDMI0),
        VC5_PV_MUXING_TEST("3 outputs: DSI0, TXP, HDMI1",
                           VC4_ENCODER_TYPE_DSI0,
-                          VC4_ENCODER_TYPE_TXP,
+                          VC4_ENCODER_TYPE_TXP0,
                           VC4_ENCODER_TYPE_HDMI1),
        VC5_PV_MUXING_TEST("3 outputs: DSI0, DSI1, HDMI0",
                           VC4_ENCODER_TYPE_DSI0,
@@ -490,17 +490,17 @@ static const struct pv_muxing_param vc5_test_pv_muxing_invalid_params[] = {
        VC5_PV_MUXING_TEST("More than 3 outputs: DPI, VEC, TXP, DSI1",
                           VC4_ENCODER_TYPE_DPI,
                           VC4_ENCODER_TYPE_VEC,
-                          VC4_ENCODER_TYPE_TXP,
+                          VC4_ENCODER_TYPE_TXP0,
                           VC4_ENCODER_TYPE_DSI1),
        VC5_PV_MUXING_TEST("More than 3 outputs: DPI, VEC, TXP, HDMI0",
                           VC4_ENCODER_TYPE_DPI,
                           VC4_ENCODER_TYPE_VEC,
-                          VC4_ENCODER_TYPE_TXP,
+                          VC4_ENCODER_TYPE_TXP0,
                           VC4_ENCODER_TYPE_HDMI0),
        VC5_PV_MUXING_TEST("More than 3 outputs: DPI, VEC, TXP, HDMI1",
                           VC4_ENCODER_TYPE_DPI,
                           VC4_ENCODER_TYPE_VEC,
-                          VC4_ENCODER_TYPE_TXP,
+                          VC4_ENCODER_TYPE_TXP0,
                           VC4_ENCODER_TYPE_HDMI1),
        VC5_PV_MUXING_TEST("More than 3 outputs: DPI, VEC, DSI1, HDMI0",
                           VC4_ENCODER_TYPE_DPI,
@@ -519,17 +519,17 @@ static const struct pv_muxing_param vc5_test_pv_muxing_invalid_params[] = {
                           VC4_ENCODER_TYPE_HDMI1),
        VC5_PV_MUXING_TEST("More than 3 outputs: DPI, TXP, DSI1, HDMI0",
                           VC4_ENCODER_TYPE_DPI,
-                          VC4_ENCODER_TYPE_TXP,
+                          VC4_ENCODER_TYPE_TXP0,
                           VC4_ENCODER_TYPE_DSI1,
                           VC4_ENCODER_TYPE_HDMI0),
        VC5_PV_MUXING_TEST("More than 3 outputs: DPI, TXP, DSI1, HDMI1",
                           VC4_ENCODER_TYPE_DPI,
-                          VC4_ENCODER_TYPE_TXP,
+                          VC4_ENCODER_TYPE_TXP0,
                           VC4_ENCODER_TYPE_DSI1,
                           VC4_ENCODER_TYPE_HDMI1),
        VC5_PV_MUXING_TEST("More than 3 outputs: DPI, TXP, HDMI0, HDMI1",
                           VC4_ENCODER_TYPE_DPI,
-                          VC4_ENCODER_TYPE_TXP,
+                          VC4_ENCODER_TYPE_TXP0,
                           VC4_ENCODER_TYPE_HDMI0,
                           VC4_ENCODER_TYPE_HDMI1),
        VC5_PV_MUXING_TEST("More than 3 outputs: DPI, DSI1, HDMI0, HDMI1",
@@ -540,19 +540,19 @@ static const struct pv_muxing_param vc5_test_pv_muxing_invalid_params[] = {
        VC5_PV_MUXING_TEST("More than 3 outputs: DPI, VEC, TXP, DSI1, HDMI0",
                           VC4_ENCODER_TYPE_DPI,
                           VC4_ENCODER_TYPE_VEC,
-                          VC4_ENCODER_TYPE_TXP,
+                          VC4_ENCODER_TYPE_TXP0,
                           VC4_ENCODER_TYPE_DSI1,
                           VC4_ENCODER_TYPE_HDMI0),
        VC5_PV_MUXING_TEST("More than 3 outputs: DPI, VEC, TXP, DSI1, HDMI1",
                           VC4_ENCODER_TYPE_DPI,
                           VC4_ENCODER_TYPE_VEC,
-                          VC4_ENCODER_TYPE_TXP,
+                          VC4_ENCODER_TYPE_TXP0,
                           VC4_ENCODER_TYPE_DSI1,
                           VC4_ENCODER_TYPE_HDMI1),
        VC5_PV_MUXING_TEST("More than 3 outputs: DPI, VEC, TXP, HDMI0, HDMI1",
                           VC4_ENCODER_TYPE_DPI,
                           VC4_ENCODER_TYPE_VEC,
-                          VC4_ENCODER_TYPE_TXP,
+                          VC4_ENCODER_TYPE_TXP0,
                           VC4_ENCODER_TYPE_HDMI0,
                           VC4_ENCODER_TYPE_HDMI1),
        VC5_PV_MUXING_TEST("More than 3 outputs: DPI, VEC, DSI1, HDMI0, HDMI1",
@@ -563,24 +563,24 @@ static const struct pv_muxing_param vc5_test_pv_muxing_invalid_params[] = {
                           VC4_ENCODER_TYPE_HDMI1),
        VC5_PV_MUXING_TEST("More than 3 outputs: DPI, TXP, DSI1, HDMI0, HDMI1",
                           VC4_ENCODER_TYPE_DPI,
-                          VC4_ENCODER_TYPE_TXP,
+                          VC4_ENCODER_TYPE_TXP0,
                           VC4_ENCODER_TYPE_DSI1,
                           VC4_ENCODER_TYPE_HDMI0,
                           VC4_ENCODER_TYPE_HDMI1),
        VC5_PV_MUXING_TEST("More than 3 outputs: DSI0, VEC, TXP, DSI1",
                           VC4_ENCODER_TYPE_DSI0,
                           VC4_ENCODER_TYPE_VEC,
-                          VC4_ENCODER_TYPE_TXP,
+                          VC4_ENCODER_TYPE_TXP0,
                           VC4_ENCODER_TYPE_DSI1),
        VC5_PV_MUXING_TEST("More than 3 outputs: DSI0, VEC, TXP, HDMI0",
                           VC4_ENCODER_TYPE_DSI0,
                           VC4_ENCODER_TYPE_VEC,
-                          VC4_ENCODER_TYPE_TXP,
+                          VC4_ENCODER_TYPE_TXP0,
                           VC4_ENCODER_TYPE_HDMI0),
        VC5_PV_MUXING_TEST("More than 3 outputs: DSI0, VEC, TXP, HDMI1",
                           VC4_ENCODER_TYPE_DSI0,
                           VC4_ENCODER_TYPE_VEC,
-                          VC4_ENCODER_TYPE_TXP,
+                          VC4_ENCODER_TYPE_TXP0,
                           VC4_ENCODER_TYPE_HDMI1),
        VC5_PV_MUXING_TEST("More than 3 outputs: DSI0, VEC, DSI1, HDMI0",
                           VC4_ENCODER_TYPE_DSI0,
@@ -599,17 +599,17 @@ static const struct pv_muxing_param vc5_test_pv_muxing_invalid_params[] = {
                           VC4_ENCODER_TYPE_HDMI1),
        VC5_PV_MUXING_TEST("More than 3 outputs: DSI0, TXP, DSI1, HDMI0",
                           VC4_ENCODER_TYPE_DSI0,
-                          VC4_ENCODER_TYPE_TXP,
+                          VC4_ENCODER_TYPE_TXP0,
                           VC4_ENCODER_TYPE_DSI1,
                           VC4_ENCODER_TYPE_HDMI0),
        VC5_PV_MUXING_TEST("More than 3 outputs: DSI0, TXP, DSI1, HDMI1",
                           VC4_ENCODER_TYPE_DSI0,
-                          VC4_ENCODER_TYPE_TXP,
+                          VC4_ENCODER_TYPE_TXP0,
                           VC4_ENCODER_TYPE_DSI1,
                           VC4_ENCODER_TYPE_HDMI1),
        VC5_PV_MUXING_TEST("More than 3 outputs: DSI0, TXP, HDMI0, HDMI1",
                           VC4_ENCODER_TYPE_DSI0,
-                          VC4_ENCODER_TYPE_TXP,
+                          VC4_ENCODER_TYPE_TXP0,
                           VC4_ENCODER_TYPE_HDMI0,
                           VC4_ENCODER_TYPE_HDMI1),
        VC5_PV_MUXING_TEST("More than 3 outputs: DSI0, DSI1, HDMI0, HDMI1",
@@ -620,19 +620,19 @@ static const struct pv_muxing_param vc5_test_pv_muxing_invalid_params[] = {
        VC5_PV_MUXING_TEST("More than 3 outputs: DSI0, VEC, TXP, DSI1, HDMI0",
                           VC4_ENCODER_TYPE_DSI0,
                           VC4_ENCODER_TYPE_VEC,
-                          VC4_ENCODER_TYPE_TXP,
+                          VC4_ENCODER_TYPE_TXP0,
                           VC4_ENCODER_TYPE_DSI1,
                           VC4_ENCODER_TYPE_HDMI0),
        VC5_PV_MUXING_TEST("More than 3 outputs: DSI0, VEC, TXP, DSI1, HDMI1",
                           VC4_ENCODER_TYPE_DSI0,
                           VC4_ENCODER_TYPE_VEC,
-                          VC4_ENCODER_TYPE_TXP,
+                          VC4_ENCODER_TYPE_TXP0,
                           VC4_ENCODER_TYPE_DSI1,
                           VC4_ENCODER_TYPE_HDMI1),
        VC5_PV_MUXING_TEST("More than 3 outputs: DSI0, VEC, TXP, HDMI0, HDMI1",
                           VC4_ENCODER_TYPE_DSI0,
                           VC4_ENCODER_TYPE_VEC,
-                          VC4_ENCODER_TYPE_TXP,
+                          VC4_ENCODER_TYPE_TXP0,
                           VC4_ENCODER_TYPE_HDMI0,
                           VC4_ENCODER_TYPE_HDMI1),
        VC5_PV_MUXING_TEST("More than 3 outputs: DSI0, VEC, DSI1, HDMI0, HDMI1",
@@ -643,27 +643,27 @@ static const struct pv_muxing_param vc5_test_pv_muxing_invalid_params[] = {
                           VC4_ENCODER_TYPE_HDMI1),
        VC5_PV_MUXING_TEST("More than 3 outputs: DSI0, TXP, DSI1, HDMI0, HDMI1",
                           VC4_ENCODER_TYPE_DSI0,
-                          VC4_ENCODER_TYPE_TXP,
+                          VC4_ENCODER_TYPE_TXP0,
                           VC4_ENCODER_TYPE_DSI1,
                           VC4_ENCODER_TYPE_HDMI0,
                           VC4_ENCODER_TYPE_HDMI1),
        VC5_PV_MUXING_TEST("More than 3 outputs: VEC, TXP, DSI1, HDMI0, HDMI1",
                           VC4_ENCODER_TYPE_VEC,
-                          VC4_ENCODER_TYPE_TXP,
+                          VC4_ENCODER_TYPE_TXP0,
                           VC4_ENCODER_TYPE_DSI1,
                           VC4_ENCODER_TYPE_HDMI0,
                           VC4_ENCODER_TYPE_HDMI1),
        VC5_PV_MUXING_TEST("More than 3 outputs: DPI, VEC, TXP, DSI1, HDMI0, HDMI1",
                           VC4_ENCODER_TYPE_DPI,
                           VC4_ENCODER_TYPE_VEC,
-                          VC4_ENCODER_TYPE_TXP,
+                          VC4_ENCODER_TYPE_TXP0,
                           VC4_ENCODER_TYPE_DSI1,
                           VC4_ENCODER_TYPE_HDMI0,
                           VC4_ENCODER_TYPE_HDMI1),
        VC5_PV_MUXING_TEST("More than 3 outputs: DSI0, VEC, TXP, DSI1, HDMI0, HDMI1",
                           VC4_ENCODER_TYPE_DSI0,
                           VC4_ENCODER_TYPE_VEC,
-                          VC4_ENCODER_TYPE_TXP,
+                          VC4_ENCODER_TYPE_TXP0,
                           VC4_ENCODER_TYPE_DSI1,
                           VC4_ENCODER_TYPE_HDMI0,
                           VC4_ENCODER_TYPE_HDMI1),

diff --git a/drivers/gpu/drm/vc4/vc4_drv.h b/drivers/gpu/drm/vc4/vc4_drv.h
index 70b7a771ff47bc452bb74a914003cb37e4ef1639..de2107e593c2b39d63a03a75c6b1670cdcdbef96 100644 (file)
--- a/drivers/gpu/drm/vc4/vc4_drv.h
+++ b/drivers/gpu/drm/vc4/vc4_drv.h
@@ -489,7 +489,8 @@ enum vc4_encoder_type {
        VC4_ENCODER_TYPE_DSI1,
        VC4_ENCODER_TYPE_SMI,
        VC4_ENCODER_TYPE_DPI,
-       VC4_ENCODER_TYPE_TXP,
+       VC4_ENCODER_TYPE_TXP0,
+       VC4_ENCODER_TYPE_TXP1,
 };
 
 struct vc4_encoder {

diff --git a/drivers/gpu/drm/vc4/vc4_kms.c b/drivers/gpu/drm/vc4/vc4_kms.c
index aa0b50d6c9fd03454e4683fc8935e0dc98c3746d..3fcfc265e1e2cd16fc3949adefe464e61027a9c1 100644 (file)
--- a/drivers/gpu/drm/vc4/vc4_kms.c
+++ b/drivers/gpu/drm/vc4/vc4_kms.c
@@ -350,7 +350,7 @@ static void vc6_hvs_pv_muxing_commit(struct vc4_dev *vc4,
                        mux = 0;
                        break;
 
-               case VC4_ENCODER_TYPE_TXP:
+               case VC4_ENCODER_TYPE_TXP1:
                        mux = 2;
                        break;
 

diff --git a/drivers/gpu/drm/vc4/vc4_txp.c b/drivers/gpu/drm/vc4/vc4_txp.c
index ecd2fc5edf454a0e310782bf6c323067bb528f0a..2979d141f3bb667d3130fb645e7f4674f100e4ca 100644 (file)
--- a/drivers/gpu/drm/vc4/vc4_txp.c
+++ b/drivers/gpu/drm/vc4/vc4_txp.c
@@ -515,7 +515,7 @@ const struct vc4_txp_data bcm2835_txp_data = {
                .hvs_available_channels = BIT(2),
                .hvs_output = 2,
        },
-       .encoder_type = VC4_ENCODER_TYPE_TXP,
+       .encoder_type = VC4_ENCODER_TYPE_TXP0,
        .has_byte_enable = true,
 };