62b7f5931c
bcm2708: boot tested on RPi B+ v1.2
bcm2709: boot tested on RPi 3B v1.2 and RPi 4B v1.1 4G
bcm2710: boot tested on RPi 3B v1.2
bcm2711: boot tested on RPi 4B v1.1 4G
Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
(cherry-picked from commit f07e572f64)
34 lines
1.0 KiB
Diff
34 lines
1.0 KiB
Diff
From a1f24e24c065b91f833e3f546c1507f69fb04bc7 Mon Sep 17 00:00:00 2001
|
|
From: Maxime Ripard <maxime@cerno.tech>
|
|
Date: Thu, 16 Jan 2020 14:27:56 +0100
|
|
Subject: [PATCH] drm/vc4: hdmi: Deal with multiple debugfs files
|
|
|
|
The HDMI driver was registering a single debugfs file so far with the name
|
|
hdmi_regs.
|
|
|
|
Obviously, this is not going to work anymore when will have multiple HDMI
|
|
controllers since we will end up trying to register two files with the same
|
|
name.
|
|
|
|
Let's use the ID to avoid that name conflict.
|
|
|
|
Signed-off-by: Maxime Ripard <maxime@cerno.tech>
|
|
---
|
|
drivers/gpu/drm/vc4/vc4_hdmi.c | 5 ++++-
|
|
1 file changed, 4 insertions(+), 1 deletion(-)
|
|
|
|
--- a/drivers/gpu/drm/vc4/vc4_hdmi.c
|
|
+++ b/drivers/gpu/drm/vc4/vc4_hdmi.c
|
|
@@ -1381,7 +1381,10 @@ static int vc4_hdmi_bind(struct device *
|
|
if (ret)
|
|
goto err_destroy_encoder;
|
|
|
|
- vc4_debugfs_add_file(drm, "hdmi_regs", vc4_hdmi_debugfs_regs, vc4_hdmi);
|
|
+ vc4_debugfs_add_file(drm,
|
|
+ variant->id ? "hdmi1_regs" : "hdmi_regs",
|
|
+ vc4_hdmi_debugfs_regs,
|
|
+ vc4_hdmi);
|
|
|
|
return 0;
|
|
|