From patchwork Tue Nov 15 13:30:56 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Robert Foss X-Patchwork-Id: 20372 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp2729389wru; Tue, 15 Nov 2022 05:32:52 -0800 (PST) X-Google-Smtp-Source: AA0mqf4+V6wtC0Kr4QsTMi3WcMPmL85SiDJDm/bSTXXXen+T6t8bzsCGZj2lIgySJD7Un/ie9KWH X-Received: by 2002:a05:6a00:139e:b0:56b:9ce2:891f with SMTP id t30-20020a056a00139e00b0056b9ce2891fmr18335064pfg.43.1668519172115; Tue, 15 Nov 2022 05:32:52 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1668519172; cv=none; d=google.com; s=arc-20160816; b=ybC0jd1G7oUXHY5cll9WvlR93AUemC2GQYbfxvMvy3e+4Ly20jWwjjXcTfyLUIgmWi rdMce9XAA/92rsY+WBpVte+IwDagRal5x76GO1Ta4CA/2rkvaqpA8pn5StXGTm98xB2s Uc1YGCA1ScT7dbllbPCNhl00+rCutaInXV/iNwaa/fgyKesmUl4/zracC18jRKUrwWHI 3v01zHs3ru7OlX1L7W+p4OwaBsI4waXNX1IjPPrIFuX+0rXMSeoepntXhzRgXSjS8gC5 rGiK7AunbbfOHbVy8c2RFZ6Ny8Vamq4p3WuNWcCCl+Rb6XqCQQihwuUs2qBXc2XEIuX3 oneg== 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=QXG7hHvghZVVv+okZsvUgCQ0s+gSPAf6atBk8Vvao4+Z+8bUqWfAVsyLkAzBxTg2qb SY93QUE95g7RmON5kMc/5yu4FDli+Gp+PbfSO6/SFxJTJue1e9fCkouRPad2u0NuG1Qs MsPo24nlGcHBTOfCZYudbm7rCRX/BmkbW2rzwes8KSVwv82XUIgPpjPDkB91lrHaZPyd tHgdoDJW7HJy5noG1YEH+LeO3hCP714mnP4+nAIoOtIMatW6/8kVWasUc5C6zhVLM1FG B2Jt/sSlrzQLryKrxaJuoaxzOU/SbYM5jh3oW2LnLr/Z5GUDnvJSUVkWCg9526OPPuYr kgtA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=U3Lu6RQx; 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 q14-20020a170902bd8e00b0018273316ce0si11323342pls.511.2022.11.15.05.32.38; Tue, 15 Nov 2022 05:32:52 -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=U3Lu6RQx; 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 S229509AbiKONb1 (ORCPT + 99 others); Tue, 15 Nov 2022 08:31:27 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60672 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230013AbiKONbT (ORCPT ); Tue, 15 Nov 2022 08:31:19 -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 67883DFC5 for ; Tue, 15 Nov 2022 05:31:17 -0800 (PST) Received: by mail-ed1-x52c.google.com with SMTP id s12so21838772edd.5 for ; Tue, 15 Nov 2022 05:31:17 -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=U3Lu6RQx8ai/jJm4ibT2pDLvRLRyr0a0Pi5ndEpjjtGQR24t0cShQmbGk0IeNjW14W 6QlkSm8oNE4aqWl7pmxflwBCtCPZu2wA5WUDYdkfZ9nlb+Tc3CoMAzpjVVd1A8wJOVKc 9esdf52FG/qsDUiNb2tFGU46BsKQWjqntwIKwqd4KASMXAfu23WF8iDqnGFizdG41WQM XC8tnackopXr90tiUkOUOgYhLYgd3qbSYgIcIxJbqwmXy4Jbz4HBQ8XZN9wRcqSKUcgQ g3mhkn4o5Gk22t82pKKIHu40sz6Xs1m76WiF2sNdT4hqyBlTIW30yleMYBNb1wxlYsHx Jd7w== 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=DzJr8UZ7yqeZuzl3xmlbNkgY/n8DXAIrroFdXh3c3F7saZMU4aWTAJ84fG/ylET7ll ZF769+P7Sdekm1y8Y4sAldYDmOY+ZQdCY92rnq0vtJlRyDouV6dNmJ1hKVlKxZaUi69c 6I8y+ALHfMjLXweNwiv89dju4O0sZZQgTZHJtjt6lIt9qeaDN1t0MtAJfcHRI/ULN6lx zIPPwpFQY2dIBdTydn+KDA60+v79kD+jOX+yxBzD+l604+87QzURcuRFT9PjLMzQKhLu 5pboIC44sX7X2mwm4zeymymL3NdQ8ldP1e+tkwwRVkBjs5HTohjOU26GpVsCRi442yEy HWxQ== X-Gm-Message-State: ANoB5pkYfaQHi0+9PbMI+HKEFFeqG3KAGnGyBVNGJQ/6mAnxHjnVvLhE XKHHacBNSBvM4yiDC2BTukfEBA== X-Received: by 2002:aa7:c90b:0:b0:467:4b3d:f2ed with SMTP id b11-20020aa7c90b000000b004674b3df2edmr15219917edt.101.1668519076868; Tue, 15 Nov 2022 05:31:16 -0800 (PST) Received: from prec5560.. (freifunk-gw.bsa1-cpe1.syseleven.net. [176.74.57.43]) by smtp.gmail.com with ESMTPSA id q22-20020aa7d456000000b004618f2127d2sm6162176edr.57.2022.11.15.05.31.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 15 Nov 2022 05:31:16 -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, quic_khsieh@quicinc.com, quic_vpolimer@quicinc.com, vkoul@kernel.org, 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 14:30:56 +0100 Message-Id: <20221115133105.980877-4-robert.foss@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221115133105.980877-1-robert.foss@linaro.org> References: <20221115133105.980877-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?1749569159823394874?= X-GMAIL-MSGID: =?utf-8?q?1749569159823394874?= 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 Reviewed-by: Abhinav Kumar --- 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 *************************************************************/