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.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS 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 01C13C04FF3 for ; Mon, 24 May 2021 21:51:16 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id D60916140F for ; Mon, 24 May 2021 21:51:15 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233126AbhEXVwn (ORCPT ); Mon, 24 May 2021 17:52:43 -0400 Received: from m43-7.mailgun.net ([69.72.43.7]:30330 "EHLO m43-7.mailgun.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232662AbhEXVwn (ORCPT ); Mon, 24 May 2021 17:52:43 -0400 DKIM-Signature: a=rsa-sha256; v=1; c=relaxed/relaxed; d=mg.codeaurora.org; q=dns/txt; s=smtp; t=1621893075; h=Message-ID: References: In-Reply-To: Subject: Cc: To: From: Date: Content-Transfer-Encoding: Content-Type: MIME-Version: Sender; bh=Dx/uQI8w502btdlmPWESdw7tCerTwVAA5RfI8qHdxWc=; b=sQRTuNXwrSn45IWNSTdnV7KBuRHzIViCUzO7zr79+oQ3YuH9q8jxB35iWhvzti2YpLMdwMwQ GN5nJKqM4Xjq/uOni3E4s5VjZbm1t7Tqx/LbE8Q7quYIJc74lrcr1PYnFi83QxDX0fte5Qwo I9nRmeYRrSK15U8KCqsWDfSwlns= X-Mailgun-Sending-Ip: 69.72.43.7 X-Mailgun-Sid: WyI1MzIzYiIsICJsaW51eC1hcm0tbXNtQHZnZXIua2VybmVsLm9yZyIsICJiZTllNGEiXQ== Received: from smtp.codeaurora.org (ec2-35-166-182-171.us-west-2.compute.amazonaws.com [35.166.182.171]) by smtp-out-n02.prod.us-east-1.postgun.com with SMTP id 60ac1fc760c53c8c9d2e4ced (version=TLS1.2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256); Mon, 24 May 2021 21:51:03 GMT Sender: abhinavk=codeaurora.org@mg.codeaurora.org Received: by smtp.codeaurora.org (Postfix, from userid 1001) id 7B821C43145; Mon, 24 May 2021 21:51:02 +0000 (UTC) Received: from mail.codeaurora.org (localhost.localdomain [127.0.0.1]) (using TLSv1 with cipher ECDHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) (Authenticated sender: abhinavk) by smtp.codeaurora.org (Postfix) with ESMTPSA id 1E885C433D3; Mon, 24 May 2021 21:51:01 +0000 (UTC) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII; format=flowed Content-Transfer-Encoding: 7bit Date: Mon, 24 May 2021 14:51:01 -0700 From: abhinavk@codeaurora.org To: Dmitry Baryshkov Cc: Bjorn Andersson , Rob Clark , Sean Paul , Jonathan Marek , Stephen Boyd , linux-arm-msm@vger.kernel.org, dri-devel@lists.freedesktop.org, David Airlie , Daniel Vetter , freedreno@lists.freedesktop.org Subject: Re: [Freedreno] [PATCH v2 3/6] drm/msm/dpu: define interrupt register names In-Reply-To: <20210516202910.2141079-4-dmitry.baryshkov@linaro.org> References: <20210516202910.2141079-1-dmitry.baryshkov@linaro.org> <20210516202910.2141079-4-dmitry.baryshkov@linaro.org> Message-ID: X-Sender: abhinavk@codeaurora.org User-Agent: Roundcube Webmail/1.3.9 Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org On 2021-05-16 13:29, Dmitry Baryshkov wrote: > In order to make mdss_irqs readable (and error-prone) define names for I think you meant "less error-prone" here. > interrupt register indices. > > Signed-off-by: Dmitry Baryshkov With that nit fixed, Reviewed-by: Abhinav Kumar > --- > .../gpu/drm/msm/disp/dpu1/dpu_hw_catalog.c | 45 ++++++++++++++++--- > .../gpu/drm/msm/disp/dpu1/dpu_hw_interrupts.h | 18 ++++++++ > 2 files changed, 58 insertions(+), 5 deletions(-) > > diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.c > b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.c > index b569030a0847..9a77d64d3fd4 100644 > --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.c > +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.c > @@ -7,6 +7,7 @@ > #include > #include > #include "dpu_hw_mdss.h" > +#include "dpu_hw_interrupts.h" > #include "dpu_hw_catalog.h" > #include "dpu_kms.h" > > @@ -56,6 +57,23 @@ > > #define INTF_SC7280_MASK INTF_SC7180_MASK | BIT(DPU_DATA_HCTL_EN) > > +#define IRQ_SDM845_MASK (BIT(MDP_SSPP_TOP0_INTR) | \ > + BIT(MDP_SSPP_TOP0_INTR2) | \ > + BIT(MDP_SSPP_TOP0_HIST_INTR) | \ > + BIT(MDP_INTF0_INTR) | \ > + BIT(MDP_INTF1_INTR) | \ > + BIT(MDP_INTF2_INTR) | \ > + BIT(MDP_INTF3_INTR) | \ > + BIT(MDP_INTF4_INTR) | \ > + BIT(MDP_AD4_0_INTR) | \ > + BIT(MDP_AD4_1_INTR)) > + > +#define IRQ_SC7180_MASK (BIT(MDP_SSPP_TOP0_INTR) | \ > + BIT(MDP_SSPP_TOP0_INTR2) | \ > + BIT(MDP_SSPP_TOP0_HIST_INTR) | \ > + BIT(MDP_INTF0_INTR) | \ > + BIT(MDP_INTF1_INTR)) > + > #define INTR_SC7180_MASK \ > (BIT(DPU_IRQ_TYPE_PING_PONG_RD_PTR) |\ > BIT(DPU_IRQ_TYPE_PING_PONG_WR_PTR) |\ > @@ -63,6 +81,23 @@ > BIT(DPU_IRQ_TYPE_PING_PONG_TEAR_CHECK) |\ > BIT(DPU_IRQ_TYPE_PING_PONG_TE_CHECK)) > > +#define IRQ_SC7280_MASK (BIT(MDP_SSPP_TOP0_INTR) | \ > + BIT(MDP_SSPP_TOP0_INTR2) | \ > + BIT(MDP_SSPP_TOP0_HIST_INTR) | \ > + BIT(MDP_INTF0_7xxx_INTR) | \ > + BIT(MDP_INTF1_7xxx_INTR) | \ > + BIT(MDP_INTF5_7xxx_INTR)) > + > +#define IRQ_SM8250_MASK (BIT(MDP_SSPP_TOP0_INTR) | \ > + BIT(MDP_SSPP_TOP0_INTR2) | \ > + BIT(MDP_SSPP_TOP0_HIST_INTR) | \ > + BIT(MDP_INTF0_INTR) | \ > + BIT(MDP_INTF1_INTR) | \ > + BIT(MDP_INTF2_INTR) | \ > + BIT(MDP_INTF3_INTR) | \ > + BIT(MDP_INTF4_INTR)) > + > + > #define DEFAULT_PIXEL_RAM_SIZE (50 * 1024) > #define DEFAULT_DPU_LINE_WIDTH 2048 > #define DEFAULT_DPU_OUTPUT_LINE_WIDTH 2560 > @@ -1060,7 +1095,7 @@ static void sdm845_cfg_init(struct dpu_mdss_cfg > *dpu_cfg) > .reg_dma_count = 1, > .dma_cfg = sdm845_regdma, > .perf = sdm845_perf_data, > - .mdss_irqs = 0x3ff, > + .mdss_irqs = IRQ_SDM845_MASK, > }; > } > > @@ -1091,7 +1126,7 @@ static void sc7180_cfg_init(struct dpu_mdss_cfg > *dpu_cfg) > .reg_dma_count = 1, > .dma_cfg = sdm845_regdma, > .perf = sc7180_perf_data, > - .mdss_irqs = 0x3f, > + .mdss_irqs = IRQ_SC7180_MASK, > .obsolete_irq = INTR_SC7180_MASK, > }; > } > @@ -1125,7 +1160,7 @@ static void sm8150_cfg_init(struct dpu_mdss_cfg > *dpu_cfg) > .reg_dma_count = 1, > .dma_cfg = sm8150_regdma, > .perf = sm8150_perf_data, > - .mdss_irqs = 0x3ff, > + .mdss_irqs = IRQ_SDM845_MASK, > }; > } > > @@ -1158,7 +1193,7 @@ static void sm8250_cfg_init(struct dpu_mdss_cfg > *dpu_cfg) > .reg_dma_count = 1, > .dma_cfg = sm8250_regdma, > .perf = sm8250_perf_data, > - .mdss_irqs = 0xff, > + .mdss_irqs = IRQ_SM8250_MASK, > }; > } > > @@ -1181,7 +1216,7 @@ static void sc7280_cfg_init(struct dpu_mdss_cfg > *dpu_cfg) > .vbif_count = ARRAY_SIZE(sdm845_vbif), > .vbif = sdm845_vbif, > .perf = sc7280_perf_data, > - .mdss_irqs = 0x1c07, > + .mdss_irqs = IRQ_SC7280_MASK, > .obsolete_irq = INTR_SC7180_MASK, > }; > } > diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_interrupts.h > b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_interrupts.h > index 5bade5637ecc..b26a3445a8eb 100644 > --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_interrupts.h > +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_interrupts.h > @@ -74,6 +74,24 @@ enum dpu_intr_type { > DPU_IRQ_TYPE_RESERVED, > }; > > +/* When making changes be sure to sync with dpu_intr_set */ > +enum dpu_hw_intr_reg { > + MDP_SSPP_TOP0_INTR, > + MDP_SSPP_TOP0_INTR2, > + MDP_SSPP_TOP0_HIST_INTR, > + MDP_INTF0_INTR, > + MDP_INTF1_INTR, > + MDP_INTF2_INTR, > + MDP_INTF3_INTR, > + MDP_INTF4_INTR, > + MDP_AD4_0_INTR, > + MDP_AD4_1_INTR, > + MDP_INTF0_7xxx_INTR, > + MDP_INTF1_7xxx_INTR, > + MDP_INTF5_7xxx_INTR, > + MDP_INTR_MAX, > +}; > + > struct dpu_hw_intr; > > /**