+++ /dev/null
-From ef65a6f064b3bd497d83b0f40908182ba2a2b863 Mon Sep 17 00:00:00 2001
-From: Dave Stevenson <dave.stevenson@raspberrypi.com>
-Date: Wed, 21 Oct 2020 18:34:56 +0100
-Subject: [PATCH] drm/vc4: Add all the HDMI registers into the debugfs
- dumps
-
-The vc5 HDMI registers hadn't been added into the debugfs
-register sets, therefore weren't dumped on request.
-Add them in.
-
-Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
----
- drivers/gpu/drm/vc4/vc4_hdmi.c | 44 ++++++++++++++++++++++++++++++++++
- drivers/gpu/drm/vc4/vc4_hdmi.h | 9 +++++++
- 2 files changed, 53 insertions(+)
-
---- a/drivers/gpu/drm/vc4/vc4_hdmi.c
-+++ b/drivers/gpu/drm/vc4/vc4_hdmi.c
-@@ -92,6 +92,12 @@ static int vc4_hdmi_debugfs_regs(struct
-
- drm_print_regset32(&p, &vc4_hdmi->hdmi_regset);
- drm_print_regset32(&p, &vc4_hdmi->hd_regset);
-+ drm_print_regset32(&p, &vc4_hdmi->cec_regset);
-+ drm_print_regset32(&p, &vc4_hdmi->csc_regset);
-+ drm_print_regset32(&p, &vc4_hdmi->dvp_regset);
-+ drm_print_regset32(&p, &vc4_hdmi->phy_regset);
-+ drm_print_regset32(&p, &vc4_hdmi->ram_regset);
-+ drm_print_regset32(&p, &vc4_hdmi->rm_regset);
-
- return 0;
- }
-@@ -1734,6 +1740,7 @@ static int vc5_hdmi_init_resources(struc
- struct platform_device *pdev = vc4_hdmi->pdev;
- struct device *dev = &pdev->dev;
- struct resource *res;
-+ int ret;
-
- res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "hdmi");
- if (!res)
-@@ -1824,6 +1831,38 @@ static int vc5_hdmi_init_resources(struc
- return PTR_ERR(vc4_hdmi->reset);
- }
-
-+ ret = vc4_hdmi_build_regset(vc4_hdmi, &vc4_hdmi->hdmi_regset, VC4_HDMI);
-+ if (ret)
-+ return ret;
-+
-+ ret = vc4_hdmi_build_regset(vc4_hdmi, &vc4_hdmi->hd_regset, VC4_HD);
-+ if (ret)
-+ return ret;
-+
-+ ret = vc4_hdmi_build_regset(vc4_hdmi, &vc4_hdmi->cec_regset, VC5_CEC);
-+ if (ret)
-+ return ret;
-+
-+ ret = vc4_hdmi_build_regset(vc4_hdmi, &vc4_hdmi->csc_regset, VC5_CSC);
-+ if (ret)
-+ return ret;
-+
-+ ret = vc4_hdmi_build_regset(vc4_hdmi, &vc4_hdmi->dvp_regset, VC5_DVP);
-+ if (ret)
-+ return ret;
-+
-+ ret = vc4_hdmi_build_regset(vc4_hdmi, &vc4_hdmi->phy_regset, VC5_PHY);
-+ if (ret)
-+ return ret;
-+
-+ ret = vc4_hdmi_build_regset(vc4_hdmi, &vc4_hdmi->ram_regset, VC5_RAM);
-+ if (ret)
-+ return ret;
-+
-+ ret = vc4_hdmi_build_regset(vc4_hdmi, &vc4_hdmi->rm_regset, VC5_RM);
-+ if (ret)
-+ return ret;
-+
- return 0;
- }
-
---- a/drivers/gpu/drm/vc4/vc4_hdmi.h
-+++ b/drivers/gpu/drm/vc4/vc4_hdmi.h
-@@ -161,8 +161,16 @@ struct vc4_hdmi {
-
- struct reset_control *reset;
-
-+ /* Common debugfs regset */
- struct debugfs_regset32 hdmi_regset;
- struct debugfs_regset32 hd_regset;
-+ /* VC5 debugfs regset */
-+ struct debugfs_regset32 cec_regset;
-+ struct debugfs_regset32 csc_regset;
-+ struct debugfs_regset32 dvp_regset;
-+ struct debugfs_regset32 phy_regset;
-+ struct debugfs_regset32 ram_regset;
-+ struct debugfs_regset32 rm_regset;
- };
-
- static inline struct vc4_hdmi *