From patchwork Thu Sep 5 03:26:13 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Baryshkov X-Patchwork-Id: 13791668 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 E24E8CD4F4F for ; Thu, 5 Sep 2024 03:26:29 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id CDE9A10E659; Thu, 5 Sep 2024 03:26:21 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.b="OvXa5SqP"; dkim-atps=neutral Received: from mail-lf1-f42.google.com (mail-lf1-f42.google.com [209.85.167.42]) by gabe.freedesktop.org (Postfix) with ESMTPS id C7CBF10E627 for ; Thu, 5 Sep 2024 03:26:18 +0000 (UTC) Received: by mail-lf1-f42.google.com with SMTP id 2adb3069b0e04-53436e04447so224830e87.1 for ; Wed, 04 Sep 2024 20:26:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1725506777; x=1726111577; 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=YU8j84JZB809IcncSQWLx7Izd+21A+I9iJZxkqhYAfM=; b=OvXa5SqPh0mWJXgB/oRzztT+5xIIUnrTpt5qytAnur68mkozXrA8emxs0rsN3Hb137 kPWgBSV7a6NUzVD7dbZgkj2XMxoLnN849hvhLOViv2GTSJPsSM3kLWDKaZ75Pu5xo5WU aaiSbFS/N2cfjGrTanH8XPHgSJV1Zy2GzejMOvQqkY+lwAnHHGJEsqEiEAw09lTQ1eXO 4rzHZd77TjQDp+ocquFztLWBuuqCmbx0/WodU6GF4NLIFhPQHtaW899aT1RZzsj2KVg5 IE9W9VUKWIAJG87n4q3Sba+vg5sx8MtmZdPXQhN8ICTCd5ATdQ+FZSyK6frc3NuGzrwE yYsg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1725506777; x=1726111577; 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=YU8j84JZB809IcncSQWLx7Izd+21A+I9iJZxkqhYAfM=; b=Vn9Ln/POwow2aNm1ya/KmA2gLkNuwyaS1/M0PcGtdbDvPdc7SK6Hks9Lnu0A+hKMra bkjLzDWFq/06/7RXGgt297CpgjnHLp69TCz+/vhro7lthP5khkieCKFy2MSei2ebUAdA Xbx/YkyqdJaO15Q28vAlIgNI+6sUw2wCs5D+e1pnRBaMWmJXFUTZ72B3/6R1ruL9y0Az bFVqx+6lDVCGrtdjVD0SarWXkF0DybHCxipu8ZUNq5AhHZ/mhhX8X9ZCjj/QCAH8aBp4 ICALR8pUzm5lctK0W1CBXByGzuD/y3B4fOmPKys2RvirXSVL0aiZTlA0ZYdGHAHqG92b cNZw== X-Forwarded-Encrypted: i=1; AJvYcCWkYkfZOv7fv+QLmfV2nyiuKf+voidtGJnSGvNsP0/yd0tPBXr/HBZVzJdQWjtARRdrLhz4DZPGALg=@lists.freedesktop.org X-Gm-Message-State: AOJu0YztmefXb6YvUsxf5GcpmLV7rLEflZdj5gwmVRlOYVm+Vgsbl8ZK gnQUDX+R6QRVDDV4CQzVVUDa23MNkhbE2zVF7TGyJ+xhkOqtxDtq1/i3hMwMRAV32FtYBJnWsyo O X-Google-Smtp-Source: AGHT+IGsEWNXC2f1c3D0I+zxRSTqAMuxXvpOEo91BcFHWNG5/aUwRnJA/fWQmf3Mdhco8AyTjrh9zw== X-Received: by 2002:a05:6512:1188:b0:52f:441:bdd6 with SMTP id 2adb3069b0e04-535674e7e79mr1533655e87.0.1725506776531; Wed, 04 Sep 2024 20:26:16 -0700 (PDT) Received: from umbar.lan ([192.130.178.90]) by smtp.gmail.com with ESMTPSA id 2adb3069b0e04-53540841a3csm2533860e87.226.2024.09.04.20.26.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 04 Sep 2024 20:26:16 -0700 (PDT) From: Dmitry Baryshkov Date: Thu, 05 Sep 2024 06:26:13 +0300 Subject: [PATCH 1/3] drm/msm/dpu: on SDM845 move DSPP_3 to LM_5 block MIME-Version: 1.0 Message-Id: <20240905-dpu-fix-sdm845-catalog-v1-1-3363d03998bd@linaro.org> References: <20240905-dpu-fix-sdm845-catalog-v1-0-3363d03998bd@linaro.org> In-Reply-To: <20240905-dpu-fix-sdm845-catalog-v1-0-3363d03998bd@linaro.org> To: Rob Clark , Abhinav Kumar , Sean Paul , Marijn Suijten , David Airlie , Daniel Vetter , Sumit Semwal , Sravanthi Kollukuduru , Rajesh Yadav , Archit Taneja , Jami Kettunen , AngeloGioacchino Del Regno Cc: linux-arm-msm@vger.kernel.org, dri-devel@lists.freedesktop.org, freedreno@lists.freedesktop.org, linux-kernel@vger.kernel.org, Jeykumar Sankaran , Chandan Uddaraju X-Mailer: b4 0.14.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=1116; i=dmitry.baryshkov@linaro.org; h=from:subject:message-id; bh=F9C+Oqk1Y88LBjszt+kJ0vjfDky4vE/BJ9fNTH+vsZM=; b=owEBbQGS/pANAwAKAYs8ij4CKSjVAcsmYgBm2STW6BXa+LG+21cLphfZoxD9U8XBc0s/zxIHx DMxe6ZCcLCJATMEAAEKAB0WIQRMcISVXLJjVvC4lX+LPIo+Aiko1QUCZtkk1gAKCRCLPIo+Aiko 1WD1B/sERkzjfa0PtufXwoDP1wA9cOwPVuN3B1cfX80GzU4cgDDJM7bYvRJFk3bQDDYrHfaIBjz 37smnHdSIuQU4E5JKPFz93dYiXqozXYeuCBa+0TnYxGB55Hqn1WS21h/PLZWY2rLgHL0tHGcsCn WZtBoxTh+TbXooB/CaGb5rbFCBF0hLSIzzCS4NzuMzrTk1uads2oo+87hHNZYpFGs7JkuYS4G8e JCnuei9zRkTecd8AlcWT16hbXa7vFjJM+DprcEaAxSc1hSq2hZ5+t1vIoiqX2zlDVXwojGKiCV5 evZcaBtnsmpygJT8XRK2J1ImcrI81Pejvwl68qeMJ4jZHq4i 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 the SDM845 platform the DSPP_3 is used by the LM_5. Correct corresponding entries in the sdm845_lm array. Fixes: c72375172194 ("drm/msm/dpu/catalog: define DSPP blocks found on sdm845") Signed-off-by: Dmitry Baryshkov Reviewed-by: Abhinav Kumar --- drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_4_0_sdm845.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_4_0_sdm845.h b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_4_0_sdm845.h index 7a23389a5732..59eeea3dd2e9 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_4_0_sdm845.h +++ b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_4_0_sdm845.h @@ -161,7 +161,6 @@ static const struct dpu_lm_cfg sdm845_lm[] = { .features = MIXER_SDM845_MASK, .sblk = &sdm845_lm_sblk, .pingpong = PINGPONG_NONE, - .dspp = DSPP_3, }, { .name = "lm_4", .id = LM_4, .base = 0x0, .len = 0x320, @@ -175,6 +174,7 @@ static const struct dpu_lm_cfg sdm845_lm[] = { .sblk = &sdm845_lm_sblk, .lm_pair = LM_2, .pingpong = PINGPONG_3, + .dspp = DSPP_3, }, }; From patchwork Thu Sep 5 03:26:14 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Baryshkov X-Patchwork-Id: 13791667 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 9CA60CD4F4E for ; Thu, 5 Sep 2024 03:26:27 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id A6C3310E64E; Thu, 5 Sep 2024 03:26:21 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.b="HZGnA+Yc"; dkim-atps=neutral Received: from mail-lf1-f45.google.com (mail-lf1-f45.google.com [209.85.167.45]) by gabe.freedesktop.org (Postfix) with ESMTPS id 8445A10E627 for ; Thu, 5 Sep 2024 03:26:19 +0000 (UTC) Received: by mail-lf1-f45.google.com with SMTP id 2adb3069b0e04-53653682246so136053e87.1 for ; Wed, 04 Sep 2024 20:26:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1725506777; x=1726111577; 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=HXkbUeL6IBm1wfBjjD3+Jqzr9VFTIqcKeiflyied+rY=; b=HZGnA+YcQbvsqRTX5WGqzVrW7TrA8VCG9kJkZWZvPM6uDAiP6uFB/e3QmXAolsAxZf 9G+K6KkfmS1Cw4tDut3kSGegSzDvGYoXEeyEoNJlnek9RxOG5Z8cMvYfbZTj/KEkEfM1 PK+rb3/xY7KH96Ubr8o6bO/Vyi575we5adb5nMw3fAciPUC64KrPIvm26haJiSSihtg/ nzHJXsJfr37wAmH22u+VGvkYJEwY02nZiIX8pYZGuxKxxRbwYGk9kaAjwlf70Dj0yXZa bC5WSwR5WTOsSzm+UObORYP2LrGjvsBtTfDSB7MVsmkSywDt2XxjaaHC0fzPuzMEJNwq hHSQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1725506777; x=1726111577; 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=HXkbUeL6IBm1wfBjjD3+Jqzr9VFTIqcKeiflyied+rY=; b=XNEzyX2Zpn6SdFv9jegA4d2pxFtd9v+NlB4DA97xlPve092/SY5oiDpAWNX69v9hON wzZvU4wAAHWvZybqYiOR3lr0+XamfYm4lJMOCzWxKZ25DL27pLIJshBb+QilSuSWc+1+ Tl6pzzTxzl4KAgdEHJ+WEcPw27BcHAYPSbRYeRsc9ZXEJnqb/GeMTNtZ3GzqpdQ4wP4N ujlGCHFEQDdTCQbVRqKoJDUA12glSv5N0lUKwbS8jfg/rnyPAc7sBX2ovzeSz2qbd1Ck g7JqfqHbkeOx5bPgcDLPCVeKcbGIG9wtHITnA+BfWZtui86o9dY1T5Ot6pRVl3dBxWX3 qQyA== X-Forwarded-Encrypted: i=1; AJvYcCV50UAlIZnbuVab+QRN/0yBy1plwDYA0aX0OsuE+KxS2RvujpDRmrfKf2+bFSfMTzkFc3RFN6xW4y8=@lists.freedesktop.org X-Gm-Message-State: AOJu0YwE64NO72oP17QZWApiiAIhkoWHt0tho1dFonqHHj6aok8dMTT1 11F9lsc1egCyIM5TNwlz5vVM00r453rXEKABtQOgRbTwFkq9tMnZ5Fzkiwi0kBI= X-Google-Smtp-Source: AGHT+IFMkHsMnMLWdT1fhzzdQZpoQBpRVkz8r8+V5KRN0VXmkFhO+BW4y2FQh7cEClInnZi740RvbA== X-Received: by 2002:a05:6512:1395:b0:52e:74f5:d13 with SMTP id 2adb3069b0e04-53546b33317mr13331248e87.30.1725506777322; Wed, 04 Sep 2024 20:26:17 -0700 (PDT) Received: from umbar.lan ([192.130.178.90]) by smtp.gmail.com with ESMTPSA id 2adb3069b0e04-53540841a3csm2533860e87.226.2024.09.04.20.26.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 04 Sep 2024 20:26:16 -0700 (PDT) From: Dmitry Baryshkov Date: Thu, 05 Sep 2024 06:26:14 +0300 Subject: [PATCH 2/3] drm/msm/dpu: drop LM_3 / LM_4 on SDM845 MIME-Version: 1.0 Message-Id: <20240905-dpu-fix-sdm845-catalog-v1-2-3363d03998bd@linaro.org> References: <20240905-dpu-fix-sdm845-catalog-v1-0-3363d03998bd@linaro.org> In-Reply-To: <20240905-dpu-fix-sdm845-catalog-v1-0-3363d03998bd@linaro.org> To: Rob Clark , Abhinav Kumar , Sean Paul , Marijn Suijten , David Airlie , Daniel Vetter , Sumit Semwal , Sravanthi Kollukuduru , Rajesh Yadav , Archit Taneja , Jami Kettunen , AngeloGioacchino Del Regno Cc: linux-arm-msm@vger.kernel.org, dri-devel@lists.freedesktop.org, freedreno@lists.freedesktop.org, linux-kernel@vger.kernel.org, Jeykumar Sankaran , Chandan Uddaraju X-Mailer: b4 0.14.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=1183; i=dmitry.baryshkov@linaro.org; h=from:subject:message-id; bh=y3ucrmUxDNZOI4nUsv8gjzz+ts2FHFe8wotadhtRUnQ=; b=owEBbQGS/pANAwAKAYs8ij4CKSjVAcsmYgBm2STW20N3JEPm4IfZde4z+mefw49r+VBcRWLuR d3caRDz19uJATMEAAEKAB0WIQRMcISVXLJjVvC4lX+LPIo+Aiko1QUCZtkk1gAKCRCLPIo+Aiko 1amSCACy4WnuagqHhLhtVUcRjFzx4e6xhzfd0pzurnwJcXaBkI+erzRSKHqlcjdYP/agBGblehI yxt4Ecpq9NZRFIO2ZwD0K9EhoBhUQmjYNO+XtEX677quTRV3v5Phh1RJk/+PajLYo+XWCO1fP8T JjcwNJdezEZ58bFMoObKhzx8jp4Gx0Y99gv6nL+amo2dxPsAHPT9yuDHVK+jR85QNio3TGNG/yl WNWE8BgOc1FstLs6qYjnYms+JBmNfwMqmxp8F0jHReXkSLvmZs9rvLdbrH2tVxuh2IcnIf9Cp07 c12CP36gN8p+pWot/Ca0cNGE11l71XHwNMxzeBaN79F1qZ5F 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 the SDM845 platform ther are no LM_3 and LM_4 blocks. Drop them from the SDM845 catalog. Fixes: 25fdd5933e4c ("drm/msm: Add SDM845 DPU support") Signed-off-by: Dmitry Baryshkov Reviewed-by: Abhinav Kumar --- drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_4_0_sdm845.h | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_4_0_sdm845.h b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_4_0_sdm845.h index 59eeea3dd2e9..72bd4f7e9e50 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_4_0_sdm845.h +++ b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_4_0_sdm845.h @@ -155,18 +155,6 @@ static const struct dpu_lm_cfg sdm845_lm[] = { .lm_pair = LM_5, .pingpong = PINGPONG_2, .dspp = DSPP_2, - }, { - .name = "lm_3", .id = LM_3, - .base = 0x0, .len = 0x320, - .features = MIXER_SDM845_MASK, - .sblk = &sdm845_lm_sblk, - .pingpong = PINGPONG_NONE, - }, { - .name = "lm_4", .id = LM_4, - .base = 0x0, .len = 0x320, - .features = MIXER_SDM845_MASK, - .sblk = &sdm845_lm_sblk, - .pingpong = PINGPONG_NONE, }, { .name = "lm_5", .id = LM_5, .base = 0x49000, .len = 0x320, From patchwork Thu Sep 5 03:26:15 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Baryshkov X-Patchwork-Id: 13791669 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 8F02CCD4848 for ; Thu, 5 Sep 2024 03:26:31 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 4F71610E669; Thu, 5 Sep 2024 03:26:22 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.b="I35ai81/"; dkim-atps=neutral Received: from mail-lf1-f53.google.com (mail-lf1-f53.google.com [209.85.167.53]) by gabe.freedesktop.org (Postfix) with ESMTPS id 3453C10E63E for ; Thu, 5 Sep 2024 03:26:20 +0000 (UTC) Received: by mail-lf1-f53.google.com with SMTP id 2adb3069b0e04-535be093a43so261611e87.3 for ; Wed, 04 Sep 2024 20:26:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1725506778; x=1726111578; 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=dMVe3dV+riSJbx0XmpXNkjqyIshg14e/HbhXiq4bN9I=; b=I35ai81/rzzYK4oaV47+s4qbxjUQENVyqJ4HbKc7ka12oeiXb8MqTD5Igj66mKB18F 8DzUaa2vDDyJy2use2VU8lQHgKMOjDHeM0FyEdC25/IJiVIePrZYV7Ipub0x9tn2dbUn dnd6rOjEwAyKyqk0mC+sDkMEYC7pI5DIaeAUBkZbra5qoX8IfACZe/eBRa6qyGZhNk0p ZErD/IWfh04SxOj0B86hFt+fIEc4X+GIuC/IAGQeCc6Zh9qY3QKfEysYmojUzOl+MOfm qjBQ776UN13VuYHS0bEkU+RvUUAAfU+uus0yJD//dqzkaXeGPWgoSH3K/Spkif1UYzDU 3EVg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1725506778; x=1726111578; 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=dMVe3dV+riSJbx0XmpXNkjqyIshg14e/HbhXiq4bN9I=; b=sH++VB4VBn52djTCbued+Zt27FX0tGGry++iA22h5IgLtPTsMZL/G1urZu4glA1gyT Ee5dP2cvFnFMLSC/fTzkIO3PkNFdHRMiV7DIiPsr9mooqpk9mWG3A9oR362f7ysvHEs2 NT4bqZVeGz/d6yPejV6alsffj3dNRbioF15CVwmMBPv3roxZafUVa6qwQhuwhFZnQH5b /b/m2VtLhzbmRDD3cTmLj0eKZhjLe7AR4YvvNueBy/2z90BUYITcAly8diZbrgI8MutA feeHPynTVBnaKloK7RwZZygpghhOVD68nLnWXMvkpVMKbEpPhPLlerhPTw87RkuP1tim +i1Q== X-Forwarded-Encrypted: i=1; AJvYcCVWG1IR736LxzNScMZNdIHBSxXfKHh7pq/ljDvtF3Ssd+cjRNFrwK+Zc0ohqfEbcBl+/X19t+R+z6Y=@lists.freedesktop.org X-Gm-Message-State: AOJu0YxuLRNisw7nRgdbXrVN+k1SqsgFVWKfcMOHW5mEJNcc0MFMhPfg /ZzdMjmzuvN35VzhvQpoTKQqkb3NLkCX65LQfD94W7T+A10p6gxiIhL4bcuvR2w= X-Google-Smtp-Source: AGHT+IE+acS5vwCPZFfqy48BFrmCtYX0ql9IXQeheRpZrwQ/SpmPQiQYu7G/Vy0git+9k2kOjN0YnA== X-Received: by 2002:a05:6512:3d24:b0:52e:a68a:6076 with SMTP id 2adb3069b0e04-53546bb4d0fmr14476272e87.49.1725506778081; Wed, 04 Sep 2024 20:26:18 -0700 (PDT) Received: from umbar.lan ([192.130.178.90]) by smtp.gmail.com with ESMTPSA id 2adb3069b0e04-53540841a3csm2533860e87.226.2024.09.04.20.26.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 04 Sep 2024 20:26:17 -0700 (PDT) From: Dmitry Baryshkov Date: Thu, 05 Sep 2024 06:26:15 +0300 Subject: [PATCH 3/3] drm/msm/dpu: drop LM_3 / LM_4 on MSM8998 MIME-Version: 1.0 Message-Id: <20240905-dpu-fix-sdm845-catalog-v1-3-3363d03998bd@linaro.org> References: <20240905-dpu-fix-sdm845-catalog-v1-0-3363d03998bd@linaro.org> In-Reply-To: <20240905-dpu-fix-sdm845-catalog-v1-0-3363d03998bd@linaro.org> To: Rob Clark , Abhinav Kumar , Sean Paul , Marijn Suijten , David Airlie , Daniel Vetter , Sumit Semwal , Sravanthi Kollukuduru , Rajesh Yadav , Archit Taneja , Jami Kettunen , AngeloGioacchino Del Regno Cc: linux-arm-msm@vger.kernel.org, dri-devel@lists.freedesktop.org, freedreno@lists.freedesktop.org, linux-kernel@vger.kernel.org, Jeykumar Sankaran , Chandan Uddaraju X-Mailer: b4 0.14.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=1277; i=dmitry.baryshkov@linaro.org; h=from:subject:message-id; bh=KnnNbGZkukvbhdJ4+vjUC7nnvFSR94+qavRX0iu+euY=; b=owEBbQGS/pANAwAKAYs8ij4CKSjVAcsmYgBm2STWnttq8+i1NuRxG0sRjN+Pu4vbmRCduSOT5 PdTVOSI9cuJATMEAAEKAB0WIQRMcISVXLJjVvC4lX+LPIo+Aiko1QUCZtkk1gAKCRCLPIo+Aiko 1Y0ACACbYLNDW/4i+2oZ6R8wbt8nuCMVXDGVTRy41HFmR9wJLSiqYXZdU88wXVZUoVToIy3ZnzQ MB2/Y7veEbRQQm+4ZuOLZh/+kALsNMc/GGZPH/pkBJAXCp5isa87fYxWtg35rn7kjsni0F1DSol OO+Xs35CudYnkNtVxbxez+/Dw3OIba3jpCNngWHkE9ADO3lZBE+nOTE1xoVZfc4TAHmhZrJyeTv ntEcJmCYKGwKlgwFGXe/4aBNf9ZlvjvLz+XcBzEOfiMF6lhCqVjk68btl48xGZp/S/MTs1uJFW1 E4ma7P6ds374GzuyyttRXUcK2LCw+3cSZOP1b2vakxWtDkSL 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 the MSM8998 platform ther are no LM_3 and LM_4 blocks. Drop them from the MSM8998 catalog. Fixes: 94391a14fc27 ("drm/msm/dpu1: Add MSM8998 to hw catalog") Reported-by: Abhinav Kumar Signed-off-by: Dmitry Baryshkov Reviewed-by: Abhinav Kumar --- drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_3_0_msm8998.h | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_3_0_msm8998.h b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_3_0_msm8998.h index 1d3e9666c741..64c94e919a69 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_3_0_msm8998.h +++ b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_3_0_msm8998.h @@ -156,18 +156,6 @@ static const struct dpu_lm_cfg msm8998_lm[] = { .sblk = &msm8998_lm_sblk, .lm_pair = LM_5, .pingpong = PINGPONG_2, - }, { - .name = "lm_3", .id = LM_3, - .base = 0x47000, .len = 0x320, - .features = MIXER_MSM8998_MASK, - .sblk = &msm8998_lm_sblk, - .pingpong = PINGPONG_NONE, - }, { - .name = "lm_4", .id = LM_4, - .base = 0x48000, .len = 0x320, - .features = MIXER_MSM8998_MASK, - .sblk = &msm8998_lm_sblk, - .pingpong = PINGPONG_NONE, }, { .name = "lm_5", .id = LM_5, .base = 0x49000, .len = 0x320,