From patchwork Tue Nov 15 11:17:12 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Robert Foss X-Patchwork-Id: 20322 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp2657183wru; Tue, 15 Nov 2022 03:21:52 -0800 (PST) X-Google-Smtp-Source: AA0mqf4ktwPjl222QCJf5BkB+szWKBSduotVe0tB7UUTh2fqf21+u+1N1TYe0ggWOXlSVN2SorhA X-Received: by 2002:aa7:d785:0:b0:462:2e27:3bf2 with SMTP id s5-20020aa7d785000000b004622e273bf2mr14697761edq.13.1668511312018; Tue, 15 Nov 2022 03:21:52 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1668511312; cv=none; d=google.com; s=arc-20160816; b=HZ/s8RAQLir2J/GATTa9LQ+0lxJJJEjDbRB5ZeJRmKHAiDiKuPwcob1kM4h8i5L2Aa VHNwTnYazufujHu0EcehEZgn6AkEnUsnQ7w167CnE7TrLg/fExuQw68HP/tytr1OFM4V R1QH3J4TLiBUTWNA02QCmB022WV1CPGhDo8SByoofDE5wRffAApMWSTVMt3fTXsBXBWv C87B2oQJlZCeOYiDQZZyTfvaIJX+3+Kg20OvFVxEUTlACP5W0IYy7tMcwLbRxbty7230 MxMzpZ72/S2NaNMYTOYN65GRuKnw3jsEC1aXlLllcn9n4JeeqNqGl/kkhiavXsPhO4GQ 3LIw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=hrGveRHtb758Cq8dNpj5YeNPoOq0dxmeWZsx/PFkuqU=; b=WaUeFtFgxO41s42FhX/2+ynFM+k8RKnPlaQaEDCfPCvEBKW0NyGODui9myl3JpxC9u yXNfRQWMULAl3UjDdYjRWqFr4hT8T/EJvO32TLzAmkLHJFc8y3dpSueszo94rR7Pt3gE Ye/NawH1vPpEuoDA0wuwgpOuUR0yTEcXYsuqTyKsO3LDE+dlKrupPf2iiRVi1hHTibxo JpQUpIH0LaeudBsjLsTBLXDGDUSSwbbwONPyYOxlVZLLUn4DCr5HSBZ9TJxKcUZfpFmx PNDOE2V7foax52uufL/4EwIvJdMvDZpopmckKi/cYfFQ2TVXrx+VZ4YItwFRU72jjuyV ALag== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=wPIr2QyM; 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; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id a16-20020aa7cf10000000b00457e6752422si9166419edy.189.2022.11.15.03.21.28; Tue, 15 Nov 2022 03:21:51 -0800 (PST) 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; dkim=pass header.i=@linaro.org header.s=google header.b=wPIr2QyM; 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; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230125AbiKOLTE (ORCPT + 99 others); Tue, 15 Nov 2022 06:19:04 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55366 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S238036AbiKOLSP (ORCPT ); Tue, 15 Nov 2022 06:18:15 -0500 Received: from mail-ed1-x52c.google.com (mail-ed1-x52c.google.com [IPv6:2a00:1450:4864:20::52c]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 69C2D286C4 for ; Tue, 15 Nov 2022 03:17:47 -0800 (PST) Received: by mail-ed1-x52c.google.com with SMTP id v17so21375646edc.8 for ; Tue, 15 Nov 2022 03:17:47 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=hrGveRHtb758Cq8dNpj5YeNPoOq0dxmeWZsx/PFkuqU=; b=wPIr2QyM4TXPHxrBhk86NI7MLxmXhxV5fy1U8mplxl2k9kUPlNoatw8IkmpXjiF37n Azcs0Z6Du0JONg81MSZ3MVxtXek5uDq5mX0MpGDVPt+WdGu3smpVIoxp5xzRFKQ9gFWP bzAoMXm+B3dOgDTFeltMu/dStKrvH2014zbEDSlIoXeQgKk6jHJixKSCBLvX9HLsTMko B3MKnL5ZbtyOXiwzNHvoGGDH2Z8qq/gpcuQqXz6b/UJEp/eCsZMzpTynJa06FsiLK6J2 vELCmCPNkM5icGYA3Uoq8uXyJCDwM2cC1ZlPIP+GTxu2BnPWr5qwmuiQJluN9EDkU0tO d1Rg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=hrGveRHtb758Cq8dNpj5YeNPoOq0dxmeWZsx/PFkuqU=; b=pc/vPAfO0I1LiFtwGZhUYVWOFybkhwuDjG8Q5h8Q+hZun/qJ/QPOzKNzAMuZQ6Tazt etMtpXF/DZR0O2Z4i0Vd2kqMcUvEAmKk8xxVamQffjhfFDnZwYJLHLyfuuwc0YYp6yLB uS0ZBi8PMt1FSr8DlQbR9EnQoyD8MkKe6uO610F2JVy3EgPjs2qla8WallNH1YYs1c2H HesfO887anFhK3f+hRCpPGEe5vEGvbxPkWyjGpxFY0Dc2zzikADuj6BWfQAmdbR/BTSw R4q/SgdNh2Og0pcGmTDhbv02NzDBLPAC3/GJnuFZsaFFf59e1s8yE33iESNYPYOH3hgD zh2g== X-Gm-Message-State: ANoB5plkPufcrgaMyJgugDpWmjwg4sK136DdcblZeYoUskzK/oWu5drL x5iXdGDAMWIxRFcBgGIjQmRuHA== X-Received: by 2002:a05:6402:1141:b0:467:3ea2:3ec4 with SMTP id g1-20020a056402114100b004673ea23ec4mr14673116edw.351.1668511065973; Tue, 15 Nov 2022 03:17:45 -0800 (PST) Received: from prec5560.. (freifunk-gw.bsa1-cpe1.syseleven.net. [176.74.57.43]) by smtp.gmail.com with ESMTPSA id eg25-20020a056402289900b00457b5ba968csm5973519edb.27.2022.11.15.03.17.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 15 Nov 2022 03:17:45 -0800 (PST) From: Robert Foss To: robdclark@gmail.com, quic_abhinavk@quicinc.com, dmitry.baryshkov@linaro.org, sean@poorly.run, airlied@linux.ie, daniel@ffwll.ch, robh+dt@kernel.org, krzysztof.kozlowski+dt@linaro.org, agross@kernel.org, bjorn.andersson@linaro.org, konrad.dybcio@somainline.org, quic_kalyant@quicinc.com, swboyd@chromium.org, robert.foss@linaro.org, angelogioacchino.delregno@somainline.org, loic.poulain@linaro.org, vkoul@kernel.org, quic_vpolimer@quicinc.com, dianders@chromium.org, linux-arm-msm@vger.kernel.org, dri-devel@lists.freedesktop.org, freedreno@lists.freedesktop.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Jonathan Marek , vinod.koul@linaro.org, quic_jesszhan@quicinc.com, andersson@kernel.org Subject: [PATCH v2 03/12] drm/msm/dpu: Refactor sc7280_pp location Date: Tue, 15 Nov 2022 12:17:12 +0100 Message-Id: <20221115111721.891404-4-robert.foss@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221115111721.891404-1-robert.foss@linaro.org> References: <20221115111721.891404-1-robert.foss@linaro.org> MIME-Version: 1.0 X-Spam-Status: No, score=1.2 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, RCVD_IN_SBL_CSS,SPF_HELO_NONE,SPF_PASS autolearn=no autolearn_force=no version=3.4.6 X-Spam-Level: * 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 X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1749560917433389038?= X-GMAIL-MSGID: =?utf-8?q?1749560917433389038?= The sc7280_pp declaration is not located by the other _pp declarations, but rather hidden around the _merge_3d declarations. Let's fix this to avoid confusion. Signed-off-by: Robert Foss Reviewed-by: Dmitry Baryshkov --- drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 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 4dac90ee5b8a..8f2d634f7b6b 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.c +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.c @@ -1294,6 +1294,13 @@ static const struct dpu_pingpong_cfg sm8150_pp[] = { -1), }; +static const struct dpu_pingpong_cfg sc7280_pp[] = { + PP_BLK("pingpong_0", PINGPONG_0, 0x59000, 0, sc7280_pp_sblk, -1, -1), + PP_BLK("pingpong_1", PINGPONG_1, 0x6a000, 0, sc7280_pp_sblk, -1, -1), + PP_BLK("pingpong_2", PINGPONG_2, 0x6b000, 0, sc7280_pp_sblk, -1, -1), + PP_BLK("pingpong_3", PINGPONG_3, 0x6c000, 0, sc7280_pp_sblk, -1, -1), +}; + static struct dpu_pingpong_cfg qcm2290_pp[] = { PP_BLK("pingpong_0", PINGPONG_0, 0x70000, 0, sdm845_pp_sblk, DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 8), @@ -1352,13 +1359,6 @@ static const struct dpu_merge_3d_cfg sm8450_merge_3d[] = { MERGE_3D_BLK("merge_3d_3", MERGE_3D_3, 0x65f00), }; -static const struct dpu_pingpong_cfg sc7280_pp[] = { - PP_BLK("pingpong_0", PINGPONG_0, 0x59000, 0, sc7280_pp_sblk, -1, -1), - PP_BLK("pingpong_1", PINGPONG_1, 0x6a000, 0, sc7280_pp_sblk, -1, -1), - PP_BLK("pingpong_2", PINGPONG_2, 0x6b000, 0, sc7280_pp_sblk, -1, -1), - PP_BLK("pingpong_3", PINGPONG_3, 0x6c000, 0, sc7280_pp_sblk, -1, -1), -}; - /************************************************************* * DSC sub blocks config *************************************************************/