lkml.org 
[lkml]   [2020]   [Dec]   [18]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    /
    From
    Date
    SubjectRe: [PATCH 12/15] drm/vc4: hdmi: Don't register the CEC adapter if there's no interrupts
    On Thu, 10 Dec 2020 at 13:47, Maxime Ripard <maxime@cerno.tech> wrote:
    >
    > We introduced the BCM2711 support to the vc4 HDMI controller with 5.10,
    > but this was lacking any of the interrupts of the CEC controller so we
    > have to deal with the backward compatibility.
    >
    > Do so by simply ignoring the CEC setup if the DT doesn't have the
    > interrupts property.
    >
    > Signed-off-by: Maxime Ripard <maxime@cerno.tech>

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

    > ---
    > drivers/gpu/drm/vc4/vc4_hdmi.c | 6 ++++++
    > 1 file changed, 6 insertions(+)
    >
    > diff --git a/drivers/gpu/drm/vc4/vc4_hdmi.c b/drivers/gpu/drm/vc4/vc4_hdmi.c
    > index 327638d93032..69217c68d3a4 100644
    > --- a/drivers/gpu/drm/vc4/vc4_hdmi.c
    > +++ b/drivers/gpu/drm/vc4/vc4_hdmi.c
    > @@ -1655,9 +1655,15 @@ static int vc4_hdmi_cec_init(struct vc4_hdmi *vc4_hdmi)
    > {
    > struct cec_connector_info conn_info;
    > struct platform_device *pdev = vc4_hdmi->pdev;
    > + struct device *dev = &pdev->dev;
    > u32 value;
    > int ret;
    >
    > + if (!of_find_property(dev->of_node, "interrupts", NULL)) {
    > + dev_warn(dev, "'interrupts' DT property is missing, no CEC\n");
    > + return 0;
    > + }
    > +
    > vc4_hdmi->cec_adap = cec_allocate_adapter(&vc4_hdmi_cec_adap_ops,
    > vc4_hdmi, "vc4",
    > CEC_CAP_DEFAULTS |
    > --
    > 2.28.0
    >

    \
     
     \ /
      Last update: 2020-12-18 15:31    [W:6.238 / U:0.000 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site