Unverified Commit 51128c3f authored by Hans Verkuil's avatar Hans Verkuil Committed by Maxime Ripard
Browse files

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: default avatarHans Verkuil <hverkuil-cisco@xs4all.nl>
Fixes: 15b4511a ("drm/vc4: add HDMI CEC support")
Signed-off-by: default avatarMaxime Ripard <maxime@cerno.tech>
Link: https://patchwork.freedesktop.org/patch/msgid/dcf1db75-d9cc-62cc-fa12-baf1b2b3bf31@xs4all.nl
parent d6591da5

drivers/gpu/drm/vc4/vc4_hdmi.c

+2 −1
Original line number Diff line number Diff line
@@ -3018,7 +3018,8 @@ static int vc4_hdmi_cec_init(struct vc4_hdmi *vc4_hdmi) 
	}



	vc4_hdmi->cec_adap = cec_allocate_adapter(&vc4_hdmi_cec_adap_ops,

						  vc4_hdmi, "vc4",

						  vc4_hdmi,

						  vc4_hdmi->variant->card_name,

						  CEC_CAP_DEFAULTS |

						  CEC_CAP_CONNECTOR_INFO, 1);

	ret = PTR_ERR_OR_ZERO(vc4_hdmi->cec_adap);