From patchwork Fri Dec 20 01:28:29 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Baryshkov X-Patchwork-Id: 13915970 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 gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 93D76E77184 for ; Fri, 20 Dec 2024 01:28:40 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 1438610EE27; Fri, 20 Dec 2024 01:28:40 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.b="JtMeDirY"; dkim-atps=neutral Received: from mail-lf1-x12c.google.com (mail-lf1-x12c.google.com [IPv6:2a00:1450:4864:20::12c]) by gabe.freedesktop.org (Postfix) with ESMTPS id BB6C110EE22 for ; Fri, 20 Dec 2024 01:28:36 +0000 (UTC) Received: by mail-lf1-x12c.google.com with SMTP id 2adb3069b0e04-5401fb9fa03so1413680e87.1 for ; Thu, 19 Dec 2024 17:28:36 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1734658115; x=1735262915; darn=lists.freedesktop.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=7bHjE0IB/vPqzg640QI5Oh3Go2fZYjsbzOVZvfoGOak=; b=JtMeDirYkGiK+kjn4iFrjQW3YkwwR08jnZpMAhe6PAv9hLnSr0+HKBqp3BNcYNcqX4 /ConfmGzB1/JcKr4RaUJ2J9vJFr33K2QW8YpmMPqTT8SyFy0X02lOrtI0H2hHb6B8pYC jzEeVhNu/LSpzTfeU2i0yRkq0/7TLqTqKDa11x+3FzAvfjswCkl/jMnsHRiH9cln0ukn Zsdw0HY1Jv3PIBSPVdPsRbxi70cKNze6PVCs2KnGmV8HIjPs7sjaClfheUvUHf8tYP8j UEmnKKhIjHl1zPdzubJAd54Prsqpl6n6c/xZs6VWky9WYjLmUBczLj2ppysCx7CiOVX+ jS1w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1734658115; x=1735262915; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=7bHjE0IB/vPqzg640QI5Oh3Go2fZYjsbzOVZvfoGOak=; b=ZrN825dTygzC/23db/B5WpLnO3Hyb20Cm7f10iQ/dLbW75b0WWc9XUpugBzk/EnG3f F81XVfgGYkXHLpRgT9BLq4907vvmdSTpXhBNu1eW1TaaqnmLrAr/UsOlva+xt1g/QwKm M1j11xwI9JWimgNLuIoatuwReNOgeFFobMGOZNqu6BsZzhu+qn2j+QZv9Fi2ZBobBSJa 7e3lqzHkwtbOwjw1ILTWYE8+XD36Hvqj+gWktqEoy1RoD84K8mKPjbuHI72IG7qb3Q5R 4hG2dOEY/JyVdzfBSxboscCCcSZEwpNwitpHv0lZTJ47H+dph9Mx++FQn+pqPoqz4L59 PLqA== X-Forwarded-Encrypted: i=1; AJvYcCWLXpzzsNCXbucgfNyZLSO+j//d+TjjOvLpC47sRRtry9SjDhsg9iURTPBfN4KyrTDKORwvgr3VhoE=@lists.freedesktop.org X-Gm-Message-State: AOJu0Yx3cqWPaGG6FNtkkitIZrBcpfPzZt32IVhPsibIwFysT6glaKoo w1jxnm5ZytKc8f8YYz9aqUGIFuWUdLUwjS5rjSSd/lhrD5w+Bjn3vkx03Rq4jMw= X-Gm-Gg: ASbGncvmSF0/PEz7oRGAFcDIEkqtP8/tqYXlm0dGSZ3BVEAjLR0x6QMyEnDlJL4Pi7F kx4uRvRlfYlHjn4MoqA48n4lyfybD4Sx9JQbWNmU83/aAtkyKhwcdcXDI3Ld4h4VN/NqnBRH5eg CkEt/trIJsMpq6ImHfaqIt7Z8QUdlGRkUAaYVJeK9j2isI2AV6iTY2U8b23qL6/Yz4EDGNwSic8 cI8NdZWPoF3BqmB4SP8dPx2i00X8ySN9iamQ8o/m1Q+O5DAQuu6AVHL18DSUGyx X-Google-Smtp-Source: AGHT+IFkoQ1wDgLQWAyIiR/AcniX2onayOceXrfk5sMzc7gbQE21NuoTAbl5Sm7gK6XKGLR3lUJqKg== X-Received: by 2002:a05:6512:401b:b0:540:2247:ac4e with SMTP id 2adb3069b0e04-542212e1035mr1554510e87.7.1734658114788; Thu, 19 Dec 2024 17:28:34 -0800 (PST) Received: from umbar.lan ([192.130.178.90]) by smtp.gmail.com with ESMTPSA id 2adb3069b0e04-54227a89c2csm170540e87.71.2024.12.19.17.28.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 19 Dec 2024 17:28:34 -0800 (PST) From: Dmitry Baryshkov Date: Fri, 20 Dec 2024 03:28:29 +0200 Subject: [PATCH v2 1/8] drm/msm/dpu: provide DSPP and correct LM config for SDM670 MIME-Version: 1.0 Message-Id: <20241220-dpu-fix-catalog-v2-1-38fa961ea992@linaro.org> References: <20241220-dpu-fix-catalog-v2-0-38fa961ea992@linaro.org> In-Reply-To: <20241220-dpu-fix-catalog-v2-0-38fa961ea992@linaro.org> To: Rob Clark , Abhinav Kumar , Sean Paul , Marijn Suijten , David Airlie , Simona Vetter , Robert Foss , Neil Armstrong , Abel Vesa , Richard Acayan Cc: Rob Clark , linux-arm-msm@vger.kernel.org, dri-devel@lists.freedesktop.org, freedreno@lists.freedesktop.org, linux-kernel@vger.kernel.org, Johan Hovold X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=2719; i=dmitry.baryshkov@linaro.org; h=from:subject:message-id; bh=8xOZo6SIWZxsw847lHaBi8XDboA4fhIU/Ie9tsdlCGA=; b=owGbwMvMwMXYbdNlx6SpcZXxtFoSQ3rKCbumdReXcE032tvX8uVtkUq/Z2LV+d0SUiebi6Ndt m7iKJbqZDRmYWDkYpAVU2TxKWiZGrMpOezDjqn1MINYmUCmMHBxCsBEPudxMKycxy78X35p3YJn SvLzV++eevbUwSP9647Uss0yfqXNsmPyhwdafeG2B+yaGHyYRSSMjRXLrqi/1wqU/i1ZqS3AHh5 kH76Nm1P6Z+z/eI64ZQ+u997bPGt2rtkE7pd2oofu5GcHOVt8sVA9JsXrviqvzqp0fwCnTsrzxX PzU6oW3LVJF9nUHGIRb9VTLpUVJKAdbn/J63rnt/iSE2Uxa6Tr94SeOnJJZm5SvZ1RltjEQ61Pe N7PSz35y6DthOZ23Xm/T/yKiFlYkK0494n26+SZivk/6t+xsAmyW8RN9T+hWZ5vd/7bi4mTXG6I 9Wnoqd8wm250y0tXSW/NF6e9mX/TPlhJiVW8dpTV4PIEAA== X-Developer-Key: i=dmitry.baryshkov@linaro.org; a=openpgp; fpr=8F88381DD5C873E4AE487DA5199BF1243632046A X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" On SDM670 the DPU has two DSPP blocks compared to 4 DSPP blocks on SDM845. Currently SDM670 just reuses LMs and DSPPs from SDM845. Define platform-specific configuration for those blocks. Fixes: e140b7e496b7 ("drm/msm/dpu: Add hw revision 4.1 (SDM670)") Reviewed-by: Abhinav Kumar Signed-off-by: Dmitry Baryshkov --- .../gpu/drm/msm/disp/dpu1/catalog/dpu_4_1_sdm670.h | 54 +++++++++++++++++++++- 1 file changed, 52 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_4_1_sdm670.h b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_4_1_sdm670.h index cbbdaebe357ec4a82a3c3d950aa13792a1fb2d6e..daef07924886a529ee30349ae80375a324bbc245 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_4_1_sdm670.h +++ b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_4_1_sdm670.h @@ -65,6 +65,54 @@ static const struct dpu_sspp_cfg sdm670_sspp[] = { }, }; +static const struct dpu_lm_cfg sdm670_lm[] = { + { + .name = "lm_0", .id = LM_0, + .base = 0x44000, .len = 0x320, + .features = MIXER_SDM845_MASK, + .sblk = &sdm845_lm_sblk, + .lm_pair = LM_1, + .pingpong = PINGPONG_0, + .dspp = DSPP_0, + }, { + .name = "lm_1", .id = LM_1, + .base = 0x45000, .len = 0x320, + .features = MIXER_SDM845_MASK, + .sblk = &sdm845_lm_sblk, + .lm_pair = LM_0, + .pingpong = PINGPONG_1, + .dspp = DSPP_1, + }, { + .name = "lm_2", .id = LM_2, + .base = 0x46000, .len = 0x320, + .features = MIXER_SDM845_MASK, + .sblk = &sdm845_lm_sblk, + .lm_pair = LM_5, + .pingpong = PINGPONG_2, + }, { + .name = "lm_5", .id = LM_5, + .base = 0x49000, .len = 0x320, + .features = MIXER_SDM845_MASK, + .sblk = &sdm845_lm_sblk, + .lm_pair = LM_2, + .pingpong = PINGPONG_3, + }, +}; + +static const struct dpu_dspp_cfg sdm670_dspp[] = { + { + .name = "dspp_0", .id = DSPP_0, + .base = 0x54000, .len = 0x1800, + .features = DSPP_SC7180_MASK, + .sblk = &sdm845_dspp_sblk, + }, { + .name = "dspp_1", .id = DSPP_1, + .base = 0x56000, .len = 0x1800, + .features = DSPP_SC7180_MASK, + .sblk = &sdm845_dspp_sblk, + }, +}; + static const struct dpu_dsc_cfg sdm670_dsc[] = { { .name = "dsc_0", .id = DSC_0, @@ -88,8 +136,10 @@ const struct dpu_mdss_cfg dpu_sdm670_cfg = { .ctl = sdm845_ctl, .sspp_count = ARRAY_SIZE(sdm670_sspp), .sspp = sdm670_sspp, - .mixer_count = ARRAY_SIZE(sdm845_lm), - .mixer = sdm845_lm, + .mixer_count = ARRAY_SIZE(sdm670_lm), + .mixer = sdm670_lm, + .dspp_count = ARRAY_SIZE(sdm670_dspp), + .dspp = sdm670_dspp, .pingpong_count = ARRAY_SIZE(sdm845_pp), .pingpong = sdm845_pp, .dsc_count = ARRAY_SIZE(sdm670_dsc),