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: 869604 Received: from mail-lf1-f43.google.com (mail-lf1-f43.google.com [209.85.167.43]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id C143D189BB0 for ; Sat, 1 Mar 2025 09:25:03 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.167.43 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740821105; cv=none; b=EKUABC+5l7uTwtSbsPwd3LLGJIvlWXyeUpUspn7cZuR6aaMBoVu7AJV1M+Ec2ZcKc9LMHn8T8a1TcOwGpus9YXuNaX5pCIAsO0T1XX5tTX2CjO/J46P38VPd0DVtOlTBZZXDx0+PVKEXuri8kHpEQJwYkDTUce+kn/mzRRcwmzI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740821105; c=relaxed/simple; bh=6iPuaAjsYMeQVkUS24obUEbYrmaOHTnqfR5LGKvkJrI=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=RKR8uDDzmX0I+cwJJLTh+MxTcKFIeOfxEhR4kZ2F3PC/nRHcmLMvkPh/CkmJe/oEc0XhZ8gIyBCAtUqaIm72xbrEBwMU42IBtQzSo/JPe79lSMK5F6dnnguXzKhmkFcuzyrDVQial0wTFs8WyJR2X0Dr872x+H/cvmqwoUb4u1Y= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org; spf=pass smtp.mailfrom=linaro.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b=KqWkuggm; arc=none smtp.client-ip=209.85.167.43 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linaro.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="KqWkuggm" Received: by mail-lf1-f43.google.com with SMTP id 2adb3069b0e04-5494bc4d796so2168245e87.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=vger.kernel.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=KqWkuggm8CoUDhxNCcgRfn4i1ZR6fyU18f5kXaZaac12hId2I7aO3jDjQ9VusDZj2X 7/vU069FFJqucxtJHvrHG0hPMcksTNz6fwh0Fn4sl/NGFk6kmiEjwfzOywjGax1HNrUE TQiz2dSDoksa/hMMCSGWpadvFWlE5uPnQn4Ias4y7uxHZdL5O4T+qTFdbzs/6WeDlyGr ygOmOLzpzYzAvygX6KOrbJdXMyI+Andy3x3XRqMfx/LEPAqDqzqd/55qNWhAwEp+uXKu +Anb5tgCvKWaWYQLv0boQU7JbQCv5gtmNrsHKWDJpeOkWY+n8sUOFkrhD5c01LYBeT1X Bywg== 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=RET7lCN3yqotc4qZxAVJUM7/dj2o3KNCso+lmLRmLaDh1nX6OzuvL6SurAHy2tdG1Q grXzXdx5mXepyxLAUFf4CtpYkSSsorfuRC2iDOXk9gIFiM9qmMJZ4vxWjZI7ZobPMuH9 unuseiyVWd2jKfjmGuAyqbIQQ18Go0+VEd8aj86HppiLG80uK8/DtVft5zBDBM9ar598 4cdY7w2a6Lnne4gBpL5pK9MJChjiksLZNBRqeOe4ZEHNjq/EPvMt4FhcKODO5a8EBx+z +oClE06EIvUh/gx34ZMsu4Nax09vgcXINN4jIdz+qHaeU1WODxOAAgCx8lsSyQsW1IN+ hCUQ== X-Gm-Message-State: AOJu0YylK0yC+LLleNNNi9Plfd36gt43fsKyLg9TWMcBytoRuNrD8NhW 3umueOQxJ3K012KDHVuuPhaxb0QZp8ChtkcAPEL6OgJ1BUB1XDmkfaCYiZ9xdBE= X-Gm-Gg: ASbGnctlnrfuRprk0E+hJE6Zw/krEHqHqS68vCY+r50MhCglacILSivCOjA6Jh9hxeo u+A4bXGgbMdJDJmsc82KAcrvPfCQCavSXeEtIgzTjUuZRybhW3H30dpY8e0mZhz/F/+TgzsAWTL PlMNJYkQxmwJ4EMyrHVA9to+m6kLXKDF//1wus0u3jAhNITTgr851nXijvDomVZT8sDh/PT2Q+J g3gAWlPG04JlAQkTHyPrmSUNFJOgImP//+5ntdQk+ottbmSdLmvBNZ2yfgasDrJCbLF8rNop5qI fjznZEwi4s+/pANHrqOnbzUByskb3KCLF3+59pfGKPZ5BevUcQCP 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 Precedence: bulk X-Mailing-List: linux-arm-msm@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: 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 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: 869734 Received: from mail-lj1-f180.google.com (mail-lj1-f180.google.com [209.85.208.180]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 6A8571D5CF9 for ; Sat, 1 Mar 2025 09:25:06 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.208.180 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740821108; cv=none; b=cgh8OsDy3OOAcBxDdLGDeAqZc5ZNAZApd0Zhs/bLhLgd/Ss+cANQd9FkwDL7lrSVtPBhwlsXNMxWhm1jwuE8X3GsBQpzz17fKY3jfJw7gS8MF6+I/wKlomvMtQzCXcAbsENs34J6MrCgXl/L5WzhRSGJWVLI4EF+JYibBiw77do= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740821108; c=relaxed/simple; bh=MfIfb1GLue9MerIIR2rhWjY6rmZBoFPVe5vbiAysvVc=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=dxNXnabo/RANTVuEoP8ob5trY660y5M41LQS1Oc/8t0f0gngXrUM4PTjBsE20d1aEx6Vl5Q8qVqEpe4nmEgw2nGGGkCQejwVBBiTWjvG/pPi5Mm02ggqYDChDEi64A9BtIZEaClZIe+virPXCByInNYtJT11gR+KAMgCw7vdMe0= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org; spf=pass smtp.mailfrom=linaro.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b=MP/oQIyq; arc=none smtp.client-ip=209.85.208.180 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linaro.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="MP/oQIyq" Received: by mail-lj1-f180.google.com with SMTP id 38308e7fff4ca-30613802a59so32836921fa.0 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=vger.kernel.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=MP/oQIyquOx26Q21G81qpr+vaZGzVIX+MQ4sXIZjY3L6JjhzZiXQDID5dXLjP4h5mS mfQ/BaC7lcVm9DD2SR0cLHbo45FlMYnDulKravts6Oslzr4LvCzrhThIuvHXwlkLaEXC EN8U/Nr3YDowkHz+5oyAGEMMQ+uPiYQ/tFGKxiXtEijN4mAAvp5DoccbMqaRRqy023Bl bib4GI/iCJNniG6WyfROPrNRUtdYHCplv1oS0F8upMFigPQ5FOsXv4Hz7vbolbNaK2AU 1MRBOnvk2KyXwEykpIoUNTvpUcVxxk8M/wh79R9T079/v8XrMPhJzXoLD4Q+Xg+d5yok nMug== 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=n9thRYc2cJUsle8w5H4lJ4z0qVowuOfowGPDoLf+c5v3GRd5q9V2ATx/kVaIUwu/bI 4UJMbOII3MWzjHeVX4HRkZ5DTvZgLC8TjH0FrhNugUn5ArdIdkpE0hV0AgocD19GLjxl VD9U6PaBhb8eRW3A4DqPPkpdEW6rB0atzCG66wTZqVuUmIjumvT1hBzvaK71JFe5TE6k aTGPla2pmi4sQoM9wQo+lRY4v8GltC24WvlLfixKotitF46JRtHC/6r7c0/0vMXrMYJO anTCjmzPNY/SxBH4c3EdLgQDDaDgEY3BuyXT78kJOJGKqZt7EyHQNLC+U0LbzNaIVuZS /D3g== X-Gm-Message-State: AOJu0Yw0p5U711+CAKCm8supW1xuXzKZlS5UV1uZdlQUnERP14ESZvwR v6fPsqXGF1kxM6GGf0cokx/e2GWkyDMiM1vUde6NaWxnQaPADj7L59DauirmhFyRHh1kBuwcnIZ wjnA= X-Gm-Gg: ASbGncs+AmKZmNNcO2fwQ7RTPdWSVc/dlyfI3Cc1oWSVqauPX35cikJ+VWzF0ufKT9F eTuZjvbGAql1g3h3bNl/BwCjASLxAqjf361kvRhxxLrsOHf2bVLz3fpltJ71LWs0Xl+WtGswrw6 okdFa6ZHba18qkLilWwrAs6NxMwNrg0Sx04h5xdHT4BaINEYHY4huYc3U4u2lbUZ3QVUn089Zay DE9/dU/MzjjUfyon1Zo2DNjUAiAewKDOJ5LBl40B4RHQrm+gcq6nfooMr/zvw+oX4KiQugx03W3 7I7qty8l6SRy9tOqItL/KZKkCeGKt2zNiopUzz/L+EpN73LyPRPD 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 Precedence: bulk X-Mailing-List: linux-arm-msm@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: 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 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: 869603 Received: from mail-lf1-f43.google.com (mail-lf1-f43.google.com [209.85.167.43]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id D74F11D6DA1 for ; Sat, 1 Mar 2025 09:25:08 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.167.43 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740821110; cv=none; b=CugVK2Qw/mf0ujm2CqGjLXqYlXF9S6yS105P/P9KEBgbp2r7e1U54HEtg+T53+Sa1qj/GSgUMzOXT0CG4H1RSVKVCEh240fJLK5I0+adMTemWE2C+gOObHEN6Hm6Vy/HSnPnsO4xFj3irLJ1Um474fLyX9fUl1Ee4dhiiTHnJw0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740821110; c=relaxed/simple; bh=3KiS1JFwz6siEC5WVugc4OTInSpbOeJ8pCpFDBbI8EA=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=aobbliKVMkZCvvqIHGA+pFsK3/P8M+9G6beQqePQ8MKZnwMqgeHH83AD49sRYu7CWZqArcLU2xGUJqGnNWNvM4zZt4lCnvazLkSz8AktwQp66rGBm8/rAlilmM5KasBGEv3ewY/yA9ZWrQ7iMO628vKSuDIm6rpEO9+FfVf2AMs= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org; spf=pass smtp.mailfrom=linaro.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b=WyBRttQr; arc=none smtp.client-ip=209.85.167.43 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linaro.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="WyBRttQr" Received: by mail-lf1-f43.google.com with SMTP id 2adb3069b0e04-5495c63bdc0so275971e87.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=vger.kernel.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=WyBRttQr+2EGE5q0DYGdam3HLywMIQdpe43N9Mtt36hq2JQS61AyVLZs2P9QOleU/I Srg4AKi9bxGVzIpemaOHnNxIx2T1Ct7SgxoZo4Th9ain0v4vZj0yRRE5t1NtQlkvCuoQ ojs/mkYGKmkVl+a8sZHiC2GpNvVi40QbMEEF55/SUpnRfwU2yEWHttunZBnBemNLA3ME 3h5wRqLNvvWRYNXOcTPAY2xxxpiMmAs7TJYiw1A+cj7+UKxyCJLrQFDBwDtcj9e5k/PW IYe+7Yjwvtmp726tw2JoK2QfpGi31DFDeyOVb9soFGwK7ODHY1IDRlfPzffD8wqWng2U JObA== 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=lsubTykU5exG/6ONNwhgGIxxRqlZNXwnSvPhV/MlmzlPqlaJsy0w8ppljkcQG3IMqc K7se+OkUgH0pUARS4oL0/TvJphFo9TPvU58v+V9xbVcmTME7xC7pAaCNn6+SpDzYXYW3 ORbNfE2wtxSbiE0PyXRdIt3ckkoEFT4osFD8CYa4ZkV+WpOUS54d5cKmHgqheCPLC4ma cxEd1X7UMSpWB3oXvq6KN0XQmw8Hx6ejyL/QGn0Wd11mqT0GbnvkkYWMOpiLQ726ckI3 4FmlCma5gDfB7LpqDlKyXLh4rFz8D24fNvsmZULobhy8UYyRB14HcILgqcO44QHQQvmh kOVQ== X-Gm-Message-State: AOJu0YxHw8ZLezPbqXZPAQcaet3i6XYDgsmOZ+1BiNsEaYaoQreN4tcC PlQ9opl4cEyDsp+GzUH0h9JsjKn1bF7DTykH6Szb+HGCyk3y1uQVyAv0XBrk/c4= X-Gm-Gg: ASbGnct4sFGBd/TdbFP5wtEoy7d35IrbJNnb8BP50pXzEEBrmC3hPYsDXMlq4DrQ1Sy V4WXPwWIrWcHKkB2BMS5IpO0xsjPuAI+BYc1/1CIzX2GwMjk7jy0/S3416JUYVLRXXD5alCj3ri eVtXISVVxB+LM4ZKUmD33zyHMd/WCVB+HCHxfXqwoNVVn2BYusJGoNgBV7DG8iG1mRGtdebMqdQ 3Cq6vqK2Jaa2eYlMHFuZXSjjLM2O0jI3XZpKVhNxv/j4C/FREcKamzUHqP9ImG+VINjsJVCbKim /spS0WNfQQRZtUDZVRUyddswLE/+2CskrMypdB/xz5Y62vezaknA 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 Precedence: bulk X-Mailing-List: linux-arm-msm@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: 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 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: 869733 Received: from mail-lf1-f49.google.com (mail-lf1-f49.google.com [209.85.167.49]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 4FCFF1D88D7 for ; Sat, 1 Mar 2025 09:25:11 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.167.49 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740821113; cv=none; b=fsDm/rOB0vbAJ22H17NPuw/4tDj4jMjJBCTCv0vehSxvfV0Xwv0WqKjNFga53KX4Bfvuctva2T3gdBissXfJ1HRiC7WOSXuSOuKAtc1os9k0A1yOAMTRBSYdJEw1arNb/owE9xy9A2PkemGLNArNbj13AeGrFvy0v6oFpFt83Cs= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740821113; c=relaxed/simple; bh=FGk4O1VHJ/AALXi9JU8E7/AS9MUo+YPgs+S6pZa0Mrg=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=s9mMsOYLbVkNKbKqDKcQxFPvwESrPO4YEDtNJ98bhPPHXHmd6ZMB3splQ+5rS55WYDJbsD+bG94g9KoH4AKv7dgF1aY5CES11evlN964xZtv0UPVpx5QwjCr+ahSE9kmKnQJMNTPYjAIarpycZNqkY4wC1Tz7kgrkek+Rla8pKQ= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org; spf=pass smtp.mailfrom=linaro.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b=RaqkO3Cn; arc=none smtp.client-ip=209.85.167.49 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linaro.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="RaqkO3Cn" Received: by mail-lf1-f49.google.com with SMTP id 2adb3069b0e04-54955222959so1378566e87.3 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=vger.kernel.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=RaqkO3CnpKN4K4zuizDWlpYM0J/WGH1kktjt6tmVgYzXTiTPgdHz4nKKl6C5ybU2P2 /3EnILEiNn1wK05TYQJNW6xoqihEc4Uqh6dLhSc8/JFp4ATTA5/zgJ/pa2gD+bvzVTml 4ccedfugTt0XngbPeRkHBX2Brxmi6mQX6GbqQ/6x055yLLYJg6uh6ZRPYBaelYlCuQ9M NsfrfBmUUxDKvuS3NKPxHO/ggZey7VTf+NZBNo3xmUffEaBRD1RvtqqWtH1kyHAa2Cg5 JgHDZzl2gzgjrZYC6CxY8777NHQ0zv6wLHNkv77FjlIyBluxpKXmMlKip9t9QpH7ST9F glnQ== 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=cNJ813vFEWpTAg7ocZi/1pObxqHKAbiaFWU/vHb4jWH4azNIHPNvVLtZTv7vaEvYei 9Y9gKZPxexDD21+193Z8JghoaQdO8+1SKS1yj5EL0VJ0yL7eTGz9bVYCr9z6QZsEFoic 6SiYhSCoIOiB3SdduYYVlmIKmpDOLhx/N3FoIP5wKf3kr/lYGCr1UUdOWTYZGH3++2ad SLsDJltui6aH/T/OOXeW3DzLz1zgbBr3QVL6FRRg6jpdv2ZRWymu/+q94inD/gy3GtEE T27t5T92VxkMLMN0ZcliIq4KU7RHyLLJBMUOSlyOAAmEISe6xThq1Lt8HLlWRasEFVrp tLNw== X-Gm-Message-State: AOJu0YwJ4gP23J0IhVJN1y7FeocsQuBwaF6maGIr7oRl/yAdJYwyMxn1 AzUbs1OaPWtc7YwYwftqwDtsfX1LXpIlT25iS4CZgVIXSbsKG6nzvK7a41vQqOY= X-Gm-Gg: ASbGnctpv0ypDYtQd3a8ZHqFsnjw7Lj702lqQHRBVSjcrqs+PZTQf+wizi5+JsWDicJ fp8iU3PZZKDy0rlq0Zmvl+knr+23y8yG698mAiLr54VdD47o9MOACp2Jt4BVPA0egSJXbLXdiDx DAtd0MNZlai26df9ji/Jf+lX5naob264UGHc/w59GyIqKbwfkxbwx020WBKQQjHQ2AfOfGiR2U6 6YsOimMMe8AR9oPgx0BHF+MxeepsBkl0q4wFsa/Z5J/ICfLr57dybkvnynLtp7wBN4D5OFufDx+ 5bnImvSHBDMuBkdc1Yv0m0SfC2QbZ4CtXX6vJBidrpJFU5eiB1WD 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 Precedence: bulk X-Mailing-List: linux-arm-msm@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: 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 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: 869602 Received: from mail-lj1-f171.google.com (mail-lj1-f171.google.com [209.85.208.171]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 99C641DA10C for ; Sat, 1 Mar 2025 09:25:13 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.208.171 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740821115; cv=none; b=JZbtvtFuofYDV3KcGqxtp8e4ShVhRgEAsJEKlAEYj32i5K+TPBwf/PgNqT1JPUyHu7eZxdtVXT66H7JnK4IkzVrpyqVn3s6bqCUECasql1nuhFSQM2r7tanw5tJ4plrDfynbHnTVc/JhFtIM1uz/N0HUPHvmVVvN/+mv/nZ9Hl0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740821115; c=relaxed/simple; bh=xfJndy0LJ6tSYaPs6OPWvlHfde8Gt+RzIdnKqXQJW2A=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=tKvGbdmMoyTX2cfMJg/WkV5JGVotAG2ikHCTsvqlbs0Sab8au/yA6S69i8BmL1dSyGZ5yuJmRb6XsErVLFBGQ7xo0oQXJLYA07dvrEp0CvV/3qVop00cphoT3dLi4+bi2DJVfTUh4qp0OGTPm2mSr9RXAbt0gO4jafR+de6WDC4= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org; spf=pass smtp.mailfrom=linaro.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b=rHxHPpTC; arc=none smtp.client-ip=209.85.208.171 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linaro.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="rHxHPpTC" Received: by mail-lj1-f171.google.com with SMTP id 38308e7fff4ca-30795988ebeso31669421fa.3 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=vger.kernel.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=rHxHPpTClM80Lh9L6ITu3fEew97kuaagqOFH1oAZQRx/t9pY7/wdphPV7e3DxySAd6 O2LDHa/akoZRVYnhQlOXhZAhxIFiiQExr1W+im8FNNFoFDimvFZewLrDKeJST497w6VN 0ouWAJU2KCeC4JToHPLxEdXsrnd6v3wRvtB4yagN9bEf3Dg8HC8Y8rDDCuoMWfP4YP5l XCO7GESFcqgLkfHrorBHxTnVD+dEomOIKLJ2a/DE1mlixs8OSRPF8O+VE6sFJuVnX0T1 EKkdxid9pKzO+gnqbfwGAtFo8YClInodsGos4SZJeb2LZ+/AmDDUUxqm4Wpeh2VzBe0u TLwQ== 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=f3/dJH4Jx3yBXiDiArEkemqNjo5i0peLTqmZrmgEPodQu/INoxUp9czeaBxpwdaItc HYTu/aN3UCLPseeQSSgH3nGwUHQgfZuaLsugYbDFEmWr+HiZzQ+j9lTrFYP1F5RFX27n zyycCbkDWrALly+GKSuR6N/QMejQ4IN/nIFtBzZpyMQyivrQGMfrvDTQEJRkAlsgsnkU 0O5y4uYaX/5LtcAxQqRXTLfPIQQROmT1ugJOsJlrs09eqp8g7f2O++jRpzEX+xPVlTfh KXiIKmme5cOhO82xFMcB3Euau+ikaw27CTeWrtAo3eSijZYWZL5oNxs/jwbSMiVZGvKs F1vw== X-Gm-Message-State: AOJu0YwRP3fW4t7pP8MELdH2yMdePugQZB8R+Gp6sflrzmZCDzQISChe nmrjav66PJYFCc6un1sPwMg3yflrQscIHx+2duN5//cV5zUUqgGtcD5e9JUXecw= X-Gm-Gg: ASbGnctAle+xVt2Bs1ohoueAGr1/Yg8HuME99a5DyBLOJIGLIACnij1SQLdQL3/LRSQ pg/i21JP2aWJClh2Ip9gQxSd71rJzHTCDRs/wWKioey+oZXh4bp+5G3D7vRCQkeRnbPVEekDYRC WOZmwcVQvwK5iWc4lpwV4J80m51vPtPzUCBK8CFJ2dEkx62ylFqmXPqV4dnTsut7NGfkCGkYBme sjDmphJOx/6w0ELvIib16Ndb6gszd+VXtjFblN2eiVlkStcY24/J0KL1wcCiScXtIOPE7I/XiAX vt1Vn84ritDVdBhGKrufCq2h+FPtZJXPzJ/HJkxn4ZRTSJDlSSom 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 Precedence: bulk X-Mailing-List: linux-arm-msm@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: 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 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),