Commit 1e5e4bbd authored by Dom Cobley's avatar Dom Cobley Committed by Maarten Lankhorst
Browse files

drm/vc4: hdmi: Remove cec_available flag 



Now that our HDMI controller supports CEC for the BCM2711, let's remove
that flag.

Reviewed-by: default avatarDave Stevenson <dave.stevenson@raspberrypi.com>
Signed-off-by: default avatarDom Cobley <popcornmix@gmail.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-12-maxime@cerno.tech


(cherry picked from commit f551863a)
Signed-off-by: default avatarMaarten Lankhorst <maarten.lankhorst@linux.intel.com>
parent 185e98b3

drivers/gpu/drm/vc4/vc4_hdmi.c

+0 −4
Original line number Diff line number Diff line
@@ -1671,9 +1671,6 @@ 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 |
@@ -2087,7 +2084,6 @@ static const struct vc4_hdmi_variant bcm2835_variant = { 
	.debugfs_name		= "hdmi_regs",

	.card_name		= "vc4-hdmi",

	.max_pixel_clock	= 162000000,

	.cec_available		= true,

	.registers		= vc4_hdmi_fields,

	.num_registers		= ARRAY_SIZE(vc4_hdmi_fields),

drivers/gpu/drm/vc4/vc4_hdmi.h

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



	/* Maximum pixel clock supported by the controller (in Hz) */

	unsigned long long max_pixel_clock;