From patchwork Sat Feb 11 23:12:41 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Baryshkov X-Patchwork-Id: 652716 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 4445CC64ED8 for ; Sat, 11 Feb 2023 23:13:44 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229581AbjBKXNm (ORCPT ); Sat, 11 Feb 2023 18:13:42 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43106 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229496AbjBKXNl (ORCPT ); Sat, 11 Feb 2023 18:13:41 -0500 Received: from mail-ed1-x529.google.com (mail-ed1-x529.google.com [IPv6:2a00:1450:4864:20::529]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id EE70916309 for ; Sat, 11 Feb 2023 15:13:40 -0800 (PST) Received: by mail-ed1-x529.google.com with SMTP id s11so860254edd.10 for ; Sat, 11 Feb 2023 15:13:40 -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:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=qe8rVCHG/b1Lvwa2nv85/t2Q0g5G/UidRqSlfbx2gLg=; b=jQ0uVyZyuYYaQSo0S0Nxi+se8xg/Mp0cHDyx7xOH36xXTnv5fIekXoQsqvvKN4//id jHZdMZ+KS5UgZcmy/DMr+bhVAIo8GToa63ugewX20SzJ122mDlXUJ12VqyKxZhHsqAqm ishpZdwtCNVZOO11uGOpXbBZTXxiwQkHUfKkUHDTSzSkea6vpdN9YElcIAvbitO7C0ED J+1e40h6db9cn+zRONMkc6mWehjwbAef2/UmQImMLNop/r8T9YhvY+set83QdznfJkoy XTOUzAB1oKM0nIrIonyB4OP5yuf5Xil/Ms0/CYkIH5dEupJ74vg4ISSUW9wnGmCGtTA7 VQSQ== 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:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=qe8rVCHG/b1Lvwa2nv85/t2Q0g5G/UidRqSlfbx2gLg=; b=G//5PNGB9eD36VKA0rs2cvwg/xi+2rRX/NDvO3S/jAoLlX92rvOMr77igFbsqiKfXh xDeFxYc/zPWri9FdM3f4izUIYPWbz5RYsn+vbDJujoxWtg/0EwtZURFpbaSHTDLHYS0z j3DeYlmHpJpL74e3JtdnnT5D/paIDIaK1za/NRUJipzNx1Mm5Od6ZGGBWAAJzUgICbKX NZkB9DGH7HtUkSkVmyURhkbUNHtUHltUtlcHt3HbhUZovnXmm+W6AjePGFAieeatxgk+ mTXzypfmnvaLnrOYWd295mtgHBxr1tSYXc7u1Niq/XLKKTOCBSi9u4wC6J4oJwjCDkx+ VsNQ== X-Gm-Message-State: AO0yUKVZVjCU2I5yFvSEFlBz6A0LhqHMlnlF8IgKMgMnv6m7mOYX2nDl md7l/peAlL0kB3ZkgbCxw7Qibw== X-Google-Smtp-Source: AK7set/K/wj+ZcPJ2JI+tM9o5aEEQG+uPXHygDitJEWGEfr3mH8pfIrdj46Jx2Y7XxkXuj8+Nc/KBQ== X-Received: by 2002:a50:f68e:0:b0:4ac:b2cb:14d4 with SMTP id d14-20020a50f68e000000b004acb2cb14d4mr4924178edn.15.1676157219451; Sat, 11 Feb 2023 15:13:39 -0800 (PST) Received: from eriador.lan (dzccz6yyyyyyyyyyybcwt-3.rev.dnainternet.fi. [2001:14ba:a085:4d00::8a5]) by smtp.gmail.com with ESMTPSA id k20-20020a1709061c1400b00871390a3b74sm4517149ejg.177.2023.02.11.15.13.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 11 Feb 2023 15:13:39 -0800 (PST) From: Dmitry Baryshkov To: Rob Clark , Sean Paul , Abhinav Kumar Cc: Stephen Boyd , David Airlie , Daniel Vetter , Bjorn Andersson , linux-arm-msm@vger.kernel.org, dri-devel@lists.freedesktop.org, freedreno@lists.freedesktop.org Subject: [PATCH v2 32/50] drm/msm/dpu: duplicate sc7180 catalog entries Date: Sun, 12 Feb 2023 01:12:41 +0200 Message-Id: <20230211231259.1308718-33-dmitry.baryshkov@linaro.org> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230211231259.1308718-1-dmitry.baryshkov@linaro.org> References: <20230211231259.1308718-1-dmitry.baryshkov@linaro.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org Duplicate some of sc7180 catalog entries to remove dependencies between DPU major generations. Signed-off-by: Dmitry Baryshkov Reviewed-by: Konrad Dybcio --- drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_7_2_sc7280.h | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_7_2_sc7280.h b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_7_2_sc7280.h index 8977878890f1..3117bb358117 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_7_2_sc7280.h +++ b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_7_2_sc7280.h @@ -82,6 +82,11 @@ static const struct dpu_lm_cfg sc7280_lm[] = { &sc7180_lm_sblk, PINGPONG_3, LM_2, 0), }; +static const struct dpu_dspp_cfg sc7280_dspp[] = { + DSPP_BLK("dspp_0", DSPP_0, 0x54000, DSPP_SC7180_MASK, + &sc7180_dspp_sblk), +}; + 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), @@ -132,8 +137,8 @@ static const struct dpu_mdss_cfg sc7280_dpu_cfg = { .ctl = sc7280_ctl, .sspp_count = ARRAY_SIZE(sc7280_sspp), .sspp = sc7280_sspp, - .dspp_count = ARRAY_SIZE(sc7180_dspp), - .dspp = sc7180_dspp, + .dspp_count = ARRAY_SIZE(sc7280_dspp), + .dspp = sc7280_dspp, .mixer_count = ARRAY_SIZE(sc7280_lm), .mixer = sc7280_lm, .pingpong_count = ARRAY_SIZE(sc7280_pp),