From: Maxime Ripard <maxime@cerno.tech>
To: Eric Anholt <eric@anholt.net>,
Maarten Lankhorst <maarten.lankhorst@linux.intel.com>,
Thomas Zimmermann <tzimmermann@suse.de>,
Maxime Ripard <maxime@cerno.tech>,
Daniel Vetter <daniel.vetter@intel.com>,
David Airlie <airlied@linux.ie>
Cc: Jason Cooper <jason@lakedaemon.net>,
bcm-kernel-feedback-list@broadcom.com,
linux-arm-kernel@lists.infradead.org,
Marc Zyngier <maz@kernel.org>,
linux-media@vger.kernel.org,
Hans Verkuil <hverkuil-cisco@xs4all.nl>,
linux-kernel@vger.kernel.org,
Mauro Carvalho Chehab <mchehab@kernel.org>,
Thomas Gleixner <tglx@linutronix.de>,
Dave Stevenson <dave.stevenson@raspberrypi.com>,
linux-rpi-kernel@lists.infradead.org,
dri-devel@lists.freedesktop.org,
Dom Cobley <popcornmix@gmail.com>
Subject: [PATCH 11/15] drm/vc4: hdmi: Remove cec_available flag
Date: Thu, 10 Dec 2020 14:46:44 +0100 [thread overview]
Message-ID: <20201210134648.272857-12-maxime@cerno.tech> (raw)
In-Reply-To: <20201210134648.272857-1-maxime@cerno.tech>
From: Dom Cobley <popcornmix@gmail.com>
Now that our HDMI controller supports CEC for the BCM2711, let's remove
that flag.
Signed-off-by: Dom Cobley <popcornmix@gmail.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 deletions(-)
diff --git a/drivers/gpu/drm/vc4/vc4_hdmi.c b/drivers/gpu/drm/vc4/vc4_hdmi.c
index d208b7d1d937..327638d93032 100644
--- a/drivers/gpu/drm/vc4/vc4_hdmi.c
+++ b/drivers/gpu/drm/vc4/vc4_hdmi.c
@@ -1658,9 +1658,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 |
@@ -2074,7 +2071,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),
diff --git a/drivers/gpu/drm/vc4/vc4_hdmi.h b/drivers/gpu/drm/vc4/vc4_hdmi.h
index 27352827f70c..c93ada62f429 100644
--- a/drivers/gpu/drm/vc4/vc4_hdmi.h
+++ b/drivers/gpu/drm/vc4/vc4_hdmi.h
@@ -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;
--
2.28.0
next prev parent reply other threads:[~2020-12-10 13:49 UTC|newest]
Thread overview: 39+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-12-10 13:46 [PATCH 00/15] drm/vc4: hdmi: Add CEC support for the BCM2711 Maxime Ripard
2020-12-10 13:46 ` [PATCH 01/15] irqchip: Allow to compile bcmstb on other platforms Maxime Ripard
2020-12-10 17:33 ` Florian Fainelli
2020-12-10 17:59 ` Marc Zyngier
2020-12-14 15:27 ` Maxime Ripard
2020-12-14 16:20 ` Marc Zyngier
2020-12-10 13:46 ` [PATCH 02/15] drm/vc4: hdmi: Move hdmi reset to bind Maxime Ripard
2020-12-18 11:20 ` Dave Stevenson
2020-12-10 13:46 ` [PATCH 03/15] drm/vc4: hdmi: Fix register offset with longer CEC messages Maxime Ripard
2020-12-15 11:23 ` Dave Stevenson
2020-12-10 13:46 ` [PATCH 04/15] drm/vc4: hdmi: Fix up CEC registers Maxime Ripard
2020-12-18 11:21 ` Dave Stevenson
2020-12-10 13:46 ` [PATCH 05/15] drm/vc4: hdmi: Restore cec physical address on reconnect Maxime Ripard
2020-12-18 14:21 ` Dave Stevenson
2020-12-18 14:45 ` Dave Stevenson
2021-01-11 10:29 ` Maxime Ripard
2020-12-10 13:46 ` [PATCH 06/15] drm/vc4: hdmi: Compute the CEC clock divider from the clock rate Maxime Ripard
2020-12-18 11:30 ` Dave Stevenson
2020-12-10 13:46 ` [PATCH 07/15] drm/vc4: hdmi: Update the CEC clock divider on HSM rate change Maxime Ripard
2020-12-18 14:26 ` Dave Stevenson
2020-12-10 13:46 ` [PATCH 08/15] drm/vc4: hdmi: Introduce a CEC clock Maxime Ripard
2020-12-18 11:37 ` Dave Stevenson
2020-12-18 12:23 ` Maxime Ripard
2020-12-18 12:25 ` Dave Stevenson
2020-12-10 13:46 ` [PATCH 09/15] drm/vc4: hdmi: Split the interrupt handlers Maxime Ripard
2020-12-10 13:46 ` [PATCH 10/15] drm/vc4: hdmi: Support BCM2711 CEC interrupt setup Maxime Ripard
2020-12-10 13:46 ` Maxime Ripard [this message]
2020-12-18 14:30 ` [PATCH 11/15] drm/vc4: hdmi: Remove cec_available flag Dave Stevenson
2020-12-10 13:46 ` [PATCH 12/15] drm/vc4: hdmi: Don't register the CEC adapter if there's no interrupts Maxime Ripard
2020-12-18 14:29 ` Dave Stevenson
2020-12-10 13:46 ` [PATCH 13/15] dt-binding: display: bcm2711-hdmi: Add CEC and hotplug interrupts Maxime Ripard
2020-12-10 13:46 ` [PATCH 14/15] ARM: dts: bcm2711: Add the BSC interrupt controller Maxime Ripard
2020-12-10 17:41 ` Florian Fainelli
2020-12-10 13:46 ` [PATCH 15/15] ARM: dts: bcm2711: Add the CEC " Maxime Ripard
2020-12-10 17:42 ` Florian Fainelli
2020-12-16 12:35 ` [PATCH 00/15] drm/vc4: hdmi: Add CEC support for the BCM2711 Hans Verkuil
2020-12-17 10:49 ` Maxime Ripard
2020-12-17 10:53 ` Hans Verkuil
2020-12-17 12:59 ` Maxime Ripard
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20201210134648.272857-12-maxime@cerno.tech \
--to=maxime@cerno.tech \
--cc=airlied@linux.ie \
--cc=bcm-kernel-feedback-list@broadcom.com \
--cc=daniel.vetter@intel.com \
--cc=dave.stevenson@raspberrypi.com \
--cc=dri-devel@lists.freedesktop.org \
--cc=eric@anholt.net \
--cc=hverkuil-cisco@xs4all.nl \
--cc=jason@lakedaemon.net \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-media@vger.kernel.org \
--cc=linux-rpi-kernel@lists.infradead.org \
--cc=maarten.lankhorst@linux.intel.com \
--cc=maz@kernel.org \
--cc=mchehab@kernel.org \
--cc=popcornmix@gmail.com \
--cc=tglx@linutronix.de \
--cc=tzimmermann@suse.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).