Skip to content

Commit 51128c3

Browse files
Hans Verkuilmripard
authored andcommitted
drm/vc4: hdmi: make CEC adapter name unique
The bcm2711 has two HDMI outputs, each with their own CEC adapter. The CEC adapter name has to be unique, but it is currently hardcoded to "vc4" for both outputs. Change this to use the card_name from the variant information in order to make the adapter name unique. Signed-off-by: Hans Verkuil <[email protected]> Fixes: 15b4511 ("drm/vc4: add HDMI CEC support") Signed-off-by: Maxime Ripard <[email protected]> Link: https://patchwork.freedesktop.org/patch/msgid/[email protected]
1 parent d6591da commit 51128c3

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

drivers/gpu/drm/vc4/vc4_hdmi.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3018,7 +3018,8 @@ static int vc4_hdmi_cec_init(struct vc4_hdmi *vc4_hdmi)
30183018
}
30193019

30203020
vc4_hdmi->cec_adap = cec_allocate_adapter(&vc4_hdmi_cec_adap_ops,
3021-
vc4_hdmi, "vc4",
3021+
vc4_hdmi,
3022+
vc4_hdmi->variant->card_name,
30223023
CEC_CAP_DEFAULTS |
30233024
CEC_CAP_CONNECTOR_INFO, 1);
30243025
ret = PTR_ERR_OR_ZERO(vc4_hdmi->cec_adap);

0 commit comments

Comments
 (0)