Received: by 2002:a05:6358:9144:b0:117:f937:c515 with SMTP id r4csp6210344rwr; Mon, 24 Apr 2023 16:00:09 -0700 (PDT) X-Google-Smtp-Source: AKy350aBdcUkRWxUBFrEYh3Plg1SInkQ8NOT3F6JgjeRfZBogR/GRVcS05OXWgxQJNPq1Y0J835I X-Received: by 2002:a05:6a21:168b:b0:ec:7cc:2da6 with SMTP id np11-20020a056a21168b00b000ec07cc2da6mr16625965pzb.56.1682377208645; Mon, 24 Apr 2023 16:00:08 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1682377208; cv=none; d=google.com; s=arc-20160816; b=QPDE1moQEJpl/2eDCnaSqcAewlhRwtt+tQFm25QpI3pgO8SvcIhk9neUVDMyXuXMNe 3XGziRMGjsUhgFfoOYp2hvgilKUxPHBA/5oUsINq22d8ZHRuVJryR1UIf/m2eh8Bk8ed loj+FiMU8A2pEJnClWRH8fWD7w5Lv3Pcl85vOLVmev3Et1hbaQdFuPS3GGRwPmQ+juO1 6+H+YrAYmA6i1wCHwYCZg3jRhnNjKuB/f54jzji6sDP34n9dubx5KcEvNk4mJIL24B/M aKJLI2eZ8Kp7qEhONmm7z1rNm+iAe8dZsQvr0rtCYdnjRJ8EtABesZ8ofgATihvOYaGb OwyQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:in-reply-to:content-disposition:mime-version :references:message-id:subject:cc:to:from:date; bh=W5iFA0nEIBtPLINxXpvzWifR3jBAFulCzYVZH0XzDu4=; b=D+7yli+bW9GCOXSBQj5IenWLn6t1JuMm3BNWCzbTp8gqEnLfuM/gLi6J5qWWRzK8au NrCtPUF53fOi++19FIGB+28s46p41tpk6ws0A7tKX3WnMJ9qgCimqCqv29p6m4i1l4v5 xtvTdedEJpyfoLYyKGlW3/AEIv1Y+dvZSHX6Ryesf2v6nDsbZN3fly2P2HcVo8HTS2GD 4GdJbQxtWhk0YraI1BuXRMSrEtWrBKb6/mr2G1xvUnTtQYRWaHE7gLyYkBMHAOmlI3uv tgT0vJeu8aaNlAtdZ5jSjHpARMf1AyPPPzf68rL4ehH2ZRl+m1vVuLxYEVcJOxIWjc44 NvSg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id bx15-20020a17090af48f00b00232f57260c1si14555471pjb.1.2023.04.24.15.59.55; Mon, 24 Apr 2023 16:00:08 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232671AbjDXWbF (ORCPT + 99 others); Mon, 24 Apr 2023 18:31:05 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47922 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231378AbjDXWaz (ORCPT ); Mon, 24 Apr 2023 18:30:55 -0400 Received: from relay07.th.seeweb.it (relay07.th.seeweb.it [5.144.164.168]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2F81AA247 for ; Mon, 24 Apr 2023 15:30:44 -0700 (PDT) Received: from SoMainline.org (94-211-6-86.cable.dynamic.v4.ziggo.nl [94.211.6.86]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-256) server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by m-r2.th.seeweb.it (Postfix) with ESMTPSA id 5E5493F28E; Tue, 25 Apr 2023 00:30:42 +0200 (CEST) Date: Tue, 25 Apr 2023 00:30:41 +0200 From: Marijn Suijten To: Abhinav Kumar Cc: Rob Clark , Dmitry Baryshkov , Sean Paul , David Airlie , Daniel Vetter , Adam Skladowski , Loic Poulain , Bjorn Andersson , Kuogee Hsieh , Robert Foss , Vinod Koul , Rajesh Yadav , Jeykumar Sankaran , Neil Armstrong , Chandan Uddaraju , Archit Taneja , Jami Kettunen , linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, Jordan Crouse , Konrad Dybcio , Martin Botka , ~postmarketos/upstreaming@lists.sr.ht, AngeloGioacchino Del Regno , freedreno@lists.freedesktop.org, Sravanthi Kollukuduru Subject: Re: [Freedreno] [PATCH v2 04/17] drm/msm/dpu: Fix PP_BLK_DIPHER -> DITHER typo Message-ID: References: <20230411-dpu-intf-te-v2-0-ef76c877eb97@somainline.org> <20230411-dpu-intf-te-v2-4-ef76c877eb97@somainline.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,RCVD_IN_DNSWL_NONE, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 2023-04-24 13:53:13, Abhinav Kumar wrote: > > > On 4/17/2023 1:21 PM, Marijn Suijten wrote: > > SM8550 only comes with a DITHER subblock inside the PINGPONG block, > > hence the name and a block length of zero. However, the PP_BLK macro > > name was typo'd to DIPHER rather than DITHER. > > > > Fixes: efcd0107727c ("drm/msm/dpu: add support for SM8550") > > Signed-off-by: Marijn Suijten > > This change itself is fine, hence > > Reviewed-by: Abhinav Kumar > > one comment below > > > --- > > drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_9_0_sm8550.h | 16 ++++++++-------- > > drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.c | 2 +- > > 2 files changed, 9 insertions(+), 9 deletions(-) > > > > diff --git a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_9_0_sm8550.h b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_9_0_sm8550.h > > index 9e403034093f..d0ab351b6a8b 100644 > > --- a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_9_0_sm8550.h > > +++ b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_9_0_sm8550.h > > @@ -132,28 +132,28 @@ static const struct dpu_dspp_cfg sm8550_dspp[] = { > > &sm8150_dspp_sblk), > > }; > > static const struct dpu_pingpong_cfg sm8550_pp[] = { > > dither block should be present on many other chipsets too but looks like > on sm8550 was enabling it. Not sure how it was validated there. But we > are enabling dither, even other chipsets have this block. Correct, they all seem to have it starting at sdm845. My patch message seems to lack the word "exclusively" as the PP on sm8550 appears to exclusively contain a DITHER subblock (unless other blocks are available that simply aren't supported within this driver yet) and no other registers. Hence this aptly named macro exist to emit just the feature bitflag for that and a .len of zero. Now, whether we should have the features contain subblock flags rather than just scanning for their id's or presence in the subblocks is a different discussion / cleanup we should have. - Marijn > > - PP_BLK_DIPHER("pingpong_0", PINGPONG_0, 0x69000, MERGE_3D_0, sc7280_pp_sblk, > > + PP_BLK_DITHER("pingpong_0", PINGPONG_0, 0x69000, MERGE_3D_0, sc7280_pp_sblk, > > DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 8), > > -1), > > - PP_BLK_DIPHER("pingpong_1", PINGPONG_1, 0x6a000, MERGE_3D_0, sc7280_pp_sblk, > > + PP_BLK_DITHER("pingpong_1", PINGPONG_1, 0x6a000, MERGE_3D_0, sc7280_pp_sblk, > > DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 9), > > -1), > > - PP_BLK_DIPHER("pingpong_2", PINGPONG_2, 0x6b000, MERGE_3D_1, sc7280_pp_sblk, > > + PP_BLK_DITHER("pingpong_2", PINGPONG_2, 0x6b000, MERGE_3D_1, sc7280_pp_sblk, > > DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 10), > > -1), > > - PP_BLK_DIPHER("pingpong_3", PINGPONG_3, 0x6c000, MERGE_3D_1, sc7280_pp_sblk, > > + PP_BLK_DITHER("pingpong_3", PINGPONG_3, 0x6c000, MERGE_3D_1, sc7280_pp_sblk, > > DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 11), > > -1), > > - PP_BLK_DIPHER("pingpong_4", PINGPONG_4, 0x6d000, MERGE_3D_2, sc7280_pp_sblk, > > + PP_BLK_DITHER("pingpong_4", PINGPONG_4, 0x6d000, MERGE_3D_2, sc7280_pp_sblk, > > DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR2, 30), > > -1), > > - PP_BLK_DIPHER("pingpong_5", PINGPONG_5, 0x6e000, MERGE_3D_2, sc7280_pp_sblk, > > + PP_BLK_DITHER("pingpong_5", PINGPONG_5, 0x6e000, MERGE_3D_2, sc7280_pp_sblk, > > DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR2, 31), > > -1), > > - PP_BLK_DIPHER("pingpong_6", PINGPONG_6, 0x66000, MERGE_3D_3, sc7280_pp_sblk, > > + PP_BLK_DITHER("pingpong_6", PINGPONG_6, 0x66000, MERGE_3D_3, sc7280_pp_sblk, > > -1, > > -1), > > - PP_BLK_DIPHER("pingpong_7", PINGPONG_7, 0x66400, MERGE_3D_3, sc7280_pp_sblk, > > + PP_BLK_DITHER("pingpong_7", PINGPONG_7, 0x66400, MERGE_3D_3, sc7280_pp_sblk, > > -1, > > -1), > > }; > > 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 03f162af1a50..ca8a02debda9 100644 > > --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.c > > +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.c > > @@ -491,7 +491,7 @@ static const struct dpu_pingpong_sub_blks sc7280_pp_sblk = { > > .len = 0x20, .version = 0x20000}, > > }; > > > > -#define PP_BLK_DIPHER(_name, _id, _base, _merge_3d, _sblk, _done, _rdptr) \ > > +#define PP_BLK_DITHER(_name, _id, _base, _merge_3d, _sblk, _done, _rdptr) \ > > {\ > > .name = _name, .id = _id, \ > > .base = _base, .len = 0, \ > >