From: Dave Stevenson <dave.stevenson@raspberrypi.com>
To: Maxime Ripard <maxime@cerno.tech>
Cc: David Airlie <airlied@linux.ie>,
Maarten Lankhorst <maarten.lankhorst@linux.intel.com>,
LKML <linux-kernel@vger.kernel.org>,
DRI Development <dri-devel@lists.freedesktop.org>,
Eric Anholt <eric@anholt.net>,
bcm-kernel-feedback-list@broadcom.com,
linux-rpi-kernel@lists.infradead.org,
Thomas Zimmermann <tzimmermann@suse.de>,
Hans Verkuil <hverkuil-cisco@xs4all.nl>,
Daniel Vetter <daniel.vetter@intel.com>,
Mauro Carvalho Chehab <mchehab@kernel.org>,
linux-arm-kernel@lists.infradead.org,
Linux Media Mailing List <linux-media@vger.kernel.org>
Subject: Re: [PATCH v2 10/15] drm/vc4: hdmi: Support BCM2711 CEC interrupt setup
Date: Fri, 22 Jan 2021 13:10:49 +0000 [thread overview]
Message-ID: <CAPY8ntCdxn3=A19VVsxnrPppk0O7eyzxa3bwFWQj1QEXnQ_GWA@mail.gmail.com> (raw)
In-Reply-To: <20210111142309.193441-11-maxime@cerno.tech>
Hi Maxime
On Mon, 11 Jan 2021 at 14:23, Maxime Ripard <maxime@cerno.tech> wrote:
>
> The HDMI controller found in the BCM2711 has an external interrupt
> controller for the CEC and hotplug interrupt shared between the two
> instances.
>
> Let's add a variant flag to register a single interrupt handler and
> deals with the interrupt handler setup, or two interrupt handlers
> relying on an external irqchip.
>
> Signed-off-by: Maxime Ripard <maxime@cerno.tech>
Looks good
Reviewed-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
> ---
> drivers/gpu/drm/vc4/vc4_hdmi.c | 42 ++++++++++++++++++++++++++--------
> drivers/gpu/drm/vc4/vc4_hdmi.h | 7 ++++++
> 2 files changed, 39 insertions(+), 10 deletions(-)
>
> diff --git a/drivers/gpu/drm/vc4/vc4_hdmi.c b/drivers/gpu/drm/vc4/vc4_hdmi.c
> index 12ca5f3084af..d116ecfd8cf7 100644
> --- a/drivers/gpu/drm/vc4/vc4_hdmi.c
> +++ b/drivers/gpu/drm/vc4/vc4_hdmi.c
> @@ -1605,9 +1605,11 @@ static int vc4_hdmi_cec_adap_enable(struct cec_adapter *adap, bool enable)
> ((3600 / usecs) << VC4_HDMI_CEC_CNT_TO_3600_US_SHIFT) |
> ((3500 / usecs) << VC4_HDMI_CEC_CNT_TO_3500_US_SHIFT));
>
> - HDMI_WRITE(HDMI_CEC_CPU_MASK_CLEAR, VC4_HDMI_CPU_CEC);
> + if (!vc4_hdmi->variant->external_irq_controller)
> + HDMI_WRITE(HDMI_CEC_CPU_MASK_CLEAR, VC4_HDMI_CPU_CEC);
> } else {
> - HDMI_WRITE(HDMI_CEC_CPU_MASK_SET, VC4_HDMI_CPU_CEC);
> + if (!vc4_hdmi->variant->external_irq_controller)
> + HDMI_WRITE(HDMI_CEC_CPU_MASK_SET, VC4_HDMI_CPU_CEC);
> HDMI_WRITE(HDMI_CEC_CNTRL_5, val |
> VC4_HDMI_CEC_TX_SW_RESET | VC4_HDMI_CEC_RX_SW_RESET);
> }
> @@ -1682,8 +1684,6 @@ static int vc4_hdmi_cec_init(struct vc4_hdmi *vc4_hdmi)
> cec_fill_conn_info_from_drm(&conn_info, &vc4_hdmi->connector);
> cec_s_conn_info(vc4_hdmi->cec_adap, &conn_info);
>
> - HDMI_WRITE(HDMI_CEC_CPU_MASK_SET, 0xffffffff);
> -
> value = HDMI_READ(HDMI_CEC_CNTRL_1);
> /* Set the logical address to Unregistered */
> value |= VC4_HDMI_CEC_ADDR_MASK;
> @@ -1691,12 +1691,32 @@ static int vc4_hdmi_cec_init(struct vc4_hdmi *vc4_hdmi)
>
> vc4_hdmi_cec_update_clk_div(vc4_hdmi);
>
> - ret = devm_request_threaded_irq(&pdev->dev, platform_get_irq(pdev, 0),
> - vc4_cec_irq_handler,
> - vc4_cec_irq_handler_thread, 0,
> - "vc4 hdmi cec", vc4_hdmi);
> - if (ret)
> - goto err_delete_cec_adap;
> + if (vc4_hdmi->variant->external_irq_controller) {
> + ret = devm_request_threaded_irq(&pdev->dev,
> + platform_get_irq_byname(pdev, "cec-rx"),
> + vc4_cec_irq_handler_rx_bare,
> + vc4_cec_irq_handler_rx_thread, 0,
> + "vc4 hdmi cec rx", vc4_hdmi);
> + if (ret)
> + goto err_delete_cec_adap;
> +
> + ret = devm_request_threaded_irq(&pdev->dev,
> + platform_get_irq_byname(pdev, "cec-tx"),
> + vc4_cec_irq_handler_tx_bare,
> + vc4_cec_irq_handler_tx_thread, 0,
> + "vc4 hdmi cec tx", vc4_hdmi);
> + if (ret)
> + goto err_delete_cec_adap;
> + } else {
> + HDMI_WRITE(HDMI_CEC_CPU_MASK_SET, 0xffffffff);
> +
> + ret = devm_request_threaded_irq(&pdev->dev, platform_get_irq(pdev, 0),
> + vc4_cec_irq_handler,
> + vc4_cec_irq_handler_thread, 0,
> + "vc4 hdmi cec", vc4_hdmi);
> + if (ret)
> + goto err_delete_cec_adap;
> + }
>
> ret = cec_register_adapter(vc4_hdmi->cec_adap, &pdev->dev);
> if (ret < 0)
> @@ -2095,6 +2115,7 @@ static const struct vc4_hdmi_variant bcm2711_hdmi0_variant = {
> PHY_LANE_CK,
> },
> .unsupported_odd_h_timings = true,
> + .external_irq_controller = true,
>
> .init_resources = vc5_hdmi_init_resources,
> .csc_setup = vc5_hdmi_csc_setup,
> @@ -2121,6 +2142,7 @@ static const struct vc4_hdmi_variant bcm2711_hdmi1_variant = {
> PHY_LANE_2,
> },
> .unsupported_odd_h_timings = true,
> + .external_irq_controller = true,
>
> .init_resources = vc5_hdmi_init_resources,
> .csc_setup = vc5_hdmi_csc_setup,
> diff --git a/drivers/gpu/drm/vc4/vc4_hdmi.h b/drivers/gpu/drm/vc4/vc4_hdmi.h
> index 6966db1a0957..d71f6ed321bf 100644
> --- a/drivers/gpu/drm/vc4/vc4_hdmi.h
> +++ b/drivers/gpu/drm/vc4/vc4_hdmi.h
> @@ -64,6 +64,13 @@ struct vc4_hdmi_variant {
> /* The BCM2711 cannot deal with odd horizontal pixel timings */
> bool unsupported_odd_h_timings;
>
> + /*
> + * The BCM2711 CEC/hotplug IRQ controller is shared between the
> + * two HDMI controllers, and we have a proper irqchip driver for
> + * it.
> + */
> + bool external_irq_controller;
> +
> /* Callback to get the resources (memory region, interrupts,
> * clocks, etc) for that variant.
> */
> --
> 2.29.2
>
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
next prev parent reply other threads:[~2021-01-22 13:12 UTC|newest]
Thread overview: 37+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-01-11 14:22 [PATCH v2 00/15] drm/vc4: hdmi: Add CEC support for the BCM2711 Maxime Ripard
2021-01-11 14:22 ` [PATCH v2 01/15] ARM: bcm: Select BRCMSTB_L2_IRQ for bcm2835 Maxime Ripard
2021-01-11 16:54 ` Florian Fainelli
2021-01-11 17:12 ` Nicolas Saenz Julienne
2021-01-11 14:22 ` [PATCH v2 02/15] drm/vc4: hdmi: Move hdmi reset to bind Maxime Ripard
2021-01-11 14:22 ` [PATCH v2 03/15] drm/vc4: hdmi: Fix register offset with longer CEC messages Maxime Ripard
2021-01-11 14:22 ` [PATCH v2 04/15] drm/vc4: hdmi: Fix up CEC registers Maxime Ripard
2021-01-11 14:22 ` [PATCH v2 05/15] drm/vc4: hdmi: Restore cec physical address on reconnect Maxime Ripard
2021-01-22 10:31 ` Dave Stevenson
2021-01-11 14:23 ` [PATCH v2 06/15] drm/vc4: hdmi: Compute the CEC clock divider from the clock rate Maxime Ripard
2021-01-11 14:23 ` [PATCH v2 07/15] drm/vc4: hdmi: Update the CEC clock divider on HSM rate change Maxime Ripard
2021-01-11 14:23 ` [PATCH v2 08/15] drm/vc4: hdmi: Introduce a CEC clock Maxime Ripard
2021-01-11 14:23 ` [PATCH v2 09/15] drm/vc4: hdmi: Split the interrupt handlers Maxime Ripard
2021-01-22 13:01 ` Dave Stevenson
2021-01-11 14:23 ` [PATCH v2 10/15] drm/vc4: hdmi: Support BCM2711 CEC interrupt setup Maxime Ripard
2021-01-22 13:10 ` Dave Stevenson [this message]
2021-01-11 14:23 ` [PATCH v2 11/15] drm/vc4: hdmi: Remove cec_available flag Maxime Ripard
2021-01-11 14:23 ` [PATCH v2 12/15] drm/vc4: hdmi: Don't register the CEC adapter if there's no interrupts Maxime Ripard
2021-01-11 14:23 ` [PATCH v2 13/15] dt-binding: display: bcm2711-hdmi: Add CEC and hotplug interrupts Maxime Ripard
2021-01-22 13:28 ` Dave Stevenson
2021-02-01 18:56 ` Rob Herring
2021-02-18 14:54 ` Rob Herring
2021-01-11 14:23 ` [PATCH v2 14/15] ARM: dts: bcm2711: Add the BSC interrupt controller Maxime Ripard
2021-02-09 9:49 ` Dave Stevenson
2021-02-10 14:40 ` Maxime Ripard
2021-02-10 15:30 ` Marc Zyngier
2021-02-10 15:49 ` Dave Stevenson
2021-02-10 18:49 ` Florian Fainelli
2021-02-12 11:20 ` Nicolas Saenz Julienne
2021-02-12 11:34 ` Maxime Ripard
2021-01-11 14:23 ` [PATCH v2 15/15] ARM: dts: bcm2711: Add the CEC " Maxime Ripard
2021-01-28 14:51 ` Nicolas Saenz Julienne
2021-01-12 15:24 ` [PATCH v2 00/15] drm/vc4: hdmi: Add CEC support for the BCM2711 Hans Verkuil
2021-01-18 13:55 ` Hans Verkuil
2021-01-27 15:28 ` Hans Verkuil
2021-01-25 21:03 ` Nicolas Saenz Julienne
2021-01-28 9:48 ` 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='CAPY8ntCdxn3=A19VVsxnrPppk0O7eyzxa3bwFWQj1QEXnQ_GWA@mail.gmail.com' \
--to=dave.stevenson@raspberrypi.com \
--cc=airlied@linux.ie \
--cc=bcm-kernel-feedback-list@broadcom.com \
--cc=daniel.vetter@intel.com \
--cc=dri-devel@lists.freedesktop.org \
--cc=eric@anholt.net \
--cc=hverkuil-cisco@xs4all.nl \
--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=maxime@cerno.tech \
--cc=mchehab@kernel.org \
--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).