lkml.org 
[lkml]   [2020]   [Jul]   [28]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    /
    From
    Date
    SubjectRe: [PATCH v4 57/78] drm/vc4: hdmi: Deal with multiple debugfs files
    Hi Maxime

    On Wed, 8 Jul 2020 at 18:43, Maxime Ripard <maxime@cerno.tech> wrote:
    >
    > The HDMI driver was registering a single debugfs file so far with the name
    > hdmi_regs.
    >
    > Obviously, this is not going to work anymore when will have multiple HDMI
    > 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@cerno.tech>

    Reviewed-by: Dave Stevenson <dave.stevenson@raspberrypi.com>

    > ---
    > drivers/gpu/drm/vc4/vc4_hdmi.c | 5 ++++-
    > drivers/gpu/drm/vc4/vc4_hdmi.h | 3 +++
    > 2 files changed, 7 insertions(+), 1 deletion(-)
    >
    > diff --git a/drivers/gpu/drm/vc4/vc4_hdmi.c b/drivers/gpu/drm/vc4/vc4_hdmi.c
    > index c50241170d7e..ef51eedaf75a 100644
    > --- a/drivers/gpu/drm/vc4/vc4_hdmi.c
    > +++ b/drivers/gpu/drm/vc4/vc4_hdmi.c
    > @@ -1370,7 +1370,9 @@ static int vc4_hdmi_bind(struct device *dev, struct device *master, void *data)
    > if (ret)
    > goto err_destroy_encoder;
    >
    > - vc4_debugfs_add_file(drm, "hdmi_regs", vc4_hdmi_debugfs_regs, vc4_hdmi);
    > + vc4_debugfs_add_file(drm, variant->debugfs_name,
    > + vc4_hdmi_debugfs_regs,
    > + vc4_hdmi);
    >
    > return 0;
    >
    > @@ -1448,6 +1450,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",
    > .registers = vc4_hdmi_fields,
    > .num_registers = ARRAY_SIZE(vc4_hdmi_fields),
    >
    > diff --git a/drivers/gpu/drm/vc4/vc4_hdmi.h b/drivers/gpu/drm/vc4/vc4_hdmi.h
    > index 0d529db4b3ab..794216f3228d 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;
    >
    > + /* Filename to expose the registers in debugfs */
    > + const char *debugfs_name;
    > +
    > /* List of the registers available on that variant */
    > const struct vc4_hdmi_register *registers;
    >
    > --
    > git-series 0.9.1

    \
     
     \ /
      Last update: 2020-07-28 15:22    [W:6.488 / U:0.084 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site