diff options
| author | Hans Verkuil <hverkuil-cisco@xs4all.nl> | 2023-01-19 12:02:19 +0300 |
|---|---|---|
| committer | Maxime Ripard <maxime@cerno.tech> | 2023-01-26 15:09:06 +0300 |
| commit | 51128c3f2a7c98055ea1d27e34910dc10977f618 (patch) | |
| tree | e56714ce46905fad5aa4fcb853ab8e0e01fcb0d6 /drivers/gpu/drm/vc4 | |
| parent | d6591da5f3ff284a376d56b5f7a48a34e9cb159d (diff) | |
| download | linux-51128c3f2a7c98055ea1d27e34910dc10977f618.tar.xz | |
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 <hverkuil-cisco@xs4all.nl>
Fixes: 15b4511a4af6 ("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
Diffstat (limited to 'drivers/gpu/drm/vc4')
| -rw-r--r-- | drivers/gpu/drm/vc4/vc4_hdmi.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/gpu/drm/vc4/vc4_hdmi.c b/drivers/gpu/drm/vc4/vc4_hdmi.c index 12a00d644b61..55744216392b 100644 --- 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); |