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,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 6785AC4338F for ; Wed, 18 Aug 2021 03:31:05 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 44C2361056 for ; Wed, 18 Aug 2021 03:31:05 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234435AbhHRDbi (ORCPT ); Tue, 17 Aug 2021 23:31:38 -0400 Received: from m43-7.mailgun.net ([69.72.43.7]:14474 "EHLO m43-7.mailgun.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233901AbhHRDbh (ORCPT ); Tue, 17 Aug 2021 23:31:37 -0400 DKIM-Signature: a=rsa-sha256; v=1; c=relaxed/relaxed; d=mg.codeaurora.org; q=dns/txt; s=smtp; t=1629257464; h=Message-ID: References: In-Reply-To: Subject: Cc: To: From: Date: Content-Transfer-Encoding: Content-Type: MIME-Version: Sender; bh=jT9vAJrXeAs90INAmemWptbPAP4ag0i3i9/El8V0x0w=; b=LoJsrL+G37zZJb7Qe/U2VPLsoM457ybz40xAhzKejn+T6MrxSQtqgBgWM0ve+n4iFaoNJpmx 2URU9U5R5rn6kbsJligm47Id0rAS8pO1dUkHa9uOuGcooX49JznAGoy690jeAr961t20EAh4 NdZgiEe1U6DXMx0zFBk9Fdzm0uE= 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-n01.prod.us-west-2.postgun.com with SMTP id 611c7eec454b7a558f5bab8e (version=TLS1.2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256); Wed, 18 Aug 2021 03:30:52 GMT Sender: abhinavk=codeaurora.org@mg.codeaurora.org Received: by smtp.codeaurora.org (Postfix, from userid 1001) id 474BDC4361A; Wed, 18 Aug 2021 03:30:52 +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 0D815C4338F; Wed, 18 Aug 2021 03:30:51 +0000 (UTC) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII; format=flowed Content-Transfer-Encoding: 7bit Date: Tue, 17 Aug 2021 20:30:51 -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 5/7] drm/msm/dpu: remove extra wrappers around dpu_core_irq In-Reply-To: <20210617222029.463045-6-dmitry.baryshkov@linaro.org> References: <20210617222029.463045-1-dmitry.baryshkov@linaro.org> <20210617222029.463045-6-dmitry.baryshkov@linaro.org> Message-ID: <683503488b598a2023456f081b1d77df@codeaurora.org> 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-06-17 15:20, Dmitry Baryshkov wrote: > Remove extra dpu_irq_* wrappers from dpu_kms.c, merge them directly > into > dpu_core_irq_* functions. > > Signed-off-by: Dmitry Baryshkov Reviewed-by: Abhinav Kumar > --- > drivers/gpu/drm/msm/disp/dpu1/dpu_core_irq.h | 12 ++++----- > .../gpu/drm/msm/disp/dpu1/dpu_hw_interrupts.c | 9 ++++--- > drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c | 27 +++---------------- > 3 files changed, 15 insertions(+), 33 deletions(-) > > diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_core_irq.h > b/drivers/gpu/drm/msm/disp/dpu1/dpu_core_irq.h > index 44ab97fb2964..afc8cd546368 100644 > --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_core_irq.h > +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_core_irq.h > @@ -10,24 +10,24 @@ > > /** > * dpu_core_irq_preinstall - perform pre-installation of core IRQ > handler > - * @dpu_kms: DPU handle > + * @kms: MSM KMS handle > * @return: none > */ > -void dpu_core_irq_preinstall(struct dpu_kms *dpu_kms); > +void dpu_core_irq_preinstall(struct msm_kms *kms); > > /** > * dpu_core_irq_uninstall - uninstall core IRQ handler > - * @dpu_kms: DPU handle > + * @kms: MSM KMS handle > * @return: none > */ > -void dpu_core_irq_uninstall(struct dpu_kms *dpu_kms); > +void dpu_core_irq_uninstall(struct msm_kms *kms); > > /** > * dpu_core_irq - core IRQ handler > - * @dpu_kms: DPU handle > + * @kms: MSM KMS handle > * @return: interrupt handling status > */ > -irqreturn_t dpu_core_irq(struct dpu_kms *dpu_kms); > +irqreturn_t dpu_core_irq(struct msm_kms *kms); > > /** > * dpu_core_irq_read - IRQ helper function for reading IRQ status > diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_interrupts.c > b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_interrupts.c > index 7062e7f0e860..9b74cfdf5355 100644 > --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_interrupts.c > +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_interrupts.c > @@ -140,8 +140,9 @@ static void dpu_core_irq_callback_handler(struct > dpu_kms *dpu_kms, int irq_idx) > > dpu_kms->hw_intr->irq_tbl[irq_idx].cb(dpu_kms->hw_intr->irq_tbl[irq_idx].arg, > irq_idx); > } > > -irqreturn_t dpu_core_irq(struct dpu_kms *dpu_kms) > +irqreturn_t dpu_core_irq(struct msm_kms *kms) > { > + struct dpu_kms *dpu_kms = to_dpu_kms(kms); > struct dpu_hw_intr *intr = dpu_kms->hw_intr; > int reg_idx; > int irq_idx; > @@ -526,8 +527,9 @@ void dpu_debugfs_core_irq_init(struct dpu_kms > *dpu_kms, > } > #endif > > -void dpu_core_irq_preinstall(struct dpu_kms *dpu_kms) > +void dpu_core_irq_preinstall(struct msm_kms *kms) > { > + struct dpu_kms *dpu_kms = to_dpu_kms(kms); > int i; > > pm_runtime_get_sync(&dpu_kms->pdev->dev); > @@ -539,8 +541,9 @@ void dpu_core_irq_preinstall(struct dpu_kms > *dpu_kms) > atomic_set(&dpu_kms->hw_intr->irq_tbl[i].count, 0); > } > > -void dpu_core_irq_uninstall(struct dpu_kms *dpu_kms) > +void dpu_core_irq_uninstall(struct msm_kms *kms) > { > + struct dpu_kms *dpu_kms = to_dpu_kms(kms); > int i; > > pm_runtime_get_sync(&dpu_kms->pdev->dev); > diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c > b/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c > index 1d3a4f395e74..c1706205a514 100644 > --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c > +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c > @@ -761,20 +761,6 @@ static void _dpu_kms_set_encoder_mode(struct > msm_kms *kms, > encoder->base.id, rc); > } > > -static irqreturn_t dpu_irq(struct msm_kms *kms) > -{ > - struct dpu_kms *dpu_kms = to_dpu_kms(kms); > - > - return dpu_core_irq(dpu_kms); > -} > - > -static void dpu_irq_preinstall(struct msm_kms *kms) > -{ > - struct dpu_kms *dpu_kms = to_dpu_kms(kms); > - > - dpu_core_irq_preinstall(dpu_kms); > -} > - > static int dpu_irq_postinstall(struct msm_kms *kms) > { > struct msm_drm_private *priv; > @@ -792,13 +778,6 @@ static int dpu_irq_postinstall(struct msm_kms > *kms) > return 0; > } > > -static void dpu_irq_uninstall(struct msm_kms *kms) > -{ > - struct dpu_kms *dpu_kms = to_dpu_kms(kms); > - > - dpu_core_irq_uninstall(dpu_kms); > -} > - > static void dpu_kms_mdp_snapshot(struct msm_disp_state *disp_state, > struct msm_kms *kms) > { > int i; > @@ -846,10 +825,10 @@ static void dpu_kms_mdp_snapshot(struct > msm_disp_state *disp_state, struct msm_k > > static const struct msm_kms_funcs kms_funcs = { > .hw_init = dpu_kms_hw_init, > - .irq_preinstall = dpu_irq_preinstall, > + .irq_preinstall = dpu_core_irq_preinstall, > .irq_postinstall = dpu_irq_postinstall, > - .irq_uninstall = dpu_irq_uninstall, > - .irq = dpu_irq, > + .irq_uninstall = dpu_core_irq_uninstall, > + .irq = dpu_core_irq, > .enable_commit = dpu_kms_enable_commit, > .disable_commit = dpu_kms_disable_commit, > .vsync_time = dpu_kms_vsync_time,