lkml.org 
[lkml]   [2020]   [Apr]   [24]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v2 55/91] drm/vc4: crtc: Rename HDMI encoder type to HDMI0
    Date
    The previous generations were only supporting a single HDMI controller, but
    that's about to change, so put an index as well to differentiate between
    the two controllers.

    Signed-off-by: Maxime Ripard <maxime@cerno.tech>
    ---
    drivers/gpu/drm/vc4/vc4_crtc.c | 2 +-
    drivers/gpu/drm/vc4/vc4_drv.h | 2 +-
    drivers/gpu/drm/vc4/vc4_hdmi.c | 2 +-
    3 files changed, 3 insertions(+), 3 deletions(-)

    diff --git a/drivers/gpu/drm/vc4/vc4_crtc.c b/drivers/gpu/drm/vc4/vc4_crtc.c
    index d4b490e3f2b8..22c0cd0dfc46 100644
    --- a/drivers/gpu/drm/vc4/vc4_crtc.c
    +++ b/drivers/gpu/drm/vc4/vc4_crtc.c
    @@ -1113,7 +1113,7 @@ static const struct vc4_crtc_data bcm2835_pv2_data = {
    .fifo_depth = 64,
    .pixels_per_clock = 1,
    .encoder_types = {
    - [PV_CONTROL_CLK_SELECT_DPI_SMI_HDMI] = VC4_ENCODER_TYPE_HDMI,
    + [PV_CONTROL_CLK_SELECT_DPI_SMI_HDMI] = VC4_ENCODER_TYPE_HDMI0,
    [PV_CONTROL_CLK_SELECT_VEC] = VC4_ENCODER_TYPE_VEC,
    },
    };
    diff --git a/drivers/gpu/drm/vc4/vc4_drv.h b/drivers/gpu/drm/vc4/vc4_drv.h
    index 1ac27f8ec725..e480839c1056 100644
    --- a/drivers/gpu/drm/vc4/vc4_drv.h
    +++ b/drivers/gpu/drm/vc4/vc4_drv.h
    @@ -429,7 +429,7 @@ to_vc4_plane_state(struct drm_plane_state *state)

    enum vc4_encoder_type {
    VC4_ENCODER_TYPE_NONE,
    - VC4_ENCODER_TYPE_HDMI,
    + VC4_ENCODER_TYPE_HDMI0,
    VC4_ENCODER_TYPE_VEC,
    VC4_ENCODER_TYPE_DSI0,
    VC4_ENCODER_TYPE_DSI1,
    diff --git a/drivers/gpu/drm/vc4/vc4_hdmi.c b/drivers/gpu/drm/vc4/vc4_hdmi.c
    index 340719238753..7e2d3ec311e3 100644
    --- a/drivers/gpu/drm/vc4/vc4_hdmi.c
    +++ b/drivers/gpu/drm/vc4/vc4_hdmi.c
    @@ -1317,7 +1317,7 @@ static int vc4_hdmi_bind(struct device *dev, struct device *master, void *data)
    GFP_KERNEL);
    if (!vc4_hdmi_encoder)
    return -ENOMEM;
    - vc4_hdmi_encoder->base.type = VC4_ENCODER_TYPE_HDMI;
    + vc4_hdmi_encoder->base.type = VC4_ENCODER_TYPE_HDMI0;
    hdmi->encoder = &vc4_hdmi_encoder->base.base;

    hdmi->pdev = pdev;
    --
    git-series 0.9.1
    \
     
     \ /
      Last update: 2020-04-24 17:37    [W:4.112 / U:0.440 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site