lkml.org 
[lkml]   [2020]   [Sep]   [3]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v5 60/80] drm/vc4: hdmi: Add CEC support flag
    Date
    Similarly to the audio support, CEC support is not there yet for the
    BCM2711, so let's skip entirely the CEC initialization through a variant
    flag.

    Reviewed-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
    Tested-by: Chanwoo Choi <cw00.choi@samsung.com>
    Tested-by: Hoegeun Kwon <hoegeun.kwon@samsung.com>
    Tested-by: Stefan Wahren <stefan.wahren@i2se.com>
    Signed-off-by: Maxime Ripard <maxime@cerno.tech>
    ---
    drivers/gpu/drm/vc4/vc4_hdmi.c | 4 ++++
    drivers/gpu/drm/vc4/vc4_hdmi.h | 3 +++
    2 files changed, 7 insertions(+)

    diff --git a/drivers/gpu/drm/vc4/vc4_hdmi.c b/drivers/gpu/drm/vc4/vc4_hdmi.c
    index bf537c6d413f..a26b6bd61f74 100644
    --- a/drivers/gpu/drm/vc4/vc4_hdmi.c
    +++ b/drivers/gpu/drm/vc4/vc4_hdmi.c
    @@ -1178,6 +1178,9 @@ static int vc4_hdmi_cec_init(struct vc4_hdmi *vc4_hdmi)
    u32 value;
    int ret;

    + if (!vc4_hdmi->variant->cec_available)
    + return 0;
    +
    vc4_hdmi->cec_adap = cec_allocate_adapter(&vc4_hdmi_cec_adap_ops,
    vc4_hdmi, "vc4",
    CEC_CAP_DEFAULTS |
    @@ -1476,6 +1479,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",
    + .cec_available = true,
    .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 794216f3228d..3f07aebe89f1 100644
    --- a/drivers/gpu/drm/vc4/vc4_hdmi.h
    +++ b/drivers/gpu/drm/vc4/vc4_hdmi.h
    @@ -33,6 +33,9 @@ struct vc4_hdmi_variant {
    /* Filename to expose the registers in debugfs */
    const char *debugfs_name;

    + /* Set to true when the CEC support is available */
    + bool cec_available;
    +
    /* List of the registers available on that variant */
    const struct vc4_hdmi_register *registers;

    --
    git-series 0.9.1
    \
     
     \ /
      Last update: 2020-09-03 10:08    [W:3.025 / U:0.600 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site