From patchwork Fri Oct 28 12:08:05 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Robert Foss X-Patchwork-Id: 12238 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp788525wru; Fri, 28 Oct 2022 05:10:15 -0700 (PDT) X-Google-Smtp-Source: AMsMyM79N7im4/iSfTPZ1ZQ3HE9saxn71yhIGCfg8rIuZzXBgM83DnwHDS07Zkytts8tYXFcrDWm X-Received: by 2002:a05:6402:42c6:b0:462:1abc:e576 with SMTP id i6-20020a05640242c600b004621abce576mr17734245edc.223.1666959015522; Fri, 28 Oct 2022 05:10:15 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666959015; cv=none; d=google.com; s=arc-20160816; b=hP/sWilhCPutgq7bxpTjaZVKEQDLQsf1UlKlS0nEuRvSwXvs1+bu1iRNHC4hfVDQ6A qfbHrh1ZsbGAqyl+UYpkBAAZ645t1SJcDnod2UVb/0Pv/bsNVzIYcKty9H/PQeeabucx 6RSaJ5pL+WV3Byuce++d2bMAqtQqafju3KdjOc3WdgCptvFnkVsuwWuA2ta5CYCsahDh 9Y6u1qnXMzomFa2smEeGBgrRL9YWRhpdu8feixYhE6zi48JJFEsADDowRSD7I/ShrL6K z4WNo/sj/W5soRY3wClu3K21lO0ZYe0vbb62U4sghsX8uLvoI70Py+E9WGHNrM6JPeFU tvPg== 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=J/gtiEXD+8uUkkIaghTv4hrEKAMCKaLjc9YinjxqWWo=; b=F0R2k3vVB4rNrR31VENuAec2PYdAta05GfMM48uO6kuS0DTHq5T3DHnuHtPyCcCFEH AoUc/EnVsvP6yl6FknMwTfZt8AAi/W6QLx6ou+dwlFxIxCZAU1Rhu0k0PpOgFMQwV0CW 6qh6WW6hrgbM/Ie8KMOKQ80aY8IhDiYX+C1ZQQOKSxmkeXFJ+RWuo8hwywKIXpq+yOaJ Op4g14pLoWHYf8eHgx3RNPuKKcTvh1ROwfs1RU7QbDb5wMsvwBvzY2RjDfjqj/3Gc9hN IkRZ0pZiB5DeJe8l+MeNZa5nCCPnssn4UBCdk5eUhWFxztgLPK1AL84XTPCdCE3YOd6Z 1QRg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=QRdI1yDk; 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 ez15-20020a1709070bcf00b0078dbec0aa81si3479067ejc.214.2022.10.28.05.09.51; Fri, 28 Oct 2022 05:10:15 -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; dkim=pass header.i=@linaro.org header.s=google header.b=QRdI1yDk; 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 S230292AbiJ1MI3 (ORCPT + 99 others); Fri, 28 Oct 2022 08:08:29 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53776 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230233AbiJ1MIZ (ORCPT ); Fri, 28 Oct 2022 08:08:25 -0400 Received: from mail-ed1-x534.google.com (mail-ed1-x534.google.com [IPv6:2a00:1450:4864:20::534]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 01B8D1D3A7D for ; Fri, 28 Oct 2022 05:08:24 -0700 (PDT) Received: by mail-ed1-x534.google.com with SMTP id 21so7584159edv.3 for ; Fri, 28 Oct 2022 05:08:23 -0700 (PDT) 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=J/gtiEXD+8uUkkIaghTv4hrEKAMCKaLjc9YinjxqWWo=; b=QRdI1yDkxsMRbomr2xeVl1S3oGNYlV+7UkLhH0STOtOKyee85y7Ty6dnzGe1Da+lbq sfK0X4YQCtcNOm1hAwcMFaYmub6S7xhQ8nnXWbQv8eeTIFD2LrZQLAck/03ibM/D7Uff RG2H5t3snHFN0LHcC4G2YQywZz88HNuBldWSQLXmuV5hxdCXgD9RFK1nhXzGew2HPyr/ fJV2YS+uwnyM6X3xvURArmYCef9b1kuK8e5ZBzmSA2WcpoiqFmZa51fUpR72XSZ78Nho ZVME3m3JtA2Bb0gAWGl0c5I/DXTy95tkyVOrVpkoszvA2lioFdAMiPWLDoWwaBj3/YkJ 27Ng== 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=J/gtiEXD+8uUkkIaghTv4hrEKAMCKaLjc9YinjxqWWo=; b=IEACKL5MpLjr+7dQvAvSxrxWMMHZLMBZU3Pc59/BR/tB5G7cjWBjY/0H5W6SioAvlw D/VUORIrdQQ/xhiHS7k3lQ9K+0tNq1RBcXgzShxdaHSHTOyR8zdV0vosnx5aad9CF0dA q/qfCBNs7PtpPA7zge9+J7g/MDfhdm6XFBme07Im8/WJUPoFjI2zA54Xs88B/jfxkpSj i/fn6lIGYboJBYEf3evUhlsjkkcBx1dF6v0ryYWytW6sd5GozE7HIEjhi//VjnsXqHFu WRCg8Qzoe9y0tHksh0sD3JcljpTZC4pmQI2Cqqrr8jRwVP5fnb2lyUgXbCV7bkpcs76B jBZQ== X-Gm-Message-State: ACrzQf0V8N7elI0qbm0JZJ1Wg0IuWw6hTBIXsJJA6Quy1rRX4DnoR1g1 fwH9nRWjhPsw+MxsnRBTuVPjwQ== X-Received: by 2002:a05:6402:348b:b0:45c:b22b:c4a9 with SMTP id v11-20020a056402348b00b0045cb22bc4a9mr51712910edc.65.1666958902502; Fri, 28 Oct 2022 05:08:22 -0700 (PDT) Received: from prec5560.. (freifunk-gw.bsa1-cpe1.syseleven.net. [176.74.57.43]) by smtp.gmail.com with ESMTPSA id u13-20020a170906124d00b00782e3cf7277sm2067258eja.120.2022.10.28.05.08.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 28 Oct 2022 05:08:21 -0700 (PDT) From: Robert Foss To: agross@kernel.org, bjorn.andersson@linaro.org, konrad.dybcio@somainline.org, robh+dt@kernel.org, krzysztof.kozlowski+dt@linaro.org, robdclark@gmail.com, quic_abhinavk@quicinc.com, dmitry.baryshkov@linaro.org, sean@poorly.run, airlied@linux.ie, daniel@ffwll.ch, quic_kalyant@quicinc.com, swboyd@chromium.org, robert.foss@linaro.org, angelogioacchino.delregno@somainline.org, loic.poulain@linaro.org, quic_vpolimer@quicinc.com, vkoul@kernel.org, dianders@chromium.org, linux-arm-msm@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, freedreno@lists.freedesktop.org, Jonathan Marek , vinod.koul@linaro.org, quic_jesszhan@quicinc.com Subject: [PATCH v1 2/9] drm/msm/dpu: Refactor sc7280_pp location Date: Fri, 28 Oct 2022 14:08:05 +0200 Message-Id: <20221028120812.339100-3-robert.foss@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221028120812.339100-1-robert.foss@linaro.org> References: <20221028120812.339100-1-robert.foss@linaro.org> MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, SPF_HELO_NONE,SPF_PASS autolearn=unavailable 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 X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1747933217069787295?= X-GMAIL-MSGID: =?utf-8?q?1747933217069787295?= 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 0239a811d5ec..d0ce7612fee8 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.c +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.c @@ -1175,6 +1175,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), @@ -1198,13 +1205,6 @@ static const struct dpu_merge_3d_cfg sm8150_merge_3d[] = { MERGE_3D_BLK("merge_3d_2", MERGE_3D_2, 0x83200), }; -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 *************************************************************/