drm/vc4: hdmi: make CEC adapter name unique

Hans Verkuil · mripard · commit 51128c3f2a7c · 2023-01-26T13:09:06.000+01:00
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 <hverkuil-cisco@xs4all.nl> Fixes: 15b4511 ("drm/vc4: add HDMI CEC support") Signed-off-by: Maxime Ripard <maxime@cerno.tech> Link: https://patchwork.freedesktop.org/patch/msgid/dcf1db75-d9cc-62cc-fa12-baf1b2b3bf31@xs4all.nl
diff --git a/drivers/gpu/drm/vc4/vc4_hdmi.c b/drivers/gpu/drm/vc4/vc4_hdmi.c
@@ -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);

Original file line number	Diff line number	Diff line change
`@@ -3018,7 +3018,8 @@ static int vc4_hdmi_cec_init(struct vc4_hdmi *vc4_hdmi)`
`3018`	`3018`	`}`
`3019`	`3019`
`3020`	`3020`	`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,`
`3022`	`3023`	`CEC_CAP_DEFAULTS \|`
`3023`	`3024`	`CEC_CAP_CONNECTOR_INFO, 1);`
`3024`	`3025`	`ret = PTR_ERR_OR_ZERO(vc4_hdmi->cec_adap);`