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), From patchwork Fri Dec 20 01:28:30 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Baryshkov X-Patchwork-Id: 13915971 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 CDD6CE7718B for ; Fri, 20 Dec 2024 01:28:41 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 7380D10EE28; 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="yZebCi0f"; dkim-atps=neutral Received: from mail-lf1-x12a.google.com (mail-lf1-x12a.google.com [IPv6:2a00:1450:4864:20::12a]) by gabe.freedesktop.org (Postfix) with ESMTPS id 2414E10EE26 for ; Fri, 20 Dec 2024 01:28:37 +0000 (UTC) Received: by mail-lf1-x12a.google.com with SMTP id 2adb3069b0e04-53e3a90336eso1457692e87.3 for ; Thu, 19 Dec 2024 17:28:37 -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=w4ndfZOZJO1jxo/ZES5BqsNFMwpzqaVZfLDHYM6sZiI=; b=yZebCi0f723QejFz5ddesZlV2YTLV/nqFF3Eajiny7PLWjF85WWEN1PanlT9kVFEmC hKuF71B4A8V6qXHuwOd3IMzT6EH6cXB3m7PfGpG2IsvJHPCBKOVGl8dHcC9gAtLIK7+M hKqZkEu3i25VF6mfYgyMKaD68xZyytUDrsTpS4VM6X52JUHz/4W2L4kNfTePrqy1otSp Ioo0YMfAVsv2cUB6UB7RwiCWabs31DV6itdP1xf0Lq97vNU1vS0JAR4z9mcaKLANSJbc sRHax4hyb7+9RhixEe3bZWw3bQFCmnGo9n34aQ7JUK6Pn2CLwg7xGpyNjVSBeeMGDhqY EHdg== 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=w4ndfZOZJO1jxo/ZES5BqsNFMwpzqaVZfLDHYM6sZiI=; b=UJVxG3mmGFZ8F0VWah2E7GP/xaTna+w94ksTIWjMINiB35QO8DzFcEGPsI9OfpkVkQ A8qaD1m7eVdptq5679N/iydw7oZkcCL+o1J1Hwmob5afvE6z35TcjjQ33ugnqOFNbjtn 7Ey8EQSP8W8HSkqmyrL4QQ99p9fU2/XWjDG1YPlqMQoz4eLC2tMWW/lOKCIwMxNROC0i Yf4QOhDm0WINsnZJRdQdKDNKzfkRepOgj6dOZE5Bfx/LQgxzoAMokzrdwbrvHbc1r5xg 4yPCpQepx/CnAGDvCnkKCP6YpaL99tVrxFwduPnSzcq3YEHpsCkY/5Mptn0h9uTk7Vaw 6mRw== X-Forwarded-Encrypted: i=1; AJvYcCWFHMi4e4BfbY6DHHAQ1h5O7wp0+UMr4gZigDWnHEtXngdvzVTJrFCuu0ONclJhSIYYltJenML/zfU=@lists.freedesktop.org X-Gm-Message-State: AOJu0Yyfxv7yrKYRv1OKrcwn/m8K25LqtJoOJ7XxG1XpCYk1SPJmBWrm gVpmN516webfBIVJ8BP3TU+co1F4rYzBXnbk2LLjGYym+l9/FV3xkAxpWhruvRo= X-Gm-Gg: ASbGnctwFzR+tT5Dd4qc/VJgPpXRVSnL6Lyb4vcM4st2CDom/nDUM4x2e2ZgPJLzzj5 Np24sfzqlFk7GHIjdefy4H670tARFbx2yEVzVP9XC6i7WbIXKcpEhotEnJCa0GYKniRXXcDXZHb ml7J+ulAIe7T9YrjUUeGJFEYE77hELvOTq+NnU3u6tabhoyvTPcxXO90a+KNm0MFQOQaBzIqpGs diwwv+XlDqFhHzbt1f5tS6PnnvaAGLLJvHFMfW2o/XXLW4priMU5O4TFtW65xnU X-Google-Smtp-Source: AGHT+IHs8K/VbvXTO8Xz4iZdDagLPpBuaGlYHTDPeiDhViakq0c6cSmYpXdTleF1r+SIikPOF9knag== X-Received: by 2002:a05:6512:2308:b0:53e:2f9d:6a81 with SMTP id 2adb3069b0e04-54229560339mr177427e87.39.1734658115428; Thu, 19 Dec 2024 17:28:35 -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.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 19 Dec 2024 17:28:35 -0800 (PST) From: Dmitry Baryshkov Date: Fri, 20 Dec 2024 03:28:30 +0200 Subject: [PATCH v2 2/8] drm/msm/dpu: link DSPP_2/_3 blocks on SM8150 MIME-Version: 1.0 Message-Id: <20241220-dpu-fix-catalog-v2-2-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=1305; i=dmitry.baryshkov@linaro.org; h=from:subject:message-id; bh=0nHV+KsFnBOLA7ZxxfDPuxSHN3vDdgnluGgG9s77asY=; b=owEBbQGS/pANAwAKAYs8ij4CKSjVAcsmYgBnZMg+cUL3mr5ppuT98cOi+fVsGwppbZmBA/cXY T6tI8w+2GOJATMEAAEKAB0WIQRMcISVXLJjVvC4lX+LPIo+Aiko1QUCZ2TIPgAKCRCLPIo+Aiko 1d8ZB/0YSHJHTNMquXkcsraZdDPc40CYd7yWi8YA/3S2WD+87CVaoICq8y56B8NmuLoeaq+eBGK +Ju8Le/3jUsJlwb2kHtL7vGpEnux9+b8ozLGdL0xs19S37/SkWOO3N5eIKrQXygVIN9kpEaJijD yh2Sidt+1WbR7/x43yLNs0T4kQK/9Y75INqPBRRq3xm4PEBsB5SFG2yK62owBF6kAJJs8mwE16X +nStEKtF2sMuZNvPkRZ7a9wkLNx5Edr4QMeXFsU/KQTDbh+Hgb1lbRsls+LnnRc4/jpeZfPgWyX kmdbILxAjDIHpvSQdHUN3I72Y6Uxeu+Vhr+jVwV+C2LMv5cI 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" Link DSPP_2 to the LM_2 and DSPP_3 to the LM_3 mixer blocks. This allows using colour transformation matrix (aka night mode) with more outputs at the same time. Fixes: 05ae91d960fd ("drm/msm/dpu: enable DSPP support on SM8[12]50") Reviewed-by: Abhinav Kumar Signed-off-by: Dmitry Baryshkov --- drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_5_0_sm8150.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_5_0_sm8150.h b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_5_0_sm8150.h index 6ccfde82fecdb4e3612df161814b16f7af40ca5f..421afacb7248039abd9fb66bcb73b756ae0d640a 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_5_0_sm8150.h +++ b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_5_0_sm8150.h @@ -164,6 +164,7 @@ static const struct dpu_lm_cfg sm8150_lm[] = { .sblk = &sdm845_lm_sblk, .lm_pair = LM_3, .pingpong = PINGPONG_2, + .dspp = DSPP_2, }, { .name = "lm_3", .id = LM_3, .base = 0x47000, .len = 0x320, @@ -171,6 +172,7 @@ static const struct dpu_lm_cfg sm8150_lm[] = { .sblk = &sdm845_lm_sblk, .lm_pair = LM_2, .pingpong = PINGPONG_3, + .dspp = DSPP_3, }, { .name = "lm_4", .id = LM_4, .base = 0x48000, .len = 0x320, From patchwork Fri Dec 20 01:28:31 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Baryshkov X-Patchwork-Id: 13915972 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 F12DCE77184 for ; Fri, 20 Dec 2024 01:28:45 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 71B9210E4DB; Fri, 20 Dec 2024 01:28:45 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.b="OY3YRaw+"; dkim-atps=neutral Received: from mail-lj1-x234.google.com (mail-lj1-x234.google.com [IPv6:2a00:1450:4864:20::234]) by gabe.freedesktop.org (Postfix) with ESMTPS id 851E410EE28 for ; Fri, 20 Dec 2024 01:28:39 +0000 (UTC) Received: by mail-lj1-x234.google.com with SMTP id 38308e7fff4ca-303489e8775so14957361fa.3 for ; Thu, 19 Dec 2024 17:28:39 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1734658118; x=1735262918; 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=B+IOu8UV/6vM6ydhmIg2O/tJH2Ir+xajrwaLNWIqsKA=; b=OY3YRaw+JI0zVljJPoXq10gdK8evi/PUhC+xJhxzqBWX3oslU2qEgeTRPgho6TD51V vnzz6r9EJfAGQ6FMNYezI0iFc0JufGKVkfy6a3RrAxuh87ZmbKj2Gmbv5TghlhQi7xtF gckXbteLYiQSozqbl3J7+dbyFm7FZgjhCPv/I4hoAz4MRA46H/ke2THfP00Cf8x4bAi1 ph/3sSGyxOEjcCquQ0EiJ1OVvoQcNYipmUpkTpePyoAQIKk5SLvVf83Az8lOpcNBRvZx M3vlTphfHRCDMsTrU0hdId//I9dloI4hEUyw2lTJ/3t5GH9KPk5zUAF5K6K/7e4IhmUX 2+9A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1734658118; x=1735262918; 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=B+IOu8UV/6vM6ydhmIg2O/tJH2Ir+xajrwaLNWIqsKA=; b=IS4xjvjqt09FVXaPo6PeAeR23nFKwutRS/6KRvOW4s1iTLwbr/TYva32gkbJRBWK5R rnyPXfjSKZhkomKuZCwfePJU0nA/HOyVqT3vRghxrQ91djMlwBASW2Z6aAUkTOcJy8If Lz1xtS2QWEBI5b9wRdT9Knb9F53laMYC6akyv9vusdE7fKOTpXi3rYmZHmeDga0UMLcr vl5BfwV3CoEdOG4pv1ir9skJYjRjlCfoT4Ide/mWbPEiZFqR62d6aM4sQQdcQ0KCAAXu l0GlhjAYFew42DPySonPBBZdUfFUhfE19ldaRvIXVyK6z7yPFM7e5eF/Wa/uAUFoZZRM /FQw== X-Forwarded-Encrypted: i=1; AJvYcCUcrUENRWxeez6RoH2C1HgbG6Rnh4v4farupMI0EDhc4pXY1RTRYIMDPwVcWP+xdH2hRjlhhWm9sS4=@lists.freedesktop.org X-Gm-Message-State: AOJu0YwFtyRQPf+oCbFTIOdmL+VS9ICj7OWyWkJlZKjZ+MFkH6NRBvB6 4I4K2sPkbaKze+9paa7DYa0snzIG8GgkbG4fRtAlXNJ62xyrajwoawmVIFNpCDEeo91SxK0HDUM Z X-Gm-Gg: ASbGncsdxCRtpVowupx3FymNzVuvh2R8vNxFqTBq/omLHvcyzg6hAWGAyQft+95PC5p 8gUGKpg4Xb+UEMbVOfJ8q8rqGSMikcjGYrzMe7pSyYvHAfuJkAPjl+RdTBOJo7djOrsobtUoP9S MVhDyPhIr8NWz5OoHZ55UjtbWVR3ajqK+UjrMiFo41kC5LOC9VGWqjm6CYrE9lEVQ46iD4lwhyJ Likb3CM2ga5mwMsLHrRs4HMzbKdDyJAHOWBsJE8jLaMiaRwf6ejLzNWUmj7jayr X-Google-Smtp-Source: AGHT+IF/gOolHvWa7yF/iCUiShP09wS2f5aMQOTOUG5/8f9sFilzuUtqb9Nhi5hK3cHa1R8oVHUSSA== X-Received: by 2002:a05:6512:281b:b0:540:1fae:b355 with SMTP id 2adb3069b0e04-5422956bdc1mr180935e87.52.1734658117831; Thu, 19 Dec 2024 17:28:37 -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.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 19 Dec 2024 17:28:36 -0800 (PST) From: Dmitry Baryshkov Date: Fri, 20 Dec 2024 03:28:31 +0200 Subject: [PATCH v2 3/8] drm/msm/dpu: link DSPP_2/_3 blocks on SC8180X MIME-Version: 1.0 Message-Id: <20241220-dpu-fix-catalog-v2-3-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=1310; i=dmitry.baryshkov@linaro.org; h=from:subject:message-id; bh=EPTpddReUdMYZ2WS7Ttu60U++lU0UI8BvSWUbWEeV/s=; b=owEBbQGS/pANAwAKAYs8ij4CKSjVAcsmYgBnZMg+ULIs7Do/CbVm2Z6XMut+0mgevQOhJC9Jk e4FFOsZiDmJATMEAAEKAB0WIQRMcISVXLJjVvC4lX+LPIo+Aiko1QUCZ2TIPgAKCRCLPIo+Aiko 1bvoB/wJarARi6agh4POgzBYGs/R1Pm89eSXojW6joFnqCgC2QvVp+stKH+rcPi2Wl6d+0/o+aH BdAxxQcwy/OW+NhaRsZexjjzlOncTAtHoKB+we8AoFIM3g3n9c8hwFokeEvb4VhXrOul5w91yhe DsyAFaF3+bmiobrYFvxa7bnUgIPGRCkGOQntnBoAZGXpN5cGaHUO/JcJO5wEEtEB8O3Ok8IpFpd 89rOzGUCUP4i+RKYppwE1gmtJQoprSHu00XVXVaFBWacndtQwQW6nYWE96xuRAzuc007SEFWj1L mYri9Rmscfeo9wbdMqO/zbgQx35nRB4C+0VZMtLLzS2Sj4aQ 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" Link DSPP_2 to the LM_2 and DSPP_3 to the LM_3 mixer blocks. This allows using colour transformation matrix (aka night mode) with more outputs at the same time. Fixes: f5abecfe339e ("drm/msm/dpu: enable DSPP and DSC on sc8180x") Reviewed-by: Abhinav Kumar Signed-off-by: Dmitry Baryshkov --- drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_5_1_sc8180x.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_5_1_sc8180x.h b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_5_1_sc8180x.h index bab19ddd1d4f97805c1bfba8ba6e117ae77c6c2e..641023b102bf59352546f0782d9264986367de78 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_5_1_sc8180x.h +++ b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_5_1_sc8180x.h @@ -163,6 +163,7 @@ static const struct dpu_lm_cfg sc8180x_lm[] = { .sblk = &sdm845_lm_sblk, .lm_pair = LM_3, .pingpong = PINGPONG_2, + .dspp = DSPP_2, }, { .name = "lm_3", .id = LM_3, .base = 0x47000, .len = 0x320, @@ -170,6 +171,7 @@ static const struct dpu_lm_cfg sc8180x_lm[] = { .sblk = &sdm845_lm_sblk, .lm_pair = LM_2, .pingpong = PINGPONG_3, + .dspp = DSPP_3, }, { .name = "lm_4", .id = LM_4, .base = 0x48000, .len = 0x320, From patchwork Fri Dec 20 01:28:32 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Baryshkov X-Patchwork-Id: 13915974 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 CCB4BE7718C for ; Fri, 20 Dec 2024 01:28:47 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 8E62B10EE31; Fri, 20 Dec 2024 01:28:46 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.b="vm0BCj/u"; dkim-atps=neutral Received: from mail-lf1-x12b.google.com (mail-lf1-x12b.google.com [IPv6:2a00:1450:4864:20::12b]) by gabe.freedesktop.org (Postfix) with ESMTPS id E633F10EE2B for ; Fri, 20 Dec 2024 01:28:41 +0000 (UTC) Received: by mail-lf1-x12b.google.com with SMTP id 2adb3069b0e04-53df6322ea7so1606148e87.0 for ; Thu, 19 Dec 2024 17:28:41 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1734658120; x=1735262920; 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=cNGurZx5APr5o8b1YKpzmXoTLfFEipQsrmLsb92m7mw=; b=vm0BCj/uaMGIOSCCOOgILpLso/uf8dzk8T/RDq27veWb/auJeIfkAZ9ip5CiXp6Mcy DgTjlqQCU7kmwz5K6Le7/kjtIW3LOvNArd8wiuzyo0zdkdm8jFdoKl+0MmEPskmUKepj 5iC3B8PEJRRHkcLTIcMu5Tp1NNj02laHd60Hu3pj9YMinJQbL1/kS7tZPcPxK/NHwX38 pEjL/wAd4IRcZvDp99y0624+5BhgjgXVBmWlh2RVHLU7+O1cL0/uC4wLS3V80jbXR3BY tkEpKPzY5U7GDI8GSGVfbdpDwPqjiRsqPbsQ5NRVttnvB3oMO9HLO25/MTJcVW6c/WO6 /+cg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1734658120; x=1735262920; 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=cNGurZx5APr5o8b1YKpzmXoTLfFEipQsrmLsb92m7mw=; b=Lh9w7AQXxi5wxXiSs9RA6r0aZV/hPzr6OsTm/eax7IQBWNhCHLDBbxLYDvfak+egYn NxJIH8OIR+fSFXT3I7NJlzvqrflLnqCukeZyH17eBIXKRIexVULQ9z08gjExYKD0I6Do lkl0YZ/wIAN5jkdOCD6ZftDwzEUzDmAhCRDIEiSJhxbGNus478jhZVY+ZOqIf1A43BKw xT2PvHCNLRIhUJ2zza2pID5spt1E62+hQ36T0vSbpXXAuv7Hp/vEVq4Kf4cfMoOACDcu Jz3Kl//neMu6Ez4W0PnB+tBqpyf/yPoPu3kWORTbouNcPDQJIrM+QGsOkcCZIQOmQJs6 Sryw== X-Forwarded-Encrypted: i=1; AJvYcCXWaS0/9j4EUNtO7oSkVBZhCGFrPkZq07qw0VCf0m7ZIjK3JVi1Pp8dOrkG39wKCF71sg6qCn+04Hc=@lists.freedesktop.org X-Gm-Message-State: AOJu0YzLCNkCugz70RCkU6ZNMVpGP3cOLUOw7OgBBFiahfY7yjl7bN2J Qzlw/ggD8RhGeFMkXQiYb7bq+IQP98Yh8K6nXX3Ku0AvQ7vVDcgrtWEALd1GSfA= X-Gm-Gg: ASbGnctjzVM6JakbPVvY/yAQvh4/ASc8ENOoHK3dFz75TxkijTvqgsA5AsW+IFdQOaY 1y3HSiopOu2Z/t5GrwKpUQIOEYBACkTF9FUJ11Kt2x7zr1hflM0gakVYpxtuOefFAEUF57O0laz vZDxnl1fxb+MfMkl4QalyfppzFPUhsXetoBCd+y9nq9sw+QrGZuD81V6mjYdBvCkrseeyCdQAb1 FToA04EcT4pWRTx6iP9uGbcu08fWf3XXpNyl1VYLS0BcIkeVPLoBdepuDP5BMan X-Google-Smtp-Source: AGHT+IEzZsIs9KHrk+RQNoZgbtix0ubEjo1ieObMZDI8gSvt5gDisA0jhTtuC/z1S2rpaDu+Y3v9hg== X-Received: by 2002:a05:6512:1055:b0:542:232a:7b2c with SMTP id 2adb3069b0e04-54229548e22mr177814e87.29.1734658120251; Thu, 19 Dec 2024 17:28:40 -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.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 19 Dec 2024 17:28:39 -0800 (PST) From: Dmitry Baryshkov Date: Fri, 20 Dec 2024 03:28:32 +0200 Subject: [PATCH v2 4/8] drm/msm/dpu: link DSPP_2/_3 blocks on SM8250 MIME-Version: 1.0 Message-Id: <20241220-dpu-fix-catalog-v2-4-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=1305; i=dmitry.baryshkov@linaro.org; h=from:subject:message-id; bh=dZzh3PXS76i6xnboEA79w1m+EII00mpCa9Y07Mzie78=; b=owGbwMvMwMXYbdNlx6SpcZXxtFoSQ3rKCbtco8lmN7xdHszWyrTvlH/Va6gQOXnhca6J55/M0 p37RvtvJ6MxCwMjF4OsmCKLT0HL1JhNyWEfdkythxnEygQyhYGLUwAmIrmfg2Eiu2lo8Z5c6RyX Hbeui8duXMSxykPaoNlh5Uo74cSQ5uqnWzdV58azlf/mWDmlbH5Hw9a4FIdH3driHWsvxvwUtTB 2axMLkbA5VPRimZ5xj8qq3a8Nij+x+VmWO2rJh+u8rnQUObWBkedeih4j6/pp3YZXONOZ1M7yBy f5V6te134k+J7T2fzD8b3y0+6aCbYnXhDc95szle/A+kN1O2yOf2FakcvMOTHkFnuigg+PuaCog +rO4Bt7Y9h8w52CuOoWTq9z15bgdqrv6k+ZtEKD40bKgWWtT5YvzXt1d5JHaHjAPG0+2eeHhaqa LsYr7n67PT+z7cyEmZ27tCWysvutb34uDlu2guuBSSUA 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" Link DSPP_2 to the LM_2 and DSPP_3 to the LM_3 mixer blocks. This allows using colour transformation matrix (aka night mode) with more outputs at the same time. Fixes: 05ae91d960fd ("drm/msm/dpu: enable DSPP support on SM8[12]50") Reviewed-by: Abhinav Kumar Signed-off-by: Dmitry Baryshkov --- drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_6_0_sm8250.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_6_0_sm8250.h b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_6_0_sm8250.h index a57d50b1f0280776bb95f55b8fce9aa8259d7041..e8916ae826a6daf30eb08de53521dae89c07636c 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_6_0_sm8250.h +++ b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_6_0_sm8250.h @@ -162,6 +162,7 @@ static const struct dpu_lm_cfg sm8250_lm[] = { .sblk = &sdm845_lm_sblk, .lm_pair = LM_3, .pingpong = PINGPONG_2, + .dspp = DSPP_2, }, { .name = "lm_3", .id = LM_3, .base = 0x47000, .len = 0x320, @@ -169,6 +170,7 @@ static const struct dpu_lm_cfg sm8250_lm[] = { .sblk = &sdm845_lm_sblk, .lm_pair = LM_2, .pingpong = PINGPONG_3, + .dspp = DSPP_3, }, { .name = "lm_4", .id = LM_4, .base = 0x48000, .len = 0x320, From patchwork Fri Dec 20 01:28:33 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Baryshkov X-Patchwork-Id: 13915973 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 68A21E7718B for ; Fri, 20 Dec 2024 01:28:46 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id D0AD210EE2B; Fri, 20 Dec 2024 01:28:45 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.b="xF4PVlgk"; dkim-atps=neutral Received: from mail-lj1-x22f.google.com (mail-lj1-x22f.google.com [IPv6:2a00:1450:4864:20::22f]) by gabe.freedesktop.org (Postfix) with ESMTPS id 5693410EE2B for ; Fri, 20 Dec 2024 01:28:44 +0000 (UTC) Received: by mail-lj1-x22f.google.com with SMTP id 38308e7fff4ca-2ffa49f623cso17280181fa.1 for ; Thu, 19 Dec 2024 17:28:44 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1734658123; x=1735262923; 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=r8niegYZnY9morgL7MxhpeF/UQMeeTk6uKDQF2VfVac=; b=xF4PVlgk2JmnA3vCNUid1ovUmvbRPp5gdGi6pCrbPMfv0x3VQYgPenpXt5I69m1Iw3 98X5yFq5fUbZ5lwMi9Vnaq83tOXpGV1J2uRQv/GObh+Y/uA20+M4Z0Diy2MAvW1rwtD8 9qtCGSrLtCN+KbbH8up+KqYyHUYSe+50aUYeIBF2t1rkX8JlOcz/iExyZyb6f4xk4Bh2 r1CWYBTImwYDmiDdsnxnrVov0ot+uxCrw9TTZ74iN7OGsf7gti1kM3V7LDZOrz9gXuvE Od+cCnh4+cGtgtq3oN7AhuKhO4aL7Iqt0GvwciRS9Ri5ukNSTvXCdDJu+MRYiwCcCylz vAgA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1734658123; x=1735262923; 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=r8niegYZnY9morgL7MxhpeF/UQMeeTk6uKDQF2VfVac=; b=QhWcrr1BpjqkxndPn/zQ0raCVLqYe3+DrWdx1LiLcjHJHYi8eDoX0Aa1BeZ0uNf/qy HCRZQO0Bs07zjMpzTY0csm30u/FOZrXP4GKi77HQpHFUndiDR2MUSSNWxYNPh+sg8bjW gr5Tk5wSB2Xmdf/KoSY63tLZ50DA7nA1w53Awq5YorHTOVrseAiOFqlviG7qGY/5ahP7 RkM1uIFPrJzEkwrOSj7/JE24Jv+BkmcMxZvKWu1dWZ1Ecksa9+d3LAoVvSfra77jdq+T ZdEY1JhwRLqnwzySY6fyu09naKLl+C9VKe/Pppcz14JR9HeaDstRLTn/7nXmvTYy55ma odYg== X-Forwarded-Encrypted: i=1; AJvYcCUrYnw4jJmAT2TulhAQhoSrai6JEQsDhcn4sIX0yOrcMKESHw1z7hsvitCYNw8PimTadAMg4dWIHVw=@lists.freedesktop.org X-Gm-Message-State: AOJu0Ywxj17U04aWIPzMf5haWk4mmuYK+t0z2Z7OCZ9DxILDHq3ZGddh 3+HeahMbPbOLYzAHUJeiX/vJ939Rj31+jT4sNeef7t5VlF/lp4hHRGxes2zjX2s= X-Gm-Gg: ASbGncsikMGsMGJoqVVe7DS3il9g05xdycZo8Rnu40gvfs6pmlQcO4FTQcruOO6XeZS R2aPIXLvKpuGkM7Q9nPFwo/xhURrjuq3/KhvAEjQujD5VARt94bckWUneNCQt1e2fxEYEEfMWRy GWv5dVW66Ti58lkIDwLXhTTVbcWSB3/39Obt8+KdKYW/RfjozB4T2xMwafMMCbywUBoc00xnMq1 f4zlVLs1VbzPi5W45NuclQPt+G1XIW3qv5K82wMpttpCDV46nNMonnQJ8r9it0K X-Google-Smtp-Source: AGHT+IF5Nq2wfvPB92CZMzX3Vkpwjzw8xyQ2wYN5LaM5HZlw7C5cwQ3Tpe29jJapNts5wwecQpNCpg== X-Received: by 2002:a05:6512:3b99:b0:540:cc4e:6e20 with SMTP id 2adb3069b0e04-5422958245cmr173527e87.42.1734658122638; Thu, 19 Dec 2024 17:28:42 -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.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 19 Dec 2024 17:28:41 -0800 (PST) From: Dmitry Baryshkov Date: Fri, 20 Dec 2024 03:28:33 +0200 Subject: [PATCH v2 5/8] drm/msm/dpu: link DSPP_2/_3 blocks on SM8350 MIME-Version: 1.0 Message-Id: <20241220-dpu-fix-catalog-v2-5-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=1297; i=dmitry.baryshkov@linaro.org; h=from:subject:message-id; bh=i4FVDn+/rOcn2C84yQSmmpsO3jO494mbVjBwMlV07+c=; b=owEBbQGS/pANAwAKAYs8ij4CKSjVAcsmYgBnZMg+fZYsheFVecn80/JQlhFbjlEtvUNOb5WRv Y2n8WFMVhSJATMEAAEKAB0WIQRMcISVXLJjVvC4lX+LPIo+Aiko1QUCZ2TIPgAKCRCLPIo+Aiko 1YoMB/4yMWZzpGpG+2PXtT/HTOXM6tBCGMchJ/4CkZavOgbJxQHJkQjxk8vw1CVxJ5U/s20ffmj MOkyl9JUAElhkUXb8wt0aqM5r476DzWlXwcCtKsUEvmbZHYzZLGSqYFsk/SaYfXxk5bL/31ZGVZ 1hTNDmw4hhs4xYpQ87HvCnTrfTbV1T7GaiFXm8fuhaH7M3AM0Z/3/74R5IjdkpTCEbtQui/nNhG 6vG1agZoeNsl9f02sHLpTgq7EAz3qKipD4X7ddvTwcst7oLxo/vI/KxU35F+pjyn3Hy4pW+vrD5 Cz0wSqb+t+w5LIESymNJ4Ij5C6mTZdDbJhcZcaBL6+JDg45f 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" Link DSPP_2 to the LM_2 and DSPP_3 to the LM_3 mixer blocks. This allows using colour transformation matrix (aka night mode) with more outputs at the same time. Fixes: 0e91bcbb0016 ("drm/msm/dpu: Add SM8350 to hw catalog") Reviewed-by: Abhinav Kumar Signed-off-by: Dmitry Baryshkov --- drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_7_0_sm8350.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_7_0_sm8350.h b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_7_0_sm8350.h index aced16e350daa1bf5d24078b2468b5095a40ce07..f7c08e89c882038aa658955ca1202bda3d928e80 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_7_0_sm8350.h +++ b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_7_0_sm8350.h @@ -162,6 +162,7 @@ static const struct dpu_lm_cfg sm8350_lm[] = { .sblk = &sdm845_lm_sblk, .lm_pair = LM_3, .pingpong = PINGPONG_2, + .dspp = DSPP_2, }, { .name = "lm_3", .id = LM_3, .base = 0x47000, .len = 0x320, @@ -169,6 +170,7 @@ static const struct dpu_lm_cfg sm8350_lm[] = { .sblk = &sdm845_lm_sblk, .lm_pair = LM_2, .pingpong = PINGPONG_3, + .dspp = DSPP_3, }, { .name = "lm_4", .id = LM_4, .base = 0x48000, .len = 0x320, From patchwork Fri Dec 20 01:28:34 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Baryshkov X-Patchwork-Id: 13915976 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 345FAE7718A for ; Fri, 20 Dec 2024 01:28:55 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 8E8AB10EE29; Fri, 20 Dec 2024 01:28:54 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.b="N/hlzS7G"; dkim-atps=neutral Received: from mail-lf1-x131.google.com (mail-lf1-x131.google.com [IPv6:2a00:1450:4864:20::131]) by gabe.freedesktop.org (Postfix) with ESMTPS id D096910EE34 for ; Fri, 20 Dec 2024 01:28:46 +0000 (UTC) Received: by mail-lf1-x131.google.com with SMTP id 2adb3069b0e04-53e3a5fa6aaso2675840e87.0 for ; Thu, 19 Dec 2024 17:28:46 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1734658125; x=1735262925; 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=p3GKBJwWEfw1/CxFlxhza+7CDGlBelmYowiHKIMRKmk=; b=N/hlzS7GiwIw66Z2FSItvgUuCLboyeyO/hMJ8bbk7MLqEAjUhYgyfOOFP0UvYHXNzZ pgWo06uTBbqYCZ58Ok3d/0Jo7604kPc6hgeI6uZdVC50Y+NjQIfhptzONRiDDQ4xcb31 w2IQI3uDEYP5md8gDed7Tjw+kR5MoQ5lscHfkFrlS51ULL1NyjiPwC8+s1e4nRS+30UG sLGdIEWVBQr1qI7o3nMR0LBS+pV1vKkOyaD0p51ywVJ/45z+eE8a8UqvzZZUxZMdkagl 8D2I0MRCOsuRLEgZj0iMmEBKcjXvJAF0wjDV6AZL3dTybvxNPJP7Hk3Z8tORjx1O/Z20 7FUw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1734658125; x=1735262925; 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=p3GKBJwWEfw1/CxFlxhza+7CDGlBelmYowiHKIMRKmk=; b=NtyPsx2xws+yF7vRq/32zAf8Z2eM/sBIvHPApoXYGEq+AevyaIiVBwlOybmFk7Qeku ouqG0sRxvsNtKraZNdbmLZk7Z7ghoxXW94Ztml7NGZQtbLlRqCzLpHfkcGS1TIYOqjVI a9mKUfNyFq7XBatBMt5SLMQPnSGoysWyErn3Cb1wnzbNj5NaxMlMj2bUIV4XWz8eiA1F 1K7DVeIfdDK1Y4NltNY/v6R/EmqN/ISPYMI3bKEez0mAIHxKchkkE9BURD7vm4luMxtw a3vUY+4271qwDDweErrUoPOZk8QivOvKwErMNp+r/wrAn4xIcEbC+cn/qmfoThg+Dokf BOFw== X-Forwarded-Encrypted: i=1; AJvYcCWLEEkl8CIhU1VTLmR0xZdf/dr06ZBWijURUKoxP8oQH/ebf47g2ORFMwDZ8SxpMDyPv3422marAWM=@lists.freedesktop.org X-Gm-Message-State: AOJu0Yz3PQMv8Dr3WgpKe9kyGzXjSpy3HghGOCuS+RF2ulAGj4et8jRX 1wOt65MxIST7xXd9W+ZpVKAJOi7vM9nDK6SqHmACoBqyyfaYXMmYNBpJ7NvR24I= X-Gm-Gg: ASbGnct86baV9WgbPlhg5jBjtzITyMG8kC34yKhleZi91WM79nxkwQMMBdZWg5aAl7s FQCxPKV2OY9RPhNSRRpC47ei4l7LKcYI+PNWDEijs0nvMqknSHUfr2WoGQZ0BWpZt0o1K/mEY91 5EljZ9FBnyae3qOKAPwrL7dThVXSLFztY5beigpYUI4mv/76Y+/MQwBoRtBQ4jNH+z98VG/Mn2g soRiJh6RCSjPw7lopDfuAes/jloTgvnufznDX14AGaq/G/8zysc1vrajxUs3K23 X-Google-Smtp-Source: AGHT+IHESAj0aPRm12hAGclUJ3UmR8oxmXDZHMsUjV8nmvQd5MLhJkySZ0kJVJQK5K08IYjyPoxqEQ== X-Received: by 2002:a05:6512:3f04:b0:542:28af:816 with SMTP id 2adb3069b0e04-5422946ed34mr244788e87.20.1734658125099; Thu, 19 Dec 2024 17:28:45 -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.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 19 Dec 2024 17:28:43 -0800 (PST) From: Dmitry Baryshkov Date: Fri, 20 Dec 2024 03:28:34 +0200 Subject: [PATCH v2 6/8] drm/msm/dpu: link DSPP_2/_3 blocks on SM8550 MIME-Version: 1.0 Message-Id: <20241220-dpu-fix-catalog-v2-6-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=1295; i=dmitry.baryshkov@linaro.org; h=from:subject:message-id; bh=vb3CBdu7rRYdoP/BORloE4ExhCArGx9G4wRA2z3QaT0=; b=owEBbQGS/pANAwAKAYs8ij4CKSjVAcsmYgBnZMg/ND6AujJKVlejqIx5KgOPU/QuqfhojOWOi DhTvYmZfx2JATMEAAEKAB0WIQRMcISVXLJjVvC4lX+LPIo+Aiko1QUCZ2TIPwAKCRCLPIo+Aiko 1bHqCACxnLhTsGmevsDSoJuKkR2vjzK5c0HdYKwGpX6aV+XMirfriaa2P5aaQ/tlhTRWFh6ufvm UUq/IdVRCqTPCoyRknT5AR0bXpShVOk7mW1h1BL+zhdkygTNie8HqmjBrQI13S/VEDjAgf9vS2A XM47vQjpfYpCw0wkwQXpW75lPPE+DCkEIzfR9srWIxj3eHjgsFU/543xYYM37xUlZPIcCyLYp4K k2NC9DgkYTXIQ8ICtLnna3UzGRR6GyX81wPnLPjU2NUNBCI1kgJfrZtamqnexvEo4OJNwUXA8f7 cOG+Yn9ZFNI1Aa+KLW57vbItrG5Rt6xAVM0V8DPL+XcK90l/ 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" Link DSPP_2 to the LM_2 and DSPP_3 to the LM_3 mixer blocks. This allows using colour transformation matrix (aka night mode) with more outputs at the same time. Fixes: efcd0107727c ("drm/msm/dpu: add support for SM8550") Reviewed-by: Abhinav Kumar Signed-off-by: Dmitry Baryshkov --- drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_9_0_sm8550.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_9_0_sm8550.h b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_9_0_sm8550.h index ad48defa154f7d808c695860fd91e60bbb08f42a..a1dbbf5c652ff9f21c02af2e2520f019702f29c1 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_9_0_sm8550.h +++ b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_9_0_sm8550.h @@ -160,6 +160,7 @@ static const struct dpu_lm_cfg sm8550_lm[] = { .sblk = &sdm845_lm_sblk, .lm_pair = LM_3, .pingpong = PINGPONG_2, + .dspp = DSPP_2, }, { .name = "lm_3", .id = LM_3, .base = 0x47000, .len = 0x320, @@ -167,6 +168,7 @@ static const struct dpu_lm_cfg sm8550_lm[] = { .sblk = &sdm845_lm_sblk, .lm_pair = LM_2, .pingpong = PINGPONG_3, + .dspp = DSPP_3, }, { .name = "lm_4", .id = LM_4, .base = 0x48000, .len = 0x320, From patchwork Fri Dec 20 01:28:35 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Baryshkov X-Patchwork-Id: 13915977 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 E2167E7718B for ; Fri, 20 Dec 2024 01:28:55 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 11D8D10EE32; Fri, 20 Dec 2024 01:28:55 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.b="udTQFYzd"; dkim-atps=neutral Received: from mail-lj1-x231.google.com (mail-lj1-x231.google.com [IPv6:2a00:1450:4864:20::231]) by gabe.freedesktop.org (Postfix) with ESMTPS id 3B58B10EE26 for ; Fri, 20 Dec 2024 01:28:49 +0000 (UTC) Received: by mail-lj1-x231.google.com with SMTP id 38308e7fff4ca-3003943288bso14470701fa.0 for ; Thu, 19 Dec 2024 17:28:49 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1734658127; x=1735262927; 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=iGem3bHUSgcY0xYR5Szm4SGhekE0/o689Nmwl8dsbT4=; b=udTQFYzdoSFKasZi6zasjTiJZmVfkglbpszrSeDyryJVTAI31pDsfdiMljHl555SGg SSZd5JMXQtgWw2PtLDaPSh0/qe2bSCsQYH5I7v/B9EXBqiirHVHGzT/oYFP5LFjcxgHy +O6Q4oQ7OIIfnR9vmyTaxGDbPULh8MiF5br8Ohj3arvcq98ZzwH5zfh3QKJMiWtxkJGY N1x6S+Fv+kMRV0HJpXf5Hp7IdnNfPXA64C8eqS7FUj8cWQ5XXGzoyE/2IoktP6hVqAg9 FvL3cOrSaAkRfSnZnFFkHWAUQDQWWNiZ4IXBdRrgxVJBxN9WrQ0aNXLzPQr48IJPRcdB mJfw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1734658127; x=1735262927; 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=iGem3bHUSgcY0xYR5Szm4SGhekE0/o689Nmwl8dsbT4=; b=iOPG3MefPUEDio3DqK6do0O2dfj/9TUwTjXfS1g6X6PcrLczIkWWb67x1jzHCjfZxz sKELz0O0tTWDjEqoWvqzQf6nEazitXzNI8dTW+GE/JFN00rAFB+CXgtvXB6QAAy/MSjD 5wWcIXdsvuVH0vPRm84bBIZQqK2RTPdLld+6Xv2negyl+zv2iO3uQvGg3d42x2iM8J3I Iu5hpocsI1FDnMQITkiUGncBYfNERWa5vtwG+KQuu0mQISs65U+R94OTRLUjxzF2jqUx i8TltCTyJ1Mh1L764edhib/MgV2q5TBy0ibYLGAltOxfF/9Ir4eiI6/joZsr+xxAk92C iV7Q== X-Forwarded-Encrypted: i=1; AJvYcCXChGp0CmMe0kTRedzwmczYm7BuL5UO5aw1oIoZPiUcSdUGISe+twsmFBpHxY5MuZ5+tdscdksXtmI=@lists.freedesktop.org X-Gm-Message-State: AOJu0Yz0pj35gweIfZJZUXhSbZejmuBGEyRucZaPn65eVRgjO9lAE6eB UB+LsOe4FQUmvIvFIBM3nGOfbkwEt2ltCCUD+AY7we4zgRSP947oSBo07zvy1lg= X-Gm-Gg: ASbGnctcHKOjY2uo3ANTOQ/BwMWl2UELqoWHiqgbDuOvSSSSwkF2h2GdKSs1RHvMzKh 9o5bHlEOBbh7oIlx4XxLV10o+4szKglueKMMRvB8zXuIce8gmz/8MEorqw7D0muytY37unLDzl1 qSYWi/wzneHZEuKEa6W3VxlQY3tV+0IoAYcR2vH8Y1REqGspgMDysY5HUNQkfVFS74LlYUT+2kg nfrwqpsy1KOcgN2+auX+Lm509PY9dR4zzpOpVwsYnzWHVPYWaJ8jjhKxhbdgUe+ X-Google-Smtp-Source: AGHT+IFlLa1rzI9ywvTJgP+UZWS6o2QRUDkLVRX0vF55rzdqfZOrzFhtlmkOZ3P7H/6LEWkwS0b3DA== X-Received: by 2002:a05:6512:2346:b0:542:1b8f:a922 with SMTP id 2adb3069b0e04-5422953332fmr191927e87.13.1734658127556; Thu, 19 Dec 2024 17:28:47 -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.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 19 Dec 2024 17:28:46 -0800 (PST) From: Dmitry Baryshkov Date: Fri, 20 Dec 2024 03:28:35 +0200 Subject: [PATCH v2 7/8] drm/msm/dpu: link DSPP_2/_3 blocks on SM8650 MIME-Version: 1.0 Message-Id: <20241220-dpu-fix-catalog-v2-7-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=1304; i=dmitry.baryshkov@linaro.org; h=from:subject:message-id; bh=X7FvetBkuSIFwQPFNTIHnsnsMQMhXRkzYapuXItW/ig=; b=owEBbQGS/pANAwAKAYs8ij4CKSjVAcsmYgBnZMg/v9DmM5T2yxcq/g6fD7SJF08okGiWvXljD A+sHsPo32aJATMEAAEKAB0WIQRMcISVXLJjVvC4lX+LPIo+Aiko1QUCZ2TIPwAKCRCLPIo+Aiko 1YdiB/9rgVTCRMCi/eCKZkC3QRKJkXBrXzrFD1gJRnAnmiBIJw3rs/CqcZNs+y9qE8Rs3HErKQD 1GRF18FqRlktpoMn/wWx0XVfvcqvF1/JOwIaufOYW/gHeDqX9bcljy+lV5BEETGiHPHlKLUSeeF lfPMYDBMKMh6fg2aMIeLOcPkBrvtuLrves2QMTCj3MzOi96WM0CFNWRijeJkeMEA21Piev+6WNP ru5ILrSjJlfyDl0PHKOOum6RS7vclvX/USM04KP03T+jQpOucULYy0PesTYVXGuxlHwqgKOwkdk q9c5a6ORSLriEroIZi3LtZE3dEhGouXRoh/oPAMTx9tic1Ex 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" Link DSPP_2 to the LM_2 and DSPP_3 to the LM_3 mixer blocks. This allows using colour transformation matrix (aka night mode) with more outputs at the same time. Fixes: b94747f7d8c7 ("drm/msm/dpu: add support for SM8650 DPU") Reviewed-by: Abhinav Kumar Signed-off-by: Dmitry Baryshkov --- drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_10_0_sm8650.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_10_0_sm8650.h b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_10_0_sm8650.h index eb5dfff2ec4f48d793f9d83aafed592d0947f04b..e187e7b1cef1677261a5de7b01ea3fa8136723ac 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_10_0_sm8650.h +++ b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_10_0_sm8650.h @@ -160,6 +160,7 @@ static const struct dpu_lm_cfg sm8650_lm[] = { .sblk = &sdm845_lm_sblk, .lm_pair = LM_3, .pingpong = PINGPONG_2, + .dspp = DSPP_2, }, { .name = "lm_3", .id = LM_3, .base = 0x47000, .len = 0x400, @@ -167,6 +168,7 @@ static const struct dpu_lm_cfg sm8650_lm[] = { .sblk = &sdm845_lm_sblk, .lm_pair = LM_2, .pingpong = PINGPONG_3, + .dspp = DSPP_3, }, { .name = "lm_4", .id = LM_4, .base = 0x48000, .len = 0x400, From patchwork Fri Dec 20 01:28:36 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Baryshkov X-Patchwork-Id: 13915975 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 BEB07E77184 for ; Fri, 20 Dec 2024 01:28:54 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 4F71610EE22; Fri, 20 Dec 2024 01:28:54 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.b="viTYzHgp"; dkim-atps=neutral Received: from mail-lf1-x12d.google.com (mail-lf1-x12d.google.com [IPv6:2a00:1450:4864:20::12d]) by gabe.freedesktop.org (Postfix) with ESMTPS id B433310EE32 for ; Fri, 20 Dec 2024 01:28:50 +0000 (UTC) Received: by mail-lf1-x12d.google.com with SMTP id 2adb3069b0e04-53f22fd6832so1344048e87.1 for ; Thu, 19 Dec 2024 17:28:50 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1734658129; x=1735262929; 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=g+UxLeMEKZ0drgg5vIKf6D6FbqGDQrxrvZvv2J0cYAE=; b=viTYzHgpStXVqI17dPHkeoGVuxt1vhJabrZeo3mNxEz5X1rJ1ZrdFdwfNZWXH/OT/a Kk8HsFVqALaDpu52Pq0azF9ILGjPp3WC+Ab/BSa7HJceuKrh2f8d4wwLmlkrrJJYHsJ9 Jb2NrQkEo3DhWJzM1lpJx46Jpra2oWUEqFuWYNUTQQSdc5vipSyGu+LpdNNArJPY96Cp Whpus/iRJi7ha3/NMx7zQfkgKXNlJFDmXfkC1cIsjHVK4vCTs6NG4tt4WMoAj2DF5xe3 Cyh0RbCh/2J7O5OB29jitbNvhy4OUOVJrtRWoTzwr913DZWcPB3yFAhrZw2u5vESfe0u 8gvA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1734658129; x=1735262929; 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=g+UxLeMEKZ0drgg5vIKf6D6FbqGDQrxrvZvv2J0cYAE=; b=P04LoRyLccEQ6j7VtOVnRn/w8Xl6OI8dC2eDaN4GWa5YoPsXOdyBCowrRaYA4mhiv3 gATYKUdnY+LrJ4mcWlYS8EpX5oNkEEVJtpnH5RjrXk1VjnqFt2GCXKojTuaevcxPn8P4 tkgg9pHRC9kwvBe9jKT//tzyRvv90lyt0GbIMz1x45xQVVdBJwUsRbNyCoW/r+nMyqKa iN8DDhl2719MF7Ike1exXgqUF+85iWR2KKnBGKX5pTbdiXV9//32aQfs1UfccfrTMOU3 /THnqCBuL1BnWalCutr9y3z5O/ZtaeMP8GIlAGunRTIhVoW89pcvxsR5s512sA6u03OL ELrw== X-Forwarded-Encrypted: i=1; AJvYcCUXF3IAnpKi9yEwx3UyYGa6+UGbjjBPu2Gla6G1jt5ufhp8IAxrVV3lgzid0FjKZ3NniA2WcsZDWMs=@lists.freedesktop.org X-Gm-Message-State: AOJu0YxHYtDlp5aFw3plVAdts6T5+m58KthPYS2OH/yjjqtT3WFV2uuN g7pcAuutujCiu1PUP6CdUNmY8bu8eHo4eEpGvX3HzHEdrpbfR+cOwv/6SQJL15o= X-Gm-Gg: ASbGncuttpFOl7iqTggXVSnJH/1RNR+/bYCYEGNWK4EFdXFXBfwl7XlgfHvboPflRn1 EBvuijRXfe+m16fouLIE5aTMMVKbbcEXDgDKCdeXPi5TVerzqAKb119wsln2b0sRebXr3W4LTvm 6wcEViGhinpOlCyKwGP1nRoFRhnDVYtZ8y6wMtlT6gUe1BgWLCMECXQ7/JLLDYvBOvzPLd+Hz2S v5J5yJlHgC+ZFDaIn2wwsG7fDq6mb1SteePjacnuh4h1XJcbujYm7Ru9fwqTR9p X-Google-Smtp-Source: AGHT+IH5Icut19CrQRKgtDSzCRG8qNy2m4CTSKGxVWKKTUEhiYw6FKBa1WmLIGAIiUsb9ae8mcxHFQ== X-Received: by 2002:a05:6512:1055:b0:53e:39e6:a1c1 with SMTP id 2adb3069b0e04-54229560360mr232733e87.43.1734658129064; Thu, 19 Dec 2024 17:28:49 -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.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 19 Dec 2024 17:28:47 -0800 (PST) From: Dmitry Baryshkov Date: Fri, 20 Dec 2024 03:28:36 +0200 Subject: [PATCH v2 8/8] drm/msm/dpu: link DSPP_2/_3 blocks on X1E80100 MIME-Version: 1.0 Message-Id: <20241220-dpu-fix-catalog-v2-8-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=1307; i=dmitry.baryshkov@linaro.org; h=from:subject:message-id; bh=5058CHEvuHi6y1shjj/7LSsaLqFOGpH0zSafsGTeHak=; b=owEBbQGS/pANAwAKAYs8ij4CKSjVAcsmYgBnZMg/RB+Fi7NOIgUKpxxiaLrBsE7s80wm6VMMl UTR4BMn15uJATMEAAEKAB0WIQRMcISVXLJjVvC4lX+LPIo+Aiko1QUCZ2TIPwAKCRCLPIo+Aiko 1QbaB/9MRXkpbzcxPF0Rcp5LR396dEkAkPli7KvHNg1toaDhWPRd5C5qR8G8fog0tXC0vQP8SLm zqaHgaRd+nheWQRf69qtmv5FXJoNt0oiyjgtNcxeokyocr3GYy07Y3hR592MYN5EJwu6aE9X+5+ HCHKAZDNf2apKR+GPHPXPoZZ1UVJLScMigOzkAX72Sq5+kUzu2XB3OvlVhrXMQPBb0BTbvEtPCp rkHncfnva1A2cFkxmw5imydwNGwSq4yiGLKiiaW+cOf/jdDMnCs9KdR7a/28KDRO1a4ZxiD+oEp pAcUn1XMmvDK83Iy5U4XmQGl8eaE4EtvxRff50IJWybEfSH3 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" Link DSPP_2 to the LM_2 and DSPP_3 to the LM_3 mixer blocks. This allows using colour transformation matrix (aka night mode) with more outputs at the same time. Fixes: e3b1f369db5a ("drm/msm/dpu: Add X1E80100 support") Reviewed-by: Abhinav Kumar Signed-off-by: Dmitry Baryshkov --- drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_9_2_x1e80100.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_9_2_x1e80100.h b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_9_2_x1e80100.h index d61895bb396fb4287e9b41807a3bb0cdb25d4e25..4f110be6b750d30e158d517aaa507c7b4eda0af4 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_9_2_x1e80100.h +++ b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_9_2_x1e80100.h @@ -159,6 +159,7 @@ static const struct dpu_lm_cfg x1e80100_lm[] = { .sblk = &sdm845_lm_sblk, .lm_pair = LM_3, .pingpong = PINGPONG_2, + .dspp = DSPP_2, }, { .name = "lm_3", .id = LM_3, .base = 0x47000, .len = 0x320, @@ -166,6 +167,7 @@ static const struct dpu_lm_cfg x1e80100_lm[] = { .sblk = &sdm845_lm_sblk, .lm_pair = LM_2, .pingpong = PINGPONG_3, + .dspp = DSPP_3, }, { .name = "lm_4", .id = LM_4, .base = 0x48000, .len = 0x320,