Commit ae442bf6 authored by Maxime Ripard's avatar Maxime Ripard Committed by Maarten Lankhorst
Browse files

drm/vc4: hdmi: Don't register the CEC adapter if there's no interrupts 



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.

Reviewed-by: default avatarDave Stevenson <dave.stevenson@raspberrypi.com>
Signed-off-by: default avatarMaxime Ripard <maxime@cerno.tech>
Acked-by: default avatarHans Verkuil <hverkuil-cisco@xs4all.nl>
Tested-by: default avatarHans Verkuil <hverkuil-cisco@xs4all.nl>
Link: https://patchwork.freedesktop.org/patch/msgid/20210111142309.193441-13-maxime@cerno.tech


(cherry picked from commit 4d03ed7a)
Signed-off-by: default avatarMaarten Lankhorst <maarten.lankhorst@linux.intel.com>
parent 1e5e4bbd

drivers/gpu/drm/vc4/vc4_hdmi.c

+6 −0
Original line number Diff line number Diff line
@@ -1668,9 +1668,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 |