From patchwork Fri Feb 28 02:40:39 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Baryshkov X-Patchwork-Id: 869342 Received: from mail-lj1-f177.google.com (mail-lj1-f177.google.com [209.85.208.177]) (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 C0F3D16A956 for ; Fri, 28 Feb 2025 02:40:49 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.208.177 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740710451; cv=none; b=pP4EopdvrSR6FQh0fdjqviGahvkjQZV/Y/QFwB1p4O5rBMp9c+YDV1qErohXEOyDJuCQl0M4kO8K2O/oTiCe6/RFudU2v16kpe4rNKJSmP9L+36ypfZAl3D6FdmS51zA86hgjk8UI7qubWrJjbYYnQUEQ7kpF/wu5DAkS4L6HxI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740710451; c=relaxed/simple; bh=AHlIDMaamS4Q911Ji55qeGiDjSSjpx7O5PqZx+FIb8k=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=ukmqsiPGzvhJab1wrackKINpJYIAfQbnA1c12pTpIXZAByNuw0PVlE6OLRWpGkCcbYd1evh1RbI4gQ6HHrPBVe4e49nJSzpAqt91DkJbKOJJ7LkxIVV1CzgoQtPJcGx43SbV4+OnyADmsLRLP5dplLBVqsiS8cddyriOlGJ9xOo= 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=Kk5uozrD; arc=none smtp.client-ip=209.85.208.177 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="Kk5uozrD" Received: by mail-lj1-f177.google.com with SMTP id 38308e7fff4ca-30b8f0c514cso5572771fa.2 for ; Thu, 27 Feb 2025 18:40:49 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1740710448; x=1741315248; 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=vOGs6Fa6zuHrhwyPIl+nFTAKnbOoAu0XxgAk7bsGnFo=; b=Kk5uozrDnNCrzJh8Jiw16Lp3b9vl6rWv2PQ+0ZYkg9jU8SMRElVWyfrYzJgVMsxXnP UbfQ4g50ixzCZctCnsD0xOLsNL6Mu6zIXHoHgzYvlGvzuDclacsKx424EikaQUQ8stH0 5ctRpSXhfrC3JgOA5oVt0kX7PsaF2cvs4kNQhMt2pecHfcuPPKfMSBC4zflZ7UH9odp3 1BHf/Qqy16PTq98ioX/ahHENQVmLtUS6C1JVenksY4NjJBErJRy7CdBc9HNkIBz8qyWG /l3Rb+2hPgiLSz2b4Db+8gXT4guY4+uJ0qju/7v12/lyw5nVRlSzNcHrWfOyg6wWuxWf vr2A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1740710448; x=1741315248; 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=vOGs6Fa6zuHrhwyPIl+nFTAKnbOoAu0XxgAk7bsGnFo=; b=sPANYJnn6t5NZe0nUYkrjy3HrU2yvPiqsl+mxjcVtUzOqRPyEeiIYwhT15JCxLDucJ ++mWnYGl80+gLAKUlS0btvYCaJHX+xGUDClnAL7BkoxhUqY6pdQCz6KClctrnzdWTdGR qWYMm26qtifJpY9hR8BUc1E98SkOUhOSEmWQUaCzmTO2YGT5iz8lmqBtuA/qiWqx2flE jCOTGEZ3F1A/f+/KwgetxRRaUxzwIJ/tGrVGAofsfJOieWKTaVEW9Od94/7HB2ytVuIl sZc44S1xS+MncsVkKIQST8GOrqbBpO3lfJ1nZIabJfDtHzC8glTuI7D2etdcSv2l0WkH VECA== X-Gm-Message-State: AOJu0YwYCEp7079M5OTgfOTL3iYx24VokW/42d4rDjRKi38ZiwkFkn4Z xAdVliN/A/ycEOBIO35t19Zxf3rjmmyTbGuqjn17C2UOS4zB0NxcXHdA2mMbwaA= X-Gm-Gg: ASbGncsaYbE4a9jylXSQaShFKOodeeWuTa7bw9/l5anK190qU75otSCMF7oSSlTcBkb lXcqsJfcDfOuLcWMnKuCPb0sWZ81i7dDOZguQWTH4Al1Az8sZla5Jx3wXpRSL9fCVSqDjuNIO30 a3Apl9eIO/Eyy6RhNRBXl/5zdTGNhvPYHjHHpu5r0UhnkJvlRsk5GEZf3NOrI/LiOtVxW6T3GUc Yx+iZHgy4vah7MzihYnVyluSqz5TiOwbTu9pD8do1AWW88YpTHkDeKPQKu5kPU+lPIfIVSqnwes LYK2gmmGcf0K6wPAXdlfxoNZYwPU8SEfEQ== X-Google-Smtp-Source: AGHT+IEB4jROCc8fnBy3MSZrW9RzrxCaLFObuJxsi615v2WW4DWyQ2y9erjQd2zzlfZt4HWqNT73Xw== X-Received: by 2002:a05:651c:e07:b0:30b:9813:afe1 with SMTP id 38308e7fff4ca-30b9813b4eemr801181fa.25.1740710447809; Thu, 27 Feb 2025 18:40:47 -0800 (PST) Received: from umbar.lan ([192.130.178.90]) by smtp.gmail.com with ESMTPSA id 38308e7fff4ca-30b867a7403sm3493881fa.17.2025.02.27.18.40.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 27 Feb 2025 18:40:46 -0800 (PST) From: Dmitry Baryshkov Date: Fri, 28 Feb 2025 04:40:39 +0200 Subject: [PATCH 2/4] 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: <20250228-dpu-fix-catalog-v1-2-b05d22fbc2b4@linaro.org> References: <20250228-dpu-fix-catalog-v1-0-b05d22fbc2b4@linaro.org> In-Reply-To: <20250228-dpu-fix-catalog-v1-0-b05d22fbc2b4@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=1244; i=dmitry.baryshkov@linaro.org; h=from:subject:message-id; bh=AHlIDMaamS4Q911Ji55qeGiDjSSjpx7O5PqZx+FIb8k=; b=owEBbQGS/pANAwAKAYs8ij4CKSjVAcsmYgBnwSIo7NuSbAFeNFO1NY+RizSOKgHJrrMgQz/BM XWFEbzrn0CJATMEAAEKAB0WIQRMcISVXLJjVvC4lX+LPIo+Aiko1QUCZ8EiKAAKCRCLPIo+Aiko 1Q9yB/9Isl5/jVjtfyVK1130CUffh72E0EfipCMgeU8T2V/cUd/oht19i47Bklr9nLRGpZgr0QF nhI5oaX2BJowBZ7XVBBL46P6bSfq7TwhGC0DrGEvNK3B9LHLnQOAdgv7wYlUqjVhqK29uQEwE5/ JJi/sefWmvVpPkWxytK+0EhNUbmF5UyfG0ADicerAHsoIy1s5QIBWruB3KdrnqsC5r/qU2j6R4m OdJs/X0VWXZRxsHn7psLQ9Q+H4INkAUvLxYhtHMHRQt0uwlxtkDVFzs2iBcWmIv6w9LROVF+Jq8 C/JtiYINhX+7199v3tqxSZaCU1G2USuXFqjGQffzH+WkMPGY 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: 62af6e1cb596 ("drm/msm/dpu: Add support for MSM8917") Reported-by: Abhinav Kumar 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 Fri Feb 28 02:40:41 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Baryshkov X-Patchwork-Id: 869341 Received: from mail-lj1-f176.google.com (mail-lj1-f176.google.com [209.85.208.176]) (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 855FF192D87 for ; Fri, 28 Feb 2025 02:40:54 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.208.176 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740710456; cv=none; b=kxTKqKcD3hvp5WNrPDuo3yRF+hHr40lAcUUlKZsWwfArJeKTQDwTZV63byEbyTSn1yeatBcKYWEQfIHId7M49x+E3SVFhUZbYvvCLdPL+/v6axX+0rzZfTAbMwp1tTHJTdlmWI1id1/re/74kofRdzJt+uh1eCTKD7Ym/hR8Ne8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740710456; c=relaxed/simple; bh=5ERbWujSiKto3U+OO7RC5nldxvAV3Xb1FsVd/34DI+E=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=VBI7c+1/d0HCaErsDwrrAHJ4YgVD+AksEsQIrQ+b5MS4p4UJvvg18xzegp4p2FHC6+Y6Dr9IDR1P3FSDiUaHEp4Wwwyxcr4/u5l7heIuiDZGqSHocNVHwrizQVc2Vq55jZR8eL+3D522Qa/jMmQ9ZjARcfvwe2tUsNZfdUaNgR0= 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=THXMXRvd; arc=none smtp.client-ip=209.85.208.176 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="THXMXRvd" Received: by mail-lj1-f176.google.com with SMTP id 38308e7fff4ca-30a3092a9ebso17614861fa.1 for ; Thu, 27 Feb 2025 18:40:54 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1740710453; x=1741315253; 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=C0drAA2PvbJ4hUCTdzmpW/pfB1rIMSFKchoim7lWctY=; b=THXMXRvdIlfXj56fnnVKkVPc6C2OO/0JQlblGwdyclizvvKfuCl80dSXXLPxjQKijP iSN5C+f/n9yhyDH9PqBwmhzk830A0prpcHRcDekKAmcDa7Bs9VOAyyx0725Yl2D20TYv qHaZ40jlDQyi4CgFHKaMndE697BD8lq+H4xOcGu+zRC0jgYqk4YwNsPNqy7np0fcD5uM XoxdYgQhDD/TV0Z3nkemnpREzxLgvUcogVwZi5cxv3wPYiV5bA6JD/TNq4VM29Bt9ADb +fOgXGHb1Bi555pSWO1Hk40Y9nXgZshKhjmBOow2E7ibda+XZHkIlbGVMoS8nKXnNBYn WaFg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1740710453; x=1741315253; 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=C0drAA2PvbJ4hUCTdzmpW/pfB1rIMSFKchoim7lWctY=; b=Ai8oOK77Su02ksTFrEKSsdfBwJvVMhXAhjJoENUE9ynCgLB+cU21garHIySKmpGwiT FUJPFTeoLHPimDXPNyL03p2QfPm33NIKEmBFXOIRRmGaEHwV/h7/xBZwmOJIqfQT6+7O o4cVekJKAkkyry9Zxq4IqRqVBftn9lOBqH6/mZ8ZiqA3xhmhIfw9+dnBI4mwDpw+jGyl rhzn4ZgPWJYLe+zKKuMntjnU5gKOoJLpi8PI4RqTm+tazzUYtHVscI5LI3Bfe5pL6AHx o1I7IEnDJWDQUnBpkjfs0rpsNQIbme5P8pRzuAcW2O+Pk5dfNQlApVDt3vZsGs0g7rl2 JI6Q== X-Gm-Message-State: AOJu0YxFQe0MTMHXj3XujvhB5QqbYI8NAx7CzDktfxAdUY9wov8Iw72W V4+kAC3ZVMegIb5e/qKNTmifYw4+i6AOVHA46UoCabKO4UnQ060ygjTw7HvrrL8= X-Gm-Gg: ASbGncs6rmbY3SgDXqAqysI08M/3dX03DX5ExpJ3higrfCK1s2W9pRODlgcKPIL0d7M cREHLpVSBJop/aDvChvvubsbX13+KVOPjeL49er/Ruvq7khO5zsMAyLcWS50ejm5C6nSWHxHIwU 1rhOoW9uxeIbgAql9LwoO2upvaKiJAWc4oTFPb3BUQUI+q9oxkDJIdb3bpvdYlFTBoIbRqkjx/D 0o6I8mpm4YY6mrXYU5NGR4tRK/UPC21HtNd5e6mzx1Q7ioREFdbQBHBY/K9I9NDGrqwmWUF4XW1 UfZ95vajaQhZf5/5segskbRedCKIuE82NQ== X-Google-Smtp-Source: AGHT+IEyA6OYswRzZk6KES4gyk4YksuY5o9aOh5bM9ecrpKh5LG64AXf+j9DZx4ELbV5JDnuU1skDA== X-Received: by 2002:a05:651c:b0d:b0:30b:8de7:c877 with SMTP id 38308e7fff4ca-30b932f27f5mr3782391fa.29.1740710452656; Thu, 27 Feb 2025 18:40:52 -0800 (PST) Received: from umbar.lan ([192.130.178.90]) by smtp.gmail.com with ESMTPSA id 38308e7fff4ca-30b867a7403sm3493881fa.17.2025.02.27.18.40.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 27 Feb 2025 18:40:51 -0800 (PST) From: Dmitry Baryshkov Date: Fri, 28 Feb 2025 04:40:41 +0200 Subject: [PATCH 4/4] 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: <20250228-dpu-fix-catalog-v1-4-b05d22fbc2b4@linaro.org> References: <20250228-dpu-fix-catalog-v1-0-b05d22fbc2b4@linaro.org> In-Reply-To: <20250228-dpu-fix-catalog-v1-0-b05d22fbc2b4@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=1666; i=dmitry.baryshkov@linaro.org; h=from:subject:message-id; bh=5ERbWujSiKto3U+OO7RC5nldxvAV3Xb1FsVd/34DI+E=; b=owEBbQGS/pANAwAKAYs8ij4CKSjVAcsmYgBnwSIppBKKZZWahn5Gl8puGu+J1APz0T7Ew7c91 NvB4zUOR9WJATMEAAEKAB0WIQRMcISVXLJjVvC4lX+LPIo+Aiko1QUCZ8EiKQAKCRCLPIo+Aiko 1eomB/kBscyXJstvxO1FfWarKxnLaj7+/cQqdJ7b2BZA4oKjEbWHt2gFNgSYoHv7kOWYpUX11BW GOEP2C05FVnfyF6dAFFx0mebAYSL3KQGKruZ5UmU/fXl3oAMzp5l3/H8Wav17TR+3S6eREXFEUX P6EYdVUAY+SIMsvoVXjsm+MEfBEe6hrDo6xtWeHDslnkniKMMZ8W6mfbNjXmaYMRafQtpOPTg+9 EzqgYx/i//5cMR3KYNmfD8xzFYv6b1AjfzxcKEYahT3njHxlN0xubMbY9xyrNbULC769joFbum5 2HMO77CtKfK4Aaxm3utxQUGoihOPJq58CCHDcD12f+w5MiYE 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, replacing PINGPONG_SDM845_MASK and PINGPONG_SDM845_TE2_MASK with proper bitmasks. Fixes: 7204df5e7e68 ("drm/msm/dpu: add support for SDM660 and SDM630 platforms") Reported-by: Abhinav Kumar Signed-off-by: Dmitry Baryshkov --- drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_3_3_sdm630.h | 5 +++-- 1 file changed, 3 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 df01227fc36468f4945c03e767e1409ea4fc0896..4fdc9c19a74a0c52ae502b77fb8697a53bef0f97 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,15 @@ static const struct dpu_pingpong_cfg sdm630_pp[] = { { .name = "pingpong_0", .id = PINGPONG_0, .base = 0x70000, .len = 0xd4, - .features = PINGPONG_SDM845_TE2_MASK, + .features = BIT(DPU_PINGPONG_DITHER) | + BIT(DPU_PINGPONG_TE2), .sblk = &sdm845_pp_sblk_te, .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),