Hi Maxime On Wed, 8 Jul 2020 at 18:44, Maxime Ripard <maxime@xxxxxxxxxx> wrote: > > The HDMI driver was registering a single ALSA card so far with the name > vc4-hdmi. > > Obviously, this is not going to work anymore when will have multiple HDMI s/will/we > controllers since we will end up trying to register two files with the same > name. > > Let's use the variant to avoid that name conflict. > > Signed-off-by: Maxime Ripard <maxime@xxxxxxxxxx> With that change Reviewed-by: Dave Stevenson <dave.stevenson@xxxxxxxxxxxxxxx> > --- > drivers/gpu/drm/vc4/vc4_hdmi.c | 3 ++- > drivers/gpu/drm/vc4/vc4_hdmi.h | 3 +++ > 2 files changed, 5 insertions(+), 1 deletion(-) > > diff --git a/drivers/gpu/drm/vc4/vc4_hdmi.c b/drivers/gpu/drm/vc4/vc4_hdmi.c > index 1b6f51849d6c..0a9a323e03d8 100644 > --- a/drivers/gpu/drm/vc4/vc4_hdmi.c > +++ b/drivers/gpu/drm/vc4/vc4_hdmi.c > @@ -1044,7 +1044,7 @@ static int vc4_hdmi_audio_init(struct vc4_hdmi *vc4_hdmi) > > card->dai_link = dai_link; > card->num_links = 1; > - card->name = "vc4-hdmi"; > + card->name = vc4_hdmi->variant->card_name; > card->dev = dev; > > /* > @@ -1503,6 +1503,7 @@ static int vc4_hdmi_dev_remove(struct platform_device *pdev) > static const struct vc4_hdmi_variant bcm2835_variant = { > .encoder_type = VC4_ENCODER_TYPE_HDMI0, > .debugfs_name = "hdmi_regs", > + .card_name = "vc4-hdmi", > .max_pixel_clock = 162000000, > .cec_available = true, > .registers = vc4_hdmi_fields, > diff --git a/drivers/gpu/drm/vc4/vc4_hdmi.h b/drivers/gpu/drm/vc4/vc4_hdmi.h > index 4aea5ee8a91d..34138e0dd4a6 100644 > --- a/drivers/gpu/drm/vc4/vc4_hdmi.h > +++ b/drivers/gpu/drm/vc4/vc4_hdmi.h > @@ -30,6 +30,9 @@ struct vc4_hdmi_variant { > /* Encoder Type for that controller */ > enum vc4_encoder_type encoder_type; > > + /* ALSA card name */ > + const char *card_name; > + > /* Filename to expose the registers in debugfs */ > const char *debugfs_name; > > -- > git-series 0.9.1 _______________________________________________ dri-devel mailing list dri-devel@xxxxxxxxxxxxxxxxxxxxx https://lists.freedesktop.org/mailman/listinfo/dri-devel