From nobody Sun Dec 14 12:16:59 2025 Received: from mx0a-0031df01.pphosted.com (mx0a-0031df01.pphosted.com [205.220.168.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 377812C3752 for ; Thu, 22 May 2025 19:04:54 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=205.220.168.131 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1747940697; cv=none; b=cKp9gwZoEwf5GbqjCLwW4yJkDzyiaqPEL4AeYWONGjbHgE/TNvsqpuKZIUxigAMA6Z7/5znVnVhzlxCCbjP9pbupcAQ/BQxlMzVRdYn1cy+XYDadpU3B8fr1gsB6R4jeOvSZtEPEgeb0o05g7/PIJYoAX47l1nFUWTwvimEp2kY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1747940697; c=relaxed/simple; bh=yMylM5q2SumCKQICfch3yCGCj/FmvjrEEGOz3RHRJig=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=BhyHIlsGtmZLpf4jzdiJmLUC4BDVCSfwUG5DhBN1jrfOlLRfdBwBDZEu5axrJJIAVFkYEtTc+iT75kP8dXHu9y6mAfcD/Ma90RsC1bJI5piQ33kA9cEXA1RPVX6taS2bXHbD7T5Z52RJ6fliUXiYQPNZ8ZUj2kr1ACh4pcDmxX4= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=oss.qualcomm.com; spf=pass smtp.mailfrom=oss.qualcomm.com; dkim=pass (2048-bit key) header.d=qualcomm.com header.i=@qualcomm.com header.b=TBFI5z+K; arc=none smtp.client-ip=205.220.168.131 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=oss.qualcomm.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=oss.qualcomm.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=qualcomm.com header.i=@qualcomm.com header.b="TBFI5z+K" Received: from pps.filterd (m0279864.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 54MFkNwT020598 for ; Thu, 22 May 2025 19:04:53 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=qualcomm.com; h= cc:content-transfer-encoding:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to; s=qcppdkim1; bh= VwZo5rFO+Fo9r6sEtki6tvyPanlZZDkaCTSawEXgDN4=; b=TBFI5z+KMHDRskSj weQJV7F0bCw4LJtVyGTJw7N5bPxs9hQBWXl4uDhzgEgV/NXBfXIJt8RUTcYPP2Lk uCAXE7JdhM8PuxEZDCYVyE2W9w6RCmFskkDApA5lqERN+4fSNiRjJXIc9aeY+BmI 0IrbikpE0FpuzISCR/uWrp/4Xi95bVGbbLS4QNoENnKrHSTHN1pquir1xs7zAO/S Fe/EqeFr5oLDhTUvRKEmrUu2G+etBMwLaZV15uxSISyrLfpJCGdJWFutpE2+xrTU sCzH1DGcw+Oc7aL24lUPxwHRtcd+80Q/MlWcjFeu3y26/ACEACOvku2/zGltw2ae zl735Q== Received: from mail-qk1-f198.google.com (mail-qk1-f198.google.com [209.85.222.198]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 46s9pb5v61-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Thu, 22 May 2025 19:04:53 +0000 (GMT) Received: by mail-qk1-f198.google.com with SMTP id af79cd13be357-7c5f3b8b1a1so1363559985a.3 for ; Thu, 22 May 2025 12:04:53 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1747940691; x=1748545491; 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=VwZo5rFO+Fo9r6sEtki6tvyPanlZZDkaCTSawEXgDN4=; b=O4ulxar9yNO7msFgbCt2M9hvGnWIg4doM/6QNuCNuZ3UrvmWE8cO9wmFFvOKMlA8/w zFalcLbM7Wmu8qkxXU3LvyXYwjToT2cbeNfLOOYzcxdkA1FsZMo2vQxcciN+dAZ/ECHS TO0dug9+VGphvVhgymLPQeQ+wq+LZ+J1Xj3h14fiGD7/5wstS2P+EYB7bV6rcpuE+AO6 O6pKV8WK6BV6e5Kjjpq/UVjH8C3iJ6RqXcopk76DvCif4+f9nn9JVsfX4qNErxeVWNqk jfD+dI0LaFSya4ivDMkimLn5LeJA96QfxFGFQtQhVOMRuvwIMf0clLTrnqFopRkcTsVq YeMA== X-Forwarded-Encrypted: i=1; AJvYcCX0yVsbfn2zep83mBvkYBm7QCP5yggEUrG8c1wv7NdR3MliKKd04VsFtAvpyPrWLOY1HrDc6wmed+Q4lzI=@vger.kernel.org X-Gm-Message-State: AOJu0YxD4+dlwx5Io/mZgHA99pSM07hO4FKWk0HChHO76Ev9SfbUx4p6 64fE2L9h2iNtP5OOjUnmo9avBUJwrl2HSX1X5eqLqdhp2pIR6bWo+g7kYM+VPbOzktgtYl8INxE u5kuOH8MvjQPOxhVYZNHumSraf19HP4Ao2r1qft3B/e62+JE0X38Ell3pUhvMeTSKvOD8t8uZjs 0= X-Gm-Gg: ASbGncsiuoMyoq4Ms+xNvI+x5mmoWYGO9cY/7/lXGaDoPbBiOvCNjn/rl7wxnxFhdFn wx63vP4pBlNuSEW78BUq2Vp/AtAnUFwQTNoUyB6ivF6BCsGfeb6p7NwvPe584aKyB2w4Lt2MLEw Cp98gBM4dch0JosU50dp7aq5zwm60AGxgHGXIYaa7l3/v8LQKi0qbjyCEOB9PJ+rWlo9w/Wk/aD osKBHVxCwbdDKC2h4tlO/DQOR0+1m59cz8lvy4sXSpbG/lofSYGbTe4R8/ebTbDctNvBBENAExL ahg3S73w15p0YaTLz339sa9H8nTgAGLI1XfutqVeNDt1gQ3xe0aFl3qLjRlTLAN772eJuG8BHHa t+oz9apRdhiEqMpnVo2PGP5DL X-Received: by 2002:a05:620a:1999:b0:7c5:5003:81b0 with SMTP id af79cd13be357-7cee31f6a61mr9208785a.23.1747940690938; Thu, 22 May 2025 12:04:50 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEGyBoxBiQu+R7TxjU/9FO7jh834AKrFaGdFjzBhtfd5AnK14VFdGaOTFWnZJjxCGXUmmEqvA== X-Received: by 2002:a05:620a:4445:b0:7c8:4634:51d3 with SMTP id af79cd13be357-7cee3297985mr6441085a.55.1747940679606; Thu, 22 May 2025 12:04:39 -0700 (PDT) Received: from umbar.lan (2001-14ba-a0c3-3a00-264b-feff-fe8b-be8a.rev.dnainternet.fi. [2001:14ba:a0c3:3a00:264b:feff:fe8b:be8a]) by smtp.gmail.com with ESMTPSA id 2adb3069b0e04-550e703c2f3sm3482506e87.214.2025.05.22.12.04.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 22 May 2025 12:04:37 -0700 (PDT) From: Dmitry Baryshkov Date: Thu, 22 May 2025 22:03:41 +0300 Subject: [PATCH v5 22/30] drm/msm/dpu: get rid of DPU_DIM_LAYER Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20250522-dpu-drop-features-v5-22-3b2085a07884@oss.qualcomm.com> References: <20250522-dpu-drop-features-v5-0-3b2085a07884@oss.qualcomm.com> In-Reply-To: <20250522-dpu-drop-features-v5-0-3b2085a07884@oss.qualcomm.com> To: Rob Clark , Abhinav Kumar , Sean Paul , Marijn Suijten , David Airlie , Simona Vetter , Vinod Koul , Konrad Dybcio Cc: Neil Armstrong , linux-arm-msm@vger.kernel.org, dri-devel@lists.freedesktop.org, freedreno@lists.freedesktop.org, linux-kernel@vger.kernel.org, Dmitry Baryshkov X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=36957; i=dmitry.baryshkov@oss.qualcomm.com; h=from:subject:message-id; bh=qFUB/zmAszMmoynn89d0rjEkbVCuOItarDz5KzyErKg=; b=owEBbQGS/pANAwAKAYs8ij4CKSjVAcsmYgBoL3T/OwHbV96aoTlGL0NlD2cJajjKIVY9RPMl1 ee2KAeiLT+JATMEAAEKAB0WIQRMcISVXLJjVvC4lX+LPIo+Aiko1QUCaC90/wAKCRCLPIo+Aiko 1Wq9B/4rUrCsa4sz/a1bhywLG2mDQ91bdn4WzsTtbHKwRWfJvfwwfVtbH30yH531fhRlGVzgLSj YioVgsrFu6+0Lvm144bAeCFW4J8xD2JwxxutXw1WohtNqMKpNd64m2apN9TNtpe1xuMErhpfPAs b6ciRtTHZvRe4RoLfh3L4/I7W+NUWhdtuL7AVMQRrCz+c0DLU6Ey51CiV3Nq6Mv5bmU/n0DAWTf mdiOxB+T0z50KJ0A/Jrfhuai6w05OVWpqZY0offyXO4amf+4mxgjNPcPdFTpwBndKr8oKlIGJfq omrfborAx9dFHGY2MOIheMDrORKcKnwpCj5hLpKGVo8HoELD X-Developer-Key: i=dmitry.baryshkov@oss.qualcomm.com; a=openpgp; fpr=8F88381DD5C873E4AE487DA5199BF1243632046A X-Authority-Analysis: v=2.4 cv=WJl/XmsR c=1 sm=1 tr=0 ts=682f7555 cx=c_pps a=qKBjSQ1v91RyAK45QCPf5w==:117 a=xqWC_Br6kY4A:10 a=IkcTkHD0fZMA:10 a=dt9VzEwgFbYA:10 a=KKAkSRfTAAAA:8 a=EUspDBNiAAAA:8 a=kQUVcpSUXEBHcVziRcEA:9 a=QEXdDO2ut3YA:10 a=NFOGd7dJGGMPyQGDc5-O:22 a=cvBusfyB2V15izCimMoJ:22 X-Proofpoint-ORIG-GUID: 31T4pHmam_bleDZiMz2fTLXHWjj_sNNt X-Proofpoint-GUID: 31T4pHmam_bleDZiMz2fTLXHWjj_sNNt X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUwNTIyMDE5MiBTYWx0ZWRfX2SWOXpQk7jHD yqFekNMnmIM3N5Fi3CWTbYA+GSMon2MYHpgVi/aOyH/huaYsuKmfVo0FYrwGIJAS5rQZ+b5Zu7g EyfUp/QD7AbNVo+rC4Gx6O2LkBciTg/f7E1knz1t+mSgNjmRgp/cuN7tEU71C98PKKoRJSRAhXa HgbMuUAPgW1+avNDrGaKmhXEdljP8wLml0IrrZvPwElomf3dlSWNZu389O4onzhEn/2waFWK+nP lwgs0DWDYqwKNUfXH61osZ19Wy4i9w5nmWBNbIAyKQi3R98cPJmsJ2Y6xFw79Wi5Xv804hYGOQA GWI/wt1ffqpk41rUpUzoypyRVsN9mSdQ5PAkKl5Yifxht2jVaZCCcIwA4eEhz/Ir0l4M6IFmdFy mWTiyL6s7u5cCuW3UH4dAnQIybYQuvzcqurGZUkZ0q/6Vy/wvVy/ixttulRyE5aFgJgPc1Q1 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1099,Hydra:6.0.736,FMLib:17.12.80.40 definitions=2025-05-22_09,2025-05-22_01,2025-03-28_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 spamscore=0 lowpriorityscore=0 clxscore=1015 suspectscore=0 bulkscore=0 malwarescore=0 impostorscore=0 mlxscore=0 adultscore=0 phishscore=0 mlxlogscore=999 priorityscore=1501 classifier=spam authscore=0 authtc=n/a authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.19.0-2505160000 definitions=main-2505220192 From: Dmitry Baryshkov Continue migration to the MDSS-revision based checks and drop the DPU_DIM_LAYER feature bit. It is currently unused, but can be replaed with the core_major_ver >=3D 4 check. Signed-off-by: Dmitry Baryshkov Reviewed-by: Neil Armstrong Signed-off-by: Dmitry Baryshkov --- drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_10_0_sm8650.h | 12 ++++++------ drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_4_0_sdm845.h | 8 ++++---- drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_4_1_sdm670.h | 8 ++++---- drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_5_0_sm8150.h | 12 ++++++------ drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_5_1_sc8180x.h | 12 ++++++------ drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_5_2_sm7150.h | 8 ++++---- drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_5_3_sm6150.h | 3 --- drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_5_4_sm6125.h | 2 -- drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_6_0_sm8250.h | 12 ++++++------ drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_6_2_sc7180.h | 4 ++-- drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_6_3_sm6115.h | 1 - drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_6_4_sm6350.h | 4 ++-- drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_6_5_qcm2290.h | 1 - drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_6_9_sm6375.h | 1 - drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_7_0_sm8350.h | 12 ++++++------ drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_7_2_sc7280.h | 6 +++--- drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_8_0_sc8280xp.h | 12 ++++++------ drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_8_1_sm8450.h | 12 ++++++------ drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_8_4_sa8775p.h | 12 ++++++------ drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_9_0_sm8550.h | 12 ++++++------ drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_9_1_sar2130p.h | 12 ++++++------ drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_9_2_x1e80100.h | 12 ++++++------ drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.c | 6 ------ drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.h | 2 -- 24 files changed, 85 insertions(+), 101 deletions(-) diff --git a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_10_0_sm8650.h b/driv= ers/gpu/drm/msm/disp/dpu1/catalog/dpu_10_0_sm8650.h index ae66c338250664f9306a7d431cfa18ca07a916a5..9a8f6043370997cb12414c4132e= b68cc73f7030a 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_10_0_sm8650.h +++ b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_10_0_sm8650.h @@ -132,7 +132,7 @@ static const struct dpu_lm_cfg sm8650_lm[] =3D { { .name =3D "lm_0", .id =3D LM_0, .base =3D 0x44000, .len =3D 0x400, - .features =3D MIXER_SDM845_MASK, + .features =3D MIXER_MSM8998_MASK, .sblk =3D &sdm845_lm_sblk, .lm_pair =3D LM_1, .pingpong =3D PINGPONG_0, @@ -140,7 +140,7 @@ static const struct dpu_lm_cfg sm8650_lm[] =3D { }, { .name =3D "lm_1", .id =3D LM_1, .base =3D 0x45000, .len =3D 0x400, - .features =3D MIXER_SDM845_MASK, + .features =3D MIXER_MSM8998_MASK, .sblk =3D &sdm845_lm_sblk, .lm_pair =3D LM_0, .pingpong =3D PINGPONG_1, @@ -148,7 +148,7 @@ static const struct dpu_lm_cfg sm8650_lm[] =3D { }, { .name =3D "lm_2", .id =3D LM_2, .base =3D 0x46000, .len =3D 0x400, - .features =3D MIXER_SDM845_MASK, + .features =3D MIXER_MSM8998_MASK, .sblk =3D &sdm845_lm_sblk, .lm_pair =3D LM_3, .pingpong =3D PINGPONG_2, @@ -156,7 +156,7 @@ static const struct dpu_lm_cfg sm8650_lm[] =3D { }, { .name =3D "lm_3", .id =3D LM_3, .base =3D 0x47000, .len =3D 0x400, - .features =3D MIXER_SDM845_MASK, + .features =3D MIXER_MSM8998_MASK, .sblk =3D &sdm845_lm_sblk, .lm_pair =3D LM_2, .pingpong =3D PINGPONG_3, @@ -164,14 +164,14 @@ static const struct dpu_lm_cfg sm8650_lm[] =3D { }, { .name =3D "lm_4", .id =3D LM_4, .base =3D 0x48000, .len =3D 0x400, - .features =3D MIXER_SDM845_MASK, + .features =3D MIXER_MSM8998_MASK, .sblk =3D &sdm845_lm_sblk, .lm_pair =3D LM_5, .pingpong =3D PINGPONG_4, }, { .name =3D "lm_5", .id =3D LM_5, .base =3D 0x49000, .len =3D 0x400, - .features =3D MIXER_SDM845_MASK, + .features =3D MIXER_MSM8998_MASK, .sblk =3D &sdm845_lm_sblk, .lm_pair =3D LM_4, .pingpong =3D PINGPONG_5, diff --git a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_4_0_sdm845.h b/drive= rs/gpu/drm/msm/disp/dpu1/catalog/dpu_4_0_sdm845.h index 72a7257b4d7ba5bfe89ec76bac19550e023a2b50..5cc9f55d542b79bd2859cdd13d7= f9640bf385866 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 @@ -133,7 +133,7 @@ static const struct dpu_lm_cfg sdm845_lm[] =3D { { .name =3D "lm_0", .id =3D LM_0, .base =3D 0x44000, .len =3D 0x320, - .features =3D MIXER_SDM845_MASK, + .features =3D MIXER_MSM8998_MASK, .sblk =3D &sdm845_lm_sblk, .lm_pair =3D LM_1, .pingpong =3D PINGPONG_0, @@ -141,7 +141,7 @@ static const struct dpu_lm_cfg sdm845_lm[] =3D { }, { .name =3D "lm_1", .id =3D LM_1, .base =3D 0x45000, .len =3D 0x320, - .features =3D MIXER_SDM845_MASK, + .features =3D MIXER_MSM8998_MASK, .sblk =3D &sdm845_lm_sblk, .lm_pair =3D LM_0, .pingpong =3D PINGPONG_1, @@ -149,7 +149,7 @@ static const struct dpu_lm_cfg sdm845_lm[] =3D { }, { .name =3D "lm_2", .id =3D LM_2, .base =3D 0x46000, .len =3D 0x320, - .features =3D MIXER_SDM845_MASK, + .features =3D MIXER_MSM8998_MASK, .sblk =3D &sdm845_lm_sblk, .lm_pair =3D LM_5, .pingpong =3D PINGPONG_2, @@ -157,7 +157,7 @@ static const struct dpu_lm_cfg sdm845_lm[] =3D { }, { .name =3D "lm_5", .id =3D LM_5, .base =3D 0x49000, .len =3D 0x320, - .features =3D MIXER_SDM845_MASK, + .features =3D MIXER_MSM8998_MASK, .sblk =3D &sdm845_lm_sblk, .lm_pair =3D LM_2, .pingpong =3D PINGPONG_3, diff --git a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_4_1_sdm670.h b/drive= rs/gpu/drm/msm/disp/dpu1/catalog/dpu_4_1_sdm670.h index ce169a610e195cbb6f0fee1362bcaaf05df777cb..0f5e9babdeea837c77546cd60cf= 9b545434c9746 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_4_1_sdm670.h +++ b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_4_1_sdm670.h @@ -68,7 +68,7 @@ static const struct dpu_lm_cfg sdm670_lm[] =3D { { .name =3D "lm_0", .id =3D LM_0, .base =3D 0x44000, .len =3D 0x320, - .features =3D MIXER_SDM845_MASK, + .features =3D MIXER_MSM8998_MASK, .sblk =3D &sdm845_lm_sblk, .lm_pair =3D LM_1, .pingpong =3D PINGPONG_0, @@ -76,7 +76,7 @@ static const struct dpu_lm_cfg sdm670_lm[] =3D { }, { .name =3D "lm_1", .id =3D LM_1, .base =3D 0x45000, .len =3D 0x320, - .features =3D MIXER_SDM845_MASK, + .features =3D MIXER_MSM8998_MASK, .sblk =3D &sdm845_lm_sblk, .lm_pair =3D LM_0, .pingpong =3D PINGPONG_1, @@ -84,14 +84,14 @@ static const struct dpu_lm_cfg sdm670_lm[] =3D { }, { .name =3D "lm_2", .id =3D LM_2, .base =3D 0x46000, .len =3D 0x320, - .features =3D MIXER_SDM845_MASK, + .features =3D MIXER_MSM8998_MASK, .sblk =3D &sdm845_lm_sblk, .lm_pair =3D LM_5, .pingpong =3D PINGPONG_2, }, { .name =3D "lm_5", .id =3D LM_5, .base =3D 0x49000, .len =3D 0x320, - .features =3D MIXER_SDM845_MASK, + .features =3D MIXER_MSM8998_MASK, .sblk =3D &sdm845_lm_sblk, .lm_pair =3D LM_2, .pingpong =3D PINGPONG_3, diff --git a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_5_0_sm8150.h b/drive= rs/gpu/drm/msm/disp/dpu1/catalog/dpu_5_0_sm8150.h index 23a3a458dd5c260399a42e5f4d4361b3c4e82c4f..8e37c40620b62aacdcb47c7a04b= cfce944ab0b4c 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_5_0_sm8150.h +++ b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_5_0_sm8150.h @@ -136,7 +136,7 @@ static const struct dpu_lm_cfg sm8150_lm[] =3D { { .name =3D "lm_0", .id =3D LM_0, .base =3D 0x44000, .len =3D 0x320, - .features =3D MIXER_SDM845_MASK, + .features =3D MIXER_MSM8998_MASK, .sblk =3D &sdm845_lm_sblk, .lm_pair =3D LM_1, .pingpong =3D PINGPONG_0, @@ -144,7 +144,7 @@ static const struct dpu_lm_cfg sm8150_lm[] =3D { }, { .name =3D "lm_1", .id =3D LM_1, .base =3D 0x45000, .len =3D 0x320, - .features =3D MIXER_SDM845_MASK, + .features =3D MIXER_MSM8998_MASK, .sblk =3D &sdm845_lm_sblk, .lm_pair =3D LM_0, .pingpong =3D PINGPONG_1, @@ -152,7 +152,7 @@ static const struct dpu_lm_cfg sm8150_lm[] =3D { }, { .name =3D "lm_2", .id =3D LM_2, .base =3D 0x46000, .len =3D 0x320, - .features =3D MIXER_SDM845_MASK, + .features =3D MIXER_MSM8998_MASK, .sblk =3D &sdm845_lm_sblk, .lm_pair =3D LM_3, .pingpong =3D PINGPONG_2, @@ -160,7 +160,7 @@ static const struct dpu_lm_cfg sm8150_lm[] =3D { }, { .name =3D "lm_3", .id =3D LM_3, .base =3D 0x47000, .len =3D 0x320, - .features =3D MIXER_SDM845_MASK, + .features =3D MIXER_MSM8998_MASK, .sblk =3D &sdm845_lm_sblk, .lm_pair =3D LM_2, .pingpong =3D PINGPONG_3, @@ -168,14 +168,14 @@ static const struct dpu_lm_cfg sm8150_lm[] =3D { }, { .name =3D "lm_4", .id =3D LM_4, .base =3D 0x48000, .len =3D 0x320, - .features =3D MIXER_SDM845_MASK, + .features =3D MIXER_MSM8998_MASK, .sblk =3D &sdm845_lm_sblk, .lm_pair =3D LM_5, .pingpong =3D PINGPONG_4, }, { .name =3D "lm_5", .id =3D LM_5, .base =3D 0x49000, .len =3D 0x320, - .features =3D MIXER_SDM845_MASK, + .features =3D MIXER_MSM8998_MASK, .sblk =3D &sdm845_lm_sblk, .lm_pair =3D LM_4, .pingpong =3D PINGPONG_5, diff --git a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_5_1_sc8180x.h b/driv= ers/gpu/drm/msm/disp/dpu1/catalog/dpu_5_1_sc8180x.h index 75f8f69123a4a6afe8234a9de21ce68b23c11605..a05d2ef8fc9d217898b8c12d463= 9563b28b4477b 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_5_1_sc8180x.h +++ b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_5_1_sc8180x.h @@ -136,7 +136,7 @@ static const struct dpu_lm_cfg sc8180x_lm[] =3D { { .name =3D "lm_0", .id =3D LM_0, .base =3D 0x44000, .len =3D 0x320, - .features =3D MIXER_SDM845_MASK, + .features =3D MIXER_MSM8998_MASK, .sblk =3D &sdm845_lm_sblk, .lm_pair =3D LM_1, .pingpong =3D PINGPONG_0, @@ -144,7 +144,7 @@ static const struct dpu_lm_cfg sc8180x_lm[] =3D { }, { .name =3D "lm_1", .id =3D LM_1, .base =3D 0x45000, .len =3D 0x320, - .features =3D MIXER_SDM845_MASK, + .features =3D MIXER_MSM8998_MASK, .sblk =3D &sdm845_lm_sblk, .lm_pair =3D LM_0, .pingpong =3D PINGPONG_1, @@ -152,7 +152,7 @@ static const struct dpu_lm_cfg sc8180x_lm[] =3D { }, { .name =3D "lm_2", .id =3D LM_2, .base =3D 0x46000, .len =3D 0x320, - .features =3D MIXER_SDM845_MASK, + .features =3D MIXER_MSM8998_MASK, .sblk =3D &sdm845_lm_sblk, .lm_pair =3D LM_3, .pingpong =3D PINGPONG_2, @@ -160,7 +160,7 @@ static const struct dpu_lm_cfg sc8180x_lm[] =3D { }, { .name =3D "lm_3", .id =3D LM_3, .base =3D 0x47000, .len =3D 0x320, - .features =3D MIXER_SDM845_MASK, + .features =3D MIXER_MSM8998_MASK, .sblk =3D &sdm845_lm_sblk, .lm_pair =3D LM_2, .pingpong =3D PINGPONG_3, @@ -168,14 +168,14 @@ static const struct dpu_lm_cfg sc8180x_lm[] =3D { }, { .name =3D "lm_4", .id =3D LM_4, .base =3D 0x48000, .len =3D 0x320, - .features =3D MIXER_SDM845_MASK, + .features =3D MIXER_MSM8998_MASK, .sblk =3D &sdm845_lm_sblk, .lm_pair =3D LM_5, .pingpong =3D PINGPONG_4, }, { .name =3D "lm_5", .id =3D LM_5, .base =3D 0x49000, .len =3D 0x320, - .features =3D MIXER_SDM845_MASK, + .features =3D MIXER_MSM8998_MASK, .sblk =3D &sdm845_lm_sblk, .lm_pair =3D LM_4, .pingpong =3D PINGPONG_5, diff --git a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_5_2_sm7150.h b/drive= rs/gpu/drm/msm/disp/dpu1/catalog/dpu_5_2_sm7150.h index 6b895eca2fac53505f7a1d857d30bb8a5d23d4c8..cb0b5687b5239418f50c539447f= 9cfa56e81fcc6 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_5_2_sm7150.h +++ b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_5_2_sm7150.h @@ -109,7 +109,7 @@ static const struct dpu_lm_cfg sm7150_lm[] =3D { { .name =3D "lm_0", .id =3D LM_0, .base =3D 0x44000, .len =3D 0x320, - .features =3D MIXER_SDM845_MASK, + .features =3D MIXER_MSM8998_MASK, .sblk =3D &sdm845_lm_sblk, .lm_pair =3D LM_1, .pingpong =3D PINGPONG_0, @@ -117,7 +117,7 @@ static const struct dpu_lm_cfg sm7150_lm[] =3D { }, { .name =3D "lm_1", .id =3D LM_1, .base =3D 0x45000, .len =3D 0x320, - .features =3D MIXER_SDM845_MASK, + .features =3D MIXER_MSM8998_MASK, .sblk =3D &sdm845_lm_sblk, .lm_pair =3D LM_0, .pingpong =3D PINGPONG_1, @@ -125,14 +125,14 @@ static const struct dpu_lm_cfg sm7150_lm[] =3D { }, { .name =3D "lm_2", .id =3D LM_2, .base =3D 0x46000, .len =3D 0x320, - .features =3D MIXER_SDM845_MASK, + .features =3D MIXER_MSM8998_MASK, .sblk =3D &sdm845_lm_sblk, .lm_pair =3D LM_3, .pingpong =3D PINGPONG_2, }, { .name =3D "lm_3", .id =3D LM_3, .base =3D 0x47000, .len =3D 0x320, - .features =3D MIXER_SDM845_MASK, + .features =3D MIXER_MSM8998_MASK, .sblk =3D &sdm845_lm_sblk, .lm_pair =3D LM_2, .pingpong =3D PINGPONG_3, diff --git a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_5_3_sm6150.h b/drive= rs/gpu/drm/msm/disp/dpu1/catalog/dpu_5_3_sm6150.h index e2306d314ef8f8b59078a8ca8c529f2e56385c98..8fb926bff36d32fb4ce1036cb69= 513599dc7b6b7 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_5_3_sm6150.h +++ b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_5_3_sm6150.h @@ -107,20 +107,17 @@ static const struct dpu_lm_cfg sm6150_lm[] =3D { { .name =3D "lm_0", .id =3D LM_0, .base =3D 0x44000, .len =3D 0x320, - .features =3D MIXER_QCM2290_MASK, .sblk =3D &sdm845_lm_sblk, .pingpong =3D PINGPONG_0, .dspp =3D DSPP_0, }, { .name =3D "lm_1", .id =3D LM_1, .base =3D 0x45000, .len =3D 0x320, - .features =3D MIXER_QCM2290_MASK, .sblk =3D &sdm845_lm_sblk, .pingpong =3D PINGPONG_1, }, { .name =3D "lm_2", .id =3D LM_2, .base =3D 0x46000, .len =3D 0x320, - .features =3D MIXER_QCM2290_MASK, .sblk =3D &sdm845_lm_sblk, .pingpong =3D PINGPONG_2, }, diff --git a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_5_4_sm6125.h b/drive= rs/gpu/drm/msm/disp/dpu1/catalog/dpu_5_4_sm6125.h index 62136811a530a6072accbd1ab3e02e7e24220ccb..5c2c8c5f812347970c534769d72= f9699e6e7049a 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_5_4_sm6125.h +++ b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_5_4_sm6125.h @@ -91,7 +91,6 @@ static const struct dpu_lm_cfg sm6125_lm[] =3D { { .name =3D "lm_0", .id =3D LM_0, .base =3D 0x44000, .len =3D 0x320, - .features =3D MIXER_QCM2290_MASK, .sblk =3D &sdm845_lm_sblk, .pingpong =3D PINGPONG_0, .dspp =3D DSPP_0, @@ -99,7 +98,6 @@ static const struct dpu_lm_cfg sm6125_lm[] =3D { }, { .name =3D "lm_1", .id =3D LM_1, .base =3D 0x45000, .len =3D 0x320, - .features =3D MIXER_QCM2290_MASK, .sblk =3D &sdm845_lm_sblk, .pingpong =3D PINGPONG_1, .dspp =3D 0, diff --git a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_6_0_sm8250.h b/drive= rs/gpu/drm/msm/disp/dpu1/catalog/dpu_6_0_sm8250.h index 34f11fb084c02cf994c272196299bb9f7bced4f1..17fa0ef9ac03e4649a218cd837b= 296211ef4506c 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_6_0_sm8250.h +++ b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_6_0_sm8250.h @@ -135,7 +135,7 @@ static const struct dpu_lm_cfg sm8250_lm[] =3D { { .name =3D "lm_0", .id =3D LM_0, .base =3D 0x44000, .len =3D 0x320, - .features =3D MIXER_SDM845_MASK, + .features =3D MIXER_MSM8998_MASK, .sblk =3D &sdm845_lm_sblk, .lm_pair =3D LM_1, .pingpong =3D PINGPONG_0, @@ -143,7 +143,7 @@ static const struct dpu_lm_cfg sm8250_lm[] =3D { }, { .name =3D "lm_1", .id =3D LM_1, .base =3D 0x45000, .len =3D 0x320, - .features =3D MIXER_SDM845_MASK, + .features =3D MIXER_MSM8998_MASK, .sblk =3D &sdm845_lm_sblk, .lm_pair =3D LM_0, .pingpong =3D PINGPONG_1, @@ -151,7 +151,7 @@ static const struct dpu_lm_cfg sm8250_lm[] =3D { }, { .name =3D "lm_2", .id =3D LM_2, .base =3D 0x46000, .len =3D 0x320, - .features =3D MIXER_SDM845_MASK, + .features =3D MIXER_MSM8998_MASK, .sblk =3D &sdm845_lm_sblk, .lm_pair =3D LM_3, .pingpong =3D PINGPONG_2, @@ -159,7 +159,7 @@ static const struct dpu_lm_cfg sm8250_lm[] =3D { }, { .name =3D "lm_3", .id =3D LM_3, .base =3D 0x47000, .len =3D 0x320, - .features =3D MIXER_SDM845_MASK, + .features =3D MIXER_MSM8998_MASK, .sblk =3D &sdm845_lm_sblk, .lm_pair =3D LM_2, .pingpong =3D PINGPONG_3, @@ -167,14 +167,14 @@ static const struct dpu_lm_cfg sm8250_lm[] =3D { }, { .name =3D "lm_4", .id =3D LM_4, .base =3D 0x48000, .len =3D 0x320, - .features =3D MIXER_SDM845_MASK, + .features =3D MIXER_MSM8998_MASK, .sblk =3D &sdm845_lm_sblk, .lm_pair =3D LM_5, .pingpong =3D PINGPONG_4, }, { .name =3D "lm_5", .id =3D LM_5, .base =3D 0x49000, .len =3D 0x320, - .features =3D MIXER_SDM845_MASK, + .features =3D MIXER_MSM8998_MASK, .sblk =3D &sdm845_lm_sblk, .lm_pair =3D LM_4, .pingpong =3D PINGPONG_5, diff --git a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_6_2_sc7180.h b/drive= rs/gpu/drm/msm/disp/dpu1/catalog/dpu_6_2_sc7180.h index 135b4f8171360493e58a1945105f8722d513d720..f6a0f1a39dcc3c9e82c07889d71= 905434274cdf9 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_6_2_sc7180.h +++ b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_6_2_sc7180.h @@ -84,7 +84,7 @@ static const struct dpu_lm_cfg sc7180_lm[] =3D { { .name =3D "lm_0", .id =3D LM_0, .base =3D 0x44000, .len =3D 0x320, - .features =3D MIXER_SDM845_MASK, + .features =3D MIXER_MSM8998_MASK, .sblk =3D &sc7180_lm_sblk, .lm_pair =3D LM_1, .pingpong =3D PINGPONG_0, @@ -92,7 +92,7 @@ static const struct dpu_lm_cfg sc7180_lm[] =3D { }, { .name =3D "lm_1", .id =3D LM_1, .base =3D 0x45000, .len =3D 0x320, - .features =3D MIXER_SDM845_MASK, + .features =3D MIXER_MSM8998_MASK, .sblk =3D &sc7180_lm_sblk, .lm_pair =3D LM_0, .pingpong =3D PINGPONG_1, diff --git a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_6_3_sm6115.h b/drive= rs/gpu/drm/msm/disp/dpu1/catalog/dpu_6_3_sm6115.h index 1189a5ecb3b7b50430eb275280c2309ee9d90b63..343ff5482382645fbd440d18d7e= e46e5b3fc868c 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_6_3_sm6115.h +++ b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_6_3_sm6115.h @@ -57,7 +57,6 @@ static const struct dpu_lm_cfg sm6115_lm[] =3D { { .name =3D "lm_0", .id =3D LM_0, .base =3D 0x44000, .len =3D 0x320, - .features =3D MIXER_QCM2290_MASK, .sblk =3D &qcm2290_lm_sblk, .pingpong =3D PINGPONG_0, .dspp =3D DSPP_0, diff --git a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_6_4_sm6350.h b/drive= rs/gpu/drm/msm/disp/dpu1/catalog/dpu_6_4_sm6350.h index 13ff6bdcc517fd566e7701f7a7cefe5ff19c5421..06bcaf4d8b0db74c349112af688= 4f7f3139a7ff8 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_6_4_sm6350.h +++ b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_6_4_sm6350.h @@ -91,7 +91,7 @@ static const struct dpu_lm_cfg sm6350_lm[] =3D { { .name =3D "lm_0", .id =3D LM_0, .base =3D 0x44000, .len =3D 0x320, - .features =3D MIXER_SDM845_MASK, + .features =3D MIXER_MSM8998_MASK, .sblk =3D &sc7180_lm_sblk, .lm_pair =3D LM_1, .pingpong =3D PINGPONG_0, @@ -99,7 +99,7 @@ static const struct dpu_lm_cfg sm6350_lm[] =3D { }, { .name =3D "lm_1", .id =3D LM_1, .base =3D 0x45000, .len =3D 0x320, - .features =3D MIXER_SDM845_MASK, + .features =3D MIXER_MSM8998_MASK, .sblk =3D &sc7180_lm_sblk, .lm_pair =3D LM_0, .pingpong =3D PINGPONG_1, diff --git a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_6_5_qcm2290.h b/driv= ers/gpu/drm/msm/disp/dpu1/catalog/dpu_6_5_qcm2290.h index d4c2d2da91aac0bce46c4d65079f01484a769ae3..47053bf9b0a205302b3937e625f= beca8d17f0c82 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_6_5_qcm2290.h +++ b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_6_5_qcm2290.h @@ -57,7 +57,6 @@ static const struct dpu_lm_cfg qcm2290_lm[] =3D { { .name =3D "lm_0", .id =3D LM_0, .base =3D 0x44000, .len =3D 0x320, - .features =3D MIXER_QCM2290_MASK, .sblk =3D &qcm2290_lm_sblk, .pingpong =3D PINGPONG_0, .dspp =3D DSPP_0, diff --git a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_6_9_sm6375.h b/drive= rs/gpu/drm/msm/disp/dpu1/catalog/dpu_6_9_sm6375.h index 9135853a0225fa60acb80d17f627153d25c612e6..9c4e8450b67760c880d9bd2528c= 6a954a0282e08 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_6_9_sm6375.h +++ b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_6_9_sm6375.h @@ -58,7 +58,6 @@ static const struct dpu_lm_cfg sm6375_lm[] =3D { { .name =3D "lm_0", .id =3D LM_0, .base =3D 0x44000, .len =3D 0x320, - .features =3D MIXER_QCM2290_MASK, .sblk =3D &qcm2290_lm_sblk, .lm_pair =3D 0, .pingpong =3D PINGPONG_0, diff --git a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_7_0_sm8350.h b/drive= rs/gpu/drm/msm/disp/dpu1/catalog/dpu_7_0_sm8350.h index 6503f11f65c11806c5b9558a0f9fd05b228340be..e81a2a02e0a6379382058fd8950= 0cf2064a2193f 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_7_0_sm8350.h +++ b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_7_0_sm8350.h @@ -135,7 +135,7 @@ static const struct dpu_lm_cfg sm8350_lm[] =3D { { .name =3D "lm_0", .id =3D LM_0, .base =3D 0x44000, .len =3D 0x320, - .features =3D MIXER_SDM845_MASK, + .features =3D MIXER_MSM8998_MASK, .sblk =3D &sdm845_lm_sblk, .lm_pair =3D LM_1, .pingpong =3D PINGPONG_0, @@ -143,7 +143,7 @@ static const struct dpu_lm_cfg sm8350_lm[] =3D { }, { .name =3D "lm_1", .id =3D LM_1, .base =3D 0x45000, .len =3D 0x320, - .features =3D MIXER_SDM845_MASK, + .features =3D MIXER_MSM8998_MASK, .sblk =3D &sdm845_lm_sblk, .lm_pair =3D LM_0, .pingpong =3D PINGPONG_1, @@ -151,7 +151,7 @@ static const struct dpu_lm_cfg sm8350_lm[] =3D { }, { .name =3D "lm_2", .id =3D LM_2, .base =3D 0x46000, .len =3D 0x320, - .features =3D MIXER_SDM845_MASK, + .features =3D MIXER_MSM8998_MASK, .sblk =3D &sdm845_lm_sblk, .lm_pair =3D LM_3, .pingpong =3D PINGPONG_2, @@ -159,7 +159,7 @@ static const struct dpu_lm_cfg sm8350_lm[] =3D { }, { .name =3D "lm_3", .id =3D LM_3, .base =3D 0x47000, .len =3D 0x320, - .features =3D MIXER_SDM845_MASK, + .features =3D MIXER_MSM8998_MASK, .sblk =3D &sdm845_lm_sblk, .lm_pair =3D LM_2, .pingpong =3D PINGPONG_3, @@ -167,14 +167,14 @@ static const struct dpu_lm_cfg sm8350_lm[] =3D { }, { .name =3D "lm_4", .id =3D LM_4, .base =3D 0x48000, .len =3D 0x320, - .features =3D MIXER_SDM845_MASK, + .features =3D MIXER_MSM8998_MASK, .sblk =3D &sdm845_lm_sblk, .lm_pair =3D LM_5, .pingpong =3D PINGPONG_4, }, { .name =3D "lm_5", .id =3D LM_5, .base =3D 0x49000, .len =3D 0x320, - .features =3D MIXER_SDM845_MASK, + .features =3D MIXER_MSM8998_MASK, .sblk =3D &sdm845_lm_sblk, .lm_pair =3D LM_4, .pingpong =3D PINGPONG_5, diff --git a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_7_2_sc7280.h b/drive= rs/gpu/drm/msm/disp/dpu1/catalog/dpu_7_2_sc7280.h index 202de6f9b0c65c6f2caa9e9d5232f5b92d8bdf01..b0e94ccf7f83e9c3c41f1df363c= b6a8c24f1503d 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_7_2_sc7280.h +++ b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_7_2_sc7280.h @@ -88,21 +88,21 @@ static const struct dpu_lm_cfg sc7280_lm[] =3D { { .name =3D "lm_0", .id =3D LM_0, .base =3D 0x44000, .len =3D 0x320, - .features =3D MIXER_SDM845_MASK, + .features =3D MIXER_MSM8998_MASK, .sblk =3D &sc7180_lm_sblk, .pingpong =3D PINGPONG_0, .dspp =3D DSPP_0, }, { .name =3D "lm_2", .id =3D LM_2, .base =3D 0x46000, .len =3D 0x320, - .features =3D MIXER_SDM845_MASK, + .features =3D MIXER_MSM8998_MASK, .sblk =3D &sc7180_lm_sblk, .lm_pair =3D LM_3, .pingpong =3D PINGPONG_2, }, { .name =3D "lm_3", .id =3D LM_3, .base =3D 0x47000, .len =3D 0x320, - .features =3D MIXER_SDM845_MASK, + .features =3D MIXER_MSM8998_MASK, .sblk =3D &sc7180_lm_sblk, .lm_pair =3D LM_2, .pingpong =3D PINGPONG_3, diff --git a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_8_0_sc8280xp.h b/dri= vers/gpu/drm/msm/disp/dpu1/catalog/dpu_8_0_sc8280xp.h index 85778071bc1347008dbe4522aeb9ca4fd21aa097..2cf30234e45da8a7776d61c49c2= 6abd75d070941 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_8_0_sc8280xp.h +++ b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_8_0_sc8280xp.h @@ -134,7 +134,7 @@ static const struct dpu_lm_cfg sc8280xp_lm[] =3D { { .name =3D "lm_0", .id =3D LM_0, .base =3D 0x44000, .len =3D 0x320, - .features =3D MIXER_SDM845_MASK, + .features =3D MIXER_MSM8998_MASK, .sblk =3D &sdm845_lm_sblk, .lm_pair =3D LM_1, .pingpong =3D PINGPONG_0, @@ -142,7 +142,7 @@ static const struct dpu_lm_cfg sc8280xp_lm[] =3D { }, { .name =3D "lm_1", .id =3D LM_1, .base =3D 0x45000, .len =3D 0x320, - .features =3D MIXER_SDM845_MASK, + .features =3D MIXER_MSM8998_MASK, .sblk =3D &sdm845_lm_sblk, .lm_pair =3D LM_0, .pingpong =3D PINGPONG_1, @@ -150,7 +150,7 @@ static const struct dpu_lm_cfg sc8280xp_lm[] =3D { }, { .name =3D "lm_2", .id =3D LM_2, .base =3D 0x46000, .len =3D 0x320, - .features =3D MIXER_SDM845_MASK, + .features =3D MIXER_MSM8998_MASK, .sblk =3D &sdm845_lm_sblk, .lm_pair =3D LM_3, .pingpong =3D PINGPONG_2, @@ -158,7 +158,7 @@ static const struct dpu_lm_cfg sc8280xp_lm[] =3D { }, { .name =3D "lm_3", .id =3D LM_3, .base =3D 0x47000, .len =3D 0x320, - .features =3D MIXER_SDM845_MASK, + .features =3D MIXER_MSM8998_MASK, .sblk =3D &sdm845_lm_sblk, .lm_pair =3D LM_2, .pingpong =3D PINGPONG_3, @@ -166,14 +166,14 @@ static const struct dpu_lm_cfg sc8280xp_lm[] =3D { }, { .name =3D "lm_4", .id =3D LM_4, .base =3D 0x48000, .len =3D 0x320, - .features =3D MIXER_SDM845_MASK, + .features =3D MIXER_MSM8998_MASK, .sblk =3D &sdm845_lm_sblk, .lm_pair =3D LM_5, .pingpong =3D PINGPONG_4, }, { .name =3D "lm_5", .id =3D LM_5, .base =3D 0x49000, .len =3D 0x320, - .features =3D MIXER_SDM845_MASK, + .features =3D MIXER_MSM8998_MASK, .sblk =3D &sdm845_lm_sblk, .lm_pair =3D LM_4, .pingpong =3D PINGPONG_5, diff --git a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_8_1_sm8450.h b/drive= rs/gpu/drm/msm/disp/dpu1/catalog/dpu_8_1_sm8450.h index f9676f804f9132296467bc751e11036696afa942..dcef56683224b5715c2608b5472= d2d5a0da62010 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_8_1_sm8450.h +++ b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_8_1_sm8450.h @@ -135,7 +135,7 @@ static const struct dpu_lm_cfg sm8450_lm[] =3D { { .name =3D "lm_0", .id =3D LM_0, .base =3D 0x44000, .len =3D 0x320, - .features =3D MIXER_SDM845_MASK, + .features =3D MIXER_MSM8998_MASK, .sblk =3D &sdm845_lm_sblk, .lm_pair =3D LM_1, .pingpong =3D PINGPONG_0, @@ -143,7 +143,7 @@ static const struct dpu_lm_cfg sm8450_lm[] =3D { }, { .name =3D "lm_1", .id =3D LM_1, .base =3D 0x45000, .len =3D 0x320, - .features =3D MIXER_SDM845_MASK, + .features =3D MIXER_MSM8998_MASK, .sblk =3D &sdm845_lm_sblk, .lm_pair =3D LM_0, .pingpong =3D PINGPONG_1, @@ -151,7 +151,7 @@ static const struct dpu_lm_cfg sm8450_lm[] =3D { }, { .name =3D "lm_2", .id =3D LM_2, .base =3D 0x46000, .len =3D 0x320, - .features =3D MIXER_SDM845_MASK, + .features =3D MIXER_MSM8998_MASK, .sblk =3D &sdm845_lm_sblk, .lm_pair =3D LM_3, .pingpong =3D PINGPONG_2, @@ -159,7 +159,7 @@ static const struct dpu_lm_cfg sm8450_lm[] =3D { }, { .name =3D "lm_3", .id =3D LM_3, .base =3D 0x47000, .len =3D 0x320, - .features =3D MIXER_SDM845_MASK, + .features =3D MIXER_MSM8998_MASK, .sblk =3D &sdm845_lm_sblk, .lm_pair =3D LM_2, .pingpong =3D PINGPONG_3, @@ -167,14 +167,14 @@ static const struct dpu_lm_cfg sm8450_lm[] =3D { }, { .name =3D "lm_4", .id =3D LM_4, .base =3D 0x48000, .len =3D 0x320, - .features =3D MIXER_SDM845_MASK, + .features =3D MIXER_MSM8998_MASK, .sblk =3D &sdm845_lm_sblk, .lm_pair =3D LM_5, .pingpong =3D PINGPONG_4, }, { .name =3D "lm_5", .id =3D LM_5, .base =3D 0x49000, .len =3D 0x320, - .features =3D MIXER_SDM845_MASK, + .features =3D MIXER_MSM8998_MASK, .sblk =3D &sdm845_lm_sblk, .lm_pair =3D LM_4, .pingpong =3D PINGPONG_5, diff --git a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_8_4_sa8775p.h b/driv= ers/gpu/drm/msm/disp/dpu1/catalog/dpu_8_4_sa8775p.h index 7462cfc4cf8de4a10326c83d3341dbee76e437e8..5f5987d5fc602df29c5eb289823= de5dd359df014 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_8_4_sa8775p.h +++ b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_8_4_sa8775p.h @@ -134,7 +134,7 @@ static const struct dpu_lm_cfg sa8775p_lm[] =3D { { .name =3D "lm_0", .id =3D LM_0, .base =3D 0x44000, .len =3D 0x400, - .features =3D MIXER_SDM845_MASK, + .features =3D MIXER_MSM8998_MASK, .sblk =3D &sdm845_lm_sblk, .lm_pair =3D LM_1, .pingpong =3D PINGPONG_0, @@ -142,7 +142,7 @@ static const struct dpu_lm_cfg sa8775p_lm[] =3D { }, { .name =3D "lm_1", .id =3D LM_1, .base =3D 0x45000, .len =3D 0x400, - .features =3D MIXER_SDM845_MASK, + .features =3D MIXER_MSM8998_MASK, .sblk =3D &sdm845_lm_sblk, .lm_pair =3D LM_0, .pingpong =3D PINGPONG_1, @@ -150,7 +150,7 @@ static const struct dpu_lm_cfg sa8775p_lm[] =3D { }, { .name =3D "lm_2", .id =3D LM_2, .base =3D 0x46000, .len =3D 0x400, - .features =3D MIXER_SDM845_MASK, + .features =3D MIXER_MSM8998_MASK, .sblk =3D &sdm845_lm_sblk, .lm_pair =3D LM_3, .pingpong =3D PINGPONG_2, @@ -158,7 +158,7 @@ static const struct dpu_lm_cfg sa8775p_lm[] =3D { }, { .name =3D "lm_3", .id =3D LM_3, .base =3D 0x47000, .len =3D 0x400, - .features =3D MIXER_SDM845_MASK, + .features =3D MIXER_MSM8998_MASK, .sblk =3D &sdm845_lm_sblk, .lm_pair =3D LM_2, .pingpong =3D PINGPONG_3, @@ -166,14 +166,14 @@ static const struct dpu_lm_cfg sa8775p_lm[] =3D { }, { .name =3D "lm_4", .id =3D LM_4, .base =3D 0x48000, .len =3D 0x400, - .features =3D MIXER_SDM845_MASK, + .features =3D MIXER_MSM8998_MASK, .sblk =3D &sdm845_lm_sblk, .lm_pair =3D LM_5, .pingpong =3D PINGPONG_4, }, { .name =3D "lm_5", .id =3D LM_5, .base =3D 0x49000, .len =3D 0x400, - .features =3D MIXER_SDM845_MASK, + .features =3D MIXER_MSM8998_MASK, .sblk =3D &sdm845_lm_sblk, .lm_pair =3D LM_4, .pingpong =3D PINGPONG_5, diff --git a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_9_0_sm8550.h b/drive= rs/gpu/drm/msm/disp/dpu1/catalog/dpu_9_0_sm8550.h index 695ae7581a88b36fa1f28aa3cd0c9166090e940c..6f310216fbccb985308f617db20= c1878e622340a 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_9_0_sm8550.h +++ b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_9_0_sm8550.h @@ -132,7 +132,7 @@ static const struct dpu_lm_cfg sm8550_lm[] =3D { { .name =3D "lm_0", .id =3D LM_0, .base =3D 0x44000, .len =3D 0x320, - .features =3D MIXER_SDM845_MASK, + .features =3D MIXER_MSM8998_MASK, .sblk =3D &sdm845_lm_sblk, .lm_pair =3D LM_1, .pingpong =3D PINGPONG_0, @@ -140,7 +140,7 @@ static const struct dpu_lm_cfg sm8550_lm[] =3D { }, { .name =3D "lm_1", .id =3D LM_1, .base =3D 0x45000, .len =3D 0x320, - .features =3D MIXER_SDM845_MASK, + .features =3D MIXER_MSM8998_MASK, .sblk =3D &sdm845_lm_sblk, .lm_pair =3D LM_0, .pingpong =3D PINGPONG_1, @@ -148,7 +148,7 @@ static const struct dpu_lm_cfg sm8550_lm[] =3D { }, { .name =3D "lm_2", .id =3D LM_2, .base =3D 0x46000, .len =3D 0x320, - .features =3D MIXER_SDM845_MASK, + .features =3D MIXER_MSM8998_MASK, .sblk =3D &sdm845_lm_sblk, .lm_pair =3D LM_3, .pingpong =3D PINGPONG_2, @@ -156,7 +156,7 @@ static const struct dpu_lm_cfg sm8550_lm[] =3D { }, { .name =3D "lm_3", .id =3D LM_3, .base =3D 0x47000, .len =3D 0x320, - .features =3D MIXER_SDM845_MASK, + .features =3D MIXER_MSM8998_MASK, .sblk =3D &sdm845_lm_sblk, .lm_pair =3D LM_2, .pingpong =3D PINGPONG_3, @@ -164,14 +164,14 @@ static const struct dpu_lm_cfg sm8550_lm[] =3D { }, { .name =3D "lm_4", .id =3D LM_4, .base =3D 0x48000, .len =3D 0x320, - .features =3D MIXER_SDM845_MASK, + .features =3D MIXER_MSM8998_MASK, .sblk =3D &sdm845_lm_sblk, .lm_pair =3D LM_5, .pingpong =3D PINGPONG_4, }, { .name =3D "lm_5", .id =3D LM_5, .base =3D 0x49000, .len =3D 0x320, - .features =3D MIXER_SDM845_MASK, + .features =3D MIXER_MSM8998_MASK, .sblk =3D &sdm845_lm_sblk, .lm_pair =3D LM_4, .pingpong =3D PINGPONG_5, diff --git a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_9_1_sar2130p.h b/dri= vers/gpu/drm/msm/disp/dpu1/catalog/dpu_9_1_sar2130p.h index 9a25113df5aec527baa514aaa61f2b47c2443d27..ba8a2c5dc5e2b3474b295c86afb= bbe8f8d416ccd 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_9_1_sar2130p.h +++ b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_9_1_sar2130p.h @@ -132,7 +132,7 @@ static const struct dpu_lm_cfg sar2130p_lm[] =3D { { .name =3D "lm_0", .id =3D LM_0, .base =3D 0x44000, .len =3D 0x320, - .features =3D MIXER_SDM845_MASK, + .features =3D MIXER_MSM8998_MASK, .sblk =3D &sdm845_lm_sblk, .lm_pair =3D LM_1, .pingpong =3D PINGPONG_0, @@ -140,7 +140,7 @@ static const struct dpu_lm_cfg sar2130p_lm[] =3D { }, { .name =3D "lm_1", .id =3D LM_1, .base =3D 0x45000, .len =3D 0x320, - .features =3D MIXER_SDM845_MASK, + .features =3D MIXER_MSM8998_MASK, .sblk =3D &sdm845_lm_sblk, .lm_pair =3D LM_0, .pingpong =3D PINGPONG_1, @@ -148,7 +148,7 @@ static const struct dpu_lm_cfg sar2130p_lm[] =3D { }, { .name =3D "lm_2", .id =3D LM_2, .base =3D 0x46000, .len =3D 0x320, - .features =3D MIXER_SDM845_MASK, + .features =3D MIXER_MSM8998_MASK, .sblk =3D &sdm845_lm_sblk, .lm_pair =3D LM_3, .pingpong =3D PINGPONG_2, @@ -156,7 +156,7 @@ static const struct dpu_lm_cfg sar2130p_lm[] =3D { }, { .name =3D "lm_3", .id =3D LM_3, .base =3D 0x47000, .len =3D 0x320, - .features =3D MIXER_SDM845_MASK, + .features =3D MIXER_MSM8998_MASK, .sblk =3D &sdm845_lm_sblk, .lm_pair =3D LM_2, .pingpong =3D PINGPONG_3, @@ -164,14 +164,14 @@ static const struct dpu_lm_cfg sar2130p_lm[] =3D { }, { .name =3D "lm_4", .id =3D LM_4, .base =3D 0x48000, .len =3D 0x320, - .features =3D MIXER_SDM845_MASK, + .features =3D MIXER_MSM8998_MASK, .sblk =3D &sdm845_lm_sblk, .lm_pair =3D LM_5, .pingpong =3D PINGPONG_4, }, { .name =3D "lm_5", .id =3D LM_5, .base =3D 0x49000, .len =3D 0x320, - .features =3D MIXER_SDM845_MASK, + .features =3D MIXER_MSM8998_MASK, .sblk =3D &sdm845_lm_sblk, .lm_pair =3D LM_4, .pingpong =3D PINGPONG_5, diff --git a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_9_2_x1e80100.h b/dri= vers/gpu/drm/msm/disp/dpu1/catalog/dpu_9_2_x1e80100.h index 54815c613f087454aa7b4befc84462265d8dfc23..77986a7bd62c1b6323482426e59= 6e5974ba40865 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_9_2_x1e80100.h +++ b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_9_2_x1e80100.h @@ -131,7 +131,7 @@ static const struct dpu_lm_cfg x1e80100_lm[] =3D { { .name =3D "lm_0", .id =3D LM_0, .base =3D 0x44000, .len =3D 0x320, - .features =3D MIXER_SDM845_MASK, + .features =3D MIXER_MSM8998_MASK, .sblk =3D &sdm845_lm_sblk, .lm_pair =3D LM_1, .pingpong =3D PINGPONG_0, @@ -139,7 +139,7 @@ static const struct dpu_lm_cfg x1e80100_lm[] =3D { }, { .name =3D "lm_1", .id =3D LM_1, .base =3D 0x45000, .len =3D 0x320, - .features =3D MIXER_SDM845_MASK, + .features =3D MIXER_MSM8998_MASK, .sblk =3D &sdm845_lm_sblk, .lm_pair =3D LM_0, .pingpong =3D PINGPONG_1, @@ -147,7 +147,7 @@ static const struct dpu_lm_cfg x1e80100_lm[] =3D { }, { .name =3D "lm_2", .id =3D LM_2, .base =3D 0x46000, .len =3D 0x320, - .features =3D MIXER_SDM845_MASK, + .features =3D MIXER_MSM8998_MASK, .sblk =3D &sdm845_lm_sblk, .lm_pair =3D LM_3, .pingpong =3D PINGPONG_2, @@ -155,7 +155,7 @@ static const struct dpu_lm_cfg x1e80100_lm[] =3D { }, { .name =3D "lm_3", .id =3D LM_3, .base =3D 0x47000, .len =3D 0x320, - .features =3D MIXER_SDM845_MASK, + .features =3D MIXER_MSM8998_MASK, .sblk =3D &sdm845_lm_sblk, .lm_pair =3D LM_2, .pingpong =3D PINGPONG_3, @@ -163,14 +163,14 @@ static const struct dpu_lm_cfg x1e80100_lm[] =3D { }, { .name =3D "lm_4", .id =3D LM_4, .base =3D 0x48000, .len =3D 0x320, - .features =3D MIXER_SDM845_MASK, + .features =3D MIXER_MSM8998_MASK, .sblk =3D &sdm845_lm_sblk, .lm_pair =3D LM_5, .pingpong =3D PINGPONG_4, }, { .name =3D "lm_5", .id =3D LM_5, .base =3D 0x49000, .len =3D 0x320, - .features =3D MIXER_SDM845_MASK, + .features =3D MIXER_MSM8998_MASK, .sblk =3D &sdm845_lm_sblk, .lm_pair =3D LM_4, .pingpong =3D PINGPONG_5, diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.c b/drivers/gpu/d= rm/msm/disp/dpu1/dpu_hw_catalog.c index d64ebc729bfb589bf90af89c094181f879d5b1ef..ad0460aa5b5ce5a373dab18c89e= 4159855da4d2b 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.c +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.c @@ -89,12 +89,6 @@ #define MIXER_MSM8998_MASK \ (BIT(DPU_MIXER_SOURCESPLIT)) =20 -#define MIXER_SDM845_MASK \ - (BIT(DPU_MIXER_SOURCESPLIT) | BIT(DPU_DIM_LAYER)) - -#define MIXER_QCM2290_MASK \ - (BIT(DPU_DIM_LAYER)) - #define WB_SDM845_MASK (BIT(DPU_WB_LINE_MODE) | \ BIT(DPU_WB_UBWC) | \ BIT(DPU_WB_YUV_CONFIG) | \ diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.h b/drivers/gpu/d= rm/msm/disp/dpu1/dpu_hw_catalog.h index 5e4608d10c6d4fee387c9a599a73b15661148430..cc17b20a7d4c15b0cd9c5dc8b9a= 4b78d4cb78315 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.h +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.h @@ -84,14 +84,12 @@ enum { * @DPU_MIXER_LAYER Layer mixer layer blend configuration, * @DPU_MIXER_SOURCESPLIT Layer mixer supports source-split configurat= ion * @DPU_MIXER_GC Gamma correction block - * @DPU_DIM_LAYER Layer mixer supports dim layer * @DPU_MIXER_MAX maximum value */ enum { DPU_MIXER_LAYER =3D 0x1, DPU_MIXER_SOURCESPLIT, DPU_MIXER_GC, - DPU_DIM_LAYER, DPU_MIXER_MAX }; =20 --=20 2.39.5