From patchwork Sat Mar 1 09:24:54 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Baryshkov X-Patchwork-Id: 13997407 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 B56F0C282CD for ; Sat, 1 Mar 2025 09:25:06 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 2AB2210E16D; Sat, 1 Mar 2025 09:25:05 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.b="RkeNhkfO"; 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 91DAB10E167 for ; Sat, 1 Mar 2025 09:25:03 +0000 (UTC) Received: by mail-lf1-f53.google.com with SMTP id 2adb3069b0e04-5494bc4d796so2168246e87.3 for ; Sat, 01 Mar 2025 01:25:03 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1740821102; x=1741425902; 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=0JVwBbchrlGfLWd7zeEe09mlkUBfIcbBf0ReoU16PUE=; b=RkeNhkfOfJSdVJu/uzlhQ19S75M1pSOHlsw5iinR/4l9gQTTdDnPI0QkiU7Ac3or4Q z82lROBjzIX49S/cEC/jVGV2VLEnvSRYppDDl9cwmWUqnf1mlu1r+OYslKXowqf0v4wf H7lClAWsFqJPlMzgWrjtvOPCiL02FN6eSvRdBu2dQ9id000P4ii2gocadVLzp+iG/iz1 2txVb1Ay4JXl1iggN3xm3Q617sFSU9dFhZF5fQ4WuwmW9OzAxsQ1VRp4LNVNFZeF/ysv C6PThbUwSID+NnAr4SnXEE7NpJf8K/+WEk9mg0lSxj3721NA3JAjHVbs4+I+YyeuyMSg Bf2Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1740821102; x=1741425902; 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=0JVwBbchrlGfLWd7zeEe09mlkUBfIcbBf0ReoU16PUE=; b=CGViiH4/nb2olnC8eyGkQPasP9gBh9rtr+N8aRSjTGpjE90jl97VcNUitANP+awOnU 9L+YYnHqOWaF5erW4E95yI/4tQjOtWp0HVojlXDpCbz8PM2EpxZXEejcClyX53/zBfE4 6Acwz63qYZimuCejbEAml4TDvM3mL6R9qWQxPS1vKHRXIb06pOyi9QVjCeWVV65e2rmG sCc7v23TMmyZcEIsc+3vLD7Eb1kumfmP0ZQMWSSv39fV2MeqFMxeiR8l2LAO9ANzZQgy Gpr6/lFNU36Nsp5EB5B1Zl3sM1j/wjUWLSy2pBi70MuDQ/rOWJ3agdJtLMnPzbv8HM2a MSbQ== X-Forwarded-Encrypted: i=1; AJvYcCVpZJYVhSUCBNRYWS7RFNlRMJ3bma8U4KY7DU/O0i6TP+2QD7hkkOdQN/DGR7VFrNithLLF+JXmeYA=@lists.freedesktop.org X-Gm-Message-State: AOJu0YzViWcHgSdpjYSGNo1N1u41ONVLR15zj6xWPm+cg1VB6QGcnjrx wVvtryB5DAH7Xb6qOFJUJjtA4HzaE+ycI5iYVB1RtWyX3JsEXGPoMlulHZBGt40= X-Gm-Gg: ASbGnct3pQ2dnjN0LyEGm2ICwYIqHBVrozUnoXYv0u3aYWiUOiZNVtppu6pLY0JhnvW vSH/d28jCf3zrmBSJdmKGc6hbZCeKpEi6XSZC8oUf0VPAvUBCMC/hY3lZoXcoBvgYZIBJbOigyF +bKtNWl7C3uhpqhatisck56aCJayzRmg6RdYwCEfKYtKNqCvJpPD3rZxmlM3AawD8dpI2W/znpU GQNqGb9Po4CRZfMGyH3MJ2OrJ8pR3bjVvkdNsKdRdYKLNVEvFkDEpefFNKJTiqOKVa9tp7k59cE ffYMdI+blNjI0ZcNJV8cNOum/vat2okA7wjf2XQxnkXxeoy4Dkrd X-Google-Smtp-Source: AGHT+IFyI4K4ofy4rt283J1E493B2LFgM14L99NpHlb5eH+sLu5qjueAHc56DM5e2fZC/5lr7A1fIQ== X-Received: by 2002:a05:6512:158f:b0:546:2ea9:6666 with SMTP id 2adb3069b0e04-5494c37d8b1mr2545975e87.34.1740821101846; Sat, 01 Mar 2025 01:25:01 -0800 (PST) Received: from umbar.lan ([192.130.178.90]) by smtp.gmail.com with ESMTPSA id 2adb3069b0e04-5494417432csm738406e87.52.2025.03.01.01.24.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 01 Mar 2025 01:25:00 -0800 (PST) From: Dmitry Baryshkov Date: Sat, 01 Mar 2025 11:24:54 +0200 Subject: [PATCH v2 1/5] drm/msm/dpu: remove DSC feature bit for PINGPONG on MSM8937 MIME-Version: 1.0 Message-Id: <20250301-dpu-fix-catalog-v2-1-498271be8b50@linaro.org> References: <20250301-dpu-fix-catalog-v2-0-498271be8b50@linaro.org> In-Reply-To: <20250301-dpu-fix-catalog-v2-0-498271be8b50@linaro.org> To: Rob Clark , Abhinav Kumar , Sean Paul , Marijn Suijten , David Airlie , Simona Vetter , =?utf-8?b?QmFybmFiw6FzIEN6w6ltw6Fu?= , Konrad Dybcio Cc: linux-arm-msm@vger.kernel.org, dri-devel@lists.freedesktop.org, freedreno@lists.freedesktop.org, linux-kernel@vger.kernel.org, Konrad Dybcio X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=1574; i=dmitry.baryshkov@linaro.org; h=from:subject:message-id; bh=6iPuaAjsYMeQVkUS24obUEbYrmaOHTnqfR5LGKvkJrI=; b=owEBbQGS/pANAwAKAYs8ij4CKSjVAcsmYgBnwtJn4QALW4Yp9jHaAiSTff5oWqqXJrWsumAXS yBUql9GT86JATMEAAEKAB0WIQRMcISVXLJjVvC4lX+LPIo+Aiko1QUCZ8LSZwAKCRCLPIo+Aiko 1bKaB/0TSkQtXBypTrGIYYMHCArbLA2WM5wcSRk1VeH/6Oy/jD6i8npth08Pb7n3qqv42TSGdFP 9Ah5kV7z1VZiMxs16n5Zqq/sUNCXg4gVnuuNUTp/Q0RQGDZdwMyhANgV7PFR//V6/UVDw0BKhub t8ehERkXMhY00pPHTnpuTRlqvUkbpsWNx8xy801MR0qAm4NSJ9PFmWbiaa7+zbDlpSxoU3g6kog AlLCfhbQ1mQpBiCGvxrFEvOayxMX+Qra03tg/D9jtulkr8Qyn52sfGmKsoMENLpc7PBh5isfGBE w1iRAIAElUBfHMniHEFWvPnwro0GxfbQZM5s+GTcwVjZCYk6 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" The MSM8937 platform doesn't have DSC blocks nor does have it DSC registers in the PINGPONG block. Drop the DPU_PINGPONG_DSC feature bit from the PINGPONG's feature mask and, as it is the only remaining bit, drop the .features assignment completely. Fixes: c079680bb0fa ("drm/msm/dpu: Add support for MSM8937") Reported-by: Abhinav Kumar Reviewed-by: Konrad Dybcio Signed-off-by: Dmitry Baryshkov --- drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_1_14_msm8937.h | 2 -- 1 file changed, 2 deletions(-) diff --git a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_1_14_msm8937.h b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_1_14_msm8937.h index ab3dfb0b374ead36c7f07b0a77c703fb2c09ff8a..a848f825c5948c5819758e131af60b83b543b15a 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_1_14_msm8937.h +++ b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_1_14_msm8937.h @@ -100,14 +100,12 @@ static const struct dpu_pingpong_cfg msm8937_pp[] = { { .name = "pingpong_0", .id = PINGPONG_0, .base = 0x70000, .len = 0xd4, - .features = PINGPONG_MSM8996_MASK, .sblk = &msm8996_pp_sblk, .intr_done = DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 8), .intr_rdptr = DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 12), }, { .name = "pingpong_1", .id = PINGPONG_1, .base = 0x70800, .len = 0xd4, - .features = PINGPONG_MSM8996_MASK, .sblk = &msm8996_pp_sblk, .intr_done = DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 9), .intr_rdptr = DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 13), From patchwork Sat Mar 1 09:24:55 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Baryshkov X-Patchwork-Id: 13997408 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 C6B90C282CD for ; Sat, 1 Mar 2025 09:25:08 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 4672010E175; Sat, 1 Mar 2025 09:25:07 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.b="qbrxD453"; dkim-atps=neutral Received: from mail-lj1-f173.google.com (mail-lj1-f173.google.com [209.85.208.173]) by gabe.freedesktop.org (Postfix) with ESMTPS id 1F4D310E175 for ; Sat, 1 Mar 2025 09:25:06 +0000 (UTC) Received: by mail-lj1-f173.google.com with SMTP id 38308e7fff4ca-309311e7b39so29217421fa.2 for ; Sat, 01 Mar 2025 01:25:06 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1740821104; x=1741425904; 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=h5L/pucqd7w1XEPp1X1sTPz+Fsqhsm/pl7T20lV9Gm8=; b=qbrxD45321mWOyfokqWnxB9R4KfaiB6WqpLA8qBV1yb6GUUQu4e1TnoSoVGub4Vbw3 SVKx0ctVKW8dNU/kneYp3YMeGDljTRtGLKGh4ePFhiuMzJg5BXxpXO1HQagqvudEOCUz FB2sZmKc7pkSHhwc7f6FWlPpynzK6+pN1LW5ZcwuTNQl11CMwmC4dDbGKDWNE0F41wM4 rG77N5u/jbF0iVCYZe5e9PDsVHeGT7fsbBXPQfNz9NoZDvOSe8chWtSWZfKbpbYPh2pf GTh3CjyBd/ywJdrKepzBvD8Pv/chuv3ucwKn1GeWzmyxv76bVmT9jB/7wMaR40cZZpES b35w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1740821104; x=1741425904; 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=h5L/pucqd7w1XEPp1X1sTPz+Fsqhsm/pl7T20lV9Gm8=; b=czrgwI0cFoJV23O2b31byzZF+qiV0UPxB95p9vH1jXjywzZMoFnUTMb4pMks0KNB3z I7XtepG4BqLUiHcU7Yos6Lt46cOQcteZAg1zwzRp5dhxdXkbfnWNEPrSXDS5bNkTLff6 yFbei4B5ZqtDSlKDsI6bWGgW3wmffTgFyKNrk6KYVkwvlvTMUrktyYxh0l2fjeGkIYBv Yt0JPJm96ltW23hfUsmVhKSnKzVaxJ9qambojAmmN/PUZrj7Q817EZQLkE1fGXp3n+f6 3KQsTH5/sorQW/7DsP5nA0pp8G1TVTWisrq06cKcnFRW9naulkDx0govPrUKx15+1K+G atVw== X-Forwarded-Encrypted: i=1; AJvYcCXcLq7Bd1CdXSG3xPlaflaYgWWbpx5hCHgovPDz+kKS30hty1JVw7tWM+VDb5k01s564SAKU0HAHaU=@lists.freedesktop.org X-Gm-Message-State: AOJu0YxWByvQCWqnMIaT2ZBjOZJjAHtLKMNumhX7WjfPVIr2bl8983b0 LTlL+fjN5HVQivFQkAnI86obClAB/xmXCbkWGduLMBE1XeNc3LAljxub2XP0RdM= X-Gm-Gg: ASbGncs55V9B2iWNub/ZKelBLzJ4bDkit9u4AEr/RyUcWobX1fL26onnHo72uUMsQ+D fZR3rO+Abo9Xa97TDbEesvpF5GpgYBmISMHQoxZAwdULsD258gn7zSQB9Y+vg3qbaUneXpQaO2X cbu8h+kp/GF3hSxsqxySDXDZttV1V5sUBx9sdLYM/aHWzAeeZoA9oH2LyD9agM/U/eW/WlBNZg6 yONA98XE7jPh8i5U9YNkZbQ/+z01drAWuCxD6Q1z/rSj+wAri62wBcbs3SrTHVNh6ubtfZvfUJ+ 6Y7t11XTXvL5j/ElYpxVM/wSJgJTGuwJlqFRVTm8CB5gHvyJv+8w X-Google-Smtp-Source: AGHT+IF6bPkXh6K3Q11IgVbCAEx/raWQukTULWZwW0cWZdP4xoy62YD1VO5brez04BzTxzWt6zMIbA== X-Received: by 2002:a2e:9d16:0:b0:308:eb58:6591 with SMTP id 38308e7fff4ca-30b93310978mr18756901fa.25.1740821104442; Sat, 01 Mar 2025 01:25:04 -0800 (PST) Received: from umbar.lan ([192.130.178.90]) by smtp.gmail.com with ESMTPSA id 2adb3069b0e04-5494417432csm738406e87.52.2025.03.01.01.25.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 01 Mar 2025 01:25:03 -0800 (PST) From: Dmitry Baryshkov Date: Sat, 01 Mar 2025 11:24:55 +0200 Subject: [PATCH v2 2/5] drm/msm/dpu: remove DSC feature bit for PINGPONG on MSM8917 MIME-Version: 1.0 Message-Id: <20250301-dpu-fix-catalog-v2-2-498271be8b50@linaro.org> References: <20250301-dpu-fix-catalog-v2-0-498271be8b50@linaro.org> In-Reply-To: <20250301-dpu-fix-catalog-v2-0-498271be8b50@linaro.org> To: Rob Clark , Abhinav Kumar , Sean Paul , Marijn Suijten , David Airlie , Simona Vetter , =?utf-8?b?QmFybmFiw6FzIEN6w6ltw6Fu?= , Konrad Dybcio Cc: linux-arm-msm@vger.kernel.org, dri-devel@lists.freedesktop.org, freedreno@lists.freedesktop.org, linux-kernel@vger.kernel.org, Konrad Dybcio 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=MfIfb1GLue9MerIIR2rhWjY6rmZBoFPVe5vbiAysvVc=; b=owEBbQGS/pANAwAKAYs8ij4CKSjVAcsmYgBnwtJobSugy0kB0JIsHODpjBT4yZPMEcMtlazNt TTJpig19bCJATMEAAEKAB0WIQRMcISVXLJjVvC4lX+LPIo+Aiko1QUCZ8LSaAAKCRCLPIo+Aiko 1VQ0B/9QjGsUEpb+DwWLNz/fIYKFPwXC7E2uGmZ4Yredir90cNDR1OI3lNMPAxYFaM6qoQOcRjk WHdMYESn1aXu0fSNpX0hxt3d7J29pPQL7AsmolGiYRLsx7b4ioytiHfzQPqpveYeIp3UHcjrfSo fghL+fxJZ755HA3xa/g4tia4Djz6aKIp5opjOkNZXxi9oy3y6DUDoimd4GFk071lq3uxox9vmqI XDqnMFtuQ0Igx3CHoEOCW5cJLpu+sDu+Xa0gy+pMis6++f/Vz+F5GFANsvu7KxEDzTe0A8pLOm9 AkvmZBtxY/piGB36iX2mR/pJTxjinj661+YqhnTvu+St/Kv1 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" The MSM8917 platform doesn't have DSC blocks nor does have it DSC registers in the PINGPONG block. Drop the DPU_PINGPONG_DSC feature bit from the PINGPONG's feature mask and, as it is the only remaining bit, drop the .features assignment completely. Fixes: 62af6e1cb596 ("drm/msm/dpu: Add support for MSM8917") Reported-by: Abhinav Kumar Reviewed-by: Konrad Dybcio Signed-off-by: Dmitry Baryshkov --- drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_1_15_msm8917.h | 1 - 1 file changed, 1 deletion(-) diff --git a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_1_15_msm8917.h b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_1_15_msm8917.h index 6bdaecca676144f9162ab1839d99f3e2e3386dc7..6f2c40b303e2b017fc3f913563a1a251779a9124 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_1_15_msm8917.h +++ b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_1_15_msm8917.h @@ -93,7 +93,6 @@ static const struct dpu_pingpong_cfg msm8917_pp[] = { { .name = "pingpong_0", .id = PINGPONG_0, .base = 0x70000, .len = 0xd4, - .features = PINGPONG_MSM8996_MASK, .sblk = &msm8996_pp_sblk, .intr_done = DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 8), .intr_rdptr = DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 12), From patchwork Sat Mar 1 09:24:56 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Baryshkov X-Patchwork-Id: 13997409 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 7D23BC021B8 for ; Sat, 1 Mar 2025 09:25:10 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id DBEAF10E186; Sat, 1 Mar 2025 09:25:09 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.b="nLhQPO9Q"; dkim-atps=neutral Received: from mail-lf1-f43.google.com (mail-lf1-f43.google.com [209.85.167.43]) by gabe.freedesktop.org (Postfix) with ESMTPS id 8890A10E17C for ; Sat, 1 Mar 2025 09:25:08 +0000 (UTC) Received: by mail-lf1-f43.google.com with SMTP id 2adb3069b0e04-5495c63bdc0so275970e87.1 for ; Sat, 01 Mar 2025 01:25:08 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1740821107; x=1741425907; 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=5ofpBUooPWWaBC1Mgfyuj8wcWUv2U0LtD4mwNGBXHw8=; b=nLhQPO9QNXy1O1JHzFPUgBAedUqzqG1QFFe44PsvFl0xykDxy4SrOGA2CqWdyQ5QTR gs7/vHsoPgnoyga2KJKfABlTmoDSK6gRhM1rFsxe66thlu7Y10NLn8JLWHF1J4sAnfoP eJnpi9mR1SjH/HzI97k110m6As3GOmJZOpMCGr24yglekUx1PeDFH/qsnCjRyr7e7I9y RM52BH9RHGEcQKqwmYwuLBzF3S81aDQPfJu+uh6oAxHfq5BdxIRc94mgCvPTawQQDuOJ awZou6/gt2Y4JfHhVCKuFN9zncfYdaPO8w3mGV8aq1BOLYBX78JZts6TjSguKP/vmedd 7llw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1740821107; x=1741425907; 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=5ofpBUooPWWaBC1Mgfyuj8wcWUv2U0LtD4mwNGBXHw8=; b=aqhVtM4X9ZinerMG01insI2Sx8Dcv9Fc0iQ6/sMdfengoogghXCmlUbnoMSTuhYTLM 5+CqWp64xnOVcQdixQiO/MltvhO3IMltgcff9OVQULi+BPVBh1jEqDfShTBthiymIyma sBHB3uBiFZ1g1JT46pEqe56rA7qierLROm+icwuRTQ6BeKvt/2a+CHtbBm5xww35NJ8+ vz/2YEDb6OvjV9Zahxewj8xHTY/a5Mee3NEEl8WWtj1Cz2Kjnne7h2TDzZs6E2f1ZGL9 SASX2SEQdtWZ0rPJ+bSNH72HYURHIOiVw3SJ01xuzArUYXEuKw9mqb6T9UklsnEv41n9 5cPA== X-Forwarded-Encrypted: i=1; AJvYcCUXvIzF3S/iFKfYmPK5fk5PQ7KC22kIoC0TQGXGHxd8JJHDKV8B+QaXBbEPKpNz6bbawGHVq8OLX0c=@lists.freedesktop.org X-Gm-Message-State: AOJu0YzgszGS3j7Xu94XKlHiZc3xzJoQy6waK/h9vior/9oTJaC1DZw0 HUDaVJS1rBN6atm0qHeLf8e3CzgLI/DxE/1cbzBRYpBRP0bXfe2kwqztINFERcM= X-Gm-Gg: ASbGncvuCRtOWhMCNdOiojD3qi3WGFBErd3tKO5uGiTMqERU7X0I/5tVsZKE6cW2NNF DARUSHLy+l9RHDFz5xigkpmRqsjsuY/SuV5CyjNjLSkHOhWhaTBWkGbIGBLfuMdfxQVgKTYp2AT SIUxbU9DH0paoeJpCuRxYzM6m5kwB7pnxZEq5spG2xKCGXWGU8M4DkftapEQR7KJOhUyF378Cfm 6OB1MR31ZueUq5aqyqtPuoHztlFkVoq3aqPlj42exIpmWMFHymQ2Fhrk1KIRGZy6fbrQaCFBUez xGWbtjEFlIS7V+HUqXOc/1kuZZTaSkhZGcyQElGOq6j+v8iGg+ha X-Google-Smtp-Source: AGHT+IFTUhe/p95CZNKJGAqG1p7sHLGDOvpr/WdekUKr6EplX6n/Lb/C1JadtiI3JNxmPIfMMazmMw== X-Received: by 2002:a05:6512:398e:b0:542:28b4:23ad with SMTP id 2adb3069b0e04-5494c11b5a4mr3148909e87.16.1740821106875; Sat, 01 Mar 2025 01:25:06 -0800 (PST) Received: from umbar.lan ([192.130.178.90]) by smtp.gmail.com with ESMTPSA id 2adb3069b0e04-5494417432csm738406e87.52.2025.03.01.01.25.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 01 Mar 2025 01:25:05 -0800 (PST) From: Dmitry Baryshkov Date: Sat, 01 Mar 2025 11:24:56 +0200 Subject: [PATCH v2 3/5] drm/msm/dpu: remove DSC feature bit for PINGPONG on MSM8953 MIME-Version: 1.0 Message-Id: <20250301-dpu-fix-catalog-v2-3-498271be8b50@linaro.org> References: <20250301-dpu-fix-catalog-v2-0-498271be8b50@linaro.org> In-Reply-To: <20250301-dpu-fix-catalog-v2-0-498271be8b50@linaro.org> To: Rob Clark , Abhinav Kumar , Sean Paul , Marijn Suijten , David Airlie , Simona Vetter , =?utf-8?b?QmFybmFiw6FzIEN6w6ltw6Fu?= , Konrad Dybcio Cc: linux-arm-msm@vger.kernel.org, dri-devel@lists.freedesktop.org, freedreno@lists.freedesktop.org, linux-kernel@vger.kernel.org, Konrad Dybcio X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=1574; i=dmitry.baryshkov@linaro.org; h=from:subject:message-id; bh=3KiS1JFwz6siEC5WVugc4OTInSpbOeJ8pCpFDBbI8EA=; b=owGbwMvMwMXYbdNlx6SpcZXxtFoSQ/qhSxlfJgT2tZu2nzENWHi/au3+z5m5nxaGzpnq4P/Ne +WEhAKhTkZjFgZGLgZZMUUWn4KWqTGbksM+7JhaDzOIlQlkCgMXpwBMZK0cB8Pkny1u1dbz98w3 jqnft7fvUZfdeRapjeq/K1zXCGwv+vQ5OyG287DkzhQThQ+v/q+/8fnkqYtWp3fMv2IRVqj3pWO /bnH/D3bTz8fuaeSapm81eBdUtT9AxPpnfFa/cuua0A7VyutlBVqXq+IP852//86N5bzHhf1X4z RbfgpM4Wn95bpEbabUKh3JPgURhfqQhtOhrh3yi9M3bF+4adsKE18Zl4QVlTpeD0O/qyrHyhz2F YhYXZh4e9/OzvjS1FldamaTroWLb89O8zlS9qU+eG0Xt49wLwePs27vhckxhZYPLU44bo7XTPHb NuthlVZG7Jz0I36mhz4Ksjea75xTLDPNZoWSVtGxWQavAA== 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" The MSM8953 platform doesn't have DSC blocks nor does have it DSC registers in the PINGPONG block. Drop the DPU_PINGPONG_DSC feature bit from the PINGPONG's feature mask and, as it is the only remaining bit, drop the .features assignment completely. Fixes: 7a6109ce1c2c ("drm/msm/dpu: Add support for MSM8953") Reported-by: Abhinav Kumar Reviewed-by: Konrad Dybcio Signed-off-by: Dmitry Baryshkov --- drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_1_16_msm8953.h | 2 -- 1 file changed, 2 deletions(-) diff --git a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_1_16_msm8953.h b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_1_16_msm8953.h index 14f36ea6ad0eb61e87f043437a8cd78bb1bde49c..04f2021a7bef1bdefee77ab34074c06713f80487 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_1_16_msm8953.h +++ b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_1_16_msm8953.h @@ -100,14 +100,12 @@ static const struct dpu_pingpong_cfg msm8953_pp[] = { { .name = "pingpong_0", .id = PINGPONG_0, .base = 0x70000, .len = 0xd4, - .features = PINGPONG_MSM8996_MASK, .sblk = &msm8996_pp_sblk, .intr_done = DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 8), .intr_rdptr = DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 12), }, { .name = "pingpong_1", .id = PINGPONG_1, .base = 0x70800, .len = 0xd4, - .features = PINGPONG_MSM8996_MASK, .sblk = &msm8996_pp_sblk, .intr_done = DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 9), .intr_rdptr = DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 13), From patchwork Sat Mar 1 09:24:57 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Baryshkov X-Patchwork-Id: 13997410 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 B6225C282CD for ; Sat, 1 Mar 2025 09:25:12 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 244EB10E198; Sat, 1 Mar 2025 09:25:12 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.b="BiXycRSI"; 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 036AE10E195 for ; Sat, 1 Mar 2025 09:25:11 +0000 (UTC) Received: by mail-lf1-f42.google.com with SMTP id 2adb3069b0e04-5495c1e1b63so217660e87.0 for ; Sat, 01 Mar 2025 01:25:10 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1740821109; x=1741425909; 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=0S3CqHmaZKk/knnnYKsC2gVCXeH/ZZG8lvfqN607uo8=; b=BiXycRSIR1UUkuC+I7bKL2fgbUqjAsUL1iHzhnuAb+oUxZ6BsMjhMye7+4F1/CtFoL YvbPK86zWuoIaud1aO2HeYzVhIixh5cDRK/09X11iaCpDVR6X/qo0D+0y3VI9TX5nfId /1GYZfDSo7UGcQEFNXw0JYo7Tfk8iaEyFjazeWNYKSqfCQbECKVXlNBoz+FTtksw2rhC BootNMx2TcB5se1+Mj3CPpmni1ogY81jx7XeUHrr58RmFN07k/GeZmxPH5yoj3LHwoBu pAHW83hR3qXq5me8g0xUduhJ/63qs9KQvuibQNcOdg1/7eHmOKktJkbJExzxCzji/uRi 9EMw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1740821109; x=1741425909; 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=0S3CqHmaZKk/knnnYKsC2gVCXeH/ZZG8lvfqN607uo8=; b=QUnrGr24VqdR11Ce2DJO5Vb11PlhHwO20zDbBB4MGMU9WsTE6Z0g5huwNxqAul1j8D kYbEEfSE/Ib4G8Qfl4FiNXMx9qnNEAqr1Mn7++jNkLPGR7P1Q14QMOwUbUloT/CXkPCv LcZY1U4F5t1JN6eMtaD8EyApN7EQMuuaWcXTR43RwcNQHAh8HNvN3Uu7aOSCjQO117qt bIDxtszZFNSEC/N+IjE8hweoo/tmpGusDTeTb0SAEUmXVCC4tEVeYOiaqR7XUDvNePVb xIpwlTyi02nuxUsW+Z1oq9wzqAZBlXE92lf8DvzwVeqHRi7O/7e+1QE312xqaYnE/05a DuEA== X-Forwarded-Encrypted: i=1; AJvYcCWeTc3tywoZRDZlmDB+kvyGf5ORKe+Oiw8F5aNyqYQA4lLuuS7vCQStIZXzgX57zpkC7S8nqouKHtk=@lists.freedesktop.org X-Gm-Message-State: AOJu0Yw4M2levgIIjnDUcPO+oEJGVc1fZHOvQaMWyl1ZJsN5sy9vHjGJ 3wpkP44E0uK0qPdYixXtnXVYQDQrsYEMWzw+YU80scY6wYaXfXbiSk2EXv2Zo58= X-Gm-Gg: ASbGncsaxqoJecqbA/+61/hJ9h6kvyUKnfWC48ZO+Fi7vOMoYqmLv9z8rOr28QtX3wK z5i7r7MeB9vb7aefdlybJOwzkDYSFAFsxPQ1IP5lNeb7eCm4YIXZOOhFdMqa4kljDWT4K5fhmJm YhE7Dl8s4NqZlEAdBVr5wm8CJAmAWFbIDMdCFHtz5IXXUcBDvu3EeWJsd4oq9ygumhUVviYCuee 1E69sZ+Tya6RxfrAx4LRmjP/hEUI6dZhjd67BwoATWlpWGzrtYFolq7Z+jFTmB/O/CsohO+hrii /hbD6EYv1ZYcI7xNiEjemXLY3EU2KoM1Kp4UiE5oYXIufSVWAIkk X-Google-Smtp-Source: AGHT+IH/J66JM3jXcQg4Hm2VzetV+is+xE4RZX/iaVVXbntv7XIHbZKu0lKbD6OmxDUwOs9xArkiDg== X-Received: by 2002:a05:6512:b88:b0:549:5b54:2c68 with SMTP id 2adb3069b0e04-5495b54357bmr396446e87.22.1740821109321; Sat, 01 Mar 2025 01:25:09 -0800 (PST) Received: from umbar.lan ([192.130.178.90]) by smtp.gmail.com with ESMTPSA id 2adb3069b0e04-5494417432csm738406e87.52.2025.03.01.01.25.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 01 Mar 2025 01:25:08 -0800 (PST) From: Dmitry Baryshkov Date: Sat, 01 Mar 2025 11:24:57 +0200 Subject: [PATCH v2 4/5] drm/msm/dpu: drop TE2 definitions MIME-Version: 1.0 Message-Id: <20250301-dpu-fix-catalog-v2-4-498271be8b50@linaro.org> References: <20250301-dpu-fix-catalog-v2-0-498271be8b50@linaro.org> In-Reply-To: <20250301-dpu-fix-catalog-v2-0-498271be8b50@linaro.org> To: Rob Clark , Abhinav Kumar , Sean Paul , Marijn Suijten , David Airlie , Simona Vetter , =?utf-8?b?QmFybmFiw6FzIEN6w6ltw6Fu?= , Konrad Dybcio Cc: 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=8773; i=dmitry.baryshkov@linaro.org; h=from:subject:message-id; bh=FGk4O1VHJ/AALXi9JU8E7/AS9MUo+YPgs+S6pZa0Mrg=; b=owEBbQGS/pANAwAKAYs8ij4CKSjVAcsmYgBnwtJoUqN4knEcdJD0ev8uxf4olTQ0qPmspUIZZ dF+m4E+3HuJATMEAAEKAB0WIQRMcISVXLJjVvC4lX+LPIo+Aiko1QUCZ8LSaAAKCRCLPIo+Aiko 1WZJB/0QBY82ZFrTQlyyCk4Fj81ctmok/eKg87Go3jbdS/MB3AXf0GlaRXlRL1cfEtEPsCDnV6R j5aRI23DxgzeZf6iBBgrUfsDWiWenGEC1O/MxgcR7uphZmn14/D/1D3MOZeZ+NnQtuk1W0/N0EX EkWd7X5Jc2Qimj9WSGRIeoPt8EZEDZy4V/ojdhJAJxytHbR5Sh4lYUhAjYnVxuReDT6l6nCySDr quWpPjOOb5raORp7puz5D3o2OdE+ChOhgFPv95xNijDrI7IfDsM109K5HNOhP107Sv7qH2LD1lI 8rEhgiM3Xc6DzRL16MB3GnydaXEu/7NGgvzvIOWTYW+aWvLY 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" Neither DPU driver nor vendor SDE driver do not use TE2 definitions (and, in case of SDE driver, never did). Semantics of the TE2 feature bit and .te2 sblk are not completely clear. Drop these bits from the catalog with the possibility of reintroducing them later if we need to support ppsplit. Signed-off-by: Dmitry Baryshkov --- drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_1_7_msm8996.h | 8 ++++---- drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_3_0_msm8998.h | 8 ++++---- drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_3_2_sdm660.h | 8 ++++---- drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_3_3_sdm630.h | 4 ++-- drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_4_0_sdm845.h | 8 ++++---- drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.c | 17 ----------------- drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.h | 6 +----- 7 files changed, 19 insertions(+), 40 deletions(-) diff --git a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_1_7_msm8996.h b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_1_7_msm8996.h index 491f6f5827d151011dd3f74bef2a4b8bf69591ab..400739295de5aa509ed3a7f6c82ef45dda21c47f 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_1_7_msm8996.h +++ b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_1_7_msm8996.h @@ -181,15 +181,15 @@ static const struct dpu_pingpong_cfg msm8996_pp[] = { { .name = "pingpong_0", .id = PINGPONG_0, .base = 0x70000, .len = 0xd4, - .features = PINGPONG_MSM8996_TE2_MASK, - .sblk = &msm8996_pp_sblk_te, + .features = PINGPONG_MSM8996_MASK, + .sblk = &msm8996_pp_sblk, .intr_done = DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 8), .intr_rdptr = DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 12), }, { .name = "pingpong_1", .id = PINGPONG_1, .base = 0x70800, .len = 0xd4, - .features = PINGPONG_MSM8996_TE2_MASK, - .sblk = &msm8996_pp_sblk_te, + .features = PINGPONG_MSM8996_MASK, + .sblk = &msm8996_pp_sblk, .intr_done = DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 9), .intr_rdptr = DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 13), }, { 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 64c94e919a69804599916404dff59fa4a6ac6cff..a253e0fdc556b57aa3752b81b803e84550ba146e 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 @@ -170,15 +170,15 @@ static const struct dpu_pingpong_cfg msm8998_pp[] = { { .name = "pingpong_0", .id = PINGPONG_0, .base = 0x70000, .len = 0xd4, - .features = PINGPONG_SDM845_TE2_MASK, - .sblk = &sdm845_pp_sblk_te, + .features = PINGPONG_SDM845_MASK, + .sblk = &sdm845_pp_sblk, .intr_done = DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 8), .intr_rdptr = DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 12), }, { .name = "pingpong_1", .id = PINGPONG_1, .base = 0x70800, .len = 0xd4, - .features = PINGPONG_SDM845_TE2_MASK, - .sblk = &sdm845_pp_sblk_te, + .features = PINGPONG_SDM845_MASK, + .sblk = &sdm845_pp_sblk, .intr_done = DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 9), .intr_rdptr = DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 13), }, { diff --git a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_3_2_sdm660.h b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_3_2_sdm660.h index 424815e7fb7dd858448bd41b5368b729373035f8..4464d4568aba0577a6f957bbd5d8d1c73f68b403 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_3_2_sdm660.h +++ b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_3_2_sdm660.h @@ -141,15 +141,15 @@ static const struct dpu_pingpong_cfg sdm660_pp[] = { { .name = "pingpong_0", .id = PINGPONG_0, .base = 0x70000, .len = 0xd4, - .features = PINGPONG_SDM845_TE2_MASK, - .sblk = &sdm845_pp_sblk_te, + .features = PINGPONG_SDM845_MASK, + .sblk = &sdm845_pp_sblk, .intr_done = DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 8), .intr_rdptr = DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 12), }, { .name = "pingpong_1", .id = PINGPONG_1, .base = 0x70800, .len = 0xd4, - .features = PINGPONG_SDM845_TE2_MASK, - .sblk = &sdm845_pp_sblk_te, + .features = PINGPONG_SDM845_MASK, + .sblk = &sdm845_pp_sblk, .intr_done = DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 9), .intr_rdptr = DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 13), }, { diff --git a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_3_3_sdm630.h b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_3_3_sdm630.h index df01227fc36468f4945c03e767e1409ea4fc0896..3aed9aa4c533f167ece7b4a5eb84fe49c4929df5 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_3_3_sdm630.h +++ b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_3_3_sdm630.h @@ -115,8 +115,8 @@ static const struct dpu_pingpong_cfg sdm630_pp[] = { { .name = "pingpong_0", .id = PINGPONG_0, .base = 0x70000, .len = 0xd4, - .features = PINGPONG_SDM845_TE2_MASK, - .sblk = &sdm845_pp_sblk_te, + .features = PINGPONG_SDM845_MASK, + .sblk = &sdm845_pp_sblk, .intr_done = DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 8), .intr_rdptr = DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 12), }, { 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 72bd4f7e9e504c771d999dcf6277fceb169cffca..c122782ec8bd7e5ad68729c8c12bc8ccd0cfe0c2 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 @@ -194,15 +194,15 @@ static const struct dpu_pingpong_cfg sdm845_pp[] = { { .name = "pingpong_0", .id = PINGPONG_0, .base = 0x70000, .len = 0xd4, - .features = PINGPONG_SDM845_TE2_MASK, - .sblk = &sdm845_pp_sblk_te, + .features = PINGPONG_SDM845_MASK, + .sblk = &sdm845_pp_sblk, .intr_done = DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 8), .intr_rdptr = DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 12), }, { .name = "pingpong_1", .id = PINGPONG_1, .base = 0x70800, .len = 0xd4, - .features = PINGPONG_SDM845_TE2_MASK, - .sblk = &sdm845_pp_sblk_te, + .features = PINGPONG_SDM845_MASK, + .sblk = &sdm845_pp_sblk, .intr_done = DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 9), .intr_rdptr = DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 13), }, { diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.c index 0b342c043875f3329a9f71c5e751b2244f9f5ef7..b67578738dffe1ac83530d93eb0e631f21384efc 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.c +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.c @@ -98,15 +98,9 @@ #define PINGPONG_MSM8996_MASK \ (BIT(DPU_PINGPONG_DSC)) -#define PINGPONG_MSM8996_TE2_MASK \ - (PINGPONG_MSM8996_MASK | BIT(DPU_PINGPONG_TE2)) - #define PINGPONG_SDM845_MASK \ (BIT(DPU_PINGPONG_DITHER) | BIT(DPU_PINGPONG_DSC)) -#define PINGPONG_SDM845_TE2_MASK \ - (PINGPONG_SDM845_MASK | BIT(DPU_PINGPONG_TE2)) - #define PINGPONG_SM8150_MASK \ (BIT(DPU_PINGPONG_DITHER) | BIT(DPU_PINGPONG_DSC)) @@ -465,22 +459,11 @@ static const struct dpu_dspp_sub_blks sdm845_dspp_sblk = { /************************************************************* * PINGPONG sub blocks config *************************************************************/ -static const struct dpu_pingpong_sub_blks msm8996_pp_sblk_te = { - .te2 = {.name = "te2", .base = 0x2000, .len = 0x0, - .version = 0x1}, -}; static const struct dpu_pingpong_sub_blks msm8996_pp_sblk = { /* No dither block */ }; -static const struct dpu_pingpong_sub_blks sdm845_pp_sblk_te = { - .te2 = {.name = "te2", .base = 0x2000, .len = 0x0, - .version = 0x1}, - .dither = {.name = "dither", .base = 0x30e0, - .len = 0x20, .version = 0x10000}, -}; - static const struct dpu_pingpong_sub_blks sdm845_pp_sblk = { .dither = {.name = "dither", .base = 0x30e0, .len = 0x20, .version = 0x10000}, diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.h b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.h index 4cea19e1a20380c56ae014f2d33a6884a72e0ca0..07b50e23ee954b96e7e6bd684dc12823f99d630b 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.h +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.h @@ -115,7 +115,6 @@ enum { /** * PINGPONG sub-blocks - * @DPU_PINGPONG_TE2 Additional tear check block for split pipes * @DPU_PINGPONG_SPLIT PP block supports split fifo * @DPU_PINGPONG_SLAVE PP block is a suitable slave for split fifo * @DPU_PINGPONG_DITHER Dither blocks @@ -123,8 +122,7 @@ enum { * @DPU_PINGPONG_MAX */ enum { - DPU_PINGPONG_TE2 = 0x1, - DPU_PINGPONG_SPLIT, + DPU_PINGPONG_SPLIT = 0x1, DPU_PINGPONG_SLAVE, DPU_PINGPONG_DITHER, DPU_PINGPONG_DSC, @@ -404,8 +402,6 @@ struct dpu_dspp_sub_blks { }; struct dpu_pingpong_sub_blks { - struct dpu_pp_blk te; - struct dpu_pp_blk te2; struct dpu_pp_blk dither; }; From patchwork Sat Mar 1 09:24:58 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Baryshkov X-Patchwork-Id: 13997411 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 D410FC282D0 for ; Sat, 1 Mar 2025 09:25:14 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 5504D10E167; Sat, 1 Mar 2025 09:25:14 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.b="OzWJprgB"; dkim-atps=neutral Received: from mail-lj1-f174.google.com (mail-lj1-f174.google.com [209.85.208.174]) by gabe.freedesktop.org (Postfix) with ESMTPS id 6E04810E1A1 for ; Sat, 1 Mar 2025 09:25:13 +0000 (UTC) Received: by mail-lj1-f174.google.com with SMTP id 38308e7fff4ca-30613802a6bso31836011fa.1 for ; Sat, 01 Mar 2025 01:25:13 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1740821112; x=1741425912; 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=URwOcNjnz6PkMJ2QDjvaSLAsGLbSDP+kGsc1C7zaZt0=; b=OzWJprgB48RskC+QJhiQ/thQgeALx3F9ngmFSv7ECg2FtcD6eG802KlzU32DeWfDPG VOaLHzUzccYqbUyuTJgHZ/rANjWRZrKZtGNWWgXrlVl7YY4a4quzhpXkMUGJrehWSLVf iYUUmvqXk1Mf81wLzmUGlJF5aG63kVHSgnt2DdwQQAkRpa0ir8L+R0OVMC5l4jI+GTaO aeqS2K76EO0w1vwYY2S9d3F0DFoEH61DXJG1BO/SLUIT0Y+LBNzajuM0w4KbjTrsxTmG 5yN0QQN2RFQvnqVTG9uZ63WgOCkgRkSCQ1WFYGFqq84xIgNq1j8POe5HHychTjV+afYU z6bw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1740821112; x=1741425912; 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=URwOcNjnz6PkMJ2QDjvaSLAsGLbSDP+kGsc1C7zaZt0=; b=pgfwFrmP/IgTq48FZTg85tnhO44KIWMbnkKeO7XVKYMFzYUygXHXkjce0WAlMbWgfY Cv6WPmbqVFjtLrufulRzgIjGvM3oq1OjC0ykRNiuUMUJaYhohov6tjmXpcqQ2zTUVGg7 JrDxEJdGuqybqGNAxYsuVE7VoDpwZmpifJSZJH2wlyYlx4Irs1nKm/aHI90npmX5InZT Fmhea5hrWB4N7FABgK/GcAlgCJcq6I4GijQz01wZughGkL+U82lhNac36qmgjwz3kdTm /e+tnewxWTGk6EwsFSZOihu5IlvDYC4gtuT9m0P4ZbsRzGJoLZsNdOv5rTFMoOhn5svl WKGg== X-Forwarded-Encrypted: i=1; AJvYcCVVPaXYl4uauh2jHEPwWk6iH4/GJxsOyzfNJ48RhyuIgeFj/s0v8yUWrNdFqJSo5r52L1Xvw5ZM5Ns=@lists.freedesktop.org X-Gm-Message-State: AOJu0YyBpgc//xevPxhWss1+/jch9O4wjXi90EenFD6oHjm672WXmN9B AdvvR/nS1o2sF5wPtkvIFMdZXPVPximYlMrA3pLf9brnWfFuqHNyIpZ27dQd52U= X-Gm-Gg: ASbGncuXqkCavB5CvyJbVVu9Xs+t912PG8NNjVqqbzK4thAV3R5IEK8qjIfl4SQLyYY SjOFL0+Kn+SvV7zz7I9s60TbzGWmFSTbcxxXDFBTR5j4p6ut4JtBfAy41istiJQdh7rX3n4SOZB uAYqh3+tW2u8xzl8RGUzKlOV4PgYWjnaKyP4QaEJ17qLyi7oHeS5pnSEWQyCNoSS04Emp2d0w9L N2pwieHf938pT5bZXQWWWpXsgIaqh4mU06LrvWp/0XUWQRpH+CQ86RkhxpcANPWdPTVUa9y8qQ2 fGJLysuUKHVpU+UFzu9akI7LjX5gUkZ43c00VPZ7iopAS7JmK2m/ X-Google-Smtp-Source: AGHT+IEh8A2sl1pAlOlMCHBvb8v6txd7ryhkeXioo/K+sIwr784pk95XMok+4SarSyMfmUmdP9cUsw== X-Received: by 2002:a05:6512:128e:b0:545:9e4:ca91 with SMTP id 2adb3069b0e04-5494c38072bmr2929372e87.39.1740821111736; Sat, 01 Mar 2025 01:25:11 -0800 (PST) Received: from umbar.lan ([192.130.178.90]) by smtp.gmail.com with ESMTPSA id 2adb3069b0e04-5494417432csm738406e87.52.2025.03.01.01.25.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 01 Mar 2025 01:25:10 -0800 (PST) From: Dmitry Baryshkov Date: Sat, 01 Mar 2025 11:24:58 +0200 Subject: [PATCH v2 5/5] drm/msm/dpu: remove DSC feature bit for PINGPONG on SDM630 MIME-Version: 1.0 Message-Id: <20250301-dpu-fix-catalog-v2-5-498271be8b50@linaro.org> References: <20250301-dpu-fix-catalog-v2-0-498271be8b50@linaro.org> In-Reply-To: <20250301-dpu-fix-catalog-v2-0-498271be8b50@linaro.org> To: Rob Clark , Abhinav Kumar , Sean Paul , Marijn Suijten , David Airlie , Simona Vetter , =?utf-8?b?QmFybmFiw6FzIEN6w6ltw6Fu?= , Konrad Dybcio Cc: 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=1811; i=dmitry.baryshkov@linaro.org; h=from:subject:message-id; bh=xfJndy0LJ6tSYaPs6OPWvlHfde8Gt+RzIdnKqXQJW2A=; b=owEBbQGS/pANAwAKAYs8ij4CKSjVAcsmYgBnwtJouDh1p63euLoMf/eO1Aa1kaVi4m9jHe64K bORUvpxw0GJATMEAAEKAB0WIQRMcISVXLJjVvC4lX+LPIo+Aiko1QUCZ8LSaAAKCRCLPIo+Aiko 1Q2wB/9+J8HcIzLcD4Z54mCSlyjwkQ3C2RZjJ0uAwHKstzXjx0uAq015I1fXZN787warvOm3j3L ig0302evj00WTzKaZrN10rzDnrgNK02AHwxv8GzoFst4YwaX6cEHT+KdUdURGSwS9ZTrJiTxTLw mxpz/opigMTdni3hSRSAGrPYop6rS3y8nVJ4FaFfXPptbG/RBr0iOlIfL8rgqK6DWb0bw7vYMJm xlMPF66WvRaTDGCudXLahAGjGqT4ggHR+p03OVjhQdOyCGRscvTvI7Q3JwqN09qFwJSKR/+y78n vU7sLNkNz1VHMK+BKtoWqHFza6tec6uBRWhHiKh9KtHSCX/W 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" The SDM630 platform doesn't have DSC blocks nor does have it DSC registers in the PINGPONG block. Drop the DPU_PINGPONG_DSC feature bit from the PINGPONG's feature mask, replacing PINGPONG_SDM845_MASK with BIT(DPU_PINGPONG_DITHER). Fixes: 7204df5e7e68 ("drm/msm/dpu: add support for SDM660 and SDM630 platforms") Reported-by: Abhinav Kumar Signed-off-by: Dmitry Baryshkov --- Note, Konrad pointed out that vendor DT doesn't define DIPTHER support for this platform, however I believe this is because support for this platform predates DITHER support in the vendor kernels. --- drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_3_3_sdm630.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_3_3_sdm630.h b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_3_3_sdm630.h index 3aed9aa4c533f167ece7b4a5eb84fe49c4929df5..99c0f824d8f00474812bde12e7d83ba3de1834f1 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_3_3_sdm630.h +++ b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_3_3_sdm630.h @@ -115,14 +115,14 @@ static const struct dpu_pingpong_cfg sdm630_pp[] = { { .name = "pingpong_0", .id = PINGPONG_0, .base = 0x70000, .len = 0xd4, - .features = PINGPONG_SDM845_MASK, + .features = BIT(DPU_PINGPONG_DITHER), .sblk = &sdm845_pp_sblk, .intr_done = DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 8), .intr_rdptr = DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 12), }, { .name = "pingpong_2", .id = PINGPONG_2, .base = 0x71000, .len = 0xd4, - .features = PINGPONG_SDM845_MASK, + .features = BIT(DPU_PINGPONG_DITHER), .sblk = &sdm845_pp_sblk, .intr_done = DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 10), .intr_rdptr = DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 14),