From patchwork Mon Dec 16 08:27:22 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Baryshkov X-Patchwork-Id: 13909372 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 05EC1E7717F for ; Mon, 16 Dec 2024 08:27:33 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 71A8C10E405; Mon, 16 Dec 2024 08:27:32 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.b="Gimgf/s7"; dkim-atps=neutral Received: from mail-lj1-x233.google.com (mail-lj1-x233.google.com [IPv6:2a00:1450:4864:20::233]) by gabe.freedesktop.org (Postfix) with ESMTPS id 9235110E3E0 for ; Mon, 16 Dec 2024 08:27:30 +0000 (UTC) Received: by mail-lj1-x233.google.com with SMTP id 38308e7fff4ca-30167f4c1e3so41673031fa.3 for ; Mon, 16 Dec 2024 00:27:30 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1734337649; x=1734942449; 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=p3QX07TGdBq1gHdO6oikHZ2FbBQpzQ564YrLte+zAm0=; b=Gimgf/s7+gNjS3oImRAAzxnEHmRffhvenWIxoNUvzDISt7tHoDvw64Nm2NcyG+4jqT MKYgROv27oMWsJJzzW+DquJv6p1n1iA6RrvGsyEwTRLy1rwDbGTtZe+xRPKhVIwb9/Z6 jrIwvZOK5kJNsQPxEHUg0/IlZ/gEkwCb/+YvMJnJDTWybhXjipUeWqJ0B2uhpIEu5YTJ 13gmIzH4TcSp7joEz+NNKYVj3HvO4ARbOUYezDwMsbkJJjkjiJZ+7ZEjnM4siALonWcM dlN+PeQF3Peakh9C0m41d4UasdslTkkMLvVrPZKKMfPZxr6WmcMTfJIPWJ1uKNZqDF1M LmuQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1734337649; x=1734942449; 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=p3QX07TGdBq1gHdO6oikHZ2FbBQpzQ564YrLte+zAm0=; b=PQ5pgerV5fuZWgv8Y3vB+9JFOqkWWlu3BQIDwjXN9CSFKiKDGvNaViUuTcswtInJ3N QrE4jOVQl+M+0W9sAMkmr/XJ4rRsFSAGL6wHgGtk0pVa4Og/Jug5xLlQCm6GBIqPZKjM HlfuBxiYrG9d/DplWYaDR/oVD6bRKB/BYGUp5pfUmSYkScG7+9mRBWzla8ahv+n1I5Cd cPCrpd7Q2FN0uWyRYhquduMXptgf9gAYt6U6NJQFdjqyCtPIe0z44KHGq1vqUWJhz4gd nFh6N0I+tAdDI6r6igoLOcTn5Nc7Xvv1+Ytm3aIhH+gfIOZkGWPAU03EiYD+XiLdeUGH 5nUA== X-Forwarded-Encrypted: i=1; AJvYcCWuUlF9uX5M+RH1YkpwpXf0mpOjLYgbkoN1eie/PM0aTAL7QsNFh6b2n4jrvZCmM9ymU2Xd+rxYTwk=@lists.freedesktop.org X-Gm-Message-State: AOJu0YwI1YmVMd8AmHFCgk3MvlHkTT/TMy9b9EbwDGIy10yeArNj8suD IpxieLuscJjIdDhxJSHmORbbFD42P3VoAeQBVxixLx8pSklioKgRKmdlSEB4uaQ= X-Gm-Gg: ASbGncutaUumNfcR+9qxJg4I3fIoX/ND6B1gVouDAaECbhkrDAdq5rXI+ffEKw5HcIX 2Q6DG2AIoObQf8CxIr2QFMO/FkHPX+SNi9YmJ91VYEryUQX7VevO6ei+YFMuPdslDIJ7C3dV/rD eMuLoquWSpp+x2v6WHzfj4fLcSpytW/r5JJqlGOV9lFzYpSQCl5osb9i0fHhkjPqOaW7tRDVMPW iuGG4GA0LS/RTwUc4zO2UZvBpWuty59ZY1UhLgmruqDmwFD7l/W1L//+MbLXFje X-Google-Smtp-Source: AGHT+IFx724whJM/3tgOtZRukuS/DQOvI/WHlmOjoQuMlO70R1sWXtGolZHOH0q3MJfJtAKMP/bH+g== X-Received: by 2002:a2e:a5cb:0:b0:300:27fd:a7cd with SMTP id 38308e7fff4ca-30254464080mr42374541fa.19.1734337648920; Mon, 16 Dec 2024 00:27:28 -0800 (PST) Received: from umbar.lan ([192.130.178.90]) by smtp.gmail.com with ESMTPSA id 38308e7fff4ca-30344045342sm8543371fa.33.2024.12.16.00.27.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 Dec 2024 00:27:27 -0800 (PST) From: Dmitry Baryshkov Date: Mon, 16 Dec 2024 10:27:22 +0200 Subject: [PATCH 1/8] drm/msm/dpu: link DSPP_2/_3 blocks on SM8150 MIME-Version: 1.0 Message-Id: <20241216-dpu-fix-catalog-v1-1-15bf0807dba1@linaro.org> References: <20241216-dpu-fix-catalog-v1-0-15bf0807dba1@linaro.org> In-Reply-To: <20241216-dpu-fix-catalog-v1-0-15bf0807dba1@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 X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=1147; i=dmitry.baryshkov@linaro.org; h=from:subject:message-id; bh=9MObEe5KzGyCABZYczA3jsFGPjAHvUO1PrGscQg+Yd8=; b=owGbwMvMwMXYbdNlx6SpcZXxtFoSQ3r8k2yTndeVZTf/++P01X49twj3domE3+FdLPFdf7jMA mwT2w52MhqzMDByMciKKbL4FLRMjdmUHPZhx9R6mEGsTCBTGLg4BWAin/PZ/7vnCGkdk3tiWteX uPGqhuc0xeKKy9IesoUVn0Mm7CgzL8sq6z97evsLbSbJF4vy+pc//sjQ6nIn8SfLnLu8zZx7HqS o2P521re/VyWyaVf6Lneno+eihGMbky0amdPPvfRbdWrifa6p5ZdK8hLX3+5/bxZx8LPhYf+g/F WRzxp7p9p8ElTbfDLqale0x0yVrnK+H/EpfW3p1uecuM8EdDW47T11Z9dfmX+O3J/nhXen5uXZL 2zf3beke9mnMtVQBV2rJsnH9yfpzP0y7arzzeyqO6/+2XZW77+bcJgtW59RIYW1KjAh4vbkaLt7 FXFPjlyX3VXFevWQSOcPhW9/HI86/HT4W3T0KsvPUzHJAA== 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. Fixes: 05ae91d960fd ("drm/msm/dpu: enable DSPP support on SM8[12]50") Signed-off-by: Dmitry Baryshkov Reviewed-by: Abhinav Kumar --- 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 Mon Dec 16 08:27:23 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Baryshkov X-Patchwork-Id: 13909373 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 1C06BE77180 for ; Mon, 16 Dec 2024 08:27:36 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id A046210E3DC; Mon, 16 Dec 2024 08:27:35 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.b="gjCTH1Tn"; dkim-atps=neutral Received: from mail-lf1-x136.google.com (mail-lf1-x136.google.com [IPv6:2a00:1450:4864:20::136]) by gabe.freedesktop.org (Postfix) with ESMTPS id 0553F10E525 for ; Mon, 16 Dec 2024 08:27:33 +0000 (UTC) Received: by mail-lf1-x136.google.com with SMTP id 2adb3069b0e04-5401be44b58so3807676e87.0 for ; Mon, 16 Dec 2024 00:27:32 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1734337651; x=1734942451; 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=1y3zws2OvDJOJvn4EwHQ6T46YmVm0fvbHsUMlmIZnm8=; b=gjCTH1Tnp1mEGlmiyJZZP2JVmBnVuCBEVzNzNMd66ZIGK2RIF5L0nBKMKfdsAUBmuY qYBzHs6LuN/yp0ju7EKfOPgavy1pjsaV09I9i3HdTW9gOrGi0TxO5emPAbwCy2BV3N2i DxE7Z6+IyG6tabGlMTSPsyZ4rOuSmVJNZ8n8476AFOJRmzlDvKRw63g3JhlFMZnzx2h4 4el64gFKbpY1nPPB/zuybMIqOcLpeBfQ6fGX2H3acI+K5KCrIEZtWfOcy5QbEOTwPXeg Gxj7gh9wOAPoPiALecT4TQObxsA5Qg+euBmaH8IcwK1Ms9Ppa+EHgfpw7fG4cfaaPGDL /QRg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1734337651; x=1734942451; 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=1y3zws2OvDJOJvn4EwHQ6T46YmVm0fvbHsUMlmIZnm8=; b=LLub3fvKj9KtUAum87EQxmzm7TYURcicLBCyaCNXtr/Kec1jcg2crJdX6iHyOqeMyu fxNHTRJOGMs5Ib2GcIIeiqva9Y9O7Nr+YsJT4xjeI0S9HC4moNbUFbwof+HLT9hOLNEJ R35J5y8Aq2Lr9kDXlG8IAcy0UsUrV1ZEm3hRQRnRjnHnxGgb+cGB0wDs6TTEBLSpeJmQ vXM+EtFc8iENvGwamJPi+s688+twCwSQoA0rCccituGUwiEloUZgqmPwvPAivyTqL9MP E/OHtxdxszylt/GN/N57pUtS74uDacx1rIYl6VLo5bI3d/pPtT3R9hGR428gJVpAUl/H vxLg== X-Forwarded-Encrypted: i=1; AJvYcCWRx7hxMJe7QO2b25BpmH5yopB1JwUYGZHq9GYHFrtGiK6o2okjQ+Y88XD8QooSY6srXHHIv/NpX3g=@lists.freedesktop.org X-Gm-Message-State: AOJu0YxsgsSqGSmDodqn5QA9oFzMknFYplVDFRRXlCU26mjlnOGTNPnB gfvDZPadzAn0qZJNQxzJKZfn9AyavHzSfmUKqEmGr0iExbNSHGUDYoMNxfCYNvg= X-Gm-Gg: ASbGnctw/OcF8PhY4c/+jcVCn/3YKvfSlwfyLssTNvwYnNozrJwtNchSuaksqx+mpkQ a1bQnNSPffeZ7c0V1S7gjU08hX/ZLnncdcqdnxo3qbifEphdawweUAxBmoVJhXllBLAJg8/Wnyy Hm2I0msum4gJ/DHaewbMr/+1KaxYfyxOiV+EZh/NY35KZlvuPN956mjaJjfQYv2mpHk+ZGIS1T3 qzrKnh1qMxVu6vwJsBdTR/c33CKRgse+O92TBUBLigsmmuG06FYFeIQODtpYQnF X-Google-Smtp-Source: AGHT+IEzJ0NEoETgA7c8ba6XyTQ/DzGVN/VS5aRCw2hY/b5fwtTAbAtRpZytYulUjtMOAdHNJr0JqA== X-Received: by 2002:a2e:a989:0:b0:300:2d54:c2ae with SMTP id 38308e7fff4ca-302546115demr45480641fa.27.1734337651302; Mon, 16 Dec 2024 00:27:31 -0800 (PST) Received: from umbar.lan ([192.130.178.90]) by smtp.gmail.com with ESMTPSA id 38308e7fff4ca-30344045342sm8543371fa.33.2024.12.16.00.27.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 Dec 2024 00:27:30 -0800 (PST) From: Dmitry Baryshkov Date: Mon, 16 Dec 2024 10:27:23 +0200 Subject: [PATCH 2/8] drm/msm/dpu: link DSPP_2/_3 blocks on SC8180X MIME-Version: 1.0 Message-Id: <20241216-dpu-fix-catalog-v1-2-15bf0807dba1@linaro.org> References: <20241216-dpu-fix-catalog-v1-0-15bf0807dba1@linaro.org> In-Reply-To: <20241216-dpu-fix-catalog-v1-0-15bf0807dba1@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 X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=1152; i=dmitry.baryshkov@linaro.org; h=from:subject:message-id; bh=GNG1YjeHfuMszqIesSKPUebiuLvhN9Xn/3L3ADbn8DU=; b=owEBbQGS/pANAwAKAYs8ij4CKSjVAcsmYgBnX+RrE/1t7QKrO1i15J4Z2UkK/SQyKBi/FHqf9 nl4CVCFJu2JATMEAAEKAB0WIQRMcISVXLJjVvC4lX+LPIo+Aiko1QUCZ1/kawAKCRCLPIo+Aiko 1aq/B/9wOMO2d+TGtOtYeWqt92iBk1GzTfpG0xNYpmbvSaiR55N0aFWclXEzgT4g2cc19vzzryv c41PGKSpiK5qXbnkhTcLfOqc/UVycrEYNAlzrGUaZW0vL7Yx4UerVgkBozAW5y04OEUYoZpiJYr MjMEURWwYOhGMkdOo7Wl5S5plX1JOwXrlZQkJt6NsAJ3lUv98ms/VamgWhKTarJqESXw46g21+F /qWNUK+XC6tSfqqjtZks/sIgGxMbfOAIRdPJJnCt43I9wNX9Ng4Kxc9Lc1uG5zTwzw2A6Xl5VEg ABGMRPo83JhPnmTajrbbslOPzjGGsAneXND3EH99hJx4QC5G 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. Fixes: f5abecfe339e ("drm/msm/dpu: enable DSPP and DSC on sc8180x") Signed-off-by: Dmitry Baryshkov Reviewed-by: Abhinav Kumar --- 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 Mon Dec 16 08:27:24 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Baryshkov X-Patchwork-Id: 13909374 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 5E855E77180 for ; Mon, 16 Dec 2024 08:27:39 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id C16A710E09F; Mon, 16 Dec 2024 08:27:38 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.b="rQmtKiPp"; dkim-atps=neutral Received: from mail-lj1-x235.google.com (mail-lj1-x235.google.com [IPv6:2a00:1450:4864:20::235]) by gabe.freedesktop.org (Postfix) with ESMTPS id 4AB5A10E526 for ; Mon, 16 Dec 2024 08:27:35 +0000 (UTC) Received: by mail-lj1-x235.google.com with SMTP id 38308e7fff4ca-2ffd6af012eso43389541fa.2 for ; Mon, 16 Dec 2024 00:27:35 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1734337654; x=1734942454; 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=N9TgW+CYKyvw5H3rblc158ZUNsXRwqGtSWGiWPsFQ+U=; b=rQmtKiPp+tLki2+evsN71n5C39zMqZ9MGjQJ10fUTP98j+Rq39S6LIEaelNkMlatTp RH2aIrEHdQfUMWuAbYmXNlPZ5CR/hXNg5bAkdNSWHf5ORwI8w2mtvu2ezdE6ijVEyHtW bDsqCzc4f1RnopWblzFkcmcu/VgZOWwAhA/XQMVgbTr1V1b3OKcXUN98hzxqHFzP1vXB FUt7XaL9QRNV1xXXv4LxFXiHZHVjQggyOshUtKFryXeqMngrUE96tCP4Wj32BcZdZ3ql 461ZyBAYI+ZkWFlJblt2YMp+xZbFXkMW37L7bPSi4Mkc1vo6oQRRqcPaL2z3S8hie30P l8Jw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1734337654; x=1734942454; 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=N9TgW+CYKyvw5H3rblc158ZUNsXRwqGtSWGiWPsFQ+U=; b=XS8NTGVQ2xwdbp0aBtvl05oBz0MZeQNyOqXVEJv/SaVLh0hqHUrrf0KPzFeww81h/L i4/EwDOcLms8aTHXNxb0+VcP3nvniEPrWlYAtuzeI5MUjg8gS+t9ZqQNq/Fr7EZHQNGj DCsL0EVkj+rqOMlTqlleQZ36lkRmTNHjDkNqNP9UIGHohv3g6o9FSNBZcIk1am3uS1Gg JnbCRtKepB+jITjsHeHE6dYbPp+OtaU1/Ry+QLimSvUhmf3OUefeF/1c9gsskL0K7YmQ taThWLBwB9DeXxB22WbPBVajjzfJtc8u/KuMZ6xSOBzNASlmvh8fMjr5njvWXtuCnEvy xQ9g== X-Forwarded-Encrypted: i=1; AJvYcCU8ZvKfFfAJa/jkhRTMrQiihg31Zh1fghhyFxSNzRFSEiMDWoncLdPZe8dsmvY/8IicsMa3c4qm3iI=@lists.freedesktop.org X-Gm-Message-State: AOJu0YyFccojsVsOfqvoWK3TTA2enV3fHU67f72dbdLV1DLSiJUScZyo syIWYAH1N+oC5UWfg3n4NyLA3cjwQLSuT3FIXdWYU//dFaQv/LqFpakZOLrS2Eg= X-Gm-Gg: ASbGncv0l5H9wUrZHhfe6CWYsp7IRWDBP9eVFZxxUgD2hMQ4mr1GMV8ZXdWVX7M8ayM 7NcZjYAP9pcoiWfWfsMix50DfQx/e6G8XU+OewRGGDj9aZPszrC/Kx8XSRlKtFyEYZ7Z8dKKBzz w1Hpqf7vGDjAwSN/2L9Hb/OnDertFNS1k0P2SblnayunX7ecFwDW0sUlzBei3L6+KLY4oUBqk/i gttv8y/turI4UOzyzXgFR9WnrFXtEClzWdJmDHRCjAQ2p5xN4OYRjVR/OakzGA+ X-Google-Smtp-Source: AGHT+IEjxE5JIr4I0Nm0OK3tkP2CuqAphMvXWSvP6WKojU0Rmwh9ouZ5/B23d8RiNZkCJxKI3XPBFQ== X-Received: by 2002:a2e:a99e:0:b0:302:25ef:813e with SMTP id 38308e7fff4ca-302544cd566mr44359121fa.32.1734337653638; Mon, 16 Dec 2024 00:27:33 -0800 (PST) Received: from umbar.lan ([192.130.178.90]) by smtp.gmail.com with ESMTPSA id 38308e7fff4ca-30344045342sm8543371fa.33.2024.12.16.00.27.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 Dec 2024 00:27:32 -0800 (PST) From: Dmitry Baryshkov Date: Mon, 16 Dec 2024 10:27:24 +0200 Subject: [PATCH 3/8] drm/msm/dpu: link DSPP_2/_3 blocks on SM8250 MIME-Version: 1.0 Message-Id: <20241216-dpu-fix-catalog-v1-3-15bf0807dba1@linaro.org> References: <20241216-dpu-fix-catalog-v1-0-15bf0807dba1@linaro.org> In-Reply-To: <20241216-dpu-fix-catalog-v1-0-15bf0807dba1@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 X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=1147; i=dmitry.baryshkov@linaro.org; h=from:subject:message-id; bh=yl0V5Ivn93jx2EQt5ftkkxVs5AyWzNRaoZkPTxOHYqg=; b=owEBbQGS/pANAwAKAYs8ij4CKSjVAcsmYgBnX+RsNa4mfff9jlJCLVtKJCVNAAOA4sqhGhdPP ZRfeHjaZJ+JATMEAAEKAB0WIQRMcISVXLJjVvC4lX+LPIo+Aiko1QUCZ1/kbAAKCRCLPIo+Aiko 1R5xCACE0lAdnhvMx22yf+S5fY20DT3I1EtoBvnhHEJOC1FXew7rU/BZ53+LAzPkmEs3vZdnDNY kwdwQoGw0qrXMIHK2qbwCAZSSut3s25QfWa7Cd3b29i24/nLx0pptqs1uonxBtwyBQhDUKoF06c PEGk/tCs1wYqbPLvR+IDrWg6zK0OGSv9BQjZlQXRM6xBclFYVdXT/3j1tQbBS2HGjGYguN3wjRd 3c1jGeTe1y7RxmNPL2e4hVHgCvixm/CewFJlsh44yx2hI2WgEb7iQfukYQHmACnAa7K6v2oiMO0 WpfYKq+iVxIFsQE+pz4M0gvGMdsRFyoYjiJyxTp5ZWIdmUUz 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. Fixes: 05ae91d960fd ("drm/msm/dpu: enable DSPP support on SM8[12]50") Signed-off-by: Dmitry Baryshkov Reviewed-by: Abhinav Kumar --- 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 Mon Dec 16 08:27:25 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Baryshkov X-Patchwork-Id: 13909375 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 C5417E77180 for ; Mon, 16 Dec 2024 08:27:41 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 41D0B10E526; Mon, 16 Dec 2024 08:27:41 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.b="Bn2no3ic"; 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 91E8610E52A for ; Mon, 16 Dec 2024 08:27:37 +0000 (UTC) Received: by mail-lj1-x234.google.com with SMTP id 38308e7fff4ca-30227c56b11so37989531fa.3 for ; Mon, 16 Dec 2024 00:27:37 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1734337656; x=1734942456; 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=EjeVcGMhalEWw9xcCqMUL7so98QwVZkPwRwD7ozFXS8=; b=Bn2no3icAca6YuSkw1CYAM++AO3bGqR6YojhWhUorNs7SjizgOYw9Ooi3qYK6QxC/V NhqRMLQIq+npWxsNkFschMRXdHC44DaSd0sH76k+2uy/xXuEeVuio3m6XXBJO71fWwZo XZu/rB1xLz0ny5Ow3rRYsSDX/YiG+J2X7CkNz8I60qz3snlPrYs3LGmdYVuSBUs0sopG lGDcvd2NxV6scLFjNTxB4mKegBW5glgSaIIQPwY8Bm8XKEyXC8DG4TIRSXXoQMjXmv/C nKdULW66/Q66XNV7Nbda1aKoYVESJcjU+ciF3Ac9SzCp+cvw42Csze8o5CeFwvoiYLf4 9J6g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1734337656; x=1734942456; 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=EjeVcGMhalEWw9xcCqMUL7so98QwVZkPwRwD7ozFXS8=; b=WpBSNhEdiB8BxAbHndQBtEM6KL/MVoVIrYGkU61fzf8jZkCSTBKfnInKQHBC04fY7K v2aOK7TUcJ4ltxf3D88InKZ/1pGLKTm28vXQ2YlF6FK7e5pcBoQ8EJ1h6ovv630YIvgx 9ANEvacj5mBCGrrGMc8ulJqpGLNGSaKPrjaKqRG0tyyOZJKBxIr/acubMyuQe62p2O9J sSqIkc4jgUJxjwvi7bPxr+q8Btdb5Cy3Pg8aCCKb/pfTTT/G49jkW/Fm4pixjZJSRSNd Of+BNYnImdpI4CQWouukyi0mOgN/EdmrI2FlSzAy3c0/gUIRsbEyyNOZcTkIeGH0utRZ xzpg== X-Forwarded-Encrypted: i=1; AJvYcCUd1Fn0zSJoh3GlJHnFwqyuntr4BjhdvMPbjWkyX5weP8x2PzOWZnNwASVBlyeYU8D4W4uC4gXPp1Q=@lists.freedesktop.org X-Gm-Message-State: AOJu0YzzWe8wPhvym0zfX8deYnxkQZaQDz8KxdLDX70UjnagEXwa/1DS Uphhu17/BMf3RUC/FxMkJ3Dw0iYmGJVKMILTy73OXi9F5mMX+rAaaSQzoZi/fD8= X-Gm-Gg: ASbGncvZ3nmg2PkP6nwb1NF8qqRuhl0749Q/oMEP6zd2Ocdd7I47nky+usfy9Vs/hqg 1LOAhf7V3qxCx2ePtYcVG3AVHlAjFwvkTzBX4hDmzJT0vVVpw4yI/r3vSTT7C0TjJrd6cgFlEYD phhNdNT4jB8ShtxtCLC8CpS+107z6jj0GgvwGY0D68Hm3qg11vYckUIE5RCwzI4DiPyay0bJXaT LDxHvOmT6Jgt+wK56abnAyG9+0f4cLIj5xbEF5Dd5MUEizhH2fGMLTwwbvnsBXx X-Google-Smtp-Source: AGHT+IGaM+ZRb1OFrc1yp/HQm0eQzzmfQ0sLJ440wGVKdOn2/mFn3Nd/997hnnex+AYrS7uGr6kzuw== X-Received: by 2002:a05:651c:198e:b0:302:26ff:d0ca with SMTP id 38308e7fff4ca-302544233ebmr31569821fa.3.1734337655950; Mon, 16 Dec 2024 00:27:35 -0800 (PST) Received: from umbar.lan ([192.130.178.90]) by smtp.gmail.com with ESMTPSA id 38308e7fff4ca-30344045342sm8543371fa.33.2024.12.16.00.27.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 Dec 2024 00:27:34 -0800 (PST) From: Dmitry Baryshkov Date: Mon, 16 Dec 2024 10:27:25 +0200 Subject: [PATCH 4/8] drm/msm/dpu: link DSPP_2/_3 blocks on SM8350 MIME-Version: 1.0 Message-Id: <20241216-dpu-fix-catalog-v1-4-15bf0807dba1@linaro.org> References: <20241216-dpu-fix-catalog-v1-0-15bf0807dba1@linaro.org> In-Reply-To: <20241216-dpu-fix-catalog-v1-0-15bf0807dba1@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 X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=1139; i=dmitry.baryshkov@linaro.org; h=from:subject:message-id; bh=bJyPESVKaUC+ChFiQF2ba+YGs7hcFzITyl26AyryJho=; b=owEBbQGS/pANAwAKAYs8ij4CKSjVAcsmYgBnX+RsYj676nOMBUcWu0Fh7OCpAZdVSpsOyhgCY g8rKfv/T8aJATMEAAEKAB0WIQRMcISVXLJjVvC4lX+LPIo+Aiko1QUCZ1/kbAAKCRCLPIo+Aiko 1fHPB/9Ao9hXUP9x6qbAqEBuksJCbxQyxmcXfPawdhm1QBaFs+qx2p/0VL5mXxsIMBUTsyftJ6G dSrnR4ASCTdvqedczP2FEqlgSTBic6YfXSrVrOo+ItdlTr/VhRiLjteBhqB18AAf2ONl6jNi0Am Wn5+9BRKSJDMFmbCXWUUIB+/Kycn2oAzv9UNnT9/Aqu9M/W43FuLjVbq71NJZmXM1GKmY2Ls0hi fE1v7zBkd4g98r+/avL33ho1dqMHjK5JcmTWZpebpFdbaOW8Rd4CaqmiH80NSY0ZgaXde3Bt7Yu THMpfE2x0NdM3+G4NdLTbNPEhEoSs9w74OkEsDYNoTNMVSFp 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. Fixes: 0e91bcbb0016 ("drm/msm/dpu: Add SM8350 to hw catalog") Signed-off-by: Dmitry Baryshkov Reviewed-by: Abhinav Kumar --- 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 Mon Dec 16 08:27:26 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Baryshkov X-Patchwork-Id: 13909376 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 586EBE7717F for ; Mon, 16 Dec 2024 08:27:42 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id A8AA710E52D; Mon, 16 Dec 2024 08:27:41 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.b="kTqdLT0E"; dkim-atps=neutral Received: from mail-lj1-x232.google.com (mail-lj1-x232.google.com [IPv6:2a00:1450:4864:20::232]) by gabe.freedesktop.org (Postfix) with ESMTPS id 1487B10E52A for ; Mon, 16 Dec 2024 08:27:40 +0000 (UTC) Received: by mail-lj1-x232.google.com with SMTP id 38308e7fff4ca-3003c82c95cso31943001fa.3 for ; Mon, 16 Dec 2024 00:27:39 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1734337658; x=1734942458; 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=ZbJUsGouyvpdIwJ5KdGKXUaM1AeXWb7FKeLRpP8lHmo=; b=kTqdLT0EiaQkf0Qsmwo2qc4Mqpig1oK1Z9tw76v//nG8ydwdVyvUtZx58fowzdghkY 9nJeBniqYXtEP00FLlCVnyWERsxrtfsDd8qFRAYtzJTOZjkBMhfVwQ5CNMFWxRvfnzC6 i0QxEpXvgHQquofiPAiS3ngrNJgE1LiaLB3OzFe+690+qX38NnsmAI0BGCuVQZ3qesIU qeEp2f+YlCtxzBmPhnXCrHvIC8xz/CB26GPAd87tE2UDDMA6zdfWVhHvRyanzSV3jIPV vNHOQyvIqs004eRovIwgJx/u+adKL2bHsrmSE9vgH2Wdf1g7rzTSHDgGz0/twXt3RJds ts5w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1734337658; x=1734942458; 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=ZbJUsGouyvpdIwJ5KdGKXUaM1AeXWb7FKeLRpP8lHmo=; b=LF/zzHw13SdafrzYIggzz9+ARa+XdpIm3Jy1iw6KfvDsi1cHt91PYPWHZwytGg47CP Sa1vK3KwaszJ5p9qqZ4x3f67w04LSOOz6zZkYnG71gnbaya0kYrQQm03PijQDwVmD0W5 2iWyJlKvP3oVqktt+YnOiFfiBamJZOU71rpkDDMlG2FQHPDhpQhhkvAYuNNttl8Ijk6j 50Hs/lnnOkW9xQpjmUFFCf++1KZdNiqQdcXIISHNuJ+8iAomybiXrfY+Rr2h1OLrvyzD v0r6CPrYWMCQ0WcoWdtt1l9EBHUdfoe9EiXxvaPsWuYwKY0nA14K/rfHISHJcV/FUnGj HjoQ== X-Forwarded-Encrypted: i=1; AJvYcCV4zhNs9DoN0I50a8L7Np/Qtccn+tNKaOvtmDhtA6S3xCasfjmdnpwRu+KzUSjfSWeqegZfueZzMaE=@lists.freedesktop.org X-Gm-Message-State: AOJu0Yyjnu0G+Gj2AREUpmidWfQ7SMJwV2R2YE4tN8pA6JkNnrh4N803 q6k1xMwOXtbmPCwwT+gV8TBmPZv3Q+oTdn/PQM+mfvAf87WefWX+CmrcsWSGRcI= X-Gm-Gg: ASbGncvm2VmfL9S6xPaVTC3gtKtLAQBG79CtkK/2M15tfPT84owt8gZ/AKi4L+KGqAU TpZ+hLv/g7Ev2UYCRGv/KWEV9AnO3734hLpJADjY+e/lzxC6Pnt07hXFtwharIE53iGFaSrEdpW ylTujqg0sZIXz5QDZd7ArG92Xec8cSRx/ZGlBlAfKIBmz8c9kDF6Z0GJeGLnoq4TvzMuuose+bv OEERZD3n84KcDgeCIC6+DbiATFte8vCEyeVaMx4TS+6Wbu3vI4QgNR5++fQxm7Q X-Google-Smtp-Source: AGHT+IE09YmVD4DRB6LYkgBX9GgTyicLTyLwxzWmsrV39R4MSiGMzGiG8tc7FZFrp00POVfsz/KMrQ== X-Received: by 2002:a2e:bc1a:0:b0:302:3610:a50f with SMTP id 38308e7fff4ca-302544ae74emr31223591fa.30.1734337658383; Mon, 16 Dec 2024 00:27:38 -0800 (PST) Received: from umbar.lan ([192.130.178.90]) by smtp.gmail.com with ESMTPSA id 38308e7fff4ca-30344045342sm8543371fa.33.2024.12.16.00.27.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 Dec 2024 00:27:37 -0800 (PST) From: Dmitry Baryshkov Date: Mon, 16 Dec 2024 10:27:26 +0200 Subject: [PATCH 5/8] drm/msm/dpu: link DSPP_2/_3 blocks on SM8550 MIME-Version: 1.0 Message-Id: <20241216-dpu-fix-catalog-v1-5-15bf0807dba1@linaro.org> References: <20241216-dpu-fix-catalog-v1-0-15bf0807dba1@linaro.org> In-Reply-To: <20241216-dpu-fix-catalog-v1-0-15bf0807dba1@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 X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=1137; i=dmitry.baryshkov@linaro.org; h=from:subject:message-id; bh=1HhOvQdDTQpfgdgbG47ZEhiTKbhwKeluJd76grZHFQ4=; b=owEBbQGS/pANAwAKAYs8ij4CKSjVAcsmYgBnX+Rs2FhUYx9q2yNDoYbhnSjaGb+un7b3T7HUG VoAKEcGX0iJATMEAAEKAB0WIQRMcISVXLJjVvC4lX+LPIo+Aiko1QUCZ1/kbAAKCRCLPIo+Aiko 1eZRB/4rtFczYnTmybdWYQxDY4DO9biNQKJsf8ktMkqNBxfoBOm6geGnYjdFg4JaRtD03g5YKl3 6UFn4R5as6rx8Zak+ZhimIcttpvhOUzURUykldcuGbs7WqYhaGp2qs2DlvqgiVQb2Z0KkNDMDeY QsdD+kpGHf+FnoV8HiCFJgrNJ95+Y3vKe0HgoHPA7NRy1eu3MUZ3DTpFwswhjuzoz/WIrviOUaB OT9Qb4erHsNqFFizJ7TgR+cPeXPik04uohYxBeKtt9K/hRMA9258n2yU7rZUYUPuICEzVyoZ7i5 JM67FnF5p5GaeujazKkpq2Vww/uULSfevN1y3671rWbyPXp2 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. Fixes: efcd0107727c ("drm/msm/dpu: add support for SM8550") Signed-off-by: Dmitry Baryshkov Reviewed-by: Abhinav Kumar --- 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 Mon Dec 16 08:27:27 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Baryshkov X-Patchwork-Id: 13909377 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 34E28E7717F for ; Mon, 16 Dec 2024 08:27:45 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id A891310E52F; Mon, 16 Dec 2024 08:27:44 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.b="pX0BPpUt"; 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 5D00510E52E for ; Mon, 16 Dec 2024 08:27:42 +0000 (UTC) Received: by mail-lj1-x231.google.com with SMTP id 38308e7fff4ca-30229d5b229so37409681fa.0 for ; Mon, 16 Dec 2024 00:27:42 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1734337661; x=1734942461; 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=LNvaBXD6rf3EQuRmCg70rZ7MEJhSs632gKbKOrH7Zm8=; b=pX0BPpUtdiWzkTrB3SFT9WmELieSuWRDT0KILiKvmcd/ya1klK2XbdlSvZinyWORn7 TVmBeK+1sGkg2Y9z0tfi2S0re099o9lEZDb5bkM+Wizzo0XFseG3XPQwupQ8H9BRnBPR S5rdGgP9Am7KlCRJMUkkDbQUonsPEGqRgTOmmUnSXfjuYLNirmF3aU5aCH2bGm6rGOx8 pBJY2IZ+RXUN6/Id9F8tOIuJgOKRMDPtDDq96pvcRo5EYbTtleZQfT0fWlWaI7Tm7nC/ 5BzD8ebdZXCoNTWI0uEpNZ8+N6EJ+q/q1VfGLO/6lXxdSmIxdGhQL3bMybpOlAilmPHB gREA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1734337661; x=1734942461; 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=LNvaBXD6rf3EQuRmCg70rZ7MEJhSs632gKbKOrH7Zm8=; b=KtwjxF66Wj20rAkxVO5Mya+sg+sonsAMIiOC9UanJLQyNPlElDQC1OUMfPZAYXfIpo M/HAobxPxMi6LHv/vcZ79Y2mjvXWBrp7WgxEthsD25XDk1scHvgF6yo6mppX6sgHosAN Y4p1bYhTdK16U7NbApcZtCfrqlA7ij+kGDEVwZZ9n9eGHRAr7ffPHNAHjqVDfNE5qrKu ZKCzqu2PRXdsKczTr5coPlwy4enFZtkD/Q+QNH90eaE/U89DqVZj8VGIT38/N82IwGHg pYEayuABCZ+gIyNvZMG63JaIxuKd1/YZokg67fnbnv3CxUOoaNji1Xbve76AcM6yXcuA zDFg== X-Forwarded-Encrypted: i=1; AJvYcCXWBIj/xc+8k59+qjWOBKMTBu0cFFSilaLxH2zxMoeF+u46k6mb7LKdv/oi0J1DIXCI4JpAqyz/Rr8=@lists.freedesktop.org X-Gm-Message-State: AOJu0YyjdDm6mlMZV+dIguV9W2kw2JFmc7MdDTgBfjU92G69wZgHwV8N pGcbpyL4E7Q580Pl42KbcC6OUfDYuw3RdNGCZTnQajzPLxCyES0TnmZLF8Gxkc8KB+BrUKXlb8B Q X-Gm-Gg: ASbGncsJAC9PZJVH45uJH/LVvfZCo6r000/JduT101o2J6cu4fN0g0Iz4Ky7lCCxWLx dBzR5GVP4UQyVil74J8hcwPsnljTslwUcdAf4NPv4sQj7GdpgcvRqkTJ2G4yBmPNrGhfnQyGAO9 SPgV/UwNF953TyPNivn5GdFEhrOQZsI9LlURqBiT58NRJxzv8JY/yt/c7lQDNHlhN0Nsy570zN+ XGYgd8iUPhclWYiG6RtSRech8FSEitKI4ShH8BRYbJbJT0AO7EMkr4GmR+w5jb8 X-Google-Smtp-Source: AGHT+IFPKDhcXSU0UCTh/igp+MQWxIINBR6P0+8IXDlL++c5r9BUnSmEl0bO6pvB1WZJK4q3wU3VCQ== X-Received: by 2002:a2e:9d8f:0:b0:302:264e:29dd with SMTP id 38308e7fff4ca-302544d37bamr35796821fa.24.1734337660711; Mon, 16 Dec 2024 00:27:40 -0800 (PST) Received: from umbar.lan ([192.130.178.90]) by smtp.gmail.com with ESMTPSA id 38308e7fff4ca-30344045342sm8543371fa.33.2024.12.16.00.27.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 Dec 2024 00:27:39 -0800 (PST) From: Dmitry Baryshkov Date: Mon, 16 Dec 2024 10:27:27 +0200 Subject: [PATCH 6/8] drm/msm/dpu: link DSPP_2/_3 blocks on SM8650 MIME-Version: 1.0 Message-Id: <20241216-dpu-fix-catalog-v1-6-15bf0807dba1@linaro.org> References: <20241216-dpu-fix-catalog-v1-0-15bf0807dba1@linaro.org> In-Reply-To: <20241216-dpu-fix-catalog-v1-0-15bf0807dba1@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 X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=1146; i=dmitry.baryshkov@linaro.org; h=from:subject:message-id; bh=3vj4siDBQO7f315YdNktE17SvgKgBr413yqy0N6ohvc=; b=owEBbQGS/pANAwAKAYs8ij4CKSjVAcsmYgBnX+RsvFTxBZ9VJCMmml3J0WOzPS0ojzqlE8FEK RhPWnm5aU2JATMEAAEKAB0WIQRMcISVXLJjVvC4lX+LPIo+Aiko1QUCZ1/kbAAKCRCLPIo+Aiko 1QSpB/0RNWf+SOymu2pMymtdPsFsrkyWTVAOo8hqG3wKYgwYnA+cLkN1U3hjojOStIB0O5rx1Ub AA6ze5HSaUFrTXAqcbWPuo2MoyojkWNGiTi/E5RTl9aht/VafStHh3jWX2+FqW66sCl9cB6ZJy6 XoroA0Iw6HouEimgf9nUHuN585Y9Yz4lfv/4ahiOdTXkIvhu2hQsFVu6D/HLu6h7X7RdbNro/wx g/sXvGBKaCoTITVZCQw/QPgldCKJbUKocpTNVwgHovUmo7e1vddHIGMqk8HPmvJ35cmEMs7gMA+ fPoL5pkcF8tX1j+aT7DohRZCLMNyHKiJj0lbiQRxRH/B5pqB 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. Fixes: b94747f7d8c7 ("drm/msm/dpu: add support for SM8650 DPU") Signed-off-by: Dmitry Baryshkov Reviewed-by: Abhinav Kumar --- 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 Mon Dec 16 08:27:28 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Baryshkov X-Patchwork-Id: 13909379 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 4FE32E77180 for ; Mon, 16 Dec 2024 08:27:52 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id C2BBE10E52A; Mon, 16 Dec 2024 08:27:51 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.b="tXOf2m+2"; 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 A4E7710E3E0 for ; Mon, 16 Dec 2024 08:27:44 +0000 (UTC) Received: by mail-lj1-x22f.google.com with SMTP id 38308e7fff4ca-3022c61557cso40456941fa.0 for ; Mon, 16 Dec 2024 00:27:44 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1734337663; x=1734942463; 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=w6iaR4XhdKUYvlNFXFyoX/pNn4cHsyDnjyLqjwDAVN4=; b=tXOf2m+2bn/833rKjlhgpB5rICXvWP+BF+Ui1UugKyns776FIw0Z4ihB/QIWHSR/HR cDuDQ+0xgpnJTPpKSI0wAEwfm5Fx+LVdYxZrtVaJBkGjel2k2uCJlyGtclR9lLmkrjC+ 2kDp8ahlpBXFtwh7EFZ0Vjnig0y28tsa0eIi8B1B7VBsIE1y7DrkEw6A/dBL5M7VT5sN /nGOCV8Tu5cmF4FnorFjQXWiggAavREa0r46d6xWRcVim/Dq/wJKUDaUCAiBzTcMmzhx HfHTWodLZDLpJqHUxlRpP+GglWTmok2tvBXe6w8FKnFWslKaCmycn0Xgo9ptbwbzus3i cxmA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1734337663; x=1734942463; 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=w6iaR4XhdKUYvlNFXFyoX/pNn4cHsyDnjyLqjwDAVN4=; b=XkGh6JVNUi4YKG2lYAfZFVBtRXo16BS4zdl34hHomnrOAf9HmPojgNG3D3aE+B+Qsf Gr1h9IGVUL1BXheBl32HCLVoY44seKJmS6RuCgbnu0VkSKz/PMh6UdV3XgqdiVghrHnR Ow9T3d2NMKjO7lHHMJIIfv49dnkbVAGyj2sIHvG4MC5hJNteyFU1TZOiuqwsfZHfGa40 ESZZk0NrtsnN9SZ50esBDJHZGW9XmS/W8NyXSUmcDjPMTubHVGrcdK5dCyKtBmg0tu/A bcwPMhBffokUrz4fAsGdcYYslSUs57GETrUH9ugmeZIxmUuxccape1nnbkUcj9jSQlD3 V3yQ== X-Forwarded-Encrypted: i=1; AJvYcCWH7/e2l71d2MzCyrG0BLqFqR5N+DyzCvXGdew427Kc/y/SJCA/VlQi4ujSRdRcC41A9ZqZ1UGC0es=@lists.freedesktop.org X-Gm-Message-State: AOJu0Yxo4OS8NZYh/rbTX6z8BAqyjVhq/LWPlt4Srgf50JGrYF+kGGAA qIZgzOzbevKOIt96cQRhzeA32F/231Jxh1s76WcmHRVlyWUU6fFDNp8+Q1C6DpY= X-Gm-Gg: ASbGncusibQ1LIXtytCN7lJpAsYA84jVqVVwF9CFYDxd5NQ7ZYf7t0KP2hA4Ki3rv6B GZ2QTnYrSID/4czUqkbS16ssySxwmvMzQm3IT3h1AlISZnLbSxLJZGzcXiMDqtXcwNyXzRn/3nY 3U9+3vp1Jcv4ckL9anWI3UgczxIqQJg9LjaeFENjmfhXJrXpSFVjt9PUCzawt/gWC20jhRCiwAP J80V6asS27ZpiLZ44Q3KdjPknyaAYjBb39TJEscVgwjhOp/paAYNeUJqfLz1uas X-Google-Smtp-Source: AGHT+IEy+x7o2Lt7ybsRZe8ZBGCz8wMHfuQe/9Ykj81HF+ZPyzLz0xLLyDsY3vkjOuNJg6AH3N2zDg== X-Received: by 2002:a2e:a9a8:0:b0:2ff:8e69:77ef with SMTP id 38308e7fff4ca-302544230e1mr42812991fa.1.1734337663008; Mon, 16 Dec 2024 00:27:43 -0800 (PST) Received: from umbar.lan ([192.130.178.90]) by smtp.gmail.com with ESMTPSA id 38308e7fff4ca-30344045342sm8543371fa.33.2024.12.16.00.27.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 Dec 2024 00:27:41 -0800 (PST) From: Dmitry Baryshkov Date: Mon, 16 Dec 2024 10:27:28 +0200 Subject: [PATCH 7/8] drm/msm/dpu: link DSPP_2/_3 blocks on X1E80100 MIME-Version: 1.0 Message-Id: <20241216-dpu-fix-catalog-v1-7-15bf0807dba1@linaro.org> References: <20241216-dpu-fix-catalog-v1-0-15bf0807dba1@linaro.org> In-Reply-To: <20241216-dpu-fix-catalog-v1-0-15bf0807dba1@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 X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=1149; i=dmitry.baryshkov@linaro.org; h=from:subject:message-id; bh=0d6Vl9uKHPMWNXj1THwSQ8KfCjRZZOIXlKFBufG6ric=; b=owEBbQGS/pANAwAKAYs8ij4CKSjVAcsmYgBnX+RsCE00L5+s73vnKOb6ulTZZZO35mal3hBlU 0p3uqpReEmJATMEAAEKAB0WIQRMcISVXLJjVvC4lX+LPIo+Aiko1QUCZ1/kbAAKCRCLPIo+Aiko 1V5+B/9pAJg0ZCTSwEwVzazpw8iop9xUL9QAUMhs88Vnbw7eF+Ky0nqKgZQOPcnp9duJ2KZd6ui Gy5oSC8vg5ghOaf6MZeZO4c56G2GEH7P5mrLyc0NWGhX7oetzAUeTeGbmicgRLBMrzpynqDEGu/ eDOJlyhNHdK94yeSjnwIEcve+5ZfFJZmaR/XywGLfDAoXizxGb5vLBwyfRnnnnfdk8qau3JNXUB HdcxyIvCCQg1HyU94uG0rGw5r/qUo+xYWM4BQzWu3xF1K6g4EKe0QTptys5QOkzJNzJ/MGSUzbR 9+xDb3ElV4sLX0QpcniZNzoD55SwhZzlv5M4vizm1nlTCp09 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. Fixes: e3b1f369db5a ("drm/msm/dpu: Add X1E80100 support") Signed-off-by: Dmitry Baryshkov Reviewed-by: Abhinav Kumar --- 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, From patchwork Mon Dec 16 08:27: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: 13909378 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 6F907E7717F for ; Mon, 16 Dec 2024 08:27:48 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id E722D10E525; Mon, 16 Dec 2024 08:27:47 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.b="HmVcfcAi"; dkim-atps=neutral Received: from mail-lj1-x229.google.com (mail-lj1-x229.google.com [IPv6:2a00:1450:4864:20::229]) by gabe.freedesktop.org (Postfix) with ESMTPS id 03ABF10E525 for ; Mon, 16 Dec 2024 08:27:47 +0000 (UTC) Received: by mail-lj1-x229.google.com with SMTP id 38308e7fff4ca-3011c7b39c7so41820351fa.1 for ; Mon, 16 Dec 2024 00:27:46 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1734337665; x=1734942465; 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=jFueXj50GklXs26URhroJEyDlIZhDwWcbd/CoZUqrUk=; b=HmVcfcAiwSjvh5U2Bv54ltdo4tdfTBxCagdSaLATyYy7r0fXlf7jUKSDhrEexNvUP1 g6q5AMMl5yUig8HOvKjK78gr/2P3qVen+j5MKwil46kio97QJ5LGHi9esxZgFCJuo0j1 LNBA4c+lZ8DsWCAQWZQQDC1LAg6TU3zgGgAy6PZKf39e2Z/Fb4x+ZUfHjSsLXyUd9g8g eYRhLHadoBQ6rFO2fv42K+84Ybguqv7svGxrVygVdD+NArKeGLoVGV2pEZGcsxavaATV hJgt9s+Og2pFgtpTZw1j7vniFwm3AZ/RLwLm+BJC1tVDCkpBqcnezNcS3al8yzxkOkZq Qz6w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1734337665; x=1734942465; 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=jFueXj50GklXs26URhroJEyDlIZhDwWcbd/CoZUqrUk=; b=iYakBH71QT11tGFnpVfehoO3CP57zu/bV16y52F1dQ7OUr75XkzPNNDQQU93GbEG4S lEO4sqIG4ocTtBbHmm5u/Ip26QCTQ/jvhCOOOn0JHj3xXV0bG5ZUCXlHKkSe4LZfP6S9 wXwBZS2e9hGuVfXjbavX8D8TFpVfrboV7Avq/e3e37vxm61AFleOL6biaiOWSfzt7xSA Kz1v7FArv8JvQQKDFgFLk5aeRDnjPUwL50j3ZNfZY6bKiofFjaFV0VqXQhjakl2nnujq bZ8pygrpDG1e6/fD1aMOEYlNYwM+6Ojk1u+wUDfSLtDPoQePWoxUCde97BLNHPmm6ZyL Atdw== X-Forwarded-Encrypted: i=1; AJvYcCUFjYt2DEoYDCvBQ4Uo//0ZzrGw0RiLh0Dkx7Qsq8+0sR7BXcPWhV5oojJ5OMdH93M6zAVqwqSrNhY=@lists.freedesktop.org X-Gm-Message-State: AOJu0YwzqSpPmU78buSXBAQnWSKw7gonwq8DQaMbL7ZzSO5fMFLqHwt1 RC9DnI6vZKmV3ZgJfTjr+JwjacGm3z2aU8VEfgO/GxzDu2j5vK0+xD+rueX6Mz8= X-Gm-Gg: ASbGncvKYTVtxmpw28xkiYZCOArhvt3+BYXrn13pAg13wUt6mCjPYVjdJisrvlOvF7r 7pI7Q+n5JBg8TXuw7xz/Uggf8CXCGu1FLE/KudCEBZpmz2QpyCTRkh6pf9lg/We+zEn4hNmljt+ 0P6OSQbzu2WTstyAGyysABu56NdEsBEIKfb40M0o2gMprd04pf60IfrUYoSsjGF3OV1NgThMjFO o65ztbBuEy4UYD6xgAliZ/AdcQm1761d0c8PX57+eKGAQOXdB/jcc74eRylQ1VU X-Google-Smtp-Source: AGHT+IGsrhukEvweE+kATGZLKV7abTQp6BM2UyFHz+pdJV3ZnHx5w2xQCWTcZUPlJgEfT6lvq/IlrA== X-Received: by 2002:a05:651c:2122:b0:300:1de5:59e3 with SMTP id 38308e7fff4ca-30254521ed0mr38410041fa.2.1734337665329; Mon, 16 Dec 2024 00:27:45 -0800 (PST) Received: from umbar.lan ([192.130.178.90]) by smtp.gmail.com with ESMTPSA id 38308e7fff4ca-30344045342sm8543371fa.33.2024.12.16.00.27.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 Dec 2024 00:27:44 -0800 (PST) From: Dmitry Baryshkov Date: Mon, 16 Dec 2024 10:27:29 +0200 Subject: [PATCH 8/8] drm/msm/dpu: provide DSPP and correct LM config for SDM670 MIME-Version: 1.0 Message-Id: <20241216-dpu-fix-catalog-v1-8-15bf0807dba1@linaro.org> References: <20241216-dpu-fix-catalog-v1-0-15bf0807dba1@linaro.org> In-Reply-To: <20241216-dpu-fix-catalog-v1-0-15bf0807dba1@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 X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=2663; i=dmitry.baryshkov@linaro.org; h=from:subject:message-id; bh=onC/sZOCceTmvl+85uTb+5rs4Fex+BwK8WACCKdIkwI=; b=owEBbQGS/pANAwAKAYs8ij4CKSjVAcsmYgBnX+RstmAKkhUgDFSMOhulvZdpJWZcJyZTinijT 6Z1u7es4gqJATMEAAEKAB0WIQRMcISVXLJjVvC4lX+LPIo+Aiko1QUCZ1/kbAAKCRCLPIo+Aiko 1aAOB/91xjMOv0FVK7azVd6PO2iTLH9oMN0HMJWRapBLHclS/S2HRw4THhS0ZTXl3SQWdRSKTzi wIF0W3NfZ7im9NKZR6BNny0YHjrC4g8ctYty0aFeoGiCyAKdHSzf3n0ws09fsYYKkpKTxpvF+pf +u1+U1KJN/2e8b3eUkzrdnVy1naigTtie8j7011s4SkhnbTbkF9QIn0ky4UqNxEaBzuCNuuLUVP xb+A22DDN96Y1ASkC+ta8ZI6TQR+qyUccvPAL4VKZOVLA8kHl1kNPqUNGLVncSzKoEvDeWa6mVG sOV3h9QmLI9X8KpCwJYjMA9uHtbm2rAZXondZBSxwraOMne/ 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)") Signed-off-by: Dmitry Baryshkov Reviewed-by: Abhinav Kumar --- .../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),