From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 386A1C433DB for ; Fri, 22 Jan 2021 13:12:09 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id DCB3E23437 for ; Fri, 22 Jan 2021 13:12:08 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727309AbhAVNME (ORCPT ); Fri, 22 Jan 2021 08:12:04 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35314 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727517AbhAVNLp (ORCPT ); Fri, 22 Jan 2021 08:11:45 -0500 Received: from mail-wr1-x431.google.com (mail-wr1-x431.google.com [IPv6:2a00:1450:4864:20::431]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 88977C0613D6 for ; Fri, 22 Jan 2021 05:11:05 -0800 (PST) Received: by mail-wr1-x431.google.com with SMTP id d16so4357556wro.11 for ; Fri, 22 Jan 2021 05:11:05 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=raspberrypi.com; s=google; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=DlbQDTL9lgcBTkGtGPLxxHcpZqtYZlnjZgESPzNd3dk=; b=cvMBoOPbyHYvHuRZJUbkoYI6wQr+uFNzsP8Byd3bREwnZWQckWn9O3O9z4rbqAAxCG DG3FeAiintfRZo3klDvSndwOAEafZQxbQ6F7WTtmJLwIjp23HpS2osdES8yLkzS7vjV6 UFHfZEM1Tl/ujKCCd90L4Fvd8mcPz+6eD9YuVeQeeyy5kKVDD5s9ci+fdJWlKEnj3xZT +DIpvikohimdbEO+qam8p2fIhaYzFI74vUqDLd6LPr+MTmSUopRwDXWhCG9LGLIXMe0h c87V5IsAQiLZ3HVsOMhJD/IRXutd5+uq5eEb87yD52RiAU+XGsa7yCtbSSCADFUNHOg2 7HuQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=DlbQDTL9lgcBTkGtGPLxxHcpZqtYZlnjZgESPzNd3dk=; b=hvdAmWcZXFV8D8HsBOo7sNdon/24hxAVf634vxem5yG5jdq/mSBMyEPONoR0UViI0T 7S+ADUbsngaH2kWquvtX2ixd8llrkHTIj48LHKo+LURTbc4qhCcockSD4v+XnVC1DTgx uRI1/viiLkOlMbjRe8wNedXJ2j8HOxxGqTonIo6m2tf5C+pylvubqrMWaAtHZkEJY0II 3tbirjoUwtM6yxZVB1TcDXrJ5HAW09MWm2AT+BcDZJiQm3VOviMdXTZzUG/Y5Nads+jH KaR2ru1HJHSgImJYLzHBPoKJiC3BbMtDhW2x6uvYLzZwdbAPndaVR87UgmNYLNzGDYs2 zrUA== X-Gm-Message-State: AOAM531C5DiYlbOm4BS+eeR9GZmLfiXglhcJ0SOVnlfGi6V+8JXycoth AY2QuSe0iuJeTeHYASiSZUv3zWv8MfA77aMXJIOZWQ== X-Google-Smtp-Source: ABdhPJzM9x7gbuptc/+Kd7a/slbXsAMEIvUb+yNdZCSX3L+dSiV9l/Kk/Q81u61D3jOMDh403qjkCGqTrzJC12ovbLY= X-Received: by 2002:a05:6000:1082:: with SMTP id y2mr4331942wrw.27.1611321064346; Fri, 22 Jan 2021 05:11:04 -0800 (PST) MIME-Version: 1.0 References: <20210111142309.193441-1-maxime@cerno.tech> <20210111142309.193441-11-maxime@cerno.tech> In-Reply-To: <20210111142309.193441-11-maxime@cerno.tech> From: Dave Stevenson Date: Fri, 22 Jan 2021 13:10:49 +0000 Message-ID: Subject: Re: [PATCH v2 10/15] drm/vc4: hdmi: Support BCM2711 CEC interrupt setup To: Maxime Ripard Cc: Eric Anholt , Maarten Lankhorst , Thomas Zimmermann , Daniel Vetter , David Airlie , linux-rpi-kernel@lists.infradead.org, linux-arm-kernel@lists.infradead.org, Hans Verkuil , LKML , DRI Development , bcm-kernel-feedback-list@broadcom.com, Mauro Carvalho Chehab , Linux Media Mailing List Content-Type: text/plain; charset="UTF-8" Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi Maxime On Mon, 11 Jan 2021 at 14:23, Maxime Ripard 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 Looks good Reviewed-by: Dave Stevenson > --- > 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 > From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-13.9 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id DC375C433DB for ; Fri, 22 Jan 2021 13:12:34 +0000 (UTC) Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 8F0D023106 for ; Fri, 22 Jan 2021 13:12:34 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 8F0D023106 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=raspberrypi.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:To:Subject:Message-ID:Date:From:In-Reply-To: References:MIME-Version:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=YuwmuSkhzSnP0+GXZm8wL5T8aX9C1DQfNj1sZAToUwc=; b=eoH/1aZQz5h4+akD6eEUg3HPN Dj/5l6LZOu0MXX6L4VhiJT0smWvhVKAEYTaXaYi5z7R8RpiVqHnoZNJdGOctxJ5FnBhtMCuK5+Pap hoYWBUHk7Z9rqnEIog+0g4zb25Lb8x+hEM3r06Cwu5YTbXCmeH7h7+lRzNCLJBjGqYJM9ngyEWZ79 vHqY6vc1U3Da575+nmD3K75sQWv5lyfaGRPtL61YFs1OlHR9T1h0ot+1LnE6dWBSbUgdlWcdquTlm juIoFiwjow2DAqDtwADQrmWDS2vRz7qABprvLtbCFYXrJNEFrp0816WoGOC7IHMtLMudnZXjaauhw ZU4i1M34g==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1l2wDU-0001jr-CP; Fri, 22 Jan 2021 13:11:08 +0000 Received: from mail-wr1-x429.google.com ([2a00:1450:4864:20::429]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1l2wDR-0001ij-HW for linux-arm-kernel@lists.infradead.org; Fri, 22 Jan 2021 13:11:06 +0000 Received: by mail-wr1-x429.google.com with SMTP id a9so5029560wrt.5 for ; Fri, 22 Jan 2021 05:11:05 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=raspberrypi.com; s=google; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=DlbQDTL9lgcBTkGtGPLxxHcpZqtYZlnjZgESPzNd3dk=; b=cvMBoOPbyHYvHuRZJUbkoYI6wQr+uFNzsP8Byd3bREwnZWQckWn9O3O9z4rbqAAxCG DG3FeAiintfRZo3klDvSndwOAEafZQxbQ6F7WTtmJLwIjp23HpS2osdES8yLkzS7vjV6 UFHfZEM1Tl/ujKCCd90L4Fvd8mcPz+6eD9YuVeQeeyy5kKVDD5s9ci+fdJWlKEnj3xZT +DIpvikohimdbEO+qam8p2fIhaYzFI74vUqDLd6LPr+MTmSUopRwDXWhCG9LGLIXMe0h c87V5IsAQiLZ3HVsOMhJD/IRXutd5+uq5eEb87yD52RiAU+XGsa7yCtbSSCADFUNHOg2 7HuQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=DlbQDTL9lgcBTkGtGPLxxHcpZqtYZlnjZgESPzNd3dk=; b=aFcmS3ovVKuR8G8ogsIbet9C/q2LpNHeNC9y60f2rKgi+l4NRRwwNmPXPaCVxHhGVv K1WgtyLIaYm8zjbTUNumiNO1r8Kb1EElaArn9gX8fVMyx/L6xIf+nra2d3QLLszOw0eS 6sAo4q6Z9Us24c8wjenEIWQK/o5zYgkNj+XW+6FCzIBM5SyKwKqjtbnBryCmTdYTAa2S qmYeECHDq/8wmBV4gHr6ex8IQScPW0Lg4LTNjkVmPsQGs3lQcuZZHhB6nV6a3BK0VAeb R7rp6qsx3AKhYzOE0e26v9U8TdnUGepIHHCP5VmS8cI/8P8yWe/iQvZsreiw4guICiX4 ueAA== X-Gm-Message-State: AOAM533PyYiFMi+al4U2uLeHcHHbFCy8h+e+YzsqZrm9G9jK5RKB1yIL VJ0m2sS4EUcc82PD8xRRSmmBOtUn9plQs3HoAunbWw== X-Google-Smtp-Source: ABdhPJzM9x7gbuptc/+Kd7a/slbXsAMEIvUb+yNdZCSX3L+dSiV9l/Kk/Q81u61D3jOMDh403qjkCGqTrzJC12ovbLY= X-Received: by 2002:a05:6000:1082:: with SMTP id y2mr4331942wrw.27.1611321064346; Fri, 22 Jan 2021 05:11:04 -0800 (PST) MIME-Version: 1.0 References: <20210111142309.193441-1-maxime@cerno.tech> <20210111142309.193441-11-maxime@cerno.tech> In-Reply-To: <20210111142309.193441-11-maxime@cerno.tech> From: Dave Stevenson Date: Fri, 22 Jan 2021 13:10:49 +0000 Message-ID: Subject: Re: [PATCH v2 10/15] drm/vc4: hdmi: Support BCM2711 CEC interrupt setup To: Maxime Ripard X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210122_081105_707640_8BA4EA86 X-CRM114-Status: GOOD ( 24.12 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: David Airlie , Maarten Lankhorst , LKML , DRI Development , Eric Anholt , bcm-kernel-feedback-list@broadcom.com, linux-rpi-kernel@lists.infradead.org, Thomas Zimmermann , Hans Verkuil , Daniel Vetter , Mauro Carvalho Chehab , linux-arm-kernel@lists.infradead.org, Linux Media Mailing List Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Hi Maxime On Mon, 11 Jan 2021 at 14:23, Maxime Ripard 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 Looks good Reviewed-by: Dave Stevenson > --- > 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 From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-13.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id E8027C433DB for ; Fri, 22 Jan 2021 13:11:06 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 8887623106 for ; Fri, 22 Jan 2021 13:11:06 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 8887623106 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=raspberrypi.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=dri-devel-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id DBF836E0B9; Fri, 22 Jan 2021 13:11:05 +0000 (UTC) Received: from mail-wr1-x42b.google.com (mail-wr1-x42b.google.com [IPv6:2a00:1450:4864:20::42b]) by gabe.freedesktop.org (Postfix) with ESMTPS id 9E20C6E0B9 for ; Fri, 22 Jan 2021 13:11:05 +0000 (UTC) Received: by mail-wr1-x42b.google.com with SMTP id q7so5012257wre.13 for ; Fri, 22 Jan 2021 05:11:05 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=raspberrypi.com; s=google; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=DlbQDTL9lgcBTkGtGPLxxHcpZqtYZlnjZgESPzNd3dk=; b=cvMBoOPbyHYvHuRZJUbkoYI6wQr+uFNzsP8Byd3bREwnZWQckWn9O3O9z4rbqAAxCG DG3FeAiintfRZo3klDvSndwOAEafZQxbQ6F7WTtmJLwIjp23HpS2osdES8yLkzS7vjV6 UFHfZEM1Tl/ujKCCd90L4Fvd8mcPz+6eD9YuVeQeeyy5kKVDD5s9ci+fdJWlKEnj3xZT +DIpvikohimdbEO+qam8p2fIhaYzFI74vUqDLd6LPr+MTmSUopRwDXWhCG9LGLIXMe0h c87V5IsAQiLZ3HVsOMhJD/IRXutd5+uq5eEb87yD52RiAU+XGsa7yCtbSSCADFUNHOg2 7HuQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=DlbQDTL9lgcBTkGtGPLxxHcpZqtYZlnjZgESPzNd3dk=; b=MaC80YaV2CL8JcggFflwYj7zlQCrkYx/ZccVDVn0d49gQt6bny5/wnZAWLrVeJu6jm w3aYJzBzsnfZx0qgpfNyr+11BV1j5L2mIDvddOgB0dG2LcE7JW13wzd0Jtb3SigqNS8H 0N82oRoF7qtAyDSS8Jt2RTKul4VzQIe3cyMCFZDMwkwK+O9u1pz8WDiJShp6VZSDadse AI54D7CuScPJRCJmQYLZ7+e75QVs8VeFNic+CLE1f76yI/7K/WO/hNe8egJZGnzMQCCH 50cO52ufJXb+DtOWRHsOUN1/fMdpHfnVQpHEzjhLVSxKbf7YyHH6sRq0lc3g00/+abZE RPlA== X-Gm-Message-State: AOAM532Z2v4sUXz2eEUFtUX08nL/KZcMeYXy6TZYTtdwZTFlgz/0xGzj 00SR9PoiVoFwEn/RQyqYn3CUS+A7fs5x90hpFhifHw== X-Google-Smtp-Source: ABdhPJzM9x7gbuptc/+Kd7a/slbXsAMEIvUb+yNdZCSX3L+dSiV9l/Kk/Q81u61D3jOMDh403qjkCGqTrzJC12ovbLY= X-Received: by 2002:a05:6000:1082:: with SMTP id y2mr4331942wrw.27.1611321064346; Fri, 22 Jan 2021 05:11:04 -0800 (PST) MIME-Version: 1.0 References: <20210111142309.193441-1-maxime@cerno.tech> <20210111142309.193441-11-maxime@cerno.tech> In-Reply-To: <20210111142309.193441-11-maxime@cerno.tech> From: Dave Stevenson Date: Fri, 22 Jan 2021 13:10:49 +0000 Message-ID: Subject: Re: [PATCH v2 10/15] drm/vc4: hdmi: Support BCM2711 CEC interrupt setup To: Maxime Ripard X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: David Airlie , LKML , DRI Development , bcm-kernel-feedback-list@broadcom.com, linux-rpi-kernel@lists.infradead.org, Thomas Zimmermann , Hans Verkuil , Daniel Vetter , Mauro Carvalho Chehab , linux-arm-kernel@lists.infradead.org, Linux Media Mailing List Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" Hi Maxime On Mon, 11 Jan 2021 at 14:23, Maxime Ripard 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 Looks good Reviewed-by: Dave Stevenson > --- > 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 > _______________________________________________ dri-devel mailing list dri-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dri-devel