From nobody Sun Feb 8 09:32:35 2026 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 E0877221710 for ; Thu, 24 Apr 2025 09:30:42 +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=1745487045; cv=none; b=CEhOCu6HUacUdbOiHgB3heqnmuBboheX9odxF/1i2oJKWH4VSv7fBFAvVHT638CjW21yvnZ6ZPf7EORQm6N7S/TN/zhoWNzV4thbWIjabzqNjTbXh0r8eBMT4r/ls3RQw3cuhgDGgUyXXaSx/Jw5Hqwhd0Ty8f7dZuhD/7dzNbo= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745487045; c=relaxed/simple; bh=2IiFHS57P0Bigwh2VE2RlX6r/1GVPFLOqjH2EKejpCo=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=Kqig07aiECIFSgpxCRA+uIOcUyQzG3sxrr81w1rl/4+350J5D9YrpESKebDcE1ybL1CNi7d0obLwq96yMj1rARAxV5v44aJeKUcqbv/fzP3M7oS+7Ab+LTBQ5YCgVWM3Pp2CSvxw9V+l7MYU/0ihDMvvyuaFoDkRDRZzFY8WvbA= 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=GeAz1bXC; 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="GeAz1bXC" Received: from pps.filterd (m0279865.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 53O0F5kT007498 for ; Thu, 24 Apr 2025 09:30:42 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= TZ+vVgitO0Ee1t7phggoG27ofzaDJceAaCxWE+985z4=; b=GeAz1bXCbdwy0tf9 c9Ii80LxEJDaDB/AQ0b1vGzUy8runmhLtDvNXcihUdAJe8LfwEqH/z5cpdr2m0PV hQBf3ciHAJ28B1TxoU2A2D9SaaMggw2DJGKYCYxTIzIIrNdh9Sm6jXqSkT3LLugB ZyTVd4ksFdJOylM7lLbHoDjA763KuX6TCll8Na95dVDdX0iXsyteIlr2lL0tPGD+ EufdSYI4jJgekOtTm5htNa8AYd0JJyuTYG14GKUX+Gqjr6YfAaG499SKNXqilgIc 4BOGPCU7uQF2qHFI4Q6JlWHc8DoRvNxoQyEk6VPhzuopIBrKzhtFRwVbWDDrO2RJ Z2OhmA== Received: from mail-qv1-f71.google.com (mail-qv1-f71.google.com [209.85.219.71]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 466jh1mypw-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Thu, 24 Apr 2025 09:30:41 +0000 (GMT) Received: by mail-qv1-f71.google.com with SMTP id 6a1803df08f44-6ed16cc6e39so15765846d6.1 for ; Thu, 24 Apr 2025 02:30:41 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1745487028; x=1746091828; 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=TZ+vVgitO0Ee1t7phggoG27ofzaDJceAaCxWE+985z4=; b=pb9BaWTyWO9H/k3JK35k2YxF70JdnTwtqofr8ZZPgRIWW3ZpaEboG16BYFomRnFnvs YP2VVQ5t3rFPhuCiIoJALGPPae8patlj6ATch83qtRFztDryEobfwPT8DkZ2qnQi7ble O0sJMWVRk1KzLI9Y0hJpUxJh4SUkfVeLu+UXa8Ns9lfPKlThJfKZe5l0Qch1kngBwaO/ Z8S8waHmRkYxRhq/1DSamhkopAXJtzQ825BBVN5cUzmTeRY96+IUujCHx+6vT2c0/Zzt qMJ9Ze1HVJplFGl5Fapu6mNIpeSbD/c4mkrVofwMGfHeerNhI/To/bdUURRCxQOb1OIy dzXw== X-Forwarded-Encrypted: i=1; AJvYcCX1uRJ24qRWK4OJDLpeMxUnD6hViDeZyXOSsiWMR0exjDAnOpgV/7522KF7DRKpOeza4XTh9eg3jNVbqS4=@vger.kernel.org X-Gm-Message-State: AOJu0Yw5mL4EHGPhiI32CZeBZhE3VjsnXUiPVu+nEdCAISNh2uVU1hYX EzBwlzErPgchVPSW8BS1XWc8hw2Vrisw2UQ67y8/Tz1xOPRGGVJwR2slNucfwuZzw/2wsdRFOye 0aKkJ8c1md0ep6mgxnabNcS8xbWGGiTU1IHQM19sKhPHOPDzd3QZFggZN3ilktFc= X-Gm-Gg: ASbGncumuQt2yuBOqFnZcg9kTfyKWr5oUpu8eNh/iZsy9fQfDO2+roXI35a8Mi2K2Gf 2UQ7uePBqaAm/83nk7Y6ajF1qEAjRCLpGhaMVZRR2fI50oZHxs/8PsGgkxam9oowewGVAYU0f4H deH8RSy97x3b5nV/LkQaWAB3hI2bsRkwZuXVBY84ZVyKW4o3JZsINk6U1E+lPhip6K8JesVC0Cl 2V8an0dDgzcNhol6CuFuKdEE/FZ2Zg2qNfVmTbBhgVRM+dxC9vzaXY00X5n/hG1oQnlHMIIkRw0 QIHNnBiCOiA8mn/M2rxXn7TttgqBdZwyDxnoLnXrJJA+I8mFaiepPUWBtM2p8995G/IBR8aqpBM 2A0Yay50BoTfxOdYDPm3POOmQ X-Received: by 2002:ad4:5bcf:0:b0:6e6:6b99:cd1e with SMTP id 6a1803df08f44-6f4bfc1da40mr29820986d6.26.1745487027897; Thu, 24 Apr 2025 02:30:27 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEnpSqDj4Yj7waYtWavXO85eCg4746V1n57mMjk0jgaE+hvzrSPBmolL9okputlPpS09V2cHA== X-Received: by 2002:ad4:5bcf:0:b0:6e6:6b99:cd1e with SMTP id 6a1803df08f44-6f4bfc1da40mr29820646d6.26.1745487027524; Thu, 24 Apr 2025 02:30:27 -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 38308e7fff4ca-317d1b9a304sm1820461fa.99.2025.04.24.02.30.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 24 Apr 2025 02:30:26 -0700 (PDT) From: Dmitry Baryshkov Date: Thu, 24 Apr 2025 12:30:05 +0300 Subject: [PATCH v3 01/33] drm/msm/dpu: stop passing mdss_ver to setup_timing_gen() 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: <20250424-dpu-drop-features-v3-1-cdaca81d356f@oss.qualcomm.com> References: <20250424-dpu-drop-features-v3-0-cdaca81d356f@oss.qualcomm.com> In-Reply-To: <20250424-dpu-drop-features-v3-0-cdaca81d356f@oss.qualcomm.com> To: Rob Clark , Abhinav Kumar , Sean Paul , Marijn Suijten , David Airlie , Simona Vetter , Vinod Koul , Konrad Dybcio Cc: 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=3649; i=dmitry.baryshkov@oss.qualcomm.com; h=from:subject:message-id; bh=sURLU3QRO4lBSIODQBucrC/9R5zvezCH7Xkam1qgsTU=; b=owEBbQGS/pANAwAKAYs8ij4CKSjVAcsmYgBoCgSpsfUttjT/E6RZYKlS5nYVZCE+2yoZls12h D4PfcXaHZqJATMEAAEKAB0WIQRMcISVXLJjVvC4lX+LPIo+Aiko1QUCaAoEqQAKCRCLPIo+Aiko 1bTFB/92pxDvmbvS+yabonuD1bCGKJY1BKkJm6f8na4d/gMftQ1VQUbSnqYCO9cU6vZhMrL+dLZ 0fC1YClRxEtSzSqhFHU2kR6/0CRnRGt9AK40wFlV42PLNkotShDhBLDNMy+j2fmve2qdCeGH4vs nUkgTSxi9weAx9T3ow57fjVNPSx+u2D4sxBZBobPaFPr6Q9d1tLoNx8HFAMihc8GDzNrC6DU8A+ 7z5NF9vPqLCmJo00slWXzHl6cxMfs/qDmHxT9wHNFXVS07DLAK2OgqpglhhmGTtVQg7atcqdeDq oyChjjymCjHzxjJImyQLDrYx46Ny2vdpwjPUUBkXEVZa7yua X-Developer-Key: i=dmitry.baryshkov@oss.qualcomm.com; a=openpgp; fpr=8F88381DD5C873E4AE487DA5199BF1243632046A X-Proofpoint-GUID: OG5rrnXBocZqyIIrrx4hsKnkHdxZgQNS X-Proofpoint-ORIG-GUID: OG5rrnXBocZqyIIrrx4hsKnkHdxZgQNS X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUwNDI0MDA2MyBTYWx0ZWRfX2JB/hXvu39y1 ddlNkZyWmIxQyvLYqsqUCswNphFreh+65yKZ338mst9ZjhZOLAzcH++P1T510ysW5rlXqRS/lrv cHNxdSaaWwDSidiNJC/D0rOtZmmifreMdZ8K4UXr4qtuH28qOUt+4IHm+0RD22qWpo1oVMi90D5 hY2B7qItE34P54/26olDut9Fz1dxvMHcC31TcWfIzYBLBPdwhwuoPrRHRW01hxlv2LcGZVEoWYV p2oi9J3/WwleMxu2yRcZz5cfmgBgHnecFqOlWoD7RYzzPxM4fj78RTAkGcpmFIxUvXMy7N14zpm KHTY+5U78+yb8SC9bnlJUil0Rw24GQL+BTNts2xPD0/FEpSpB4BibjQCJTKtAdFdMY0MKBh5TXy ikVzmt7ONw9FYJpFGy+eIq8lFrGDrbjLlaS42KJpNGy5nWrnb2GTvleSpyfv2OL47bGuL7T/ X-Authority-Analysis: v=2.4 cv=ZpjtK87G c=1 sm=1 tr=0 ts=680a04c1 cx=c_pps a=UgVkIMxJMSkC9lv97toC5g==:117 a=xqWC_Br6kY4A:10 a=IkcTkHD0fZMA:10 a=XR8D0OoHHMoA:10 a=KKAkSRfTAAAA:8 a=Fc1Z5Xec4v_XsjI5eh8A:9 a=QEXdDO2ut3YA:10 a=1HOtulTD9v-eNWfpl4qZ:22 a=cvBusfyB2V15izCimMoJ:22 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1099,Hydra:6.0.680,FMLib:17.12.80.40 definitions=2025-04-24_04,2025-04-22_01,2025-02-21_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 adultscore=0 malwarescore=0 lowpriorityscore=0 priorityscore=1501 phishscore=0 clxscore=1015 bulkscore=0 suspectscore=0 mlxlogscore=999 spamscore=0 impostorscore=0 mlxscore=0 classifier=spam authscore=0 authtc=n/a authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.19.0-2504070000 definitions=main-2504240063 From: Dmitry Baryshkov As a preparation to further MDSS-revision cleanups stop passing MDSS revision to the setup_timing_gen() callback. Instead store a pointer to it inside struct dpu_hw_intf and use it diretly. It's not that the MDSS revision can chance between dpu_hw_intf_init() and dpu_encoder_phys_vid_setup_timing_engine(). Signed-off-by: Dmitry Baryshkov --- drivers/gpu/drm/msm/disp/dpu1/dpu_encoder_phys_vid.c | 3 +-- drivers/gpu/drm/msm/disp/dpu1/dpu_hw_intf.c | 7 ++++--- drivers/gpu/drm/msm/disp/dpu1/dpu_hw_intf.h | 5 +++-- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder_phys_vid.c b/drivers= /gpu/drm/msm/disp/dpu1/dpu_encoder_phys_vid.c index abd6600046cb3a91bf88ca240fd9b9c306b0ea2e..3e0f1288ad17e19f6d0b7c5dcba= 19d3e5977a461 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder_phys_vid.c +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder_phys_vid.c @@ -307,8 +307,7 @@ static void dpu_encoder_phys_vid_setup_timing_engine( =20 spin_lock_irqsave(phys_enc->enc_spinlock, lock_flags); phys_enc->hw_intf->ops.setup_timing_gen(phys_enc->hw_intf, - &timing_params, fmt, - phys_enc->dpu_kms->catalog->mdss_ver); + &timing_params, fmt); phys_enc->hw_ctl->ops.setup_intf_cfg(phys_enc->hw_ctl, &intf_cfg); =20 /* setup which pp blk will connect to this intf */ diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_intf.c b/drivers/gpu/drm/= msm/disp/dpu1/dpu_hw_intf.c index fb1d25baa518057e74fec3406faffd48969d492b..1d56c21ac79095ab515aeb48534= 6e1eb5793c260 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_intf.c +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_intf.c @@ -98,8 +98,7 @@ =20 static void dpu_hw_intf_setup_timing_engine(struct dpu_hw_intf *intf, const struct dpu_hw_intf_timing_params *p, - const struct msm_format *fmt, - const struct dpu_mdss_version *mdss_ver) + const struct msm_format *fmt) { struct dpu_hw_blk_reg_map *c =3D &intf->hw; u32 hsync_period, vsync_period; @@ -180,7 +179,7 @@ static void dpu_hw_intf_setup_timing_engine(struct dpu_= hw_intf *intf, =20 /* TODO: handle DSC+DP case, we only handle DSC+DSI case so far */ if (p->compression_en && !dp_intf && - mdss_ver->core_major_ver >=3D 7) + intf->mdss_ver->core_major_ver >=3D 7) intf_cfg2 |=3D INTF_CFG2_DCE_DATA_COMPRESS; =20 hsync_data_start_x =3D hsync_start_x; @@ -580,6 +579,8 @@ struct dpu_hw_intf *dpu_hw_intf_init(struct drm_device = *dev, c->idx =3D cfg->id; c->cap =3D cfg; =20 + c->mdss_ver =3D mdss_rev; + c->ops.setup_timing_gen =3D dpu_hw_intf_setup_timing_engine; c->ops.setup_prg_fetch =3D dpu_hw_intf_setup_prg_fetch; c->ops.get_status =3D dpu_hw_intf_get_status; diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_intf.h b/drivers/gpu/drm/= msm/disp/dpu1/dpu_hw_intf.h index 114be272ac0ae67fe0d4dfc0c117baa4106f77c9..f31067a9aaf1d6b96c771571351= 22e5e8bccb7c4 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_intf.h +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_intf.h @@ -81,8 +81,7 @@ struct dpu_hw_intf_cmd_mode_cfg { struct dpu_hw_intf_ops { void (*setup_timing_gen)(struct dpu_hw_intf *intf, const struct dpu_hw_intf_timing_params *p, - const struct msm_format *fmt, - const struct dpu_mdss_version *mdss_ver); + const struct msm_format *fmt); =20 void (*setup_prg_fetch)(struct dpu_hw_intf *intf, const struct dpu_hw_intf_prog_fetch *fetch); @@ -126,6 +125,8 @@ struct dpu_hw_intf { enum dpu_intf idx; const struct dpu_intf_cfg *cap; =20 + const struct dpu_mdss_version *mdss_ver; + /* ops */ struct dpu_hw_intf_ops ops; }; --=20 2.39.5 From nobody Sun Feb 8 09:32:35 2026 Received: from mx0b-0031df01.pphosted.com (mx0b-0031df01.pphosted.com [205.220.180.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 5A68122256E for ; Thu, 24 Apr 2025 09:30:47 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=205.220.180.131 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745487050; cv=none; b=KRmMh/nHwQg85d+0FhcardWv8kk8h+eXf0/295wjXPPIVQPITxeW1hS3feP7/3nhJa9VAvajQmYkXEfuXJlyk0XmP+NkkDjgGT3uNqtSNVf5LDHylcGto5NJf/N0lli918To4hEvl54KdlbRnv/rUJ+QdXarW3apl+nU3hRJwBs= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745487050; c=relaxed/simple; bh=xqUX+XKrS4PHNua9Ynz8Kl1TzHsr7LrCKvNfMSAD18I=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=h1zXu1YKVrLTlN+Dq3Z1ibZf7O4H+BQzX0bMGvWtPIAvCOVhJ4TrryLFwYb66F/UnidagV9tIPq/v1o+GRtiIQ2J1RpDZg5LP8dzqmu1LdLxAdgNBfuVR5w/g59lkva9KUF+OlnqmJ2QRRrh4SnOWI25ulZhXquJpczZKMpaUY8= 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=jaiC47tf; arc=none smtp.client-ip=205.220.180.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="jaiC47tf" Received: from pps.filterd (m0279872.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 53O0FlrB007098 for ; Thu, 24 Apr 2025 09:30:46 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= 8EJN54KqFz4lGTcY8hYz0K1sswWCGJ8Jea8w74+g++o=; b=jaiC47tftLgUQbln EfuuBU7+ViCwfc0WayK9W78o0j/vu/rHwAEkf7o6wpYxjZw5mvv/XtjOXyodVSq0 K8WU4lBGQVsfgZvQ+O9Db5M1T6P+sQJOdbY7IMf3/TFRCYhC79AApI4vdCHs/O+k O7zhafugLhWATNizskJvdTOn5TL64B91L0ZQFQxqAKYxrY6BdCfTngeal0gLizjj s4y/xsaxCzUswznsucCSLTEvpgjKfvA28fWGJoYeLJkgO2gcTAr9zICHLbQBNAE2 XG/T5s1bplPqy2lzVHfTOvRmyTIqT8rDQGx4GKGsz67O+tV2pCwOzbmAZquoC8sy R6S+cw== 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 466jh05020-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Thu, 24 Apr 2025 09:30:45 +0000 (GMT) Received: by mail-qk1-f198.google.com with SMTP id af79cd13be357-7c5f3b94827so125655885a.0 for ; Thu, 24 Apr 2025 02:30:45 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1745487030; x=1746091830; 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=8EJN54KqFz4lGTcY8hYz0K1sswWCGJ8Jea8w74+g++o=; b=uxox8rI8LyrZNtexliKBqCCGfWfjEb0ByV0+DsAvHQdMbOvdugttBgcQRMMyEgRXZ3 Dahh1DRv6hwdfi2rzoK7BOMs2kXNUlap6ZFBo7alpuvIUyZqz7ULg1CMEOzjkirTetkr VdSgai+caZJVZ6A2UBA52aV2LijOfBnsPriqCepb/BP6/WK9k30+EW9hfXUekYfrWblW /gss0jOk5VAK0l3Cyutet0hf5oLdCPbSAJHb/TyObUoWPVdfpm2p4St+vzuGcdDU/aQe JwnBucRWl+qfXZyeW3Cd3Qv5CvA+mv0+0gD/EArqi0Ve7GlE9ybQx/3Ppj3nurVXQlxE XoPQ== X-Forwarded-Encrypted: i=1; AJvYcCU+zdWbS3VwQ1X+c/svwGyHwgX6uwbktfur3d7uZ19fT4aJxLvvxvJLJfSYpg6vsmeHZ85ybM+0+d6bLHw=@vger.kernel.org X-Gm-Message-State: AOJu0YwWBlks6ZZMznOPBk+s39vSwk6xnEXNjdLyYMHwdb3A4thY1uAs 8sC0WeANxhezur4/yr+uCd/niF+IjpB/1LuNjunN4FI98xxwVfmEv4nvRb3BGjjRgNTD/3hwiJw EG7GIfaYghjMFy0U1RQQk1CQpPt/+DGNJ4tLugJz/V+aqIZ6BB5IimMnjedx71A0= X-Gm-Gg: ASbGncssfNTbCqD6fIpmneE+X+QezHV8ukVJ31Apfse/HZ5rxZaJfdDJnAhrx6Qj1dY 4mY1UuVOTtH0LTw9Nha6mvXB9Dox9skRfqJFQpzhwAslDevUPptTMZoqQVj+nG3fP/Pak8vfxmZ IdgHCwO9qDqCH9qHBWFPnCCWt50JdsGjxvADSDCgtiS7YrzEBKkgKMUy40dQR6eUXFjlbKqnBs2 c28NdaG9JDTdOcuh60U4tMQbT1JsIi/PSOIj+ZzEqExMUWRTCqLu98HInIksgpC3DFX06oweu9D SHPt6ENgPn6BA7cxDkqFxHVe1kkkyT3amTsJs/9I+OKk+1jqUdMz442WbrTKLryF/JicYeIfN/l BSGTrl8zNvB5mISI7095VexH6 X-Received: by 2002:a05:620a:191b:b0:7c5:46e4:47f5 with SMTP id af79cd13be357-7c956eb83cdmr271710785a.20.1745487029532; Thu, 24 Apr 2025 02:30:29 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGKYI2WPZxdFfTsgzmkV4jJmvjU/+PPEzpJ6DXYIsepupE8DKxEZbJ9kT9O3tjWxyadf20tkg== X-Received: by 2002:a05:620a:191b:b0:7c5:46e4:47f5 with SMTP id af79cd13be357-7c956eb83cdmr271707485a.20.1745487029075; Thu, 24 Apr 2025 02:30:29 -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 38308e7fff4ca-317d1b9a304sm1820461fa.99.2025.04.24.02.30.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 24 Apr 2025 02:30:27 -0700 (PDT) From: Dmitry Baryshkov Date: Thu, 24 Apr 2025 12:30:06 +0300 Subject: [PATCH v3 02/33] drm/msm/dpu: drop INTF_SC7280_MASK 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: <20250424-dpu-drop-features-v3-2-cdaca81d356f@oss.qualcomm.com> References: <20250424-dpu-drop-features-v3-0-cdaca81d356f@oss.qualcomm.com> In-Reply-To: <20250424-dpu-drop-features-v3-0-cdaca81d356f@oss.qualcomm.com> To: Rob Clark , Abhinav Kumar , Sean Paul , Marijn Suijten , David Airlie , Simona Vetter , Vinod Koul , Konrad Dybcio Cc: 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=19101; i=dmitry.baryshkov@oss.qualcomm.com; h=from:subject:message-id; bh=xlGqFQKejkBi19WJTCfzWwC/AtKB39a4TtFtZ23pzus=; b=owGbwMvMwMXYbdNlx6SpcZXxtFoSQwYXy6pCGYPSDx57P69V2uafbsrQt0Rqhmge/zSpVqsyE /XoyFedjMYsDIxcDLJiiiw+BS1TYzYlh33YMbUeZhArE8gUBi5OAZhIaREHQ2NS0YEf+U+n3+Lt 9FmnoW82Raj11O3gp7phGauzWDhbGTpP9cx8/sZsRXI2E5/j0SLpk2/KliWGJ3gJRvKaHdpv4TV hfeGvoID61p0mT+aH8Vbr3fy6zWJB8uKAvvspz9eemCf3adrqvA2PrLMi/QXNv38Or1khKPz+4Z wIvjUXJ1hfvPZp+/EpF3x0jty82JJ1L4HFuf8WV1Qwe43P6kzjX09nXrvwMmwSm0Pjfjel2tTcC sFdtj9kXtxbdbNdJ2XnCzVBkwmtHH2rlmxum+m3NrDl+LQXyv9d3LdPkdGVdvpqWPHG/ntaQ4Po Htumye+3sn5h6H4sUdPc4NukzHdMd/9ZcROWvq51Dk/LAQ== X-Developer-Key: i=dmitry.baryshkov@oss.qualcomm.com; a=openpgp; fpr=8F88381DD5C873E4AE487DA5199BF1243632046A X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUwNDI0MDA2MyBTYWx0ZWRfX34aH8GhrkOYe MD3TSJ8o/apAAvYWugztvd0oXZCmB7XHjekvRAfPBMFAMtMoJeFo0kRxoR6SRXD4WQT/qJDtV7b skoTc8OK5Z0VgmKRT0xlC3Smnd125GVJ1PaUxmBWROF8/buA1dRT33gwvGujZXpEZLgeIQN6/Q+ LjlUEe2XqHiboLo35nJKJo11rmhSb2s4PEeC7l9T9q4kZxJyJ3WCrurLtRYrKQjd+C56VVgPs59 Lw2Ixcn8WF5qX33DrVRpGqgf3znav/Zm7VsrLNWOrvH+afTsxsSfNX3db1xSNH0FdI2YOTCOqSd jAHTxBCLBl6xHfMqkACXsAHzVBWJDHsGsnYmV2zX7Z0AJlbJA2ZFvjVOc03muJSlngWbTvHXWZr baCNRwtc0Yy1v8pqmogQeyPtZV2p5HmnrQqVED+jrcOfCSb8NKRAApDxwtRMghT2dCCCcPGP X-Proofpoint-GUID: 7sQ1roQfp_DnJ-Ad55K2xKia6rWKqfSX X-Authority-Analysis: v=2.4 cv=ZuTtK87G c=1 sm=1 tr=0 ts=680a04c5 cx=c_pps a=qKBjSQ1v91RyAK45QCPf5w==:117 a=xqWC_Br6kY4A:10 a=IkcTkHD0fZMA:10 a=XR8D0OoHHMoA:10 a=KKAkSRfTAAAA:8 a=COk6AnOGAAAA:8 a=VRwz4S5yodoF-XQobIwA:9 a=QEXdDO2ut3YA:10 a=NFOGd7dJGGMPyQGDc5-O:22 a=cvBusfyB2V15izCimMoJ:22 a=TjNXssC_j7lpFel5tvFf:22 X-Proofpoint-ORIG-GUID: 7sQ1roQfp_DnJ-Ad55K2xKia6rWKqfSX X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1099,Hydra:6.0.680,FMLib:17.12.80.40 definitions=2025-04-24_04,2025-04-22_01,2025-02-21_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 phishscore=0 clxscore=1015 impostorscore=0 bulkscore=0 mlxscore=0 adultscore=0 lowpriorityscore=0 mlxlogscore=999 priorityscore=1501 malwarescore=0 suspectscore=0 spamscore=0 classifier=spam authscore=0 authtc=n/a authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.19.0-2504070000 definitions=main-2504240063 From: Dmitry Baryshkov The INTF_SC7280_MASK is equal to the INTF_SC7180_MASK. Stop defining a separate symbol and use the INTF_SC7180_MASK instead. Signed-off-by: Dmitry Baryshkov Reviewed-by: Abhinav Kumar --- .../gpu/drm/msm/disp/dpu1/catalog/dpu_10_0_sm8650.h | 8 ++++---- drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_7_0_sm8350.h | 8 ++++---- drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_7_2_sc7280.h | 6 +++--- .../gpu/drm/msm/disp/dpu1/catalog/dpu_8_0_sc8280xp.h | 18 +++++++++-----= ---- drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_8_1_sm8450.h | 8 ++++---- .../gpu/drm/msm/disp/dpu1/catalog/dpu_8_4_sa8775p.h | 16 ++++++++------= -- drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_9_0_sm8550.h | 8 ++++---- .../gpu/drm/msm/disp/dpu1/catalog/dpu_9_2_x1e80100.h | 18 +++++++++-----= ---- drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.c | 2 -- 9 files changed, 45 insertions(+), 47 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 6ac97c378056c08c937ed992b81d139cbb1fbbb0..a8b5c5b5a2e8d9d67ee185f00d9= 2feeec42e490f 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 @@ -375,7 +375,7 @@ static const struct dpu_intf_cfg sm8650_intf[] =3D { { .name =3D "intf_0", .id =3D INTF_0, .base =3D 0x34000, .len =3D 0x280, - .features =3D INTF_SC7280_MASK, + .features =3D INTF_SC7180_MASK, .type =3D INTF_DP, .controller_id =3D MSM_DP_CONTROLLER_0, .prog_fetch_lines_worst_case =3D 24, @@ -384,7 +384,7 @@ static const struct dpu_intf_cfg sm8650_intf[] =3D { }, { .name =3D "intf_1", .id =3D INTF_1, .base =3D 0x35000, .len =3D 0x300, - .features =3D INTF_SC7280_MASK, + .features =3D INTF_SC7180_MASK, .type =3D INTF_DSI, .controller_id =3D MSM_DSI_CONTROLLER_0, .prog_fetch_lines_worst_case =3D 24, @@ -394,7 +394,7 @@ static const struct dpu_intf_cfg sm8650_intf[] =3D { }, { .name =3D "intf_2", .id =3D INTF_2, .base =3D 0x36000, .len =3D 0x300, - .features =3D INTF_SC7280_MASK, + .features =3D INTF_SC7180_MASK, .type =3D INTF_DSI, .controller_id =3D MSM_DSI_CONTROLLER_1, .prog_fetch_lines_worst_case =3D 24, @@ -404,7 +404,7 @@ static const struct dpu_intf_cfg sm8650_intf[] =3D { }, { .name =3D "intf_3", .id =3D INTF_3, .base =3D 0x37000, .len =3D 0x280, - .features =3D INTF_SC7280_MASK, + .features =3D INTF_SC7180_MASK, .type =3D INTF_DP, .controller_id =3D MSM_DP_CONTROLLER_1, .prog_fetch_lines_worst_case =3D 24, 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 0c860e804cab8ece8966596f4ec2b17ff3aa226f..93427f7cac3a370fdac3f119134= bf9fee8b87a17 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 @@ -319,7 +319,7 @@ static const struct dpu_intf_cfg sm8350_intf[] =3D { { .name =3D "intf_0", .id =3D INTF_0, .base =3D 0x34000, .len =3D 0x280, - .features =3D INTF_SC7280_MASK, + .features =3D INTF_SC7180_MASK, .type =3D INTF_DP, .controller_id =3D MSM_DP_CONTROLLER_0, .prog_fetch_lines_worst_case =3D 24, @@ -328,7 +328,7 @@ static const struct dpu_intf_cfg sm8350_intf[] =3D { }, { .name =3D "intf_1", .id =3D INTF_1, .base =3D 0x35000, .len =3D 0x2c4, - .features =3D INTF_SC7280_MASK, + .features =3D INTF_SC7180_MASK, .type =3D INTF_DSI, .controller_id =3D MSM_DSI_CONTROLLER_0, .prog_fetch_lines_worst_case =3D 24, @@ -338,7 +338,7 @@ static const struct dpu_intf_cfg sm8350_intf[] =3D { }, { .name =3D "intf_2", .id =3D INTF_2, .base =3D 0x36000, .len =3D 0x2c4, - .features =3D INTF_SC7280_MASK, + .features =3D INTF_SC7180_MASK, .type =3D INTF_DSI, .controller_id =3D MSM_DSI_CONTROLLER_1, .prog_fetch_lines_worst_case =3D 24, @@ -348,7 +348,7 @@ static const struct dpu_intf_cfg sm8350_intf[] =3D { }, { .name =3D "intf_3", .id =3D INTF_3, .base =3D 0x37000, .len =3D 0x280, - .features =3D INTF_SC7280_MASK, + .features =3D INTF_SC7180_MASK, .type =3D INTF_DP, .controller_id =3D MSM_DP_CONTROLLER_1, .prog_fetch_lines_worst_case =3D 24, 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 e9625c48c5677ef221b8fc80e7f9df8957b847e2..1edec0644b078ac1fff129354d4= d02eec015a331 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 @@ -183,7 +183,7 @@ static const struct dpu_intf_cfg sc7280_intf[] =3D { { .name =3D "intf_0", .id =3D INTF_0, .base =3D 0x34000, .len =3D 0x280, - .features =3D INTF_SC7280_MASK, + .features =3D INTF_SC7180_MASK, .type =3D INTF_DP, .controller_id =3D MSM_DP_CONTROLLER_0, .prog_fetch_lines_worst_case =3D 24, @@ -192,7 +192,7 @@ static const struct dpu_intf_cfg sc7280_intf[] =3D { }, { .name =3D "intf_1", .id =3D INTF_1, .base =3D 0x35000, .len =3D 0x2c4, - .features =3D INTF_SC7280_MASK, + .features =3D INTF_SC7180_MASK, .type =3D INTF_DSI, .controller_id =3D MSM_DSI_CONTROLLER_0, .prog_fetch_lines_worst_case =3D 24, @@ -202,7 +202,7 @@ static const struct dpu_intf_cfg sc7280_intf[] =3D { }, { .name =3D "intf_5", .id =3D INTF_5, .base =3D 0x39000, .len =3D 0x280, - .features =3D INTF_SC7280_MASK, + .features =3D INTF_SC7180_MASK, .type =3D INTF_DP, .controller_id =3D MSM_DP_CONTROLLER_1, .prog_fetch_lines_worst_case =3D 24, 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 fcee1c3665f88a9defca4fec38dd76d56c97297e..7d698fc354666a2dc468a71ff08= cb8df0c37234c 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 @@ -315,7 +315,7 @@ static const struct dpu_intf_cfg sc8280xp_intf[] =3D { { .name =3D "intf_0", .id =3D INTF_0, .base =3D 0x34000, .len =3D 0x280, - .features =3D INTF_SC7280_MASK, + .features =3D INTF_SC7180_MASK, .type =3D INTF_DP, .controller_id =3D MSM_DP_CONTROLLER_0, .prog_fetch_lines_worst_case =3D 24, @@ -324,7 +324,7 @@ static const struct dpu_intf_cfg sc8280xp_intf[] =3D { }, { .name =3D "intf_1", .id =3D INTF_1, .base =3D 0x35000, .len =3D 0x300, - .features =3D INTF_SC7280_MASK, + .features =3D INTF_SC7180_MASK, .type =3D INTF_DSI, .controller_id =3D MSM_DSI_CONTROLLER_0, .prog_fetch_lines_worst_case =3D 24, @@ -334,7 +334,7 @@ static const struct dpu_intf_cfg sc8280xp_intf[] =3D { }, { .name =3D "intf_2", .id =3D INTF_2, .base =3D 0x36000, .len =3D 0x300, - .features =3D INTF_SC7280_MASK, + .features =3D INTF_SC7180_MASK, .type =3D INTF_DSI, .controller_id =3D MSM_DSI_CONTROLLER_1, .prog_fetch_lines_worst_case =3D 24, @@ -344,7 +344,7 @@ static const struct dpu_intf_cfg sc8280xp_intf[] =3D { }, { .name =3D "intf_3", .id =3D INTF_3, .base =3D 0x37000, .len =3D 0x280, - .features =3D INTF_SC7280_MASK, + .features =3D INTF_SC7180_MASK, .type =3D INTF_NONE, .controller_id =3D MSM_DP_CONTROLLER_0, .prog_fetch_lines_worst_case =3D 24, @@ -353,7 +353,7 @@ static const struct dpu_intf_cfg sc8280xp_intf[] =3D { }, { .name =3D "intf_4", .id =3D INTF_4, .base =3D 0x38000, .len =3D 0x280, - .features =3D INTF_SC7280_MASK, + .features =3D INTF_SC7180_MASK, .type =3D INTF_DP, .controller_id =3D MSM_DP_CONTROLLER_1, .prog_fetch_lines_worst_case =3D 24, @@ -362,7 +362,7 @@ static const struct dpu_intf_cfg sc8280xp_intf[] =3D { }, { .name =3D "intf_5", .id =3D INTF_5, .base =3D 0x39000, .len =3D 0x280, - .features =3D INTF_SC7280_MASK, + .features =3D INTF_SC7180_MASK, .type =3D INTF_DP, .controller_id =3D MSM_DP_CONTROLLER_3, .prog_fetch_lines_worst_case =3D 24, @@ -371,7 +371,7 @@ static const struct dpu_intf_cfg sc8280xp_intf[] =3D { }, { .name =3D "intf_6", .id =3D INTF_6, .base =3D 0x3a000, .len =3D 0x280, - .features =3D INTF_SC7280_MASK, + .features =3D INTF_SC7180_MASK, .type =3D INTF_DP, .controller_id =3D MSM_DP_CONTROLLER_2, .prog_fetch_lines_worst_case =3D 24, @@ -380,7 +380,7 @@ static const struct dpu_intf_cfg sc8280xp_intf[] =3D { }, { .name =3D "intf_7", .id =3D INTF_7, .base =3D 0x3b000, .len =3D 0x280, - .features =3D INTF_SC7280_MASK, + .features =3D INTF_SC7180_MASK, .type =3D INTF_NONE, .controller_id =3D MSM_DP_CONTROLLER_2, .prog_fetch_lines_worst_case =3D 24, @@ -389,7 +389,7 @@ static const struct dpu_intf_cfg sc8280xp_intf[] =3D { }, { .name =3D "intf_8", .id =3D INTF_8, .base =3D 0x3c000, .len =3D 0x280, - .features =3D INTF_SC7280_MASK, + .features =3D INTF_SC7180_MASK, .type =3D INTF_NONE, .controller_id =3D MSM_DP_CONTROLLER_1, .prog_fetch_lines_worst_case =3D 24, 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 19b2ee8bbd5fd3ab6096ea1c9dc2e0f804bec973..ce050c898b9f21e69e5ff967c2a= f7c2df1e08232 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 @@ -335,7 +335,7 @@ static const struct dpu_intf_cfg sm8450_intf[] =3D { { .name =3D "intf_0", .id =3D INTF_0, .base =3D 0x34000, .len =3D 0x280, - .features =3D INTF_SC7280_MASK, + .features =3D INTF_SC7180_MASK, .type =3D INTF_DP, .controller_id =3D MSM_DP_CONTROLLER_0, .prog_fetch_lines_worst_case =3D 24, @@ -344,7 +344,7 @@ static const struct dpu_intf_cfg sm8450_intf[] =3D { }, { .name =3D "intf_1", .id =3D INTF_1, .base =3D 0x35000, .len =3D 0x300, - .features =3D INTF_SC7280_MASK, + .features =3D INTF_SC7180_MASK, .type =3D INTF_DSI, .controller_id =3D MSM_DSI_CONTROLLER_0, .prog_fetch_lines_worst_case =3D 24, @@ -354,7 +354,7 @@ static const struct dpu_intf_cfg sm8450_intf[] =3D { }, { .name =3D "intf_2", .id =3D INTF_2, .base =3D 0x36000, .len =3D 0x300, - .features =3D INTF_SC7280_MASK, + .features =3D INTF_SC7180_MASK, .type =3D INTF_DSI, .controller_id =3D MSM_DSI_CONTROLLER_1, .prog_fetch_lines_worst_case =3D 24, @@ -364,7 +364,7 @@ static const struct dpu_intf_cfg sm8450_intf[] =3D { }, { .name =3D "intf_3", .id =3D INTF_3, .base =3D 0x37000, .len =3D 0x280, - .features =3D INTF_SC7280_MASK, + .features =3D INTF_SC7180_MASK, .type =3D INTF_DP, .controller_id =3D MSM_DP_CONTROLLER_1, .prog_fetch_lines_worst_case =3D 24, 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 4d96ce71746f2595427649d0fdb73dae0c18be60..4291b4f9ce324eb517022eabe3a= b6078b1c3a2fb 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 @@ -345,7 +345,7 @@ static const struct dpu_intf_cfg sa8775p_intf[] =3D { { .name =3D "intf_0", .id =3D INTF_0, .base =3D 0x34000, .len =3D 0x280, - .features =3D INTF_SC7280_MASK, + .features =3D INTF_SC7180_MASK, .type =3D INTF_DP, .controller_id =3D MSM_DP_CONTROLLER_0, .prog_fetch_lines_worst_case =3D 24, @@ -354,7 +354,7 @@ static const struct dpu_intf_cfg sa8775p_intf[] =3D { }, { .name =3D "intf_1", .id =3D INTF_1, .base =3D 0x35000, .len =3D 0x300, - .features =3D INTF_SC7280_MASK, + .features =3D INTF_SC7180_MASK, .type =3D INTF_DSI, .controller_id =3D MSM_DSI_CONTROLLER_0, .prog_fetch_lines_worst_case =3D 24, @@ -364,7 +364,7 @@ static const struct dpu_intf_cfg sa8775p_intf[] =3D { }, { .name =3D "intf_2", .id =3D INTF_2, .base =3D 0x36000, .len =3D 0x300, - .features =3D INTF_SC7280_MASK, + .features =3D INTF_SC7180_MASK, .type =3D INTF_DSI, .controller_id =3D MSM_DSI_CONTROLLER_1, .prog_fetch_lines_worst_case =3D 24, @@ -374,7 +374,7 @@ static const struct dpu_intf_cfg sa8775p_intf[] =3D { }, { .name =3D "intf_3", .id =3D INTF_3, .base =3D 0x37000, .len =3D 0x280, - .features =3D INTF_SC7280_MASK, + .features =3D INTF_SC7180_MASK, .type =3D INTF_NONE, .controller_id =3D MSM_DP_CONTROLLER_0, /* pair with intf_0 for DP MST */ .prog_fetch_lines_worst_case =3D 24, @@ -383,7 +383,7 @@ static const struct dpu_intf_cfg sa8775p_intf[] =3D { }, { .name =3D "intf_4", .id =3D INTF_4, .base =3D 0x38000, .len =3D 0x280, - .features =3D INTF_SC7280_MASK, + .features =3D INTF_SC7180_MASK, .type =3D INTF_DP, .controller_id =3D MSM_DP_CONTROLLER_1, .prog_fetch_lines_worst_case =3D 24, @@ -392,7 +392,7 @@ static const struct dpu_intf_cfg sa8775p_intf[] =3D { }, { .name =3D "intf_6", .id =3D INTF_6, .base =3D 0x3A000, .len =3D 0x280, - .features =3D INTF_SC7280_MASK, + .features =3D INTF_SC7180_MASK, .type =3D INTF_NONE, .controller_id =3D MSM_DP_CONTROLLER_0, /* pair with intf_0 for DP MST */ .prog_fetch_lines_worst_case =3D 24, @@ -401,7 +401,7 @@ static const struct dpu_intf_cfg sa8775p_intf[] =3D { }, { .name =3D "intf_7", .id =3D INTF_7, .base =3D 0x3b000, .len =3D 0x280, - .features =3D INTF_SC7280_MASK, + .features =3D INTF_SC7180_MASK, .type =3D INTF_NONE, .controller_id =3D MSM_DP_CONTROLLER_0, /* pair with intf_0 for DP MST */ .prog_fetch_lines_worst_case =3D 24, @@ -410,7 +410,7 @@ static const struct dpu_intf_cfg sa8775p_intf[] =3D { }, { .name =3D "intf_8", .id =3D INTF_8, .base =3D 0x3c000, .len =3D 0x280, - .features =3D INTF_SC7280_MASK, + .features =3D INTF_SC7180_MASK, .type =3D INTF_NONE, .controller_id =3D MSM_DP_CONTROLLER_1, /* pair with intf_4 for DP MST */ .prog_fetch_lines_worst_case =3D 24, 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 24f988465bf6ba8e3d3d2691534f0981f222fa27..a6ab5c49654010194bfc1d4991f= fec411ef6e6fd 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 @@ -330,7 +330,7 @@ static const struct dpu_intf_cfg sm8550_intf[] =3D { { .name =3D "intf_0", .id =3D INTF_0, .base =3D 0x34000, .len =3D 0x280, - .features =3D INTF_SC7280_MASK, + .features =3D INTF_SC7180_MASK, .type =3D INTF_DP, .controller_id =3D MSM_DP_CONTROLLER_0, .prog_fetch_lines_worst_case =3D 24, @@ -339,7 +339,7 @@ static const struct dpu_intf_cfg sm8550_intf[] =3D { }, { .name =3D "intf_1", .id =3D INTF_1, .base =3D 0x35000, .len =3D 0x300, - .features =3D INTF_SC7280_MASK, + .features =3D INTF_SC7180_MASK, .type =3D INTF_DSI, .controller_id =3D MSM_DSI_CONTROLLER_0, .prog_fetch_lines_worst_case =3D 24, @@ -349,7 +349,7 @@ static const struct dpu_intf_cfg sm8550_intf[] =3D { }, { .name =3D "intf_2", .id =3D INTF_2, .base =3D 0x36000, .len =3D 0x300, - .features =3D INTF_SC7280_MASK, + .features =3D INTF_SC7180_MASK, .type =3D INTF_DSI, .controller_id =3D MSM_DSI_CONTROLLER_1, .prog_fetch_lines_worst_case =3D 24, @@ -359,7 +359,7 @@ static const struct dpu_intf_cfg sm8550_intf[] =3D { }, { .name =3D "intf_3", .id =3D INTF_3, .base =3D 0x37000, .len =3D 0x280, - .features =3D INTF_SC7280_MASK, + .features =3D INTF_SC7180_MASK, .type =3D INTF_DP, .controller_id =3D MSM_DP_CONTROLLER_1, .prog_fetch_lines_worst_case =3D 24, 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 6417baa84f826feb3bc6eaa6b063ad75e597a9d7..ad486b03c54d9beb6d77df4d6b5= f142fd1dd8d8d 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 @@ -331,7 +331,7 @@ static const struct dpu_intf_cfg x1e80100_intf[] =3D { { .name =3D "intf_0", .id =3D INTF_0, .base =3D 0x34000, .len =3D 0x280, - .features =3D INTF_SC7280_MASK, + .features =3D INTF_SC7180_MASK, .type =3D INTF_DP, .controller_id =3D MSM_DP_CONTROLLER_0, .prog_fetch_lines_worst_case =3D 24, @@ -340,7 +340,7 @@ static const struct dpu_intf_cfg x1e80100_intf[] =3D { }, { .name =3D "intf_1", .id =3D INTF_1, .base =3D 0x35000, .len =3D 0x300, - .features =3D INTF_SC7280_MASK, + .features =3D INTF_SC7180_MASK, .type =3D INTF_DSI, .controller_id =3D MSM_DSI_CONTROLLER_0, .prog_fetch_lines_worst_case =3D 24, @@ -350,7 +350,7 @@ static const struct dpu_intf_cfg x1e80100_intf[] =3D { }, { .name =3D "intf_2", .id =3D INTF_2, .base =3D 0x36000, .len =3D 0x300, - .features =3D INTF_SC7280_MASK, + .features =3D INTF_SC7180_MASK, .type =3D INTF_DSI, .controller_id =3D MSM_DSI_CONTROLLER_1, .prog_fetch_lines_worst_case =3D 24, @@ -360,7 +360,7 @@ static const struct dpu_intf_cfg x1e80100_intf[] =3D { }, { .name =3D "intf_3", .id =3D INTF_3, .base =3D 0x37000, .len =3D 0x280, - .features =3D INTF_SC7280_MASK, + .features =3D INTF_SC7180_MASK, .type =3D INTF_NONE, .controller_id =3D MSM_DP_CONTROLLER_0, /* pair with intf_0 for DP MST */ .prog_fetch_lines_worst_case =3D 24, @@ -369,7 +369,7 @@ static const struct dpu_intf_cfg x1e80100_intf[] =3D { }, { .name =3D "intf_4", .id =3D INTF_4, .base =3D 0x38000, .len =3D 0x280, - .features =3D INTF_SC7280_MASK, + .features =3D INTF_SC7180_MASK, .type =3D INTF_DP, .controller_id =3D MSM_DP_CONTROLLER_1, .prog_fetch_lines_worst_case =3D 24, @@ -378,7 +378,7 @@ static const struct dpu_intf_cfg x1e80100_intf[] =3D { }, { .name =3D "intf_5", .id =3D INTF_5, .base =3D 0x39000, .len =3D 0x280, - .features =3D INTF_SC7280_MASK, + .features =3D INTF_SC7180_MASK, .type =3D INTF_DP, .controller_id =3D MSM_DP_CONTROLLER_3, .prog_fetch_lines_worst_case =3D 24, @@ -387,7 +387,7 @@ static const struct dpu_intf_cfg x1e80100_intf[] =3D { }, { .name =3D "intf_6", .id =3D INTF_6, .base =3D 0x3A000, .len =3D 0x280, - .features =3D INTF_SC7280_MASK, + .features =3D INTF_SC7180_MASK, .type =3D INTF_DP, .controller_id =3D MSM_DP_CONTROLLER_2, .prog_fetch_lines_worst_case =3D 24, @@ -396,7 +396,7 @@ static const struct dpu_intf_cfg x1e80100_intf[] =3D { }, { .name =3D "intf_7", .id =3D INTF_7, .base =3D 0x3b000, .len =3D 0x280, - .features =3D INTF_SC7280_MASK, + .features =3D INTF_SC7180_MASK, .type =3D INTF_NONE, .controller_id =3D MSM_DP_CONTROLLER_2, /* pair with intf_6 for DP MST */ .prog_fetch_lines_worst_case =3D 24, @@ -405,7 +405,7 @@ static const struct dpu_intf_cfg x1e80100_intf[] =3D { }, { .name =3D "intf_8", .id =3D INTF_8, .base =3D 0x3c000, .len =3D 0x280, - .features =3D INTF_SC7280_MASK, + .features =3D INTF_SC7180_MASK, .type =3D INTF_NONE, .controller_id =3D MSM_DP_CONTROLLER_1, /* pair with intf_4 for DP MST */ .prog_fetch_lines_worst_case =3D 24, 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 64265ca4656a04d8c5a1d9582d7124c7eb897099..671e1ba35d28a20ca3a483bfc64= 12a8e53c25709 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.c +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.c @@ -126,8 +126,6 @@ BIT(DPU_INTF_STATUS_SUPPORTED) | \ BIT(DPU_DATA_HCTL_EN)) =20 -#define INTF_SC7280_MASK (INTF_SC7180_MASK) - #define WB_SDM845_MASK (BIT(DPU_WB_LINE_MODE) | \ BIT(DPU_WB_UBWC) | \ BIT(DPU_WB_YUV_CONFIG) | \ --=20 2.39.5 From nobody Sun Feb 8 09:32:35 2026 Received: from mx0b-0031df01.pphosted.com (mx0b-0031df01.pphosted.com [205.220.180.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 D28CD207A2B for ; Thu, 24 Apr 2025 09:30:32 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=205.220.180.131 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745487034; cv=none; b=ZKPj0xqdpxZ+qqEn9Utw6KsmjvWrsejjkDDdhT+Xo9rQ4fUqkoeiTdlhhTWpQX7qdib6gxhNzrXFmyborEuozVm2zYawW7xADcCUHAyZc7T6CKspRPC9+KbUxEIToRKjGATnB5HXb4bJ6qPM/UkQldygUXSBJhS0TwNJlGkDVko= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745487034; c=relaxed/simple; bh=F7g9BzAAbozmHaA6qYlbtrmbTeJi2EDpYk1ZIzA3gYs=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=nHPhAnpM+tMCfJobKlZ0JTSugL9x6vWNdNt7gGrUkhQyZ7SVLSFGGkO5zo7jS/+8fJk9zuQnGdDshFF3EqB6I3OSY4GUfVQflmZyWuBTXFcOKCUCeutm6VRYsK/+9KOIMLVxzM4uKKJFQEu0VsrVB+9SLg/J7P0af45V+Ew1lYM= 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=WbROGqVF; arc=none smtp.client-ip=205.220.180.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="WbROGqVF" Received: from pps.filterd (m0279869.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 53O0F8DZ010276 for ; Thu, 24 Apr 2025 09:30:31 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= yyPCpdExNHYyCfka5wJ1DgOakGmSWlxEKnN0dB+rNyA=; b=WbROGqVFtURaoPkN ygMGXjhv6pg9g7Synyob1P3lBLQWdMdvpapaV9zrO8NAQR7Zj3T7jkiYIFAHKn4I whM5KuXGXa2nLI88y+spPYIczCTQSsmIbAMfSa5bzCEA0CIcm+NwBsDmk5izQ5g1 huMROmEUqlsHpxl8wszj4t5Fq9PSfMm0D9bxkr58RyPAGsMjL0hT/7DdMZPxNDFv 5ZLV8Cl68OoFqZm8JVvrTNRDgWJHl5vKUGeJBUpA7BCrnq0YozvAUe4i1mnM3GyA woGzxE2TK2ns7xTGp8KO5orjLkUgMFghbbCq4rPJ+Ehx8mVA81RS6y2ynj5g52Ir hOAuZQ== 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 466jh3mym2-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Thu, 24 Apr 2025 09:30:31 +0000 (GMT) Received: by mail-qk1-f198.google.com with SMTP id af79cd13be357-7c5f3b8b1a1so128915085a.3 for ; Thu, 24 Apr 2025 02:30:31 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1745487031; x=1746091831; 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=yyPCpdExNHYyCfka5wJ1DgOakGmSWlxEKnN0dB+rNyA=; b=eKtgx+j1ghwyZvOgZytmF9hkxKumeaRurYYDHPKYa5UfC/4Hq7KAYPmGmqC8WKjM1v 1vbWne7j8Y4j3d1bNrwiMS3ZPSts6AUSkh0vcQf+Y9VZBTLt2sGbShwyHHWfsTCewMSc ijKG6SX5CsW2jJK2EbLu1HScEwInXoFKhn0xmeCLL8JoktK9YnIj+w8HRF4mcl5CRT+O t0ZwQpwQuc6a86mZ88Gq0GMien3gzCI4Lvo/Yqcm8aSfxP6DkN1v1XJtkMIcIX9A3pOC w0rOLZ1LpPvi274LOEGuBjs5rFKoTvCcCtNNkU6jdfkbC4jHBV4SLqAxqWEDGNC4j0L8 7fng== X-Forwarded-Encrypted: i=1; AJvYcCWd74AuHn4y34Gkkn/ffj2sWUjse6YN88+ujfctwPd9O+iD8KwvvbW2SDU7hBMm0LG3A8MVQhFlcc0AVes=@vger.kernel.org X-Gm-Message-State: AOJu0YzHFumO+cNsYXOs15t0XixSVnqk5/Mofa5HGruy7OxgtwPz6nIR y3OhDnanQO942C6O4nZDbDCuQwnYINBTLAyiimANccqNnzjkxl2FKnbffEeJNWmXRwl0I5XGKlv XsVj+zAe7QzMj3l+mGa4vAlPlB29vf5JIzSM3cowUs5E4gySKvcSo8bLVD+wddCs= X-Gm-Gg: ASbGnctuY3YczvHM+DzxkTFlAaMlGOKupBmOLU69Ic6wbnoAEVZfYc2kc96iM4l5jyJ eHZwADwLmc1BRgB9xvesLYxyTW9K8W9soLMi6bl2ZZSG8Er80EKsT+bVRJ7S3qz5A0IiEleu9/L bs5XBkYaTXIP4xUs0ObFB7VoDXxgpe8tKe1GPmwdcdzsFA4GIrQgSgwIuNKRJYUrGt72ziWUMDG wUWeOyLExYtExPrupWBvnkkbOdkx3jEwCxo0aFP0nR84Q5FUf4ZB+uW2UYyKTF+ZV1rHKSOMGPM G/hoxwQIwp2ef3Fz2gx59BIJPK1JaAvvr0ABoDb5tfm6/KB0V/jCoVz/HC6178EzTajf4jwyrZt KxC4U03aqvNHFNpSDnH9HqYWE X-Received: by 2002:a05:620a:240c:b0:7c8:b141:29a with SMTP id af79cd13be357-7c956f434e9mr295633185a.53.1745487030631; Thu, 24 Apr 2025 02:30:30 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEx9uaadwaX8bJYGxUDegggO2ScWj1v+mzcXVJ3LgUY++bid1Lg/SAxfptX6bTexPiMslZnTA== X-Received: by 2002:a05:620a:240c:b0:7c8:b141:29a with SMTP id af79cd13be357-7c956f434e9mr295629685a.53.1745487030283; Thu, 24 Apr 2025 02:30:30 -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 38308e7fff4ca-317d1b9a304sm1820461fa.99.2025.04.24.02.30.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 24 Apr 2025 02:30:29 -0700 (PDT) From: Dmitry Baryshkov Date: Thu, 24 Apr 2025 12:30:07 +0300 Subject: [PATCH v3 03/33] drm/msm/dpu: inline _setup_ctl_ops() 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: <20250424-dpu-drop-features-v3-3-cdaca81d356f@oss.qualcomm.com> References: <20250424-dpu-drop-features-v3-0-cdaca81d356f@oss.qualcomm.com> In-Reply-To: <20250424-dpu-drop-features-v3-0-cdaca81d356f@oss.qualcomm.com> To: Rob Clark , Abhinav Kumar , Sean Paul , Marijn Suijten , David Airlie , Simona Vetter , Vinod Koul , Konrad Dybcio Cc: 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=5798; i=dmitry.baryshkov@oss.qualcomm.com; h=from:subject:message-id; bh=6nM57vgHQs62/wjwRtInuGG9vKrODBr++a+KVt2bcP8=; b=owEBbQGS/pANAwAKAYs8ij4CKSjVAcsmYgBoCgSqaDbO1cyuYOI8GY2KGOace+EMYeHMZnN4M 8YTpevhqVKJATMEAAEKAB0WIQRMcISVXLJjVvC4lX+LPIo+Aiko1QUCaAoEqgAKCRCLPIo+Aiko 1ZzKCACc/Fqq3vdDRKnSwfbFcgQLxFyD9c/N04fCkEkisVRf1/kEa4lDji6r27tOe0LWjEAj7eG P+VqwUVMg9mNZmvpeWfRfnYcX60FxVk6WyiAocC3uh+WQco8rtSBtHALHqz4g/w1UKYsu+QLtXE LxQbEPx+5PJ+MOTz9XrcX7S1lp7PvafCYFDWW7DxJNl9hOxwehH3/0fVR+BLbrBb2g3dRAVHHAJ w+Uk5G9fN/NtZATLDFOzJ3+4HxVD15GSqCY1YmhXeEx5feUZSUKYF+GKYHA1r0aLKrTBtzaDYU7 SMzVcqzF+eX7lrmMR6Flji9l2BH4LBken36gXJqA0pd3aonX X-Developer-Key: i=dmitry.baryshkov@oss.qualcomm.com; a=openpgp; fpr=8F88381DD5C873E4AE487DA5199BF1243632046A X-Proofpoint-ORIG-GUID: _sIIIepx7x3myGTssBVPiNlXPBW0G4TA X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUwNDI0MDA2MiBTYWx0ZWRfX/eceCr9gEacg AbeGYy2Qn5K8oWrSAOe5r7AIOCaj0DwqEmZIOdI7j+9gFb9fG+SKVQoFyUSrnPE7gQTueglsbry 4hoTimcAcPcwg/DKi5Wm/6KLCpYJ3PhE/XF9Y/gWJi7+u4PIAPzubyeW4y9RG5rKJj7zTcptKSq sXjJn87E1OIp2JG7RP4OT+txkUlDmOXfA9jmpDGCt1kflJNhTMT+ZNv9h5sFZvK+vsK/w302aMh SoAsv7Vxlb2HqqepesXC/OH7niS/4G6xjpjs00Dff2o/00UVQa8YtEnptl5zMSNTuewuw5x9mkL +J01I/rmVV48legj5QQNcdE6xWinwUryQRB3ef00R1l7yn6jRdmdeVzN/iz+4u0KzAgEmw9Da0s lSLCMwPDvYYYt42EnCtaZ0YiUVFxAwX52AdnWuFqrnule++SAc4WVv2xnpPgvwBFffRgSQKq X-Authority-Analysis: v=2.4 cv=ELgG00ZC c=1 sm=1 tr=0 ts=680a04b7 cx=c_pps a=qKBjSQ1v91RyAK45QCPf5w==:117 a=xqWC_Br6kY4A:10 a=IkcTkHD0fZMA:10 a=XR8D0OoHHMoA:10 a=KKAkSRfTAAAA:8 a=RpF703knbOfOEe3tTfUA:9 a=QEXdDO2ut3YA:10 a=NFOGd7dJGGMPyQGDc5-O:22 a=cvBusfyB2V15izCimMoJ:22 X-Proofpoint-GUID: _sIIIepx7x3myGTssBVPiNlXPBW0G4TA X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1099,Hydra:6.0.680,FMLib:17.12.80.40 definitions=2025-04-24_04,2025-04-22_01,2025-02-21_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 impostorscore=0 adultscore=0 malwarescore=0 clxscore=1015 bulkscore=0 phishscore=0 spamscore=0 mlxscore=0 lowpriorityscore=0 priorityscore=1501 suspectscore=0 mlxlogscore=999 classifier=spam authscore=0 authtc=n/a authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.19.0-2504070000 definitions=main-2504240062 From: Dmitry Baryshkov Inline the _setup_ctl_ops() function, it makes it easier to handle different conditions involving CTL configuration. Signed-off-by: Dmitry Baryshkov --- drivers/gpu/drm/msm/disp/dpu1/dpu_hw_ctl.c | 98 ++++++++++++++------------= ---- 1 file changed, 47 insertions(+), 51 deletions(-) diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_ctl.c b/drivers/gpu/drm/m= sm/disp/dpu1/dpu_hw_ctl.c index 411a7cf088eb72f856940c09b0af9e108ccade4b..466bfee3db52d980877a5cdc4ee= b739cae250afc 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_ctl.c +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_ctl.c @@ -714,56 +714,6 @@ static void dpu_hw_ctl_set_fetch_pipe_active(struct dp= u_hw_ctl *ctx, DPU_REG_WRITE(&ctx->hw, CTL_FETCH_PIPE_ACTIVE, val); } =20 -static void _setup_ctl_ops(struct dpu_hw_ctl_ops *ops, - unsigned long cap) -{ - if (cap & BIT(DPU_CTL_ACTIVE_CFG)) { - ops->trigger_flush =3D dpu_hw_ctl_trigger_flush_v1; - ops->setup_intf_cfg =3D dpu_hw_ctl_intf_cfg_v1; - ops->reset_intf_cfg =3D dpu_hw_ctl_reset_intf_cfg_v1; - ops->update_pending_flush_intf =3D - dpu_hw_ctl_update_pending_flush_intf_v1; - - ops->update_pending_flush_periph =3D - dpu_hw_ctl_update_pending_flush_periph_v1; - - ops->update_pending_flush_merge_3d =3D - dpu_hw_ctl_update_pending_flush_merge_3d_v1; - ops->update_pending_flush_wb =3D dpu_hw_ctl_update_pending_flush_wb_v1; - ops->update_pending_flush_cwb =3D dpu_hw_ctl_update_pending_flush_cwb_v1; - ops->update_pending_flush_dsc =3D - dpu_hw_ctl_update_pending_flush_dsc_v1; - ops->update_pending_flush_cdm =3D dpu_hw_ctl_update_pending_flush_cdm_v1; - } else { - ops->trigger_flush =3D dpu_hw_ctl_trigger_flush; - ops->setup_intf_cfg =3D dpu_hw_ctl_intf_cfg; - ops->update_pending_flush_intf =3D - dpu_hw_ctl_update_pending_flush_intf; - ops->update_pending_flush_wb =3D dpu_hw_ctl_update_pending_flush_wb; - ops->update_pending_flush_cdm =3D dpu_hw_ctl_update_pending_flush_cdm; - } - ops->clear_pending_flush =3D dpu_hw_ctl_clear_pending_flush; - ops->update_pending_flush =3D dpu_hw_ctl_update_pending_flush; - ops->get_pending_flush =3D dpu_hw_ctl_get_pending_flush; - ops->get_flush_register =3D dpu_hw_ctl_get_flush_register; - ops->trigger_start =3D dpu_hw_ctl_trigger_start; - ops->is_started =3D dpu_hw_ctl_is_started; - ops->trigger_pending =3D dpu_hw_ctl_trigger_pending; - ops->reset =3D dpu_hw_ctl_reset_control; - ops->wait_reset_status =3D dpu_hw_ctl_wait_reset_status; - ops->clear_all_blendstages =3D dpu_hw_ctl_clear_all_blendstages; - ops->setup_blendstage =3D dpu_hw_ctl_setup_blendstage; - ops->update_pending_flush_sspp =3D dpu_hw_ctl_update_pending_flush_sspp; - ops->update_pending_flush_mixer =3D dpu_hw_ctl_update_pending_flush_mixer; - if (cap & BIT(DPU_CTL_DSPP_SUB_BLOCK_FLUSH)) - ops->update_pending_flush_dspp =3D dpu_hw_ctl_update_pending_flush_dspp_= sub_blocks; - else - ops->update_pending_flush_dspp =3D dpu_hw_ctl_update_pending_flush_dspp; - - if (cap & BIT(DPU_CTL_FETCH_ACTIVE)) - ops->set_active_pipes =3D dpu_hw_ctl_set_fetch_pipe_active; -}; - /** * dpu_hw_ctl_init() - Initializes the ctl_path hw driver object. * Should be called before accessing any ctl_path register. @@ -789,7 +739,53 @@ struct dpu_hw_ctl *dpu_hw_ctl_init(struct drm_device *= dev, c->hw.log_mask =3D DPU_DBG_MASK_CTL; =20 c->caps =3D cfg; - _setup_ctl_ops(&c->ops, c->caps->features); + + if (c->caps->features & BIT(DPU_CTL_ACTIVE_CFG)) { + c->ops.trigger_flush =3D dpu_hw_ctl_trigger_flush_v1; + c->ops.setup_intf_cfg =3D dpu_hw_ctl_intf_cfg_v1; + c->ops.reset_intf_cfg =3D dpu_hw_ctl_reset_intf_cfg_v1; + c->ops.update_pending_flush_intf =3D + dpu_hw_ctl_update_pending_flush_intf_v1; + + c->ops.update_pending_flush_periph =3D + dpu_hw_ctl_update_pending_flush_periph_v1; + + c->ops.update_pending_flush_merge_3d =3D + dpu_hw_ctl_update_pending_flush_merge_3d_v1; + c->ops.update_pending_flush_wb =3D dpu_hw_ctl_update_pending_flush_wb_v1; + c->ops.update_pending_flush_cwb =3D dpu_hw_ctl_update_pending_flush_cwb_= v1; + c->ops.update_pending_flush_dsc =3D + dpu_hw_ctl_update_pending_flush_dsc_v1; + c->ops.update_pending_flush_cdm =3D dpu_hw_ctl_update_pending_flush_cdm_= v1; + } else { + c->ops.trigger_flush =3D dpu_hw_ctl_trigger_flush; + c->ops.setup_intf_cfg =3D dpu_hw_ctl_intf_cfg; + c->ops.update_pending_flush_intf =3D + dpu_hw_ctl_update_pending_flush_intf; + c->ops.update_pending_flush_wb =3D dpu_hw_ctl_update_pending_flush_wb; + c->ops.update_pending_flush_cdm =3D dpu_hw_ctl_update_pending_flush_cdm; + } + c->ops.clear_pending_flush =3D dpu_hw_ctl_clear_pending_flush; + c->ops.update_pending_flush =3D dpu_hw_ctl_update_pending_flush; + c->ops.get_pending_flush =3D dpu_hw_ctl_get_pending_flush; + c->ops.get_flush_register =3D dpu_hw_ctl_get_flush_register; + c->ops.trigger_start =3D dpu_hw_ctl_trigger_start; + c->ops.is_started =3D dpu_hw_ctl_is_started; + c->ops.trigger_pending =3D dpu_hw_ctl_trigger_pending; + c->ops.reset =3D dpu_hw_ctl_reset_control; + c->ops.wait_reset_status =3D dpu_hw_ctl_wait_reset_status; + c->ops.clear_all_blendstages =3D dpu_hw_ctl_clear_all_blendstages; + c->ops.setup_blendstage =3D dpu_hw_ctl_setup_blendstage; + c->ops.update_pending_flush_sspp =3D dpu_hw_ctl_update_pending_flush_sspp; + c->ops.update_pending_flush_mixer =3D dpu_hw_ctl_update_pending_flush_mix= er; + if (c->caps->features & BIT(DPU_CTL_DSPP_SUB_BLOCK_FLUSH)) + c->ops.update_pending_flush_dspp =3D dpu_hw_ctl_update_pending_flush_dsp= p_sub_blocks; + else + c->ops.update_pending_flush_dspp =3D dpu_hw_ctl_update_pending_flush_dsp= p; + + if (c->caps->features & BIT(DPU_CTL_FETCH_ACTIVE)) + c->ops.set_active_pipes =3D dpu_hw_ctl_set_fetch_pipe_active; + c->idx =3D cfg->id; c->mixer_count =3D mixer_count; c->mixer_hw_caps =3D mixer; --=20 2.39.5 From nobody Sun Feb 8 09:32:35 2026 Received: from mx0b-0031df01.pphosted.com (mx0b-0031df01.pphosted.com [205.220.180.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 E4EAE221552 for ; Thu, 24 Apr 2025 09:30:41 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=205.220.180.131 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745487043; cv=none; b=hBrqz8gR4v5aC2NeNGv3MOq8bMZawfunRJexWdKhO479NlReOTY05t25o3ZTIVEbdHxiKp7ecRpSXUiWew+qU6H97AROQbzybwcBdKHmnqXaH7vc8BH28xFVfILirF3qPtUQ0YX6rcrx5MrzdCKMNPKiqQ8IhnlXfnjEs+ZFx/g= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745487043; c=relaxed/simple; bh=H22xBWnfXZ6Aj4WLHuFbpSsw2wrEBfKKWdLmWP0e9rI=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=BoOo9dEukZA8QqHM7NHtBWhdDhUJBh5Ni9Ig+eO4z1cgxHrQB63Z6ztRG0xz1yVVMtEefhtYDaLnssT80j4Hze4dV7qtWduXRmGeoNOQGaGgrFT5wKVule9+6eI1eUVBTQvwv4Zw8wm6aXNxFM6DI2pbCF9ZA664ieMMhd4NqR4= 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=pGFXOq5O; arc=none smtp.client-ip=205.220.180.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="pGFXOq5O" Received: from pps.filterd (m0279870.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 53O0F9VS031001 for ; Thu, 24 Apr 2025 09:30:40 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= c0lUvSTsPxc5lkWV7yqgUJckTrtbVC9CMumomIWomoM=; b=pGFXOq5Or5ttyZJ2 +4b2x6Zaq3MnjPshfANAVMk3Fu0aPE1ZmlIA4ACYjleyo2vLig+lRYhONHBXcfCk i/PTDBej41EBDfkz9/NpwxGnip4LHf2FcSTC56bwIrqNLqRSlrgvFhxRBgIY2izd Ve2K5SfZCj+ex3fFcOrXba3DbM9/L7M7moZ9vOETSW2waBMqOF3vAUc7ueWixhtD a9WBzN/wort1Sc6ccbOs3U/Y/Nc86cYBWV3UKYw4KMGWw2tWHDp+YZc1gTZZ7mBX voxFnxdb/3q/rqfoGnDIofKXyXTKWqLNq0x+ibrthwD0zIraWrUCIoF227pWw7/J YyGbsA== Received: from mail-qk1-f200.google.com (mail-qk1-f200.google.com [209.85.222.200]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 466jh5cywc-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Thu, 24 Apr 2025 09:30:40 +0000 (GMT) Received: by mail-qk1-f200.google.com with SMTP id af79cd13be357-7c5e28d0cc0so134624985a.3 for ; Thu, 24 Apr 2025 02:30:39 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1745487032; x=1746091832; 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=c0lUvSTsPxc5lkWV7yqgUJckTrtbVC9CMumomIWomoM=; b=Q8Rqfzvkl59WOuGoSOrqnU6Aa+1yz8jHnHdPI+gsVrutqUg6TRbWcLJiRiQ0HnodkT fZOTOdhvkZ/8KzOy+zoH3t58IqaCTpWniJHDSdX4yt/f4Bs9luN9Xl5xfxqQfz75UocK XeG4OTfg49/q8JEKsY+IE4TsI2y0OHzWutaTErZL0kUBW7vpoLPrQOmUXqX3I3BpEwLH 6jZif6AIfCbGUrOPnt9udImqEVOm/CRZVBwvYJZwxShuzPjKhuwWSEFuC6oUqSsNfLNE rbq/DaTfguXVggqpnXLTYrAns2Ghi4xPuMiuaN3xhpvvd7BnODmBmalhkr1ebMT7NgyU A5eg== X-Forwarded-Encrypted: i=1; AJvYcCVH4oNckmVlomMu3onEcYlDK2H3CEujbQ5sBaZbvC4Bd6Kj0Fy7AvrVM81IiBUTRvumA8OgwURiZrI1OIg=@vger.kernel.org X-Gm-Message-State: AOJu0YxFx6HYHXvc4GBOynBPVaYPl20aVficVoWtc84g9KAFfDIPu0Tw VWbGEESktjyBjvnWu1pwgetJDT3aHkQX5NGghzOx5jsxdHEMJ8puS5LRwZa4UP280+KXoOnqJUp HH+9X5sqE8bOIyRtYxaLw0+aC2b59PNe5KeHqw7ufcnrlHkoF/2gDeJJg+og9OTY= X-Gm-Gg: ASbGnctJrDybU9DpElonrxjZJcwmDx8Qx9g0k6hUTzZPWd8QGptC80XPx1R4eDA1dye C8L4koxIeEA3CnVgLHP0vu/HEZTWIgcGC3mgWQoKCCqzxQvVGe2Lk28rP3+uUJ+zTAhPsgd29LY C27J/AFKt+0ZZGsV+JYuUGCZHn8w74RNlbE62aUQo5h+hnn0Ny6Aiv2OwXTKDkDA7P3vh5GP9jO SyssAiRW6popbQ6uOmV6LsmMvQAB/D5cvyAHFssnXOUYvkgDktOWYy2yLbkFB6HXw+5tYjignhN UmoosZ18EwVLzeVcoNPUeZFrF1Ab8Mfwu5xbISlSoB8tI1Iny7aPgS+NX4BagRTG4Ya6CilkaKn fxCCnISOALOttuy99XYr/6Iod X-Received: by 2002:a05:620a:31a0:b0:7c5:3b3b:c9da with SMTP id af79cd13be357-7c956f334e9mr319894685a.40.1745487032139; Thu, 24 Apr 2025 02:30:32 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEWUHHejoPAWrPi677FUC/LXOAzZqmXm+Nu8bw/i4Gd23G4xaODXoIn0yKuicCcUyxeizcG3w== X-Received: by 2002:a05:620a:31a0:b0:7c5:3b3b:c9da with SMTP id af79cd13be357-7c956f334e9mr319888385a.40.1745487031797; Thu, 24 Apr 2025 02:30:31 -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 38308e7fff4ca-317d1b9a304sm1820461fa.99.2025.04.24.02.30.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 24 Apr 2025 02:30:30 -0700 (PDT) From: Dmitry Baryshkov Date: Thu, 24 Apr 2025 12:30:08 +0300 Subject: [PATCH v3 04/33] drm/msm/dpu: inline _setup_dsc_ops() 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: <20250424-dpu-drop-features-v3-4-cdaca81d356f@oss.qualcomm.com> References: <20250424-dpu-drop-features-v3-0-cdaca81d356f@oss.qualcomm.com> In-Reply-To: <20250424-dpu-drop-features-v3-0-cdaca81d356f@oss.qualcomm.com> To: Rob Clark , Abhinav Kumar , Sean Paul , Marijn Suijten , David Airlie , Simona Vetter , Vinod Koul , Konrad Dybcio Cc: 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=1652; i=dmitry.baryshkov@oss.qualcomm.com; h=from:subject:message-id; bh=pmq5vBCUeBdexnqWIWU7CFkRwfE1mAJP/nnHW7qtnOo=; b=owEBbQGS/pANAwAKAYs8ij4CKSjVAcsmYgBoCgSqhsEhQWFa8FUQJirnBAfp4FL5UyiZYwL2j KSWqcA0JxaJATMEAAEKAB0WIQRMcISVXLJjVvC4lX+LPIo+Aiko1QUCaAoEqgAKCRCLPIo+Aiko 1RT7B/4lgGUG++hlUG/YtsFmd7Qoh4doQsDs+oVgtZvTumibpfEr+jSMdAVQEEydNd4LTj9r/3e 7XJmv/FoQpLM9UXzNq565hGC+f5P34GP481Q8iXLcbBHhtJCX+SjeNxfP6fJRh6pC6NWhbV44lG iUmCXwzAYZUnr5hM4AQ0FBBlCGDZ0L2g7nW0WYbi3SQrWUK3ZY94wxeldCbk6nttodBiErfRMee Spk6Jv401RlstzoR3jfpNXozBO4tDoiBBEO4UavQHnldyWVXJ5LQDA59mar1bu8eKyn2sbxmreF lZmJtj2JU3tSoto4IKzJQ9w0z+jjPbxlB26AG1+jQp4dQxKv X-Developer-Key: i=dmitry.baryshkov@oss.qualcomm.com; a=openpgp; fpr=8F88381DD5C873E4AE487DA5199BF1243632046A X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUwNDI0MDA2MyBTYWx0ZWRfX2sZr7QGB+E73 XnevtkLQ3rJNVxUyrlz45n23nu4ZO6letxFTdIuXHxXWq+posJ0JFdeERmAvGLil0cIp3aX4uSO Bd/V6gp0XVpPeD6xJiOHFJJqh+JqYfxE2Vbpwkmbxn75L0p2jL9E6O7ZfKHC3y2junPebuo/c+F QcjRNWQIAurXnJVkHoLrivTRX8jxyu4kk062ziSSqK/y+kEHVKmozA6S4QBov59d2iETQs0l45p hSa1bo1sUlu1CgftqjHRBv9SkL7R6t4/r6zPKA4JSXMOi4WlyFTsDEcy0QwL3VtlP3l8smNwa9W BM0KYXqg+HIPHcaCc2PZIcXg8FpcSqGiDp/Pme+kA1MV3QOnd4YTE9Wk/5hjaDxS0DIVUH9y6NP dgdh+jcAugjbZcZHqq6XEHTbO4cW9hyevGki8PVVSQNR1qUjzANSWlbEj7USnooirvOluAIy X-Proofpoint-GUID: ZYAh3-QbeUIC3VpJlVo4pl-Wu8SJTNc5 X-Authority-Analysis: v=2.4 cv=B/S50PtM c=1 sm=1 tr=0 ts=680a04c0 cx=c_pps a=hnmNkyzTK/kJ09Xio7VxxA==:117 a=xqWC_Br6kY4A:10 a=IkcTkHD0fZMA:10 a=XR8D0OoHHMoA:10 a=KKAkSRfTAAAA:8 a=aBwJmt2KlYBR8C_sNNsA:9 a=QEXdDO2ut3YA:10 a=PEH46H7Ffwr30OY-TuGO:22 a=cvBusfyB2V15izCimMoJ:22 X-Proofpoint-ORIG-GUID: ZYAh3-QbeUIC3VpJlVo4pl-Wu8SJTNc5 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1099,Hydra:6.0.680,FMLib:17.12.80.40 definitions=2025-04-24_04,2025-04-22_01,2025-02-21_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 adultscore=0 mlxlogscore=999 lowpriorityscore=0 bulkscore=0 impostorscore=0 suspectscore=0 mlxscore=0 priorityscore=1501 phishscore=0 malwarescore=0 spamscore=0 clxscore=1015 classifier=spam authscore=0 authtc=n/a authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.19.0-2504070000 definitions=main-2504240063 From: Dmitry Baryshkov Inline the _setup_dsc_ops() function, it makes it easier to handle different conditions involving DSC configuration. Signed-off-by: Dmitry Baryshkov --- drivers/gpu/drm/msm/disp/dpu1/dpu_hw_dsc.c | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_dsc.c b/drivers/gpu/drm/m= sm/disp/dpu1/dpu_hw_dsc.c index cec6d4e8baec4d00282465cfd2885d365f835976..c7db917afd27e3daf1e8aad2ad6= 71246bf6c8fbf 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_dsc.c +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_dsc.c @@ -181,16 +181,6 @@ static void dpu_hw_dsc_bind_pingpong_blk( DPU_REG_WRITE(c, dsc_ctl_offset, mux_cfg); } =20 -static void _setup_dsc_ops(struct dpu_hw_dsc_ops *ops, - unsigned long cap) -{ - ops->dsc_disable =3D dpu_hw_dsc_disable; - ops->dsc_config =3D dpu_hw_dsc_config; - ops->dsc_config_thresh =3D dpu_hw_dsc_config_thresh; - if (cap & BIT(DPU_DSC_OUTPUT_CTRL)) - ops->dsc_bind_pingpong_blk =3D dpu_hw_dsc_bind_pingpong_blk; -}; - /** * dpu_hw_dsc_init() - Initializes the DSC hw driver object. * @dev: Corresponding device for devres management @@ -213,7 +203,12 @@ struct dpu_hw_dsc *dpu_hw_dsc_init(struct drm_device *= dev, =20 c->idx =3D cfg->id; c->caps =3D cfg; - _setup_dsc_ops(&c->ops, c->caps->features); + + c->ops.dsc_disable =3D dpu_hw_dsc_disable; + c->ops.dsc_config =3D dpu_hw_dsc_config; + c->ops.dsc_config_thresh =3D dpu_hw_dsc_config_thresh; + if (c->caps->features & BIT(DPU_DSC_OUTPUT_CTRL)) + c->ops.dsc_bind_pingpong_blk =3D dpu_hw_dsc_bind_pingpong_blk; =20 return c; } --=20 2.39.5 From nobody Sun Feb 8 09:32:35 2026 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 C8E77221F14 for ; Thu, 24 Apr 2025 09:30:44 +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=1745487046; cv=none; b=Vaktxi2hczyVZm7ENu81XwGSVi21F9t84wUNFLnbBgQbxaCq2wfY1yswaOM9sV7bHA7iHBU0SU8dI7P0+kap4NgZxkQdXtz+8enejZOo0Tqpp0ntG/nWgErPDmZ3Bh1ECHGbNAcUx8VAQXstYPu3E8tDpFhWsVwrl6RCfqNY44c= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745487046; c=relaxed/simple; bh=4p9sBWIN8YkcJelXyV+UcMZ45sgycQrXYsSAAZuvWu4=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=OGbfRVaJiiCOlOJGTJI2MSFYs66BhJOg8F1jc3vIdyIpyrYiyX9yeJTednLqYNC4URxEYwZ+Zw7gUB2NbD9ANJVPmjX9ZF3TnEZplRRnsnmJSvTNjRReFWquNY6PTA+s/zlnti9+Ry4REpbKoxM7O4nBazwDkWD7bMgUXpkeoj0= 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=GdOFmMR2; 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="GdOFmMR2" 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 53O0FBB5009006 for ; Thu, 24 Apr 2025 09:30:44 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= 3h8IwCQygULBCYKUzhqZAZ0C4RUrKlRlSMDkS+Z3mD8=; b=GdOFmMR2dRM+TZyp glkhuB9JnKoiX4WZbUocXi127fgxsHI9BBa5LCyygPe6fkHgmIrJGdyUTS/it/iA ZNw8SBjDeFpKynHrkfdO+GaGro2wPZK3PsGdgf1HnncWKb2txEc+cb5AZwqf8Ep6 qSDbxnuJQjcdulgUb0YYtpBbmJsmx8BfZThJTNRFV3srR+4nKmNgjQjvEQBouBWY 5ukDgk3pNeWNvwzyVK35E6eP5Zg8ARcxP9AlURCpnEcjg0cJNOwYK/km4jQjujPe uiadU50Ba/fDt/zWqdV5fQ2MntkI6NWvtNc3NU70BK7alx3h3t1pCExX+urdSAIM J4nDsA== Received: from mail-qv1-f69.google.com (mail-qv1-f69.google.com [209.85.219.69]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 466jh3cxx1-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Thu, 24 Apr 2025 09:30:43 +0000 (GMT) Received: by mail-qv1-f69.google.com with SMTP id 6a1803df08f44-6e91d8a7165so14296836d6.0 for ; Thu, 24 Apr 2025 02:30:43 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1745487034; x=1746091834; 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=3h8IwCQygULBCYKUzhqZAZ0C4RUrKlRlSMDkS+Z3mD8=; b=gCG/botZDmQ0/zIEJ9QBdRsKEAQeStieFtjEGmgPLhp2g7jGRFzCaOxUltyjRmRiBw q2o1a0ZyaMKWg80ZvOtZKW28nDNY7fCG9chn+eG5WWCyuLQbfJe4xAucrPUFfuZZn6qg fJe8sXPSStQjrF24V5Fukhpf+kIE2UapX73izczC/x39QVUiKakBIY45kTNArMoHqe1F I6F7LQa/5VaBN1l68xJDDyTwRYc5KwX/gmxHQe9Ky4YpLeKr5anOn2kiSLY/xfDpOHbm FT0ENJzW8/AyyJnJGNJJ/siAm9DBdzQ4WeiUo2rM5OyrG7wGvFW0x6qkXkKql/MRwlU1 Rlgg== X-Forwarded-Encrypted: i=1; AJvYcCV80pfiNIvSw7gllKSrlZSimVZ2znwkMlwuJxMysFsnedhVdt+/mfSak/qDGBXZGdmWdXvaG9sI3GR5JZc=@vger.kernel.org X-Gm-Message-State: AOJu0YwPAN2yFbH/lQUvKQDw5ZJ3cbXE0A6PbxPmztP2b/9qkeYS9qkw qITsJqQxXwXRueU2AyivnJeDYV/VpJ5+YLKQS3z1+v+t05FMtV5L4hyr3Vg9PyghBEtp2GLcALB kT8AQvuFCI0h618uSwkFujOds6Ei/xPLbgCPdMzghK4Iev/Y0k3ufriTBOAkTeGc= X-Gm-Gg: ASbGnct58LwUxaEJ3t3M/s5uGoDkR1vD6UMTNGMXq/peipK2Fsdi5lUJr/gjZ/yclw2 242KwlMPQYoA6SxEXofs2F5uZtu6IHiBSzK4VHmwWbyIDYy2ARPQ3mLdrON5x59kdu/+iAYEgbe NDO2YwsAkyOusYz5r7qiqMF5aq/IaOYlGX76xPVgM+qjkgEwFku583u29VtHhnAuub/9oznKmT6 QAkWUnD/mpDlaRePoCKRqddNFQC2DjnhMmGNknXmjqovugYdKgtKrey/IPBAMDGD2pwBtIT6rgT 4ATY4AY51dzciQUG5EKtFChNE0at9Qrrl2v7NX0yGUpLOeqj3rHcJ4PyEoIm7TGxYoZGgQxoM1+ r5glO9ZiDQXKHuiks6PrK4LlG X-Received: by 2002:a05:6214:190:b0:6f4:c2e5:9dc5 with SMTP id 6a1803df08f44-6f4c2e59fc6mr12091996d6.44.1745487034049; Thu, 24 Apr 2025 02:30:34 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFYiPdy8b33rsIWhjyFiQzIakpdZn+3nbe9+UAF3x7yXZ+JZYFOs7kqMnbbBxaZc8zFD/lqsw== X-Received: by 2002:a05:6214:190:b0:6f4:c2e5:9dc5 with SMTP id 6a1803df08f44-6f4c2e59fc6mr12091676d6.44.1745487033547; Thu, 24 Apr 2025 02:30:33 -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 38308e7fff4ca-317d1b9a304sm1820461fa.99.2025.04.24.02.30.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 24 Apr 2025 02:30:32 -0700 (PDT) From: Dmitry Baryshkov Date: Thu, 24 Apr 2025 12:30:09 +0300 Subject: [PATCH v3 05/33] drm/msm/dpu: inline _setup_dspp_ops() 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: <20250424-dpu-drop-features-v3-5-cdaca81d356f@oss.qualcomm.com> References: <20250424-dpu-drop-features-v3-0-cdaca81d356f@oss.qualcomm.com> In-Reply-To: <20250424-dpu-drop-features-v3-0-cdaca81d356f@oss.qualcomm.com> To: Rob Clark , Abhinav Kumar , Sean Paul , Marijn Suijten , David Airlie , Simona Vetter , Vinod Koul , Konrad Dybcio Cc: 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=1344; i=dmitry.baryshkov@oss.qualcomm.com; h=from:subject:message-id; bh=TzajbLeXFeWcm21J+7IjoKJq84HYxMWKTI0BXOLnjkU=; b=owEBbQGS/pANAwAKAYs8ij4CKSjVAcsmYgBoCgSqIqH1D8iy9QmolQ3g4lkccg43SLzxBrGRz ZKYMKQ4OPuJATMEAAEKAB0WIQRMcISVXLJjVvC4lX+LPIo+Aiko1QUCaAoEqgAKCRCLPIo+Aiko 1YI/B/wOv26Yb4VFOEtRUKCRC69FKjk/WGSbZOZIhHasZ47DuPlZbmNbEoWj3roPkKbSqrb3uPH NOpCq5/ldcFkEgylrt5/V0ZjR6bLB5HuzX4wXuxWTnURrHP19zd/ELzooZaInwfVPG+Hc1/idn6 ol84xTej46Af/zW3INNdYLJ0JIEA21ZN29TOb4JxBvFdTzKRT+kv4c25lx7IH+1jDHtKQWVBygH bWDJyKfZi+ZEEuwdwcOc1lDE8NVWmm+krlQISZ/DhLGX1zlkx3QqzIDxdLkYkyjT8XwibwAM2u8 mYX4gdn+arbBz8u+PniC13dEB1hynNsB04Yzth2WfFOPhsIA X-Developer-Key: i=dmitry.baryshkov@oss.qualcomm.com; a=openpgp; fpr=8F88381DD5C873E4AE487DA5199BF1243632046A X-Proofpoint-ORIG-GUID: VFC4A0aV_fJRHM3xX-C_uf-Su_hLb3N7 X-Proofpoint-GUID: VFC4A0aV_fJRHM3xX-C_uf-Su_hLb3N7 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUwNDI0MDA2MyBTYWx0ZWRfXyU0mba7RZcj6 O+GMcQ9830Uk6ctq7cLGIaqiFJoQ0v4MjIEzE95jM38gtQ542e68mX50Uk96GUpm3vxrJ+CHnOP AWK4IiaRIZM7OsepqqdtPjw+evKJMHQ0qU2zwxa0LoBaBlJebSisYYBu16T8t3bxT1Sau26lWVH G5uIOfPgfUqYuXxqe2/NpnlWUhfey6y1W2mjQhfB6Et45AWVkxb3W/ZxzOKxByy+3yEf4pmpamE qLxSdViW6UdL650dfxOX3MVrKBxjCwA5b73dKUuQ9O7HxKSFU4KkpOLgPVzcA7QN4C6smyYHZl8 tpg0Zp8K3Enxoi9/r/q0bAuXtVFl10PAo0YePVenrF3N3On9CBWfT+vBATbLzE8WqItlGHxD0pT I3f/pD08sB5+I6A5ov+J6NVCI6NO+vDf3AqzlmbNH+dC6lvS34x6j1PJw5H2Mb6Me0+UoWCW X-Authority-Analysis: v=2.4 cv=Mepsu4/f c=1 sm=1 tr=0 ts=680a04c3 cx=c_pps a=wEM5vcRIz55oU/E2lInRtA==:117 a=xqWC_Br6kY4A:10 a=IkcTkHD0fZMA:10 a=XR8D0OoHHMoA:10 a=KKAkSRfTAAAA:8 a=ezFYmCdhRMHQQexkQpIA:9 a=QEXdDO2ut3YA:10 a=OIgjcC2v60KrkQgK7BGD:22 a=cvBusfyB2V15izCimMoJ:22 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1099,Hydra:6.0.680,FMLib:17.12.80.40 definitions=2025-04-24_04,2025-04-22_01,2025-02-21_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 suspectscore=0 phishscore=0 adultscore=0 lowpriorityscore=0 spamscore=0 bulkscore=0 malwarescore=0 priorityscore=1501 mlxscore=0 impostorscore=0 clxscore=1015 mlxlogscore=999 classifier=spam authscore=0 authtc=n/a authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.19.0-2504070000 definitions=main-2504240063 From: Dmitry Baryshkov Inline the _setup_dspp_ops() function, it makes it easier to handle different conditions involving DSPP configuration. Signed-off-by: Dmitry Baryshkov --- drivers/gpu/drm/msm/disp/dpu1/dpu_hw_dspp.c | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_dspp.c b/drivers/gpu/drm/= msm/disp/dpu1/dpu_hw_dspp.c index 829ca272873e45b122c04bea7da22dc569732e10..0f5a74398e66642fba48c112db4= 1ffc75ae2a79f 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_dspp.c +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_dspp.c @@ -63,13 +63,6 @@ static void dpu_setup_dspp_pcc(struct dpu_hw_dspp *ctx, DPU_REG_WRITE(&ctx->hw, base, PCC_EN); } =20 -static void _setup_dspp_ops(struct dpu_hw_dspp *c, - unsigned long features) -{ - if (test_bit(DPU_DSPP_PCC, &features)) - c->ops.setup_pcc =3D dpu_setup_dspp_pcc; -} - /** * dpu_hw_dspp_init() - Initializes the DSPP hw driver object. * should be called once before accessing every DSPP. @@ -97,7 +90,8 @@ struct dpu_hw_dspp *dpu_hw_dspp_init(struct drm_device *d= ev, /* Assign ops */ c->idx =3D cfg->id; c->cap =3D cfg; - _setup_dspp_ops(c, c->cap->features); + if (test_bit(DPU_DSPP_PCC, &c->cap->features)) + c->ops.setup_pcc =3D dpu_setup_dspp_pcc; =20 return c; } --=20 2.39.5 From nobody Sun Feb 8 09:32:35 2026 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 7EA011C8639 for ; Thu, 24 Apr 2025 09:30:37 +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=1745487039; cv=none; b=I5zBXLMoorbT5pEvdQ9iYERNQ2PLDqVxLxBjtp/z1eaTDoKSkw2x7fp2Dp46eDXwVq5Em6RxzgapmU3zIUt7QdfzJ2tSKT0e6GaZN2twYusgTn+uCpdU4DFgsg1PfTVVqJp0QuM1s5i9Dxp+Eht4bF0IkaSsjRKXIEPusYbHlE0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745487039; c=relaxed/simple; bh=JxFfxzAgO590taIYVsdC3ww1ICf9N0VyO1B86wmG0ns=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=QhQvw/673/gzxtroz79nN4HXweYcRCc8PGAVqtAO1UgoyHGUkAnBjfchTJXj+yz4FMtKGAec32O9YiRaH2Pf7k3iO/B/MbjqLDcr81gBjwBoUhlgLgicuF0B9zCwtkGTbogRWqZ6rBj4KyEt5GLTvy28YXeS/fF1u2KWR5owxio= 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=ZDz3cGJC; 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="ZDz3cGJC" Received: from pps.filterd (m0279866.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 53O0F7gw010071 for ; Thu, 24 Apr 2025 09:30:36 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= L2W9+B0ZnfjCFViTwk/uQhdvUhFo4znCgY6BQw1Faug=; b=ZDz3cGJC4SU2atd9 vr2Vys2AfbDJ8Wu3xqMDIjMfhfWIpejh/B5deVLJSBemUivPZuSS32jgTz4jzFRA fuHaOfn85E7c1LU8+AX/pU0QDKG4mQ2kgWWDLFjNt13gAokLLb9FBLXf0cG4JHNw C3DulBIV+JGn+FitBe22LRp4mBQMRI9OhScKkwFA7P9RdKA+wE7r7HaYRoLxYCIC MS+tnMfS4IXL3u3Ffpw5xrOUveuBzJWYSlKaU+v6nUWXmq/ojPXeBToLlJHbmVZl M3dTEKwl958C+Fct037tjGxxV47Mzz632jLwrSg2fiZHqkGmyNacfcOKfRNZ2lEj Nloe2g== Received: from mail-qv1-f70.google.com (mail-qv1-f70.google.com [209.85.219.70]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 466jh0d1ej-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Thu, 24 Apr 2025 09:30:36 +0000 (GMT) Received: by mail-qv1-f70.google.com with SMTP id 6a1803df08f44-6e90b13f5c3so18519626d6.0 for ; Thu, 24 Apr 2025 02:30:36 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1745487035; x=1746091835; 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=L2W9+B0ZnfjCFViTwk/uQhdvUhFo4znCgY6BQw1Faug=; b=TYyxiIwmlseWRYvQMVQpeV27sD33Y4Y9mo1KQMJOgn5qQRGRIU+AniOoDE2c34ah9q CqpgHON1uiUP7SwQo6R2X8y8DjrS7b3L37+26yh51fl8jaS3esQzbDk9JhZ6iRZDTcn4 gu4Hvj5siZmZtDv54vEBj/uktomhKgltvtkZCwT3OnmQs8ZsjHbUnMEME8zukY5Vuuif LTojzRo4cC8Ag5YiVmSa/+z07eieVbS9E71f5+cxAb04Sfl2zNpJzCj4a/Q0squCL4vU BQAqR4zQguMRLCsX+gQrusun+cHB2VoKcNLpirPJwUgp3u2wFA4Ub2edp7NPEkDxPbQb 7Z6Q== X-Forwarded-Encrypted: i=1; AJvYcCWa2WR6rRX7ESX2mJ92TWDW6OnXDJ4wbNmgmPGk6h1nhvT2GlF9yeopldvA/mBQjHD4l2z9s9B3NqhjK6w=@vger.kernel.org X-Gm-Message-State: AOJu0YzT9FDKnP7FVYiaEG05Ef0F1Px5ncl6dPCfbh2BTHBK+p+qyHdG iVw979dDqne1v+TQpvcwgXlMsyIrMBpXgAHwW4q3/LJFJ6W49xY3s0+j9iS5CjamlklKj/znpbt gAh/Zt/LKvHoj5d5/UjwsvQRTOPUedOVCqg//8FBQvKdqBXNRZpgLps5aUM1MpUI= X-Gm-Gg: ASbGncsyaZxIUCD2tjgIApGm2Yx0PStI0HPNaFf+Dwu9W4NkqfoPka4rIltq5/WTHl3 UbH5mqjaLbeC6LVaNTlgsDmEuriQlvB9C15lCcrz1RqgSjNk/TbAQxYTnbd/q4KzRQsoFBKFWby MyEgVWy6VXOr6YqQcJrE7SjVivg6Q149+apt7XytVylJbdTZuySm2dzj1PZLtX++7PpbbvhnWc8 Plz23pGTlVWuQfPLqYYZS6goUUpAEMNDG1R1EOse46y1iRnwwKqTRtQv8GHnNCLJNJhwvqahXja f2HLtfzmqsmcdubh+JkKu0/Oh9cN+ZSlGYHt2DiALygr2JUcZJcXpNSHWTrgUGml/qFIlFGW4Xz gE4tyThAlVTyfLkhwrivTxWfY X-Received: by 2002:ad4:5882:0:b0:6f4:c21b:cd9d with SMTP id 6a1803df08f44-6f4c21bd1e7mr13179286d6.29.1745487035134; Thu, 24 Apr 2025 02:30:35 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHxCZuAnggMj3l1bp3VhBBdZn7SikDu72aqo9cVDnc9ZZvE7kzgKSO3dAMP++P4RQGtn7Gcdg== X-Received: by 2002:ad4:5882:0:b0:6f4:c21b:cd9d with SMTP id 6a1803df08f44-6f4c21bd1e7mr13178936d6.29.1745487034802; Thu, 24 Apr 2025 02:30:34 -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 38308e7fff4ca-317d1b9a304sm1820461fa.99.2025.04.24.02.30.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 24 Apr 2025 02:30:34 -0700 (PDT) From: Dmitry Baryshkov Date: Thu, 24 Apr 2025 12:30:10 +0300 Subject: [PATCH v3 06/33] drm/msm/dpu: inline _setup_mixer_ops() 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: <20250424-dpu-drop-features-v3-6-cdaca81d356f@oss.qualcomm.com> References: <20250424-dpu-drop-features-v3-0-cdaca81d356f@oss.qualcomm.com> In-Reply-To: <20250424-dpu-drop-features-v3-0-cdaca81d356f@oss.qualcomm.com> To: Rob Clark , Abhinav Kumar , Sean Paul , Marijn Suijten , David Airlie , Simona Vetter , Vinod Koul , Konrad Dybcio Cc: 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=2099; i=dmitry.baryshkov@oss.qualcomm.com; h=from:subject:message-id; bh=7p9Y0N9fe5J+FNtNErF+g9/bY2UcR9C9Ev4Hmj1Hodk=; b=owEBbQGS/pANAwAKAYs8ij4CKSjVAcsmYgBoCgSqFUrxRR+NGyuOJa9iZPcU0YKALTABfDjex qvwvQQi4leJATMEAAEKAB0WIQRMcISVXLJjVvC4lX+LPIo+Aiko1QUCaAoEqgAKCRCLPIo+Aiko 1f9cB/9gxIKyI+sJgil0eeT2ElX+Lg5NIqskYAtVXvqVFJrBFsxc7bM2fNfy/yAca75ktCpEQGT izFMD4d0TVSymz2DVDCTr8jEmFsNT6kTr4sYeHW64rvRuROHHxVtFhxii8TzzdWMx0eFFTFIYcy Z1cl0mNA9N7Uca5rf08k5HCjBPcRDi0eMV+eFzutkJPuXowU4tFGV6laG7uZKX60fFtqJATjwvZ XvUWYDl/7slG3eyAl8tquvIeK7yxE99hvbOiq+GS4jfB02o3qE16b0EpAajL3RsQwUl8320zhd6 qBL2Emz3OpptOvvBoq8gQ1TAeI4jGBD271WmlGZsFuESOJgQ X-Developer-Key: i=dmitry.baryshkov@oss.qualcomm.com; a=openpgp; fpr=8F88381DD5C873E4AE487DA5199BF1243632046A X-Proofpoint-GUID: fMgxTCalgpOmAb7IfmvJawnc05LNYr0n X-Proofpoint-ORIG-GUID: fMgxTCalgpOmAb7IfmvJawnc05LNYr0n X-Authority-Analysis: v=2.4 cv=Fv0F/3rq c=1 sm=1 tr=0 ts=680a04bc cx=c_pps a=oc9J++0uMp73DTRD5QyR2A==:117 a=xqWC_Br6kY4A:10 a=IkcTkHD0fZMA:10 a=XR8D0OoHHMoA:10 a=KKAkSRfTAAAA:8 a=2ONPo-prfMSwqFkLVuAA:9 a=QEXdDO2ut3YA:10 a=iYH6xdkBrDN1Jqds4HTS:22 a=cvBusfyB2V15izCimMoJ:22 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUwNDI0MDA2MyBTYWx0ZWRfX7WhUwdmjimzU VHSYU3R9zyeOUGOsJ73rUjs6UMv4cAEeIwqQpvtVKBfYviuSVRQTHlKxtjZSuDVLBsJgo1VPjRW JHP2r63rBj855aK/ELMZSYb8thcV/Oouq/eEW1KJZXqVT3xixIGRTHGeTq9NJ7pwbFPKfDiDlYl oWCmlLFlFnjHsP1UvKvOWS6p5rVHXTROPHzm+aqMUFmwyzXasWEF1De1LO39/bYmyYNfr7+BQ1P h8S/Q8H0FiWSowb+lU6a2JVsmAPgd9l85l6bmGLiYC++iLH1H10q7FO2mMvwvHpBx8AxrpJVEYg UmIb7A1PzNBJKOtreRcHEe8MG23xsYcR47X8UrIIY/tW2DtKPVk0FK7SRRHyHeULdwACF8vXaAZ 6ZpY960qUuo0iZwkNNa0YDqcvfifSv0e44QkrexCLjQ5wqkRN0VBmcIMCAfUEF2p8twwhWy3 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1099,Hydra:6.0.680,FMLib:17.12.80.40 definitions=2025-04-24_04,2025-04-22_01,2025-02-21_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 impostorscore=0 mlxscore=0 malwarescore=0 mlxlogscore=999 priorityscore=1501 suspectscore=0 adultscore=0 bulkscore=0 clxscore=1015 spamscore=0 lowpriorityscore=0 phishscore=0 classifier=spam authscore=0 authtc=n/a authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.19.0-2504070000 definitions=main-2504240063 From: Dmitry Baryshkov Inline the _setup_mixer_ops() function, it makes it easier to handle different conditions involving LM configuration. Signed-off-by: Dmitry Baryshkov --- drivers/gpu/drm/msm/disp/dpu1/dpu_hw_lm.c | 24 +++++++++--------------- 1 file changed, 9 insertions(+), 15 deletions(-) diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_lm.c b/drivers/gpu/drm/ms= m/disp/dpu1/dpu_hw_lm.c index 81b56f066519a68c9e72f0b42df12652139ab83a..4f57cfca89bd3962e7e51295280= 9db0300cb9baf 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_lm.c +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_lm.c @@ -144,20 +144,6 @@ static void dpu_hw_lm_setup_color3(struct dpu_hw_mixer= *ctx, DPU_REG_WRITE(c, LM_OP_MODE, op_mode); } =20 -static void _setup_mixer_ops(struct dpu_hw_lm_ops *ops, - unsigned long features) -{ - ops->setup_mixer_out =3D dpu_hw_lm_setup_out; - if (test_bit(DPU_MIXER_COMBINED_ALPHA, &features)) - ops->setup_blend_config =3D dpu_hw_lm_setup_blend_config_combined_alpha; - else - ops->setup_blend_config =3D dpu_hw_lm_setup_blend_config; - ops->setup_alpha_out =3D dpu_hw_lm_setup_color3; - ops->setup_border_color =3D dpu_hw_lm_setup_border_color; - ops->setup_misr =3D dpu_hw_lm_setup_misr; - ops->collect_misr =3D dpu_hw_lm_collect_misr; -} - /** * dpu_hw_lm_init() - Initializes the mixer hw driver object. * should be called once before accessing every mixer. @@ -186,7 +172,15 @@ struct dpu_hw_mixer *dpu_hw_lm_init(struct drm_device = *dev, /* Assign ops */ c->idx =3D cfg->id; c->cap =3D cfg; - _setup_mixer_ops(&c->ops, c->cap->features); + c->ops.setup_mixer_out =3D dpu_hw_lm_setup_out; + if (test_bit(DPU_MIXER_COMBINED_ALPHA, &c->cap->features)) + c->ops.setup_blend_config =3D dpu_hw_lm_setup_blend_config_combined_alph= a; + else + c->ops.setup_blend_config =3D dpu_hw_lm_setup_blend_config; + c->ops.setup_alpha_out =3D dpu_hw_lm_setup_color3; + c->ops.setup_border_color =3D dpu_hw_lm_setup_border_color; + c->ops.setup_misr =3D dpu_hw_lm_setup_misr; + c->ops.collect_misr =3D dpu_hw_lm_collect_misr; =20 return c; } --=20 2.39.5 From nobody Sun Feb 8 09:32:35 2026 Received: from mx0b-0031df01.pphosted.com (mx0b-0031df01.pphosted.com [205.220.180.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 A1019221540 for ; Thu, 24 Apr 2025 09:30:41 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=205.220.180.131 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745487044; cv=none; b=Um0DkzQ9Ndp6yUE28jwdV3fB8ZfGCR+bxRgj7LB0vNDLqwrfsLivipRX9Qra6OBZVALxmqDrSoDNk11H3Qk/+YrHKuW8ISP1qbWKTuxpo/0fH6yrse29FrJMVlrWf3mXIJ+fSO1TOiT484rBSu5g87/o+7fXdGcnKDxWpiDfCjw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745487044; c=relaxed/simple; bh=YMYON1soBbl0GednnpvOpjyNcG4Pj3hn65AoPj8KqUg=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=kZbLuTudUsCR9v6my6yvtsYcJNwgtQiM2SkKdts23Pb3ORGJM9rEl6N31EdipRxGLxNnNTKYufMdVLnbpVbxnLgGM+aKxbkgsxYXwWSLJro65r2xWMazVshTyz+4R9P3r/91CyfGm5KGqliN0eqAD66JUAvmt6wpTpA1uxnvcyc= 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=kTUkvm9B; arc=none smtp.client-ip=205.220.180.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="kTUkvm9B" Received: from pps.filterd (m0279870.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 53O0F9sA031020 for ; Thu, 24 Apr 2025 09:30:40 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= 5JEcUzXyDf8lbbSGvWUUCuzyTen5/B29hB2EPGhL8i0=; b=kTUkvm9BepJ5qGoA caMLJTx3GoNkx1N60aPKfOa95t9nGNMlgYt3/TZe38t6vB76go69ZK3prUHbJhAq uf8s4bvOcZsXVAFnWr3mxTPaRYT8SXcwICHgUwDDK2yyWU2lutGofhB7sAwSDP4T yjg971LDekvkgHVM5URyIVCjPVD0OacIbwEzfyJe4O3/i4r/mZaS26M5Gd9ulX9U hE3GNKR9B+neh+kcyE1CKSLafY1YB1hZkps//8+MZH8MnmJ2R/TaV9qWjA0gtce5 f3ykriP1GdeNs6i566+aSth1rvbOtSgPg9/QZ7bYHy9fmAV+K/iQBt0IhATPotN7 70FEMQ== Received: from mail-qv1-f70.google.com (mail-qv1-f70.google.com [209.85.219.70]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 466jh5cywq-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Thu, 24 Apr 2025 09:30:39 +0000 (GMT) Received: by mail-qv1-f70.google.com with SMTP id 6a1803df08f44-6e8f6443ed5so33905346d6.1 for ; Thu, 24 Apr 2025 02:30:39 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1745487037; x=1746091837; 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=5JEcUzXyDf8lbbSGvWUUCuzyTen5/B29hB2EPGhL8i0=; b=gA5DbycN2mbZbwp9H+x/k90L0GiitREmcQfsMMqbgrgy0LwiCQeU/Aj0KwqD+QwBoB t1pTZLTPVEMzDCQargFycRLwbyOmfzzQto0/JX3ln0M+So08L4lZJE7GFy1KZTyTdPZm Aj06r8R7fglDbzUYIYRG//t04pPpgk3t7ITdCxk44yHpNdXylvjsinZtpKxo8XxoZOg4 cuP8dsfyeH8SgDke90WbSVkbWM0R2ho89YW9oSlfoPSR2Sie/akLS2+ktEGgmpXfdRIg 3cSA877sZ3bvACSu5JGHvxF1E4bcUGp+Xv/u57kbn8+EHt8MxD9D/gwhEY08oMCYXT7Y VGtA== X-Forwarded-Encrypted: i=1; AJvYcCWVd4ovGoa+mWqlJgry7P6HEU2lRv6HGOzdytiGegiWGaoOhlDx0xjwgYa8EGiQ7iOuLaD9sDMc/qzTdZg=@vger.kernel.org X-Gm-Message-State: AOJu0Yy0ZmzhpSjinIovc02IsMtX61WUgAurO/hxsOmUtkCMxSQMJf9o 5oa5Mzu8zvbHEjDXIAg84FofTG+iPGWEW4oKkyQw1n7Kgjnw8dFNcKBAsnmv1vabS/TTl/bZUz2 8RNmtbX4Ew1aq9xm1yRiN8Ou+smS///XZJq9GpsglKI/GaYb5Uw0ae9s4lJ9R3U5gGxua5Sk= X-Gm-Gg: ASbGnct78aclkgYDfcCuqr/KA9lg+QCwqWmhV6V2T5QfXzaPI8vYV2lkML4JKP9e8wv kMjumnS5GnNApJcYP+o6CSUAEA4CQ7Fg5CcTkf7ugZAJT57JYQgw1pb86HAadZYfXBiM8ZOs62Z ROVdkETvLA0nizPZU/uijCa2bQX+PRJApzxZgEHTM6vswKpSv5B/P+z/VQXoxfmoSUOY/g56YRn cxpZM6/Gc/NkrmKhQkDUZkX9YnZbAgT+7RHRdLNVl66tZ/o55Cvpq+xwFm2e+r+wZoIJ8pTAezb L3zcuqDaHuZxRAAf5rP9Lu6UlS9tsEgs1BGLf6qlRpRxp9Vg/AaRt4AYOTYRvl6VI1MLNbxy4iC 1QsXccAaJmB6EECEBWS5kAnyb X-Received: by 2002:a05:6214:2588:b0:6e8:9053:825e with SMTP id 6a1803df08f44-6f4c11e6619mr20611286d6.17.1745487036739; Thu, 24 Apr 2025 02:30:36 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHXVkkbRrNtWfIg5BoG1lXuKkLGCu6SBQVoLObHu+C/+NsZs76OIWmOk8YJOMHC4LIKoDQ0mA== X-Received: by 2002:a05:6214:2588:b0:6e8:9053:825e with SMTP id 6a1803df08f44-6f4c11e6619mr20610966d6.17.1745487036270; Thu, 24 Apr 2025 02:30:36 -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 38308e7fff4ca-317d1b9a304sm1820461fa.99.2025.04.24.02.30.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 24 Apr 2025 02:30:35 -0700 (PDT) From: Dmitry Baryshkov Date: Thu, 24 Apr 2025 12:30:11 +0300 Subject: [PATCH v3 07/33] drm/msm/dpu: remove DSPP_SC7180_MASK 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: <20250424-dpu-drop-features-v3-7-cdaca81d356f@oss.qualcomm.com> References: <20250424-dpu-drop-features-v3-0-cdaca81d356f@oss.qualcomm.com> In-Reply-To: <20250424-dpu-drop-features-v3-0-cdaca81d356f@oss.qualcomm.com> To: Rob Clark , Abhinav Kumar , Sean Paul , Marijn Suijten , David Airlie , Simona Vetter , Vinod Koul , Konrad Dybcio Cc: 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=25067; i=dmitry.baryshkov@oss.qualcomm.com; h=from:subject:message-id; bh=N2ibSK9AaVQQSoYkm2800cwsnJJzF8hIkM91nNwFHLE=; b=owEBbQGS/pANAwAKAYs8ij4CKSjVAcsmYgBoCgSriVirVcsbGKwTCz0ei+oLdC9c3Wzdsol0T aoaNe+0HSqJATMEAAEKAB0WIQRMcISVXLJjVvC4lX+LPIo+Aiko1QUCaAoEqwAKCRCLPIo+Aiko 1dYAB/9kKvzbL5D+AfS5A063M8uok7WKyN68LXKX8vQWP0dAPIIUsFLUF3GVStCJxXD3BeWGAfH DWHsLHWfPPGXIBtx1rmOn/SL3ti9nlu0XMfaQ1N1izB9xml8+0IjZhP3OqrxxyLGoIyqCId/usZ iL8nudkMPvBMS5EoguYajF13w1vVSptILeB93jnASOEaf6pSfXuTBnsDozdSPbv5O/T1M6K1szv fGObIHBOfTBeJ6+UOmifox4HfWV0ETnHnuNogrZo79jpN+xNS1MOLHTRWrM8NJnsFD4oNYg8e4D X6IFHobFVsWFeRIIWj60IM20C/aTsrEp39G+n0abQKnz2F1s X-Developer-Key: i=dmitry.baryshkov@oss.qualcomm.com; a=openpgp; fpr=8F88381DD5C873E4AE487DA5199BF1243632046A X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUwNDI0MDA2MyBTYWx0ZWRfX7GxeqW9e6P5/ +JhwDmzo560Vp+wsGtpCSMhoakGMhZjk8eZqIjtBXI2FVYa0gac4WuPiRuWOMawcpbCMP9dbJuh +UOC7rezKZNeTH1Ayb3U6uoEugGFL4RsRHsSC9aANqoU2GY4wADSGgYSqJ1phnvudpKgEwMa4/2 imH3fTwYdRTiaWBngwsmpA90yWvrTH8xjuUKPoaBLJZ8Rhgf3oHsUzPBcH8aLZgvKscTbOgZjLi cyhBKnvg8NyN5oDlUhPKTRW8FgBMQhLycqw/L6Rv4+Vb/w14Nx5Aahg9RW6E7jqPcXnSekTkTDg AAWVdlgQtcNtDSHihWFpoM6BEAfq3bN/NQHAEFMc68NFLPnaMSp9JUjGZ/pQfqvKGQZDQsOGhnt qVFUyEw7T4CFGU3vx999z84/h2y+dKcitTkuVJ4PYivEIxZRmkL87X4/krFgRqVBA6agVIbg X-Proofpoint-GUID: s7DYlZGnERDWpsBAX-JKdxBUEZMNGx35 X-Authority-Analysis: v=2.4 cv=B/S50PtM c=1 sm=1 tr=0 ts=680a04bf cx=c_pps a=oc9J++0uMp73DTRD5QyR2A==:117 a=xqWC_Br6kY4A:10 a=IkcTkHD0fZMA:10 a=XR8D0OoHHMoA:10 a=KKAkSRfTAAAA:8 a=U5TJg58F3aoNapyFlmsA:9 a=QEXdDO2ut3YA:10 a=iYH6xdkBrDN1Jqds4HTS:22 a=cvBusfyB2V15izCimMoJ:22 X-Proofpoint-ORIG-GUID: s7DYlZGnERDWpsBAX-JKdxBUEZMNGx35 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1099,Hydra:6.0.680,FMLib:17.12.80.40 definitions=2025-04-24_04,2025-04-22_01,2025-02-21_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 adultscore=0 mlxlogscore=999 lowpriorityscore=0 bulkscore=0 impostorscore=0 suspectscore=0 mlxscore=0 priorityscore=1501 phishscore=0 malwarescore=0 spamscore=0 clxscore=1015 classifier=spam authscore=0 authtc=n/a authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.19.0-2504070000 definitions=main-2504240063 From: Dmitry Baryshkov Stop declaring DPU_DSPP_PCC as a part of the DSPP features, use the presence of the PCC sblk to check whether PCC is present in the hardware or not. Signed-off-by: Dmitry Baryshkov --- drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_10_0_sm8650.h | 4 ---- drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_1_14_msm8937.h | 1 - drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_1_15_msm8917.h | 1 - drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_1_16_msm8953.h | 1 - drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_1_7_msm8996.h | 2 -- drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_3_0_msm8998.h | 2 -- drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_3_2_sdm660.h | 2 -- drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_3_3_sdm630.h | 1 - drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_4_0_sdm845.h | 4 ---- drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_4_1_sdm670.h | 2 -- drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_5_0_sm8150.h | 4 ---- drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_5_1_sc8180x.h | 4 ---- drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_5_2_sm7150.h | 2 -- drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_5_3_sm6150.h | 1 - drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_5_4_sm6125.h | 1 - drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_6_0_sm8250.h | 4 ---- drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_6_2_sc7180.h | 1 - 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 | 1 - 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 | 4 ---- drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_7_2_sc7280.h | 1 - drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_8_0_sc8280xp.h | 4 ---- drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_8_1_sm8450.h | 4 ---- drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_8_4_sa8775p.h | 4 ---- drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_9_0_sm8550.h | 4 ---- drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_9_2_x1e80100.h | 4 ---- drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.c | 2 -- drivers/gpu/drm/msm/disp/dpu1/dpu_hw_dspp.c | 2 +- 30 files changed, 1 insertion(+), 69 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 a8b5c5b5a2e8d9d67ee185f00d92feeec42e490f..f7acceba7af1e8ec4b9c0cb52cb= ec60842c73704 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 @@ -190,22 +190,18 @@ static const struct dpu_dspp_cfg sm8650_dspp[] =3D { { .name =3D "dspp_0", .id =3D DSPP_0, .base =3D 0x54000, .len =3D 0x1800, - .features =3D DSPP_SC7180_MASK, .sblk =3D &sdm845_dspp_sblk, }, { .name =3D "dspp_1", .id =3D DSPP_1, .base =3D 0x56000, .len =3D 0x1800, - .features =3D DSPP_SC7180_MASK, .sblk =3D &sdm845_dspp_sblk, }, { .name =3D "dspp_2", .id =3D DSPP_2, .base =3D 0x58000, .len =3D 0x1800, - .features =3D DSPP_SC7180_MASK, .sblk =3D &sdm845_dspp_sblk, }, { .name =3D "dspp_3", .id =3D DSPP_3, .base =3D 0x5a000, .len =3D 0x1800, - .features =3D DSPP_SC7180_MASK, .sblk =3D &sdm845_dspp_sblk, }, }; diff --git a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_1_14_msm8937.h b/dri= vers/gpu/drm/msm/disp/dpu1/catalog/dpu_1_14_msm8937.h index ad60089f18ea6c22160533874ea0cc54c352e064..78ade3e977108fe98dc63ed9353= 5ae3d947d871b 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 @@ -118,7 +118,6 @@ static const struct dpu_dspp_cfg msm8937_dspp[] =3D { { .name =3D "dspp_0", .id =3D DSPP_0, .base =3D 0x54000, .len =3D 0x1800, - .features =3D DSPP_SC7180_MASK, .sblk =3D &msm8998_dspp_sblk, }, }; diff --git a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_1_15_msm8917.h b/dri= vers/gpu/drm/msm/disp/dpu1/catalog/dpu_1_15_msm8917.h index a1cf89a0a42d5f3c909798c30901fe8796b15075..63dd5afdb60b051f6d531257b28= 44920cc09ed80 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 @@ -104,7 +104,6 @@ static const struct dpu_dspp_cfg msm8917_dspp[] =3D { { .name =3D "dspp_0", .id =3D DSPP_0, .base =3D 0x54000, .len =3D 0x1800, - .features =3D DSPP_SC7180_MASK, .sblk =3D &msm8998_dspp_sblk, }, }; diff --git a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_1_16_msm8953.h b/dri= vers/gpu/drm/msm/disp/dpu1/catalog/dpu_1_16_msm8953.h index eea9b80e2287a86448ab4e1a5914c1914d5a2090..4f09d483fbde29c74e3fd9bd0ba= 7a1a9c2638183 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 @@ -118,7 +118,6 @@ static const struct dpu_dspp_cfg msm8953_dspp[] =3D { { .name =3D "dspp_0", .id =3D DSPP_0, .base =3D 0x54000, .len =3D 0x1800, - .features =3D DSPP_SC7180_MASK, .sblk =3D &msm8998_dspp_sblk, }, }; diff --git a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_1_7_msm8996.h b/driv= ers/gpu/drm/msm/disp/dpu1/catalog/dpu_1_7_msm8996.h index ae18a354e5d2a3d2e073f2099e4d970bff5ed085..54477e300c273182172a78b81dd= 0274242689895 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 @@ -223,12 +223,10 @@ static const struct dpu_dspp_cfg msm8996_dspp[] =3D { { .name =3D "dspp_0", .id =3D DSPP_0, .base =3D 0x54000, .len =3D 0x1800, - .features =3D DSPP_SC7180_MASK, .sblk =3D &msm8998_dspp_sblk, }, { .name =3D "dspp_1", .id =3D DSPP_1, .base =3D 0x56000, .len =3D 0x1800, - .features =3D DSPP_SC7180_MASK, .sblk =3D &msm8998_dspp_sblk, }, }; diff --git a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_3_0_msm8998.h b/driv= ers/gpu/drm/msm/disp/dpu1/catalog/dpu_3_0_msm8998.h index 746474679ef5b9ce7ef351e2d5434706d6109d33..9dc84c8dfb64c5f6642fe47ff9a= a9ab16922687f 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 @@ -212,12 +212,10 @@ static const struct dpu_dspp_cfg msm8998_dspp[] =3D { { .name =3D "dspp_0", .id =3D DSPP_0, .base =3D 0x54000, .len =3D 0x1800, - .features =3D DSPP_SC7180_MASK, .sblk =3D &msm8998_dspp_sblk, }, { .name =3D "dspp_1", .id =3D DSPP_1, .base =3D 0x56000, .len =3D 0x1800, - .features =3D DSPP_SC7180_MASK, .sblk =3D &msm8998_dspp_sblk, }, }; diff --git a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_3_2_sdm660.h b/drive= rs/gpu/drm/msm/disp/dpu1/catalog/dpu_3_2_sdm660.h index bb89da0a481dec053e06369dee8b0854a3427aaf..5ec81e3eb6c0902113b4ef1bf85= 0b946d0ce4b1b 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 @@ -183,12 +183,10 @@ static const struct dpu_dspp_cfg sdm660_dspp[] =3D { { .name =3D "dspp_0", .id =3D DSPP_0, .base =3D 0x54000, .len =3D 0x1800, - .features =3D DSPP_SC7180_MASK, .sblk =3D &msm8998_dspp_sblk, }, { .name =3D "dspp_1", .id =3D DSPP_1, .base =3D 0x56000, .len =3D 0x1800, - .features =3D DSPP_SC7180_MASK, .sblk =3D &msm8998_dspp_sblk, }, }; diff --git a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_3_3_sdm630.h b/drive= rs/gpu/drm/msm/disp/dpu1/catalog/dpu_3_3_sdm630.h index 7caf876ca3e30cc9230cbc6f19b9d3d1b954e2e0..2a80a881a233f48aa7f0b8a9345= 386eb85e3157d 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 @@ -133,7 +133,6 @@ static const struct dpu_dspp_cfg sdm630_dspp[] =3D { { .name =3D "dspp_0", .id =3D DSPP_0, .base =3D 0x54000, .len =3D 0x1800, - .features =3D DSPP_SC7180_MASK, .sblk =3D &msm8998_dspp_sblk, }, }; 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 ab7b4822ca630f8258bc9eb52c0b967e9bc34d18..968076c5f2211552bec1bd75040= 9e4be57dddeff 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 @@ -170,22 +170,18 @@ static const struct dpu_dspp_cfg sdm845_dspp[] =3D { { .name =3D "dspp_0", .id =3D DSPP_0, .base =3D 0x54000, .len =3D 0x1800, - .features =3D DSPP_SC7180_MASK, .sblk =3D &sdm845_dspp_sblk, }, { .name =3D "dspp_1", .id =3D DSPP_1, .base =3D 0x56000, .len =3D 0x1800, - .features =3D DSPP_SC7180_MASK, .sblk =3D &sdm845_dspp_sblk, }, { .name =3D "dspp_2", .id =3D DSPP_2, .base =3D 0x58000, .len =3D 0x1800, - .features =3D DSPP_SC7180_MASK, .sblk =3D &sdm845_dspp_sblk, }, { .name =3D "dspp_3", .id =3D DSPP_3, .base =3D 0x5a000, .len =3D 0x1800, - .features =3D DSPP_SC7180_MASK, .sblk =3D &sdm845_dspp_sblk, }, }; 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 c2fde980fb521d9259a9f1e3bf88cc81f46fdfe8..3a60432a758a942eb1541f14301= 8bd466b2bdf20 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 @@ -103,12 +103,10 @@ static const struct dpu_dspp_cfg sdm670_dspp[] =3D { { .name =3D "dspp_0", .id =3D DSPP_0, .base =3D 0x54000, .len =3D 0x1800, - .features =3D DSPP_SC7180_MASK, .sblk =3D &sdm845_dspp_sblk, }, { .name =3D "dspp_1", .id =3D DSPP_1, .base =3D 0x56000, .len =3D 0x1800, - .features =3D DSPP_SC7180_MASK, .sblk =3D &sdm845_dspp_sblk, }, }; 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 979527d98fbcb19c33ccb45b5ba4716031949985..7731bd79c135f1f28cc3e5a53bf= 05097cc9f70e9 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 @@ -194,22 +194,18 @@ static const struct dpu_dspp_cfg sm8150_dspp[] =3D { { .name =3D "dspp_0", .id =3D DSPP_0, .base =3D 0x54000, .len =3D 0x1800, - .features =3D DSPP_SC7180_MASK, .sblk =3D &sdm845_dspp_sblk, }, { .name =3D "dspp_1", .id =3D DSPP_1, .base =3D 0x56000, .len =3D 0x1800, - .features =3D DSPP_SC7180_MASK, .sblk =3D &sdm845_dspp_sblk, }, { .name =3D "dspp_2", .id =3D DSPP_2, .base =3D 0x58000, .len =3D 0x1800, - .features =3D DSPP_SC7180_MASK, .sblk =3D &sdm845_dspp_sblk, }, { .name =3D "dspp_3", .id =3D DSPP_3, .base =3D 0x5a000, .len =3D 0x1800, - .features =3D DSPP_SC7180_MASK, .sblk =3D &sdm845_dspp_sblk, }, }; 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 d76b8992a6c18c21a54eb2a373c789720b876c8b..899a5502229f1321403a27c4431= c10bdbfeeeda8 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 @@ -193,22 +193,18 @@ static const struct dpu_dspp_cfg sc8180x_dspp[] =3D { { .name =3D "dspp_0", .id =3D DSPP_0, .base =3D 0x54000, .len =3D 0x1800, - .features =3D DSPP_SC7180_MASK, .sblk =3D &sdm845_dspp_sblk, }, { .name =3D "dspp_1", .id =3D DSPP_1, .base =3D 0x56000, .len =3D 0x1800, - .features =3D DSPP_SC7180_MASK, .sblk =3D &sdm845_dspp_sblk, }, { .name =3D "dspp_2", .id =3D DSPP_2, .base =3D 0x58000, .len =3D 0x1800, - .features =3D DSPP_SC7180_MASK, .sblk =3D &sdm845_dspp_sblk, }, { .name =3D "dspp_3", .id =3D DSPP_3, .base =3D 0x5a000, .len =3D 0x1800, - .features =3D DSPP_SC7180_MASK, .sblk =3D &sdm845_dspp_sblk, }, }; 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 83db11339b29dc6e11010bfc73f112f93cf6f7c6..830f416c0b5183cb764b2d6381b= dc4a74df0ab0c 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 @@ -150,12 +150,10 @@ static const struct dpu_dspp_cfg sm7150_dspp[] =3D { { .name =3D "dspp_0", .id =3D DSPP_0, .base =3D 0x54000, .len =3D 0x1800, - .features =3D DSPP_SC7180_MASK, .sblk =3D &sdm845_dspp_sblk, }, { .name =3D "dspp_1", .id =3D DSPP_1, .base =3D 0x56000, .len =3D 0x1800, - .features =3D DSPP_SC7180_MASK, .sblk =3D &sdm845_dspp_sblk, }, }; 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 da11830d44072666e47b0505e2edc3ae7717eb23..dc6d8fd05c2e3afbe5182b1ae8d= d9fea8b6543e5 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 @@ -136,7 +136,6 @@ static const struct dpu_dspp_cfg sm6150_dspp[] =3D { { .name =3D "dspp_0", .id =3D DSPP_0, .base =3D 0x54000, .len =3D 0x1800, - .features =3D DSPP_SC7180_MASK, .sblk =3D &sdm845_dspp_sblk, }, }; 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 d3d3a34d0b45de08a33436f46a197cc836cf2629..14ecf429e7695c167e85f500b11= 3952ebdbc3aa6 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 @@ -117,7 +117,6 @@ static const struct dpu_dspp_cfg sm6125_dspp[] =3D { { .name =3D "dspp_0", .id =3D DSPP_0, .base =3D 0x54000, .len =3D 0x1800, - .features =3D DSPP_SC7180_MASK, .sblk =3D &sdm845_dspp_sblk, }, }; 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 47e01c3c242f9a2ecb201b04be5effd7ff0d04b1..8dab7f63928bb708c79080b1393= 95c3410fd45bf 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 @@ -192,22 +192,18 @@ static const struct dpu_dspp_cfg sm8250_dspp[] =3D { { .name =3D "dspp_0", .id =3D DSPP_0, .base =3D 0x54000, .len =3D 0x1800, - .features =3D DSPP_SC7180_MASK, .sblk =3D &sdm845_dspp_sblk, }, { .name =3D "dspp_1", .id =3D DSPP_1, .base =3D 0x56000, .len =3D 0x1800, - .features =3D DSPP_SC7180_MASK, .sblk =3D &sdm845_dspp_sblk, }, { .name =3D "dspp_2", .id =3D DSPP_2, .base =3D 0x58000, .len =3D 0x1800, - .features =3D DSPP_SC7180_MASK, .sblk =3D &sdm845_dspp_sblk, }, { .name =3D "dspp_3", .id =3D DSPP_3, .base =3D 0x5a000, .len =3D 0x1800, - .features =3D DSPP_SC7180_MASK, .sblk =3D &sdm845_dspp_sblk, }, }; 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 040c94c0bb66ef5aaab2808f6f5ee04dd53e2540..f648d19123fa95a1c20074abd4d= d0bda5147ed29 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 @@ -106,7 +106,6 @@ static const struct dpu_dspp_cfg sc7180_dspp[] =3D { { .name =3D "dspp_0", .id =3D DSPP_0, .base =3D 0x54000, .len =3D 0x1800, - .features =3D DSPP_SC7180_MASK, .sblk =3D &sdm845_dspp_sblk, }, }; 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 43f64a005f5a89e09ee9506a12cfff781530cb80..f8164950a0f7721643eabf5cb2b= b7a5e3bcdfbfa 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 @@ -69,7 +69,6 @@ static const struct dpu_dspp_cfg sm6115_dspp[] =3D { { .name =3D "dspp_0", .id =3D DSPP_0, .base =3D 0x54000, .len =3D 0x1800, - .features =3D DSPP_SC7180_MASK, .sblk =3D &sdm845_dspp_sblk, }, }; 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 397278ba999b24722b116e73b008b2d0aec5fcb5..ddf05cb3954e12e6689cb579f20= b20e1d220156c 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 @@ -115,7 +115,6 @@ static const struct dpu_dspp_cfg sm6350_dspp[] =3D { { .name =3D "dspp_0", .id =3D DSPP_0, .base =3D 0x54000, .len =3D 0x1800, - .features =3D DSPP_SC7180_MASK, .sblk =3D &sdm845_dspp_sblk, }, }; 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 3cbb2fe8aba24c7b9db6bb61ff4c48f34db48bf4..6d424a4fd60bd94ddc0374466d8= 6770138b2831f 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 @@ -69,7 +69,6 @@ static const struct dpu_dspp_cfg qcm2290_dspp[] =3D { { .name =3D "dspp_0", .id =3D DSPP_0, .base =3D 0x54000, .len =3D 0x1800, - .features =3D DSPP_SC7180_MASK, .sblk =3D &sdm845_dspp_sblk, }, }; 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 a06c8634d2d7779f7e867fb821f8d332652ba7e9..aaf4b270f20dcc5fb91fbcb783c= 6d3bc673894f5 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 @@ -71,7 +71,6 @@ static const struct dpu_dspp_cfg sm6375_dspp[] =3D { { .name =3D "dspp_0", .id =3D DSPP_0, .base =3D 0x54000, .len =3D 0x1800, - .features =3D DSPP_SC7180_MASK, .sblk =3D &sdm845_dspp_sblk, }, }; 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 93427f7cac3a370fdac3f119134bf9fee8b87a17..6fc6083607403be8ad2287952c9= 9c7bd4d30f2e4 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 @@ -192,22 +192,18 @@ static const struct dpu_dspp_cfg sm8350_dspp[] =3D { { .name =3D "dspp_0", .id =3D DSPP_0, .base =3D 0x54000, .len =3D 0x1800, - .features =3D DSPP_SC7180_MASK, .sblk =3D &sdm845_dspp_sblk, }, { .name =3D "dspp_1", .id =3D DSPP_1, .base =3D 0x56000, .len =3D 0x1800, - .features =3D DSPP_SC7180_MASK, .sblk =3D &sdm845_dspp_sblk, }, { .name =3D "dspp_2", .id =3D DSPP_2, .base =3D 0x58000, .len =3D 0x1800, - .features =3D DSPP_SC7180_MASK, .sblk =3D &sdm845_dspp_sblk, }, { .name =3D "dspp_3", .id =3D DSPP_3, .base =3D 0x5a000, .len =3D 0x1800, - .features =3D DSPP_SC7180_MASK, .sblk =3D &sdm845_dspp_sblk, }, }; 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 1edec0644b078ac1fff129354d4d02eec015a331..281826170da082fc90a05c64106= 0901ece0fbed3 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 @@ -117,7 +117,6 @@ static const struct dpu_dspp_cfg sc7280_dspp[] =3D { { .name =3D "dspp_0", .id =3D DSPP_0, .base =3D 0x54000, .len =3D 0x1800, - .features =3D DSPP_SC7180_MASK, .sblk =3D &sdm845_dspp_sblk, }, }; 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 7d698fc354666a2dc468a71ff08cb8df0c37234c..957e92d63f07723c8834bbb6e9c= 5a4d6449999a4 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 @@ -192,22 +192,18 @@ static const struct dpu_dspp_cfg sc8280xp_dspp[] =3D { { .name =3D "dspp_0", .id =3D DSPP_0, .base =3D 0x54000, .len =3D 0x1800, - .features =3D DSPP_SC7180_MASK, .sblk =3D &sdm845_dspp_sblk, }, { .name =3D "dspp_1", .id =3D DSPP_1, .base =3D 0x56000, .len =3D 0x1800, - .features =3D DSPP_SC7180_MASK, .sblk =3D &sdm845_dspp_sblk, }, { .name =3D "dspp_2", .id =3D DSPP_2, .base =3D 0x58000, .len =3D 0x1800, - .features =3D DSPP_SC7180_MASK, .sblk =3D &sdm845_dspp_sblk, }, { .name =3D "dspp_3", .id =3D DSPP_3, .base =3D 0x5a000, .len =3D 0x1800, - .features =3D DSPP_SC7180_MASK, .sblk =3D &sdm845_dspp_sblk, }, }; 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 ce050c898b9f21e69e5ff967c2af7c2df1e08232..ec0cf30306d2adbd5f07a2b6a6a= 443d29e11f712 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 @@ -193,22 +193,18 @@ static const struct dpu_dspp_cfg sm8450_dspp[] =3D { { .name =3D "dspp_0", .id =3D DSPP_0, .base =3D 0x54000, .len =3D 0x1800, - .features =3D DSPP_SC7180_MASK, .sblk =3D &sdm845_dspp_sblk, }, { .name =3D "dspp_1", .id =3D DSPP_1, .base =3D 0x56000, .len =3D 0x1800, - .features =3D DSPP_SC7180_MASK, .sblk =3D &sdm845_dspp_sblk, }, { .name =3D "dspp_2", .id =3D DSPP_2, .base =3D 0x58000, .len =3D 0x1800, - .features =3D DSPP_SC7180_MASK, .sblk =3D &sdm845_dspp_sblk, }, { .name =3D "dspp_3", .id =3D DSPP_3, .base =3D 0x5a000, .len =3D 0x1800, - .features =3D DSPP_SC7180_MASK, .sblk =3D &sdm845_dspp_sblk, }, }; 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 4291b4f9ce324eb517022eabe3ab6078b1c3a2fb..4bded17f2e371a48a5b21808b9f= 0c55c00efbecf 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 @@ -192,22 +192,18 @@ static const struct dpu_dspp_cfg sa8775p_dspp[] =3D { { .name =3D "dspp_0", .id =3D DSPP_0, .base =3D 0x54000, .len =3D 0x1800, - .features =3D DSPP_SC7180_MASK, .sblk =3D &sdm845_dspp_sblk, }, { .name =3D "dspp_1", .id =3D DSPP_1, .base =3D 0x56000, .len =3D 0x1800, - .features =3D DSPP_SC7180_MASK, .sblk =3D &sdm845_dspp_sblk, }, { .name =3D "dspp_2", .id =3D DSPP_2, .base =3D 0x58000, .len =3D 0x1800, - .features =3D DSPP_SC7180_MASK, .sblk =3D &sdm845_dspp_sblk, }, { .name =3D "dspp_3", .id =3D DSPP_3, .base =3D 0x5a000, .len =3D 0x1800, - .features =3D DSPP_SC7180_MASK, .sblk =3D &sdm845_dspp_sblk, }, }; 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 a6ab5c49654010194bfc1d4991ffec411ef6e6fd..3907d143056e2513a6a6bdd8aa2= b56f63ac406cb 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 @@ -190,22 +190,18 @@ static const struct dpu_dspp_cfg sm8550_dspp[] =3D { { .name =3D "dspp_0", .id =3D DSPP_0, .base =3D 0x54000, .len =3D 0x1800, - .features =3D DSPP_SC7180_MASK, .sblk =3D &sdm845_dspp_sblk, }, { .name =3D "dspp_1", .id =3D DSPP_1, .base =3D 0x56000, .len =3D 0x1800, - .features =3D DSPP_SC7180_MASK, .sblk =3D &sdm845_dspp_sblk, }, { .name =3D "dspp_2", .id =3D DSPP_2, .base =3D 0x58000, .len =3D 0x1800, - .features =3D DSPP_SC7180_MASK, .sblk =3D &sdm845_dspp_sblk, }, { .name =3D "dspp_3", .id =3D DSPP_3, .base =3D 0x5a000, .len =3D 0x1800, - .features =3D DSPP_SC7180_MASK, .sblk =3D &sdm845_dspp_sblk, }, }; 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 ad486b03c54d9beb6d77df4d6b5f142fd1dd8d8d..8cbec3741338aba07a780194ae5= 0c162d2087d83 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 @@ -189,22 +189,18 @@ static const struct dpu_dspp_cfg x1e80100_dspp[] =3D { { .name =3D "dspp_0", .id =3D DSPP_0, .base =3D 0x54000, .len =3D 0x1800, - .features =3D DSPP_SC7180_MASK, .sblk =3D &sdm845_dspp_sblk, }, { .name =3D "dspp_1", .id =3D DSPP_1, .base =3D 0x56000, .len =3D 0x1800, - .features =3D DSPP_SC7180_MASK, .sblk =3D &sdm845_dspp_sblk, }, { .name =3D "dspp_2", .id =3D DSPP_2, .base =3D 0x58000, .len =3D 0x1800, - .features =3D DSPP_SC7180_MASK, .sblk =3D &sdm845_dspp_sblk, }, { .name =3D "dspp_3", .id =3D DSPP_3, .base =3D 0x5a000, .len =3D 0x1800, - .features =3D DSPP_SC7180_MASK, .sblk =3D &sdm845_dspp_sblk, }, }; 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 671e1ba35d28a20ca3a483bfc6412a8e53c25709..fda429972c35acc1e44c4384cf6= d72d7e9f120eb 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.c +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.c @@ -119,8 +119,6 @@ #define CTL_SM8550_MASK \ (CTL_SC7280_MASK | BIT(DPU_CTL_HAS_LAYER_EXT4)) =20 -#define DSPP_SC7180_MASK BIT(DPU_DSPP_PCC) - #define INTF_SC7180_MASK \ (BIT(DPU_INTF_INPUT_CTRL) | \ BIT(DPU_INTF_STATUS_SUPPORTED) | \ diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_dspp.c b/drivers/gpu/drm/= msm/disp/dpu1/dpu_hw_dspp.c index 0f5a74398e66642fba48c112db41ffc75ae2a79f..11fb1bc54fa92a5d9926addb437= bc4b8f283723b 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_dspp.c +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_dspp.c @@ -90,7 +90,7 @@ struct dpu_hw_dspp *dpu_hw_dspp_init(struct drm_device *d= ev, /* Assign ops */ c->idx =3D cfg->id; c->cap =3D cfg; - if (test_bit(DPU_DSPP_PCC, &c->cap->features)) + if (c->cap->sblk->pcc.base) c->ops.setup_pcc =3D dpu_setup_dspp_pcc; =20 return c; --=20 2.39.5 From nobody Sun Feb 8 09:32:35 2026 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 4AE9A20D517 for ; Thu, 24 Apr 2025 09:30:40 +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=1745487042; cv=none; b=nkfn8pV+Q22kYC5PwodWHjPravBjXdBk4pEYc2+njJPZXP5G4fSuh6mJPCn8vgdn3aaNGUGwQBeRTxsV4jInaWmOvwCnLnhkqo3n0zo4jjtnGw3EjkMqnM0XjZp+P/aRGiRUgzLwWO2z7t2RrC7y7xHV3eDRxqRokjGsvi4aZXc= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745487042; c=relaxed/simple; bh=BADQwtzEfIqmdry91ABJFWu/ahxyhjqsUqlLLm6qRok=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=NAfS+e9sX1Rmncl9BxuxIPKyNLEsadXxalSDZmifwB50NJg9G7DL3P3jg/UyJMSAETFkIG6ouW12ksOETXxCeKEnJLGgZUnXqHknYSTf0f4YoOpCG9jlq90g/nMt7ib+Nh1NJotCVc6PYR65nS3BecJoLD78htUbGrQEwTenzFQ= 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=lHVHBo6s; 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="lHVHBo6s" Received: from pps.filterd (m0279863.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 53O0F7RJ013249 for ; Thu, 24 Apr 2025 09:30:39 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= bgw5w6Jz5CCY8K4ZBzZ638Sd8klA46YawrWWMxJ7sso=; b=lHVHBo6soTzMiRN3 tb1QofpoyCkrIzZtYbYvZl5UEk0IEJFlY5kfF1nVPQ7q5Ws994BxhrUkhy/1sMIv lixco34/YlJfpFj4G8wyHL1L2T0wk2wXl75I4QniX2qpTdu7GdYvcFIkioPCBfAN GiTr2iw9k+wjArKqVPE4OA8Grygzgws9nUL7ZIPLj7hvdXipLn2ObFpV4FR+ThDG CP5AC2OiskvxNylOp9dL9Eya+6TC4gULXkRUhjE8pVS77IgKUdHQvFJkZAI8TcIX 0X5YseSD/lcD/bdugZoaL62Z/q3KensyahUXINmZyaO/9jKM/iUH6dujD1K3mQ6D IoghGw== Received: from mail-qv1-f71.google.com (mail-qv1-f71.google.com [209.85.219.71]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 466jh2d04c-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Thu, 24 Apr 2025 09:30:39 +0000 (GMT) Received: by mail-qv1-f71.google.com with SMTP id 6a1803df08f44-6e90b13f5c3so18520136d6.0 for ; Thu, 24 Apr 2025 02:30:39 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1745487038; x=1746091838; 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=bgw5w6Jz5CCY8K4ZBzZ638Sd8klA46YawrWWMxJ7sso=; b=ECVl486xmdNeQfsGh4qbV4E3mwzr5lSVu25fGBeSB59ZuC+6UmyGiL8DrU0EvJ4jNh Vl7que+mP4ANqw/PV0VUECevifwGo3rjltT5y2yUurctdpbtmsVfmjVoI7lDl20ySiE+ A6DaWjb1qzsRaPEvJYN4c77pwsW9pn29ZsI1uIBB+K/396WOOh6jZXgY+079Nh8Nk8QK teOd2Y6AP4GFTLHlEtRhWXcY8MP2YCayUWP2Lt8TGenOlfrAqhF79vpGxX/4Ic7LCe43 hLe1d2Mvfs4iUA+tCfsOX4AgkLf/akkrl1pnD5Jd9SurDFmWRqQzg4fQLZNRh2Baexd4 OvHg== X-Forwarded-Encrypted: i=1; AJvYcCWR+t/g0ykECmjzKwEyLJ/ir15r6yYNM8ZheW//NEdrKpdLVIp80d6mR/YAyEDpZRW6b/izcQFx29qMqUQ=@vger.kernel.org X-Gm-Message-State: AOJu0Yx36h+diNJJCtNXJXpXduIS+w47o2aVGxkDByAHPXlKSrgmT8RM DPpzg/dCSGj8nW9Q8eAN6+4bUEytv7NmwaaNwhg45aVxokCN4k5d14/+fmlSNKR0XmcKGPsnQKu 11YQRsf1MSBuA2d0VRaUVrxTG9xbOPQk3DwLNfGqqGqGijOIUmgM+5n5e6i0QWbU= X-Gm-Gg: ASbGnctB7ES8itgKIvhCV+xjpi1tDUtdkjdEE4jWYkoGRUhb5knVy9PlIxsFRje27QN iUeVmFDcX86ZvoSB1HBRYGMzCgYJ+YVDRg97qCKZI4BQDPami5yv0i03IN0MWRr/7ZP/HFUjJd7 Bp6fL75WvxdUatfkVEhmLqJR7alof21//6Z0uRlCyQw041EVRceQEXVBCAPVuazxrloRDmiyk7V QBke57UlxgE/EaIkU8s3nwouY5FL7xQ+1xBXbIWGWi1a/XkWurAlL6uGOqCUM70Vkkq/U9mObzV 8AP3As3j1XOxUz/u8uuYMrFUJro3iyYr/wlQv40b3op11C4cogXdm7b9G1jGhDeRSPkcWidat13 26dxXlR2nUDSTexlFNQ6zyYej X-Received: by 2002:a05:6214:d8f:b0:6e8:f2aa:a8b0 with SMTP id 6a1803df08f44-6f4bfbea652mr33175106d6.18.1745487038027; Thu, 24 Apr 2025 02:30:38 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEvwBz40WSrk/d+/umWPXxXJTB9VQ3N1H+0AsJ57bietmhxEZmsUeRU+GZrZtNc7PCWuFiaLg== X-Received: by 2002:a05:6214:d8f:b0:6e8:f2aa:a8b0 with SMTP id 6a1803df08f44-6f4bfbea652mr33174756d6.18.1745487037501; Thu, 24 Apr 2025 02:30:37 -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 38308e7fff4ca-317d1b9a304sm1820461fa.99.2025.04.24.02.30.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 24 Apr 2025 02:30:36 -0700 (PDT) From: Dmitry Baryshkov Date: Thu, 24 Apr 2025 12:30:12 +0300 Subject: [PATCH v3 08/33] drm/msm/dpu: get rid of DPU_CTL_HAS_LAYER_EXT4 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: <20250424-dpu-drop-features-v3-8-cdaca81d356f@oss.qualcomm.com> References: <20250424-dpu-drop-features-v3-0-cdaca81d356f@oss.qualcomm.com> In-Reply-To: <20250424-dpu-drop-features-v3-0-cdaca81d356f@oss.qualcomm.com> To: Rob Clark , Abhinav Kumar , Sean Paul , Marijn Suijten , David Airlie , Simona Vetter , Vinod Koul , Konrad Dybcio Cc: 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=11085; i=dmitry.baryshkov@oss.qualcomm.com; h=from:subject:message-id; bh=x2jmSC9gKl9NnUFLRgdzswBb50uCdVNQ6+tX2ykb8hA=; b=owEBbQGS/pANAwAKAYs8ij4CKSjVAcsmYgBoCgSrtdYl7kmUvsNg1/uIObaogE24lE8rizvDX SADxmWeuNyJATMEAAEKAB0WIQRMcISVXLJjVvC4lX+LPIo+Aiko1QUCaAoEqwAKCRCLPIo+Aiko 1ZJIB/9++G5MI52D6unsT7D+/lUIir5fRCQlyOUyFhQ20DGcB6wptwRn6o8pRwHSrXfi/0Qm1IA rpvFMrZz7fzXTBKZG7pmPIsYk4AWIUX7zKYQjccoPQ07j2FNM43Vul83u0b6WD4Q/837s2cNGwh Q7oy9ch5h6dljFgt8I8XXKFv2H4D7PchUgIEHGTw8tx8dmoyxkW0wBtmZdnSsLauguQ1WuhdNXW /thoEzxVsVotBfrblCBKlja2YOtmKqL5qAufyXCbUSu1CDjWXfE09gfN+y8NOAjsQD2HRHn5M24 m6+iJsNPKdBVzEz1304IJZjuyQq78gC66SfWTZoiOhxY5xEh X-Developer-Key: i=dmitry.baryshkov@oss.qualcomm.com; a=openpgp; fpr=8F88381DD5C873E4AE487DA5199BF1243632046A X-Proofpoint-GUID: 2w1KsSzI-io4geAlYu-IKEK9m4mrHQob X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUwNDI0MDA2MyBTYWx0ZWRfX8DJ1/0pVlJFU iP3e1ch85UH9GZRcGBg6uw6FCGy1WhRA8QfTfXMKraL5xKavjuOt8/fs2xjr+Ll37Rqvaxhxbyd ZCPu14ZDtsIo6q0cQMqCvDqo9iPzwCBTGWMNn9xYUtNrqmsOdQAyS+82ifXncrtlNZLI8RdmOYp C7+5ZOhfrG5vg1K0YhW0BithS/77OOSkyBaL3/zOkNC8GzsUmJJXAGdgHpkBEs8vQvXS4IXJjMW O7YyZIOK/m/Q3kg2qhVc+901SjJ2z0hy7IOJOFD1CA2aWBtWll6W3o95b7Rt4ppgFn3o4mAQRJ6 7cv1C3XGJsmVyzSumpTXDz6f4MgGDlXQNB9vqRTN7ur62xqUm57RbIcN+MgYipdQNglzx1cyKBm 8CU7X7/pJxYcdlIS4gxM1brcteSU9+UnHgbjzmFRk4+pqHu97CBgW2FODUnXJ4vd63QFA5oz X-Authority-Analysis: v=2.4 cv=Tu/mhCXh c=1 sm=1 tr=0 ts=680a04bf cx=c_pps a=UgVkIMxJMSkC9lv97toC5g==:117 a=xqWC_Br6kY4A:10 a=IkcTkHD0fZMA:10 a=XR8D0OoHHMoA:10 a=KKAkSRfTAAAA:8 a=COk6AnOGAAAA:8 a=mVeP-GC--jfuYOuej4MA:9 a=QEXdDO2ut3YA:10 a=1HOtulTD9v-eNWfpl4qZ:22 a=cvBusfyB2V15izCimMoJ:22 a=TjNXssC_j7lpFel5tvFf:22 X-Proofpoint-ORIG-GUID: 2w1KsSzI-io4geAlYu-IKEK9m4mrHQob X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1099,Hydra:6.0.680,FMLib:17.12.80.40 definitions=2025-04-24_04,2025-04-22_01,2025-02-21_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 priorityscore=1501 malwarescore=0 suspectscore=0 spamscore=0 clxscore=1015 lowpriorityscore=0 impostorscore=0 adultscore=0 phishscore=0 mlxlogscore=999 bulkscore=0 mlxscore=0 classifier=spam authscore=0 authtc=n/a authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.19.0-2504070000 definitions=main-2504240063 From: Dmitry Baryshkov Continue migration to the MDSS-revision based checks and replace DPU_CTL_HAS_LAYER_EXT4 feature bit with the core_major_ver >=3D 9 check. Signed-off-by: Dmitry Baryshkov Reviewed-by: Abhinav Kumar --- drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_10_0_sm8650.h | 12 ++++++------ drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_9_0_sm8550.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 | 3 --- drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.h | 2 -- drivers/gpu/drm/msm/disp/dpu1/dpu_hw_ctl.c | 5 ++++- drivers/gpu/drm/msm/disp/dpu1/dpu_hw_ctl.h | 4 ++++ drivers/gpu/drm/msm/disp/dpu1/dpu_rm.c | 2 +- 8 files changed, 27 insertions(+), 25 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 f7acceba7af1e8ec4b9c0cb52cbec60842c73704..922c9c6ebd82cdfc7f948df5900= 91852282c9f64 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 @@ -32,32 +32,32 @@ static const struct dpu_ctl_cfg sm8650_ctl[] =3D { { .name =3D "ctl_0", .id =3D CTL_0, .base =3D 0x15000, .len =3D 0x1000, - .features =3D CTL_SM8550_MASK | BIT(DPU_CTL_SPLIT_DISPLAY), + .features =3D CTL_SC7280_MASK | BIT(DPU_CTL_SPLIT_DISPLAY), .intr_start =3D DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR2, 9), }, { .name =3D "ctl_1", .id =3D CTL_1, .base =3D 0x16000, .len =3D 0x1000, - .features =3D CTL_SM8550_MASK | BIT(DPU_CTL_SPLIT_DISPLAY), + .features =3D CTL_SC7280_MASK | BIT(DPU_CTL_SPLIT_DISPLAY), .intr_start =3D DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR2, 10), }, { .name =3D "ctl_2", .id =3D CTL_2, .base =3D 0x17000, .len =3D 0x1000, - .features =3D CTL_SM8550_MASK, + .features =3D CTL_SC7280_MASK, .intr_start =3D DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR2, 11), }, { .name =3D "ctl_3", .id =3D CTL_3, .base =3D 0x18000, .len =3D 0x1000, - .features =3D CTL_SM8550_MASK, + .features =3D CTL_SC7280_MASK, .intr_start =3D DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR2, 12), }, { .name =3D "ctl_4", .id =3D CTL_4, .base =3D 0x19000, .len =3D 0x1000, - .features =3D CTL_SM8550_MASK, + .features =3D CTL_SC7280_MASK, .intr_start =3D DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR2, 13), }, { .name =3D "ctl_5", .id =3D CTL_5, .base =3D 0x1a000, .len =3D 0x1000, - .features =3D CTL_SM8550_MASK, + .features =3D CTL_SC7280_MASK, .intr_start =3D DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR2, 23), }, }; 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 3907d143056e2513a6a6bdd8aa2b56f63ac406cb..e17345d954f26b234ef6cd65843= e1cb349376ed3 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 @@ -32,32 +32,32 @@ static const struct dpu_ctl_cfg sm8550_ctl[] =3D { { .name =3D "ctl_0", .id =3D CTL_0, .base =3D 0x15000, .len =3D 0x290, - .features =3D CTL_SM8550_MASK | BIT(DPU_CTL_SPLIT_DISPLAY), + .features =3D CTL_SC7280_MASK | BIT(DPU_CTL_SPLIT_DISPLAY), .intr_start =3D DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR2, 9), }, { .name =3D "ctl_1", .id =3D CTL_1, .base =3D 0x16000, .len =3D 0x290, - .features =3D CTL_SM8550_MASK | BIT(DPU_CTL_SPLIT_DISPLAY), + .features =3D CTL_SC7280_MASK | BIT(DPU_CTL_SPLIT_DISPLAY), .intr_start =3D DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR2, 10), }, { .name =3D "ctl_2", .id =3D CTL_2, .base =3D 0x17000, .len =3D 0x290, - .features =3D CTL_SM8550_MASK, + .features =3D CTL_SC7280_MASK, .intr_start =3D DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR2, 11), }, { .name =3D "ctl_3", .id =3D CTL_3, .base =3D 0x18000, .len =3D 0x290, - .features =3D CTL_SM8550_MASK, + .features =3D CTL_SC7280_MASK, .intr_start =3D DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR2, 12), }, { .name =3D "ctl_4", .id =3D CTL_4, .base =3D 0x19000, .len =3D 0x290, - .features =3D CTL_SM8550_MASK, + .features =3D CTL_SC7280_MASK, .intr_start =3D DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR2, 13), }, { .name =3D "ctl_5", .id =3D CTL_5, .base =3D 0x1a000, .len =3D 0x290, - .features =3D CTL_SM8550_MASK, + .features =3D CTL_SC7280_MASK, .intr_start =3D DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR2, 23), }, }; 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 8cbec3741338aba07a780194ae50c162d2087d83..4d37587d6a6374d9e6ed6d8f138= 37aae0ef55c34 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 @@ -31,32 +31,32 @@ static const struct dpu_ctl_cfg x1e80100_ctl[] =3D { { .name =3D "ctl_0", .id =3D CTL_0, .base =3D 0x15000, .len =3D 0x290, - .features =3D CTL_SM8550_MASK | BIT(DPU_CTL_SPLIT_DISPLAY), + .features =3D CTL_SC7280_MASK | BIT(DPU_CTL_SPLIT_DISPLAY), .intr_start =3D DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR2, 9), }, { .name =3D "ctl_1", .id =3D CTL_1, .base =3D 0x16000, .len =3D 0x290, - .features =3D CTL_SM8550_MASK | BIT(DPU_CTL_SPLIT_DISPLAY), + .features =3D CTL_SC7280_MASK | BIT(DPU_CTL_SPLIT_DISPLAY), .intr_start =3D DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR2, 10), }, { .name =3D "ctl_2", .id =3D CTL_2, .base =3D 0x17000, .len =3D 0x290, - .features =3D CTL_SM8550_MASK, + .features =3D CTL_SC7280_MASK, .intr_start =3D DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR2, 11), }, { .name =3D "ctl_3", .id =3D CTL_3, .base =3D 0x18000, .len =3D 0x290, - .features =3D CTL_SM8550_MASK, + .features =3D CTL_SC7280_MASK, .intr_start =3D DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR2, 12), }, { .name =3D "ctl_4", .id =3D CTL_4, .base =3D 0x19000, .len =3D 0x290, - .features =3D CTL_SM8550_MASK, + .features =3D CTL_SC7280_MASK, .intr_start =3D DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR2, 13), }, { .name =3D "ctl_5", .id =3D CTL_5, .base =3D 0x1a000, .len =3D 0x290, - .features =3D CTL_SM8550_MASK, + .features =3D CTL_SC7280_MASK, .intr_start =3D DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR2, 23), }, }; 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 fda429972c35acc1e44c4384cf6d72d7e9f120eb..c3b659a12d58e18aaba65ba88ff= 5de131d712412 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.c +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.c @@ -116,9 +116,6 @@ BIT(DPU_CTL_VM_CFG) | \ BIT(DPU_CTL_DSPP_SUB_BLOCK_FLUSH)) =20 -#define CTL_SM8550_MASK \ - (CTL_SC7280_MASK | BIT(DPU_CTL_HAS_LAYER_EXT4)) - #define INTF_SC7180_MASK \ (BIT(DPU_INTF_INPUT_CTRL) | \ BIT(DPU_INTF_STATUS_SUPPORTED) | \ 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 4cea19e1a20380c56ae014f2d33a6884a72e0ca0..81592cbdd5d234dacc154778492= 382faecfddb39 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.h +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.h @@ -136,7 +136,6 @@ enum { * @DPU_CTL_SPLIT_DISPLAY: CTL supports video mode split display * @DPU_CTL_FETCH_ACTIVE: Active CTL for fetch HW (SSPPs) * @DPU_CTL_VM_CFG: CTL config to support multiple VMs - * @DPU_CTL_HAS_LAYER_EXT4: CTL has the CTL_LAYER_EXT4 register * @DPU_CTL_DSPP_BLOCK_FLUSH: CTL config to support dspp sub-block flush * @DPU_CTL_MAX */ @@ -145,7 +144,6 @@ enum { DPU_CTL_ACTIVE_CFG, DPU_CTL_FETCH_ACTIVE, DPU_CTL_VM_CFG, - DPU_CTL_HAS_LAYER_EXT4, DPU_CTL_DSPP_SUB_BLOCK_FLUSH, DPU_CTL_MAX }; diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_ctl.c b/drivers/gpu/drm/m= sm/disp/dpu1/dpu_hw_ctl.c index 466bfee3db52d980877a5cdc4eeb739cae250afc..8a7408801bb59e8799e67115ee0= 0cdfe87eba668 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_ctl.c +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_ctl.c @@ -549,7 +549,7 @@ static void dpu_hw_ctl_setup_blendstage(struct dpu_hw_c= tl *ctx, DPU_REG_WRITE(c, CTL_LAYER_EXT(lm), mixercfg[1]); DPU_REG_WRITE(c, CTL_LAYER_EXT2(lm), mixercfg[2]); DPU_REG_WRITE(c, CTL_LAYER_EXT3(lm), mixercfg[3]); - if ((test_bit(DPU_CTL_HAS_LAYER_EXT4, &ctx->caps->features))) + if (ctx->mdss_ver->core_major_ver >=3D 9) DPU_REG_WRITE(c, CTL_LAYER_EXT4(lm), mixercfg[4]); } =20 @@ -720,12 +720,14 @@ static void dpu_hw_ctl_set_fetch_pipe_active(struct d= pu_hw_ctl *ctx, * @dev: Corresponding device for devres management * @cfg: ctl_path catalog entry for which driver object is required * @addr: mapped register io address of MDP + * @mdss_ver: dpu core's major and minor versions * @mixer_count: Number of mixers in @mixer * @mixer: Pointer to an array of Layer Mixers defined in the catalog */ struct dpu_hw_ctl *dpu_hw_ctl_init(struct drm_device *dev, const struct dpu_ctl_cfg *cfg, void __iomem *addr, + const struct dpu_mdss_version *mdss_ver, u32 mixer_count, const struct dpu_lm_cfg *mixer) { @@ -739,6 +741,7 @@ struct dpu_hw_ctl *dpu_hw_ctl_init(struct drm_device *d= ev, c->hw.log_mask =3D DPU_DBG_MASK_CTL; =20 c->caps =3D cfg; + c->mdss_ver =3D mdss_ver; =20 if (c->caps->features & BIT(DPU_CTL_ACTIVE_CFG)) { c->ops.trigger_flush =3D dpu_hw_ctl_trigger_flush_v1; diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_ctl.h b/drivers/gpu/drm/m= sm/disp/dpu1/dpu_hw_ctl.h index 080a9550a0cc6530b4115165dd737857b6213d15..aa560df698ed4e57a25e4a893d7= 333e19b065fe8 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_ctl.h +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_ctl.h @@ -272,6 +272,7 @@ struct dpu_hw_ctl_ops { * @pending_cwb_flush_mask: pending CWB flush * @pending_dsc_flush_mask: pending DSC flush * @pending_cdm_flush_mask: pending CDM flush + * @mdss_ver: MDSS revision information * @ops: operation list */ struct dpu_hw_ctl { @@ -293,6 +294,8 @@ struct dpu_hw_ctl { u32 pending_dsc_flush_mask; u32 pending_cdm_flush_mask; =20 + const struct dpu_mdss_version *mdss_ver; + /* ops */ struct dpu_hw_ctl_ops ops; }; @@ -310,6 +313,7 @@ static inline struct dpu_hw_ctl *to_dpu_hw_ctl(struct d= pu_hw_blk *hw) struct dpu_hw_ctl *dpu_hw_ctl_init(struct drm_device *dev, const struct dpu_ctl_cfg *cfg, void __iomem *addr, + const struct dpu_mdss_version *mdss_ver, u32 mixer_count, const struct dpu_lm_cfg *mixer); =20 diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_rm.c b/drivers/gpu/drm/msm/d= isp/dpu1/dpu_rm.c index 3efbba425ca6e037cb9646981ebb0f0354ffea8e..1ed458aed2bc2c54f6e02acce43= d88927100b99c 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_rm.c +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_rm.c @@ -140,7 +140,7 @@ int dpu_rm_init(struct drm_device *dev, struct dpu_hw_ctl *hw; const struct dpu_ctl_cfg *ctl =3D &cat->ctl[i]; =20 - hw =3D dpu_hw_ctl_init(dev, ctl, mmio, cat->mixer_count, cat->mixer); + hw =3D dpu_hw_ctl_init(dev, ctl, mmio, cat->mdss_ver, cat->mixer_count, = cat->mixer); if (IS_ERR(hw)) { rc =3D PTR_ERR(hw); DPU_ERROR("failed ctl object creation: err %d\n", rc); --=20 2.39.5 From nobody Sun Feb 8 09:32:35 2026 Received: from mx0b-0031df01.pphosted.com (mx0b-0031df01.pphosted.com [205.220.180.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 AC23822170B for ; Thu, 24 Apr 2025 09:30:43 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=205.220.180.131 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745487046; cv=none; b=lxq5Ur69T5KI+VuP11hw4KLS4+uQFitP3Ylj/Q5i2seueTbA2aIPCuMQOdOh3izWh290wx4itpWsWU3crZlZHjeq8jFcL3B1MrixQ5I4q2ljus6tuF8snh02elXfEBb5YR5/vLhiin8PrnVPJ/Pgo4ju74qn1YLmhvQ4zAxIo3Y= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745487046; c=relaxed/simple; bh=FPpQXhCAtJWD+llxzmofIq+g2UnjKxY9klTU0N29QSk=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=HEI9TdNGLwHJs84FlbQ2zMH0KkMWkmKHZowAnufqgYY7w/S4qloY0GC0gbmaKn5ohrBgylffH8SD6kf1tkfMNLZkkvIO2Pz5nmmF+HeFHWQzaHnMM09HFLm0E1omFhg6GW9ybzvqjUky+jwNXUwta0rK3ekatzeMxrtM2pnOVbk= 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=PXgW6Phg; arc=none smtp.client-ip=205.220.180.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="PXgW6Phg" Received: from pps.filterd (m0279870.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 53O0FD65031157 for ; Thu, 24 Apr 2025 09:30:42 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= P7GEUOgJ+d3VgJMqSPmtGJC0ytCJzVLRSBncAB0gqgM=; b=PXgW6PhgQpmypCzi L3kfKXCnXbgokTFYTnAPu1HPCRZ7flZ3O+wWEHxRn9CQOs3M9uNLVUX47+RFQN44 in6TLjD2TKztv5D/LtSwmqppMihRSxAdOftDmiQeTkl6QBhW6la/U3SNg9XcrR3I h2PiuecQEb9omTafjClauZzF4q5fXReEFQUdzfaOaLirXDuquKBRWDaahGYfGS5M FaHxfoqhLkLad86kkhzQzg5hOOJRxyeCEyAhIvLODLzx5GgdWc+8PUmOERyBcPr1 vrxSDtgr3U0EcgS87o48LORvVUqwVDNLeknPOvYxPXq9cO0SvG16ASh2r2uJ5WGs uMIlug== Received: from mail-qk1-f197.google.com (mail-qk1-f197.google.com [209.85.222.197]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 466jh5cyx9-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Thu, 24 Apr 2025 09:30:42 +0000 (GMT) Received: by mail-qk1-f197.google.com with SMTP id af79cd13be357-7c5e2a31f75so254072685a.1 for ; Thu, 24 Apr 2025 02:30:42 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1745487041; x=1746091841; 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=P7GEUOgJ+d3VgJMqSPmtGJC0ytCJzVLRSBncAB0gqgM=; b=HDqrUJQfN6URoyZC9EEGrronFlabLPEW5yYEtpS8/RsqpYqrdFmyIXdMfTCOqW05vw GOKT1FMedUT1Dov2FJaDhZm4Hep/JBiztxRujNzOa7xOGXUbmvH66Yv/Ip05E+12q42n ELDtHOwNX3KuXQYNnvbd6mYqd0lQ/+e6cSFbQbWoId9ksu+Yxi0q4DGuPCJSres+5KxK t3OGsvztraL5bHs//5tJvVGoTTlGjdkRBb/xPkLSqjXJl9rovOlydwab+tmMTPKFTfg4 ML79FQbKrAx/qFaVQy2wu0yuUoowopN1H/0fG0DgaaVOqX8AYRFnFWXYda+HSA8Uhxs3 hZ8g== X-Forwarded-Encrypted: i=1; AJvYcCUfFmdkAAYuZ8u6Dt8p43Lt+zoaii5GMU/GpDRl7aQXvfpz2Iag99XeVzMlyQemQ6tUUGjJLZo/9DKSkWM=@vger.kernel.org X-Gm-Message-State: AOJu0YxKhi7aUAOn0U/0gJ5RyXIoOkNmOb20d7odC88kgYr4+nSMQJXJ Vk826hqcSuxaNxM4+NIJ0b+rnx7h7Ukw4QW/PqZKN68WrXA0wcjOjXzQUoeAq100SAKzoz94DSs XY9lk6yMITiFk2d7dAQIre1VruuWOCn1AZqTCMu+luxSfxGzduTgKO+Bn+nMF1kQ= X-Gm-Gg: ASbGncvWmEhNPlgokAHE4HSADCGhmuC859kGf2by2dce1hnI1Bzak7qL1IcZnBw6WYG oI125z8gn/zH/cnnX+W4cS9A3PWF8lelD3/uz+If8ZzKc8cFVXdA0wtTrVXJe7Fl0FRNPhsJv2J az/orDkq8i4moWTeeW/j0zlqv7B4vilTWKGxZICQ8ecWun1WH2X+yK55QkZwR+lyFyZhuQFSMuV spjhCLJTX9ov3f88hwvNUE6+ZE2+8YzWY70XjTVDItosr3BD9+a4qfo7O1Vh246ZVgvl+AAuYIj 0JRZSpWfkdv1BcXEyQoa8CUMVNP0XUGHMwFfZnbmHypI02Fdqiy6FU5R0fOEtbcLRnow9gXNzL0 spWDNG28tdpusNfV0diBucwzq X-Received: by 2002:a05:620a:4054:b0:7c7:af68:b6f3 with SMTP id af79cd13be357-7c956edf04cmr286423585a.33.1745487041320; Thu, 24 Apr 2025 02:30:41 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEw7xllsK8s5mAWFwEYYUORkTQn8WDPEjG0mLr6qzjcim2dQzKtXcFBiadW7v+N0cGLXouGAQ== X-Received: by 2002:a05:620a:4054:b0:7c7:af68:b6f3 with SMTP id af79cd13be357-7c956edf04cmr286419385a.33.1745487040879; Thu, 24 Apr 2025 02:30:40 -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 38308e7fff4ca-317d1b9a304sm1820461fa.99.2025.04.24.02.30.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 24 Apr 2025 02:30:37 -0700 (PDT) From: Dmitry Baryshkov Date: Thu, 24 Apr 2025 12:30:13 +0300 Subject: [PATCH v3 09/33] drm/msm/dpu: get rid of DPU_CTL_ACTIVE_CFG 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: <20250424-dpu-drop-features-v3-9-cdaca81d356f@oss.qualcomm.com> References: <20250424-dpu-drop-features-v3-0-cdaca81d356f@oss.qualcomm.com> In-Reply-To: <20250424-dpu-drop-features-v3-0-cdaca81d356f@oss.qualcomm.com> To: Rob Clark , Abhinav Kumar , Sean Paul , Marijn Suijten , David Airlie , Simona Vetter , Vinod Koul , Konrad Dybcio Cc: 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=18958; i=dmitry.baryshkov@oss.qualcomm.com; h=from:subject:message-id; bh=ZNJ38EuFTkNMEqkAwQ+8h/9Btpclakp0rdOuryipKi8=; b=owEBbQGS/pANAwAKAYs8ij4CKSjVAcsmYgBoCgSrUxIl2eJQUKijaqvks56+j4jD1gXOCNeZa JHaXJgi5qqJATMEAAEKAB0WIQRMcISVXLJjVvC4lX+LPIo+Aiko1QUCaAoEqwAKCRCLPIo+Aiko 1XhTB/wJnjR1o/jYSmOTpqts17OKPZraFAGAInwS8ckcOyCSHyCSSqPy0R/k0nk81GovExq8OB5 X8tlyab8AK+R3a2vk65IncXHAiWzpnXANEmLfnFeymlIDwukqhHhPbDJpOSxBRpWfsx8bgQ95Ea kAj4Sww2icrvcDu9Jw6vGrQsQovta71FZBC9qdkwpG8mh/iRn++SWnyETpjsUB4hXttZy/Npj+f BYKsaZuRnihpw1HKWOckSLTCCSpSW9cg5q1LSxBlNI9/n8sLO4uc9HygkguM6XYLTZkRsApdsNJ qrvU/7Ypsew5nSNC+HwI9yBeAIbUo0rkd+Voiojtz7GJIx3y X-Developer-Key: i=dmitry.baryshkov@oss.qualcomm.com; a=openpgp; fpr=8F88381DD5C873E4AE487DA5199BF1243632046A X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUwNDI0MDA2MyBTYWx0ZWRfX4oijHwg5t/D2 ODIAQ/lFS82v2OoJ1vX1OMaoCuo8mQJ2AoJmh5GobbRnDE40g9vd9Mj95RFsGM5w8MHywdjdDZK 9eXFUbFA1MfcjRuGPY9zf/cFVLSTxuDyzjX0uiNayeOht5m18g/TgyBpCOrtLhUpXpT2bSpXMqV zqEzcqOMROJvedx/q+8ExjlWY+X/2a2sY5cdloRgxxsBOUdg0VDR9WwvpCKHWcUIxNYBIGrvM3O KSCGRl3xdGY2vFu4KhKn2sEqVpoLckJqR+oaATpzOv3cVFiI1WxbJQ/5MSgXk13H803CmgHVxZH rryZlaYGCiv2V4GjWRsF238QCCI88JKUdIXRS63zAi4KUcy0Ygc7D0AII+6zffpCBnjXwE+H+fl HkQ/EQvpaL4Vov/HcpNALNk7KRFo4e6HRfp2sXuD2H6erAKDWrJDMpcKy4s49pQkuTrpBpGX X-Proofpoint-GUID: bhPKLObBrB1nUiVf9Ga_CHJ7UoLk-Kdx X-Authority-Analysis: v=2.4 cv=B/S50PtM c=1 sm=1 tr=0 ts=680a04c2 cx=c_pps a=50t2pK5VMbmlHzFWWp8p/g==:117 a=xqWC_Br6kY4A:10 a=IkcTkHD0fZMA:10 a=XR8D0OoHHMoA:10 a=KKAkSRfTAAAA:8 a=COk6AnOGAAAA:8 a=QkM7UoOa6lEXaYzOGzoA:9 a=QEXdDO2ut3YA:10 a=IoWCM6iH3mJn3m4BftBB:22 a=cvBusfyB2V15izCimMoJ:22 a=TjNXssC_j7lpFel5tvFf:22 X-Proofpoint-ORIG-GUID: bhPKLObBrB1nUiVf9Ga_CHJ7UoLk-Kdx X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1099,Hydra:6.0.680,FMLib:17.12.80.40 definitions=2025-04-24_04,2025-04-22_01,2025-02-21_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 adultscore=0 mlxlogscore=999 lowpriorityscore=0 bulkscore=0 impostorscore=0 suspectscore=0 mlxscore=0 priorityscore=1501 phishscore=0 malwarescore=0 spamscore=0 clxscore=1015 classifier=spam authscore=0 authtc=n/a authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.19.0-2504070000 definitions=main-2504240063 From: Dmitry Baryshkov Continue migration to the MDSS-revision based checks and replace DPU_CTL_ACTIVE_CFG feature bit with the core_major_ver >=3D 5 check. Signed-off-by: Dmitry Baryshkov Reviewed-by: Abhinav Kumar --- drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_5_0_sm8150.h | 8 ++------ drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_5_1_sc8180x.h | 8 ++------ 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 | 6 ------ drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_5_4_sm6125.h | 6 ------ drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_6_0_sm8250.h | 8 ++------ drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_6_2_sc7180.h | 3 --- 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/dpu_encoder_phys_cmd.c | 2 +- drivers/gpu/drm/msm/disp/dpu1/dpu_encoder_phys_wb.c | 7 ++----- drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.c | 3 +-- drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.h | 1 - drivers/gpu/drm/msm/disp/dpu1/dpu_hw_ctl.c | 2 +- 16 files changed, 13 insertions(+), 56 deletions(-) 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 7731bd79c135f1f28cc3e5a53bf05097cc9f70e9..3bb0749f931d7417f8e90bfe373= 6ce77dafccb57 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 @@ -42,32 +42,28 @@ static const struct dpu_ctl_cfg sm8150_ctl[] =3D { { .name =3D "ctl_0", .id =3D CTL_0, .base =3D 0x1000, .len =3D 0x1e0, - .features =3D BIT(DPU_CTL_ACTIVE_CFG) | BIT(DPU_CTL_SPLIT_DISPLAY), + .features =3D BIT(DPU_CTL_SPLIT_DISPLAY), .intr_start =3D DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR2, 9), }, { .name =3D "ctl_1", .id =3D CTL_1, .base =3D 0x1200, .len =3D 0x1e0, - .features =3D BIT(DPU_CTL_ACTIVE_CFG) | BIT(DPU_CTL_SPLIT_DISPLAY), + .features =3D BIT(DPU_CTL_SPLIT_DISPLAY), .intr_start =3D DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR2, 10), }, { .name =3D "ctl_2", .id =3D CTL_2, .base =3D 0x1400, .len =3D 0x1e0, - .features =3D BIT(DPU_CTL_ACTIVE_CFG), .intr_start =3D DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR2, 11), }, { .name =3D "ctl_3", .id =3D CTL_3, .base =3D 0x1600, .len =3D 0x1e0, - .features =3D BIT(DPU_CTL_ACTIVE_CFG), .intr_start =3D DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR2, 12), }, { .name =3D "ctl_4", .id =3D CTL_4, .base =3D 0x1800, .len =3D 0x1e0, - .features =3D BIT(DPU_CTL_ACTIVE_CFG), .intr_start =3D DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR2, 13), }, { .name =3D "ctl_5", .id =3D CTL_5, .base =3D 0x1a00, .len =3D 0x1e0, - .features =3D BIT(DPU_CTL_ACTIVE_CFG), .intr_start =3D DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR2, 23), }, }; 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 899a5502229f1321403a27c4431c10bdbfeeeda8..84114df5f072af16aeedd3aada8= a106ca4369ddb 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 @@ -41,32 +41,28 @@ static const struct dpu_ctl_cfg sc8180x_ctl[] =3D { { .name =3D "ctl_0", .id =3D CTL_0, .base =3D 0x1000, .len =3D 0x1e0, - .features =3D BIT(DPU_CTL_ACTIVE_CFG) | BIT(DPU_CTL_SPLIT_DISPLAY), + .features =3D BIT(DPU_CTL_SPLIT_DISPLAY), .intr_start =3D DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR2, 9), }, { .name =3D "ctl_1", .id =3D CTL_1, .base =3D 0x1200, .len =3D 0x1e0, - .features =3D BIT(DPU_CTL_ACTIVE_CFG) | BIT(DPU_CTL_SPLIT_DISPLAY), + .features =3D BIT(DPU_CTL_SPLIT_DISPLAY), .intr_start =3D DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR2, 10), }, { .name =3D "ctl_2", .id =3D CTL_2, .base =3D 0x1400, .len =3D 0x1e0, - .features =3D BIT(DPU_CTL_ACTIVE_CFG), .intr_start =3D DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR2, 11), }, { .name =3D "ctl_3", .id =3D CTL_3, .base =3D 0x1600, .len =3D 0x1e0, - .features =3D BIT(DPU_CTL_ACTIVE_CFG), .intr_start =3D DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR2, 12), }, { .name =3D "ctl_4", .id =3D CTL_4, .base =3D 0x1800, .len =3D 0x1e0, - .features =3D BIT(DPU_CTL_ACTIVE_CFG), .intr_start =3D DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR2, 13), }, { .name =3D "ctl_5", .id =3D CTL_5, .base =3D 0x1a00, .len =3D 0x1e0, - .features =3D BIT(DPU_CTL_ACTIVE_CFG), .intr_start =3D DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR2, 23), }, }; 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 830f416c0b5183cb764b2d6381bdc4a74df0ab0c..7a04eacb108bea33573cf75fb55= 37b80e8273039 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 @@ -38,32 +38,28 @@ static const struct dpu_ctl_cfg sm7150_ctl[] =3D { { .name =3D "ctl_0", .id =3D CTL_0, .base =3D 0x1000, .len =3D 0x1e0, - .features =3D BIT(DPU_CTL_ACTIVE_CFG) | BIT(DPU_CTL_SPLIT_DISPLAY), + .features =3D BIT(DPU_CTL_SPLIT_DISPLAY), .intr_start =3D DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR2, 9), }, { .name =3D "ctl_1", .id =3D CTL_1, .base =3D 0x1200, .len =3D 0x1e0, - .features =3D BIT(DPU_CTL_ACTIVE_CFG) | BIT(DPU_CTL_SPLIT_DISPLAY), + .features =3D BIT(DPU_CTL_SPLIT_DISPLAY), .intr_start =3D DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR2, 10), }, { .name =3D "ctl_2", .id =3D CTL_2, .base =3D 0x1400, .len =3D 0x1e0, - .features =3D BIT(DPU_CTL_ACTIVE_CFG), .intr_start =3D DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR2, 11), }, { .name =3D "ctl_3", .id =3D CTL_3, .base =3D 0x1600, .len =3D 0x1e0, - .features =3D BIT(DPU_CTL_ACTIVE_CFG), .intr_start =3D DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR2, 12), }, { .name =3D "ctl_4", .id =3D CTL_4, .base =3D 0x1800, .len =3D 0x1e0, - .features =3D BIT(DPU_CTL_ACTIVE_CFG), .intr_start =3D DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR2, 13), }, { .name =3D "ctl_5", .id =3D CTL_5, .base =3D 0x1a00, .len =3D 0x1e0, - .features =3D BIT(DPU_CTL_ACTIVE_CFG), .intr_start =3D DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR2, 23), }, }; 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 dc6d8fd05c2e3afbe5182b1ae8dd9fea8b6543e5..d44db988a6e2f443803a422846f= 817779d382b2a 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 @@ -35,32 +35,26 @@ static const struct dpu_ctl_cfg sm6150_ctl[] =3D { { .name =3D "ctl_0", .id =3D CTL_0, .base =3D 0x1000, .len =3D 0x1e0, - .features =3D BIT(DPU_CTL_ACTIVE_CFG), .intr_start =3D DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR2, 9), }, { .name =3D "ctl_1", .id =3D CTL_1, .base =3D 0x1200, .len =3D 0x1e0, - .features =3D BIT(DPU_CTL_ACTIVE_CFG), .intr_start =3D DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR2, 10), }, { .name =3D "ctl_2", .id =3D CTL_2, .base =3D 0x1400, .len =3D 0x1e0, - .features =3D BIT(DPU_CTL_ACTIVE_CFG), .intr_start =3D DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR2, 11), }, { .name =3D "ctl_3", .id =3D CTL_3, .base =3D 0x1600, .len =3D 0x1e0, - .features =3D BIT(DPU_CTL_ACTIVE_CFG), .intr_start =3D DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR2, 12), }, { .name =3D "ctl_4", .id =3D CTL_4, .base =3D 0x1800, .len =3D 0x1e0, - .features =3D BIT(DPU_CTL_ACTIVE_CFG), .intr_start =3D DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR2, 13), }, { .name =3D "ctl_5", .id =3D CTL_5, .base =3D 0x1a00, .len =3D 0x1e0, - .features =3D BIT(DPU_CTL_ACTIVE_CFG), .intr_start =3D DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR2, 23), }, }; 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 14ecf429e7695c167e85f500b113952ebdbc3aa6..ba631cdbbff0cec7453685bc102= 8791eadbbb2d4 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 @@ -35,32 +35,26 @@ static const struct dpu_ctl_cfg sm6125_ctl[] =3D { { .name =3D "ctl_0", .id =3D CTL_0, .base =3D 0x1000, .len =3D 0x1e0, - .features =3D BIT(DPU_CTL_ACTIVE_CFG), .intr_start =3D DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR2, 9), }, { .name =3D "ctl_1", .id =3D CTL_1, .base =3D 0x1200, .len =3D 0x1e0, - .features =3D BIT(DPU_CTL_ACTIVE_CFG), .intr_start =3D DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR2, 10), }, { .name =3D "ctl_2", .id =3D CTL_2, .base =3D 0x1400, .len =3D 0x1e0, - .features =3D BIT(DPU_CTL_ACTIVE_CFG), .intr_start =3D DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR2, 11), }, { .name =3D "ctl_3", .id =3D CTL_3, .base =3D 0x1600, .len =3D 0x1e0, - .features =3D BIT(DPU_CTL_ACTIVE_CFG), .intr_start =3D DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR2, 12), }, { .name =3D "ctl_4", .id =3D CTL_4, .base =3D 0x1800, .len =3D 0x1e0, - .features =3D BIT(DPU_CTL_ACTIVE_CFG), .intr_start =3D DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR2, 13), }, { .name =3D "ctl_5", .id =3D CTL_5, .base =3D 0x1a00, .len =3D 0x1e0, - .features =3D BIT(DPU_CTL_ACTIVE_CFG), .intr_start =3D DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR2, 23), }, }; 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 8dab7f63928bb708c79080b139395c3410fd45bf..5f7bee25a7a4f80d1f2fb86f126= 863b721c41281 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 @@ -40,32 +40,28 @@ static const struct dpu_ctl_cfg sm8250_ctl[] =3D { { .name =3D "ctl_0", .id =3D CTL_0, .base =3D 0x1000, .len =3D 0x1e0, - .features =3D BIT(DPU_CTL_ACTIVE_CFG) | BIT(DPU_CTL_SPLIT_DISPLAY), + .features =3D BIT(DPU_CTL_SPLIT_DISPLAY), .intr_start =3D DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR2, 9), }, { .name =3D "ctl_1", .id =3D CTL_1, .base =3D 0x1200, .len =3D 0x1e0, - .features =3D BIT(DPU_CTL_ACTIVE_CFG) | BIT(DPU_CTL_SPLIT_DISPLAY), + .features =3D BIT(DPU_CTL_SPLIT_DISPLAY), .intr_start =3D DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR2, 10), }, { .name =3D "ctl_2", .id =3D CTL_2, .base =3D 0x1400, .len =3D 0x1e0, - .features =3D BIT(DPU_CTL_ACTIVE_CFG), .intr_start =3D DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR2, 11), }, { .name =3D "ctl_3", .id =3D CTL_3, .base =3D 0x1600, .len =3D 0x1e0, - .features =3D BIT(DPU_CTL_ACTIVE_CFG), .intr_start =3D DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR2, 12), }, { .name =3D "ctl_4", .id =3D CTL_4, .base =3D 0x1800, .len =3D 0x1e0, - .features =3D BIT(DPU_CTL_ACTIVE_CFG), .intr_start =3D DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR2, 13), }, { .name =3D "ctl_5", .id =3D CTL_5, .base =3D 0x1a00, .len =3D 0x1e0, - .features =3D BIT(DPU_CTL_ACTIVE_CFG), .intr_start =3D DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR2, 23), }, }; 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 f648d19123fa95a1c20074abd4dd0bda5147ed29..0ede8223a3a85414f271de11b60= 1b648ca865fbe 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 @@ -32,17 +32,14 @@ static const struct dpu_ctl_cfg sc7180_ctl[] =3D { { .name =3D "ctl_0", .id =3D CTL_0, .base =3D 0x1000, .len =3D 0x1dc, - .features =3D BIT(DPU_CTL_ACTIVE_CFG), .intr_start =3D DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR2, 9), }, { .name =3D "ctl_1", .id =3D CTL_1, .base =3D 0x1200, .len =3D 0x1dc, - .features =3D BIT(DPU_CTL_ACTIVE_CFG), .intr_start =3D DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR2, 10), }, { .name =3D "ctl_2", .id =3D CTL_2, .base =3D 0x1400, .len =3D 0x1dc, - .features =3D BIT(DPU_CTL_ACTIVE_CFG), .intr_start =3D DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR2, 11), }, }; 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 f8164950a0f7721643eabf5cb2bb7a5e3bcdfbfa..01e398add3c45a8bc504da5ca26= 8df0487462113 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 @@ -29,7 +29,6 @@ static const struct dpu_ctl_cfg sm6115_ctl[] =3D { { .name =3D "ctl_0", .id =3D CTL_0, .base =3D 0x1000, .len =3D 0x1dc, - .features =3D BIT(DPU_CTL_ACTIVE_CFG), .intr_start =3D DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR2, 9), }, }; 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 ddf05cb3954e12e6689cb579f20b20e1d220156c..da04822327975aa70cab679f5e5= 3d53f65fb749c 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 @@ -35,22 +35,18 @@ static const struct dpu_ctl_cfg sm6350_ctl[] =3D { { .name =3D "ctl_0", .id =3D CTL_0, .base =3D 0x1000, .len =3D 0x1dc, - .features =3D BIT(DPU_CTL_ACTIVE_CFG), .intr_start =3D DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR2, 9), }, { .name =3D "ctl_1", .id =3D CTL_1, .base =3D 0x1200, .len =3D 0x1dc, - .features =3D BIT(DPU_CTL_ACTIVE_CFG), .intr_start =3D DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR2, 10), }, { .name =3D "ctl_2", .id =3D CTL_2, .base =3D 0x1400, .len =3D 0x1dc, - .features =3D BIT(DPU_CTL_ACTIVE_CFG), .intr_start =3D DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR2, 11), }, { .name =3D "ctl_3", .id =3D CTL_3, .base =3D 0x1600, .len =3D 0x1dc, - .features =3D BIT(DPU_CTL_ACTIVE_CFG), .intr_start =3D DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR2, 12), }, }; 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 6d424a4fd60bd94ddc0374466d86770138b2831f..94dc8726199a3a48a64c7dff58b= c62e6fd097c99 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 @@ -29,7 +29,6 @@ static const struct dpu_ctl_cfg qcm2290_ctl[] =3D { { .name =3D "ctl_0", .id =3D CTL_0, .base =3D 0x1000, .len =3D 0x1dc, - .features =3D BIT(DPU_CTL_ACTIVE_CFG), .intr_start =3D DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR2, 9), }, }; 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 aaf4b270f20dcc5fb91fbcb783c6d3bc673894f5..2b2b9417e23950425a72f6dd44b= af824b5a00061 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 @@ -30,7 +30,6 @@ static const struct dpu_ctl_cfg sm6375_ctl[] =3D { { .name =3D "ctl_0", .id =3D CTL_0, .base =3D 0x1000, .len =3D 0x1dc, - .features =3D BIT(DPU_CTL_ACTIVE_CFG), .intr_start =3D DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR2, 9), }, }; diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder_phys_cmd.c b/drivers= /gpu/drm/msm/disp/dpu1/dpu_encoder_phys_cmd.c index da9994a79ca293ec0265680c438835742102db2a..9d0b6397acbd41cc7c93df040be= 5c248b7ad3c05 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder_phys_cmd.c +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder_phys_cmd.c @@ -67,7 +67,7 @@ static void _dpu_encoder_phys_cmd_update_intf_cfg( ctl->ops.setup_intf_cfg(ctl, &intf_cfg); =20 /* setup which pp blk will connect to this intf */ - if (test_bit(DPU_CTL_ACTIVE_CFG, &ctl->caps->features) && phys_enc->hw_in= tf->ops.bind_pingpong_blk) + if (phys_enc->hw_intf->ops.bind_pingpong_blk) phys_enc->hw_intf->ops.bind_pingpong_blk( phys_enc->hw_intf, phys_enc->hw_pp->idx); diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder_phys_wb.c b/drivers/= gpu/drm/msm/disp/dpu1/dpu_encoder_phys_wb.c index 849fea580a4ca55fc4a742c6b6dee7dfcdd788e4..c8f3516ae4faa709e3eda4c0efb= 050ca18b675e4 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder_phys_wb.c +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder_phys_wb.c @@ -218,7 +218,6 @@ static void dpu_encoder_phys_wb_setup_fb(struct dpu_enc= oder_phys *phys_enc, static void dpu_encoder_phys_wb_setup_ctl(struct dpu_encoder_phys *phys_en= c) { struct dpu_hw_wb *hw_wb; - struct dpu_hw_ctl *ctl; struct dpu_hw_cdm *hw_cdm; =20 if (!phys_enc) { @@ -227,10 +226,9 @@ static void dpu_encoder_phys_wb_setup_ctl(struct dpu_e= ncoder_phys *phys_enc) } =20 hw_wb =3D phys_enc->hw_wb; - ctl =3D phys_enc->hw_ctl; hw_cdm =3D phys_enc->hw_cdm; =20 - if (test_bit(DPU_CTL_ACTIVE_CFG, &ctl->caps->features) && + if (phys_enc->dpu_kms->catalog->mdss_ver->core_major_ver >=3D 5 && (phys_enc->hw_ctl && phys_enc->hw_ctl->ops.setup_intf_cfg)) { struct dpu_hw_intf_cfg intf_cfg =3D {0}; @@ -534,7 +532,6 @@ static void dpu_encoder_phys_wb_enable(struct dpu_encod= er_phys *phys_enc) static void dpu_encoder_phys_wb_disable(struct dpu_encoder_phys *phys_enc) { struct dpu_hw_wb *hw_wb =3D phys_enc->hw_wb; - struct dpu_hw_ctl *hw_ctl =3D phys_enc->hw_ctl; =20 DPU_DEBUG("[wb:%d]\n", hw_wb->idx - WB_0); =20 @@ -556,7 +553,7 @@ static void dpu_encoder_phys_wb_disable(struct dpu_enco= der_phys *phys_enc) * WB support is added to those targets will need to add * the legacy teardown sequence as well. */ - if (hw_ctl->caps->features & BIT(DPU_CTL_ACTIVE_CFG)) + if (phys_enc->dpu_kms->catalog->mdss_ver->core_major_ver >=3D 5) dpu_encoder_helper_phys_cleanup(phys_enc); =20 phys_enc->enable_state =3D DPU_ENC_DISABLED; 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 c3b659a12d58e18aaba65ba88ff5de131d712412..0fcc9fb975c0955f459ba4264b6= a114a4b17af52 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.c +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.c @@ -111,8 +111,7 @@ (BIT(DPU_PINGPONG_DITHER) | BIT(DPU_PINGPONG_DSC)) =20 #define CTL_SC7280_MASK \ - (BIT(DPU_CTL_ACTIVE_CFG) | \ - BIT(DPU_CTL_FETCH_ACTIVE) | \ + (BIT(DPU_CTL_FETCH_ACTIVE) | \ BIT(DPU_CTL_VM_CFG) | \ BIT(DPU_CTL_DSPP_SUB_BLOCK_FLUSH)) =20 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 81592cbdd5d234dacc154778492382faecfddb39..b6c45ed4fa3d18ed21c2a2547b0= d5af4debd974e 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.h +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.h @@ -141,7 +141,6 @@ enum { */ enum { DPU_CTL_SPLIT_DISPLAY =3D 0x1, - DPU_CTL_ACTIVE_CFG, DPU_CTL_FETCH_ACTIVE, DPU_CTL_VM_CFG, DPU_CTL_DSPP_SUB_BLOCK_FLUSH, diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_ctl.c b/drivers/gpu/drm/m= sm/disp/dpu1/dpu_hw_ctl.c index 8a7408801bb59e8799e67115ee00cdfe87eba668..c63a6cbd07d94acae04b6edf534= b1a7f5d4119b1 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_ctl.c +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_ctl.c @@ -743,7 +743,7 @@ struct dpu_hw_ctl *dpu_hw_ctl_init(struct drm_device *d= ev, c->caps =3D cfg; c->mdss_ver =3D mdss_ver; =20 - if (c->caps->features & BIT(DPU_CTL_ACTIVE_CFG)) { + if (mdss_ver->core_major_ver >=3D 5) { c->ops.trigger_flush =3D dpu_hw_ctl_trigger_flush_v1; c->ops.setup_intf_cfg =3D dpu_hw_ctl_intf_cfg_v1; c->ops.reset_intf_cfg =3D dpu_hw_ctl_reset_intf_cfg_v1; --=20 2.39.5 From nobody Sun Feb 8 09:32:35 2026 Received: from mx0b-0031df01.pphosted.com (mx0b-0031df01.pphosted.com [205.220.180.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 7A73E221F00 for ; Thu, 24 Apr 2025 09:30:44 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=205.220.180.131 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745487046; cv=none; b=sAP0pwuDP5WsB/jOagd87z2KrR/tI8SK5iF0pXWG83hoo/aM+WxeOHCf9y7+AAYJMD/yZTJV9vrX81D+PT8Zbs6vgQoXEqJpXM+YJhfqsgKrB7EzveBvUYQXuvkDj0Zrt77U/7YQg6PJmGKF/nJanGkVyjJbNroZ/RHd7QjnSHg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745487046; c=relaxed/simple; bh=NOFMD1nYVEYJjjfMb34qEI79sZOjl0v7XF7HN3hOgww=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=iuiab1iqFLvLPHmAnc6ejsSSMTjeVGK7TWcdlE8964jxD4CBCUpWir04zXEH+fH2GMHyTYdXmLDqUbJcR70rNgF/xzp2yP5gtEN6PoaxPAxe/bvcECjtZfdHWjIgzUJ3tc419jOqG8ITOCKb1UYciR1NP9JuIeMITYm9Us/hPRc= 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=DUU67ApW; arc=none smtp.client-ip=205.220.180.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="DUU67ApW" Received: from pps.filterd (m0279870.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 53O0FD66031157 for ; Thu, 24 Apr 2025 09:30:43 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= yY8Yo5pYvT9Z4+o3bkCAq7zmpRUaxk4DK2Ff/7M+6kI=; b=DUU67ApWdav6G6YN WSn9hzjcyQpko/leMcfLmBQHGOuFdmU58cgfwWEfPpiOxNgKDePVC0IE4ucyQcr+ QZ0StuljrOnKQjkzAJX1uK66u+G3djk4RwUliwcbqTzvhYryXkK/PdEobHTZQ6lP SxTsICXP7K6ehLMHMkFsTfaowddULEaIG3aFm2Ddv8qD56CINo1bC++Y/q/kqW+2 dd5QsBW2nVcDwr0BIvGWBLkw4HuYnp6EmZ80iWC7VBndX2w6oHTTigkwkb/pOqYc uDlJewCRAOk0OCXSaWVVLXAtuGDzc5KjaGbSc2t+xCASuaVVJ9tCtgNJsqvbtrB1 NdR3OA== 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 466jh5cyxd-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Thu, 24 Apr 2025 09:30:43 +0000 (GMT) Received: by mail-qk1-f198.google.com with SMTP id af79cd13be357-7c9305d29abso142188685a.1 for ; Thu, 24 Apr 2025 02:30:43 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1745487042; x=1746091842; 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=yY8Yo5pYvT9Z4+o3bkCAq7zmpRUaxk4DK2Ff/7M+6kI=; b=jepJURWcQXWQbHwsyI04XYadm06oqzulmmM66bTsnouHooSHtMX7Zx6v3V4R0tbXCS 6yf0+9XQSQ4a8ThK5hjArI9lHlJdoGOGFld6poySJwHfdY2A6nLBURoWdjxEMobPLVKT 6loA9Kxv62ZhIxz1H5/BHWyTrIqIY1lKnwI5TMGFrRYvsTYiNiFTQYzxYqZnkS1+5tUz b5GKJikDKTN6Lw+CLM9J1ys0PLKWiXzvsxdwY9/w8sEfKzsZ0VwUy5leCdLrQw6cFsoQ WVM26LEddNjV3C9eyDK8MbGC8Z1iQPDPUhvlB8Kcs0yBKEkXAR9Ja+11G7OJ/tP/YzTn 4X4g== X-Forwarded-Encrypted: i=1; AJvYcCXJLVCXE38cRsN+v6bz1nYHzfvmCzFmHiJLWK5hmgg37CPhDb/bC0nf6EdRd6Es0AXH8t3PuQ16Kbhn6mE=@vger.kernel.org X-Gm-Message-State: AOJu0YzTWn+5gl9ydffQ3aHRZ1i4SRT1+CkxoNPtJnqr8xBsg1G2Fusf XFE5F8ym0L7xHq5gK1nMs7hix7kytLh0uKQyymRpOZoPRCUHNlymaNY94mIp1ZC+JJX3V4HZAcw x066H/wXkhf8r7IHnmouLuqT9uQ3b0LG1lr6B9Amu3mMQDop8ht1wAhCDjRujjfU= X-Gm-Gg: ASbGncvznHKM4uLouKeFGJDIJZVtI+SfmqieR5BcxyGLS8rJnHfDMMpl2cqqf+VstmP EdjFIiSkAvWn2NVlniEtodDK14kYISujW4Kndr4b6JaTAwI2vReCpQmGn1Y07kZHCNUfeBHw94M SskxFqeL5fbTxeNto2TyGi6RnqHQwWHU6Y9ZSoK89LgNp+uP3ZlcIkwtHk+ST1gQ0vXxmwmZHXw FT6yid1ZKhIuNXsMEdxPoEyZpIObsXglEnHRb64nO+QYU10DpExrDWNaRfxjRT3sNvf1dENgVDZ ZxvjGKWaAMOmnuW/Hkv8txyVofB/uvbhwBEko/TOsc1tuSAqoWtYtrkM59hhITMZqqNUhPMXtp8 79S/ou/kqYAVuxZuUGJxKLCkG X-Received: by 2002:a05:620a:6106:b0:7c7:93ae:fe56 with SMTP id af79cd13be357-7c956f88f47mr243298985a.51.1745487042459; Thu, 24 Apr 2025 02:30:42 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEUa/6yCoT6mZ5aizKzpe4+iNnRS2svRyasrbIHuoR01W3sgsHGigRTnWpApWKWi3FaFl+b0w== X-Received: by 2002:a05:620a:6106:b0:7c7:93ae:fe56 with SMTP id af79cd13be357-7c956f88f47mr243295385a.51.1745487042042; Thu, 24 Apr 2025 02:30:42 -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 38308e7fff4ca-317d1b9a304sm1820461fa.99.2025.04.24.02.30.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 24 Apr 2025 02:30:41 -0700 (PDT) From: Dmitry Baryshkov Date: Thu, 24 Apr 2025 12:30:14 +0300 Subject: [PATCH v3 10/33] drm/msm/dpu: get rid of DPU_CTL_FETCH_ACTIVE 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: <20250424-dpu-drop-features-v3-10-cdaca81d356f@oss.qualcomm.com> References: <20250424-dpu-drop-features-v3-0-cdaca81d356f@oss.qualcomm.com> In-Reply-To: <20250424-dpu-drop-features-v3-0-cdaca81d356f@oss.qualcomm.com> To: Rob Clark , Abhinav Kumar , Sean Paul , Marijn Suijten , David Airlie , Simona Vetter , Vinod Koul , Konrad Dybcio Cc: 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=2516; i=dmitry.baryshkov@oss.qualcomm.com; h=from:subject:message-id; bh=DsDYyaEtmcEU0Q3DXm3LKbekIuXiOgkLRrmoNbxq0Rs=; b=owGbwMvMwMXYbdNlx6SpcZXxtFoSQwYXyxqGhQ1r1BdqhZq2OsZ/T4t6t3pvffUUrueP03ZrH H+Tmbeqk9GYhYGRi0FWTJHFp6Blasym5LAPO6bWwwxiZQKbwsUpABO5fov9n5GQ2W9pP7PSvoiz i/UFnTh1vuTFP/xinsR6V/B88tyDvTb8mzlcz12cWtlw+En2kl9f5AWrVkTMm/2/mvFISfKSisJ Usxz7d9Lf8p64ldbc4985uz9Pj/v3prkbJ5vZlFcJF53fPruY1SXvp72YvdssMc7ewxGfvtalbw 04+fG3bmTd3c2bpTUzqoJ2vDi/XOuzjPR/6dT0aYujlm0sdTmzaoPOy+cPjTTEY6rymnWnLet+W LSye1qs7Q/P9JPFJ60WBmkJF6+ScBD74KXV21HzQzfF1bEmuHZ7S/zd0yFWjSs72t5+1Oh5Xtvu JHOP70OWyrswR9eloncWfjblu+q97qCllry2UHDWBiUA X-Developer-Key: i=dmitry.baryshkov@oss.qualcomm.com; a=openpgp; fpr=8F88381DD5C873E4AE487DA5199BF1243632046A X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUwNDI0MDA2MyBTYWx0ZWRfX2nj+SqG90QfA bg/3ga+F1naq+So0lUbm0sedkZ6ba9O7sv7lZWCfvbCjXTJsdDM/Rjn4ZotJR6bj1MZTxXp9QB8 ms/S3o37m364u3mgJnCFNh8LiIEUDx3aFLJIIL/scYGBGArMLBw16w7XGYFuVMsC++nRY30tItU vEs6tohz1Wjbf+dBq5tbfSN7UjPZ1kpLfE3wT5snv3dUWMISKHfZ0vHWflrs87yOf27lEYNdpcp vy/QpCdksRiUfcKLzRf7KTO6Js3ygto1MwKrn3jvGPNJ14dD7RXYmXF5V6t9ItnAdjjU+Ekk97G zwP82SrzibdU96wAj7LUrJxYz6W9UOLRfElpmqStOHRxf0PuDHjIipXFZpGOJWV+2/RhrPb2hJA 91otTxRwK3UAXMU+SOTB300WseJXa+zjhJUBzXHMfs1ZERbya9JIOrMP0paIj7VrqpsyTS0C X-Proofpoint-GUID: je5ACE6LOX8jPWNKDIpHcZxNTFEOSUxf X-Authority-Analysis: v=2.4 cv=B/S50PtM c=1 sm=1 tr=0 ts=680a04c3 cx=c_pps a=qKBjSQ1v91RyAK45QCPf5w==:117 a=xqWC_Br6kY4A:10 a=IkcTkHD0fZMA:10 a=XR8D0OoHHMoA:10 a=KKAkSRfTAAAA:8 a=COk6AnOGAAAA:8 a=k2A94KsD3O5M_qN9siwA:9 a=QEXdDO2ut3YA:10 a=NFOGd7dJGGMPyQGDc5-O:22 a=cvBusfyB2V15izCimMoJ:22 a=TjNXssC_j7lpFel5tvFf:22 X-Proofpoint-ORIG-GUID: je5ACE6LOX8jPWNKDIpHcZxNTFEOSUxf X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1099,Hydra:6.0.680,FMLib:17.12.80.40 definitions=2025-04-24_04,2025-04-22_01,2025-02-21_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 adultscore=0 mlxlogscore=904 lowpriorityscore=0 bulkscore=0 impostorscore=0 suspectscore=0 mlxscore=0 priorityscore=1501 phishscore=0 malwarescore=0 spamscore=0 clxscore=1015 classifier=spam authscore=0 authtc=n/a authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.19.0-2504070000 definitions=main-2504240063 From: Dmitry Baryshkov Continue migration to the MDSS-revision based checks and replace DPU_CTL_FETCH_ACTIVE feature bit with the core_major_ver >=3D 7 check. Signed-off-by: Dmitry Baryshkov Reviewed-by: Abhinav Kumar --- drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.c | 3 +-- drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.h | 2 -- drivers/gpu/drm/msm/disp/dpu1/dpu_hw_ctl.c | 2 +- 3 files changed, 2 insertions(+), 5 deletions(-) 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 0fcc9fb975c0955f459ba4264b6a114a4b17af52..3431b3c956486aee99664ea9b7c= 2e00f5c130b7f 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.c +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.c @@ -111,8 +111,7 @@ (BIT(DPU_PINGPONG_DITHER) | BIT(DPU_PINGPONG_DSC)) =20 #define CTL_SC7280_MASK \ - (BIT(DPU_CTL_FETCH_ACTIVE) | \ - BIT(DPU_CTL_VM_CFG) | \ + (BIT(DPU_CTL_VM_CFG) | \ BIT(DPU_CTL_DSPP_SUB_BLOCK_FLUSH)) =20 #define INTF_SC7180_MASK \ 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 b6c45ed4fa3d18ed21c2a2547b0d5af4debd974e..ae168e73026d8ebbe605397c6bb= d95552193498c 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.h +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.h @@ -134,14 +134,12 @@ enum { /** * CTL sub-blocks * @DPU_CTL_SPLIT_DISPLAY: CTL supports video mode split display - * @DPU_CTL_FETCH_ACTIVE: Active CTL for fetch HW (SSPPs) * @DPU_CTL_VM_CFG: CTL config to support multiple VMs * @DPU_CTL_DSPP_BLOCK_FLUSH: CTL config to support dspp sub-block flush * @DPU_CTL_MAX */ enum { DPU_CTL_SPLIT_DISPLAY =3D 0x1, - DPU_CTL_FETCH_ACTIVE, DPU_CTL_VM_CFG, DPU_CTL_DSPP_SUB_BLOCK_FLUSH, DPU_CTL_MAX diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_ctl.c b/drivers/gpu/drm/m= sm/disp/dpu1/dpu_hw_ctl.c index c63a6cbd07d94acae04b6edf534b1a7f5d4119b1..593da532d40042ca31fb452679d= 3de04c3b0d1a7 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_ctl.c +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_ctl.c @@ -786,7 +786,7 @@ struct dpu_hw_ctl *dpu_hw_ctl_init(struct drm_device *d= ev, else c->ops.update_pending_flush_dspp =3D dpu_hw_ctl_update_pending_flush_dsp= p; =20 - if (c->caps->features & BIT(DPU_CTL_FETCH_ACTIVE)) + if (mdss_ver->core_major_ver >=3D 7) c->ops.set_active_pipes =3D dpu_hw_ctl_set_fetch_pipe_active; =20 c->idx =3D cfg->id; --=20 2.39.5 From nobody Sun Feb 8 09:32:35 2026 Received: from mx0b-0031df01.pphosted.com (mx0b-0031df01.pphosted.com [205.220.180.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 EAB2A221FB7 for ; Thu, 24 Apr 2025 09:30:45 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=205.220.180.131 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745487048; cv=none; b=MaLfzgSuJ8f90Ma/zP4VeviA2NuSxOQxHtr0i6Hgq9Jm7KqQMhLzFXnxJ0jjimu/Gh/OYwiZvyLXT77dg5MOZNQj6En3JNn4Ep2D6KqjYmjrRSJbIJncUruSYbwKFUH1WyomX1OOu3JtIun1k8GNAeSyElgF98WOsMbnBkjJeog= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745487048; c=relaxed/simple; bh=U4GL5zF173e2x4GPZaOKTDYieJIngsEi0ILheHs1NI4=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=qTfrWRrvxnbRCJHsJARrR9R21lIb/KLB3rrrqVT9HoXdej7kKrQKH0VLlbxlrAeI4f6asdoAvEca2ZFY3EayDRD7Rt5edwdf3XOU7D5BKaBMXb1XFK2Wid8eWf5/zkZuGbHN62/e5QhfL8Cnl9BR6+W1ByIDJnGjQzp33EzCnQg= 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=VdSBPqBg; arc=none smtp.client-ip=205.220.180.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="VdSBPqBg" Received: from pps.filterd (m0279873.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 53O0F6Q2028369 for ; Thu, 24 Apr 2025 09:30:45 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= 6bD19mWyyeRl2BnZqRF5RUcMoFf4DqIr+Rm3GIwm2h8=; b=VdSBPqBgg3tzAqgX 0YnEqidQ9QmPSOkcBt5kulYTuvA7kzTKfasC02wwFqGYM2letFkH+TQBxGNZ57iV drPhBVJp5qGazmjJG3HInJdoS0RLPWNmL77qoY3Uu/KhX7tdceXHYPEXdGsBWwkb CCPWGvQsUa+hVwth2J5rZhH+mvkNGbtxNYCHVsMlZdT8eUffv3Pl+Ux4QwDk39s/ 1jQY/apF1BH4ENybPcPG852phIafvl+jULYEqZfqZjrjrAy6/mkDkQ+eKmEIq+ZM nza21sbIqaeIpjhygMmkBBWmpYuqRq5/4A9onOoK4SaNhxfqmLbfl+Na/QLMDuRy CoA4Pw== 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 466jgy4yxw-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Thu, 24 Apr 2025 09:30:44 +0000 (GMT) Received: by mail-qk1-f198.google.com with SMTP id af79cd13be357-7c54e7922a1so161946385a.2 for ; Thu, 24 Apr 2025 02:30:44 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1745487044; x=1746091844; 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=6bD19mWyyeRl2BnZqRF5RUcMoFf4DqIr+Rm3GIwm2h8=; b=E/iKE8pGH5RMc8ZC00R/dRnMHfQfHAPS8vbvNDacLchVycdNmX7hdIA9+qbl6fU1RS Csa5j+lM8/WpDbvZn6hyNE5bq9oTuQyle8QNB7cRpx9hiNc1zoREPizOi5R6QmuyStGs TQ1yrWvh9dk8FdhHiTuh6Lc8dEks/4nz5NlkPrJ+KBl+TLunPySQzMsPyEg97SFV6027 5jZ9Di4IuPh2JQBaj8Q6LskHgAGLrUujqGbJ0ejONW0CX+8OeChsS7deFWKQ1Rt6Tk0h ixTkORHDJwJ5CsRQVo637cWCYt/aRDVUMC09bgcxrVD7JE5Ssh1OQGbVJ853R9IlqFwa aX8Q== X-Forwarded-Encrypted: i=1; AJvYcCWC3NgoHmZ7MAB9m2CAcMd5sAraRwdxp+mDNGPGT/4TrDDRz351LjeMmrDcuBe81jWybpwtCrgYl4lJht0=@vger.kernel.org X-Gm-Message-State: AOJu0Yy8g1U7ZgR97RpHGJeFHvTYpEiS/uG1xK8vmv8+imK8oITDIqMQ Nn1fujaQYg/+JFQX5pAiLWafeUEV18pObw7rbg5AAee/V1G3/GKMKBAUiGn+LyJtazZvLiPHpSt +sS/fGlAwvm91Ngji4WJMrayobFJCZDzYG7GTlKDCWmOHORxtHxvg/nXUMGd6Lzw= X-Gm-Gg: ASbGncs4rYHgd4CC63z3YSOC0xITy6+jzZniwqlzH3MAoYbaqHP6Nc9OSNAWq6xx0OS XcsIJEH/uVD9hB97HPsRcaS5N0I3mAnKiJT926WjqXu4nRPbhhJEGZjiDM+i/XGCKzj9aIZPSLT 09FjkOLx5ZjATvk3tmd0nNxNmnLmf8V0Gg8yr9cdMP4B7GCN22uKviFcamjnVOjD+ZcVnF2sFoz tn19C9zX97Q5QpxCYVysJbqlpGF1Gfi+PrURw5LvkyXrUwgrTITGygweKoAVS8Sf1wbUom6BYlS eDuZzl0NAPU6iRgy4vLb3rcciJeMDmslChE5uPYX7PyWJZ6zA2qZmFVrTa3oNqPgtQx/IQsakDg qC80O3Rw9WWA9stv/0+YnjVoS X-Received: by 2002:a05:620a:248e:b0:7c0:c046:7c6b with SMTP id af79cd13be357-7c956f4b1b0mr309106685a.53.1745487043814; Thu, 24 Apr 2025 02:30:43 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGAwo3TGBB0JbKYaGM0Jh5jTBbjQoUKUqSjxZ/rWO3kT7qP1SCGWEJowM6QHyb0GtkW/P4jgQ== X-Received: by 2002:a05:620a:248e:b0:7c0:c046:7c6b with SMTP id af79cd13be357-7c956f4b1b0mr309103285a.53.1745487043469; Thu, 24 Apr 2025 02:30:43 -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 38308e7fff4ca-317d1b9a304sm1820461fa.99.2025.04.24.02.30.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 24 Apr 2025 02:30:42 -0700 (PDT) From: Dmitry Baryshkov Date: Thu, 24 Apr 2025 12:30:15 +0300 Subject: [PATCH v3 11/33] drm/msm/dpu: get rid of DPU_CTL_DSPP_SUB_BLOCK_FLUSH 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: <20250424-dpu-drop-features-v3-11-cdaca81d356f@oss.qualcomm.com> References: <20250424-dpu-drop-features-v3-0-cdaca81d356f@oss.qualcomm.com> In-Reply-To: <20250424-dpu-drop-features-v3-0-cdaca81d356f@oss.qualcomm.com> To: Rob Clark , Abhinav Kumar , Sean Paul , Marijn Suijten , David Airlie , Simona Vetter , Vinod Koul , Konrad Dybcio Cc: 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=2655; i=dmitry.baryshkov@oss.qualcomm.com; h=from:subject:message-id; bh=UKa7WiIdYlZA+i2dElAGlJso1hJFJoPQsInsDm2A0CU=; b=owEBbQGS/pANAwAKAYs8ij4CKSjVAcsmYgBoCgSsqIEafMwgDFJ9BeM4xMLeUsIlU/Y+LsPuC jeLsprgl4WJATMEAAEKAB0WIQRMcISVXLJjVvC4lX+LPIo+Aiko1QUCaAoErAAKCRCLPIo+Aiko 1eLzB/9/MN/nCIlTddRpL8y8PUD9UWVVm1g/yG4CTqbexASMeX3PBht683qN5wR5d8s8zSZ3v2F 2piE5d2FtnLewMmHgG/16+1gUDc1QN/YoBpymM8KQx0cI/1iCWagr7ilm3X+Smx0SEDlKm/6Dre pCg3TBtRtIH5vBKIKLzTm9L9/CTMSr6xfW96DKDkrJ2IUde/JRVwnIOUK3zTNu1pBn6SY8sUmDA /Pt9HxHKLIwRysczI90K89hgLH/9iV4euy/FXuoN7ZQNfJZMxi8uBnr1XbBNDkqnU6nIaIhTPuZ swLpHxOa1YpgT+fpViIPiqaDGa84+9qLm/KCPio/rDZZF93d X-Developer-Key: i=dmitry.baryshkov@oss.qualcomm.com; a=openpgp; fpr=8F88381DD5C873E4AE487DA5199BF1243632046A X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUwNDI0MDA2MyBTYWx0ZWRfX9FAeua0ZPend Dbra2Y+8egvKrwMWqx8Xuh27wvs/kqpbRIAl0+QnD1plTp5hAXgyUkbh41C5KxkKztv509fv2pQ P2aYsJW6rIqCsiO4wWWrlCv5+EI0KHtqh4IBG9147pNXvUfAdBboRgt+6RzVVeZ05vFPlMmsmmt e7wOZgD/JCfEUUB6VmVWLM+J/zdqloclADOOX66i+wgYwSZ1swaQ+MUrNisnzq9syEWQyprjoS+ iJoUeUXL7aWzQnMPIAc8ft5WVs+ZNsBfrlcrQA9QbRrmEqkRFq9PRgl+CQnxxv52+b/dNHphYFN 2imLb/pmapOEKv7w/rMOxFPdCt5B2ztTHYC7BEvJfMp5yThEV/Foak6AI0QUfv+On4dCMgKKaxx 2KvdYUS0pf/XMOCWDZfA1gPXXLNWaHtZ6D4r4KxU70Y3Em9dwpMkfz+TxUHlCzwIZHPHDVrF X-Proofpoint-GUID: Esb0lhT4zaGgaW8SpgefonF8_dO9cJNs X-Proofpoint-ORIG-GUID: Esb0lhT4zaGgaW8SpgefonF8_dO9cJNs X-Authority-Analysis: v=2.4 cv=M5VNKzws c=1 sm=1 tr=0 ts=680a04c4 cx=c_pps a=qKBjSQ1v91RyAK45QCPf5w==:117 a=xqWC_Br6kY4A:10 a=IkcTkHD0fZMA:10 a=XR8D0OoHHMoA:10 a=KKAkSRfTAAAA:8 a=COk6AnOGAAAA:8 a=qfl85FH2DSYpkZ7DoNYA:9 a=QEXdDO2ut3YA:10 a=NFOGd7dJGGMPyQGDc5-O:22 a=cvBusfyB2V15izCimMoJ:22 a=TjNXssC_j7lpFel5tvFf:22 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1099,Hydra:6.0.680,FMLib:17.12.80.40 definitions=2025-04-24_04,2025-04-22_01,2025-02-21_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 bulkscore=0 lowpriorityscore=0 adultscore=0 spamscore=0 priorityscore=1501 mlxscore=0 mlxlogscore=999 malwarescore=0 impostorscore=0 clxscore=1015 suspectscore=0 phishscore=0 classifier=spam authscore=0 authtc=n/a authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.19.0-2504070000 definitions=main-2504240063 From: Dmitry Baryshkov Continue migration to the MDSS-revision based checks and replace DPU_CTL_DSPP_SUB_BLOCK_FLUSH feature bit with the core_major_ver >=3D 7 check. Signed-off-by: Dmitry Baryshkov Reviewed-by: Abhinav Kumar --- drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.c | 3 +-- drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.h | 2 -- drivers/gpu/drm/msm/disp/dpu1/dpu_hw_ctl.c | 2 +- 3 files changed, 2 insertions(+), 5 deletions(-) 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 3431b3c956486aee99664ea9b7c2e00f5c130b7f..a2dc353151f3e1a4cb8a9f4644e= 7fc2e037356a2 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.c +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.c @@ -111,8 +111,7 @@ (BIT(DPU_PINGPONG_DITHER) | BIT(DPU_PINGPONG_DSC)) =20 #define CTL_SC7280_MASK \ - (BIT(DPU_CTL_VM_CFG) | \ - BIT(DPU_CTL_DSPP_SUB_BLOCK_FLUSH)) + (BIT(DPU_CTL_VM_CFG)) =20 #define INTF_SC7180_MASK \ (BIT(DPU_INTF_INPUT_CTRL) | \ 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 ae168e73026d8ebbe605397c6bbd95552193498c..1c6be8f93b54f28d370a379d1ed= ccd178fe3cf7b 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.h +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.h @@ -135,13 +135,11 @@ enum { * CTL sub-blocks * @DPU_CTL_SPLIT_DISPLAY: CTL supports video mode split display * @DPU_CTL_VM_CFG: CTL config to support multiple VMs - * @DPU_CTL_DSPP_BLOCK_FLUSH: CTL config to support dspp sub-block flush * @DPU_CTL_MAX */ enum { DPU_CTL_SPLIT_DISPLAY =3D 0x1, DPU_CTL_VM_CFG, - DPU_CTL_DSPP_SUB_BLOCK_FLUSH, DPU_CTL_MAX }; =20 diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_ctl.c b/drivers/gpu/drm/m= sm/disp/dpu1/dpu_hw_ctl.c index 593da532d40042ca31fb452679d3de04c3b0d1a7..543fe12252b7887ce2bd28abafa= c3be7caf17ac4 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_ctl.c +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_ctl.c @@ -781,7 +781,7 @@ struct dpu_hw_ctl *dpu_hw_ctl_init(struct drm_device *d= ev, c->ops.setup_blendstage =3D dpu_hw_ctl_setup_blendstage; c->ops.update_pending_flush_sspp =3D dpu_hw_ctl_update_pending_flush_sspp; c->ops.update_pending_flush_mixer =3D dpu_hw_ctl_update_pending_flush_mix= er; - if (c->caps->features & BIT(DPU_CTL_DSPP_SUB_BLOCK_FLUSH)) + if (mdss_ver->core_major_ver >=3D 7) c->ops.update_pending_flush_dspp =3D dpu_hw_ctl_update_pending_flush_dsp= p_sub_blocks; else c->ops.update_pending_flush_dspp =3D dpu_hw_ctl_update_pending_flush_dsp= p; --=20 2.39.5 From nobody Sun Feb 8 09:32:35 2026 Received: from mx0b-0031df01.pphosted.com (mx0b-0031df01.pphosted.com [205.220.180.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 2F59E226170 for ; Thu, 24 Apr 2025 09:30:50 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=205.220.180.131 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745487053; cv=none; b=P80mNyy8jVklrrM/y33gbYxv9ca2Y1a4thbB6R74dO2A2bixXAhhBeHnIV3Q8/kldW5pC3wxmhRS4tkrRpWBPYS0xfDW3UZ1GJju8jGGpDwePgkcdfmUzVdjnjMmOcvtCzqm/U08+dDz3JNUZZtfIE9DCYY0/s6uhgPLEu7yi2I= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745487053; c=relaxed/simple; bh=XS7CNXyngJlfAvtuL9tp1r75hlGCItPpCAMx/wj7X6s=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=lG/szHV33ieh9tMZ4lE/qkL7FjJAP2LG/rj0UnspYn5r0jH8j3OYZ7Ruwq3ucskUo8GC2nEHr5wddnK2u1Yr2yEVEjR0MaxVJLihC86s5EFhaeQzKJ0gT+oqclt4qr6xTF3ng2Yp2D+bNyQe5o+lmZYS0PICtoE3cKPPrfh3P+c= 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=hIEdzb4e; arc=none smtp.client-ip=205.220.180.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="hIEdzb4e" Received: from pps.filterd (m0279868.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 53O0F6Ew003384 for ; Thu, 24 Apr 2025 09:30:49 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= F8KVHsnOFRuRXpiK5xU3zOFSxJprJgrKOnBMKsdyke4=; b=hIEdzb4eMmuSaOHA yEbM75WBCRel+WJd/KLG6NDt/JEN9bA8HS14Ek+BuMsGZgduP8Bud5r1i5uZEonW QlNFPZe7GJY0NxH/j3JnbCN1OlThe7k8LTieo5mdr4XftxUZumk4g9wiDByzBHp1 urE2fc4MmR80LSmRXAlzoPrB3M6aRILYAyMDsbZE4s977czUWsxiP7cHBuuaP2Jz sOZ5eMxEPNZ/xR6VdKCYyku6Q3gUCPMZgkkESA269dTuH/1yfe0WIVkKHuQ6Jjno H2J7Z25LTLrw7ExeNudvotCNpm2IpZYGFJAWz74SOOpSHpmQiMOqbGJi/MNRiUCP DBToLQ== Received: from mail-qk1-f197.google.com (mail-qk1-f197.google.com [209.85.222.197]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 466jh0my94-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Thu, 24 Apr 2025 09:30:48 +0000 (GMT) Received: by mail-qk1-f197.google.com with SMTP id af79cd13be357-7c791987cf6so169185085a.0 for ; Thu, 24 Apr 2025 02:30:48 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1745487045; x=1746091845; 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=F8KVHsnOFRuRXpiK5xU3zOFSxJprJgrKOnBMKsdyke4=; b=uW5wqKK4r99ZF9dA0SDx4KuXooDDHDEX5sVUllZybmIjQFUCtRS2PRw7vxSk2xrJsw 36wCUMtjup1i4zdgfrCFAEb1a5jnsWXhzo1z/DofHxYT12CEf3ztrukxl82OEk0cYDzO Czj2aymJYIwBpOVBZgeiosvkdamKPQjHprzBmPgpnnet1mMbT/g1oy+bBGs+g3GmH1kU Y7XnUyx495HSInwnB7YtGffll7KejDpFGWsUB9N1OX389LkRr4hkxea6g7taC1i71mYZ +vkzX1vlcD1pOWjEqW1ryeJFOi8/1RlsNfvpvwFdR61n3JAWkhopA6h1JvXvSvdejhmS FmBg== X-Forwarded-Encrypted: i=1; AJvYcCUx/uG5sIKn2i1YpSNRDMnlyI8z9Nj1fJKQZ2djCFhipLPjhHNuc+3YoogHWoXiCNjAUo16RxIVMu3DzUw=@vger.kernel.org X-Gm-Message-State: AOJu0YzwWq0NipukjKHWf0b/DKXRaDw+tjxDmOGFeSagrGYr4vC3hufA 5fOe9lgqncR+qrGkcSa9GcikaaxCsxsvJwE3p2QAKE7c6S8qmxQb0AzsufrgbALMqyvRnmaIGXc QlRC4MNLwo9NLzLXAarS09Ny70w443nT8LL5Mffylfu2LNdvcvTZUvVyaNSfKv8Y= X-Gm-Gg: ASbGncv4I5WdVOq3dwZaFjuwl3Nc5ZAaQv6xV8ELpClZcRM0OBrMZhbxbKkXNDPgOa9 NQOZ2LIMUfx2m02yAYZveMNnvCFWwi5vr/ucpYztM/4gyvpVK6wKL8MBTuIa86YLHwMC9foTzSb 7Sll7DtIZpGclL8aE89o6eA0O2S4h5M/jX0drZGsTpDfLIiIcc+AhGDdW1W33seiGskMOQiAPIG c/xjdNi4407M6Tz4ylONoiIamMq+wkN40mqB0uV2wL3a1+V3wCBM/Uadgztk28gwXPxgn4Ju7uA Rh1wbR9xmDNrHrtywb2G8iIin4hGNoGUIoYgSwkUkDaPR4Cw2cEWz+ZmZsMX9gKDrqbRyy0lrem fa2KrIuvpAwoWfOlF78OMJO4G X-Received: by 2002:a05:620a:45a5:b0:7c5:5a51:d2d1 with SMTP id af79cd13be357-7c956f471bbmr358948385a.55.1745487045456; Thu, 24 Apr 2025 02:30:45 -0700 (PDT) X-Google-Smtp-Source: AGHT+IG3RLd2OURtEpN0wWDOYE5ic2brd8ZkWNHntUUWiuO8CTO8D04VBoDT1b6r9TMu75McvCBNyw== X-Received: by 2002:a05:620a:45a5:b0:7c5:5a51:d2d1 with SMTP id af79cd13be357-7c956f471bbmr358941585a.55.1745487044824; Thu, 24 Apr 2025 02:30:44 -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 38308e7fff4ca-317d1b9a304sm1820461fa.99.2025.04.24.02.30.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 24 Apr 2025 02:30:43 -0700 (PDT) From: Dmitry Baryshkov Date: Thu, 24 Apr 2025 12:30:16 +0300 Subject: [PATCH v3 12/33] drm/msm/dpu: get rid of DPU_CTL_VM_CFG 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: <20250424-dpu-drop-features-v3-12-cdaca81d356f@oss.qualcomm.com> References: <20250424-dpu-drop-features-v3-0-cdaca81d356f@oss.qualcomm.com> In-Reply-To: <20250424-dpu-drop-features-v3-0-cdaca81d356f@oss.qualcomm.com> To: Rob Clark , Abhinav Kumar , Sean Paul , Marijn Suijten , David Airlie , Simona Vetter , Vinod Koul , Konrad Dybcio Cc: 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=15065; i=dmitry.baryshkov@oss.qualcomm.com; h=from:subject:message-id; bh=47KdKwzl6eJzgTGC1PmI4bMv2JSspbmc7E5cJjyGADw=; b=owEBbQGS/pANAwAKAYs8ij4CKSjVAcsmYgBoCgSsWXxVoelQh9KOS2QBoqkyOEMQ/S05yitO3 m06qh/tUcCJATMEAAEKAB0WIQRMcISVXLJjVvC4lX+LPIo+Aiko1QUCaAoErAAKCRCLPIo+Aiko 1fngB/wPLtPCJAbuRTfyphNxLy6j7cBmbnL0V88C+v6ubzJHlWGd5XZ38SflD7uV83TSyUlXyfH 0SyWe1Hoh5QdNtH2TpuBFJKVM8DfZatfBOPQ15cGiycKxBi8GEndthoAPCE2wIc+GMPZpaT57WR xaK6RsKfmfBPkazBQml6cxGWkG49l6awPZSIxlsMz4EkPcDU5HYTZRsqK0PXoMxx+Hepv/xRLtn izqlmZ+Q9aY5zYmNhClArIaw3J7UT1SXA4pxmKVeenKXBxAW/eSZrJ5KR4CDyGgqcUTx+BVKeuC 0IiDZBklX21KgvKBJUaQPWdNbUCnTEaSs/yKg9Qn5w2dL2bC X-Developer-Key: i=dmitry.baryshkov@oss.qualcomm.com; a=openpgp; fpr=8F88381DD5C873E4AE487DA5199BF1243632046A X-Proofpoint-ORIG-GUID: TcNmYZU2DhbmDj7TaKUaxqBxPCaV-d82 X-Authority-Analysis: v=2.4 cv=ftfcZE4f c=1 sm=1 tr=0 ts=680a04c8 cx=c_pps a=50t2pK5VMbmlHzFWWp8p/g==:117 a=xqWC_Br6kY4A:10 a=IkcTkHD0fZMA:10 a=XR8D0OoHHMoA:10 a=KKAkSRfTAAAA:8 a=COk6AnOGAAAA:8 a=2tDT8zELnxangoEIUYcA:9 a=QEXdDO2ut3YA:10 a=IoWCM6iH3mJn3m4BftBB:22 a=cvBusfyB2V15izCimMoJ:22 a=TjNXssC_j7lpFel5tvFf:22 X-Proofpoint-GUID: TcNmYZU2DhbmDj7TaKUaxqBxPCaV-d82 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUwNDI0MDA2MyBTYWx0ZWRfX0MO4cNzTCtto hT8fzR9DCw/PadNV7Mt9OHey2VD8mV7ej1ss23km2Af/zC9jTmsIgliQyIibCBcwFr9nNyNF7c+ AJDTF/aESQj6QPgipd2MBafvIu++q6bxAwLPBaxcArVPCBypWq767BAmx6yAcq6lWAisMJiKzXm K9QC6VCaDuqAzxkDSUlZLCML12O9V6w24fA3mBCbz9QAnfSQ+WXPwjat6wNr3EZgY/3h0zaIBQl usBQmOgcTKH50hkplOnhhFFaFeEokO2iSOW+su6idqGs5HOyyTebu9YWpvx4yIGpkGo92ct6JPz LgL59M2WNTeXSJSwcbkOOmoKUH+RYh0zkEH51d1HVoCz2XrEwlVg6gGsszQe/d5uUPNbGYXAnxK rhZR+721+NsmyU9cW2IHAipvGsXqzNl3XlZCMwrk5f4aEnn47H1M52BMuake2xx7Oi5gNQOz X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1099,Hydra:6.0.680,FMLib:17.12.80.40 definitions=2025-04-24_04,2025-04-22_01,2025-02-21_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 bulkscore=0 mlxscore=0 suspectscore=0 mlxlogscore=999 lowpriorityscore=0 phishscore=0 malwarescore=0 impostorscore=0 adultscore=0 spamscore=0 clxscore=1015 priorityscore=1501 classifier=spam authscore=0 authtc=n/a authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.19.0-2504070000 definitions=main-2504240063 From: Dmitry Baryshkov Continue migration to the MDSS-revision based checks and replace DPU_CTL_VM_CFG feature bit with the core_major_ver >=3D 7 check. Signed-off-by: Dmitry Baryshkov Reviewed-by: Abhinav Kumar --- drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_10_0_sm8650.h | 8 ++------ drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_7_0_sm8350.h | 8 ++------ drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_7_2_sc7280.h | 4 ---- drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_8_0_sc8280xp.h | 8 ++------ drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_8_1_sm8450.h | 8 ++------ drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_8_4_sa8775p.h | 8 ++------ drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_9_0_sm8550.h | 8 ++------ drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_9_2_x1e80100.h | 8 ++------ drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.c | 3 --- drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.h | 2 -- drivers/gpu/drm/msm/disp/dpu1/dpu_hw_ctl.c | 2 +- 11 files changed, 15 insertions(+), 52 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 922c9c6ebd82cdfc7f948df590091852282c9f64..4ab361b7c977c2c97927543154d= 5dcd00091879c 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 @@ -32,32 +32,28 @@ static const struct dpu_ctl_cfg sm8650_ctl[] =3D { { .name =3D "ctl_0", .id =3D CTL_0, .base =3D 0x15000, .len =3D 0x1000, - .features =3D CTL_SC7280_MASK | BIT(DPU_CTL_SPLIT_DISPLAY), + .features =3D BIT(DPU_CTL_SPLIT_DISPLAY), .intr_start =3D DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR2, 9), }, { .name =3D "ctl_1", .id =3D CTL_1, .base =3D 0x16000, .len =3D 0x1000, - .features =3D CTL_SC7280_MASK | BIT(DPU_CTL_SPLIT_DISPLAY), + .features =3D BIT(DPU_CTL_SPLIT_DISPLAY), .intr_start =3D DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR2, 10), }, { .name =3D "ctl_2", .id =3D CTL_2, .base =3D 0x17000, .len =3D 0x1000, - .features =3D CTL_SC7280_MASK, .intr_start =3D DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR2, 11), }, { .name =3D "ctl_3", .id =3D CTL_3, .base =3D 0x18000, .len =3D 0x1000, - .features =3D CTL_SC7280_MASK, .intr_start =3D DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR2, 12), }, { .name =3D "ctl_4", .id =3D CTL_4, .base =3D 0x19000, .len =3D 0x1000, - .features =3D CTL_SC7280_MASK, .intr_start =3D DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR2, 13), }, { .name =3D "ctl_5", .id =3D CTL_5, .base =3D 0x1a000, .len =3D 0x1000, - .features =3D CTL_SC7280_MASK, .intr_start =3D DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR2, 23), }, }; 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 6fc6083607403be8ad2287952c99c7bd4d30f2e4..490ddf9880103fc853b5187256c= 4b960739820bc 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 @@ -40,32 +40,28 @@ static const struct dpu_ctl_cfg sm8350_ctl[] =3D { { .name =3D "ctl_0", .id =3D CTL_0, .base =3D 0x15000, .len =3D 0x1e8, - .features =3D BIT(DPU_CTL_SPLIT_DISPLAY) | CTL_SC7280_MASK, + .features =3D BIT(DPU_CTL_SPLIT_DISPLAY), .intr_start =3D DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR2, 9), }, { .name =3D "ctl_1", .id =3D CTL_1, .base =3D 0x16000, .len =3D 0x1e8, - .features =3D BIT(DPU_CTL_SPLIT_DISPLAY) | CTL_SC7280_MASK, + .features =3D BIT(DPU_CTL_SPLIT_DISPLAY), .intr_start =3D DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR2, 10), }, { .name =3D "ctl_2", .id =3D CTL_2, .base =3D 0x17000, .len =3D 0x1e8, - .features =3D CTL_SC7280_MASK, .intr_start =3D DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR2, 11), }, { .name =3D "ctl_3", .id =3D CTL_3, .base =3D 0x18000, .len =3D 0x1e8, - .features =3D CTL_SC7280_MASK, .intr_start =3D DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR2, 12), }, { .name =3D "ctl_4", .id =3D CTL_4, .base =3D 0x19000, .len =3D 0x1e8, - .features =3D CTL_SC7280_MASK, .intr_start =3D DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR2, 13), }, { .name =3D "ctl_5", .id =3D CTL_5, .base =3D 0x1a000, .len =3D 0x1e8, - .features =3D CTL_SC7280_MASK, .intr_start =3D DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR2, 23), }, }; 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 281826170da082fc90a05c641060901ece0fbed3..2ee29c56224596b378610409029= 0b88cecf7b223 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 @@ -32,22 +32,18 @@ static const struct dpu_ctl_cfg sc7280_ctl[] =3D { { .name =3D "ctl_0", .id =3D CTL_0, .base =3D 0x15000, .len =3D 0x1e8, - .features =3D CTL_SC7280_MASK, .intr_start =3D DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR2, 9), }, { .name =3D "ctl_1", .id =3D CTL_1, .base =3D 0x16000, .len =3D 0x1e8, - .features =3D CTL_SC7280_MASK, .intr_start =3D DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR2, 10), }, { .name =3D "ctl_2", .id =3D CTL_2, .base =3D 0x17000, .len =3D 0x1e8, - .features =3D CTL_SC7280_MASK, .intr_start =3D DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR2, 11), }, { .name =3D "ctl_3", .id =3D CTL_3, .base =3D 0x18000, .len =3D 0x1e8, - .features =3D CTL_SC7280_MASK, .intr_start =3D DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR2, 12), }, }; 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 957e92d63f07723c8834bbb6e9c5a4d6449999a4..dac38e0ade971876c2ed73b6d46= cd4055cb77d2d 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 @@ -40,32 +40,28 @@ static const struct dpu_ctl_cfg sc8280xp_ctl[] =3D { { .name =3D "ctl_0", .id =3D CTL_0, .base =3D 0x15000, .len =3D 0x204, - .features =3D BIT(DPU_CTL_SPLIT_DISPLAY) | CTL_SC7280_MASK, + .features =3D BIT(DPU_CTL_SPLIT_DISPLAY), .intr_start =3D DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR2, 9), }, { .name =3D "ctl_1", .id =3D CTL_1, .base =3D 0x16000, .len =3D 0x204, - .features =3D BIT(DPU_CTL_SPLIT_DISPLAY) | CTL_SC7280_MASK, + .features =3D BIT(DPU_CTL_SPLIT_DISPLAY), .intr_start =3D DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR2, 10), }, { .name =3D "ctl_2", .id =3D CTL_2, .base =3D 0x17000, .len =3D 0x204, - .features =3D CTL_SC7280_MASK, .intr_start =3D DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR2, 11), }, { .name =3D "ctl_3", .id =3D CTL_3, .base =3D 0x18000, .len =3D 0x204, - .features =3D CTL_SC7280_MASK, .intr_start =3D DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR2, 12), }, { .name =3D "ctl_4", .id =3D CTL_4, .base =3D 0x19000, .len =3D 0x204, - .features =3D CTL_SC7280_MASK, .intr_start =3D DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR2, 13), }, { .name =3D "ctl_5", .id =3D CTL_5, .base =3D 0x1a000, .len =3D 0x204, - .features =3D CTL_SC7280_MASK, .intr_start =3D DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR2, 23), }, }; 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 ec0cf30306d2adbd5f07a2b6a6a443d29e11f712..db332286a0a92cfda434571a2a5= 82c45460e5300 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 @@ -41,32 +41,28 @@ static const struct dpu_ctl_cfg sm8450_ctl[] =3D { { .name =3D "ctl_0", .id =3D CTL_0, .base =3D 0x15000, .len =3D 0x204, - .features =3D BIT(DPU_CTL_SPLIT_DISPLAY) | CTL_SC7280_MASK, + .features =3D BIT(DPU_CTL_SPLIT_DISPLAY), .intr_start =3D DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR2, 9), }, { .name =3D "ctl_1", .id =3D CTL_1, .base =3D 0x16000, .len =3D 0x204, - .features =3D BIT(DPU_CTL_SPLIT_DISPLAY) | CTL_SC7280_MASK, + .features =3D BIT(DPU_CTL_SPLIT_DISPLAY), .intr_start =3D DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR2, 10), }, { .name =3D "ctl_2", .id =3D CTL_2, .base =3D 0x17000, .len =3D 0x204, - .features =3D CTL_SC7280_MASK, .intr_start =3D DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR2, 11), }, { .name =3D "ctl_3", .id =3D CTL_3, .base =3D 0x18000, .len =3D 0x204, - .features =3D CTL_SC7280_MASK, .intr_start =3D DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR2, 12), }, { .name =3D "ctl_4", .id =3D CTL_4, .base =3D 0x19000, .len =3D 0x204, - .features =3D CTL_SC7280_MASK, .intr_start =3D DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR2, 13), }, { .name =3D "ctl_5", .id =3D CTL_5, .base =3D 0x1a000, .len =3D 0x204, - .features =3D CTL_SC7280_MASK, .intr_start =3D DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR2, 23), }, }; 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 4bded17f2e371a48a5b21808b9f0c55c00efbecf..826cd366495139e0e4cf1862e92= 3ef0ece0d7184 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 @@ -40,32 +40,28 @@ static const struct dpu_ctl_cfg sa8775p_ctl[] =3D { { .name =3D "ctl_0", .id =3D CTL_0, .base =3D 0x15000, .len =3D 0x204, - .features =3D BIT(DPU_CTL_SPLIT_DISPLAY) | CTL_SC7280_MASK, + .features =3D BIT(DPU_CTL_SPLIT_DISPLAY), .intr_start =3D DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR2, 9), }, { .name =3D "ctl_1", .id =3D CTL_1, .base =3D 0x16000, .len =3D 0x204, - .features =3D BIT(DPU_CTL_SPLIT_DISPLAY) | CTL_SC7280_MASK, + .features =3D BIT(DPU_CTL_SPLIT_DISPLAY), .intr_start =3D DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR2, 10), }, { .name =3D "ctl_2", .id =3D CTL_2, .base =3D 0x17000, .len =3D 0x204, - .features =3D CTL_SC7280_MASK, .intr_start =3D DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR2, 11), }, { .name =3D "ctl_3", .id =3D CTL_3, .base =3D 0x18000, .len =3D 0x204, - .features =3D CTL_SC7280_MASK, .intr_start =3D DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR2, 12), }, { .name =3D "ctl_4", .id =3D CTL_4, .base =3D 0x19000, .len =3D 0x204, - .features =3D CTL_SC7280_MASK, .intr_start =3D DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR2, 13), }, { .name =3D "ctl_5", .id =3D CTL_5, .base =3D 0x1a000, .len =3D 0x204, - .features =3D CTL_SC7280_MASK, .intr_start =3D DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR2, 23), }, }; 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 e17345d954f26b234ef6cd65843e1cb349376ed3..f5f018381b4f0f59c2751b18528= 994ff79555d58 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 @@ -32,32 +32,28 @@ static const struct dpu_ctl_cfg sm8550_ctl[] =3D { { .name =3D "ctl_0", .id =3D CTL_0, .base =3D 0x15000, .len =3D 0x290, - .features =3D CTL_SC7280_MASK | BIT(DPU_CTL_SPLIT_DISPLAY), + .features =3D BIT(DPU_CTL_SPLIT_DISPLAY), .intr_start =3D DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR2, 9), }, { .name =3D "ctl_1", .id =3D CTL_1, .base =3D 0x16000, .len =3D 0x290, - .features =3D CTL_SC7280_MASK | BIT(DPU_CTL_SPLIT_DISPLAY), + .features =3D BIT(DPU_CTL_SPLIT_DISPLAY), .intr_start =3D DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR2, 10), }, { .name =3D "ctl_2", .id =3D CTL_2, .base =3D 0x17000, .len =3D 0x290, - .features =3D CTL_SC7280_MASK, .intr_start =3D DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR2, 11), }, { .name =3D "ctl_3", .id =3D CTL_3, .base =3D 0x18000, .len =3D 0x290, - .features =3D CTL_SC7280_MASK, .intr_start =3D DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR2, 12), }, { .name =3D "ctl_4", .id =3D CTL_4, .base =3D 0x19000, .len =3D 0x290, - .features =3D CTL_SC7280_MASK, .intr_start =3D DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR2, 13), }, { .name =3D "ctl_5", .id =3D CTL_5, .base =3D 0x1a000, .len =3D 0x290, - .features =3D CTL_SC7280_MASK, .intr_start =3D DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR2, 23), }, }; 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 4d37587d6a6374d9e6ed6d8f13837aae0ef55c34..ecda48282f52e0fc33b68117650= b9f2b76c90276 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 @@ -31,32 +31,28 @@ static const struct dpu_ctl_cfg x1e80100_ctl[] =3D { { .name =3D "ctl_0", .id =3D CTL_0, .base =3D 0x15000, .len =3D 0x290, - .features =3D CTL_SC7280_MASK | BIT(DPU_CTL_SPLIT_DISPLAY), + .features =3D BIT(DPU_CTL_SPLIT_DISPLAY), .intr_start =3D DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR2, 9), }, { .name =3D "ctl_1", .id =3D CTL_1, .base =3D 0x16000, .len =3D 0x290, - .features =3D CTL_SC7280_MASK | BIT(DPU_CTL_SPLIT_DISPLAY), + .features =3D BIT(DPU_CTL_SPLIT_DISPLAY), .intr_start =3D DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR2, 10), }, { .name =3D "ctl_2", .id =3D CTL_2, .base =3D 0x17000, .len =3D 0x290, - .features =3D CTL_SC7280_MASK, .intr_start =3D DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR2, 11), }, { .name =3D "ctl_3", .id =3D CTL_3, .base =3D 0x18000, .len =3D 0x290, - .features =3D CTL_SC7280_MASK, .intr_start =3D DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR2, 12), }, { .name =3D "ctl_4", .id =3D CTL_4, .base =3D 0x19000, .len =3D 0x290, - .features =3D CTL_SC7280_MASK, .intr_start =3D DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR2, 13), }, { .name =3D "ctl_5", .id =3D CTL_5, .base =3D 0x1a000, .len =3D 0x290, - .features =3D CTL_SC7280_MASK, .intr_start =3D DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR2, 23), }, }; 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 a2dc353151f3e1a4cb8a9f4644e7fc2e037356a2..22ca093419059600f0ad7e1e7a0= a4e443b977860 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.c +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.c @@ -110,9 +110,6 @@ #define PINGPONG_SM8150_MASK \ (BIT(DPU_PINGPONG_DITHER) | BIT(DPU_PINGPONG_DSC)) =20 -#define CTL_SC7280_MASK \ - (BIT(DPU_CTL_VM_CFG)) - #define INTF_SC7180_MASK \ (BIT(DPU_INTF_INPUT_CTRL) | \ BIT(DPU_INTF_STATUS_SUPPORTED) | \ 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 1c6be8f93b54f28d370a379d1edccd178fe3cf7b..27422a5a340b90ee02f36a87cf1= bab9d97504c76 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.h +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.h @@ -134,12 +134,10 @@ enum { /** * CTL sub-blocks * @DPU_CTL_SPLIT_DISPLAY: CTL supports video mode split display - * @DPU_CTL_VM_CFG: CTL config to support multiple VMs * @DPU_CTL_MAX */ enum { DPU_CTL_SPLIT_DISPLAY =3D 0x1, - DPU_CTL_VM_CFG, DPU_CTL_MAX }; =20 diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_ctl.c b/drivers/gpu/drm/m= sm/disp/dpu1/dpu_hw_ctl.c index 543fe12252b7887ce2bd28abafac3be7caf17ac4..7f6c548b626dbc5bcc3ddb27f18= 5f336354dcb37 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_ctl.c +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_ctl.c @@ -568,7 +568,7 @@ static void dpu_hw_ctl_intf_cfg_v1(struct dpu_hw_ctl *c= tx, * per VM. Explicitly disable it until VM support is * added in SW. Power on reset value is not disable. */ - if ((test_bit(DPU_CTL_VM_CFG, &ctx->caps->features))) + if (ctx->mdss_ver->core_major_ver >=3D 7) mode_sel =3D CTL_DEFAULT_GROUP_ID << 28; =20 if (cfg->intf_mode_sel =3D=3D DPU_CTL_MODE_SEL_CMD) --=20 2.39.5 From nobody Sun Feb 8 09:32:35 2026 Received: from mx0b-0031df01.pphosted.com (mx0b-0031df01.pphosted.com [205.220.180.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 09EAF229B21 for ; Thu, 24 Apr 2025 09:30:51 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=205.220.180.131 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745487054; cv=none; b=cL617kI+TyjP7FUKvJYiEzPUKpHg8qlfWs4Xjy6rZ8+5FZ4JnmXW1oYxFV+GzZOQ5rjElVeivGQxNkmzKvah9ixO5+mHUqVPUgOEEAuy7IeX82C/0gUOWuICqNm/CkZprwdUCLH+5m0QnnjsZHHgTqg1XJhJxVW75fHxlnpDhLc= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745487054; c=relaxed/simple; bh=FQ2i0vtcNutvW6mILhPnqYVxeeOvmk8EyijG6FMoWqc=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=T6zc1RKuLJvk58bungbwvIxmjpI8OuItC5jqYQBESI7S8mgV2ZJBFNE/7btzGH8BX8/+JWDqg4eZ/CRn8QuHiwNn644hbBEXimSgQhVOnoJXQuvfcpJnxazYx72Ieckf9Kb5YrB/08g9mTRlH7GI4czh0d6uOJzheTDCznPUyAU= 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=f+fO7SZZ; arc=none smtp.client-ip=205.220.180.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="f+fO7SZZ" Received: from pps.filterd (m0279871.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 53O0F61P016964 for ; Thu, 24 Apr 2025 09:30:51 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= QywQSn/YHjitxPlBIJbPhSL0qb3ubeGjN/MXA9O/FXo=; b=f+fO7SZZwcAoFk8Z 46Ye7IAzGepfF1Ak08qs3OKavxtVBCWWRwN8qEoIzEzVOA6aHiit+tUq1ivF/DYu aSsvjnBtGBiWH/NN+OSScwKHElr8FKdE3g3c8N2HS4SQN3PhSmh9wmEjPcOBQU71 bw0APT4Z3gFSdVj0cuN3vSZJn2JtJtAuhdW3x9Z7dLaDXIABvflwyNVv/pBowE2Q GzVY1mZBJeFkYAa9dfirKdHr5c7th7leRs+NhW0+mG5yZcCZqdeWRhQ8rKpHtGg/ IJSmBxCP+2onbgeGVXFRRBpVijUa3lGZts+22beIdnIjQ2JqLG6VR8l/SMtBgVG9 8bhK0w== Received: from mail-qk1-f197.google.com (mail-qk1-f197.google.com [209.85.222.197]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 466jh14y3u-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Thu, 24 Apr 2025 09:30:50 +0000 (GMT) Received: by mail-qk1-f197.google.com with SMTP id af79cd13be357-7c7c30d8986so229835985a.2 for ; Thu, 24 Apr 2025 02:30:49 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1745487046; x=1746091846; 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=QywQSn/YHjitxPlBIJbPhSL0qb3ubeGjN/MXA9O/FXo=; b=qdjPVePevdK4lpGZRptFZfZksFCSzXP97zi4anOmDe0v4ECwKt0foUAwg3bizhOeW+ NTSRUn9jZZ71x8GQhgw/fidrfnihc+BVHehLQdqso3g38ynMZkdIMWd61dlrShETbNsD skFEiRzk1PSVH0cCPkE0qxM0zKvpDWl996uG41SZgZBOd1Ehm1kE/RuHcxCBgEs97A7e rcVtTsnzsewfSDzPNTN0rRR1mwIYMpboTvCGeBBsS2E5jECXvsIrlN1geAP7c7d7t8/c R2KvTr4nLgOXThNCRcrfMkhrg4Rw4Ylv0As1716KWUq7WmyPyFIP1jIx6PeLRChJjH7r 6UTA== X-Forwarded-Encrypted: i=1; AJvYcCXJFKt0Yw/3REfLbd1PA+bwGCueuU2u1AdtUv2Pv+7/uAej3nAKwVhe2pX/NVNOn8iNAEG8hXzSUYOwP0o=@vger.kernel.org X-Gm-Message-State: AOJu0Yxwrwt6XAUZwMeDvI9MTFNJ2akwFAmFsS1LE00jKrN6+/bOPBTF jfCXSkK2+GssP7VQx4n+k1hFlp85zn6YiPJVuhH7Tb60tfS7/kV+XZGX68/LXn6SSLi/jSgUcib 37HXh+YgnEr0NXO0IZkwKuIigA9ZhV2MDjDKDEhNcm7/Bhgd35PIqEWprlrs78cw= X-Gm-Gg: ASbGnctlgAJ8VEtgs2b65Y1386HP8yKzozhudVZp5q5A5g/NYdZzcMYvWCXxJH67utO 6UxI9ymvn6e6zJfZVo7hk8NwH1lq3GqQiGp0GgUOfI9NlKoQONLWPLRdZNRwEsXHQKdEnP9cLHA Es2yaBzS5cIGc5WHwP+XfBUNT5Y9r8Ps9ZuPBUhoW/BxKjuQM7fKqJvWfX/lfTMS+t1EbLdqrXT KnRrbvPaG31oATAYIvuu1Gcjp78xmbOiYtTipmvyme+UeSFPYoaoO0WDkNS91k0jleICUsAgJ9Z d0cHjpjcpiHmdL0kaOP2B+xgzedG07UOQFLB2Ib4Yj5yIhN1SRQSNZCkYq/gOArCqymSKxXq56j TS+QJcAdwjUV3eeLGED7d5UPl X-Received: by 2002:a05:620a:4248:b0:7c9:1523:3f17 with SMTP id af79cd13be357-7c956f60603mr265149885a.57.1745487046326; Thu, 24 Apr 2025 02:30:46 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHYXB3qqSao1dvcIQQrC/bcdm4MO4pX3tX178JHk99SvJsxRtFn1KxSr1x2fmrSYlsEquMDTA== X-Received: by 2002:a05:620a:4248:b0:7c9:1523:3f17 with SMTP id af79cd13be357-7c956f60603mr265146385a.57.1745487045996; Thu, 24 Apr 2025 02:30:45 -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 38308e7fff4ca-317d1b9a304sm1820461fa.99.2025.04.24.02.30.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 24 Apr 2025 02:30:45 -0700 (PDT) From: Dmitry Baryshkov Date: Thu, 24 Apr 2025 12:30:17 +0300 Subject: [PATCH v3 13/33] drm/msm/dpu: get rid of DPU_DATA_HCTL_EN 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: <20250424-dpu-drop-features-v3-13-cdaca81d356f@oss.qualcomm.com> References: <20250424-dpu-drop-features-v3-0-cdaca81d356f@oss.qualcomm.com> In-Reply-To: <20250424-dpu-drop-features-v3-0-cdaca81d356f@oss.qualcomm.com> To: Rob Clark , Abhinav Kumar , Sean Paul , Marijn Suijten , David Airlie , Simona Vetter , Vinod Koul , Konrad Dybcio Cc: 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=2745; i=dmitry.baryshkov@oss.qualcomm.com; h=from:subject:message-id; bh=RMvwZw2IoUGRGV6OIhReHxHfhgm4YrJasKj5L020giI=; b=owEBbQGS/pANAwAKAYs8ij4CKSjVAcsmYgBoCgSsrXBB/I40QUDXp7j0Pla/+E9TO3fFw7wQC IshmHo6E+eJATMEAAEKAB0WIQRMcISVXLJjVvC4lX+LPIo+Aiko1QUCaAoErAAKCRCLPIo+Aiko 1eZEB/4sSFKY1+3onz1ptOWEABhrbuoYH6l8WyhMjFTRKQLJEzl5fOI19kQvvs6fi7qA7Kb/fnm qPZOLtqlGi4VWE75FAqi7F8ymnxcFWihZvu/rBDjgk/k0t4uIjFjUbmuZa7mkzdAtYHOU/oRQwn KBZcHjR3f70lmuLUvW06LbWzVYT+jKk6F/EAKofVdm7DneGFo6Af096FbWsxxCWND+988H+WFIA bjNndujTIRnb9qCXz3UlfZgvDsFQrTk39+a7S8+9FMB9kiUmsfsrR7ADczNTl9//KVpI6h4LiIA mcIO0FCMKHuUmAZaiVcYlkxIpEyQyL9RzvnTAuyKCcGAllX0 X-Developer-Key: i=dmitry.baryshkov@oss.qualcomm.com; a=openpgp; fpr=8F88381DD5C873E4AE487DA5199BF1243632046A X-Proofpoint-GUID: NlYFtRwtinIiyOHnubIJLDxjFSzzmpOp X-Authority-Analysis: v=2.4 cv=OY6YDgTY c=1 sm=1 tr=0 ts=680a04ca cx=c_pps a=50t2pK5VMbmlHzFWWp8p/g==:117 a=xqWC_Br6kY4A:10 a=IkcTkHD0fZMA:10 a=XR8D0OoHHMoA:10 a=KKAkSRfTAAAA:8 a=COk6AnOGAAAA:8 a=BlGH1-kmwhya4yQ-KWAA:9 a=QEXdDO2ut3YA:10 a=IoWCM6iH3mJn3m4BftBB:22 a=cvBusfyB2V15izCimMoJ:22 a=TjNXssC_j7lpFel5tvFf:22 X-Proofpoint-ORIG-GUID: NlYFtRwtinIiyOHnubIJLDxjFSzzmpOp X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUwNDI0MDA2MyBTYWx0ZWRfX+63IdY2CGxyI 8Wd+3RnXOofckYISZzHKe+WMmG2o4M3kjq+7oi6gopJHF4ugaMW4mTXroO37B9pNhymuSSKnVT8 HbVzkuw1aqxG6orilnp0AhMwyd1GojdgHGCbvb4s9sMZy+9BcSgVAbm2q01bPfth2Y13Vf/KNLp OCThDaULcV6jmZszlLNo5SCg3VC0m+gi3xC827Is2vcODBHRCQiLkzdJZDOiTli88GhqkuNVG0A 2aD3fjRTvNVzSajAy27hfpbPXtTy40u1IVjhG3hLubeEBniVVfdKbTBNW6U7fiacUFgvl7pj3LW n6nNxRtSKGYpKLPMcW2ONAzEowU2gSCbAdZ0X8nj5TRbtRUFjFr7KXZT+SOdH3OJYMNPME5vEYB n9Bnlr6RKZcigpp8m9cmIMQe1w3ywYXUFKWDxC7fVA/pSAvHvNW8ptdg1zordFiuTynPtAw3 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1099,Hydra:6.0.680,FMLib:17.12.80.40 definitions=2025-04-24_04,2025-04-22_01,2025-02-21_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 impostorscore=0 lowpriorityscore=0 suspectscore=0 mlxscore=0 clxscore=1015 malwarescore=0 mlxlogscore=999 phishscore=0 priorityscore=1501 spamscore=0 adultscore=0 bulkscore=0 classifier=spam authscore=0 authtc=n/a authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.19.0-2504070000 definitions=main-2504240063 From: Dmitry Baryshkov Continue migration to the MDSS-revision based checks and replace DPU_DATA_HCTL_EN feature bit with the core_major_ver >=3D 5 check. Signed-off-by: Dmitry Baryshkov Reviewed-by: Abhinav Kumar --- drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.c | 3 +-- drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.h | 3 --- drivers/gpu/drm/msm/disp/dpu1/dpu_hw_intf.c | 2 +- 3 files changed, 2 insertions(+), 6 deletions(-) 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 22ca093419059600f0ad7e1e7a0a4e443b977860..20f4700ef9969003cfa4728049b= 9737cb9eb6229 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.c +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.c @@ -112,8 +112,7 @@ =20 #define INTF_SC7180_MASK \ (BIT(DPU_INTF_INPUT_CTRL) | \ - BIT(DPU_INTF_STATUS_SUPPORTED) | \ - BIT(DPU_DATA_HCTL_EN)) + BIT(DPU_INTF_STATUS_SUPPORTED)) =20 #define WB_SDM845_MASK (BIT(DPU_WB_LINE_MODE) | \ BIT(DPU_WB_UBWC) | \ 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 27422a5a340b90ee02f36a87cf1bab9d97504c76..36100e21135fba09fcafdd5d36a= c919cd17f63c0 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.h +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.h @@ -145,14 +145,11 @@ enum { * INTF sub-blocks * @DPU_INTF_INPUT_CTRL Supports the setting of pp block from = which * pixel data arrives to this INTF - * @DPU_DATA_HCTL_EN Allows data to be transferred at diffe= rent rate - * than video timing * @DPU_INTF_STATUS_SUPPORTED INTF block has INTF_STATUS register * @DPU_INTF_MAX */ enum { DPU_INTF_INPUT_CTRL =3D 0x1, - DPU_DATA_HCTL_EN, DPU_INTF_STATUS_SUPPORTED, DPU_INTF_MAX }; diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_intf.c b/drivers/gpu/drm/= msm/disp/dpu1/dpu_hw_intf.c index 1d56c21ac79095ab515aeb485346e1eb5793c260..8f9733aad2dec3a9b5464d55b00= f350348842911 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_intf.c +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_intf.c @@ -237,7 +237,7 @@ static void dpu_hw_intf_setup_timing_engine(struct dpu_= hw_intf *intf, DPU_REG_WRITE(c, INTF_FRAME_LINE_COUNT_EN, 0x3); DPU_REG_WRITE(c, INTF_CONFIG, intf_cfg); DPU_REG_WRITE(c, INTF_PANEL_FORMAT, panel_format); - if (intf->cap->features & BIT(DPU_DATA_HCTL_EN)) { + if (intf->mdss_ver->core_major_ver >=3D 5) { /* * DATA_HCTL_EN controls data timing which can be different from * video timing. It is recommended to enable it for all cases, except --=20 2.39.5 From nobody Sun Feb 8 09:32:35 2026 Received: from mx0b-0031df01.pphosted.com (mx0b-0031df01.pphosted.com [205.220.180.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 6DA1C225402 for ; Thu, 24 Apr 2025 09:30:51 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=205.220.180.131 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745487053; cv=none; b=jIvf9Z7tUuBFAXmena2f10SmXy9cskcIjS1Vhdc/f++RUj36NxVaj7f8kJvcHyercAMeS7IPhZ2ltKT8V6FiWwLFl9b+Xlbv5ZBWmX0w7zYZZk1WVyywd6M06OV5mlrCgwXRIq9/HCWx0fBfHi5EYeP0k5ICWqbhufSpERuyDAw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745487053; c=relaxed/simple; bh=Uacr3JGWYtukIhw8R5JPc/xlbl+xhhFg6HvK7EGKgqM=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=J+pRZpFBHf65gDRXJSwlrIrSZZTHxdpE5hXEDb0Uqnu2AZk9l/2772bYm3NO7OaTsGJYEUyfJHi0XMn4zbx3Jp3I+FNfnq/NVV0cwwqUHQEF6zgtI/7aZkrNuAEtHpRhe4vrJse+4v8mxaQj8PMWZ+9FndzDTzHGCvcmW68qEyw= 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=Nonq8wif; arc=none smtp.client-ip=205.220.180.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="Nonq8wif" Received: from pps.filterd (m0279869.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 53O0F7rL010242 for ; Thu, 24 Apr 2025 09:30:50 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= mJipZcZZWH1q+GPZjyCUn13cwL4q5wMDd8S9OaXiPQE=; b=Nonq8wifbCmkLCqr E4UJ4AsWLcoudxwqiP4aRkSOfnjqjTWLPYtKaCH20w45oAIuuUhqAcQxaH4+eVDc WmKFgQyBfbrjPM1TYd1pTXSHgEhcKOU/CWXyClM7SADQ05ud2/iYIXTUGdShModZ XVhl/2qAZCnV8caTPO7FP4i4du36UaCpHgHCtsMqzl3ed7smU6JPMGO3Sc4mx2un H6GXaG8hhv4sKTmz1om9MFbNyKnhs7XA6gvsW5CMfFRRws6RLz2XpKtrGqAX6HQu 3mhUuy3lNGomgL32187YruD9bhAT84/3HyMDDXq4OGDoukXGP+WYfq8i2fLK0sXC EigGaA== 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 466jh3mypt-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Thu, 24 Apr 2025 09:30:49 +0000 (GMT) Received: by mail-qk1-f198.google.com with SMTP id af79cd13be357-7c791987cf6so169192285a.0 for ; Thu, 24 Apr 2025 02:30:49 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1745487049; x=1746091849; 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=mJipZcZZWH1q+GPZjyCUn13cwL4q5wMDd8S9OaXiPQE=; b=fSo95uYYYe2gf+bIuvxAJb8qKq3L9kdmjW+wAyHg/b2zhtXApYnd0pCysCZxCYnOQr A/DrKTkf7Gk7gMLoXGsE0LsJ5ruleTZbTC0zt7hdP8A+VBrB/YvsLPPqkiLaZym6Gp4C vODKX8cqdwDZJt3o0azirz1zG1CUFpzIPc7kf8sd8FFGf+fhjw+ro0xYW70rbunQtBNP y3Pe4D8r/ls8IVejLTvDBP0uXQm1fDqJ+01qn+LXz1wcKR12c1crHdufZrUzhyYQDcjz ZLIZAWKP9yxeRsH9YuKSQOPuXJSUcn0V9zoMlThLM1QMFuwXWxOVaVYuTrK0MAz/qAkl q8cQ== X-Forwarded-Encrypted: i=1; AJvYcCW9KOZsKM7tRmf0ux1HY6uY8so9s7SKZRjSooO4mUnHHwRNkgrq8Uz62DgjfMzUHAQjLwPFUYJyl2lDlnQ=@vger.kernel.org X-Gm-Message-State: AOJu0Yz/O7PAXMhuTG6oYTbYschmp7mceyHJydL3R8e9kfGo5WyZWOdT XcBAv7/k+Hny4qbmrYUbDTAKjG3F1zO6Ag0dWi4XbA9VyKQi0EjtrwM0ml1L8U20B/34pQ0DcSf ik9bfmPBvwfUrOf/8ZI5id8Q4ZzCK3S9mUiZUscXU/BGfc5UWbaXIGj0gokfxqGw= X-Gm-Gg: ASbGncsWRRahGg2w2ibyd1AI4dOJggCzCqqIzw2OIH6QZrWfUR2J4Mn8DGzaWVL+j9h iW3qdGIa/6qPAct9zqmvzouSAZky8ZAkfjAMMbqABo3HfmYufz+o4s/Ouk9idyJLepvB73/yJKJ Fglu+UCZMj/Am43PMLyqhKs+P6oc8yi58pz2G21axsqS4pceaYPBabQvcyH0r7iDdzgihzQ/NGm tJ8mYP1dhHaJz4Mio27/tdE/9/q8VYH2eeHaOgUpRQFhenfw4WKvfChpAYWuEtZgqyEhrStB/e3 +Mrhtbcqip0/kKK24U6tq4qqf8OxRZAfwAFQq0pPsoLc/+n2Bx4hmYe9nmqaYGQv28bjPY33ej6 KzU2CZtJ9pMIe+qhbYtjgBn1d X-Received: by 2002:a05:620a:1794:b0:7c5:5909:18e5 with SMTP id af79cd13be357-7c956e7d446mr326878485a.3.1745487049292; Thu, 24 Apr 2025 02:30:49 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFBQmRn7SKcjUSTbGIjxqsPY4wEMu/CWMSRP8MryisNW1tohurPxko9cDIUFwhuJlclwe9QsQ== X-Received: by 2002:a05:620a:1794:b0:7c5:5909:18e5 with SMTP id af79cd13be357-7c956e7d446mr326875185a.3.1745487048943; Thu, 24 Apr 2025 02:30:48 -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 38308e7fff4ca-317d1b9a304sm1820461fa.99.2025.04.24.02.30.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 24 Apr 2025 02:30:46 -0700 (PDT) From: Dmitry Baryshkov Date: Thu, 24 Apr 2025 12:30:18 +0300 Subject: [PATCH v3 14/33] drm/msm/dpu: get rid of DPU_INTF_STATUS_SUPPORTED 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: <20250424-dpu-drop-features-v3-14-cdaca81d356f@oss.qualcomm.com> References: <20250424-dpu-drop-features-v3-0-cdaca81d356f@oss.qualcomm.com> In-Reply-To: <20250424-dpu-drop-features-v3-0-cdaca81d356f@oss.qualcomm.com> To: Rob Clark , Abhinav Kumar , Sean Paul , Marijn Suijten , David Airlie , Simona Vetter , Vinod Koul , Konrad Dybcio Cc: 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=2459; i=dmitry.baryshkov@oss.qualcomm.com; h=from:subject:message-id; bh=Nt4QhnpHTNYrhzhqV0xbi5+n74LJmsNMY4VbVunyJu8=; b=owEBbAGT/pANAwAKAYs8ij4CKSjVAcsmYgBoCgSt5uuV1bwUk5DQ4vQkc/FrwRESt2DWna1p0 zQoy8eeh6GJATIEAAEKAB0WIQRMcISVXLJjVvC4lX+LPIo+Aiko1QUCaAoErQAKCRCLPIo+Aiko 1UZUB/dSUNDw61C3xWnyNFZGuOISsMOOeIDbwgFQ1wDsmxaKY820q07g40rgZ/jKh0prEf7XsmO C84OnR0tvenNeIvXZm8sZsdkRJNU020kjboki6Vqkmsax4Ep3wq7AO1EKashj7zmJlOD5iUXmGC /fM7entgLttcNsyxwhK515VCsxvazBjGD69tk/9xPDmrje/LPtvt7APsgR6AvjHuWBpTVV9A+wS kLTvq1xTz5KU/ZlLtsOgAB+A1tgJytgfIvqL929trBGoE+no6fM4G9YMEE3PIyLBT9xAbDw7PDg 0gMgrV1By9pnPaoOvSuU61HaZ0ap1pb0iPeLu43FByx4Vto= X-Developer-Key: i=dmitry.baryshkov@oss.qualcomm.com; a=openpgp; fpr=8F88381DD5C873E4AE487DA5199BF1243632046A X-Proofpoint-ORIG-GUID: V1mC5egB3csfzY7faimiNTI3lx38ViWv X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUwNDI0MDA2MiBTYWx0ZWRfX1Apy0ZFfKfmG 288RXV3RU3qEKUwHiR8yl8jI6P7rRGW1Ya/JRKbxqEJaclTEDrIJ4/qTMSqxth8WonNwdrXwmtZ XIiCooIa4eFcqZoX87XG6rZcx+Y5ERJ1HutUxZIbSq6t4HaWKxeBs46dsfqu4ebiGaBXimhxnR4 vP4NON0L6v9kdT5DjTyl0P4hf+QYGW0zvV0ngb1Tbk5EAoGB/qeialqeNNU6ZxDsFQ7ua/YAbr7 sN/TkUn3omNHgGgjEijHRKSimgP0q5URt85U1zOkZCYa+vvHUPLE9BykY/bRDsT2AwHZGaCznmM 7Zq3JJUnSRMbuM6tvuwxtGpn62ddoLKoioPEFgU36x6GwDXx0uOyRw1KAc+E7SeZUBnhGMi+iWL stVfi1VhQ8xQ2aQXyVCF0bbmuyzOl2wtt3h70fHWxMoQlhsT4dSEQqOUEKbU5OVTMjhq4qMS X-Authority-Analysis: v=2.4 cv=ELgG00ZC c=1 sm=1 tr=0 ts=680a04ca cx=c_pps a=qKBjSQ1v91RyAK45QCPf5w==:117 a=xqWC_Br6kY4A:10 a=IkcTkHD0fZMA:10 a=XR8D0OoHHMoA:10 a=KKAkSRfTAAAA:8 a=z6iiZyybfqEMMI01lysA:9 a=QEXdDO2ut3YA:10 a=NFOGd7dJGGMPyQGDc5-O:22 a=cvBusfyB2V15izCimMoJ:22 X-Proofpoint-GUID: V1mC5egB3csfzY7faimiNTI3lx38ViWv X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1099,Hydra:6.0.680,FMLib:17.12.80.40 definitions=2025-04-24_04,2025-04-22_01,2025-02-21_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 impostorscore=0 adultscore=0 malwarescore=0 clxscore=1015 bulkscore=0 phishscore=0 spamscore=0 mlxscore=0 lowpriorityscore=0 priorityscore=1501 suspectscore=0 mlxlogscore=999 classifier=spam authscore=0 authtc=n/a authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.19.0-2504070000 definitions=main-2504240062 From: Dmitry Baryshkov Continue migration to the MDSS-revision based checks and replace DPU_INTF_STATUS_SUPPORTED feature bit with the core_major_ver >=3D 5 check. Signed-off-by: Dmitry Baryshkov --- drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.c | 3 +-- drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.h | 2 -- drivers/gpu/drm/msm/disp/dpu1/dpu_hw_intf.c | 3 +-- 3 files changed, 2 insertions(+), 6 deletions(-) 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 20f4700ef9969003cfa4728049b9737cb9eb6229..8808be27593b303a2a199a74082= 7c92ea5339b0d 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.c +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.c @@ -111,8 +111,7 @@ (BIT(DPU_PINGPONG_DITHER) | BIT(DPU_PINGPONG_DSC)) =20 #define INTF_SC7180_MASK \ - (BIT(DPU_INTF_INPUT_CTRL) | \ - BIT(DPU_INTF_STATUS_SUPPORTED)) + (BIT(DPU_INTF_INPUT_CTRL)) =20 #define WB_SDM845_MASK (BIT(DPU_WB_LINE_MODE) | \ BIT(DPU_WB_UBWC) | \ 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 36100e21135fba09fcafdd5d36ac919cd17f63c0..858fd73e0ac3a92fe402001d479= 6eb86945f61b0 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.h +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.h @@ -145,12 +145,10 @@ enum { * INTF sub-blocks * @DPU_INTF_INPUT_CTRL Supports the setting of pp block from = which * pixel data arrives to this INTF - * @DPU_INTF_STATUS_SUPPORTED INTF block has INTF_STATUS register * @DPU_INTF_MAX */ enum { DPU_INTF_INPUT_CTRL =3D 0x1, - DPU_INTF_STATUS_SUPPORTED, DPU_INTF_MAX }; =20 diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_intf.c b/drivers/gpu/drm/= msm/disp/dpu1/dpu_hw_intf.c index 8f9733aad2dec3a9b5464d55b00f350348842911..54c2e984ef0ce604e3eda49595d= 2816ea41bd7fd 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_intf.c +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_intf.c @@ -308,9 +308,8 @@ static void dpu_hw_intf_get_status( struct dpu_hw_intf_status *s) { struct dpu_hw_blk_reg_map *c =3D &intf->hw; - unsigned long cap =3D intf->cap->features; =20 - if (cap & BIT(DPU_INTF_STATUS_SUPPORTED)) + if (intf->mdss_ver->core_major_ver >=3D 5) s->is_en =3D DPU_REG_READ(c, INTF_STATUS) & BIT(0); else s->is_en =3D DPU_REG_READ(c, INTF_TIMING_ENGINE_EN); --=20 2.39.5 From nobody Sun Feb 8 09:32:35 2026 Received: from mx0b-0031df01.pphosted.com (mx0b-0031df01.pphosted.com [205.220.180.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 C246522B8D2 for ; Thu, 24 Apr 2025 09:30:53 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=205.220.180.131 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745487057; cv=none; b=hd9A6LSSvKPx7BID7WdIHB0ZL1lpGjIg91TmqMHS+5XaPgcRlhLaFybfkgNOSPodfNMwsKMFR+Mf16Ne7bm0nX+ibS2jCeU2YTtULEZ5qGlG0a5SqveNoSrM8eqoIeq5QxkLPmrb/qXmbLzHDMMD9I5Cl64YOsO2gWkwiXpu1M0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745487057; c=relaxed/simple; bh=NVMj8kSGvpnn0EZeuNLh+KZSravW0HZLSVloOshSsSY=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=W2B4LAxc7QRtBrxagTK6l5vs4e7Y/hL5AgH28ftKj75xRztNJ1S2lnqa4mlt0fv6rOb4oNCyEMf2v+JneCDWUUc8xEjUUB/9UWc4rgax4cefovawEMU5pmO7h/KWJZz+u1yJR6P7/HWQtCY83DxdmI26xEcoWUhsbcAK1THUFiQ= 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=IgND3GTU; arc=none smtp.client-ip=205.220.180.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="IgND3GTU" Received: from pps.filterd (m0279871.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 53O0F6Eo016968 for ; Thu, 24 Apr 2025 09:30:52 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= Dp3LAunTuRflNZBtXu2Vp8CQDz2HsVbSuLW3Ww4uZZ4=; b=IgND3GTUaRrQqqAz ycWu30Ev9kr6IY0fi+pQpa7RawUR91HJS2pfsk8uv8GDdI2QPXf73iGykKt7iNvk QfgflJouK8n4g8dwSzNx10PksunFtTLQdgHHHwIoocpieE43eVjEc1g+0wnXnP7E ZHPLLgWTS3n3p6iGxmcmfdavn7znn58qIq0WdOttdssq5uNFGPMHXUoFLizVIwY2 ML/3d+y8nDIRkCmVnhV04jE77xeSlM+KczBMYPBygmxFlIAATxzYBl9uauZ/tQy/ 4FUU/nRhiuiEftp7Ew4D5zlVHDM9pMuQkOEHj7hk/XWv/A+usR2jZJkS0qCSsToG PPEzKA== Received: from mail-qk1-f197.google.com (mail-qk1-f197.google.com [209.85.222.197]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 466jh14y45-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Thu, 24 Apr 2025 09:30:52 +0000 (GMT) Received: by mail-qk1-f197.google.com with SMTP id af79cd13be357-7c3c8f8ab79so118544585a.2 for ; Thu, 24 Apr 2025 02:30:52 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1745487052; x=1746091852; 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=Dp3LAunTuRflNZBtXu2Vp8CQDz2HsVbSuLW3Ww4uZZ4=; b=uluGE4WTTkCH0UoQWxZbABjZfEKy5YY71mRggyi2R/OtgC71EI3RgYUaROhFU+SXi8 yexF+PVGR08RM0hj7aJWu88h3X2JryiExTi6mi+HlaEsnbl1CcqtZQY7p0+bEd0rA5Br 1uPj+5HIHVjm++r81nkotw3I47UGmKtcdf3XWJkWARZ7K3fI0Lo0yYYJ4MErlQdDy2/1 1M8EfqgBuhncRww3njSYWxeqQ6mylj2MnkvVUtpHxsFZqOEkxpNqkbtz3UbSp4TWtQjg Do38Z/j82BwDbpul/7fR+IoOnnYqPtUBvWDwUQoXj/hKf2B36eOTyVyjmIPUJ4RTRZyu ydyg== X-Forwarded-Encrypted: i=1; AJvYcCUVIY1iVHDzu2zh6ABGMK9cyiDOC34XJT6KES0hBfT5WqipCPe5us6qRkXEISxezFwrcQWyN0tg3wnzSoE=@vger.kernel.org X-Gm-Message-State: AOJu0YwCWYU1bk5Aft20rMgIfra9X8vGdhzNhr/x7DLD8OcToqCtsA/O 8XDag5tays1EJh4mZqTSmwOEpBHVA3XtSpoJxngL0njWXvGc5QuP2M+aGmQJTn6TDuxLkgBshlf kncDslg4tDOMksE79XkgOhGP6vslPe/oMbsha2EqCd8o8c0/QJQyTn3aVsj5Eatw= X-Gm-Gg: ASbGncu5iTZB8eVx2A9f0huhPGjD4R6V9rnRydCDUXz2BeM7ulr7ky03z6U0NsSL73R qrNfPHnbGy0h2j/MvlmPsc0PlwvHYLXlqoIwxG9rmGjPmsu8z6EZ3YI11iju+g7ikUnLK0v2qCP u5OFTGMEk/4boSpod7aafkqRaPKuSFfkhxNOMF4UHbYlE+nv/euneSUxZ3tcsgYhZG0SAAo4dd7 KUFvR2yoVa8DnSUo4Z+0IdJcrp9F00q52XsxG2GzP4OPtp+oQy7+10q9VncMIxX75J3bTsdKdhV rROrA1vb8Y3uG3N6J+j7hiQ+nERCSd8FjzK98b2lHtC/zJikCi4CAAvHQgywfsjJ8vgSSoTgOQJ 8u505tPZrU8CXVsULzbw8OGph X-Received: by 2002:a05:620a:4248:b0:7c5:95e6:ce1d with SMTP id af79cd13be357-7c956dd8d70mr263947985a.0.1745487051132; Thu, 24 Apr 2025 02:30:51 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGjgmVNS4loigIVuk7ZUocq2+9yjDMd43Own5q88QyQytVU8AMtg5wG7dEqf2pIqDqQTTqO0w== X-Received: by 2002:a05:620a:4248:b0:7c5:95e6:ce1d with SMTP id af79cd13be357-7c956dd8d70mr263944885a.0.1745487050645; Thu, 24 Apr 2025 02:30:50 -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 38308e7fff4ca-317d1b9a304sm1820461fa.99.2025.04.24.02.30.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 24 Apr 2025 02:30:49 -0700 (PDT) From: Dmitry Baryshkov Date: Thu, 24 Apr 2025 12:30:19 +0300 Subject: [PATCH v3 15/33] drm/msm/dpu: get rid of DPU_INTF_INPUT_CTRL 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: <20250424-dpu-drop-features-v3-15-cdaca81d356f@oss.qualcomm.com> References: <20250424-dpu-drop-features-v3-0-cdaca81d356f@oss.qualcomm.com> In-Reply-To: <20250424-dpu-drop-features-v3-0-cdaca81d356f@oss.qualcomm.com> To: Rob Clark , Abhinav Kumar , Sean Paul , Marijn Suijten , David Airlie , Simona Vetter , Vinod Koul , Konrad Dybcio Cc: 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=32242; i=dmitry.baryshkov@oss.qualcomm.com; h=from:subject:message-id; bh=cfyxGw4+H2UfNBQPXEZK30ob8F55d5sE0iKGaWWPHvM=; b=owEBbQGS/pANAwAKAYs8ij4CKSjVAcsmYgBoCgStM/d1vdUsxln83e5CgT0KCA8vSzp1sFPGi SAOUn3vuC6JATMEAAEKAB0WIQRMcISVXLJjVvC4lX+LPIo+Aiko1QUCaAoErQAKCRCLPIo+Aiko 1TB3B/9R6BeWeNQ4CSkMy2/rlGhhyKtMbBnq2MemsnGXn3PIbTsEJW0WPkGFgWpb6cwLdcHvpf2 SKU6nHQxaIMq897ywP6/YXeMwt5IWV73kpPZ0hxy7gkg91t9zqYjf01klTE2NcgUvFdLCqZOhsj BDLthHIZRmQU6FGZRV4mTSnxcETrfQAjHlrzA4CI2T8mCFo/kRxcp0OjjVDVtzUvAXZnDjM6rJ4 1qFB/hf8VG4DWAq2nA8YxE3lsF2RUJbua8j86kOO9iVGqzX6OmnVAdS7PD7y2i/MNvHe218FhWe I3ebJynXE1FIfoCMWTLIK9F/+oToxYuHIy9WHiEGEbLQ7iFc X-Developer-Key: i=dmitry.baryshkov@oss.qualcomm.com; a=openpgp; fpr=8F88381DD5C873E4AE487DA5199BF1243632046A X-Proofpoint-GUID: WfBXVd8feB5rBNb1OVojvE8HQ3Q3rd57 X-Authority-Analysis: v=2.4 cv=OY6YDgTY c=1 sm=1 tr=0 ts=680a04cc cx=c_pps a=50t2pK5VMbmlHzFWWp8p/g==:117 a=xqWC_Br6kY4A:10 a=IkcTkHD0fZMA:10 a=XR8D0OoHHMoA:10 a=KKAkSRfTAAAA:8 a=_YFPJyc67s1Z8jbQfgUA:9 a=QEXdDO2ut3YA:10 a=IoWCM6iH3mJn3m4BftBB:22 a=cvBusfyB2V15izCimMoJ:22 X-Proofpoint-ORIG-GUID: WfBXVd8feB5rBNb1OVojvE8HQ3Q3rd57 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUwNDI0MDA2MyBTYWx0ZWRfX68LXRdzN594G ukudHiQALYc+GDm5FN/JrT96XL5+gj0IDCle3bwCZn2kCQFEkFsj1MWArgoIDn+Ebg3c1sy/BxZ 4Iqm/XpMgsbzAON6A5BZR8WGy4Ms5NLOZm6TlsLDmrGhuTb+rrKNr6BpE3RbX4P4IQWW95dhHPR pRDrM7boJYERlmFUvELuVmDoG11t49ONrIuy5A4DUGuwBo3YKeak994GxhVlkMMbq3OOvJQea6k wdGmNXuX4eIzQUGp3IUDFm8WddGCpmt1Hb7C4rITKkrkoUmhveAWAinUDaSNw/iI3eOS/ptJPMq GyjU1dzfO9jBTxfBRcP6yL5xMkKg2/9p6Y4dAX4WKA23U7iXdzFP+udlRp3HqpjeNWrrFAbBKsp Uu4Mf/Qd45c9tH3j3zl6O/sd/LKnJp1vt2OxMavKE2ygJiLQUEtMNM1dfaS05kAl9GnwUHw5 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1099,Hydra:6.0.680,FMLib:17.12.80.40 definitions=2025-04-24_04,2025-04-22_01,2025-02-21_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 impostorscore=0 lowpriorityscore=0 suspectscore=0 mlxscore=0 clxscore=1015 malwarescore=0 mlxlogscore=999 phishscore=0 priorityscore=1501 spamscore=0 adultscore=0 bulkscore=0 classifier=spam authscore=0 authtc=n/a authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.19.0-2504070000 definitions=main-2504240063 From: Dmitry Baryshkov Continue migration to the MDSS-revision based checks and replace DPU_INTF_INPUT_CTRL feature bit with the core_major_ver >=3D 5 check. Signed-off-by: Dmitry Baryshkov --- drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_10_0_sm8650.h | 4 ---- drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_5_0_sm8150.h | 4 ---- drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_5_1_sc8180x.h | 6 ------ drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_5_2_sm7150.h | 4 ---- 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 | 4 ---- drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_6_2_sc7180.h | 2 -- 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 | 2 -- 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 | 4 ---- drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_7_2_sc7280.h | 3 --- drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_8_0_sc8280xp.h | 9 --------- drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_8_1_sm8450.h | 4 ---- drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_8_4_sa8775p.h | 8 -------- drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_9_0_sm8550.h | 4 ---- drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_9_2_x1e80100.h | 9 --------- drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.c | 3 --- drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.h | 11 ----------- drivers/gpu/drm/msm/disp/dpu1/dpu_hw_intf.c | 2 +- 22 files changed, 1 insertion(+), 90 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 4ab361b7c977c2c97927543154d5dcd00091879c..70c519b923f57f2ccae094eedf0= 3c4f313062de8 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 @@ -367,7 +367,6 @@ static const struct dpu_intf_cfg sm8650_intf[] =3D { { .name =3D "intf_0", .id =3D INTF_0, .base =3D 0x34000, .len =3D 0x280, - .features =3D INTF_SC7180_MASK, .type =3D INTF_DP, .controller_id =3D MSM_DP_CONTROLLER_0, .prog_fetch_lines_worst_case =3D 24, @@ -376,7 +375,6 @@ static const struct dpu_intf_cfg sm8650_intf[] =3D { }, { .name =3D "intf_1", .id =3D INTF_1, .base =3D 0x35000, .len =3D 0x300, - .features =3D INTF_SC7180_MASK, .type =3D INTF_DSI, .controller_id =3D MSM_DSI_CONTROLLER_0, .prog_fetch_lines_worst_case =3D 24, @@ -386,7 +384,6 @@ static const struct dpu_intf_cfg sm8650_intf[] =3D { }, { .name =3D "intf_2", .id =3D INTF_2, .base =3D 0x36000, .len =3D 0x300, - .features =3D INTF_SC7180_MASK, .type =3D INTF_DSI, .controller_id =3D MSM_DSI_CONTROLLER_1, .prog_fetch_lines_worst_case =3D 24, @@ -396,7 +393,6 @@ static const struct dpu_intf_cfg sm8650_intf[] =3D { }, { .name =3D "intf_3", .id =3D INTF_3, .base =3D 0x37000, .len =3D 0x280, - .features =3D INTF_SC7180_MASK, .type =3D INTF_DP, .controller_id =3D MSM_DP_CONTROLLER_1, .prog_fetch_lines_worst_case =3D 24, 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 3bb0749f931d7417f8e90bfe3736ce77dafccb57..6438a5a14e4b89462873b5c8177= 13b4ff67d7ccc 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 @@ -304,7 +304,6 @@ static const struct dpu_intf_cfg sm8150_intf[] =3D { { .name =3D "intf_0", .id =3D INTF_0, .base =3D 0x6a000, .len =3D 0x280, - .features =3D INTF_SC7180_MASK, .type =3D INTF_DP, .controller_id =3D MSM_DP_CONTROLLER_0, .prog_fetch_lines_worst_case =3D 24, @@ -313,7 +312,6 @@ static const struct dpu_intf_cfg sm8150_intf[] =3D { }, { .name =3D "intf_1", .id =3D INTF_1, .base =3D 0x6a800, .len =3D 0x2bc, - .features =3D INTF_SC7180_MASK, .type =3D INTF_DSI, .controller_id =3D MSM_DSI_CONTROLLER_0, .prog_fetch_lines_worst_case =3D 24, @@ -323,7 +321,6 @@ static const struct dpu_intf_cfg sm8150_intf[] =3D { }, { .name =3D "intf_2", .id =3D INTF_2, .base =3D 0x6b000, .len =3D 0x2bc, - .features =3D INTF_SC7180_MASK, .type =3D INTF_DSI, .controller_id =3D MSM_DSI_CONTROLLER_1, .prog_fetch_lines_worst_case =3D 24, @@ -333,7 +330,6 @@ static const struct dpu_intf_cfg sm8150_intf[] =3D { }, { .name =3D "intf_3", .id =3D INTF_3, .base =3D 0x6b800, .len =3D 0x280, - .features =3D INTF_SC7180_MASK, .type =3D INTF_DP, .controller_id =3D MSM_DP_CONTROLLER_1, .prog_fetch_lines_worst_case =3D 24, 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 84114df5f072af16aeedd3aada8a106ca4369ddb..d08799471b85a882ecb151cb9b5= be2a098bfc003 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 @@ -311,7 +311,6 @@ static const struct dpu_intf_cfg sc8180x_intf[] =3D { { .name =3D "intf_0", .id =3D INTF_0, .base =3D 0x6a000, .len =3D 0x280, - .features =3D INTF_SC7180_MASK, .type =3D INTF_DP, .controller_id =3D MSM_DP_CONTROLLER_0, .prog_fetch_lines_worst_case =3D 24, @@ -320,7 +319,6 @@ static const struct dpu_intf_cfg sc8180x_intf[] =3D { }, { .name =3D "intf_1", .id =3D INTF_1, .base =3D 0x6a800, .len =3D 0x2bc, - .features =3D INTF_SC7180_MASK, .type =3D INTF_DSI, .controller_id =3D MSM_DSI_CONTROLLER_0, .prog_fetch_lines_worst_case =3D 24, @@ -330,7 +328,6 @@ static const struct dpu_intf_cfg sc8180x_intf[] =3D { }, { .name =3D "intf_2", .id =3D INTF_2, .base =3D 0x6b000, .len =3D 0x2bc, - .features =3D INTF_SC7180_MASK, .type =3D INTF_DSI, .controller_id =3D MSM_DSI_CONTROLLER_1, .prog_fetch_lines_worst_case =3D 24, @@ -342,7 +339,6 @@ static const struct dpu_intf_cfg sc8180x_intf[] =3D { { .name =3D "intf_3", .id =3D INTF_3, .base =3D 0x6b800, .len =3D 0x280, - .features =3D INTF_SC7180_MASK, .type =3D INTF_DP, .controller_id =3D 999, .prog_fetch_lines_worst_case =3D 24, @@ -351,7 +347,6 @@ static const struct dpu_intf_cfg sc8180x_intf[] =3D { }, { .name =3D "intf_4", .id =3D INTF_4, .base =3D 0x6c000, .len =3D 0x280, - .features =3D INTF_SC7180_MASK, .type =3D INTF_DP, .controller_id =3D MSM_DP_CONTROLLER_1, .prog_fetch_lines_worst_case =3D 24, @@ -360,7 +355,6 @@ static const struct dpu_intf_cfg sc8180x_intf[] =3D { }, { .name =3D "intf_5", .id =3D INTF_5, .base =3D 0x6c800, .len =3D 0x280, - .features =3D INTF_SC7180_MASK, .type =3D INTF_DP, .controller_id =3D MSM_DP_CONTROLLER_2, .prog_fetch_lines_worst_case =3D 24, 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 7a04eacb108bea33573cf75fb5537b80e8273039..acaa0b85ed1edd970dd17ae4d8d= 06a3dee6e8083 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 @@ -212,7 +212,6 @@ static const struct dpu_intf_cfg sm7150_intf[] =3D { { .name =3D "intf_0", .id =3D INTF_0, .base =3D 0x6a000, .len =3D 0x280, - .features =3D INTF_SC7180_MASK, .type =3D INTF_DP, .controller_id =3D MSM_DP_CONTROLLER_0, .prog_fetch_lines_worst_case =3D 24, @@ -221,7 +220,6 @@ static const struct dpu_intf_cfg sm7150_intf[] =3D { }, { .name =3D "intf_1", .id =3D INTF_1, .base =3D 0x6a800, .len =3D 0x2bc, - .features =3D INTF_SC7180_MASK, .type =3D INTF_DSI, .controller_id =3D MSM_DSI_CONTROLLER_0, .prog_fetch_lines_worst_case =3D 24, @@ -231,7 +229,6 @@ static const struct dpu_intf_cfg sm7150_intf[] =3D { }, { .name =3D "intf_2", .id =3D INTF_2, .base =3D 0x6b000, .len =3D 0x2bc, - .features =3D INTF_SC7180_MASK, .type =3D INTF_DSI, .controller_id =3D MSM_DSI_CONTROLLER_1, .prog_fetch_lines_worst_case =3D 24, @@ -241,7 +238,6 @@ static const struct dpu_intf_cfg sm7150_intf[] =3D { }, { .name =3D "intf_3", .id =3D INTF_3, .base =3D 0x6b800, .len =3D 0x280, - .features =3D INTF_SC7180_MASK, .type =3D INTF_DP, .controller_id =3D MSM_DP_CONTROLLER_1, .prog_fetch_lines_worst_case =3D 24, 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 d44db988a6e2f443803a422846f817779d382b2a..a99c99ca37703cc3a7d4403d3f0= 26f234b693319 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 @@ -175,7 +175,6 @@ static const struct dpu_intf_cfg sm6150_intf[] =3D { { .name =3D "intf_0", .id =3D INTF_0, .base =3D 0x6a000, .len =3D 0x280, - .features =3D INTF_SC7180_MASK, .type =3D INTF_DP, .controller_id =3D MSM_DP_CONTROLLER_0, .prog_fetch_lines_worst_case =3D 24, @@ -184,7 +183,6 @@ static const struct dpu_intf_cfg sm6150_intf[] =3D { }, { .name =3D "intf_1", .id =3D INTF_1, .base =3D 0x6a800, .len =3D 0x2c0, - .features =3D INTF_SC7180_MASK, .type =3D INTF_DSI, .controller_id =3D MSM_DSI_CONTROLLER_0, .prog_fetch_lines_worst_case =3D 24, @@ -194,7 +192,6 @@ static const struct dpu_intf_cfg sm6150_intf[] =3D { }, { .name =3D "intf_3", .id =3D INTF_3, .base =3D 0x6b800, .len =3D 0x280, - .features =3D INTF_SC7180_MASK, .type =3D INTF_DP, .controller_id =3D MSM_DP_CONTROLLER_1, .prog_fetch_lines_worst_case =3D 24, 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 ba631cdbbff0cec7453685bc1028791eadbbb2d4..0dce5292fdfe7988504d51d701d= 3908adf9b596a 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 @@ -152,7 +152,6 @@ static const struct dpu_intf_cfg sm6125_intf[] =3D { { .name =3D "intf_0", .id =3D INTF_0, .base =3D 0x6a000, .len =3D 0x280, - .features =3D INTF_SC7180_MASK, .type =3D INTF_DP, .controller_id =3D MSM_DP_CONTROLLER_0, .prog_fetch_lines_worst_case =3D 24, @@ -161,7 +160,6 @@ static const struct dpu_intf_cfg sm6125_intf[] =3D { }, { .name =3D "intf_1", .id =3D INTF_1, .base =3D 0x6a800, .len =3D 0x2c0, - .features =3D INTF_SC7180_MASK, .type =3D INTF_DSI, .controller_id =3D 0, .prog_fetch_lines_worst_case =3D 24, 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 5f7bee25a7a4f80d1f2fb86f126863b721c41281..6fce6d382c959b7ae47591f52dd= 06bcf241ff4e2 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 @@ -287,7 +287,6 @@ static const struct dpu_intf_cfg sm8250_intf[] =3D { { .name =3D "intf_0", .id =3D INTF_0, .base =3D 0x6a000, .len =3D 0x280, - .features =3D INTF_SC7180_MASK, .type =3D INTF_DP, .controller_id =3D MSM_DP_CONTROLLER_0, .prog_fetch_lines_worst_case =3D 24, @@ -296,7 +295,6 @@ static const struct dpu_intf_cfg sm8250_intf[] =3D { }, { .name =3D "intf_1", .id =3D INTF_1, .base =3D 0x6a800, .len =3D 0x2c0, - .features =3D INTF_SC7180_MASK, .type =3D INTF_DSI, .controller_id =3D MSM_DSI_CONTROLLER_0, .prog_fetch_lines_worst_case =3D 24, @@ -306,7 +304,6 @@ static const struct dpu_intf_cfg sm8250_intf[] =3D { }, { .name =3D "intf_2", .id =3D INTF_2, .base =3D 0x6b000, .len =3D 0x2c0, - .features =3D INTF_SC7180_MASK, .type =3D INTF_DSI, .controller_id =3D MSM_DSI_CONTROLLER_1, .prog_fetch_lines_worst_case =3D 24, @@ -316,7 +313,6 @@ static const struct dpu_intf_cfg sm8250_intf[] =3D { }, { .name =3D "intf_3", .id =3D INTF_3, .base =3D 0x6b800, .len =3D 0x280, - .features =3D INTF_SC7180_MASK, .type =3D INTF_DP, .controller_id =3D MSM_DP_CONTROLLER_1, .prog_fetch_lines_worst_case =3D 24, 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 0ede8223a3a85414f271de11b601b648ca865fbe..52b674fed71e57f82b778c13f67= 12a52a2a425a7 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 @@ -129,7 +129,6 @@ static const struct dpu_intf_cfg sc7180_intf[] =3D { { .name =3D "intf_0", .id =3D INTF_0, .base =3D 0x6a000, .len =3D 0x280, - .features =3D INTF_SC7180_MASK, .type =3D INTF_DP, .controller_id =3D MSM_DP_CONTROLLER_0, .prog_fetch_lines_worst_case =3D 24, @@ -138,7 +137,6 @@ static const struct dpu_intf_cfg sc7180_intf[] =3D { }, { .name =3D "intf_1", .id =3D INTF_1, .base =3D 0x6a800, .len =3D 0x2c0, - .features =3D INTF_SC7180_MASK, .type =3D INTF_DSI, .controller_id =3D MSM_DSI_CONTROLLER_0, .prog_fetch_lines_worst_case =3D 24, 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 01e398add3c45a8bc504da5ca268df0487462113..0178ce52e84f355919241435f58= c390234c16162 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 @@ -87,7 +87,6 @@ static const struct dpu_intf_cfg sm6115_intf[] =3D { { .name =3D "intf_1", .id =3D INTF_1, .base =3D 0x6a800, .len =3D 0x2c0, - .features =3D INTF_SC7180_MASK, .type =3D INTF_DSI, .controller_id =3D MSM_DSI_CONTROLLER_0, .prog_fetch_lines_worst_case =3D 24, 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 da04822327975aa70cab679f5e53d53f65fb749c..89db83a73bbeb15b99ac4324b76= 85baf0d724039 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 @@ -160,7 +160,6 @@ static const struct dpu_intf_cfg sm6350_intf[] =3D { { .name =3D "intf_0", .id =3D INTF_0, .base =3D 0x6a000, .len =3D 0x280, - .features =3D INTF_SC7180_MASK, .type =3D INTF_DP, .controller_id =3D MSM_DP_CONTROLLER_0, .prog_fetch_lines_worst_case =3D 35, @@ -169,7 +168,6 @@ static const struct dpu_intf_cfg sm6350_intf[] =3D { }, { .name =3D "intf_1", .id =3D INTF_1, .base =3D 0x6a800, .len =3D 0x2c0, - .features =3D INTF_SC7180_MASK, .type =3D INTF_DSI, .controller_id =3D MSM_DSI_CONTROLLER_0, .prog_fetch_lines_worst_case =3D 35, 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 94dc8726199a3a48a64c7dff58bc62e6fd097c99..0b1740de2bff94f1818ab41c6bc= 713f16796c4a4 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 @@ -87,7 +87,6 @@ static const struct dpu_intf_cfg qcm2290_intf[] =3D { { .name =3D "intf_1", .id =3D INTF_1, .base =3D 0x6a800, .len =3D 0x2c0, - .features =3D INTF_SC7180_MASK, .type =3D INTF_DSI, .controller_id =3D MSM_DSI_CONTROLLER_0, .prog_fetch_lines_worst_case =3D 24, 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 2b2b9417e23950425a72f6dd44baf824b5a00061..19800f207bff3077c7ac57ad736= eea533674ae20 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 @@ -97,7 +97,6 @@ static const struct dpu_intf_cfg sm6375_intf[] =3D { { .name =3D "intf_1", .id =3D INTF_1, .base =3D 0x6a800, .len =3D 0x2c0, - .features =3D INTF_SC7180_MASK, .type =3D INTF_DSI, .controller_id =3D MSM_DSI_CONTROLLER_0, .prog_fetch_lines_worst_case =3D 24, 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 490ddf9880103fc853b5187256c4b960739820bc..94a9f33f008a13db09764882cb0= 42f71337b89d5 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 @@ -311,7 +311,6 @@ static const struct dpu_intf_cfg sm8350_intf[] =3D { { .name =3D "intf_0", .id =3D INTF_0, .base =3D 0x34000, .len =3D 0x280, - .features =3D INTF_SC7180_MASK, .type =3D INTF_DP, .controller_id =3D MSM_DP_CONTROLLER_0, .prog_fetch_lines_worst_case =3D 24, @@ -320,7 +319,6 @@ static const struct dpu_intf_cfg sm8350_intf[] =3D { }, { .name =3D "intf_1", .id =3D INTF_1, .base =3D 0x35000, .len =3D 0x2c4, - .features =3D INTF_SC7180_MASK, .type =3D INTF_DSI, .controller_id =3D MSM_DSI_CONTROLLER_0, .prog_fetch_lines_worst_case =3D 24, @@ -330,7 +328,6 @@ static const struct dpu_intf_cfg sm8350_intf[] =3D { }, { .name =3D "intf_2", .id =3D INTF_2, .base =3D 0x36000, .len =3D 0x2c4, - .features =3D INTF_SC7180_MASK, .type =3D INTF_DSI, .controller_id =3D MSM_DSI_CONTROLLER_1, .prog_fetch_lines_worst_case =3D 24, @@ -340,7 +337,6 @@ static const struct dpu_intf_cfg sm8350_intf[] =3D { }, { .name =3D "intf_3", .id =3D INTF_3, .base =3D 0x37000, .len =3D 0x280, - .features =3D INTF_SC7180_MASK, .type =3D INTF_DP, .controller_id =3D MSM_DP_CONTROLLER_1, .prog_fetch_lines_worst_case =3D 24, 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 2ee29c56224596b3786104090290b88cecf7b223..d1dd895acbf666ceab39f9c38ae= 11bda100b5953 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 @@ -178,7 +178,6 @@ static const struct dpu_intf_cfg sc7280_intf[] =3D { { .name =3D "intf_0", .id =3D INTF_0, .base =3D 0x34000, .len =3D 0x280, - .features =3D INTF_SC7180_MASK, .type =3D INTF_DP, .controller_id =3D MSM_DP_CONTROLLER_0, .prog_fetch_lines_worst_case =3D 24, @@ -187,7 +186,6 @@ static const struct dpu_intf_cfg sc7280_intf[] =3D { }, { .name =3D "intf_1", .id =3D INTF_1, .base =3D 0x35000, .len =3D 0x2c4, - .features =3D INTF_SC7180_MASK, .type =3D INTF_DSI, .controller_id =3D MSM_DSI_CONTROLLER_0, .prog_fetch_lines_worst_case =3D 24, @@ -197,7 +195,6 @@ static const struct dpu_intf_cfg sc7280_intf[] =3D { }, { .name =3D "intf_5", .id =3D INTF_5, .base =3D 0x39000, .len =3D 0x280, - .features =3D INTF_SC7180_MASK, .type =3D INTF_DP, .controller_id =3D MSM_DP_CONTROLLER_1, .prog_fetch_lines_worst_case =3D 24, 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 dac38e0ade971876c2ed73b6d46cd4055cb77d2d..5b765620d6eff14327f8eff811e= e3b7b8fd404a5 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 @@ -307,7 +307,6 @@ static const struct dpu_intf_cfg sc8280xp_intf[] =3D { { .name =3D "intf_0", .id =3D INTF_0, .base =3D 0x34000, .len =3D 0x280, - .features =3D INTF_SC7180_MASK, .type =3D INTF_DP, .controller_id =3D MSM_DP_CONTROLLER_0, .prog_fetch_lines_worst_case =3D 24, @@ -316,7 +315,6 @@ static const struct dpu_intf_cfg sc8280xp_intf[] =3D { }, { .name =3D "intf_1", .id =3D INTF_1, .base =3D 0x35000, .len =3D 0x300, - .features =3D INTF_SC7180_MASK, .type =3D INTF_DSI, .controller_id =3D MSM_DSI_CONTROLLER_0, .prog_fetch_lines_worst_case =3D 24, @@ -326,7 +324,6 @@ static const struct dpu_intf_cfg sc8280xp_intf[] =3D { }, { .name =3D "intf_2", .id =3D INTF_2, .base =3D 0x36000, .len =3D 0x300, - .features =3D INTF_SC7180_MASK, .type =3D INTF_DSI, .controller_id =3D MSM_DSI_CONTROLLER_1, .prog_fetch_lines_worst_case =3D 24, @@ -336,7 +333,6 @@ static const struct dpu_intf_cfg sc8280xp_intf[] =3D { }, { .name =3D "intf_3", .id =3D INTF_3, .base =3D 0x37000, .len =3D 0x280, - .features =3D INTF_SC7180_MASK, .type =3D INTF_NONE, .controller_id =3D MSM_DP_CONTROLLER_0, .prog_fetch_lines_worst_case =3D 24, @@ -345,7 +341,6 @@ static const struct dpu_intf_cfg sc8280xp_intf[] =3D { }, { .name =3D "intf_4", .id =3D INTF_4, .base =3D 0x38000, .len =3D 0x280, - .features =3D INTF_SC7180_MASK, .type =3D INTF_DP, .controller_id =3D MSM_DP_CONTROLLER_1, .prog_fetch_lines_worst_case =3D 24, @@ -354,7 +349,6 @@ static const struct dpu_intf_cfg sc8280xp_intf[] =3D { }, { .name =3D "intf_5", .id =3D INTF_5, .base =3D 0x39000, .len =3D 0x280, - .features =3D INTF_SC7180_MASK, .type =3D INTF_DP, .controller_id =3D MSM_DP_CONTROLLER_3, .prog_fetch_lines_worst_case =3D 24, @@ -363,7 +357,6 @@ static const struct dpu_intf_cfg sc8280xp_intf[] =3D { }, { .name =3D "intf_6", .id =3D INTF_6, .base =3D 0x3a000, .len =3D 0x280, - .features =3D INTF_SC7180_MASK, .type =3D INTF_DP, .controller_id =3D MSM_DP_CONTROLLER_2, .prog_fetch_lines_worst_case =3D 24, @@ -372,7 +365,6 @@ static const struct dpu_intf_cfg sc8280xp_intf[] =3D { }, { .name =3D "intf_7", .id =3D INTF_7, .base =3D 0x3b000, .len =3D 0x280, - .features =3D INTF_SC7180_MASK, .type =3D INTF_NONE, .controller_id =3D MSM_DP_CONTROLLER_2, .prog_fetch_lines_worst_case =3D 24, @@ -381,7 +373,6 @@ static const struct dpu_intf_cfg sc8280xp_intf[] =3D { }, { .name =3D "intf_8", .id =3D INTF_8, .base =3D 0x3c000, .len =3D 0x280, - .features =3D INTF_SC7180_MASK, .type =3D INTF_NONE, .controller_id =3D MSM_DP_CONTROLLER_1, .prog_fetch_lines_worst_case =3D 24, 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 db332286a0a92cfda434571a2a582c45460e5300..770c2236afebe8b6bb38f2eab4d= 201fbf4256342 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 @@ -327,7 +327,6 @@ static const struct dpu_intf_cfg sm8450_intf[] =3D { { .name =3D "intf_0", .id =3D INTF_0, .base =3D 0x34000, .len =3D 0x280, - .features =3D INTF_SC7180_MASK, .type =3D INTF_DP, .controller_id =3D MSM_DP_CONTROLLER_0, .prog_fetch_lines_worst_case =3D 24, @@ -336,7 +335,6 @@ static const struct dpu_intf_cfg sm8450_intf[] =3D { }, { .name =3D "intf_1", .id =3D INTF_1, .base =3D 0x35000, .len =3D 0x300, - .features =3D INTF_SC7180_MASK, .type =3D INTF_DSI, .controller_id =3D MSM_DSI_CONTROLLER_0, .prog_fetch_lines_worst_case =3D 24, @@ -346,7 +344,6 @@ static const struct dpu_intf_cfg sm8450_intf[] =3D { }, { .name =3D "intf_2", .id =3D INTF_2, .base =3D 0x36000, .len =3D 0x300, - .features =3D INTF_SC7180_MASK, .type =3D INTF_DSI, .controller_id =3D MSM_DSI_CONTROLLER_1, .prog_fetch_lines_worst_case =3D 24, @@ -356,7 +353,6 @@ static const struct dpu_intf_cfg sm8450_intf[] =3D { }, { .name =3D "intf_3", .id =3D INTF_3, .base =3D 0x37000, .len =3D 0x280, - .features =3D INTF_SC7180_MASK, .type =3D INTF_DP, .controller_id =3D MSM_DP_CONTROLLER_1, .prog_fetch_lines_worst_case =3D 24, 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 826cd366495139e0e4cf1862e923ef0ece0d7184..6f376b716690a8e144d2ad9c424= 232c7a535c45e 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 @@ -337,7 +337,6 @@ static const struct dpu_intf_cfg sa8775p_intf[] =3D { { .name =3D "intf_0", .id =3D INTF_0, .base =3D 0x34000, .len =3D 0x280, - .features =3D INTF_SC7180_MASK, .type =3D INTF_DP, .controller_id =3D MSM_DP_CONTROLLER_0, .prog_fetch_lines_worst_case =3D 24, @@ -346,7 +345,6 @@ static const struct dpu_intf_cfg sa8775p_intf[] =3D { }, { .name =3D "intf_1", .id =3D INTF_1, .base =3D 0x35000, .len =3D 0x300, - .features =3D INTF_SC7180_MASK, .type =3D INTF_DSI, .controller_id =3D MSM_DSI_CONTROLLER_0, .prog_fetch_lines_worst_case =3D 24, @@ -356,7 +354,6 @@ static const struct dpu_intf_cfg sa8775p_intf[] =3D { }, { .name =3D "intf_2", .id =3D INTF_2, .base =3D 0x36000, .len =3D 0x300, - .features =3D INTF_SC7180_MASK, .type =3D INTF_DSI, .controller_id =3D MSM_DSI_CONTROLLER_1, .prog_fetch_lines_worst_case =3D 24, @@ -366,7 +363,6 @@ static const struct dpu_intf_cfg sa8775p_intf[] =3D { }, { .name =3D "intf_3", .id =3D INTF_3, .base =3D 0x37000, .len =3D 0x280, - .features =3D INTF_SC7180_MASK, .type =3D INTF_NONE, .controller_id =3D MSM_DP_CONTROLLER_0, /* pair with intf_0 for DP MST */ .prog_fetch_lines_worst_case =3D 24, @@ -375,7 +371,6 @@ static const struct dpu_intf_cfg sa8775p_intf[] =3D { }, { .name =3D "intf_4", .id =3D INTF_4, .base =3D 0x38000, .len =3D 0x280, - .features =3D INTF_SC7180_MASK, .type =3D INTF_DP, .controller_id =3D MSM_DP_CONTROLLER_1, .prog_fetch_lines_worst_case =3D 24, @@ -384,7 +379,6 @@ static const struct dpu_intf_cfg sa8775p_intf[] =3D { }, { .name =3D "intf_6", .id =3D INTF_6, .base =3D 0x3A000, .len =3D 0x280, - .features =3D INTF_SC7180_MASK, .type =3D INTF_NONE, .controller_id =3D MSM_DP_CONTROLLER_0, /* pair with intf_0 for DP MST */ .prog_fetch_lines_worst_case =3D 24, @@ -393,7 +387,6 @@ static const struct dpu_intf_cfg sa8775p_intf[] =3D { }, { .name =3D "intf_7", .id =3D INTF_7, .base =3D 0x3b000, .len =3D 0x280, - .features =3D INTF_SC7180_MASK, .type =3D INTF_NONE, .controller_id =3D MSM_DP_CONTROLLER_0, /* pair with intf_0 for DP MST */ .prog_fetch_lines_worst_case =3D 24, @@ -402,7 +395,6 @@ static const struct dpu_intf_cfg sa8775p_intf[] =3D { }, { .name =3D "intf_8", .id =3D INTF_8, .base =3D 0x3c000, .len =3D 0x280, - .features =3D INTF_SC7180_MASK, .type =3D INTF_NONE, .controller_id =3D MSM_DP_CONTROLLER_1, /* pair with intf_4 for DP MST */ .prog_fetch_lines_worst_case =3D 24, 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 f5f018381b4f0f59c2751b18528994ff79555d58..b03077865cd545219e814311bec= 4d8da4fd9974c 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 @@ -322,7 +322,6 @@ static const struct dpu_intf_cfg sm8550_intf[] =3D { { .name =3D "intf_0", .id =3D INTF_0, .base =3D 0x34000, .len =3D 0x280, - .features =3D INTF_SC7180_MASK, .type =3D INTF_DP, .controller_id =3D MSM_DP_CONTROLLER_0, .prog_fetch_lines_worst_case =3D 24, @@ -331,7 +330,6 @@ static const struct dpu_intf_cfg sm8550_intf[] =3D { }, { .name =3D "intf_1", .id =3D INTF_1, .base =3D 0x35000, .len =3D 0x300, - .features =3D INTF_SC7180_MASK, .type =3D INTF_DSI, .controller_id =3D MSM_DSI_CONTROLLER_0, .prog_fetch_lines_worst_case =3D 24, @@ -341,7 +339,6 @@ static const struct dpu_intf_cfg sm8550_intf[] =3D { }, { .name =3D "intf_2", .id =3D INTF_2, .base =3D 0x36000, .len =3D 0x300, - .features =3D INTF_SC7180_MASK, .type =3D INTF_DSI, .controller_id =3D MSM_DSI_CONTROLLER_1, .prog_fetch_lines_worst_case =3D 24, @@ -351,7 +348,6 @@ static const struct dpu_intf_cfg sm8550_intf[] =3D { }, { .name =3D "intf_3", .id =3D INTF_3, .base =3D 0x37000, .len =3D 0x280, - .features =3D INTF_SC7180_MASK, .type =3D INTF_DP, .controller_id =3D MSM_DP_CONTROLLER_1, .prog_fetch_lines_worst_case =3D 24, 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 ecda48282f52e0fc33b68117650b9f2b76c90276..a587c6bba11c30d9090aa6c48d1= 1c7b65819a58e 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 @@ -323,7 +323,6 @@ static const struct dpu_intf_cfg x1e80100_intf[] =3D { { .name =3D "intf_0", .id =3D INTF_0, .base =3D 0x34000, .len =3D 0x280, - .features =3D INTF_SC7180_MASK, .type =3D INTF_DP, .controller_id =3D MSM_DP_CONTROLLER_0, .prog_fetch_lines_worst_case =3D 24, @@ -332,7 +331,6 @@ static const struct dpu_intf_cfg x1e80100_intf[] =3D { }, { .name =3D "intf_1", .id =3D INTF_1, .base =3D 0x35000, .len =3D 0x300, - .features =3D INTF_SC7180_MASK, .type =3D INTF_DSI, .controller_id =3D MSM_DSI_CONTROLLER_0, .prog_fetch_lines_worst_case =3D 24, @@ -342,7 +340,6 @@ static const struct dpu_intf_cfg x1e80100_intf[] =3D { }, { .name =3D "intf_2", .id =3D INTF_2, .base =3D 0x36000, .len =3D 0x300, - .features =3D INTF_SC7180_MASK, .type =3D INTF_DSI, .controller_id =3D MSM_DSI_CONTROLLER_1, .prog_fetch_lines_worst_case =3D 24, @@ -352,7 +349,6 @@ static const struct dpu_intf_cfg x1e80100_intf[] =3D { }, { .name =3D "intf_3", .id =3D INTF_3, .base =3D 0x37000, .len =3D 0x280, - .features =3D INTF_SC7180_MASK, .type =3D INTF_NONE, .controller_id =3D MSM_DP_CONTROLLER_0, /* pair with intf_0 for DP MST */ .prog_fetch_lines_worst_case =3D 24, @@ -361,7 +357,6 @@ static const struct dpu_intf_cfg x1e80100_intf[] =3D { }, { .name =3D "intf_4", .id =3D INTF_4, .base =3D 0x38000, .len =3D 0x280, - .features =3D INTF_SC7180_MASK, .type =3D INTF_DP, .controller_id =3D MSM_DP_CONTROLLER_1, .prog_fetch_lines_worst_case =3D 24, @@ -370,7 +365,6 @@ static const struct dpu_intf_cfg x1e80100_intf[] =3D { }, { .name =3D "intf_5", .id =3D INTF_5, .base =3D 0x39000, .len =3D 0x280, - .features =3D INTF_SC7180_MASK, .type =3D INTF_DP, .controller_id =3D MSM_DP_CONTROLLER_3, .prog_fetch_lines_worst_case =3D 24, @@ -379,7 +373,6 @@ static const struct dpu_intf_cfg x1e80100_intf[] =3D { }, { .name =3D "intf_6", .id =3D INTF_6, .base =3D 0x3A000, .len =3D 0x280, - .features =3D INTF_SC7180_MASK, .type =3D INTF_DP, .controller_id =3D MSM_DP_CONTROLLER_2, .prog_fetch_lines_worst_case =3D 24, @@ -388,7 +381,6 @@ static const struct dpu_intf_cfg x1e80100_intf[] =3D { }, { .name =3D "intf_7", .id =3D INTF_7, .base =3D 0x3b000, .len =3D 0x280, - .features =3D INTF_SC7180_MASK, .type =3D INTF_NONE, .controller_id =3D MSM_DP_CONTROLLER_2, /* pair with intf_6 for DP MST */ .prog_fetch_lines_worst_case =3D 24, @@ -397,7 +389,6 @@ static const struct dpu_intf_cfg x1e80100_intf[] =3D { }, { .name =3D "intf_8", .id =3D INTF_8, .base =3D 0x3c000, .len =3D 0x280, - .features =3D INTF_SC7180_MASK, .type =3D INTF_NONE, .controller_id =3D MSM_DP_CONTROLLER_1, /* pair with intf_4 for DP MST */ .prog_fetch_lines_worst_case =3D 24, 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 8808be27593b303a2a199a740827c92ea5339b0d..5e0123557a44fda1d250130e09e= 4968535927088 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.c +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.c @@ -110,9 +110,6 @@ #define PINGPONG_SM8150_MASK \ (BIT(DPU_PINGPONG_DITHER) | BIT(DPU_PINGPONG_DSC)) =20 -#define INTF_SC7180_MASK \ - (BIT(DPU_INTF_INPUT_CTRL)) - #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 858fd73e0ac3a92fe402001d4796eb86945f61b0..33506e3bba9fc51f9e99446cb7d= f6aa51d81a3b1 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.h +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.h @@ -141,17 +141,6 @@ enum { DPU_CTL_MAX }; =20 -/** - * INTF sub-blocks - * @DPU_INTF_INPUT_CTRL Supports the setting of pp block from = which - * pixel data arrives to this INTF - * @DPU_INTF_MAX - */ -enum { - DPU_INTF_INPUT_CTRL =3D 0x1, - DPU_INTF_MAX -}; - /** * WB sub-blocks and features * @DPU_WB_LINE_MODE Writeback module supports line/linear mode diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_intf.c b/drivers/gpu/drm/= msm/disp/dpu1/dpu_hw_intf.c index 54c2e984ef0ce604e3eda49595d2816ea41bd7fd..a80ac82a96255da1d52e1f2fa7f= c39388fc3782b 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_intf.c +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_intf.c @@ -588,7 +588,7 @@ struct dpu_hw_intf *dpu_hw_intf_init(struct drm_device = *dev, c->ops.setup_misr =3D dpu_hw_intf_setup_misr; c->ops.collect_misr =3D dpu_hw_intf_collect_misr; =20 - if (cfg->features & BIT(DPU_INTF_INPUT_CTRL)) + if (mdss_rev->core_major_ver >=3D 5) c->ops.bind_pingpong_blk =3D dpu_hw_intf_bind_pingpong_blk; =20 /* INTF TE is only for DSI interfaces */ --=20 2.39.5 From nobody Sun Feb 8 09:32:35 2026 Received: from mx0b-0031df01.pphosted.com (mx0b-0031df01.pphosted.com [205.220.180.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 6A08F22D780 for ; Thu, 24 Apr 2025 09:30:54 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=205.220.180.131 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745487056; cv=none; b=fo2xABiKlhlUBLe5rVmF7vWTsS3w69uyQ0UxBqd0x0HT4yGUXwx8Vzi4QSpFnl9OgQea9E/WfTb+jaNZBtmz4CPBKZtJ3wXqQEZIwApj8IF+FOwsDlDwmIZssYHoCK8y0YhQlazbqLTGng1ltTUMaufdDXlEiiDSgtRX0Mfpy6A= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745487056; c=relaxed/simple; bh=QLlgGZjuAgrO3Lrr+XY7lOHAAtK3ZPDDnutOZORXNm0=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=ICCwFYEk7JR/Q641cu4VEqPeLr5B9pw+7C8Ch00CgQA5XrMvIS5Tho5amQy/Wv9xTmeOwBwCJhLNxnXz/Sr3Ro9WdSPnTBegJJizpOVCSTVCBDc1MeJNLV0GOFJrLPJnQ1UalaPjVTWHlsthnM4LA84nC8zD+mOtnbZYQjwyCCg= 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=khMrd9oB; arc=none smtp.client-ip=205.220.180.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="khMrd9oB" Received: from pps.filterd (m0279870.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 53O0F9VW031001 for ; Thu, 24 Apr 2025 09:30: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= ffZOVjR3W6ynnIHHd9IljxUE9heAZOgJlW9d31dbFoc=; b=khMrd9oB79g3YR5r 0e0Amby+Ck1zDWIG9pU42DPSOF1boUZb8TmImFP8aFgavRABRlInKofOJDAU8/vf sfIPpp4l5N9WCynx89GIlVVnzQ9iYQggkT5CuKh8d1leTruFc0DFlU3k2M9DQjmY /MmtNDSWequkn6j/mpUHaOOQy+y+kV8hTBj3tq9ZVkO/gf45AUkQdegkusjyOsfi NnlQ5UZLBShEQ1nZE9NW50MXTbNFILIghxjk9NPJOY72IBF7HUE+j8KJo2o22af0 QRh8TyV82IXHsjrSak0aj/Hvzchvy0yFVY/VqYezDB9cZeSW8WH5Fq43r8qZSJIH k5bEaw== Received: from mail-qk1-f200.google.com (mail-qk1-f200.google.com [209.85.222.200]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 466jh5cyyx-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Thu, 24 Apr 2025 09:30:53 +0000 (GMT) Received: by mail-qk1-f200.google.com with SMTP id af79cd13be357-7c5f3b8b1a1so128957485a.3 for ; Thu, 24 Apr 2025 02:30:53 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1745487052; x=1746091852; 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=ffZOVjR3W6ynnIHHd9IljxUE9heAZOgJlW9d31dbFoc=; b=f5dN1MBe61MSg0xnpBjjRKATfyfZvI8DNU5s5VymprLO8BIA9XX90UIjlvCCO57VwQ dP4jtzILkbU1g5pVgZPHaUrKDhGTLrQRjopjt67wjuragGqs0SFdLH6VKZCy/jh08MsD QUZx+Hxtw1fg6cg7aoHPzNer/Sp2uWfFDfdv1nvTm0YqcXZofUESxK8T5dlT7i3WrKKY k30QH7nsb9PuQNci8NnnIhbkyfNUiEVH/EG1XTLv/hbsdSHyU131EALFxlsuQ7Ny3sEs 9v49sbBVBI4vV4LerU8Gkqb4rbCOUXZSqhrekKO5U+LktiT+FCKyJYIqRICcY+jT8d8f mGOg== X-Forwarded-Encrypted: i=1; AJvYcCXZA+9OheIH43NnfJdnLu/Z/mhsy3J/arT2FK5P+xYrmmGT7EHhFUichfX0As+AUUyzSU3q97Z5orgtwU0=@vger.kernel.org X-Gm-Message-State: AOJu0Yyq9AxnndAahWJRPpf9YWelOPuczrDHwQVwNJIXak5rz5ZPvgoS VMfKaQZtV3CfolxFeByMN6dBu4WSm4XhFtpUycbQLbvo5+QUPMIUsmsv8kWKL/s9wmBqHGLOBCv K7p6hNZ0GlTuNyzTUQpKM9CmF1u/UJX7u8EcRKkYGHawEntKmqBTjmoyOS4BDnmM= X-Gm-Gg: ASbGnctNyoWHf9581kvM43lO2qNm9kmQVfVlpCk7TSg1o8LFjWlJi4q3g9+INsB98aI U0hBz5PbOe4aMJqSM4wSWduSNlGBW8YL+/jGzkWifyA9gyHv9letRwF752dHafZnLkCF3+RaqCu Lx1/IYQIjfOsHC5q36e63o/+5m1v0q5xQJC1C4le6CM0iVJR1Zdj9zjtoyd4dnxxKIgM3D7NxZj NYsVt56Hm6FcRUuMHtaSpBsH5vrMw/wBloA8jFU7jqUsGg2rPvX4CZfAXn+hoo+/Ob9hKx4WbEz hQ0ATE5/QbjF5KwVBmGE0iZLYb2RdjlGIYQbtd2+8S9R0wOm2w9vyuajPyU2PO3BQjn+h+Mekc/ qdtvCmKYb1JI4OQiG23qE1cy0 X-Received: by 2002:a05:620a:371d:b0:7c5:5859:1b81 with SMTP id af79cd13be357-7c956f44e77mr272137485a.57.1745487052473; Thu, 24 Apr 2025 02:30:52 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGcWHf9Ny0IeovtF8ZvpzJBNbPhPozTKv/A8zYHNTd5Y1Te38q8EqdTPyCxrYKfDo87wxxgIA== X-Received: by 2002:a05:620a:371d:b0:7c5:5859:1b81 with SMTP id af79cd13be357-7c956f44e77mr272132585a.57.1745487052014; Thu, 24 Apr 2025 02:30:52 -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 38308e7fff4ca-317d1b9a304sm1820461fa.99.2025.04.24.02.30.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 24 Apr 2025 02:30:51 -0700 (PDT) From: Dmitry Baryshkov Date: Thu, 24 Apr 2025 12:30:20 +0300 Subject: [PATCH v3 16/33] drm/msm/dpu: get rid of DPU_PINGPONG_DSC 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: <20250424-dpu-drop-features-v3-16-cdaca81d356f@oss.qualcomm.com> References: <20250424-dpu-drop-features-v3-0-cdaca81d356f@oss.qualcomm.com> In-Reply-To: <20250424-dpu-drop-features-v3-0-cdaca81d356f@oss.qualcomm.com> To: Rob Clark , Abhinav Kumar , Sean Paul , Marijn Suijten , David Airlie , Simona Vetter , Vinod Koul , Konrad Dybcio Cc: 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=7378; i=dmitry.baryshkov@oss.qualcomm.com; h=from:subject:message-id; bh=zZbpETW7aMiyCYpHLuzre/GCxsgOdCyoBUUKB/kjzjU=; b=owEBbQGS/pANAwAKAYs8ij4CKSjVAcsmYgBoCgStFXlbTHqq+sLgNh00isgD0oAiBCFwbz9Gx H6NbQQg2I+JATMEAAEKAB0WIQRMcISVXLJjVvC4lX+LPIo+Aiko1QUCaAoErQAKCRCLPIo+Aiko 1S3ECACMKZAVW+bLxLDpNw2SrOTD/i+MXKRnOtn+Ez//wa7Zef13Dq+Sv5IWB7GkWyPSkZv3+Zb sHLSpZxz4S3ZqYJtj3DK3DHOqn1CrA/Nf7f44i4hYN9waH+qGMNYcLatmy28iX0x44WvZBdrtZt GFCTVrezMiNngaEeDBp5uopRzR4uPYv79vTwPRPUDJUXAwJZ90OhL2WAVkDh+QXpKD45hvymdmT 6sB7x3llcZsG28bDWtVK/NIhJk81hv0TepQAJeSI0ZzdUGlEDyr96/4/5gUcNltxU4t5CtTj5lm 9mXqakol3o2wX6bqs/7/30M61KtBCqDfepfz8fEyPqwlMUvI X-Developer-Key: i=dmitry.baryshkov@oss.qualcomm.com; a=openpgp; fpr=8F88381DD5C873E4AE487DA5199BF1243632046A X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUwNDI0MDA2MyBTYWx0ZWRfX2gj1luWnYu1T 2QWJ8/F2/q4DldPFwa1nNTvhBhtKjD0SZWxvFFFznZBM3XXHRJ7DZ/lVj7D0x9YAykG9w3G+Djn JU8dbr6lP4b+YeBsdot6cXlNtMjoXDxd02yPFzr7GCJNh0zp4CZw9Twl8ZxI9OOWvy/8dWHSoGA qPM82q0dKi+wvp1Ca69Ska2EmAkQRe9pCwmn/G9wq/PZpGIwPB2k0OIO2TkFJn1bm/swt+JFb0a lbbQuzgyNuKsSV/a8cN0Tq/ur8smpiH4t4OFhkgmGIRTKqmhzAP5bfDgWjviuECbtm0msM5TZuh iWnt7ZU3c8qYOU55hX4Kt/mTAycYPSbsLt06B9ZymobIXZNYaFFGnxljRRc+X9AeNibEy69JmSL OYCn+6zSJLOGkXAaFmkZfavhg0p0SqAtD/KevbsBAW8t3X0zU5HAoACXpLUnAeljT8FWqbVG X-Proofpoint-GUID: uOpaAUtp6YvSSHRZzXzrU6njh10oIHgj X-Authority-Analysis: v=2.4 cv=B/S50PtM c=1 sm=1 tr=0 ts=680a04cd cx=c_pps a=hnmNkyzTK/kJ09Xio7VxxA==:117 a=xqWC_Br6kY4A:10 a=IkcTkHD0fZMA:10 a=XR8D0OoHHMoA:10 a=KKAkSRfTAAAA:8 a=TBtKe9T1WDpDz7RobDkA:9 a=QEXdDO2ut3YA:10 a=PEH46H7Ffwr30OY-TuGO:22 a=cvBusfyB2V15izCimMoJ:22 X-Proofpoint-ORIG-GUID: uOpaAUtp6YvSSHRZzXzrU6njh10oIHgj X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1099,Hydra:6.0.680,FMLib:17.12.80.40 definitions=2025-04-24_04,2025-04-22_01,2025-02-21_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 adultscore=0 mlxlogscore=999 lowpriorityscore=0 bulkscore=0 impostorscore=0 suspectscore=0 mlxscore=0 priorityscore=1501 phishscore=0 malwarescore=0 spamscore=0 clxscore=1015 classifier=spam authscore=0 authtc=n/a authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.19.0-2504070000 definitions=main-2504240063 From: Dmitry Baryshkov Continue migration to the MDSS-revision based checks and replace DPU_PINGPONG_DSC feature bit with the core_major_ver < 7 check. Signed-off-by: Dmitry Baryshkov --- drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_1_14_msm8937.h | 2 -- drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_1_15_msm8917.h | 1 - drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_1_16_msm8953.h | 2 -- drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_1_7_msm8996.h | 6 ++---- drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.c | 10 ++-------- drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.h | 2 -- drivers/gpu/drm/msm/disp/dpu1/dpu_hw_pingpong.c | 2 +- 7 files changed, 5 insertions(+), 20 deletions(-) diff --git a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_1_14_msm8937.h b/dri= vers/gpu/drm/msm/disp/dpu1/catalog/dpu_1_14_msm8937.h index 78ade3e977108fe98dc63ed93535ae3d947d871b..c0b4db94777c42efd941fdd5299= 3b854ab54c694 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[] =3D= { { .name =3D "pingpong_0", .id =3D PINGPONG_0, .base =3D 0x70000, .len =3D 0xd4, - .features =3D PINGPONG_MSM8996_MASK, .sblk =3D &msm8996_pp_sblk, .intr_done =3D DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 8), .intr_rdptr =3D DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 12), }, { .name =3D "pingpong_1", .id =3D PINGPONG_1, .base =3D 0x70800, .len =3D 0xd4, - .features =3D PINGPONG_MSM8996_MASK, .sblk =3D &msm8996_pp_sblk, .intr_done =3D DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 9), .intr_rdptr =3D DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 13), diff --git a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_1_15_msm8917.h b/dri= vers/gpu/drm/msm/disp/dpu1/catalog/dpu_1_15_msm8917.h index 63dd5afdb60b051f6d531257b2844920cc09ed80..d3e4c48be306a04b457cc002910= eb018a3f13154 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[] =3D { { .name =3D "pingpong_0", .id =3D PINGPONG_0, .base =3D 0x70000, .len =3D 0xd4, - .features =3D PINGPONG_MSM8996_MASK, .sblk =3D &msm8996_pp_sblk, .intr_done =3D DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 8), .intr_rdptr =3D DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 12), diff --git a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_1_16_msm8953.h b/dri= vers/gpu/drm/msm/disp/dpu1/catalog/dpu_1_16_msm8953.h index 4f09d483fbde29c74e3fd9bd0ba7a1a9c2638183..c488b88332d0e69cfb23bcf4e41= a2e4f4be6844d 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[] =3D= { { .name =3D "pingpong_0", .id =3D PINGPONG_0, .base =3D 0x70000, .len =3D 0xd4, - .features =3D PINGPONG_MSM8996_MASK, .sblk =3D &msm8996_pp_sblk, .intr_done =3D DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 8), .intr_rdptr =3D DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 12), }, { .name =3D "pingpong_1", .id =3D PINGPONG_1, .base =3D 0x70800, .len =3D 0xd4, - .features =3D PINGPONG_MSM8996_MASK, .sblk =3D &msm8996_pp_sblk, .intr_done =3D DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 9), .intr_rdptr =3D DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 13), diff --git a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_1_7_msm8996.h b/driv= ers/gpu/drm/msm/disp/dpu1/catalog/dpu_1_7_msm8996.h index 54477e300c273182172a78b81dd0274242689895..ac0d872ac06be7376b7b4111e1a= c5f4057b5fb76 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,28 +181,26 @@ static const struct dpu_pingpong_cfg msm8996_pp[] =3D= { { .name =3D "pingpong_0", .id =3D PINGPONG_0, .base =3D 0x70000, .len =3D 0xd4, - .features =3D PINGPONG_MSM8996_TE2_MASK, + .features =3D BIT(DPU_PINGPONG_TE2), .sblk =3D &msm8996_pp_sblk_te, .intr_done =3D DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 8), .intr_rdptr =3D DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 12), }, { .name =3D "pingpong_1", .id =3D PINGPONG_1, .base =3D 0x70800, .len =3D 0xd4, - .features =3D PINGPONG_MSM8996_TE2_MASK, + .features =3D BIT(DPU_PINGPONG_TE2), .sblk =3D &msm8996_pp_sblk_te, .intr_done =3D DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 9), .intr_rdptr =3D DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 13), }, { .name =3D "pingpong_2", .id =3D PINGPONG_2, .base =3D 0x71000, .len =3D 0xd4, - .features =3D PINGPONG_MSM8996_MASK, .sblk =3D &msm8996_pp_sblk, .intr_done =3D DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 10), .intr_rdptr =3D DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 14), }, { .name =3D "pingpong_3", .id =3D PINGPONG_3, .base =3D 0x71800, .len =3D 0xd4, - .features =3D PINGPONG_MSM8996_MASK, .sblk =3D &msm8996_pp_sblk, .intr_done =3D DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 11), .intr_rdptr =3D DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 15), 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 5e0123557a44fda1d250130e09e4968535927088..5dd486dd9bc77184d5e9cf5ca29= 22bb3d1671ea2 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.c +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.c @@ -95,20 +95,14 @@ #define MIXER_QCM2290_MASK \ (BIT(DPU_DIM_LAYER) | BIT(DPU_MIXER_COMBINED_ALPHA)) =20 -#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)) + (BIT(DPU_PINGPONG_DITHER)) =20 #define PINGPONG_SDM845_TE2_MASK \ (PINGPONG_SDM845_MASK | BIT(DPU_PINGPONG_TE2)) =20 #define PINGPONG_SM8150_MASK \ - (BIT(DPU_PINGPONG_DITHER) | BIT(DPU_PINGPONG_DSC)) + (BIT(DPU_PINGPONG_DITHER)) =20 #define WB_SDM845_MASK (BIT(DPU_WB_LINE_MODE) | \ BIT(DPU_WB_UBWC) | \ 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 33506e3bba9fc51f9e99446cb7df6aa51d81a3b1..3300897aebc9d6b38bcf4a0e0d5= 1095bcbb6fa9d 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.h +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.h @@ -119,7 +119,6 @@ enum { * @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 - * @DPU_PINGPONG_DSC PP block supports DSC * @DPU_PINGPONG_MAX */ enum { @@ -127,7 +126,6 @@ enum { DPU_PINGPONG_SPLIT, DPU_PINGPONG_SLAVE, DPU_PINGPONG_DITHER, - DPU_PINGPONG_DSC, DPU_PINGPONG_MAX }; =20 diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_pingpong.c b/drivers/gpu/= drm/msm/disp/dpu1/dpu_hw_pingpong.c index 36c0ec775b92036eaab26e1fa5331579651ac27c..49e03ecee9e8b567a3f809b977d= eb83731006ac0 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_pingpong.c +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_pingpong.c @@ -319,7 +319,7 @@ struct dpu_hw_pingpong *dpu_hw_pingpong_init(struct drm= _device *dev, c->ops.disable_autorefresh =3D dpu_hw_pp_disable_autorefresh; } =20 - if (test_bit(DPU_PINGPONG_DSC, &cfg->features)) { + if (mdss_rev->core_major_ver < 7) { c->ops.setup_dsc =3D dpu_hw_pp_setup_dsc; c->ops.enable_dsc =3D dpu_hw_pp_dsc_enable; c->ops.disable_dsc =3D dpu_hw_pp_dsc_disable; --=20 2.39.5 From nobody Sun Feb 8 09:32:35 2026 Received: from mx0b-0031df01.pphosted.com (mx0b-0031df01.pphosted.com [205.220.180.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 817EA231A24 for ; Thu, 24 Apr 2025 09:30:59 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=205.220.180.131 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745487062; cv=none; b=APhi+8X13ymYctwwSQrFqbQVBc6zVlGtpsjnG5qtG2XC0dvZsgeYQ7UqoBZ2cTWpb2mTVgEQCYfszbYcJlXvrgh5Tt/vofRrr9pZX0Xd0FrCzkyPE7EuWvx8acZoWYEVPJfe9pWuCG4cuFPif3rI8Qte4Ai1dsApaMXQlYRf+lY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745487062; c=relaxed/simple; bh=5dJwuP5daQ4yF6kiPzHL31r6KK+hVr0Watzu+boz27Q=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=ml/MgUKSzVji7UvO4tJbb7EUrb23TTAK3L5BmdgMmQB/Y8OilZXcZbKbLrr5DqLWYNybDiSy5KX8Tp8FEGBgR4dRcvPwZieJixRUMFIlpaLYUkIxTyUxMhMZoWYhGUcGB7FWXAtG2NSEV5eATftBAaAyUdRA8TUfFNqC3dhUFsE= 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=ndb6Orlk; arc=none smtp.client-ip=205.220.180.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="ndb6Orlk" Received: from pps.filterd (m0279870.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 53O0F8ae030993 for ; Thu, 24 Apr 2025 09:30:58 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= WNgjgHk3OMg1TnuyB6jq0+gopQ0EWCOYi8IMN4bIZsU=; b=ndb6Orlk68JHCyha YtHV45odtLa7X91DEuTweQO/WswnhdnwBDs7RBxg5+xqxOO1mqHwCtII4AbMBiQT 4RjsnqW9oASpSvJ9geu0iDiCZlWfXtUK3q1qzmRVhC+rVXTm3udR6RcVxL5PfgAT UoP8NSTigOCLSuYqMqEGXd1AxufsjeJnPWgutrKSae+3bBz971CxoteyPI21+ZBB ArzJMSy5bUMJnTalTjUzvLkFYm7QZuNFuAC5ku1cipQ57YYHFE97iHi6v/QTN1mu 7AP7YL8SVSMPXCtiWvrA0eJOG2jurrBejdzybhtbPgx5VRXZrhhOOlXcT3QBnP9D KpfZ5g== Received: from mail-qk1-f200.google.com (mail-qk1-f200.google.com [209.85.222.200]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 466jh5d00p-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Thu, 24 Apr 2025 09:30:58 +0000 (GMT) Received: by mail-qk1-f200.google.com with SMTP id af79cd13be357-7c5e2a31f75so254142985a.1 for ; Thu, 24 Apr 2025 02:30:58 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1745487056; x=1746091856; 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=WNgjgHk3OMg1TnuyB6jq0+gopQ0EWCOYi8IMN4bIZsU=; b=nPi5o+9bbUM5GIyEystqrRuPdW669I/kGFLThE+GcC+/mqMXR3DWtcSvbp0eH04eeX 00gluG78/8QJqPrWwpgo/cVQM7pUFH9CgXVjNkqYXdp6SF/V2DnyrFre/T7uhPzTDsc4 si3j4T/gihfc2k/qz725MXeQpcooax64ZDHPuQlbHPtYGAqkDLfaVQ43Lulb4RdrXu74 lyYzVP5x2d6gVHl7w6WUrO9wt+CfVYRZmj4nnXU/oNPUTo/3JqVqDIeRHbOn/yC13fNW roCtOioqWD0bzM2+z6GZkzs6KZIBQ/vKZHtZnWa+abU5TENgFYbolDWOxTSG2Hlu3bUy 1Cpg== X-Forwarded-Encrypted: i=1; AJvYcCWvwwEVAtZJsgjUds2r/GCacK9yLdLV8drlSc4/GsnsGreAfdLOnZ6EDjujGjKxbpPbfWrcrFaUNbNWVmY=@vger.kernel.org X-Gm-Message-State: AOJu0YyU4Yn4hTuykc5vy3l/OYDD+OR31teVs+0GksX9lwfFWjfPRZbT Sd+pFupeLeXPoh76SpX1wV+WbCcPd0whA7FjM7DdXp1nPxVnIJJJBc7CKnhFaQu+4KvnvGuGilT qOLWMrLM8xg/YNM4DJFDLu/hLt5gf+0lnkGanYrq+QX4lMDKjGSrgbLjZXYydSqQ= X-Gm-Gg: ASbGncuplkS4THSWbBoHS/+PLnpdELKwgnQjbtFrLxY/bTu1woy38eLLqq/82rB6lSY BYtIZTdMB0rgOVdmGivuhD/B3W0mjGL6H5y7jrbDRR5DIhczipS7jDkPqpPYpqWuZi/DHwE0Mn1 bnvxfumwJw/7SxSVBeqffcCmAoohdoC8padLJc2yrBLaNb/iOpIuLp4t+GL7zuA7AFRtP2276WF gpRHoEELIFWuA7YUmzlMbbVGRWnj44nEON1MHs5mKU6jziJaz7PX4QCuodE3LG4uip8uofZ7AsN G+dkVc5gcKDgbT4XhJn0Qb4zJ0q4w8qVCD/J/TZqNcBxobPkzmiB51Y4ZSvLKXW8nNKLpm38RG5 02wz9Zgw1k8FT+PNjLB0p4rPz X-Received: by 2002:a05:620a:44cd:b0:7c5:4de8:bf65 with SMTP id af79cd13be357-7c956f3ff8bmr353994285a.36.1745487055522; Thu, 24 Apr 2025 02:30:55 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEH7nz7ce8IiBzbFQSi4Y28TT0pi3mb9bDQHPOwYUt2CqqEXstwYPE3WnRcTKalYeOSSSaQrA== X-Received: by 2002:a05:620a:44cd:b0:7c5:4de8:bf65 with SMTP id af79cd13be357-7c956f3ff8bmr353989785a.36.1745487054968; Thu, 24 Apr 2025 02:30:54 -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 38308e7fff4ca-317d1b9a304sm1820461fa.99.2025.04.24.02.30.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 24 Apr 2025 02:30:53 -0700 (PDT) From: Dmitry Baryshkov Date: Thu, 24 Apr 2025 12:30:21 +0300 Subject: [PATCH v3 17/33] drm/msm/dpu: get rid of DPU_PINGPONG_DITHER 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: <20250424-dpu-drop-features-v3-17-cdaca81d356f@oss.qualcomm.com> References: <20250424-dpu-drop-features-v3-0-cdaca81d356f@oss.qualcomm.com> In-Reply-To: <20250424-dpu-drop-features-v3-0-cdaca81d356f@oss.qualcomm.com> To: Rob Clark , Abhinav Kumar , Sean Paul , Marijn Suijten , David Airlie , Simona Vetter , Vinod Koul , Konrad Dybcio Cc: 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=38840; i=dmitry.baryshkov@oss.qualcomm.com; h=from:subject:message-id; bh=3UfFt+IDDT9TeYfOXsppTGjO8YQkzT6Rn+lo0FBmcSI=; b=owEBbQGS/pANAwAKAYs8ij4CKSjVAcsmYgBoCgStDcqJBq8vbp8YwpWIQn/upRJcHQa4jOCJk y2XkFzBQr6JATMEAAEKAB0WIQRMcISVXLJjVvC4lX+LPIo+Aiko1QUCaAoErQAKCRCLPIo+Aiko 1SwrB/4tXpFksZdFGA7SNvj0kCuzG4/QTdk3GzTgoycYuu6RLCU0J/t3O7bM1Y+Ejns8FofceUP cpZ7cKF5PNa6xUbEC+svjNilW7oHdS4hkei839qGE8L7NMQWCQ6+jxB1dF/jUN1OvSw5B5zl89D PXVjHsT/eKNVLTL0mGgmeQKsbzPlybN0LVnMxV+OG+E0RiV3MMykCvPZQkqHHhYGfEzhL0dLhzQ /i89TDSDJo0STuxdCEF+ltjaN+ykhKCTyhKNmsffAZ8bUmg0ZjtgpSzglX7fqYzDR+aolnp8/6T KLs6xD0xaixSEbiJQqmv/4HGPL5QTFG9FdOqaKbTo72c14l4 X-Developer-Key: i=dmitry.baryshkov@oss.qualcomm.com; a=openpgp; fpr=8F88381DD5C873E4AE487DA5199BF1243632046A X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUwNDI0MDA2MyBTYWx0ZWRfX9eoxNsUJPvu/ Y61eflSzQKhXEcOzd9TNcbpdww/VuaUDYXEoVkcHmWydgN7UvY02LAh7wMc62jvcQcgV7vfNRH9 TV1vp1uPdli1Qg9vlkKWOnw9b/zHoqau3T/hGLAB55NKiY6B6jtzV6UrxidHL0snkvegzYDmZ+I L4qktSyAoxpbagarmcmZY9iB7L63w2nt6Y6s04SHtmtlaGUOtSI5OWfHajc8u2g1vaW7qigtx+U 29WYf79lG4QVPVZTZwr3rW8UQnz5c3ulfeLVnirV3Mdf2K7NxMa79SWOE2Rvimg+XP4GIgz+qS9 sxiVx6gQUG4BJ/HjC8FLDqHFia46aMUu9tFN0OhxFNt0gEVZRJwuaVZjJ/3SVabOcH/U6jFgoGX 2Zsj8V0C86RFVAeZQrADVO9QWCR9rExDkUOriz6h1ggGt5m7xdrB5yFiHY9OhOmgjjZ4edlp X-Proofpoint-GUID: IMeWYtr844X1tQIlA-V-AWw0AxeJ8qNO X-Authority-Analysis: v=2.4 cv=B/S50PtM c=1 sm=1 tr=0 ts=680a04d2 cx=c_pps a=hnmNkyzTK/kJ09Xio7VxxA==:117 a=xqWC_Br6kY4A:10 a=IkcTkHD0fZMA:10 a=XR8D0OoHHMoA:10 a=KKAkSRfTAAAA:8 a=7QmdccvAk3pR4y1ATDMA:9 a=QEXdDO2ut3YA:10 a=PEH46H7Ffwr30OY-TuGO:22 a=cvBusfyB2V15izCimMoJ:22 X-Proofpoint-ORIG-GUID: IMeWYtr844X1tQIlA-V-AWw0AxeJ8qNO X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1099,Hydra:6.0.680,FMLib:17.12.80.40 definitions=2025-04-24_04,2025-04-22_01,2025-02-21_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 adultscore=0 mlxlogscore=999 lowpriorityscore=0 bulkscore=0 impostorscore=0 suspectscore=0 mlxscore=0 priorityscore=1501 phishscore=0 malwarescore=0 spamscore=0 clxscore=1015 classifier=spam authscore=0 authtc=n/a authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.19.0-2504070000 definitions=main-2504240063 From: Dmitry Baryshkov Continue migration to the MDSS-revision based checks and replace DPU_PINGPONG_DITHER feature bit with the core_major_ver >=3D 3 check. Signed-off-by: Dmitry Baryshkov --- drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_10_0_sm8650.h | 10 ---------- drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_3_0_msm8998.h | 6 ++---- drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_3_2_sdm660.h | 6 ++---- drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_3_3_sdm630.h | 3 +-- drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_4_0_sdm845.h | 6 ++---- drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_5_0_sm8150.h | 6 ------ drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_5_1_sc8180x.h | 6 ------ drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_5_2_sm7150.h | 4 ---- 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 | 6 ------ drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_6_2_sc7180.h | 2 -- 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 | 2 -- 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 | 6 ------ drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_7_2_sc7280.h | 4 ---- drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_8_0_sc8280xp.h | 6 ------ drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_8_1_sm8450.h | 8 -------- drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_8_4_sa8775p.h | 8 -------- drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_9_0_sm8550.h | 8 -------- drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_9_2_x1e80100.h | 8 -------- drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.c | 9 --------- drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.h | 2 -- drivers/gpu/drm/msm/disp/dpu1/dpu_hw_pingpong.c | 2 +- 26 files changed, 8 insertions(+), 118 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 70c519b923f57f2ccae094eedf03c4f313062de8..bc013fb6705d0e5b8e1f5304ebe= 9318227450cae 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 @@ -206,67 +206,57 @@ static const struct dpu_pingpong_cfg sm8650_pp[] =3D { { .name =3D "pingpong_0", .id =3D PINGPONG_0, .base =3D 0x69000, .len =3D 0, - .features =3D BIT(DPU_PINGPONG_DITHER), .sblk =3D &sc7280_pp_sblk, .merge_3d =3D MERGE_3D_0, .intr_done =3D DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 8), }, { .name =3D "pingpong_1", .id =3D PINGPONG_1, .base =3D 0x6a000, .len =3D 0, - .features =3D BIT(DPU_PINGPONG_DITHER), .sblk =3D &sc7280_pp_sblk, .merge_3d =3D MERGE_3D_0, .intr_done =3D DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 9), }, { .name =3D "pingpong_2", .id =3D PINGPONG_2, .base =3D 0x6b000, .len =3D 0, - .features =3D BIT(DPU_PINGPONG_DITHER), .sblk =3D &sc7280_pp_sblk, .merge_3d =3D MERGE_3D_1, .intr_done =3D DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 10), }, { .name =3D "pingpong_3", .id =3D PINGPONG_3, .base =3D 0x6c000, .len =3D 0, - .features =3D BIT(DPU_PINGPONG_DITHER), .sblk =3D &sc7280_pp_sblk, .merge_3d =3D MERGE_3D_1, .intr_done =3D DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 11), }, { .name =3D "pingpong_4", .id =3D PINGPONG_4, .base =3D 0x6d000, .len =3D 0, - .features =3D BIT(DPU_PINGPONG_DITHER), .sblk =3D &sc7280_pp_sblk, .merge_3d =3D MERGE_3D_2, .intr_done =3D DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR2, 30), }, { .name =3D "pingpong_5", .id =3D PINGPONG_5, .base =3D 0x6e000, .len =3D 0, - .features =3D BIT(DPU_PINGPONG_DITHER), .sblk =3D &sc7280_pp_sblk, .merge_3d =3D MERGE_3D_2, .intr_done =3D DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR2, 31), }, { .name =3D "pingpong_cwb_0", .id =3D PINGPONG_CWB_0, .base =3D 0x66000, .len =3D 0, - .features =3D BIT(DPU_PINGPONG_DITHER), .sblk =3D &sc7280_pp_sblk, .merge_3d =3D MERGE_3D_3, }, { .name =3D "pingpong_cwb_1", .id =3D PINGPONG_CWB_1, .base =3D 0x66400, .len =3D 0, - .features =3D BIT(DPU_PINGPONG_DITHER), .sblk =3D &sc7280_pp_sblk, .merge_3d =3D MERGE_3D_3, }, { .name =3D "pingpong_cwb_2", .id =3D PINGPONG_CWB_2, .base =3D 0x7e000, .len =3D 0, - .features =3D BIT(DPU_PINGPONG_DITHER), .sblk =3D &sc7280_pp_sblk, .merge_3d =3D MERGE_3D_4, }, { .name =3D "pingpong_cwb_3", .id =3D PINGPONG_CWB_3, .base =3D 0x7e400, .len =3D 0, - .features =3D BIT(DPU_PINGPONG_DITHER), .sblk =3D &sc7280_pp_sblk, .merge_3d =3D MERGE_3D_4, }, diff --git a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_3_0_msm8998.h b/driv= ers/gpu/drm/msm/disp/dpu1/catalog/dpu_3_0_msm8998.h index 9dc84c8dfb64c5f6642fe47ff9aa9ab16922687f..b171e26165f11185645ac5e6d22= c499a949d8271 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,28 +170,26 @@ static const struct dpu_pingpong_cfg msm8998_pp[] =3D= { { .name =3D "pingpong_0", .id =3D PINGPONG_0, .base =3D 0x70000, .len =3D 0xd4, - .features =3D PINGPONG_SDM845_TE2_MASK, + .features =3D BIT(DPU_PINGPONG_TE2), .sblk =3D &sdm845_pp_sblk_te, .intr_done =3D DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 8), .intr_rdptr =3D DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 12), }, { .name =3D "pingpong_1", .id =3D PINGPONG_1, .base =3D 0x70800, .len =3D 0xd4, - .features =3D PINGPONG_SDM845_TE2_MASK, + .features =3D BIT(DPU_PINGPONG_TE2), .sblk =3D &sdm845_pp_sblk_te, .intr_done =3D DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 9), .intr_rdptr =3D DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 13), }, { .name =3D "pingpong_2", .id =3D PINGPONG_2, .base =3D 0x71000, .len =3D 0xd4, - .features =3D PINGPONG_SDM845_MASK, .sblk =3D &sdm845_pp_sblk, .intr_done =3D DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 10), .intr_rdptr =3D DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 14), }, { .name =3D "pingpong_3", .id =3D PINGPONG_3, .base =3D 0x71800, .len =3D 0xd4, - .features =3D PINGPONG_SDM845_MASK, .sblk =3D &sdm845_pp_sblk, .intr_done =3D DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 11), .intr_rdptr =3D DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 15), diff --git a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_3_2_sdm660.h b/drive= rs/gpu/drm/msm/disp/dpu1/catalog/dpu_3_2_sdm660.h index 5ec81e3eb6c0902113b4ef1bf850b946d0ce4b1b..6308dece88db70932d55d1e2d4e= 8af713996d9e0 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,28 +141,26 @@ static const struct dpu_pingpong_cfg sdm660_pp[] =3D { { .name =3D "pingpong_0", .id =3D PINGPONG_0, .base =3D 0x70000, .len =3D 0xd4, - .features =3D PINGPONG_SDM845_TE2_MASK, + .features =3D BIT(DPU_PINGPONG_TE2), .sblk =3D &sdm845_pp_sblk_te, .intr_done =3D DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 8), .intr_rdptr =3D DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 12), }, { .name =3D "pingpong_1", .id =3D PINGPONG_1, .base =3D 0x70800, .len =3D 0xd4, - .features =3D PINGPONG_SDM845_TE2_MASK, + .features =3D BIT(DPU_PINGPONG_TE2), .sblk =3D &sdm845_pp_sblk_te, .intr_done =3D DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 9), .intr_rdptr =3D DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 13), }, { .name =3D "pingpong_2", .id =3D PINGPONG_2, .base =3D 0x71000, .len =3D 0xd4, - .features =3D PINGPONG_SDM845_MASK, .sblk =3D &sdm845_pp_sblk, .intr_done =3D DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 10), .intr_rdptr =3D DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 14), }, { .name =3D "pingpong_3", .id =3D PINGPONG_3, .base =3D 0x71800, .len =3D 0xd4, - .features =3D PINGPONG_SDM845_MASK, .sblk =3D &sdm845_pp_sblk, .intr_done =3D DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 11), .intr_rdptr =3D DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 15), diff --git a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_3_3_sdm630.h b/drive= rs/gpu/drm/msm/disp/dpu1/catalog/dpu_3_3_sdm630.h index 2a80a881a233f48aa7f0b8a9345386eb85e3157d..25954ae17cec5b141637e7c2eba= 29a1bc826b1fe 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,13 @@ static const struct dpu_pingpong_cfg sdm630_pp[] =3D { { .name =3D "pingpong_0", .id =3D PINGPONG_0, .base =3D 0x70000, .len =3D 0xd4, - .features =3D PINGPONG_SDM845_TE2_MASK, + .features =3D BIT(DPU_PINGPONG_TE2), .sblk =3D &sdm845_pp_sblk_te, .intr_done =3D DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 8), .intr_rdptr =3D DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 12), }, { .name =3D "pingpong_2", .id =3D PINGPONG_2, .base =3D 0x71000, .len =3D 0xd4, - .features =3D PINGPONG_SDM845_MASK, .sblk =3D &sdm845_pp_sblk, .intr_done =3D DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 10), .intr_rdptr =3D DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 14), 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 968076c5f2211552bec1bd750409e4be57dddeff..283e709065be31131f6bc515802= 96e836b8487ae 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 @@ -190,28 +190,26 @@ static const struct dpu_pingpong_cfg sdm845_pp[] =3D { { .name =3D "pingpong_0", .id =3D PINGPONG_0, .base =3D 0x70000, .len =3D 0xd4, - .features =3D PINGPONG_SDM845_TE2_MASK, + .features =3D BIT(DPU_PINGPONG_TE2), .sblk =3D &sdm845_pp_sblk_te, .intr_done =3D DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 8), .intr_rdptr =3D DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 12), }, { .name =3D "pingpong_1", .id =3D PINGPONG_1, .base =3D 0x70800, .len =3D 0xd4, - .features =3D PINGPONG_SDM845_TE2_MASK, + .features =3D BIT(DPU_PINGPONG_TE2), .sblk =3D &sdm845_pp_sblk_te, .intr_done =3D DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 9), .intr_rdptr =3D DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 13), }, { .name =3D "pingpong_2", .id =3D PINGPONG_2, .base =3D 0x71000, .len =3D 0xd4, - .features =3D PINGPONG_SDM845_MASK, .sblk =3D &sdm845_pp_sblk, .intr_done =3D DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 10), .intr_rdptr =3D DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 14), }, { .name =3D "pingpong_3", .id =3D PINGPONG_3, .base =3D 0x71800, .len =3D 0xd4, - .features =3D PINGPONG_SDM845_MASK, .sblk =3D &sdm845_pp_sblk, .intr_done =3D DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 11), .intr_rdptr =3D DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 15), 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 6438a5a14e4b89462873b5c817713b4ff67d7ccc..c93213682a5781bbd8ad137152c= 9be8bb1e6efbe 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 @@ -210,42 +210,36 @@ static const struct dpu_pingpong_cfg sm8150_pp[] =3D { { .name =3D "pingpong_0", .id =3D PINGPONG_0, .base =3D 0x70000, .len =3D 0xd4, - .features =3D PINGPONG_SM8150_MASK, .sblk =3D &sdm845_pp_sblk, .merge_3d =3D MERGE_3D_0, .intr_done =3D DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 8), }, { .name =3D "pingpong_1", .id =3D PINGPONG_1, .base =3D 0x70800, .len =3D 0xd4, - .features =3D PINGPONG_SM8150_MASK, .sblk =3D &sdm845_pp_sblk, .merge_3d =3D MERGE_3D_0, .intr_done =3D DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 9), }, { .name =3D "pingpong_2", .id =3D PINGPONG_2, .base =3D 0x71000, .len =3D 0xd4, - .features =3D PINGPONG_SM8150_MASK, .sblk =3D &sdm845_pp_sblk, .merge_3d =3D MERGE_3D_1, .intr_done =3D DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 10), }, { .name =3D "pingpong_3", .id =3D PINGPONG_3, .base =3D 0x71800, .len =3D 0xd4, - .features =3D PINGPONG_SM8150_MASK, .sblk =3D &sdm845_pp_sblk, .merge_3d =3D MERGE_3D_1, .intr_done =3D DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 11), }, { .name =3D "pingpong_4", .id =3D PINGPONG_4, .base =3D 0x72000, .len =3D 0xd4, - .features =3D PINGPONG_SM8150_MASK, .sblk =3D &sdm845_pp_sblk, .merge_3d =3D MERGE_3D_2, .intr_done =3D DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR2, 30), }, { .name =3D "pingpong_5", .id =3D PINGPONG_5, .base =3D 0x72800, .len =3D 0xd4, - .features =3D PINGPONG_SM8150_MASK, .sblk =3D &sdm845_pp_sblk, .merge_3d =3D MERGE_3D_2, .intr_done =3D DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR2, 31), 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 d08799471b85a882ecb151cb9b5be2a098bfc003..5da17c288f66f4b7b5fef1550fc= c9793f524115e 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 @@ -209,42 +209,36 @@ static const struct dpu_pingpong_cfg sc8180x_pp[] =3D= { { .name =3D "pingpong_0", .id =3D PINGPONG_0, .base =3D 0x70000, .len =3D 0xd4, - .features =3D PINGPONG_SM8150_MASK, .sblk =3D &sdm845_pp_sblk, .merge_3d =3D MERGE_3D_0, .intr_done =3D DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 8), }, { .name =3D "pingpong_1", .id =3D PINGPONG_1, .base =3D 0x70800, .len =3D 0xd4, - .features =3D PINGPONG_SM8150_MASK, .sblk =3D &sdm845_pp_sblk, .merge_3d =3D MERGE_3D_0, .intr_done =3D DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 9), }, { .name =3D "pingpong_2", .id =3D PINGPONG_2, .base =3D 0x71000, .len =3D 0xd4, - .features =3D PINGPONG_SM8150_MASK, .sblk =3D &sdm845_pp_sblk, .merge_3d =3D MERGE_3D_1, .intr_done =3D DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 10), }, { .name =3D "pingpong_3", .id =3D PINGPONG_3, .base =3D 0x71800, .len =3D 0xd4, - .features =3D PINGPONG_SM8150_MASK, .sblk =3D &sdm845_pp_sblk, .merge_3d =3D MERGE_3D_1, .intr_done =3D DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 11), }, { .name =3D "pingpong_4", .id =3D PINGPONG_4, .base =3D 0x72000, .len =3D 0xd4, - .features =3D PINGPONG_SM8150_MASK, .sblk =3D &sdm845_pp_sblk, .merge_3d =3D MERGE_3D_2, .intr_done =3D DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR2, 30), }, { .name =3D "pingpong_5", .id =3D PINGPONG_5, .base =3D 0x72800, .len =3D 0xd4, - .features =3D PINGPONG_SM8150_MASK, .sblk =3D &sdm845_pp_sblk, .merge_3d =3D MERGE_3D_2, .intr_done =3D DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR2, 31), 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 acaa0b85ed1edd970dd17ae4d8d06a3dee6e8083..e388900623f0de4a1af10d22a6b= 9bdf4842e1f40 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 @@ -158,28 +158,24 @@ static const struct dpu_pingpong_cfg sm7150_pp[] =3D { { .name =3D "pingpong_0", .id =3D PINGPONG_0, .base =3D 0x70000, .len =3D 0xd4, - .features =3D PINGPONG_SM8150_MASK, .sblk =3D &sdm845_pp_sblk, .merge_3d =3D MERGE_3D_0, .intr_done =3D DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 8), }, { .name =3D "pingpong_1", .id =3D PINGPONG_1, .base =3D 0x70800, .len =3D 0xd4, - .features =3D PINGPONG_SM8150_MASK, .sblk =3D &sdm845_pp_sblk, .merge_3d =3D MERGE_3D_0, .intr_done =3D DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 9), }, { .name =3D "pingpong_2", .id =3D PINGPONG_2, .base =3D 0x71000, .len =3D 0xd4, - .features =3D PINGPONG_SM8150_MASK, .sblk =3D &sdm845_pp_sblk, .merge_3d =3D MERGE_3D_1, .intr_done =3D DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 10), }, { .name =3D "pingpong_3", .id =3D PINGPONG_3, .base =3D 0x71800, .len =3D 0xd4, - .features =3D PINGPONG_SM8150_MASK, .sblk =3D &sdm845_pp_sblk, .merge_3d =3D MERGE_3D_1, .intr_done =3D DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 11), 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 a99c99ca37703cc3a7d4403d3f026f234b693319..e2306d314ef8f8b59078a8ca8c5= 29f2e56385c98 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 @@ -138,19 +138,16 @@ static const struct dpu_pingpong_cfg sm6150_pp[] =3D { { .name =3D "pingpong_0", .id =3D PINGPONG_0, .base =3D 0x70000, .len =3D 0xd4, - .features =3D PINGPONG_SM8150_MASK, .sblk =3D &sdm845_pp_sblk, .intr_done =3D DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 8), }, { .name =3D "pingpong_1", .id =3D PINGPONG_1, .base =3D 0x70800, .len =3D 0xd4, - .features =3D PINGPONG_SM8150_MASK, .sblk =3D &sdm845_pp_sblk, .intr_done =3D DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 9), }, { .name =3D "pingpong_2", .id =3D PINGPONG_2, .base =3D 0x71000, .len =3D 0xd4, - .features =3D PINGPONG_SM8150_MASK, .sblk =3D &sdm845_pp_sblk, .intr_done =3D DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 10), }, 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 0dce5292fdfe7988504d51d701d3908adf9b596a..c75d0d42b6d856f98580068a5ac= 7f82f90380ac9 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 @@ -119,14 +119,12 @@ static const struct dpu_pingpong_cfg sm6125_pp[] =3D { { .name =3D "pingpong_0", .id =3D PINGPONG_0, .base =3D 0x70000, .len =3D 0xd4, - .features =3D PINGPONG_SM8150_MASK, .merge_3d =3D 0, .sblk =3D &sdm845_pp_sblk, .intr_done =3D DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 8), }, { .name =3D "pingpong_1", .id =3D PINGPONG_1, .base =3D 0x70800, .len =3D 0xd4, - .features =3D PINGPONG_SM8150_MASK, .merge_3d =3D 0, .sblk =3D &sdm845_pp_sblk, .intr_done =3D DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 9), 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 6fce6d382c959b7ae47591f52dd06bcf241ff4e2..4da7445aa8019894b35b12ace18= c0bd6209b9148 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 @@ -208,42 +208,36 @@ static const struct dpu_pingpong_cfg sm8250_pp[] =3D { { .name =3D "pingpong_0", .id =3D PINGPONG_0, .base =3D 0x70000, .len =3D 0xd4, - .features =3D PINGPONG_SM8150_MASK, .sblk =3D &sdm845_pp_sblk, .merge_3d =3D MERGE_3D_0, .intr_done =3D DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 8), }, { .name =3D "pingpong_1", .id =3D PINGPONG_1, .base =3D 0x70800, .len =3D 0xd4, - .features =3D PINGPONG_SM8150_MASK, .sblk =3D &sdm845_pp_sblk, .merge_3d =3D MERGE_3D_0, .intr_done =3D DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 9), }, { .name =3D "pingpong_2", .id =3D PINGPONG_2, .base =3D 0x71000, .len =3D 0xd4, - .features =3D PINGPONG_SM8150_MASK, .sblk =3D &sdm845_pp_sblk, .merge_3d =3D MERGE_3D_1, .intr_done =3D DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 10), }, { .name =3D "pingpong_3", .id =3D PINGPONG_3, .base =3D 0x71800, .len =3D 0xd4, - .features =3D PINGPONG_SM8150_MASK, .sblk =3D &sdm845_pp_sblk, .merge_3d =3D MERGE_3D_1, .intr_done =3D DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 11), }, { .name =3D "pingpong_4", .id =3D PINGPONG_4, .base =3D 0x72000, .len =3D 0xd4, - .features =3D PINGPONG_SM8150_MASK, .sblk =3D &sdm845_pp_sblk, .merge_3d =3D MERGE_3D_2, .intr_done =3D DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR2, 30), }, { .name =3D "pingpong_5", .id =3D PINGPONG_5, .base =3D 0x72800, .len =3D 0xd4, - .features =3D PINGPONG_SM8150_MASK, .sblk =3D &sdm845_pp_sblk, .merge_3d =3D MERGE_3D_2, .intr_done =3D DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR2, 31), 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 52b674fed71e57f82b778c13f6712a52a2a425a7..77126039733bbb2941aa6698bb3= 53334efab3804 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 @@ -111,14 +111,12 @@ static const struct dpu_pingpong_cfg sc7180_pp[] =3D { { .name =3D "pingpong_0", .id =3D PINGPONG_0, .base =3D 0x70000, .len =3D 0xd4, - .features =3D PINGPONG_SM8150_MASK, .sblk =3D &sdm845_pp_sblk, .merge_3d =3D 0, .intr_done =3D DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 8), }, { .name =3D "pingpong_1", .id =3D PINGPONG_1, .base =3D 0x70800, .len =3D 0xd4, - .features =3D PINGPONG_SM8150_MASK, .sblk =3D &sdm845_pp_sblk, .merge_3d =3D 0, .intr_done =3D DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 9), 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 0178ce52e84f355919241435f58c390234c16162..842505ab5c4a6555e0a32238040= 65e68a5a4e680 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 @@ -76,7 +76,6 @@ static const struct dpu_pingpong_cfg sm6115_pp[] =3D { { .name =3D "pingpong_0", .id =3D PINGPONG_0, .base =3D 0x70000, .len =3D 0xd4, - .features =3D PINGPONG_SM8150_MASK, .sblk =3D &sdm845_pp_sblk, .merge_3d =3D 0, .intr_done =3D DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 8), 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 89db83a73bbeb15b99ac4324b7685baf0d724039..6563296190bb27b6cab1b03921a= f6cff34037cd2 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 @@ -119,14 +119,12 @@ static struct dpu_pingpong_cfg sm6350_pp[] =3D { { .name =3D "pingpong_0", .id =3D PINGPONG_0, .base =3D 0x70000, .len =3D 0xd4, - .features =3D PINGPONG_SM8150_MASK, .sblk =3D &sdm845_pp_sblk, .merge_3d =3D 0, .intr_done =3D DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 8), }, { .name =3D "pingpong_1", .id =3D PINGPONG_1, .base =3D 0x70800, .len =3D 0xd4, - .features =3D PINGPONG_SM8150_MASK, .sblk =3D &sdm845_pp_sblk, .merge_3d =3D 0, .intr_done =3D DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 9), 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 0b1740de2bff94f1818ab41c6bc713f16796c4a4..7087c3c2e728c51f070b67ab0f8= 039f74eb7da6c 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 @@ -76,7 +76,6 @@ static const struct dpu_pingpong_cfg qcm2290_pp[] =3D { { .name =3D "pingpong_0", .id =3D PINGPONG_0, .base =3D 0x70000, .len =3D 0xd4, - .features =3D PINGPONG_SM8150_MASK, .sblk =3D &sdm845_pp_sblk, .merge_3d =3D 0, .intr_done =3D DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 8), 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 19800f207bff3077c7ac57ad736eea533674ae20..a2fdbe39e4415c1da1da0517db2= 284f368bfa07b 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 @@ -78,7 +78,6 @@ static const struct dpu_pingpong_cfg sm6375_pp[] =3D { { .name =3D "pingpong_0", .id =3D PINGPONG_0, .base =3D 0x70000, .len =3D 0xd4, - .features =3D PINGPONG_SM8150_MASK, .sblk =3D &sdm845_pp_sblk, .merge_3d =3D 0, .intr_done =3D DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 8), 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 94a9f33f008a13db09764882cb042f71337b89d5..62de32268ee5528ff0fb16a3ff7= c2baa5ea42466 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 @@ -208,42 +208,36 @@ static const struct dpu_pingpong_cfg sm8350_pp[] =3D { { .name =3D "pingpong_0", .id =3D PINGPONG_0, .base =3D 0x69000, .len =3D 0, - .features =3D BIT(DPU_PINGPONG_DITHER), .sblk =3D &sc7280_pp_sblk, .merge_3d =3D MERGE_3D_0, .intr_done =3D DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 8), }, { .name =3D "pingpong_1", .id =3D PINGPONG_1, .base =3D 0x6a000, .len =3D 0, - .features =3D BIT(DPU_PINGPONG_DITHER), .sblk =3D &sc7280_pp_sblk, .merge_3d =3D MERGE_3D_0, .intr_done =3D DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 9), }, { .name =3D "pingpong_2", .id =3D PINGPONG_2, .base =3D 0x6b000, .len =3D 0, - .features =3D BIT(DPU_PINGPONG_DITHER), .sblk =3D &sc7280_pp_sblk, .merge_3d =3D MERGE_3D_1, .intr_done =3D DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 10), }, { .name =3D "pingpong_3", .id =3D PINGPONG_3, .base =3D 0x6c000, .len =3D 0, - .features =3D BIT(DPU_PINGPONG_DITHER), .sblk =3D &sc7280_pp_sblk, .merge_3d =3D MERGE_3D_1, .intr_done =3D DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 11), }, { .name =3D "pingpong_4", .id =3D PINGPONG_4, .base =3D 0x6d000, .len =3D 0, - .features =3D BIT(DPU_PINGPONG_DITHER), .sblk =3D &sc7280_pp_sblk, .merge_3d =3D MERGE_3D_2, .intr_done =3D DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR2, 30), }, { .name =3D "pingpong_5", .id =3D PINGPONG_5, .base =3D 0x6e000, .len =3D 0, - .features =3D BIT(DPU_PINGPONG_DITHER), .sblk =3D &sc7280_pp_sblk, .merge_3d =3D MERGE_3D_2, .intr_done =3D DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR2, 31), 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 d1dd895acbf666ceab39f9c38ae11bda100b5953..202de6f9b0c65c6f2caa9e9d523= 2f5b92d8bdf01 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 @@ -121,28 +121,24 @@ static const struct dpu_pingpong_cfg sc7280_pp[] =3D { { .name =3D "pingpong_0", .id =3D PINGPONG_0, .base =3D 0x69000, .len =3D 0, - .features =3D BIT(DPU_PINGPONG_DITHER), .sblk =3D &sc7280_pp_sblk, .merge_3d =3D 0, .intr_done =3D DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 8), }, { .name =3D "pingpong_1", .id =3D PINGPONG_1, .base =3D 0x6a000, .len =3D 0, - .features =3D BIT(DPU_PINGPONG_DITHER), .sblk =3D &sc7280_pp_sblk, .merge_3d =3D 0, .intr_done =3D DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 9), }, { .name =3D "pingpong_2", .id =3D PINGPONG_2, .base =3D 0x6b000, .len =3D 0, - .features =3D BIT(DPU_PINGPONG_DITHER), .sblk =3D &sc7280_pp_sblk, .merge_3d =3D 0, .intr_done =3D DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 10), }, { .name =3D "pingpong_3", .id =3D PINGPONG_3, .base =3D 0x6c000, .len =3D 0, - .features =3D BIT(DPU_PINGPONG_DITHER), .sblk =3D &sc7280_pp_sblk, .merge_3d =3D 0, .intr_done =3D DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 11), 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 5b765620d6eff14327f8eff811ee3b7b8fd404a5..e16fa6d8a431f55643c9ed9c8b3= 845a790a7e268 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 @@ -208,42 +208,36 @@ static const struct dpu_pingpong_cfg sc8280xp_pp[] = =3D { { .name =3D "pingpong_0", .id =3D PINGPONG_0, .base =3D 0x69000, .len =3D 0, - .features =3D BIT(DPU_PINGPONG_DITHER), .sblk =3D &sc7280_pp_sblk, .merge_3d =3D MERGE_3D_0, .intr_done =3D DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 8), }, { .name =3D "pingpong_1", .id =3D PINGPONG_1, .base =3D 0x6a000, .len =3D 0, - .features =3D BIT(DPU_PINGPONG_DITHER), .sblk =3D &sc7280_pp_sblk, .merge_3d =3D MERGE_3D_0, .intr_done =3D DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 9), }, { .name =3D "pingpong_2", .id =3D PINGPONG_2, .base =3D 0x6b000, .len =3D 0, - .features =3D BIT(DPU_PINGPONG_DITHER), .sblk =3D &sc7280_pp_sblk, .merge_3d =3D MERGE_3D_1, .intr_done =3D DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 10), }, { .name =3D "pingpong_3", .id =3D PINGPONG_3, .base =3D 0x6c000, .len =3D 0, - .features =3D BIT(DPU_PINGPONG_DITHER), .sblk =3D &sc7280_pp_sblk, .merge_3d =3D MERGE_3D_1, .intr_done =3D DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 11), }, { .name =3D "pingpong_4", .id =3D PINGPONG_4, .base =3D 0x6d000, .len =3D 0, - .features =3D BIT(DPU_PINGPONG_DITHER), .sblk =3D &sc7280_pp_sblk, .merge_3d =3D MERGE_3D_2, .intr_done =3D DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR2, 30), }, { .name =3D "pingpong_5", .id =3D PINGPONG_5, .base =3D 0x6e000, .len =3D 0, - .features =3D BIT(DPU_PINGPONG_DITHER), .sblk =3D &sc7280_pp_sblk, .merge_3d =3D MERGE_3D_2, .intr_done =3D DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR2, 31), 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 770c2236afebe8b6bb38f2eab4d201fbf4256342..3059b9f88567c6f667ac456fa49= de73f3f212ad5 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 @@ -209,55 +209,47 @@ static const struct dpu_pingpong_cfg sm8450_pp[] =3D { { .name =3D "pingpong_0", .id =3D PINGPONG_0, .base =3D 0x69000, .len =3D 0, - .features =3D BIT(DPU_PINGPONG_DITHER), .sblk =3D &sc7280_pp_sblk, .merge_3d =3D MERGE_3D_0, .intr_done =3D DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 8), }, { .name =3D "pingpong_1", .id =3D PINGPONG_1, .base =3D 0x6a000, .len =3D 0, - .features =3D BIT(DPU_PINGPONG_DITHER), .sblk =3D &sc7280_pp_sblk, .merge_3d =3D MERGE_3D_0, .intr_done =3D DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 9), }, { .name =3D "pingpong_2", .id =3D PINGPONG_2, .base =3D 0x6b000, .len =3D 0, - .features =3D BIT(DPU_PINGPONG_DITHER), .sblk =3D &sc7280_pp_sblk, .merge_3d =3D MERGE_3D_1, .intr_done =3D DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 10), }, { .name =3D "pingpong_3", .id =3D PINGPONG_3, .base =3D 0x6c000, .len =3D 0, - .features =3D BIT(DPU_PINGPONG_DITHER), .sblk =3D &sc7280_pp_sblk, .merge_3d =3D MERGE_3D_1, .intr_done =3D DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 11), }, { .name =3D "pingpong_4", .id =3D PINGPONG_4, .base =3D 0x6d000, .len =3D 0, - .features =3D BIT(DPU_PINGPONG_DITHER), .sblk =3D &sc7280_pp_sblk, .merge_3d =3D MERGE_3D_2, .intr_done =3D DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR2, 30), }, { .name =3D "pingpong_5", .id =3D PINGPONG_5, .base =3D 0x6e000, .len =3D 0, - .features =3D BIT(DPU_PINGPONG_DITHER), .sblk =3D &sc7280_pp_sblk, .merge_3d =3D MERGE_3D_2, .intr_done =3D DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR2, 31), }, { .name =3D "pingpong_cwb_0", .id =3D PINGPONG_CWB_0, .base =3D 0x65800, .len =3D 0, - .features =3D BIT(DPU_PINGPONG_DITHER), .sblk =3D &sc7280_pp_sblk, .merge_3d =3D MERGE_3D_3, }, { .name =3D "pingpong_cwb_1", .id =3D PINGPONG_CWB_1, .base =3D 0x65c00, .len =3D 0, - .features =3D BIT(DPU_PINGPONG_DITHER), .sblk =3D &sc7280_pp_sblk, .merge_3d =3D MERGE_3D_3, }, 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 6f376b716690a8e144d2ad9c424232c7a535c45e..786071b35b7b66e202899849b0e= 06762c8d1c57d 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 @@ -208,55 +208,47 @@ static const struct dpu_pingpong_cfg sa8775p_pp[] =3D= { { .name =3D "pingpong_0", .id =3D PINGPONG_0, .base =3D 0x69000, .len =3D 0, - .features =3D BIT(DPU_PINGPONG_DITHER), .sblk =3D &sc7280_pp_sblk, .merge_3d =3D MERGE_3D_0, .intr_done =3D DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 8), }, { .name =3D "pingpong_1", .id =3D PINGPONG_1, .base =3D 0x6a000, .len =3D 0, - .features =3D BIT(DPU_PINGPONG_DITHER), .sblk =3D &sc7280_pp_sblk, .merge_3d =3D MERGE_3D_0, .intr_done =3D DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 9), }, { .name =3D "pingpong_2", .id =3D PINGPONG_2, .base =3D 0x6b000, .len =3D 0, - .features =3D BIT(DPU_PINGPONG_DITHER), .sblk =3D &sc7280_pp_sblk, .merge_3d =3D MERGE_3D_1, .intr_done =3D DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 10), }, { .name =3D "pingpong_3", .id =3D PINGPONG_3, .base =3D 0x6c000, .len =3D 0, - .features =3D BIT(DPU_PINGPONG_DITHER), .sblk =3D &sc7280_pp_sblk, .merge_3d =3D MERGE_3D_1, .intr_done =3D DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 11), }, { .name =3D "pingpong_4", .id =3D PINGPONG_4, .base =3D 0x6d000, .len =3D 0, - .features =3D BIT(DPU_PINGPONG_DITHER), .sblk =3D &sc7280_pp_sblk, .merge_3d =3D MERGE_3D_2, .intr_done =3D DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR2, 30), }, { .name =3D "pingpong_5", .id =3D PINGPONG_5, .base =3D 0x6e000, .len =3D 0, - .features =3D BIT(DPU_PINGPONG_DITHER), .sblk =3D &sc7280_pp_sblk, .merge_3d =3D MERGE_3D_2, .intr_done =3D DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR2, 31), }, { .name =3D "pingpong_6", .id =3D PINGPONG_CWB_0, .base =3D 0x65800, .len =3D 0, - .features =3D BIT(DPU_PINGPONG_DITHER), .sblk =3D &sc7280_pp_sblk, .merge_3d =3D MERGE_3D_3, }, { .name =3D "pingpong_7", .id =3D PINGPONG_CWB_1, .base =3D 0x65c00, .len =3D 0, - .features =3D BIT(DPU_PINGPONG_DITHER), .sblk =3D &sc7280_pp_sblk, .merge_3d =3D MERGE_3D_3, }, 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 b03077865cd545219e814311bec4d8da4fd9974c..fb31699cf5bf11036315984ab95= 240a312703afc 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 @@ -205,55 +205,47 @@ static const struct dpu_pingpong_cfg sm8550_pp[] =3D { { .name =3D "pingpong_0", .id =3D PINGPONG_0, .base =3D 0x69000, .len =3D 0, - .features =3D BIT(DPU_PINGPONG_DITHER), .sblk =3D &sc7280_pp_sblk, .merge_3d =3D MERGE_3D_0, .intr_done =3D DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 8), }, { .name =3D "pingpong_1", .id =3D PINGPONG_1, .base =3D 0x6a000, .len =3D 0, - .features =3D BIT(DPU_PINGPONG_DITHER), .sblk =3D &sc7280_pp_sblk, .merge_3d =3D MERGE_3D_0, .intr_done =3D DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 9), }, { .name =3D "pingpong_2", .id =3D PINGPONG_2, .base =3D 0x6b000, .len =3D 0, - .features =3D BIT(DPU_PINGPONG_DITHER), .sblk =3D &sc7280_pp_sblk, .merge_3d =3D MERGE_3D_1, .intr_done =3D DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 10), }, { .name =3D "pingpong_3", .id =3D PINGPONG_3, .base =3D 0x6c000, .len =3D 0, - .features =3D BIT(DPU_PINGPONG_DITHER), .sblk =3D &sc7280_pp_sblk, .merge_3d =3D MERGE_3D_1, .intr_done =3D DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 11), }, { .name =3D "pingpong_4", .id =3D PINGPONG_4, .base =3D 0x6d000, .len =3D 0, - .features =3D BIT(DPU_PINGPONG_DITHER), .sblk =3D &sc7280_pp_sblk, .merge_3d =3D MERGE_3D_2, .intr_done =3D DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR2, 30), }, { .name =3D "pingpong_5", .id =3D PINGPONG_5, .base =3D 0x6e000, .len =3D 0, - .features =3D BIT(DPU_PINGPONG_DITHER), .sblk =3D &sc7280_pp_sblk, .merge_3d =3D MERGE_3D_2, .intr_done =3D DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR2, 31), }, { .name =3D "pingpong_cwb_0", .id =3D PINGPONG_CWB_0, .base =3D 0x66000, .len =3D 0, - .features =3D BIT(DPU_PINGPONG_DITHER), .sblk =3D &sc7280_pp_sblk, .merge_3d =3D MERGE_3D_3, }, { .name =3D "pingpong_cwb_1", .id =3D PINGPONG_CWB_1, .base =3D 0x66400, .len =3D 0, - .features =3D BIT(DPU_PINGPONG_DITHER), .sblk =3D &sc7280_pp_sblk, .merge_3d =3D MERGE_3D_3, }, 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 a587c6bba11c30d9090aa6c48d11c7b65819a58e..67fc0098836f72b6b67da68a6c4= 1c18f334afd94 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 @@ -205,55 +205,47 @@ static const struct dpu_pingpong_cfg x1e80100_pp[] = =3D { { .name =3D "pingpong_0", .id =3D PINGPONG_0, .base =3D 0x69000, .len =3D 0, - .features =3D BIT(DPU_PINGPONG_DITHER), .sblk =3D &sc7280_pp_sblk, .merge_3d =3D MERGE_3D_0, .intr_done =3D DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 8), }, { .name =3D "pingpong_1", .id =3D PINGPONG_1, .base =3D 0x6a000, .len =3D 0, - .features =3D BIT(DPU_PINGPONG_DITHER), .sblk =3D &sc7280_pp_sblk, .merge_3d =3D MERGE_3D_0, .intr_done =3D DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 9), }, { .name =3D "pingpong_2", .id =3D PINGPONG_2, .base =3D 0x6b000, .len =3D 0, - .features =3D BIT(DPU_PINGPONG_DITHER), .sblk =3D &sc7280_pp_sblk, .merge_3d =3D MERGE_3D_1, .intr_done =3D DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 10), }, { .name =3D "pingpong_3", .id =3D PINGPONG_3, .base =3D 0x6c000, .len =3D 0, - .features =3D BIT(DPU_PINGPONG_DITHER), .sblk =3D &sc7280_pp_sblk, .merge_3d =3D MERGE_3D_1, .intr_done =3D DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 11), }, { .name =3D "pingpong_4", .id =3D PINGPONG_4, .base =3D 0x6d000, .len =3D 0, - .features =3D BIT(DPU_PINGPONG_DITHER), .sblk =3D &sc7280_pp_sblk, .merge_3d =3D MERGE_3D_2, .intr_done =3D DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR2, 30), }, { .name =3D "pingpong_5", .id =3D PINGPONG_5, .base =3D 0x6e000, .len =3D 0, - .features =3D BIT(DPU_PINGPONG_DITHER), .sblk =3D &sc7280_pp_sblk, .merge_3d =3D MERGE_3D_2, .intr_done =3D DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR2, 31), }, { .name =3D "pingpong_cwb_0", .id =3D PINGPONG_CWB_0, .base =3D 0x66000, .len =3D 0, - .features =3D BIT(DPU_PINGPONG_DITHER), .sblk =3D &sc7280_pp_sblk, .merge_3d =3D MERGE_3D_3, }, { .name =3D "pingpong_cwb_1", .id =3D PINGPONG_CWB_1, .base =3D 0x66400, .len =3D 0, - .features =3D BIT(DPU_PINGPONG_DITHER), .sblk =3D &sc7280_pp_sblk, .merge_3d =3D MERGE_3D_3, }, 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 5dd486dd9bc77184d5e9cf5ca2922bb3d1671ea2..f205e2c967ddf5f437ac335585d= 43d75a0623e32 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.c +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.c @@ -95,15 +95,6 @@ #define MIXER_QCM2290_MASK \ (BIT(DPU_DIM_LAYER) | BIT(DPU_MIXER_COMBINED_ALPHA)) =20 -#define PINGPONG_SDM845_MASK \ - (BIT(DPU_PINGPONG_DITHER)) - -#define PINGPONG_SDM845_TE2_MASK \ - (PINGPONG_SDM845_MASK | BIT(DPU_PINGPONG_TE2)) - -#define PINGPONG_SM8150_MASK \ - (BIT(DPU_PINGPONG_DITHER)) - #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 3300897aebc9d6b38bcf4a0e0d51095bcbb6fa9d..530eb74b0548b0a257abc89c3e1= 2ab990addd550 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.h +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.h @@ -118,14 +118,12 @@ enum { * @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 * @DPU_PINGPONG_MAX */ enum { DPU_PINGPONG_TE2 =3D 0x1, DPU_PINGPONG_SPLIT, DPU_PINGPONG_SLAVE, - DPU_PINGPONG_DITHER, DPU_PINGPONG_MAX }; =20 diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_pingpong.c b/drivers/gpu/= drm/msm/disp/dpu1/dpu_hw_pingpong.c index 49e03ecee9e8b567a3f809b977deb83731006ac0..138071be56496da9fdcaff902f6= 8ebb09a212e2e 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_pingpong.c +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_pingpong.c @@ -325,7 +325,7 @@ struct dpu_hw_pingpong *dpu_hw_pingpong_init(struct drm= _device *dev, c->ops.disable_dsc =3D dpu_hw_pp_dsc_disable; } =20 - if (test_bit(DPU_PINGPONG_DITHER, &cfg->features)) + if (mdss_rev->core_major_ver >=3D 3) c->ops.setup_dither =3D dpu_hw_pp_setup_dither; =20 return c; --=20 2.39.5 From nobody Sun Feb 8 09:32:35 2026 Received: from mx0b-0031df01.pphosted.com (mx0b-0031df01.pphosted.com [205.220.180.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 24696230BFD for ; Thu, 24 Apr 2025 09:30:58 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=205.220.180.131 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745487061; cv=none; b=fDmDMJ7VJGDbkbHH11wy6wn7PoGUiZpEVoIj4pbEqNZZBUAcCmTaU++Vg6++nlGTzchFs6/gk/ifvv7g2r3Hf3btS3Zf3XozWaU29EP2W0oamQBT6A1Y+Xoo0Ohh+NcedBh4z4HNblq3supSAZfzewntyQFXYmFALnXpuma3YuI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745487061; c=relaxed/simple; bh=ae7CdbyFk93QlhPpKlxCGQ4xEXgjUDbq+zL9XeOfraE=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=qrNNWYEGpKwQUEmaE81e0Sz9KUUn9X9FXXLruNeYKqq6knEHFx15fuEAB7kXFN4stu4se39GQTm1fNDIm6KRyc5qJ4RMu+nj0pakcr7aSDDI+KQTbAcdGqYrtxEFMaVLW7QlWwx2k9fGSd7UEKpX1eqWL0dwirUyRLyb1HpsM+s= 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=k6r9JyJ0; arc=none smtp.client-ip=205.220.180.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="k6r9JyJ0" Received: from pps.filterd (m0279871.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 53O0GlJN019260 for ; Thu, 24 Apr 2025 09:30:57 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= RaiLXmSFyRRrX3ufrwuFBRGXKu/EKdvWcLLrhUCzJA8=; b=k6r9JyJ0vseAm7xo 5tPC+SKKZRqIrxgh06W7J/Xgr9rdG/0NaOEz5CcgxtyBh+8AsS3+2XsmAdIffJ5J 4IJOgMeA02pg4nJmB0bonSKQ+TOWkY/lemyBI+48ezW0YNYNU8yI2O8ZRyhkqX8K dOM8OHK4SqotiWdGnA9cjZweIq5jHh9//O/6n6UJKNkvLrIF63/vKQkcmFK5lRhG 9vrSj7oeFr+CZzYjMnPkyD9puOodY8QBqAUAku2mIlYYDoctPA+30hX+My7BZOBq Are+SuNcy+z4UncdABfxQzC4KKFpP8wQeE/s6b9NxfCGFA4wd6FEozu6UGtD0Anp TCzxIg== Received: from mail-qk1-f197.google.com (mail-qk1-f197.google.com [209.85.222.197]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 466jh14y4p-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Thu, 24 Apr 2025 09:30:57 +0000 (GMT) Received: by mail-qk1-f197.google.com with SMTP id af79cd13be357-7c9305d29abso142232685a.1 for ; Thu, 24 Apr 2025 02:30:57 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1745487057; x=1746091857; 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=RaiLXmSFyRRrX3ufrwuFBRGXKu/EKdvWcLLrhUCzJA8=; b=S2baY5keLRA70NSTQUSRl0zoEPDPMImcsb/OscAHcyW3HxS7CmdOCWTxqP541btTib bdpca1o72gLN9oKlz4EjdtbLvnMoXv1AzxTNgXuGWGPpy+CFRuDLr+HSgiIthvvSY5Ks HcwuzJTxiwketIbVgFZGPqPRGVBqFEncVAwMY24NZdHK5a91YlEHtKAznDrpGZ6qW+42 R4mKREDExdcUw2RAwxUF+IfdjAerSY1T87HwTXXmZ3XLfGD/KKx1SHDhdnEbsPoAHCTc n3Ccvp9UFjNPK0zxN/gTgmX4KjPxWThIfVdlVdj2NC6W/OmuLRQi+IP1jwFLM6pZv7cV Mbpg== X-Forwarded-Encrypted: i=1; AJvYcCWUkRwPRYCRgH0lZFBaC/cKvEe57Ca87NZgAar60gfSmzLtySL8ZdrjtFfgVx/JBt267oy10CEGZ+Cwrug=@vger.kernel.org X-Gm-Message-State: AOJu0YylnJcOw9iynaSOUAPMSZMuxNNNyiQ7BhVARRXfJIUdEIQftekm DV8+1eMVrVr9cqvrF2a7IpnzHfq+983LOLD0v6DNG57qY54PRwUuU/zLIgUGqgDjhZ8cFdgmoaY ubvlu+jliBsVaYB7TdC0L9vdTXOCfXHQL6DM8OYtG5ocxWgtaF20oPPtLpKwR+y4= X-Gm-Gg: ASbGncve083gXjaostmb9iHuyUX03SnSH3sIcKmp12vU9q0hGjR4sXEP5bM1w+aTu5q KdY9cxh0Qu9jaL0gU8/48NKSmO2wiQq2hG4Ush6tgZtYXH1hMPQiW+v1qaXWRvwpD/w2VwGPR6e Ma2Qeq1Xpo+NQGHxae10ckQW0U4msOqVXySZJZ7SRYuFHzxb5IAXVppTCK7QuM7TpnelHdImZen 392BDYTLoGv0y39QZMJGnJSlmsQjrPvhq3JDZRgSIUEBAJ09x91ML8DPQOaQrWQ/fTeW2mLTA0W ZaCmEH+91Vs8xVSbxAKBpqT+jyZgaS0bEOXpVK2P7GOe1dagiGNiJChjVuZBwAtcECbNbnCmSby 1T6CuumWh/eAB0kjgjZ5r4Q99 X-Received: by 2002:a05:620a:25d2:b0:7c5:4c6d:7f95 with SMTP id af79cd13be357-7c956f88647mr351773885a.48.1745487056712; Thu, 24 Apr 2025 02:30:56 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEhTIv72wVA/57mwaw1hcPs6/v32cw7AVJI/SfbbyrB4/tZ68WXBKkDxGD38ASVFqXkc8/EwQ== X-Received: by 2002:a05:620a:25d2:b0:7c5:4c6d:7f95 with SMTP id af79cd13be357-7c956f88647mr351770285a.48.1745487056368; Thu, 24 Apr 2025 02:30:56 -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 38308e7fff4ca-317d1b9a304sm1820461fa.99.2025.04.24.02.30.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 24 Apr 2025 02:30:55 -0700 (PDT) From: Dmitry Baryshkov Date: Thu, 24 Apr 2025 12:30:22 +0300 Subject: [PATCH v3 18/33] drm/msm/dpu: get rid of DPU_MDP_VSYNC_SEL 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: <20250424-dpu-drop-features-v3-18-cdaca81d356f@oss.qualcomm.com> References: <20250424-dpu-drop-features-v3-0-cdaca81d356f@oss.qualcomm.com> In-Reply-To: <20250424-dpu-drop-features-v3-0-cdaca81d356f@oss.qualcomm.com> To: Rob Clark , Abhinav Kumar , Sean Paul , Marijn Suijten , David Airlie , Simona Vetter , Vinod Koul , Konrad Dybcio Cc: 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=8032; i=dmitry.baryshkov@oss.qualcomm.com; h=from:subject:message-id; bh=aitBeEK1lAlbuZORfcr1XUSiZGXBb4ytUSBho231JhA=; b=owGbwMvMwMXYbdNlx6SpcZXxtFoSQwYXy7obB8ysJ/X9absq7FhXbM4sX7W4e7s203GW2ttdr KoT2dk6GY1ZGBi5GGTFFFl8ClqmxmxKDvuwY2o9zCBWJpApDFycAjARFU0OhgliV8UOnPr6WpPB YcvHe65s3txBHT6rO0N3ZAfYb3Q8mvogkG3pj40rxJY4971ikbxVu8k86I2oWn785K+7NwUdmNB zhnGKwFtzqYe3T/l6nuJwFm/3YXweYp8QL2d67LjjuuUfZuws/Vr59ODuA0ERc4tDwyp5r+8Ikz 3EGXB55f5HvbMtZv2plglm11fuT9P9EHSLrY1JdFeUpLBGQ3ffjLubShQeMX0JTC3uvThFQLrsy 0njl6K3Jy394nbsQtpFgfIcx9diTVXPVZ5b7vP+dfho1TmGn3JhvgUXfzCmZtqmFzhF+11p3LNV KsB+lSWT2SbpQ/sNeNvT3rJKPd/pztv3OPtVtqOE34NHAA== X-Developer-Key: i=dmitry.baryshkov@oss.qualcomm.com; a=openpgp; fpr=8F88381DD5C873E4AE487DA5199BF1243632046A X-Proofpoint-GUID: vGaxVbOWnEaDtCN_qHHbp1m5qVwEPMTS X-Authority-Analysis: v=2.4 cv=OY6YDgTY c=1 sm=1 tr=0 ts=680a04d1 cx=c_pps a=50t2pK5VMbmlHzFWWp8p/g==:117 a=xqWC_Br6kY4A:10 a=IkcTkHD0fZMA:10 a=XR8D0OoHHMoA:10 a=KKAkSRfTAAAA:8 a=ul0-cYutqJjMKJRySm4A:9 a=QEXdDO2ut3YA:10 a=IoWCM6iH3mJn3m4BftBB:22 a=cvBusfyB2V15izCimMoJ:22 X-Proofpoint-ORIG-GUID: vGaxVbOWnEaDtCN_qHHbp1m5qVwEPMTS X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUwNDI0MDA2MyBTYWx0ZWRfX0EcgXnSleBDN AUjesH4+cTQL972EbAfint6P0MqSUWOFPqS6wFAbfuEUxnhEWMKJK75Zsp1+C60+KHymSDFTOKk o/q5D5kf3VW+ZIYQ+878q7u6vpbnoBtpnuYbMQ+BfjinRFdkt7YTJs0+8v9/+kEyJjkuSY4Ky20 j+/72gXQzR5qTBKOlp6SfiYj6dxmwYLK/+mK1vZhJI7XGpvHItz8AuBgBd9URk3ZPRQvwnerjQ1 AP6CG/4kEdhgvOHJnDx8LHzGz/jtLtLDGmk50J0t3s6lDL7RkzpsalTvVRcWsLNCiTnlBx9Bk9+ Tvq4hUipqzOHHGZEHwHQa+SSubRka9VTSW1GSUb1YmVEnnkHCmeaUaDC9UpnYIsLVutPhEOvX/+ eX/xB2HonhdaMiI+yqwOcgSFXVw0nQb6gsbU0GZSXs+aDzT4c4aO96yGTFVcsbpmXF1Fp0nH X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1099,Hydra:6.0.680,FMLib:17.12.80.40 definitions=2025-04-24_04,2025-04-22_01,2025-02-21_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 impostorscore=0 lowpriorityscore=0 suspectscore=0 mlxscore=0 clxscore=1015 malwarescore=0 mlxlogscore=810 phishscore=0 priorityscore=1501 spamscore=0 adultscore=0 bulkscore=0 classifier=spam authscore=0 authtc=n/a authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.19.0-2504070000 definitions=main-2504240063 From: Dmitry Baryshkov Continue migration to the MDSS-revision based checks and replace DPU_MDP_VSYNC_SEL feature bit with the core_major_ver < 5 check. Signed-off-by: Dmitry Baryshkov --- drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_1_14_msm8937.h | 1 - drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_1_15_msm8917.h | 1 - drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_1_16_msm8953.h | 1 - drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_1_7_msm8996.h | 1 - drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_3_0_msm8998.h | 1 - drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_3_2_sdm660.h | 1 - drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_3_3_sdm630.h | 1 - drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_4_0_sdm845.h | 2 +- drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.h | 3 --- drivers/gpu/drm/msm/disp/dpu1/dpu_hw_top.c | 2 +- 10 files changed, 2 insertions(+), 12 deletions(-) diff --git a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_1_14_msm8937.h b/dri= vers/gpu/drm/msm/disp/dpu1/catalog/dpu_1_14_msm8937.h index c0b4db94777c42efd941fdd52993b854ab54c694..29e0eba91930f96fb94c97c33b4= 490771c3a7c17 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 @@ -19,7 +19,6 @@ static const struct dpu_mdp_cfg msm8937_mdp[] =3D { { .name =3D "top_0", .base =3D 0x0, .len =3D 0x454, - .features =3D BIT(DPU_MDP_VSYNC_SEL), .clk_ctrls =3D { [DPU_CLK_CTRL_VIG0] =3D { .reg_off =3D 0x2ac, .bit_off =3D 0 }, [DPU_CLK_CTRL_RGB0] =3D { .reg_off =3D 0x2ac, .bit_off =3D 4 }, diff --git a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_1_15_msm8917.h b/dri= vers/gpu/drm/msm/disp/dpu1/catalog/dpu_1_15_msm8917.h index d3e4c48be306a04b457cc002910eb018a3f13154..cb1ee4b63f9fe8f0b069ad4a75b= 121d40e988d2b 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 @@ -19,7 +19,6 @@ static const struct dpu_mdp_cfg msm8917_mdp[] =3D { { .name =3D "top_0", .base =3D 0x0, .len =3D 0x454, - .features =3D BIT(DPU_MDP_VSYNC_SEL), .clk_ctrls =3D { [DPU_CLK_CTRL_VIG0] =3D { .reg_off =3D 0x2ac, .bit_off =3D 0 }, [DPU_CLK_CTRL_RGB0] =3D { .reg_off =3D 0x2ac, .bit_off =3D 4 }, diff --git a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_1_16_msm8953.h b/dri= vers/gpu/drm/msm/disp/dpu1/catalog/dpu_1_16_msm8953.h index c488b88332d0e69cfb23bcf4e41a2e4f4be6844d..b44d02b48418f7bca50b0411954= 0122fb861b971 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 @@ -19,7 +19,6 @@ static const struct dpu_mdp_cfg msm8953_mdp[] =3D { { .name =3D "top_0", .base =3D 0x0, .len =3D 0x454, - .features =3D BIT(DPU_MDP_VSYNC_SEL), .clk_ctrls =3D { [DPU_CLK_CTRL_VIG0] =3D { .reg_off =3D 0x2ac, .bit_off =3D 0 }, [DPU_CLK_CTRL_RGB0] =3D { .reg_off =3D 0x2ac, .bit_off =3D 4 }, diff --git a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_1_7_msm8996.h b/driv= ers/gpu/drm/msm/disp/dpu1/catalog/dpu_1_7_msm8996.h index ac0d872ac06be7376b7b4111e1ac5f4057b5fb76..436fa56e2ba2d867b58b59ec6b0= 2d1d0f396c23b 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 @@ -22,7 +22,6 @@ static const struct dpu_mdp_cfg msm8996_mdp[] =3D { { .name =3D "top_0", .base =3D 0x0, .len =3D 0x454, - .features =3D BIT(DPU_MDP_VSYNC_SEL), .clk_ctrls =3D { [DPU_CLK_CTRL_VIG0] =3D { .reg_off =3D 0x2ac, .bit_off =3D 0 }, [DPU_CLK_CTRL_VIG1] =3D { .reg_off =3D 0x2b4, .bit_off =3D 0 }, diff --git a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_3_0_msm8998.h b/driv= ers/gpu/drm/msm/disp/dpu1/catalog/dpu_3_0_msm8998.h index b171e26165f11185645ac5e6d22c499a949d8271..38cdea019bf2b1391c242953e4c= 67d9dc4c2274c 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 @@ -23,7 +23,6 @@ static const struct dpu_caps msm8998_dpu_caps =3D { static const struct dpu_mdp_cfg msm8998_mdp =3D { .name =3D "top_0", .base =3D 0x0, .len =3D 0x458, - .features =3D BIT(DPU_MDP_VSYNC_SEL), .clk_ctrls =3D { [DPU_CLK_CTRL_VIG0] =3D { .reg_off =3D 0x2ac, .bit_off =3D 0 }, [DPU_CLK_CTRL_VIG1] =3D { .reg_off =3D 0x2b4, .bit_off =3D 0 }, diff --git a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_3_2_sdm660.h b/drive= rs/gpu/drm/msm/disp/dpu1/catalog/dpu_3_2_sdm660.h index 6308dece88db70932d55d1e2d4e8af713996d9e0..176640bff1214e89606286ce572= f74300f6f343f 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 @@ -22,7 +22,6 @@ static const struct dpu_caps sdm660_dpu_caps =3D { static const struct dpu_mdp_cfg sdm660_mdp =3D { .name =3D "top_0", .base =3D 0x0, .len =3D 0x458, - .features =3D BIT(DPU_MDP_VSYNC_SEL), .clk_ctrls =3D { [DPU_CLK_CTRL_VIG0] =3D { .reg_off =3D 0x2ac, .bit_off =3D 0 }, [DPU_CLK_CTRL_VIG1] =3D { .reg_off =3D 0x2b4, .bit_off =3D 0 }, diff --git a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_3_3_sdm630.h b/drive= rs/gpu/drm/msm/disp/dpu1/catalog/dpu_3_3_sdm630.h index 25954ae17cec5b141637e7c2eba29a1bc826b1fe..e6eb95173cfef2a52f5dc606ca4= 1a2f1f5650c2c 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 @@ -22,7 +22,6 @@ static const struct dpu_caps sdm630_dpu_caps =3D { static const struct dpu_mdp_cfg sdm630_mdp =3D { .name =3D "top_0", .base =3D 0x0, .len =3D 0x458, - .features =3D BIT(DPU_MDP_VSYNC_SEL), .clk_ctrls =3D { [DPU_CLK_CTRL_VIG0] =3D { .reg_off =3D 0x2ac, .bit_off =3D 0 }, [DPU_CLK_CTRL_DMA0] =3D { .reg_off =3D 0x2ac, .bit_off =3D 8 }, 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 283e709065be31131f6bc51580296e836b8487ae..9f04c7cd5539c012a9490556a57= 36d09aa0a10c1 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 @@ -23,7 +23,7 @@ static const struct dpu_caps sdm845_dpu_caps =3D { static const struct dpu_mdp_cfg sdm845_mdp =3D { .name =3D "top_0", .base =3D 0x0, .len =3D 0x45c, - .features =3D BIT(DPU_MDP_AUDIO_SELECT) | BIT(DPU_MDP_VSYNC_SEL), + .features =3D BIT(DPU_MDP_AUDIO_SELECT), .clk_ctrls =3D { [DPU_CLK_CTRL_VIG0] =3D { .reg_off =3D 0x2ac, .bit_off =3D 0 }, [DPU_CLK_CTRL_VIG1] =3D { .reg_off =3D 0x2b4, .bit_off =3D 0 }, 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 530eb74b0548b0a257abc89c3e12ab990addd550..3a0de200cc5c9751adebe681f80= 679e0d527ab1c 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.h +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.h @@ -34,8 +34,6 @@ * @DPU_MDP_10BIT_SUPPORT, Chipset supports 10 bit pixel formats * @DPU_MDP_PERIPH_0_REMOVED Indicates that access to periph top0 block re= sults * in a failure - * @DPU_MDP_VSYNC_SEL Enables vsync source selection via MDP_VSYNC_SE= L register - * (moved into INTF block since DPU 5.0.0) * @DPU_MDP_MAX Maximum value =20 */ @@ -44,7 +42,6 @@ enum { DPU_MDP_10BIT_SUPPORT, DPU_MDP_AUDIO_SELECT, DPU_MDP_PERIPH_0_REMOVED, - DPU_MDP_VSYNC_SEL, DPU_MDP_MAX }; =20 diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_top.c b/drivers/gpu/drm/m= sm/disp/dpu1/dpu_hw_top.c index 562a3f4c5238a3ad6c8c1fa4d285b9165ada3cfd..cebe7ce7b258fc178a687770906= f7c4c20aa0d4c 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_top.c +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_top.c @@ -270,7 +270,7 @@ static void _setup_mdp_ops(struct dpu_hw_mdp_ops *ops, ops->setup_clk_force_ctrl =3D dpu_hw_setup_clk_force_ctrl; ops->get_danger_status =3D dpu_hw_get_danger_status; =20 - if (cap & BIT(DPU_MDP_VSYNC_SEL)) + if (mdss_rev->core_major_ver < 5) ops->setup_vsync_source =3D dpu_hw_setup_vsync_sel; else if (!(cap & BIT(DPU_MDP_PERIPH_0_REMOVED))) ops->setup_vsync_source =3D dpu_hw_setup_wd_timer; --=20 2.39.5 From nobody Sun Feb 8 09:32:35 2026 Received: from mx0b-0031df01.pphosted.com (mx0b-0031df01.pphosted.com [205.220.180.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 947FA23372C for ; Thu, 24 Apr 2025 09:31:02 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=205.220.180.131 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745487065; cv=none; b=SebrYDsWeneekWzMDnglXdiUiXKotAU6VMqH2cQ52v7nx2iRvS/J2j7Gg4+S4/e4WTZ+Yt5gVGmqS5cV1lODlCfr47CM8jP88MvRDygcuOh2XwfUw6SekYVyY9KH4C60nRQJUxLkiLIbEvbvRZXcZCiL43n9VgNxM8JpEtHp2Jg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745487065; c=relaxed/simple; bh=1eXpnQfANX9Y99ZcxD7BNPiJ9pknxP7SyHraRqFo/Ag=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=TWJC6nwkt+BRiroR+wRTL71AU24cPJrfz1Kgiz/G9cxdIQ6MCkmFqbLee9vhromJH4X42cFQtA/arSxjS/uPZp0N+FekWJxR45TwtC51nT0+HpAWFlvdQO69RE/cNobOPIeaPdYKpkKkOoqaJ8jfZ1Vju3plTNo03a7KVWcB3rw= 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=jkP0XL78; arc=none smtp.client-ip=205.220.180.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="jkP0XL78" Received: from pps.filterd (m0279870.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 53O0F9Yg031004 for ; Thu, 24 Apr 2025 09:31:01 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= 4PZNJwwm0ndQw9RdwVRs0rxLCkA5yAG3VPXYAhSa1Zo=; b=jkP0XL78qW+T1P0m a1vbXlpYUptfsZ1gdNUlCcsujiA5n7RmBTVpgykKbHlPg/ir8jCN6FrkMrtLzqo4 zWRwLA0Bxv3ocvD0Q4IXHGzol3lAum1kOaudRnWlKYYspNCnKHwQ9yzydaQzuzln P0d/czLv341NSGflwHA1wqq0BtXO77QARWeeHABQZNjI3SxUWHXp0H9s2DSQ6Pqk 5N2Ybob6H2E17kieXq4Kxh6X1+chPQd0OofINd3iwerBvO1KQ0O3IwgE3zZWB4dL 19L76DReeMjNvpOpRQiWenLiyDW4fUUsLMLBkEq7wXw3B8ZbmaQRGEvRFOdP8ELI 7ZkNPQ== Received: from mail-qk1-f200.google.com (mail-qk1-f200.google.com [209.85.222.200]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 466jh5d018-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Thu, 24 Apr 2025 09:31:01 +0000 (GMT) Received: by mail-qk1-f200.google.com with SMTP id af79cd13be357-7c5f876bfe0so133911785a.3 for ; Thu, 24 Apr 2025 02:31:01 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1745487059; x=1746091859; 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=4PZNJwwm0ndQw9RdwVRs0rxLCkA5yAG3VPXYAhSa1Zo=; b=jgqSJ0einlW8YsKF/e8c2YXeBMtdKRKvq+hfNzqSkNO+IzlXZ2dW/WexazHk2sOp9W 3xA1kF0HBT5ucNNWfi5zRbncC+b/R/iiU+Qz9ohkAM8TgIMc883bLpM+JOPT3a4FD3ZU 6fAfCqsWTAHW3VFVyRgJoZEH3CYm3zyIbt+GTxtsDOxtFOK4vHzYdH68zWO5UukHiTrj /gcSBV2shNBgOe1sEz9ngxFcE+HUoBcGEtGH+cMY9T3YHYMdZeWXpqtlNMIq6E2IFyLX p8vdYaECDSsDpVqPDNMS6QhNcME8apuoRdX/iSq/0VEpB3fmvl99XgRtIMB22H3D56Ji qKag== X-Forwarded-Encrypted: i=1; AJvYcCXI2L+GkbN3rTmcPWFKFrqHa4DFaRUJo2CHwP1tWnYCzqnlSzwzQ14seMqe0OBsAPqmRBQfWyOgxVmRZVs=@vger.kernel.org X-Gm-Message-State: AOJu0Yw1hNo3YsfJ0RYXca0EoVU2YNygUycnldCwPjR85w+dpFbvDNYp mPcjmImtPM9lkf5KtjzedsqrhDUYgnxKtZ2aSQ5n+9eFU+mEeCyAFqKhoXqz5q+YqbFrk/w4AEs qUKoJKKoRwuabXitKO3rZ87raxdP7enNXKRzHAPhZtN0j5eVv4Bv2V3LmK01zqOg= X-Gm-Gg: ASbGncs0aQW2CCrUx1Az2H1KrNCE1wrXnRhM5MMJE1I0H75fqspaAp+Pc4YBZbbi8sP +suNg3xgzUwRcdTJIroLSVG2CyyVx+yKYasfQoCc0BEs5XxJSdN86LYf8rfVtfumj7uNDC58Z64 jlLIjVZZWXi68xMFa+7EL3ZrBM65G5FbSv87oVBsU0cRnA/3C1zwNv8+UrOLupRbLcTS8H7XZt5 0KRfcjgCvtJFsSON3RyeKmkHo8cav2ZTy+Y5uYCe58s+aLjct/1p4tRVX2KiZanii64T1xCGk7N fJA8irl00paHA7piRmugUolIktRspam3wiXQ2lX+mwl9Lpu08lkyqM9Uc9rOXIgsuBqCjGNeyHU gxmJxrxpzKvDKAEMo440GtBW/ X-Received: by 2002:a05:620a:394b:b0:7c7:97d7:f776 with SMTP id af79cd13be357-7c956eb34d3mr292968585a.10.1745487059307; Thu, 24 Apr 2025 02:30:59 -0700 (PDT) X-Google-Smtp-Source: AGHT+IE+7xCg6YWOVbhCABq5kWNTCYBPieR4pZj9CTpaeNDPUL89mNgzgdp5we/BXH/AqGFCeKr8xQ== X-Received: by 2002:a05:620a:394b:b0:7c7:97d7:f776 with SMTP id af79cd13be357-7c956eb34d3mr292964985a.10.1745487058877; Thu, 24 Apr 2025 02:30:58 -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 38308e7fff4ca-317d1b9a304sm1820461fa.99.2025.04.24.02.30.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 24 Apr 2025 02:30:56 -0700 (PDT) From: Dmitry Baryshkov Date: Thu, 24 Apr 2025 12:30:23 +0300 Subject: [PATCH v3 19/33] drm/msm/dpu: get rid of DPU_MDP_PERIPH_0_REMOVED 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: <20250424-dpu-drop-features-v3-19-cdaca81d356f@oss.qualcomm.com> References: <20250424-dpu-drop-features-v3-0-cdaca81d356f@oss.qualcomm.com> In-Reply-To: <20250424-dpu-drop-features-v3-0-cdaca81d356f@oss.qualcomm.com> To: Rob Clark , Abhinav Kumar , Sean Paul , Marijn Suijten , David Airlie , Simona Vetter , Vinod Koul , Konrad Dybcio Cc: 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=7220; i=dmitry.baryshkov@oss.qualcomm.com; h=from:subject:message-id; bh=qbAqux1dNcQt1qGmHQYeMqCZv03w8t4uvcu6nMew/Ic=; b=owEBbQGS/pANAwAKAYs8ij4CKSjVAcsmYgBoCgSug5II481cqkzqQ4DQMbykLOwbg79W0SLrr 7qT4mEM4dSJATMEAAEKAB0WIQRMcISVXLJjVvC4lX+LPIo+Aiko1QUCaAoErgAKCRCLPIo+Aiko 1axBB/4vlGiIwN3dBGhCiyvB+cTj30dLH0V6OLHtwYrbt81n3whCujpz/fHygrzf7jIWyDMGQJB Sa4aJLc9JJgdRlYvPLcmNa7JRGH404MsWNfa0K4yNakLOaVcWCe2o+PYPxRxSu3MWwN+Ugiy5M8 McQU+Eljnq+Bi1X/+Pxu4pkEzanUixnR2w9d5WGf5QM3MAQimZtmOnv0Vc7Bj3imS//i4JBzgNY D/lqYU0TsXjRCm2EomDKdEtGBHHESE3kuiVOi+xtyBnvTcHAFvQENHEJpjxeUbN0ENBQI0oSex6 J1CvD1L/oEhTewz59QIAdELH5ZGnkmZTMMqYs7X5ItY1EJkY X-Developer-Key: i=dmitry.baryshkov@oss.qualcomm.com; a=openpgp; fpr=8F88381DD5C873E4AE487DA5199BF1243632046A X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUwNDI0MDA2MyBTYWx0ZWRfX/ZIwdPMhuGKe xBzbavB4CkF/xppK4xRzzNw+nffzEFcx6rtZtSMR2XAtaUO45pYacJqL9ohvY9kho8YQFC5RfMz IDWDR30UuaIdkGsc0ohcCol8kM3GsGUqGBdLdrCiDmIFM26GVwIWl6gQ5x8/PoQ5H5oblz0BJDH Qm2OKn/J6FO9mjAagpZcnm6LIsd+L5bH/T6spmRL+Ygq3B+kwThF+mOpQ2UJiCYl7BQU/+G7iTb Oh3zJ9CYbtj/3LbGqOtLwnjKDTUcYvJcRmwUUN0p122NDMf51iPuVy6DJtPjZ/eZGS6KMioY9fn bQ5VX7obPNq9wlhpjkfyncV/kbX5ymLcW4JI2siHi8Rr+KHV6htHtJc4wSKCcbMtjkjZIJ6bCEx OIzglOx5TZd//d8nm4OoFJ+k6P7pKizGnRrCZjORkAmqHC7HFG66fOSQ63s0AUmEP01w8eF6 X-Proofpoint-GUID: P0uq-ol9rfX9jWAoMofDsEvWVuYu5Tof X-Authority-Analysis: v=2.4 cv=B/S50PtM c=1 sm=1 tr=0 ts=680a04d5 cx=c_pps a=hnmNkyzTK/kJ09Xio7VxxA==:117 a=xqWC_Br6kY4A:10 a=IkcTkHD0fZMA:10 a=XR8D0OoHHMoA:10 a=KKAkSRfTAAAA:8 a=aymVMRhB4c0mkscYco0A:9 a=QEXdDO2ut3YA:10 a=PEH46H7Ffwr30OY-TuGO:22 a=cvBusfyB2V15izCimMoJ:22 X-Proofpoint-ORIG-GUID: P0uq-ol9rfX9jWAoMofDsEvWVuYu5Tof X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1099,Hydra:6.0.680,FMLib:17.12.80.40 definitions=2025-04-24_04,2025-04-22_01,2025-02-21_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 adultscore=0 mlxlogscore=998 lowpriorityscore=0 bulkscore=0 impostorscore=0 suspectscore=0 mlxscore=0 priorityscore=1501 phishscore=0 malwarescore=0 spamscore=0 clxscore=1015 classifier=spam authscore=0 authtc=n/a authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.19.0-2504070000 definitions=main-2504240063 From: Dmitry Baryshkov Continue migration to the MDSS-revision based checks and replace DPU_MDP_PERIPH_0_REMOVED feature bit with the core_major_ver >=3D 8 check. Signed-off-by: Dmitry Baryshkov --- drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_10_0_sm8650.h | 1 - drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_8_0_sc8280xp.h | 1 - drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_8_1_sm8450.h | 1 - drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_8_4_sa8775p.h | 1 - drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_9_0_sm8550.h | 1 - drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_9_2_x1e80100.h | 1 - drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.h | 3 --- drivers/gpu/drm/msm/disp/dpu1/dpu_hw_top.c | 2 +- drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c | 2 +- 9 files changed, 2 insertions(+), 11 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 bc013fb6705d0e5b8e1f5304ebe9318227450cae..d64366f608ea673422bbf4e5b6a= e7f4ad8570784 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 @@ -21,7 +21,6 @@ static const struct dpu_caps sm8650_dpu_caps =3D { static const struct dpu_mdp_cfg sm8650_mdp =3D { .name =3D "top_0", .base =3D 0, .len =3D 0x494, - .features =3D BIT(DPU_MDP_PERIPH_0_REMOVED), .clk_ctrls =3D { [DPU_CLK_CTRL_REG_DMA] =3D { .reg_off =3D 0x2bc, .bit_off =3D 20 }, }, 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 e16fa6d8a431f55643c9ed9c8b3845a790a7e268..43916752cfd5836718a3770df4c= 8767635f77ee9 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 @@ -21,7 +21,6 @@ static const struct dpu_caps sc8280xp_dpu_caps =3D { static const struct dpu_mdp_cfg sc8280xp_mdp =3D { .name =3D "top_0", .base =3D 0x0, .len =3D 0x494, - .features =3D BIT(DPU_MDP_PERIPH_0_REMOVED), .clk_ctrls =3D { [DPU_CLK_CTRL_VIG0] =3D { .reg_off =3D 0x2ac, .bit_off =3D 0 }, [DPU_CLK_CTRL_VIG1] =3D { .reg_off =3D 0x2b4, .bit_off =3D 0 }, 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 3059b9f88567c6f667ac456fa49de73f3f212ad5..d58d5b7ce79b8c069d111c3c2aa= 3e9cdb2c1a435 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 @@ -21,7 +21,6 @@ static const struct dpu_caps sm8450_dpu_caps =3D { static const struct dpu_mdp_cfg sm8450_mdp =3D { .name =3D "top_0", .base =3D 0x0, .len =3D 0x494, - .features =3D BIT(DPU_MDP_PERIPH_0_REMOVED), .clk_ctrls =3D { [DPU_CLK_CTRL_VIG0] =3D { .reg_off =3D 0x2ac, .bit_off =3D 0 }, [DPU_CLK_CTRL_VIG1] =3D { .reg_off =3D 0x2b4, .bit_off =3D 0 }, 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 786071b35b7b66e202899849b0e06762c8d1c57d..064546d4fd4538cd5a6b56fca3e= e12d482a7dbb6 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 @@ -20,7 +20,6 @@ static const struct dpu_caps sa8775p_dpu_caps =3D { static const struct dpu_mdp_cfg sa8775p_mdp =3D { .name =3D "top_0", .base =3D 0x0, .len =3D 0x494, - .features =3D BIT(DPU_MDP_PERIPH_0_REMOVED), .clk_ctrls =3D { [DPU_CLK_CTRL_VIG0] =3D { .reg_off =3D 0x2ac, .bit_off =3D 0 }, [DPU_CLK_CTRL_VIG1] =3D { .reg_off =3D 0x2b4, .bit_off =3D 0 }, 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 fb31699cf5bf11036315984ab95240a312703afc..959f3e9dbc5455fe53c1bb240b5= db57212f2d4eb 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 @@ -21,7 +21,6 @@ static const struct dpu_caps sm8550_dpu_caps =3D { static const struct dpu_mdp_cfg sm8550_mdp =3D { .name =3D "top_0", .base =3D 0, .len =3D 0x494, - .features =3D BIT(DPU_MDP_PERIPH_0_REMOVED), .clk_ctrls =3D { [DPU_CLK_CTRL_REG_DMA] =3D { .reg_off =3D 0x2bc, .bit_off =3D 20 }, }, 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 67fc0098836f72b6b67da68a6c41c18f334afd94..174cfdfcfdf9860ea86c983c6b6= 591ba98da5400 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 @@ -20,7 +20,6 @@ static const struct dpu_caps x1e80100_dpu_caps =3D { static const struct dpu_mdp_cfg x1e80100_mdp =3D { .name =3D "top_0", .base =3D 0, .len =3D 0x494, - .features =3D BIT(DPU_MDP_PERIPH_0_REMOVED), .clk_ctrls =3D { [DPU_CLK_CTRL_REG_DMA] =3D { .reg_off =3D 0x2bc, .bit_off =3D 20 }, }, 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 3a0de200cc5c9751adebe681f80679e0d527ab1c..0f8c24ad346568464206eaaeeb1= 99955788ed505 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.h +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.h @@ -32,8 +32,6 @@ * MDP TOP BLOCK features * @DPU_MDP_PANIC_PER_PIPE Panic configuration needs to be done per pipe * @DPU_MDP_10BIT_SUPPORT, Chipset supports 10 bit pixel formats - * @DPU_MDP_PERIPH_0_REMOVED Indicates that access to periph top0 block re= sults - * in a failure * @DPU_MDP_MAX Maximum value =20 */ @@ -41,7 +39,6 @@ enum { DPU_MDP_PANIC_PER_PIPE =3D 0x1, DPU_MDP_10BIT_SUPPORT, DPU_MDP_AUDIO_SELECT, - DPU_MDP_PERIPH_0_REMOVED, DPU_MDP_MAX }; =20 diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_top.c b/drivers/gpu/drm/m= sm/disp/dpu1/dpu_hw_top.c index cebe7ce7b258fc178a687770906f7c4c20aa0d4c..c49a67da86b0d46d12c32466981= be7f00519974c 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_top.c +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_top.c @@ -272,7 +272,7 @@ static void _setup_mdp_ops(struct dpu_hw_mdp_ops *ops, =20 if (mdss_rev->core_major_ver < 5) ops->setup_vsync_source =3D dpu_hw_setup_vsync_sel; - else if (!(cap & BIT(DPU_MDP_PERIPH_0_REMOVED))) + else if (mdss_rev->core_major_ver < 8) ops->setup_vsync_source =3D dpu_hw_setup_wd_timer; =20 ops->get_safe_status =3D dpu_hw_get_safe_status; diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c b/drivers/gpu/drm/msm/= disp/dpu1/dpu_kms.c index 3305ad0623ca41882db0172e65a9beb7ebe00b6c..f3f84c8c302fb1bfe6e6d70e411= 0d0b89259e55c 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c @@ -1022,7 +1022,7 @@ static void dpu_kms_mdp_snapshot(struct msm_disp_stat= e *disp_state, struct msm_k dpu_kms->mmio + cat->wb[i].base, "%s", cat->wb[i].name); =20 - if (cat->mdp[0].features & BIT(DPU_MDP_PERIPH_0_REMOVED)) { + if (dpu_kms->catalog->mdss_ver->core_major_ver >=3D 8) { msm_disp_snapshot_add_block(disp_state, MDP_PERIPH_TOP0, dpu_kms->mmio + cat->mdp[0].base, "top"); msm_disp_snapshot_add_block(disp_state, cat->mdp[0].len - MDP_PERIPH_TOP= 0_END, --=20 2.39.5 From nobody Sun Feb 8 09:32:35 2026 Received: from mx0b-0031df01.pphosted.com (mx0b-0031df01.pphosted.com [205.220.180.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 3E0A32356C7 for ; Thu, 24 Apr 2025 09:31:04 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=205.220.180.131 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745487066; cv=none; b=ntOeWZJlQF62X99lneQ2hgtARsh22ntATehjd0Tv/326BxrLZNUr3qXR0SzPuGz6+aZqqCwg8ksiRmAixwq2D8xPr5hstF0wLoQhCqn2fDhwL8LMZzGzkhjALxbweWbvI3qFWs4WErr1M3cL6myAsCQyaZ0YaCYwnC9W80ENuG4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745487066; c=relaxed/simple; bh=n5O4ww1n3+SMbT/TIK3jOGKdBMWSn6Zb2wDw1RidMsc=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=RBtYHri/h7DGk4zYQraONZm/vc0loSe9nIy2XhZplvzURlizbJI/j+7og+ZwoljWLVNZ41XPzhf90vgJR+Zt6063w2tEKOZKha8wnVujbQJawpc/646pnodqxX2jkB06nyS5wQA2WudNyMugpt9T2Y5TTTsD0WllC6vw3KYE2pk= 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=Mkwe1y5Z; arc=none smtp.client-ip=205.220.180.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="Mkwe1y5Z" Received: from pps.filterd (m0279873.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 53O0F7PC028374 for ; Thu, 24 Apr 2025 09:31:03 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= R2Plo6/QBFF1HAXNaurzwl09t9WnclC1kSkO0ycKczA=; b=Mkwe1y5ZnkG72rgn vZrFr5z2BbnLubYG2vjQEXph6IeivFM6tghKq+wMVNvpWWREHErpKQclfMjYSaQd XGwZUGN3ip0ji5h92n8JTxxDTGwMwC+jPsS39xkW3vS9NhXAZNGjESj+7e9WV3sG ENq8QxfWedg/V1MV9799z1M5cFh5JNZuWxPXuJs+HgnPKcjqusH+z942ZNlgFip6 vHtz+9614aD7cv79Lx3STWs47Q+5XBCGCiwMxI8jxFm0HoXmca3G2ECGeFFy7Crk Hxky5dnohQ8CCJBwWyyYmzloCcAeGHkEsr+m4VNDy3CWlZymfMy9MBvbRMFUj2On U+Hu3A== Received: from mail-qv1-f70.google.com (mail-qv1-f70.google.com [209.85.219.70]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 466jgy5015-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Thu, 24 Apr 2025 09:31:03 +0000 (GMT) Received: by mail-qv1-f70.google.com with SMTP id 6a1803df08f44-6eb2480028cso13598866d6.3 for ; Thu, 24 Apr 2025 02:31:03 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1745487062; x=1746091862; 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=R2Plo6/QBFF1HAXNaurzwl09t9WnclC1kSkO0ycKczA=; b=Ion95qI6mtEp1PMHPLtlsaoLxDgEISYh1kX6FVZ5G853a7pFeerDPme9zkr/DjXPrc yjit7/opn8nIhKB4tRPYlR9LAALZqJlKTq05vGW50/e8r9Q4bVz8MGGu9mvqa4CJRtph +zoZWJ8lQrnZl4WWbNNND+DjVB5t5omscKp5HVcUqop0PRIopvGWyiBU3hOZdoIjKABF N7tvk3pCsegNAD5G9eB1BHTjr3r4miYSorHV4JNinf11Tz368xczuvjk+lPWXSb1gO8d +JKEhDOORh8DyFd+ckc2ZTvUJviGSR11FHFww00tOi+04ZT0Bp+7QO2SmBCRDj9dkLWg Fcdg== X-Forwarded-Encrypted: i=1; AJvYcCVpEwEVnww3Fuwn7WFSFUC52CTKysRtE09IX+qCvXd9K/N319TI56NAIrjwSBBnOCIMGaDPDwJ+ne8SgW8=@vger.kernel.org X-Gm-Message-State: AOJu0YwTQz4z2Y5Lk8EYluT0Li17579Ug+yaYGgAd/ACxnPtDzb3Rqam YDVz5uK21v/54wXX6PzpiTnZTb8mvbjrMOpRaG5Y6FnBLptA6CCWvk8vjd5hBTsCQCtvpzogo0T ojGiE9i6SwzB1hucz9eSopRPgZHDDDz3nZ3mz1/0AxG68hXWtC4+iBeLcNp1gYks= X-Gm-Gg: ASbGnctjJ7vXoPzUbtPlB5Eer+qRQfxnRp1inbjhXe1Q9a3HxxI5DTh37OSfO1gdK1C TUCRyE/TK/Qdja8Sh+8M0/Cjpmsd6gvN75TIGfvqF9mjQ+nYYj9X6roKf82cEJKvx++Vwj6bwyy 9haHdQl/8vVsLz1Pf5fVKl9oVvhSh9qSA72BrgMJJHl/4FqBtqdMw7Zij5mHnD5IDIYUanVtdym Pwj8Pq82K5VTPq5zu0cj2QoFF+cyAl3EWrUrzCXphrDxWaf6XVnbQgi8s+LfSxlHsfaHkOPP4Lq 7f+8rmgbuBG5xbMsaCOxjDPi86Sh0QWPu35+/2wMWv52yieYZXuIlzaNkQ0/6ZuXfZ7TJSL6ND+ vxJRoVgghfmNeVUkzv8I4tQSr X-Received: by 2002:ad4:576d:0:b0:6e8:f4e2:26ef with SMTP id 6a1803df08f44-6f4bfc6d804mr33930536d6.31.1745487062451; Thu, 24 Apr 2025 02:31:02 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFt8rlPlDH/a8MvnQzJpkVdpgygatDbG6zTeLQgE1Sk5DPz/AogmqatCixLLoM+SsnZM5MFUQ== X-Received: by 2002:ad4:576d:0:b0:6e8:f4e2:26ef with SMTP id 6a1803df08f44-6f4bfc6d804mr33930256d6.31.1745487062122; Thu, 24 Apr 2025 02:31:02 -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 38308e7fff4ca-317d1b9a304sm1820461fa.99.2025.04.24.02.30.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 24 Apr 2025 02:30:59 -0700 (PDT) From: Dmitry Baryshkov Date: Thu, 24 Apr 2025 12:30:24 +0300 Subject: [PATCH v3 20/33] drm/msm/dpu: get rid of DPU_MDP_AUDIO_SELECT 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: <20250424-dpu-drop-features-v3-20-cdaca81d356f@oss.qualcomm.com> References: <20250424-dpu-drop-features-v3-0-cdaca81d356f@oss.qualcomm.com> In-Reply-To: <20250424-dpu-drop-features-v3-0-cdaca81d356f@oss.qualcomm.com> To: Rob Clark , Abhinav Kumar , Sean Paul , Marijn Suijten , David Airlie , Simona Vetter , Vinod Koul , Konrad Dybcio Cc: 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=5292; i=dmitry.baryshkov@oss.qualcomm.com; h=from:subject:message-id; bh=0gPy4u9+yg/VW6I+AUS7zPeR83r1ug1HSB+hIPYj1+Y=; b=owEBbQGS/pANAwAKAYs8ij4CKSjVAcsmYgBoCgSu5bNMbuDpHhEpy7HNgZaFCwQ5ZDMxP6sT7 JZrYDTsT3WJATMEAAEKAB0WIQRMcISVXLJjVvC4lX+LPIo+Aiko1QUCaAoErgAKCRCLPIo+Aiko 1UfIB/9WDqSHx1nPN5xr+kKBFRcZRtKeYEFF85X/Fdg3fWJhEJiTk3D/zEEyTn0Q8lq5bCIkIDw W0qWuOb+GsoG0sipVZnjLVKXZbrWvDxaMcaA5lJMc4tPpMdKr6LM6DmUdMytpU+mWNNo4wxvR1N bU9kQVPaOPZCmGPsrY+G5mTFwnRQ/spL1z6a5VsrX2L93MqsaITAXoajkktSeQJHe9/smXXsPm7 cSF3/SCpoHDHbcNIbXmIPqfTlf0wkULocARbfKGuyF2Vr2CIrPaBq25x/pfMcMuYs5UDhKtKs3n OXVX3b7vY+ndpGdQrYN1WeaMj1uh6Dvafk3wGu+3loRgN66n X-Developer-Key: i=dmitry.baryshkov@oss.qualcomm.com; a=openpgp; fpr=8F88381DD5C873E4AE487DA5199BF1243632046A X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUwNDI0MDA2MyBTYWx0ZWRfXwX6/gbtIUxA1 vscCXEt+quiG/WzekVcxItoTa6Kyc7hBTE2EKAN8uUBH+CsH2+1c8q43VlRXG/aKmY4iQlVSK2U n99ixlWcnYiPrW1lv3Z4g1LJfZKk7UsrZhQPK3C0RIbrWqLP0on6EA2sT915llru+xMerabq5Aa QhZPqVdxKyV+JvdY/z+sSAPdGUem6U3x03wzXkCMd85yl7Zr7tb9DqAjGHyQ09ajBiRB0nDaXp8 1p28CionY9ANF4IurL0V9lFJn1HfsDriZWKdVlTClEXl6whWuB4HeiVkNdfzQ0Iad/DcEk89ceJ meOvmlMfF4WBzlMZpnnhn/FeQ4Rf1eHMMV7Ko67NrlnPghzdYYPL0VwhK29JBF94KPCHzA0mUIY QyYJ6JcDaMPNu/1CY+zzIZ0QMjANT7Vc7rjagubhQOV43foDaeJTe/U6KKfJ6sfs+7p1/HAr X-Proofpoint-GUID: g3vZ--5yMmnbAQFGyb6HXOVZNfLGt9Q5 X-Proofpoint-ORIG-GUID: g3vZ--5yMmnbAQFGyb6HXOVZNfLGt9Q5 X-Authority-Analysis: v=2.4 cv=M5VNKzws c=1 sm=1 tr=0 ts=680a04d7 cx=c_pps a=oc9J++0uMp73DTRD5QyR2A==:117 a=xqWC_Br6kY4A:10 a=IkcTkHD0fZMA:10 a=XR8D0OoHHMoA:10 a=KKAkSRfTAAAA:8 a=H1s5W502GRu5WLOynKcA:9 a=QEXdDO2ut3YA:10 a=iYH6xdkBrDN1Jqds4HTS:22 a=cvBusfyB2V15izCimMoJ:22 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1099,Hydra:6.0.680,FMLib:17.12.80.40 definitions=2025-04-24_04,2025-04-22_01,2025-02-21_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 bulkscore=0 lowpriorityscore=0 adultscore=0 spamscore=0 priorityscore=1501 mlxscore=0 mlxlogscore=999 malwarescore=0 impostorscore=0 clxscore=1015 suspectscore=0 phishscore=0 classifier=spam authscore=0 authtc=n/a authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.19.0-2504070000 definitions=main-2504240063 From: Dmitry Baryshkov Continue migration to the MDSS-revision based checks and replace DPU_MDP_AUDIO_SELECT feature bit with the core_major_ver =3D=3D 8 || core_major_ver =3D=3D 5 check. Signed-off-by: Dmitry Baryshkov --- drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_4_0_sdm845.h | 1 - drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_4_1_sdm670.h | 1 - drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_5_0_sm8150.h | 1 - drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_5_1_sc8180x.h | 1 - drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_5_2_sm7150.h | 1 - drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.h | 1 - drivers/gpu/drm/msm/disp/dpu1/dpu_hw_top.c | 3 ++- 7 files changed, 2 insertions(+), 7 deletions(-) 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 9f04c7cd5539c012a9490556a5736d09aa0a10c1..21264184566493ab4e356a4e0c0= 32ee7780cabff 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 @@ -23,7 +23,6 @@ static const struct dpu_caps sdm845_dpu_caps =3D { static const struct dpu_mdp_cfg sdm845_mdp =3D { .name =3D "top_0", .base =3D 0x0, .len =3D 0x45c, - .features =3D BIT(DPU_MDP_AUDIO_SELECT), .clk_ctrls =3D { [DPU_CLK_CTRL_VIG0] =3D { .reg_off =3D 0x2ac, .bit_off =3D 0 }, [DPU_CLK_CTRL_VIG1] =3D { .reg_off =3D 0x2b4, .bit_off =3D 0 }, 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 3a60432a758a942eb1541f143018bd466b2bdf20..ce169a610e195cbb6f0fee1362b= caaf05df777cb 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 @@ -11,7 +11,6 @@ static const struct dpu_mdp_cfg sdm670_mdp =3D { .name =3D "top_0", .base =3D 0x0, .len =3D 0x45c, - .features =3D BIT(DPU_MDP_AUDIO_SELECT), .clk_ctrls =3D { [DPU_CLK_CTRL_VIG0] =3D { .reg_off =3D 0x2ac, .bit_off =3D 0 }, [DPU_CLK_CTRL_VIG1] =3D { .reg_off =3D 0x2b4, .bit_off =3D 0 }, 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 c93213682a5781bbd8ad137152c9be8bb1e6efbe..634b7dc452839f994c948601fe9= a09581cb42a42 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 @@ -23,7 +23,6 @@ static const struct dpu_caps sm8150_dpu_caps =3D { static const struct dpu_mdp_cfg sm8150_mdp =3D { .name =3D "top_0", .base =3D 0x0, .len =3D 0x45c, - .features =3D BIT(DPU_MDP_AUDIO_SELECT), .clk_ctrls =3D { [DPU_CLK_CTRL_VIG0] =3D { .reg_off =3D 0x2ac, .bit_off =3D 0 }, [DPU_CLK_CTRL_VIG1] =3D { .reg_off =3D 0x2b4, .bit_off =3D 0 }, 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 5da17c288f66f4b7b5fef1550fcc9793f524115e..59e280edcd508c14ee297857a19= e9974970566de 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 @@ -23,7 +23,6 @@ static const struct dpu_caps sc8180x_dpu_caps =3D { static const struct dpu_mdp_cfg sc8180x_mdp =3D { .name =3D "top_0", .base =3D 0x0, .len =3D 0x45c, - .features =3D BIT(DPU_MDP_AUDIO_SELECT), .clk_ctrls =3D { [DPU_CLK_CTRL_VIG0] =3D { .reg_off =3D 0x2ac, .bit_off =3D 0 }, [DPU_CLK_CTRL_VIG1] =3D { .reg_off =3D 0x2b4, .bit_off =3D 0 }, 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 e388900623f0de4a1af10d22a6b9bdf4842e1f40..af0d789c47917e9b712282a542c= 3d0886313c049 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 @@ -23,7 +23,6 @@ static const struct dpu_caps sm7150_dpu_caps =3D { static const struct dpu_mdp_cfg sm7150_mdp =3D { .name =3D "top_0", .base =3D 0x0, .len =3D 0x45c, - .features =3D BIT(DPU_MDP_AUDIO_SELECT), .clk_ctrls =3D { [DPU_CLK_CTRL_VIG0] =3D { .reg_off =3D 0x2ac, .bit_off =3D 0 }, [DPU_CLK_CTRL_VIG1] =3D { .reg_off =3D 0x2b4, .bit_off =3D 0 }, 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 0f8c24ad346568464206eaaeeb199955788ed505..a493dfffa9e4981f4c3f6e05dbb= f14e1416f07e5 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.h +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.h @@ -38,7 +38,6 @@ enum { DPU_MDP_PANIC_PER_PIPE =3D 0x1, DPU_MDP_10BIT_SUPPORT, - DPU_MDP_AUDIO_SELECT, DPU_MDP_MAX }; =20 diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_top.c b/drivers/gpu/drm/m= sm/disp/dpu1/dpu_hw_top.c index c49a67da86b0d46d12c32466981be7f00519974c..5c811f0142d5e2a012d7e9b3a91= 8818f22ec11cf 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_top.c +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_top.c @@ -280,7 +280,8 @@ static void _setup_mdp_ops(struct dpu_hw_mdp_ops *ops, if (mdss_rev->core_major_ver >=3D 5) ops->dp_phy_intf_sel =3D dpu_hw_dp_phy_intf_sel; =20 - if (cap & BIT(DPU_MDP_AUDIO_SELECT)) + if (mdss_rev->core_major_ver =3D=3D 4 || + mdss_rev->core_major_ver =3D=3D 5) ops->intf_audio_select =3D dpu_hw_intf_audio_select; } =20 --=20 2.39.5 From nobody Sun Feb 8 09:32:35 2026 Received: from mx0b-0031df01.pphosted.com (mx0b-0031df01.pphosted.com [205.220.180.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 E21EE236453 for ; Thu, 24 Apr 2025 09:31:05 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=205.220.180.131 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745487067; cv=none; b=tmY3nQmFET4wM2T0vg9//ZPHCuQ/Vsz7hDJx4YjMbpkgRPpnv8Eqkyj/bJs/+IUjrUsnpWu9c7FnFkZmJzwZCavhlbtlDCBPmSq7JTt9LPfb/Lybjh/Kb40jSYutE/3ljeE1ZfVxbCFexY5jRcM10fMqV+hj+tiU2W/AMS7wDv0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745487067; c=relaxed/simple; bh=FxB+CA1pAHMQ58/QY5AJKV5ZEY88tJNa8wr7RUKfjKY=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=UpjjGsPndA3befYZVY5WPgp3nNuucfnbOgcKOSyLcd8d/Ixn8BBmDzdzIi8NxL/xduu6CkMfCRsb9c1KvDFB9rWGXbDzN9lxJhPtII1oPSoWAtcPJJVp0wsPW9QZ8F3SknQ6H3BxDLusn4vb5LltGKLtrSbtkPL7pb9ILbl9UII= 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=SWVJygIc; arc=none smtp.client-ip=205.220.180.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="SWVJygIc" Received: from pps.filterd (m0279870.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 53O0F9Rl031013 for ; Thu, 24 Apr 2025 09:31:05 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= iTk0UnQH3xDorjJpebyNAcKqHxIR/o9PBKmisagINwA=; b=SWVJygIcknDY+HV/ t4z9kWI1uJ7ua2CM7r+tcMVjfch0V9FHbyivqZPzHk46IzV5VxDTB/9lwO06Pkhh aYoAPiHN1kv28Lno2wUg74P2xGLPJTWIoAX4O9DjGtkZBmyaokNMqC5OLzZqQIA4 nkwm/F3hzasW8CFdfIH8aTqUpINwnVJl8gTYqhkRoOdIcJ4fCmxtiTBaf9kI3LgD hwn03uP67umboBCeI/6p96zD0lKoJacZHx9WlE0LbqedB9tGnHDRUPVKMjwb37kR hkbvy4flYhE8PqzH/6rVyzE8sj9klaql/dnoFJd3hTQ1v4D8QUTU45c9T1J5n9L6 YyxqhA== Received: from mail-qk1-f199.google.com (mail-qk1-f199.google.com [209.85.222.199]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 466jh5d01t-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Thu, 24 Apr 2025 09:31:04 +0000 (GMT) Received: by mail-qk1-f199.google.com with SMTP id af79cd13be357-7c790dc38b4so151438485a.0 for ; Thu, 24 Apr 2025 02:31:04 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1745487064; x=1746091864; 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=iTk0UnQH3xDorjJpebyNAcKqHxIR/o9PBKmisagINwA=; b=VZP3g6wfWeQyn157P4iMGZvkoKYubEaCyfM+pBwiV1Yw5coxifFdHfPv2r9xf4W9vg I2KGsoSkdwdz5Ph+McznGCWW+JP9si5jVjg/3DmxIVlgAQMx4LypEGow0/A/1wb7fRSg 83Zefvjj+lNh8tPPEYIgdT76wjcQjB2vDhgs5sjx6JVyALDZjMVRfdCrP0O2kglwGUnF v3OXGamdDDyYpfazlEo9Q0Ux+hfaUmwVeemJMaX02zqzPUBv8H8EMPK2HLGSPHvm8qN6 xmCQfjTHw4Lgsf+kRaXMoXhIn3O4I2vpSQwZX1FfwI+akGYql/187jN/mZ8FdgmsDjmO Ov2w== X-Forwarded-Encrypted: i=1; AJvYcCXJVVyTnf+rfUHF9lkfIdtwMxepV+LRMxPmBbpoYSddfnV7WU2UvH2qTNnHzqcSOksGda0yl9Srbx1k2Vs=@vger.kernel.org X-Gm-Message-State: AOJu0Ywwtr9ztqlyqQHbxZpmYw8nyzDnyEodh2aNPbvrjy5B31L+VQp9 21K+1hhFMWzdiY87wIR/F+d+bGr9DKyuol3+xsulLvIVa0+95KE5hL2lx0dPADgX1QmPbvsHhb+ AtOXDxAcGmZjNejOS3EA9XAAge9FMBqkQDcxXpM8OaTk1l3urirKTQxEUHADjfk8= X-Gm-Gg: ASbGncuZn6zWC8PEgQlqjzm/7Lz+2ZC13pDpoC9Y6I6vuXonVjmVcHhI8nwkhRw4AsA 8oZGK6XE9mYsA7Ck5IQIgMn4BLu5W1srUpUU0RlcWYwoYuGTxpFOHjF/hyAp79kKzmtZsy/CtGd IdzKjoFIJ+RTDpWRWPZplyHhNg1TdayfpbP6xoy6Wogue4WanA94+jpT4YbJW+Bas0ratD1zmO+ nBWYGi4bV8j+rtSPp5Z72cRaL+Xtw3SRDewTbP1wYspJ5mXK3crySWENDj1RNHxdYwIKxpKkpxd jJxnWBlWe/I6cpzaK3gHYanxcPh1AZccH7UA0UkktOppnTCla5t+wTn0/IC6MlmuhUAIRskxTwV MiGM7MIqe4OCJThBNX0jtHCjp X-Received: by 2002:a05:620a:24c3:b0:7c3:ca29:c87e with SMTP id af79cd13be357-7c95863dedcmr204324885a.21.1745487064063; Thu, 24 Apr 2025 02:31:04 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGTPVFMhjZTjsvgv1tiFzDAqp2yVisyrGxoW2goZLlIgUKXnOxpnGEHjvPO8PzRIpVvho4Syw== X-Received: by 2002:a05:620a:24c3:b0:7c3:ca29:c87e with SMTP id af79cd13be357-7c95863dedcmr204322785a.21.1745487063708; Thu, 24 Apr 2025 02:31:03 -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 38308e7fff4ca-317d1b9a304sm1820461fa.99.2025.04.24.02.31.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 24 Apr 2025 02:31:02 -0700 (PDT) From: Dmitry Baryshkov Date: Thu, 24 Apr 2025 12:30:25 +0300 Subject: [PATCH v3 21/33] drm/msm/dpu: get rid of DPU_MIXER_COMBINED_ALPHA 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: <20250424-dpu-drop-features-v3-21-cdaca81d356f@oss.qualcomm.com> References: <20250424-dpu-drop-features-v3-0-cdaca81d356f@oss.qualcomm.com> In-Reply-To: <20250424-dpu-drop-features-v3-0-cdaca81d356f@oss.qualcomm.com> To: Rob Clark , Abhinav Kumar , Sean Paul , Marijn Suijten , David Airlie , Simona Vetter , Vinod Koul , Konrad Dybcio Cc: 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=4640; i=dmitry.baryshkov@oss.qualcomm.com; h=from:subject:message-id; bh=Qx+tWXrswqotBVXqga7C6jCwYmZehbjfGnHTcmUatQs=; b=owEBbQGS/pANAwAKAYs8ij4CKSjVAcsmYgBoCgSuvOjXOKZz85LXtpy3hCiTey8BYOEKUq36R 6U/lorabWuJATMEAAEKAB0WIQRMcISVXLJjVvC4lX+LPIo+Aiko1QUCaAoErgAKCRCLPIo+Aiko 1UraB/0XQswNUOxaIf5ad/EjxLk26DQuGjk1en0FBcVTNLd0eqa4sLwMWaXwcVSDzwpqoIHGUjP j7q4+Hk98WfhZC/bPMXYY6XHN2Yw7C2yaoH3a5yEcY0JL6545RwywTLmg7oMcwM8y0UcpbaDTEx tLWg6yAiTaxRbsZhNUUl2unGAV+h3BCUPjs/nMP6s+P2/VJ3N+Fr8i4EmRfAHsepTFg2IXFlET5 BxBQ/4UNol5O69p52pNV7dgzRHbm10fQ/2qFdZxv/MSrfKkYP3AcXAa5qhkED2Tz92qO8sqIc2k ME0RUyLZTiyl+veOPo22B402OfTrDQtPXxJO03WgA+8exlCC X-Developer-Key: i=dmitry.baryshkov@oss.qualcomm.com; a=openpgp; fpr=8F88381DD5C873E4AE487DA5199BF1243632046A X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUwNDI0MDA2MyBTYWx0ZWRfX8Yh8FK69v0zU dhKa9uNUuySh5A09Ly83zmxCSrHFo/OABFbI4ZtT05LCQMlnqVcpHOlrABURwuomfbiNkpF9PG1 dQlgHWf+fJ9i1j8A9Wz6sgm6dbJm77eJEMQKcJROfe1jqnD2qD7ha1X6QfQCksDwIv0KuNVOJH4 ERb84e8Fd+iR7z+chlwx3ywzDPaGuNd5MbLV8Rldbx0ZcsSFh6U1EZ4VYmTRBXdX2KwOFtQ1TMf i8gEfikKhwzy3ACYYOCCq1K3X46JegAeCmh/+CQVWZcpV+AsIpqaS8l3Pl6+DNFURFcEXEMLTKS 43Y0nvFWmKx659CYKEf/GSEYve0ITR3MD9QC6Jr+wvuUwCPe5VMV62dGJONeuM5Q8ts0kS2W2ui 27hw003WjbL3uNgjSjIlX0aHBPQ/21GdokCtSfiPYb7z6J15QrWuPn26HD1MbqQs6g51WFIV X-Proofpoint-GUID: btazcjcM0gdXApWNKhVBeWkEACrgKLN1 X-Authority-Analysis: v=2.4 cv=B/S50PtM c=1 sm=1 tr=0 ts=680a04d8 cx=c_pps a=HLyN3IcIa5EE8TELMZ618Q==:117 a=xqWC_Br6kY4A:10 a=IkcTkHD0fZMA:10 a=XR8D0OoHHMoA:10 a=KKAkSRfTAAAA:8 a=TQSGqBnpyQA7SagL8QUA:9 a=QEXdDO2ut3YA:10 a=bTQJ7kPSJx9SKPbeHEYW:22 a=cvBusfyB2V15izCimMoJ:22 X-Proofpoint-ORIG-GUID: btazcjcM0gdXApWNKhVBeWkEACrgKLN1 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1099,Hydra:6.0.680,FMLib:17.12.80.40 definitions=2025-04-24_04,2025-04-22_01,2025-02-21_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 adultscore=0 mlxlogscore=999 lowpriorityscore=0 bulkscore=0 impostorscore=0 suspectscore=0 mlxscore=0 priorityscore=1501 phishscore=0 malwarescore=0 spamscore=0 clxscore=1015 classifier=spam authscore=0 authtc=n/a authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.19.0-2504070000 definitions=main-2504240063 From: Dmitry Baryshkov Continue migration to the MDSS-revision based checks and replace DPU_MIXER_COMBINED_ALPHA feature bit with the core_major_ver >=3D 4 check. Signed-off-by: Dmitry Baryshkov --- drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.c | 4 ++-- drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.h | 2 -- drivers/gpu/drm/msm/disp/dpu1/dpu_hw_lm.c | 6 ++++-- drivers/gpu/drm/msm/disp/dpu1/dpu_hw_lm.h | 3 ++- drivers/gpu/drm/msm/disp/dpu1/dpu_rm.c | 2 +- 5 files changed, 9 insertions(+), 8 deletions(-) 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 f205e2c967ddf5f437ac335585d43d75a0623e32..e22ad69e451bb5ed38f056e95b0= 944fb5c21ec7b 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.c +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.c @@ -90,10 +90,10 @@ (BIT(DPU_MIXER_SOURCESPLIT)) =20 #define MIXER_SDM845_MASK \ - (BIT(DPU_MIXER_SOURCESPLIT) | BIT(DPU_DIM_LAYER) | BIT(DPU_MIXER_COMBINED= _ALPHA)) + (BIT(DPU_MIXER_SOURCESPLIT) | BIT(DPU_DIM_LAYER)) =20 #define MIXER_QCM2290_MASK \ - (BIT(DPU_DIM_LAYER) | BIT(DPU_MIXER_COMBINED_ALPHA)) + (BIT(DPU_DIM_LAYER)) =20 #define WB_SDM845_MASK (BIT(DPU_WB_LINE_MODE) | \ BIT(DPU_WB_UBWC) | \ 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 a493dfffa9e4981f4c3f6e05dbbf14e1416f07e5..e1fc6fdd8864b017bec35e448ef= 15420530e018b 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.h +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.h @@ -85,7 +85,6 @@ enum { * @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_COMBINED_ALPHA Layer mixer has combined alpha register * @DPU_MIXER_MAX maximum value */ enum { @@ -93,7 +92,6 @@ enum { DPU_MIXER_SOURCESPLIT, DPU_MIXER_GC, DPU_DIM_LAYER, - DPU_MIXER_COMBINED_ALPHA, DPU_MIXER_MAX }; =20 diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_lm.c b/drivers/gpu/drm/ms= m/disp/dpu1/dpu_hw_lm.c index 4f57cfca89bd3962e7e512952809db0300cb9baf..3bfb61cb83672dca4236bdbbbfb= 1e442223576d2 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_lm.c +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_lm.c @@ -150,10 +150,12 @@ static void dpu_hw_lm_setup_color3(struct dpu_hw_mixe= r *ctx, * @dev: Corresponding device for devres management * @cfg: mixer catalog entry for which driver object is required * @addr: mapped register io address of MDP + * @mdss_ver: DPU core's major and minor versions */ struct dpu_hw_mixer *dpu_hw_lm_init(struct drm_device *dev, const struct dpu_lm_cfg *cfg, - void __iomem *addr) + void __iomem *addr, + const struct dpu_mdss_version *mdss_ver) { struct dpu_hw_mixer *c; =20 @@ -173,7 +175,7 @@ struct dpu_hw_mixer *dpu_hw_lm_init(struct drm_device *= dev, c->idx =3D cfg->id; c->cap =3D cfg; c->ops.setup_mixer_out =3D dpu_hw_lm_setup_out; - if (test_bit(DPU_MIXER_COMBINED_ALPHA, &c->cap->features)) + if (mdss_ver->core_major_ver >=3D 4) c->ops.setup_blend_config =3D dpu_hw_lm_setup_blend_config_combined_alph= a; else c->ops.setup_blend_config =3D dpu_hw_lm_setup_blend_config; diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_lm.h b/drivers/gpu/drm/ms= m/disp/dpu1/dpu_hw_lm.h index 6f60fa9b3cd78160699a97dc7a86a5ec0b599281..fff1156add683fec8ce6785e7fe= 1d769d0de3fe0 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_lm.h +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_lm.h @@ -95,6 +95,7 @@ static inline struct dpu_hw_mixer *to_dpu_hw_mixer(struct= dpu_hw_blk *hw) =20 struct dpu_hw_mixer *dpu_hw_lm_init(struct drm_device *dev, const struct dpu_lm_cfg *cfg, - void __iomem *addr); + void __iomem *addr, + const struct dpu_mdss_version *mdss_ver); =20 #endif /*_DPU_HW_LM_H */ diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_rm.c b/drivers/gpu/drm/msm/d= isp/dpu1/dpu_rm.c index 1ed458aed2bc2c54f6e02acce43d88927100b99c..5d55b246b32f0757281d8743ae2= d1a23cc6e333d 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_rm.c +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_rm.c @@ -58,7 +58,7 @@ int dpu_rm_init(struct drm_device *dev, struct dpu_hw_mixer *hw; const struct dpu_lm_cfg *lm =3D &cat->mixer[i]; =20 - hw =3D dpu_hw_lm_init(dev, lm, mmio); + hw =3D dpu_hw_lm_init(dev, lm, mmio, cat->mdss_ver); if (IS_ERR(hw)) { rc =3D PTR_ERR(hw); DPU_ERROR("failed lm object creation: err %d\n", rc); --=20 2.39.5 From nobody Sun Feb 8 09:32:35 2026 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 CB6512367CC for ; Thu, 24 Apr 2025 09:31:07 +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=1745487069; cv=none; b=tcLUwzd5a9gs1lKpvlKaL+ZH7Wm1TQpLXvKE4gAUX4vxVKBKnRuljfp0E85zA8hZpi7kLQ0ORItM2g1PHEzq5fUeunAqo7tvPTVmDcDYUU6IAV/3KGSFgfGt3F507wuyA7+aMzlzHijz6fJIX1YIAXZ8vPDwC3YwPvu9ln55hv8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745487069; c=relaxed/simple; bh=bQMYAHfj7KWCroJT+ESYAjKZOFAaQqBXgQ5pnLnwzF8=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=obUMEqsS8Ujjv33p+ugGWCJuACx5W/FYjHVTi0XA/9K0O6fHuzmgPT0wyXV8gS+tCizEuwfyG7X9E2JRYMl8JshOZuwXhQOjYqGLkevG5gNhscMU4shL1dknWox6uRxoSNJDzqTTXidV4WWV0RlxItIKOFFD0FfZAeL7uyaYCu4= 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=W7TmY9aP; 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="W7TmY9aP" Received: from pps.filterd (m0279863.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 53O0F67Q013227 for ; Thu, 24 Apr 2025 09:31:07 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= SejrFGzUZ3kFShcktbFsTSzpZWaEgxbcsEESujMNhDU=; b=W7TmY9aPh/aHrPRK vL/Gq2KNUszZ03TXkr9rLrqBCoJ5flbv5IFmQr9Rv9rWvyi2o2aP0UvTGxgvg76t xtFWAbFQDAhU+JUlzUx9DqJ8cOwPEHC3T/N+zz5FRxJKKci3r4jBsytB58AobHhN u7Fc0UNDXSNJYJIyIBdyLeDetzLN+eirweeVWMxwhmKkO9pEd6C9uVjXKwVm9rr3 C1oHBZhMs1XZkoHUPvRDGrlxJI5B6xRySo1SxnqBRG2luo/yZkpbwCH1cNeybN0c Cd7LVSetcOQMEeoT2TaXMe+7DfFuF8ThAx1CNZafSUq3dCHd/pVKjuvGmEKh43hE g0p2+A== Received: from mail-qv1-f69.google.com (mail-qv1-f69.google.com [209.85.219.69]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 466jh2d06q-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Thu, 24 Apr 2025 09:31:06 +0000 (GMT) Received: by mail-qv1-f69.google.com with SMTP id 6a1803df08f44-6eb2480028cso13599306d6.3 for ; Thu, 24 Apr 2025 02:31:06 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1745487065; x=1746091865; 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=SejrFGzUZ3kFShcktbFsTSzpZWaEgxbcsEESujMNhDU=; b=DJny7FBTllL/MjXfgsreK4FCvGU3r9/x8f4HAwa8f21X+lyKON4rlOCCEudwwrNJwA gI80NdFCgTe7SZjikMkbvMEXcKD/V3UPQ58MaLVS/KfTr/vwQOgkxsqFy4ZIfC2s2h6y zPYRbT0+qf8N5uxCkzt9Z5NGSADLPINfTQ3Qy0/oIeYiVu5hOLUY7pvKDF4SaHpXiY4s AK88B0eYITcamOSXWfiWwypdtO8SPfFHnTAVNBDmrujmT3Ngu4qyrVLh+I5iIyGCmvgW +oA4NrxUWGL3Pon5EVsPCkQeQ34wSQxcoKNjvW9L2qD2/B4pEUV/FGNEV5+PRhI0Oxux SQgg== X-Forwarded-Encrypted: i=1; AJvYcCX0OxgEwUam0QD9/L1DQeDzI3tznPMTG7cLtDCnN9uzACZuGQ0dkjd71RcogKGT1awWq/Ia7QDOWKhhdWU=@vger.kernel.org X-Gm-Message-State: AOJu0Yz3PMjZ8k13JOcao3RoPlmNCmp4GzkQI6oDFKzfnU1CqdCoKhXO m5hwOPwwdzD+nt/+YOx55HnGQ7/YogJKUachvEgi4GjWRtNHGiByZfdBrPbuIBmUOp1mBfZU79/ DhWvJ+K2px8sMZbKPYm8wYw5SJH5dIdUsZRaoF0IcfA/W03lFeHj3P8BBj+wOHMs= X-Gm-Gg: ASbGncvLAWOFmDJSL2B4Er282Ae1M+bqMvrwYdV/ZIV+cUb4/X0XfHrsvYuQ/qycsLG 86vVKSoEWTBUcLeQ/tcUBEeogb5YBrjmawh/l1D5JKdFFMqkft1y3CFxgSZx0QpM1GFe8e0i4d2 S+Wd6ZsGJTg1WDODAUm9fWznXvaZ5UPQDyWIt6bvfGioINSyAs7P0oxUi41GL0fGPCgZlvvY7AY GTYe3+zUz1HLXkxwtzQbXMYYKK8i8S2xuooY6pg65uVu9OBdQPffafiLVdw6/Y7VMwGd2UPgajQ XNXzEV5GLLuU/GHk80+u1wwz56yjAOv+9vlift/GCrdPa3EXVhliaR8EtkwBXSfqA/E5PY641fd /mOcfenkpKZt6/t1kyoqwrH3M X-Received: by 2002:a05:6214:2265:b0:6e4:3eb1:2bde with SMTP id 6a1803df08f44-6f4bfbf7c75mr35754026d6.19.1745487065604; Thu, 24 Apr 2025 02:31:05 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHuvDq7PRXtyL337isMbNw0whC03Huj9hquF1Ds8ItN3e2etA+3UBBGy9s4LWZnk0LkPFpV7A== X-Received: by 2002:a05:6214:2265:b0:6e4:3eb1:2bde with SMTP id 6a1803df08f44-6f4bfbf7c75mr35753446d6.19.1745487065131; Thu, 24 Apr 2025 02:31:05 -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 38308e7fff4ca-317d1b9a304sm1820461fa.99.2025.04.24.02.31.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 24 Apr 2025 02:31:04 -0700 (PDT) From: Dmitry Baryshkov Date: Thu, 24 Apr 2025 12:30:26 +0300 Subject: [PATCH v3 22/33] 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: <20250424-dpu-drop-features-v3-22-cdaca81d356f@oss.qualcomm.com> References: <20250424-dpu-drop-features-v3-0-cdaca81d356f@oss.qualcomm.com> In-Reply-To: <20250424-dpu-drop-features-v3-0-cdaca81d356f@oss.qualcomm.com> To: Rob Clark , Abhinav Kumar , Sean Paul , Marijn Suijten , David Airlie , Simona Vetter , Vinod Koul , Konrad Dybcio Cc: 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=5770; i=dmitry.baryshkov@oss.qualcomm.com; h=from:subject:message-id; bh=zPzoSre6QlYhSZgH7eVz8ApdAwO0iDMR9kpYQh6k0wA=; b=owEBbQGS/pANAwAKAYs8ij4CKSjVAcsmYgBoCgSuco4C7iqbAq1sRE+ubkpew4WjhD1s21BHe Rj6XtiWSXKJATMEAAEKAB0WIQRMcISVXLJjVvC4lX+LPIo+Aiko1QUCaAoErgAKCRCLPIo+Aiko 1Tt3B/9oCdW/g+rDJFr0tiFBV8vFJIROnR+I5OktIYU8v6C/tdJNIySmYtyVpbNjIGZlZFHBMe7 KVAbEF79Qte1VIYuw2rf4Z1zaIm3iKFsHe7ib6pHwff2/qS4RbpIuNSdiTDJ/Ym+HPOJq5auBUN zBr/F5d1X25gPoR3QY+3Wp7tCzyaveTuSZkrAYZ/V1DEsyJh8EsFobwAig3fZzEpba/kWNS+Yqo ZbYH4PKgaYNuJBN5AexBCctnwOuF6pZtkiv+DFvaMLlheW9pwvqTa39P088yU+lP+nLhEHfDKWf +la1l0I2ARtqF29JGGlo2QlqryWq2+2g0+K2vs+WKMO84J1K X-Developer-Key: i=dmitry.baryshkov@oss.qualcomm.com; a=openpgp; fpr=8F88381DD5C873E4AE487DA5199BF1243632046A X-Proofpoint-GUID: vfvPYdwl81tVFG5HpyBklvO5KCoX0Mxj X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUwNDI0MDA2MyBTYWx0ZWRfX1mQuY6857ZtO QzBn2mHmgdDmZ8S5C8uYzdNSnjnB8/XGV7Nws0YobsZv8YxvV3m3KU9VISXIybErGElmqa13vkc 8F7+sY+Ms2WG/uv33ez3CDAKcrzVt4gE8W1ue4pokZwmbymlGleauqYNaVuvZWP4wR5qmkVfSfn 1jXeZInTMi1tXlPL1/hcgsrv0nUfuYKWJWpV6HuuIL7eJOc7FCgqlq/RNGOfM+kLRxVBJM9v3mS Cp58lrA4nxt0FJjTH0gcTJUqZpnhfwUOrQLyuJjFGIDWro763SAhES9wGxDAX7AbqfWUl45GHWV 5WBY0QicyphUXBS1bx91PK5Z9sdjc7z6pzR0nTCbKYdFPZPlf7z2W3F8WZNp/h/lMVHTSgCF3/9 J5UhOpKxGChXzZeGWVpZQyWJPsStKkIwhtoE/D1wGy1O7kPr3nJ3faa0Dh6p5ToCah2BP2gG X-Authority-Analysis: v=2.4 cv=Tu/mhCXh c=1 sm=1 tr=0 ts=680a04da cx=c_pps a=wEM5vcRIz55oU/E2lInRtA==:117 a=xqWC_Br6kY4A:10 a=IkcTkHD0fZMA:10 a=XR8D0OoHHMoA:10 a=KKAkSRfTAAAA:8 a=whSD1cen4EvMnTwSsNsA:9 a=QEXdDO2ut3YA:10 a=OIgjcC2v60KrkQgK7BGD:22 a=cvBusfyB2V15izCimMoJ:22 X-Proofpoint-ORIG-GUID: vfvPYdwl81tVFG5HpyBklvO5KCoX0Mxj X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1099,Hydra:6.0.680,FMLib:17.12.80.40 definitions=2025-04-24_04,2025-04-22_01,2025-02-21_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 priorityscore=1501 malwarescore=0 suspectscore=0 spamscore=0 clxscore=1015 lowpriorityscore=0 impostorscore=0 adultscore=0 phishscore=0 mlxlogscore=999 bulkscore=0 mlxscore=0 classifier=spam authscore=0 authtc=n/a authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.19.0-2504070000 definitions=main-2504240063 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 --- 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_3_sm6115.h | 1 - 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/dpu_hw_catalog.c | 5 +---- drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.h | 2 -- 7 files changed, 1 insertion(+), 14 deletions(-) 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 c75d0d42b6d856f98580068a5ac7f82f90380ac9..af7433fc6c128c2e29381ba6bf5= 6388bccdd93f8 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_3_sm6115.h b/drive= rs/gpu/drm/msm/disp/dpu1/catalog/dpu_6_3_sm6115.h index 842505ab5c4a6555e0a3223804065e68a5a4e680..155db203282f687e5632dcb0423= 93951bb03876f 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_5_qcm2290.h b/driv= ers/gpu/drm/msm/disp/dpu1/catalog/dpu_6_5_qcm2290.h index 7087c3c2e728c51f070b67ab0f8039f74eb7da6c..708cf1544bd1d5c72a125b572e5= 1d628c53f5033 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 a2fdbe39e4415c1da1da0517db2284f368bfa07b..b5a3574e2ce43f7f5d47c42fe1b= dd0f084396a9f 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/dpu_hw_catalog.c b/drivers/gpu/d= rm/msm/disp/dpu1/dpu_hw_catalog.c index e22ad69e451bb5ed38f056e95b0944fb5c21ec7b..5ca696b8cd92cefe295cc7e4597= 4e1da0d420cad 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.c +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.c @@ -90,10 +90,7 @@ (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)) + (BIT(DPU_MIXER_SOURCESPLIT)) =20 #define WB_SDM845_MASK (BIT(DPU_WB_LINE_MODE) | \ BIT(DPU_WB_UBWC) | \ 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 e1fc6fdd8864b017bec35e448ef15420530e018b..8e6fcb51aad8278eb80570a44a4= 23c2443744c61 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 From nobody Sun Feb 8 09:32:35 2026 Received: from mx0b-0031df01.pphosted.com (mx0b-0031df01.pphosted.com [205.220.180.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 1A74D221296 for ; Thu, 24 Apr 2025 09:31:09 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=205.220.180.131 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745487071; cv=none; b=Zt2NMGGwjH5uoyma+j2Yo0K2phqmAVb+Doof9eJErwSR1dvmVZhxhExcirvVdrSjuDCkDb1WLvLlA30e0TsOPEvhjEYootpKViwPrix0ItZZpN97tooB+3RO8yDVQaz3OJ6dVs/s+qMVMq53nyeRG0+Fk9m2Mtp5PEvrUGsJTlo= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745487071; c=relaxed/simple; bh=B40lq6uRn0ZgMp/A6sVR+CLhtNoPeXhoInTByCWb0qM=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=FzqEQfpsLCzb5X7fJnmnv8aWtSWu05gya8lYrMiURhlvlT97qR+IVElXXao2P7n8KnrITSjF9rjpBr8AXzY/PvzYymBUzCBCdmZ0TtcXSNHz21Wny1ancAZtmq3IIfM3diEFBi5rY+6KqjCwN1EEuyUfdgn1PeS79WTjH1CiJao= 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=C2ENHqoF; arc=none smtp.client-ip=205.220.180.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="C2ENHqoF" Received: from pps.filterd (m0279872.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 53O0FEUT006002 for ; Thu, 24 Apr 2025 09:31:08 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= LgK6xIOjacLuDPpGjs8hBbn93g/ttzUpC2INcaluSsw=; b=C2ENHqoF1nhOZDhp vHUzu6AE5ZVpWrYSeprNOFdPHodtQE7mUjJ17iIQ1E36MJY06R2hZ2xXpsGO23EH RsglztNJybHlfSYePceRLMgbWKMcQ/5n3k2fSYS8zraQ6LdYhv/I37Fa3XCzNx/u T9060GYCB/DZL+iNW5eZn8AxJSq/R2xuxKK1bL0H8YzCLgpyiQa1JhkdNvf6rD0x kHSnhhPLb1RgcmAlvx30rrSLmnFXjJlp85qHq4obtTH7SqPO3qUFSwNGM884+KGZ +dj7O1uordsJSIHYqUUZCdLYirL2SpOI7uv+uFytBQ+ZXulnE6P8IZcp5HCXzuH3 XmTxcA== 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 466jh05068-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Thu, 24 Apr 2025 09:31:08 +0000 (GMT) Received: by mail-qk1-f198.google.com with SMTP id af79cd13be357-7c790dc38b4so151443385a.0 for ; Thu, 24 Apr 2025 02:31:08 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1745487067; x=1746091867; 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=LgK6xIOjacLuDPpGjs8hBbn93g/ttzUpC2INcaluSsw=; b=B6tMA8Sds76y3SAwD9SXG1OhCsCtGErOpDRwD4/4sAy3mNzaqe6PP5fZpYZtw2BX7d n0aEknKDB35dTCTayR3m39jIgyTbqFI6yoULz2z0SRBXxZ2eCFUx5BuCGYzBFooinJj8 lcMAIksmTi4E9E2vw1KHp8g4ZW/eKoUgkYVOvbiu/pvqqW/Q6HnKphHUIWIaIS5OMQWj t2dHq8CoBmHOwm77TOwbtKUO68bKljJUimcO9a17UYBeVriB/xEoSSj74srV4f7ps0qI xTjZCskMvCH7cAJV1f3yKeSMN8ihY/UnjYCvtOUxCIj0mPL+CDOWfIsXmnAVuqa1h9jD /vew== X-Forwarded-Encrypted: i=1; AJvYcCWbLAqcISbIku9Ak6UQuPZTWdnamqJGPIL+szqEiB7YNP9UPfI461bfXIsDkXvu78qaNouemVUpheYtJug=@vger.kernel.org X-Gm-Message-State: AOJu0YzG5nS4D1b5K86XkOOJl7dGXF23rPzULwb2aC+O3Lmb3LvuMZCh ptkpavz8YI8Jeh8bPRbPY0+5j1T+doSE7PqGq34mVEaKjF98YLLjB3CR1atg4BHuFh8BwjvQdnz Ykj9SYtQ8J8YAVjqYLeieqZ0W7AIyErw30IH01G1IB/KXc5YeJ0iJ5+Tp5i+M09U= X-Gm-Gg: ASbGnctwBoPoA+KQV2FgmDxvR2OmvVIYg7TPsiXTGGzJM9bYE0ZZOFPVshT0tgO80BT ttHWnRjFehshcj4mH11U+iDE8ed33SKDnlYgzjGJIvZ4o7kxjOCrKShVwiUjrwrSJYDNZaSb4sA ACUYIELupqoq04RHaVbnF2bIZo7PaJyVTawS0smlaTM5CBxsIL1g7dX20AlO5sxAAIqywniC9wf cvT31XzTPhcjMPr+RNIbc/BT1khq5bypTHUdWp7PvtO0YxaWoKcRZ51hEmBh/mGF68WxIghnwMl wxF042DrM86lxrV30LENk1spQMVDTc0P+RlR4iQo64KqM7szHVU1X2EeUKhJVtBf74kTYlIfPl0 XJLmhf3+cdaPvG49JCeXlP2Dy X-Received: by 2002:a05:620a:40ce:b0:7c9:230f:904a with SMTP id af79cd13be357-7c9585e1f74mr242589785a.14.1745487067039; Thu, 24 Apr 2025 02:31:07 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFT/5BDjs/dFudjKR13o52cxRkF1rtWIDMdRd7stzgPNRZw0qjp0I+yUaccPj6KEaQQ/ridlg== X-Received: by 2002:a05:620a:40ce:b0:7c9:230f:904a with SMTP id af79cd13be357-7c9585e1f74mr242585085a.14.1745487066568; Thu, 24 Apr 2025 02:31:06 -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 38308e7fff4ca-317d1b9a304sm1820461fa.99.2025.04.24.02.31.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 24 Apr 2025 02:31:05 -0700 (PDT) From: Dmitry Baryshkov Date: Thu, 24 Apr 2025 12:30:27 +0300 Subject: [PATCH v3 23/33] drm/msm/dpu: get rid of DPU_DSC_HW_REV_1_2 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: <20250424-dpu-drop-features-v3-23-cdaca81d356f@oss.qualcomm.com> References: <20250424-dpu-drop-features-v3-0-cdaca81d356f@oss.qualcomm.com> In-Reply-To: <20250424-dpu-drop-features-v3-0-cdaca81d356f@oss.qualcomm.com> To: Rob Clark , Abhinav Kumar , Sean Paul , Marijn Suijten , David Airlie , Simona Vetter , Vinod Koul , Konrad Dybcio Cc: 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=12855; i=dmitry.baryshkov@oss.qualcomm.com; h=from:subject:message-id; bh=Q3MTIf4rQy+am/uHf/BMkZYmbIwxtrhN/RYvyuNUjQI=; b=owEBbQGS/pANAwAKAYs8ij4CKSjVAcsmYgBoCgSv7xfDVWi92hHXZlm3iZWDhXKcseAs1FBz3 InjFsxQLMiJATMEAAEKAB0WIQRMcISVXLJjVvC4lX+LPIo+Aiko1QUCaAoErwAKCRCLPIo+Aiko 1b4XB/0VsYnB5FTAl0bgYt8XOKDghnKAsAi6wX55QnBqun1a8IhFq6MH+KuZKVoZKugcthkPYjY enBv0frQ16euveh70KD31GHNYu6U9D7fNOmCQuUKUkaDlzjFarNbd626pvbDa+NNF0JokiViPw4 2CpS2nstCH0dh9Z7LZ7hjJ8dDJedXWuytLpN7Y423boSl9XstAbV4YNiTfxI5BsTTHJ3LgulTsX d8uvxl7PBjNEN/c7/5Ab0aoAq5We7CiRlB30w/NmsTdCz8hlgnUzbh2WU0MDu/fUSEhsgjjobi6 bMcAmasfvwiCR5+Q5/X2NtG/gHhlZqna6hhY+HrmqKJM46qZ X-Developer-Key: i=dmitry.baryshkov@oss.qualcomm.com; a=openpgp; fpr=8F88381DD5C873E4AE487DA5199BF1243632046A X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUwNDI0MDA2MyBTYWx0ZWRfX7LZm7QzdBK3r KutWk1rOHvWB1OFbOTIaEey7Ikds3fhJJIiSpMQYi5jdlPsZlJSKG0seC9eZjLcBI9nBtyF4xD5 jVjJD7g6WSIgL5o2bgMDsbVwgMYWuzIgT2pN0QxWVw89hg+0+2N9Wwv+tyKzTBNL02h6Q3lmwmd NWUaEXLwi2d3XzgbyY7nIX5LkPGSjPT2IIgqo2vU1icmXXgU4vX/s8RpqEsEQ1bkFzhBvLEv53b qpFbuGO4/tBAVhT1WFkXrvqPCBy2hop+nitXMJBm5jJcr3Np5izF6n00cxXbxTCsjCfyABX3zoy ODHqM30b9xpmfh2ijRxeesP12M1TQ+Db+2ZeC0XVGNsWfwAwdtvNi2COGTK8B4MKDbu6f8ldR/R bE+8uaFRZckjtGgqZxZQhIdjrRjAckq869iLpA0RFRuI+S8sn2MKJgVnx1OPEIgduBK/dnb6 X-Proofpoint-GUID: XaPZ32OiKHSak63OONoaMjHb9NV0TXx5 X-Authority-Analysis: v=2.4 cv=ZuTtK87G c=1 sm=1 tr=0 ts=680a04dc cx=c_pps a=qKBjSQ1v91RyAK45QCPf5w==:117 a=xqWC_Br6kY4A:10 a=IkcTkHD0fZMA:10 a=XR8D0OoHHMoA:10 a=KKAkSRfTAAAA:8 a=C81KZioEkqZAcCmD564A:9 a=QEXdDO2ut3YA:10 a=NFOGd7dJGGMPyQGDc5-O:22 a=cvBusfyB2V15izCimMoJ:22 X-Proofpoint-ORIG-GUID: XaPZ32OiKHSak63OONoaMjHb9NV0TXx5 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1099,Hydra:6.0.680,FMLib:17.12.80.40 definitions=2025-04-24_04,2025-04-22_01,2025-02-21_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 phishscore=0 clxscore=1015 impostorscore=0 bulkscore=0 mlxscore=0 adultscore=0 lowpriorityscore=0 mlxlogscore=999 priorityscore=1501 malwarescore=0 suspectscore=0 spamscore=0 classifier=spam authscore=0 authtc=n/a authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.19.0-2504070000 definitions=main-2504240063 From: Dmitry Baryshkov Continue migration to the MDSS-revision based checks and replace DPU_DSC_HW_REV_1_2 feature bit with the core_major_ver >=3D 7 check. Signed-off-by: Dmitry Baryshkov --- drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_10_0_sm8650.h | 10 ++++------ drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_7_0_sm8350.h | 6 ++---- drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_7_2_sc7280.h | 2 +- drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_8_0_sc8280xp.h | 8 ++------ drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_8_1_sm8450.h | 6 ++---- drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_8_4_sa8775p.h | 8 ++------ drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_9_0_sm8550.h | 6 ++---- drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_9_2_x1e80100.h | 6 ++---- drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.h | 2 -- drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c | 2 +- drivers/gpu/drm/msm/disp/dpu1/dpu_rm.c | 2 +- 11 files changed, 19 insertions(+), 39 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 d64366f608ea673422bbf4e5b6ae7f4ad8570784..5f6b1251f30f3c6dfb20261a0d1= bbf776ed5dd33 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 @@ -289,32 +289,30 @@ static const struct dpu_dsc_cfg sm8650_dsc[] =3D { { .name =3D "dce_0_0", .id =3D DSC_0, .base =3D 0x80000, .len =3D 0x6, - .features =3D BIT(DPU_DSC_HW_REV_1_2) | BIT(DPU_DSC_NATIVE_42x_EN), + .features =3D BIT(DPU_DSC_NATIVE_42x_EN), .sblk =3D &dsc_sblk_0, }, { .name =3D "dce_0_1", .id =3D DSC_1, .base =3D 0x80000, .len =3D 0x6, - .features =3D BIT(DPU_DSC_HW_REV_1_2) | BIT(DPU_DSC_NATIVE_42x_EN), + .features =3D BIT(DPU_DSC_NATIVE_42x_EN), .sblk =3D &dsc_sblk_1, }, { .name =3D "dce_1_0", .id =3D DSC_2, .base =3D 0x81000, .len =3D 0x6, - .features =3D BIT(DPU_DSC_HW_REV_1_2) | BIT(DPU_DSC_NATIVE_42x_EN), + .features =3D BIT(DPU_DSC_NATIVE_42x_EN), .sblk =3D &dsc_sblk_0, }, { .name =3D "dce_1_1", .id =3D DSC_3, .base =3D 0x81000, .len =3D 0x6, - .features =3D BIT(DPU_DSC_HW_REV_1_2) | BIT(DPU_DSC_NATIVE_42x_EN), + .features =3D BIT(DPU_DSC_NATIVE_42x_EN), .sblk =3D &dsc_sblk_1, }, { .name =3D "dce_2_0", .id =3D DSC_4, .base =3D 0x82000, .len =3D 0x6, - .features =3D BIT(DPU_DSC_HW_REV_1_2), .sblk =3D &dsc_sblk_0, }, { .name =3D "dce_2_1", .id =3D DSC_5, .base =3D 0x82000, .len =3D 0x6, - .features =3D BIT(DPU_DSC_HW_REV_1_2), .sblk =3D &dsc_sblk_1, }, }; 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 62de32268ee5528ff0fb16a3ff7c2baa5ea42466..bb35eea64a5af844965259cd96b= ef10d9955b493 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 @@ -266,22 +266,20 @@ static const struct dpu_dsc_cfg sm8350_dsc[] =3D { { .name =3D "dce_0_0", .id =3D DSC_0, .base =3D 0x80000, .len =3D 0x4, - .features =3D BIT(DPU_DSC_HW_REV_1_2), .sblk =3D &dsc_sblk_0, }, { .name =3D "dce_0_1", .id =3D DSC_1, .base =3D 0x80000, .len =3D 0x4, - .features =3D BIT(DPU_DSC_HW_REV_1_2), .sblk =3D &dsc_sblk_1, }, { .name =3D "dce_1_0", .id =3D DSC_2, .base =3D 0x81000, .len =3D 0x4, - .features =3D BIT(DPU_DSC_HW_REV_1_2) | BIT(DPU_DSC_NATIVE_42x_EN), + .features =3D BIT(DPU_DSC_NATIVE_42x_EN), .sblk =3D &dsc_sblk_0, }, { .name =3D "dce_1_1", .id =3D DSC_3, .base =3D 0x81000, .len =3D 0x4, - .features =3D BIT(DPU_DSC_HW_REV_1_2) | BIT(DPU_DSC_NATIVE_42x_EN), + .features =3D BIT(DPU_DSC_NATIVE_42x_EN), .sblk =3D &dsc_sblk_1, }, }; 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..d21b2266909050fd20bf55b6fab= e07351e445c5a 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 @@ -150,7 +150,7 @@ static const struct dpu_dsc_cfg sc7280_dsc[] =3D { { .name =3D "dce_0_0", .id =3D DSC_0, .base =3D 0x80000, .len =3D 0x4, - .features =3D BIT(DPU_DSC_HW_REV_1_2) | BIT(DPU_DSC_NATIVE_42x_EN), + .features =3D BIT(DPU_DSC_NATIVE_42x_EN), .sblk =3D &dsc_sblk_0, }, }; 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 43916752cfd5836718a3770df4c8767635f77ee9..72110b2a2770435ac886e992b1c= cce280c5ac3db 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 @@ -265,32 +265,28 @@ static const struct dpu_dsc_cfg sc8280xp_dsc[] =3D { { .name =3D "dce_0_0", .id =3D DSC_0, .base =3D 0x80000, .len =3D 0x4, - .features =3D BIT(DPU_DSC_HW_REV_1_2), .sblk =3D &dsc_sblk_0, }, { .name =3D "dce_0_1", .id =3D DSC_1, .base =3D 0x80000, .len =3D 0x4, - .features =3D BIT(DPU_DSC_HW_REV_1_2), .sblk =3D &dsc_sblk_1, }, { .name =3D "dce_1_0", .id =3D DSC_2, .base =3D 0x81000, .len =3D 0x4, - .features =3D BIT(DPU_DSC_HW_REV_1_2) | BIT(DPU_DSC_NATIVE_42x_EN), + .features =3D BIT(DPU_DSC_NATIVE_42x_EN), .sblk =3D &dsc_sblk_0, }, { .name =3D "dce_1_1", .id =3D DSC_3, .base =3D 0x81000, .len =3D 0x4, - .features =3D BIT(DPU_DSC_HW_REV_1_2) | BIT(DPU_DSC_NATIVE_42x_EN), + .features =3D BIT(DPU_DSC_NATIVE_42x_EN), .sblk =3D &dsc_sblk_1, }, { .name =3D "dce_2_0", .id =3D DSC_4, .base =3D 0x82000, .len =3D 0x4, - .features =3D BIT(DPU_DSC_HW_REV_1_2), .sblk =3D &dsc_sblk_0, }, { .name =3D "dce_2_1", .id =3D DSC_5, .base =3D 0x82000, .len =3D 0x4, - .features =3D BIT(DPU_DSC_HW_REV_1_2), .sblk =3D &dsc_sblk_1, }, }; 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 d58d5b7ce79b8c069d111c3c2aa3e9cdb2c1a435..305a798768c60a2ec409c1021a9= 1efc4eccc92fd 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 @@ -279,22 +279,20 @@ static const struct dpu_dsc_cfg sm8450_dsc[] =3D { { .name =3D "dce_0_0", .id =3D DSC_0, .base =3D 0x80000, .len =3D 0x4, - .features =3D BIT(DPU_DSC_HW_REV_1_2), .sblk =3D &dsc_sblk_0, }, { .name =3D "dce_0_1", .id =3D DSC_1, .base =3D 0x80000, .len =3D 0x4, - .features =3D BIT(DPU_DSC_HW_REV_1_2), .sblk =3D &dsc_sblk_1, }, { .name =3D "dce_1_0", .id =3D DSC_2, .base =3D 0x81000, .len =3D 0x4, - .features =3D BIT(DPU_DSC_HW_REV_1_2) | BIT(DPU_DSC_NATIVE_42x_EN), + .features =3D BIT(DPU_DSC_NATIVE_42x_EN), .sblk =3D &dsc_sblk_0, }, { .name =3D "dce_1_1", .id =3D DSC_3, .base =3D 0x81000, .len =3D 0x4, - .features =3D BIT(DPU_DSC_HW_REV_1_2) | BIT(DPU_DSC_NATIVE_42x_EN), + .features =3D BIT(DPU_DSC_NATIVE_42x_EN), .sblk =3D &dsc_sblk_1, }, }; 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 064546d4fd4538cd5a6b56fca3ee12d482a7dbb6..67aed1ebc78952c6dfce0cc9f16= 80fa75ec26e13 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 @@ -278,32 +278,28 @@ static const struct dpu_dsc_cfg sa8775p_dsc[] =3D { { .name =3D "dce_0_0", .id =3D DSC_0, .base =3D 0x80000, .len =3D 0x4, - .features =3D BIT(DPU_DSC_HW_REV_1_2), .sblk =3D &dsc_sblk_0, }, { .name =3D "dce_0_1", .id =3D DSC_1, .base =3D 0x80000, .len =3D 0x4, - .features =3D BIT(DPU_DSC_HW_REV_1_2), .sblk =3D &dsc_sblk_1, }, { .name =3D "dce_1_0", .id =3D DSC_2, .base =3D 0x81000, .len =3D 0x4, - .features =3D BIT(DPU_DSC_HW_REV_1_2) | BIT(DPU_DSC_NATIVE_42x_EN), + .features =3D BIT(DPU_DSC_NATIVE_42x_EN), .sblk =3D &dsc_sblk_0, }, { .name =3D "dce_1_1", .id =3D DSC_3, .base =3D 0x81000, .len =3D 0x4, - .features =3D BIT(DPU_DSC_HW_REV_1_2) | BIT(DPU_DSC_NATIVE_42x_EN), + .features =3D BIT(DPU_DSC_NATIVE_42x_EN), .sblk =3D &dsc_sblk_1, }, { .name =3D "dce_2_0", .id =3D DSC_4, .base =3D 0x82000, .len =3D 0x4, - .features =3D BIT(DPU_DSC_HW_REV_1_2), .sblk =3D &dsc_sblk_0, }, { .name =3D "dce_2_1", .id =3D DSC_5, .base =3D 0x82000, .len =3D 0x4, - .features =3D BIT(DPU_DSC_HW_REV_1_2), .sblk =3D &dsc_sblk_1, }, }; 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 959f3e9dbc5455fe53c1bb240b5db57212f2d4eb..b54a208e48a8508c39b4e4e95c9= e26ce28ba7c02 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 @@ -275,22 +275,20 @@ static const struct dpu_dsc_cfg sm8550_dsc[] =3D { { .name =3D "dce_0_0", .id =3D DSC_0, .base =3D 0x80000, .len =3D 0x4, - .features =3D BIT(DPU_DSC_HW_REV_1_2), .sblk =3D &dsc_sblk_0, }, { .name =3D "dce_0_1", .id =3D DSC_1, .base =3D 0x80000, .len =3D 0x4, - .features =3D BIT(DPU_DSC_HW_REV_1_2), .sblk =3D &dsc_sblk_1, }, { .name =3D "dce_1_0", .id =3D DSC_2, .base =3D 0x81000, .len =3D 0x4, - .features =3D BIT(DPU_DSC_HW_REV_1_2) | BIT(DPU_DSC_NATIVE_42x_EN), + .features =3D BIT(DPU_DSC_NATIVE_42x_EN), .sblk =3D &dsc_sblk_0, }, { .name =3D "dce_1_1", .id =3D DSC_3, .base =3D 0x81000, .len =3D 0x4, - .features =3D BIT(DPU_DSC_HW_REV_1_2) | BIT(DPU_DSC_NATIVE_42x_EN), + .features =3D BIT(DPU_DSC_NATIVE_42x_EN), .sblk =3D &dsc_sblk_1, }, }; 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 174cfdfcfdf9860ea86c983c6b6591ba98da5400..da2fdf01a17d29fd9a7ea46890d= b7a33fedee31e 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 @@ -275,22 +275,20 @@ static const struct dpu_dsc_cfg x1e80100_dsc[] =3D { { .name =3D "dce_0_0", .id =3D DSC_0, .base =3D 0x80000, .len =3D 0x4, - .features =3D BIT(DPU_DSC_HW_REV_1_2), .sblk =3D &dsc_sblk_0, }, { .name =3D "dce_0_1", .id =3D DSC_1, .base =3D 0x80000, .len =3D 0x4, - .features =3D BIT(DPU_DSC_HW_REV_1_2), .sblk =3D &dsc_sblk_1, }, { .name =3D "dce_1_0", .id =3D DSC_2, .base =3D 0x81000, .len =3D 0x4, - .features =3D BIT(DPU_DSC_HW_REV_1_2) | BIT(DPU_DSC_NATIVE_42x_EN), + .features =3D BIT(DPU_DSC_NATIVE_42x_EN), .sblk =3D &dsc_sblk_0, }, { .name =3D "dce_1_1", .id =3D DSC_3, .base =3D 0x81000, .len =3D 0x4, - .features =3D BIT(DPU_DSC_HW_REV_1_2) | BIT(DPU_DSC_NATIVE_42x_EN), + .features =3D BIT(DPU_DSC_NATIVE_42x_EN), .sblk =3D &dsc_sblk_1, }, }; 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 8e6fcb51aad8278eb80570a44a423c2443744c61..ee8dd66a68f421161961495dd68= d39dd4622ecf6 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.h +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.h @@ -178,13 +178,11 @@ enum { * DSC sub-blocks/features * @DPU_DSC_OUTPUT_CTRL Configure which PINGPONG block gets * the pixel output from this DSC. - * @DPU_DSC_HW_REV_1_2 DSC block supports DSC 1.1 and 1.2 * @DPU_DSC_NATIVE_42x_EN Supports NATIVE_422_EN and NATIVE_420_EN enc= oding * @DPU_DSC_MAX */ enum { DPU_DSC_OUTPUT_CTRL =3D 0x1, - DPU_DSC_HW_REV_1_2, DPU_DSC_NATIVE_42x_EN, DPU_DSC_MAX }; diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c b/drivers/gpu/drm/msm/= disp/dpu1/dpu_kms.c index f3f84c8c302fb1bfe6e6d70e4110d0b89259e55c..d44461e7e1641b25c5181bf7c0c= 9bbedffcc869d 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c @@ -1043,7 +1043,7 @@ static void dpu_kms_mdp_snapshot(struct msm_disp_stat= e *disp_state, struct msm_k msm_disp_snapshot_add_block(disp_state, cat->dsc[i].len, base, "%s", cat->dsc[i].name); =20 - if (cat->dsc[i].features & BIT(DPU_DSC_HW_REV_1_2)) { + if (cat->mdss_ver->core_major_ver >=3D 7) { struct dpu_dsc_blk enc =3D cat->dsc[i].sblk->enc; struct dpu_dsc_blk ctl =3D cat->dsc[i].sblk->ctl; =20 diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_rm.c b/drivers/gpu/drm/msm/d= isp/dpu1/dpu_rm.c index 5d55b246b32f0757281d8743ae2d1a23cc6e333d..f917ffb85d2f1b1a0ee826f125d= 02980b7a79052 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_rm.c +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_rm.c @@ -166,7 +166,7 @@ int dpu_rm_init(struct drm_device *dev, struct dpu_hw_dsc *hw; const struct dpu_dsc_cfg *dsc =3D &cat->dsc[i]; =20 - if (test_bit(DPU_DSC_HW_REV_1_2, &dsc->features)) + if (cat->mdss_ver->core_major_ver >=3D 7) hw =3D dpu_hw_dsc_init_1_2(dev, dsc, mmio); else hw =3D dpu_hw_dsc_init(dev, dsc, mmio); --=20 2.39.5 From nobody Sun Feb 8 09:32:35 2026 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 BEA1A23D2B7 for ; Thu, 24 Apr 2025 09:31:12 +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=1745487074; cv=none; b=bL9hcywJPTRqnJcuTiI15tgDqEi7uKm8wF6UJ+1HoeoZwLdy2u2tln+bHXIbdSdsUG6EThBdE0/EC54V54I3Vxe6sHwTpYFq4wtXDcKf59KAak+9UurMsiLn7yfqL49Z7+o+Ar2kJbn8kQxjkSkS3qxR2X/H71ERiAit+zk/7z8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745487074; c=relaxed/simple; bh=Urh6j0LSqE54C08BmFdbEO+NZBZ70PEd4SfFu524gDg=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=Ml2/QcQlwQRIhyFp4gTuy+xN8ldITer4KWhkLd2BSzfA9BzfxyyhjtbDwyTqBtUFssG4y1hBIUDAl6EY2SbW8gdaytJy0dABz0+GxogPgo8Gi/Z7zsXkT43s2ji8PnkIP8bZ3Erljjq6LENJGz35+JKNCxYqfPrY/ejtz88LNYw= 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=Ob7I5X7/; 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="Ob7I5X7/" Received: from pps.filterd (m0279866.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 53O0FB3d010239 for ; Thu, 24 Apr 2025 09:31:12 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= QWOXTZcF0bL7VGfgRmCavQFcox9xVMfgnodJM+CDno8=; b=Ob7I5X7/bzbIuYIA 4T7XevZH4tZXv//yKrLyKpJrU0bbUcPkaAy5hI0lmJiF9nDADSemhDqVBwssGSi0 V7/MlZQvw4Z37oVYMqUGGBjziIwt9Ol7TRqznEg5tQuX6njEVXNJj+Ckac4TYtwN s9EPuEBK2Fn6yX2PwcikFdMaD5C3d8zb0bWC+Hix0kls3nhF7ayZh6KZ/CGG5DXz 84F0xI0cEH06aiABvfFNMl10bQb20vSdmZWNNmdLI/29gdQMUbNIpyAHW++jKYn6 Jkl2xfCeHfC/q+BilffGTbccWrOQ1qulWIQDvZHNtnLUoPeggfHI+SkYJo4BVhU5 vi8R+w== Received: from mail-qv1-f72.google.com (mail-qv1-f72.google.com [209.85.219.72]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 466jh0d1hk-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Thu, 24 Apr 2025 09:31:11 +0000 (GMT) Received: by mail-qv1-f72.google.com with SMTP id 6a1803df08f44-6f2b50a75d8so10508396d6.0 for ; Thu, 24 Apr 2025 02:31:11 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1745487070; x=1746091870; 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=QWOXTZcF0bL7VGfgRmCavQFcox9xVMfgnodJM+CDno8=; b=FDdZ3ImXDZRvDebdA+FvQq5z6S8g8z4wfgRHboOrjKaIkBrCxKCU4gbrGPpN2vcY3j x0GbYEPidRcxWrA7QG+gS6vJ900keF9QjpByN7L0qZ33HwBxKmE7oAK3x0omWzZhtpS0 6Wf40InFt7Y5fA65FLaUH/XxTh5bx8ZpmPmT/S00vxJyOFKpoaZvZZvoaqc5QA8qlAv4 9e1ttLk1GBg4d3qoeNSnxU21+j1GGXG71yaEFfySKa0voc0XS2ekg0aY+Ly+5qrtOTNp bbBuOXiQiatAWF+fOOQ2s1b18wHfk+JEurVt8Yv1aQD8l9J/sRj7cecUNWq+BBNphxhL wpkw== X-Forwarded-Encrypted: i=1; AJvYcCVR7gt9pIu4dsND07d/RnPXLWntxrGf9jAvdkE44Ei7BmkJMHqSiJr0sJthjx32pi1+nLyRxZtcQTs8ilM=@vger.kernel.org X-Gm-Message-State: AOJu0YwHUPPX//IXjQR40BPQbxC7/jytF4Liv55hhajNxe0iZyUa6ya9 728JEGVr0eTkS7D2iilJFSlceKTm0lneIgUmjn8QoezaOCtIjG6hyb3napSooNpPJpDI8xCPGgr xEP6ssAuDgwLMdYF0gjLJ21MA0sHs11Yqzp12uvtkIGSjY5sdb9XhVoWM1fp41f0= X-Gm-Gg: ASbGncvg3VkYfYDBMxH0wq6QdNbeDWC5OCfrhUhHOnmCTjJWA5IN3uKNsT9WM9PNN17 c8fr4ofe0AOUVVSVVaBeU5vtBaahnyPzw9g5QIYffYbY4nJffUHg85FUly/vsGP82wYFszv5gBB GExBu94vCSx8WScw+L5byrhZSfHe5vqY6/k6ha8jjRu/g4kirtEpnZxGSaB/N8rdGia2SEQ/Hug bd5rDNusu0AWKczXq4uDrlZX477IExEa1GZO99mFUbHbNUYaFt9JCksbx0LUGuD7ssmGoCEbZ5E u+fV7xITUbAgVCkM509DMtrBHwLkkC3wGjXU9JgGMeVpiby++XevkjsGbyqlhJTuuXWuMwTwW7C vtAJ6kuqhqh9xjL0MixgWWKzt X-Received: by 2002:a05:6214:2305:b0:6f4:5dbd:276e with SMTP id 6a1803df08f44-6f4bfbb2307mr30139326d6.6.1745487069881; Thu, 24 Apr 2025 02:31:09 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHuLWelc9lNTVRH0Jj2i516G3cgyKr62QEB1AThhgaOwIqKDKdIyx66racPUaRhbjAglcpNAg== X-Received: by 2002:a05:6214:2305:b0:6f4:5dbd:276e with SMTP id 6a1803df08f44-6f4bfbb2307mr30139036d6.6.1745487069436; Thu, 24 Apr 2025 02:31:09 -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 38308e7fff4ca-317d1b9a304sm1820461fa.99.2025.04.24.02.31.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 24 Apr 2025 02:31:07 -0700 (PDT) From: Dmitry Baryshkov Date: Thu, 24 Apr 2025 12:30:28 +0300 Subject: [PATCH v3 24/33] drm/msm/dpu: get rid of DPU_DSC_OUTPUT_CTRL 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: <20250424-dpu-drop-features-v3-24-cdaca81d356f@oss.qualcomm.com> References: <20250424-dpu-drop-features-v3-0-cdaca81d356f@oss.qualcomm.com> In-Reply-To: <20250424-dpu-drop-features-v3-0-cdaca81d356f@oss.qualcomm.com> To: Rob Clark , Abhinav Kumar , Sean Paul , Marijn Suijten , David Airlie , Simona Vetter , Vinod Koul , Konrad Dybcio Cc: 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=8937; i=dmitry.baryshkov@oss.qualcomm.com; h=from:subject:message-id; bh=HOkBs/6zBYjscOwL9t+s9f3+kkK5I+SwIYI8RcLTw34=; b=owEBbQGS/pANAwAKAYs8ij4CKSjVAcsmYgBoCgSvt8TvUn3IpdTbEShE0t9uQFQyIfft7O4/O a4LV+a9tzqJATMEAAEKAB0WIQRMcISVXLJjVvC4lX+LPIo+Aiko1QUCaAoErwAKCRCLPIo+Aiko 1ZtRB/4w7mYGDq9A6U27YaNQug+5Dap57zQs8PGkxZl2LITLCA2khXRtwcuACXNENRSphRswYgl esiA5Dc2E0PSL/OWoIMlBvGKAjXNN6CIxhzcYupvH+HJmspb6+XR3ysobM86uXuMv8PRU0xH07W 9uwbvKHD2hBT/XkN4cI4Kqwi7n68anlHaVoSpKSrlE4LTWkB9NySzkmRL8RGQ5VM3iOi40W4U8x wY45al7JyVp9AGT9ZbcYDShGrqW+rcQFr9JB4y+gWwW6lFTgBxs50hdnj5nHM15ELpMnfV5dvYL sHRzJPfHYAv75MV71JJ55sipq2KtSQxeNQKZ/sY+C5tW3mlE X-Developer-Key: i=dmitry.baryshkov@oss.qualcomm.com; a=openpgp; fpr=8F88381DD5C873E4AE487DA5199BF1243632046A X-Proofpoint-GUID: 5Msl3IZK5dpt-bXHmCZFczUBRxTMOqpn X-Proofpoint-ORIG-GUID: 5Msl3IZK5dpt-bXHmCZFczUBRxTMOqpn X-Authority-Analysis: v=2.4 cv=Fv0F/3rq c=1 sm=1 tr=0 ts=680a04df cx=c_pps a=7E5Bxpl4vBhpaufnMqZlrw==:117 a=xqWC_Br6kY4A:10 a=IkcTkHD0fZMA:10 a=XR8D0OoHHMoA:10 a=KKAkSRfTAAAA:8 a=s0E_TIProlikEKm38KMA:9 a=QEXdDO2ut3YA:10 a=pJ04lnu7RYOZP9TFuWaZ:22 a=cvBusfyB2V15izCimMoJ:22 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUwNDI0MDA2MyBTYWx0ZWRfX0YzF0i/giYie li2qkDIUh/fJzp3dWTLkySLjCRmvaiyU95Vo/q3cfBdtUG3CBVOSJe/maetQyr0K5plKfGbfAeX vADMOkJ3dOcwYzy+QTqZbc4pMRwFs8wGKBMqZOVvPliVU2kCJ+lVhuSnLZQlOim0jLQZ0y2CweQ XpLAWY6OezrkVS87ymllFxR0K3w4JgthrUp0vztE+5Ofp0wgDPrxS2h+1IVzoKNHXtHQO4VcTTD uvUUtxFSgrNYrNC37a1gI6Z/ZQunHqZqWmg6XO2sSGskN67Jsi6LxUkZCFHLWFJ+HqLm9+X8nCp AjTI7mV7/lfnSWKdRI3W1pmDoJ/tEeL4yJYEuI0oTVp+4C/g87XEv5wIEDtC/OiajJZuh3GiZz8 d3FI3KvN3uauEzV+FMqrmWMMc8dv6tf7PRTmFNkyu7HBnzmliXsfqlM8zF6/rZ5gbbhY1qgM X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1099,Hydra:6.0.680,FMLib:17.12.80.40 definitions=2025-04-24_04,2025-04-22_01,2025-02-21_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 impostorscore=0 mlxscore=0 malwarescore=0 mlxlogscore=999 priorityscore=1501 suspectscore=0 adultscore=0 bulkscore=0 clxscore=1015 spamscore=0 lowpriorityscore=0 phishscore=0 classifier=spam authscore=0 authtc=n/a authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.19.0-2504070000 definitions=main-2504240063 From: Dmitry Baryshkov Continue migration to the MDSS-revision based checks and replace DPU_DSC_OUTPUT_CTRL feature bit with the core_major_ver >=3D 5 check. Signed-off-by: Dmitry Baryshkov --- drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_5_0_sm8150.h | 4 ---- drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_5_1_sc8180x.h | 6 ------ drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_5_2_sm7150.h | 2 -- drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_6_0_sm8250.h | 4 ---- drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_6_4_sm6350.h | 1 - drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_6_9_sm6375.h | 1 - drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.h | 5 +---- drivers/gpu/drm/msm/disp/dpu1/dpu_hw_dsc.c | 6 ++++-- drivers/gpu/drm/msm/disp/dpu1/dpu_hw_dsc.h | 3 ++- drivers/gpu/drm/msm/disp/dpu1/dpu_rm.c | 2 +- 10 files changed, 8 insertions(+), 26 deletions(-) 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 634b7dc452839f994c948601fe9a09581cb42a42..c5d964e915cdde1f8a83c2793b0= 020d7cecde672 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 @@ -262,19 +262,15 @@ static const struct dpu_dsc_cfg sm8150_dsc[] =3D { { .name =3D "dsc_0", .id =3D DSC_0, .base =3D 0x80000, .len =3D 0x140, - .features =3D BIT(DPU_DSC_OUTPUT_CTRL), }, { .name =3D "dsc_1", .id =3D DSC_1, .base =3D 0x80400, .len =3D 0x140, - .features =3D BIT(DPU_DSC_OUTPUT_CTRL), }, { .name =3D "dsc_2", .id =3D DSC_2, .base =3D 0x80800, .len =3D 0x140, - .features =3D BIT(DPU_DSC_OUTPUT_CTRL), }, { .name =3D "dsc_3", .id =3D DSC_3, .base =3D 0x80c00, .len =3D 0x140, - .features =3D BIT(DPU_DSC_OUTPUT_CTRL), }, }; =20 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 59e280edcd508c14ee297857a19e9974970566de..dc21c5c232a7ce7d8c21d3a3f30= a5c1bc352ddd7 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 @@ -261,27 +261,21 @@ static const struct dpu_dsc_cfg sc8180x_dsc[] =3D { { .name =3D "dsc_0", .id =3D DSC_0, .base =3D 0x80000, .len =3D 0x140, - .features =3D BIT(DPU_DSC_OUTPUT_CTRL), }, { .name =3D "dsc_1", .id =3D DSC_1, .base =3D 0x80400, .len =3D 0x140, - .features =3D BIT(DPU_DSC_OUTPUT_CTRL), }, { .name =3D "dsc_2", .id =3D DSC_2, .base =3D 0x80800, .len =3D 0x140, - .features =3D BIT(DPU_DSC_OUTPUT_CTRL), }, { .name =3D "dsc_3", .id =3D DSC_3, .base =3D 0x80c00, .len =3D 0x140, - .features =3D BIT(DPU_DSC_OUTPUT_CTRL), }, { .name =3D "dsc_4", .id =3D DSC_4, .base =3D 0x81000, .len =3D 0x140, - .features =3D BIT(DPU_DSC_OUTPUT_CTRL), }, { .name =3D "dsc_5", .id =3D DSC_5, .base =3D 0x81400, .len =3D 0x140, - .features =3D BIT(DPU_DSC_OUTPUT_CTRL), }, }; =20 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 af0d789c47917e9b712282a542c3d0886313c049..c1e620ae9596f400655b64b47e6= b51a8d25e1428 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 @@ -195,11 +195,9 @@ static const struct dpu_dsc_cfg sm7150_dsc[] =3D { { .name =3D "dsc_0", .id =3D DSC_0, .base =3D 0x80000, .len =3D 0x140, - .features =3D BIT(DPU_DSC_OUTPUT_CTRL), }, { .name =3D "dsc_1", .id =3D DSC_1, .base =3D 0x80400, .len =3D 0x140, - .features =3D BIT(DPU_DSC_OUTPUT_CTRL), }, }; =20 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 4da7445aa8019894b35b12ace18c0bd6209b9148..81af11630202943b910cd5896f0= 7a32e53a23c6a 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 @@ -261,19 +261,15 @@ static const struct dpu_dsc_cfg sm8250_dsc[] =3D { { .name =3D "dsc_0", .id =3D DSC_0, .base =3D 0x80000, .len =3D 0x140, - .features =3D BIT(DPU_DSC_OUTPUT_CTRL), }, { .name =3D "dsc_1", .id =3D DSC_1, .base =3D 0x80400, .len =3D 0x140, - .features =3D BIT(DPU_DSC_OUTPUT_CTRL), }, { .name =3D "dsc_2", .id =3D DSC_2, .base =3D 0x80800, .len =3D 0x140, - .features =3D BIT(DPU_DSC_OUTPUT_CTRL), }, { .name =3D "dsc_3", .id =3D DSC_3, .base =3D 0x80c00, .len =3D 0x140, - .features =3D BIT(DPU_DSC_OUTPUT_CTRL), }, }; =20 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 6563296190bb27b6cab1b03921af6cff34037cd2..8cdd601a5350e80a5324db42c23= bdeb474a59b0c 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 @@ -135,7 +135,6 @@ static const struct dpu_dsc_cfg sm6350_dsc[] =3D { { .name =3D "dsc_0", .id =3D DSC_0, .base =3D 0x80000, .len =3D 0x140, - .features =3D BIT(DPU_DSC_OUTPUT_CTRL), }, }; =20 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 b5a3574e2ce43f7f5d47c42fe1bdd0f084396a9f..c08d8bae3293d00ef7ff2894269= 9ae2a52e2cea9 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 @@ -87,7 +87,6 @@ static const struct dpu_dsc_cfg sm6375_dsc[] =3D { { .name =3D "dsc_0", .id =3D DSC_0, .base =3D 0x80000, .len =3D 0x140, - .features =3D BIT(DPU_DSC_OUTPUT_CTRL), }, }; =20 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 ee8dd66a68f421161961495dd68d39dd4622ecf6..981d259c33631d31f0216f5cfae= 948b828d03592 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.h +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.h @@ -176,14 +176,11 @@ enum { =20 /** * DSC sub-blocks/features - * @DPU_DSC_OUTPUT_CTRL Configure which PINGPONG block gets - * the pixel output from this DSC. * @DPU_DSC_NATIVE_42x_EN Supports NATIVE_422_EN and NATIVE_420_EN enc= oding * @DPU_DSC_MAX */ enum { - DPU_DSC_OUTPUT_CTRL =3D 0x1, - DPU_DSC_NATIVE_42x_EN, + DPU_DSC_NATIVE_42x_EN =3D 0x1, DPU_DSC_MAX }; =20 diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_dsc.c b/drivers/gpu/drm/m= sm/disp/dpu1/dpu_hw_dsc.c index c7db917afd27e3daf1e8aad2ad671246bf6c8fbf..3a149caa7ff4f20dc7a902033cf= 29a168268839e 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_dsc.c +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_dsc.c @@ -186,11 +186,13 @@ static void dpu_hw_dsc_bind_pingpong_blk( * @dev: Corresponding device for devres management * @cfg: DSC catalog entry for which driver object is required * @addr: Mapped register io address of MDP + * @mdss_ver: dpu core's major and minor versions * Return: Error code or allocated dpu_hw_dsc context */ struct dpu_hw_dsc *dpu_hw_dsc_init(struct drm_device *dev, const struct dpu_dsc_cfg *cfg, - void __iomem *addr) + void __iomem *addr, + const struct dpu_mdss_version *mdss_ver) { struct dpu_hw_dsc *c; =20 @@ -207,7 +209,7 @@ struct dpu_hw_dsc *dpu_hw_dsc_init(struct drm_device *d= ev, c->ops.dsc_disable =3D dpu_hw_dsc_disable; c->ops.dsc_config =3D dpu_hw_dsc_config; c->ops.dsc_config_thresh =3D dpu_hw_dsc_config_thresh; - if (c->caps->features & BIT(DPU_DSC_OUTPUT_CTRL)) + if (mdss_ver->core_major_ver >=3D 5) c->ops.dsc_bind_pingpong_blk =3D dpu_hw_dsc_bind_pingpong_blk; =20 return c; diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_dsc.h b/drivers/gpu/drm/m= sm/disp/dpu1/dpu_hw_dsc.h index fc171bdeca488f6287cf2ba7362ed330ad55b28f..b7013c9822d23238eb5411a5e28= 4bb072ecc3395 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_dsc.h +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_dsc.h @@ -64,7 +64,8 @@ struct dpu_hw_dsc { =20 struct dpu_hw_dsc *dpu_hw_dsc_init(struct drm_device *dev, const struct dpu_dsc_cfg *cfg, - void __iomem *addr); + void __iomem *addr, + const struct dpu_mdss_version *mdss_ver); =20 struct dpu_hw_dsc *dpu_hw_dsc_init_1_2(struct drm_device *dev, const struct dpu_dsc_cfg *cfg, diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_rm.c b/drivers/gpu/drm/msm/d= isp/dpu1/dpu_rm.c index f917ffb85d2f1b1a0ee826f125d02980b7a79052..f118c6caa1b9007eb03fa9b39ef= a87dfb46583ba 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_rm.c +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_rm.c @@ -169,7 +169,7 @@ int dpu_rm_init(struct drm_device *dev, if (cat->mdss_ver->core_major_ver >=3D 7) hw =3D dpu_hw_dsc_init_1_2(dev, dsc, mmio); else - hw =3D dpu_hw_dsc_init(dev, dsc, mmio); + hw =3D dpu_hw_dsc_init(dev, dsc, mmio, cat->mdss_ver); =20 if (IS_ERR(hw)) { rc =3D PTR_ERR(hw); --=20 2.39.5 From nobody Sun Feb 8 09:32:35 2026 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 3FF232417C8 for ; Thu, 24 Apr 2025 09:31:15 +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=1745487078; cv=none; b=RRyghzJmKD2FInjVxX4I5MvPfOsga++akH9anZmW1MRvSkryZ+c6WUYdV8GX53mg6499jyPO8xMqUNupuv1uYyGDhAAi3bswjxuNZqENecoQRZdHOHblxDAuR8i1gIF8i1rUiVObAHytPeeiBkd1Cf8QP+HVJtta0n4hCpL6N/k= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745487078; c=relaxed/simple; bh=+LkgCLQTfsN1XshO4dd9+YhVnPh0FkfYstgaJMuLCEg=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=cluEIViYFZUNtz770/lvFiet7eT5XTD5U/HLhGIMoMTxCiF1i5QnYN6NpuZAJozeKWw0rtYLTD4ahBmJzOa7mUPEEN11fB7pqWA5PxoskG4A6iZGktQD6q6F3kYuYZkyhhMtbku1IBzO0fJfzu9E+O45ay/zjJNJhs+SP6Pktxg= 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=VE13EaKX; 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="VE13EaKX" Received: from pps.filterd (m0279865.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 53O0F5Tu007493 for ; Thu, 24 Apr 2025 09:31:15 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= p7QBd09toXDPTxrH5vx0XxRC7vdkh0nO6VZwdHqqgW8=; b=VE13EaKXN+/RiHfV vpONfXdaDTWbzLnDvF6B8I3nuIYPC6aPn9uFAmHH/BXS0li6Y6/VffWooLcj9GhG lDXHT8saj/uf3Sgf6H+U2Le+pKw/Y0OzFss7WOzt+ZwTWbegrvHD63DxFWTzLQnG 0e8aaP3knsHSB0GwqCfClAkaAZj6T5jpNoWNTFbe5f00QzATsbBmYWG8QeFJvbJu 49xDB+C4XkeprkfjhyQ9IWrZ1L0tQfwG1SorHzLHgdqz9W1NimNrI1psjzbi5vPV CvoJSE3C1uFQE0XDgpYd0PoLBDDyndxiN1oxxQEOS/9YWKeXSrLENPEUivieL7ru +ov7/Q== Received: from mail-qv1-f72.google.com (mail-qv1-f72.google.com [209.85.219.72]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 466jh1myss-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Thu, 24 Apr 2025 09:31:15 +0000 (GMT) Received: by mail-qv1-f72.google.com with SMTP id 6a1803df08f44-6e9083404b7so14501846d6.1 for ; Thu, 24 Apr 2025 02:31:14 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1745487073; x=1746091873; 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=p7QBd09toXDPTxrH5vx0XxRC7vdkh0nO6VZwdHqqgW8=; b=tOJWsP2hRnLhQ1iYpmy+8WI50b9IkYsHb3U+ZvQ99AJxctKZ7nqkqHg3kofoUh1fmq TXkGnz0qXE7BMSF5Mj4peBNUVsazZrIi94QTefL67yYlJh/H4JYMZSucf0cUB/3vzV1H 39EA9kpjmOoNiI4Vi/KHHz+6ej/pwQCVNjMdGA7R6rI/ZoYDaxROhDRufB7qBYmLBJHK MY/zSOtlcxSlKRHzypx/ZN87K5h7oP9Uzac+jg+HK/Emh8hHw0Fcnat5G0VYzdBqpcJM 4zdayBL3XSC7/CPe+RHqcVaXtwI+RDwhpBSeRpph7H2kPPW0Y4jvsMXYq3ppsN2en+re iUNA== X-Forwarded-Encrypted: i=1; AJvYcCUelEElWHBA4c+TDuxzK6USKmRCOuECtULwnfo0Iiadje1A7Tjj6ocvdzXkOsojNAI7RSWFnEJYc156FLc=@vger.kernel.org X-Gm-Message-State: AOJu0Yxrgwa7cEF3n7RBm850Y//CQKXIr/EM1s64ub0jHKbvYZuOoU9K WG/vQaBOZi5mG2m/ucUzOMu/ZJuBYrLqytIkU7T7eXbwRePIjEeprQM1N26J4k66eY8e+9Gh0NQ 8mmowDYce5Rgk9/6g2E2gOrcyry04YWTb8SmkY3rB62qMNGUUDfu6/QYoUuAXm/s= X-Gm-Gg: ASbGncvXXrzX0/2oZngoUgpiFIVj5lcSd1S5dgFTKBvzOKuUJRaxIZ1KqktxvNSACe1 1DS1PF32Yn9gEDkswGJMO6Ye+6AqvcE1tMMzd8Z8R22VT9NasD91XCUGoJfbxo96m4LpZsERaaB 8OvwCjPSFr5U0Ld4ZyVbpMovL8CnOHWNtwFRW+Rr9IpkoJs9VMMoiv/lr7pOb1O44/PiC0RtXXJ 52n5yMQ0AY0rKEkBxGO8I31Uat1WXVClZrJUIXr5yYfIpHfgcJ3lnQ6hZ3rcPiWaQ/ffnOvfFpK vq51W7/3ACvPmGUMLXPUOqw7YgamNyCATQQfIKrrJEPGQk4U3uIilOojUsLu/NN+DPhSqnriM98 Ug1csPHgKZT2FBO4/2c4ERlRJ X-Received: by 2002:a05:6214:dab:b0:6d8:a1fe:7293 with SMTP id 6a1803df08f44-6f4bfca4560mr28718336d6.42.1745487072690; Thu, 24 Apr 2025 02:31:12 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEJ+U3ha+fp2N8SiPtLrKv0a/ioyNMNuBlA0czrAfkLKqr62nyrIT47NeRoNYV4FWUxOEGfgA== X-Received: by 2002:a05:6214:dab:b0:6d8:a1fe:7293 with SMTP id 6a1803df08f44-6f4bfca4560mr28717926d6.42.1745487072268; Thu, 24 Apr 2025 02:31:12 -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 38308e7fff4ca-317d1b9a304sm1820461fa.99.2025.04.24.02.31.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 24 Apr 2025 02:31:09 -0700 (PDT) From: Dmitry Baryshkov Date: Thu, 24 Apr 2025 12:30:29 +0300 Subject: [PATCH v3 25/33] drm/msm/dpu: get rid of DPU_WB_INPUT_CTRL 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: <20250424-dpu-drop-features-v3-25-cdaca81d356f@oss.qualcomm.com> References: <20250424-dpu-drop-features-v3-0-cdaca81d356f@oss.qualcomm.com> In-Reply-To: <20250424-dpu-drop-features-v3-0-cdaca81d356f@oss.qualcomm.com> To: Rob Clark , Abhinav Kumar , Sean Paul , Marijn Suijten , David Airlie , Simona Vetter , Vinod Koul , Konrad Dybcio Cc: 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=13833; i=dmitry.baryshkov@oss.qualcomm.com; h=from:subject:message-id; bh=+LkgCLQTfsN1XshO4dd9+YhVnPh0FkfYstgaJMuLCEg=; b=owEBbQGS/pANAwAKAYs8ij4CKSjVAcsmYgBoCgSvUxH/BqvZoDra4F3nGyl7TVGDYyC9dfCsQ +rvV+p0S26JATMEAAEKAB0WIQRMcISVXLJjVvC4lX+LPIo+Aiko1QUCaAoErwAKCRCLPIo+Aiko 1cCAB/9lHEu+2UJmzv6h2gHHCcxM3YOJLv2KBoWPCwqsB8CyiPpyX0nXnITmcDAAKk2u2anwASD Gaer39LznPmGtmDhw5Ajmp/bUde64DdREidlCZMe6SYUs5dy8Fk7ExAVer/2gGoY3p3KMb+8dpz TrAKfv83DN7s45H6PIKVh2H9FVe72iT3pDy95d5WHKDG3Zv7/5GMxrI9kQITpqsRAM82xqmncTO BWoCwxs29vPxk9kx0Q74Pnsg7QzfTz+RonfL4J2AC1qXeSZkuHpa2+H/Fx3aafwa4T1qrOrGCuP 8HesI20PbVbeyNhT0ZcOE8gdO6qncrbZpHBDLhBSZZYsxuJb X-Developer-Key: i=dmitry.baryshkov@oss.qualcomm.com; a=openpgp; fpr=8F88381DD5C873E4AE487DA5199BF1243632046A X-Proofpoint-GUID: zz8UENUhLq2nEy2revMM1VdNuCOFihMH X-Proofpoint-ORIG-GUID: zz8UENUhLq2nEy2revMM1VdNuCOFihMH X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUwNDI0MDA2MyBTYWx0ZWRfX+sQil5zy44nK Gm2VEuZzHHHcS5drfirgIy9Di/KTC+eMACcyv7tZas9Alq/zBVi2dNiud7Egc89CVoMcNgxfHZC THltpoB9gDs70mNAMbbCiNDzG2SzAyu3z7ItBDkfz4cxc2Sq0MtmIwlRdg2AmsMgqVbyKyAVFrT J7OzcJjCgJYoxlwAp1H+7/HAWVpehG/5AVYoFQG+emz2ISatxlRjAbo6gKR1oUaCvm1hGrN/9AP 84wqW/t3VEiZQXn8fq5ZVISPDsx1aKPZq85jhBVeTCbgPTh3tTyyFs5xuysuBEUSONhcfqRTLjf 4bICVNtLgvfpGIb2YoeLr+iAFc80e12ToNBq7PcLXXEvGvMgmx10qcuJhwKZ3th0PsDkK7jExs3 3YmT0hshFEMAITcqDN71L+1Oo4Ox39hwaXQmw9xY4+4wvSoc2gy/vCVqPKXbZ7GNvXP/rPR7 X-Authority-Analysis: v=2.4 cv=ZpjtK87G c=1 sm=1 tr=0 ts=680a04e3 cx=c_pps a=7E5Bxpl4vBhpaufnMqZlrw==:117 a=xqWC_Br6kY4A:10 a=IkcTkHD0fZMA:10 a=XR8D0OoHHMoA:10 a=KKAkSRfTAAAA:8 a=EUspDBNiAAAA:8 a=PTNk0fzPuTrgWsykFtIA:9 a=QEXdDO2ut3YA:10 a=pJ04lnu7RYOZP9TFuWaZ:22 a=cvBusfyB2V15izCimMoJ:22 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1099,Hydra:6.0.680,FMLib:17.12.80.40 definitions=2025-04-24_04,2025-04-22_01,2025-02-21_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 adultscore=0 malwarescore=0 lowpriorityscore=0 priorityscore=1501 phishscore=0 clxscore=1015 bulkscore=0 suspectscore=0 mlxlogscore=999 spamscore=0 impostorscore=0 mlxscore=0 classifier=spam authscore=0 authtc=n/a authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.19.0-2504070000 definitions=main-2504240063 Continue migration to the MDSS-revision based checks and replace DPU_WB_INPUT_CTRL feature bit with the core_major_ver >=3D 5 check. Signed-off-by: Dmitry Baryshkov Signed-off-by: Dmitry Baryshkov --- drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_10_0_sm8650.h | 2 +- drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_5_0_sm8150.h | 2 +- drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_5_1_sc8180x.h | 2 +- drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_5_2_sm7150.h | 2 +- drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_5_3_sm6150.h | 2 +- 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 | 2 +- drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_6_2_sc7180.h | 2 +- drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_6_4_sm6350.h | 2 +- drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_7_0_sm8350.h | 2 +- drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_7_2_sc7280.h | 2 +- drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_8_1_sm8450.h | 2 +- drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_8_4_sa8775p.h | 2 +- drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_9_0_sm8550.h | 2 +- drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_9_2_x1e80100.h | 2 +- drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.c | 3 --- drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.h | 3 --- drivers/gpu/drm/msm/disp/dpu1/dpu_hw_wb.c | 2 +- 18 files changed, 16 insertions(+), 22 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 5f6b1251f30f3c6dfb20261a0d1bbf776ed5dd33..02bb3d01e2dcfb881d089c68b51= 6abe1761f692d 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 @@ -321,7 +321,7 @@ static const struct dpu_wb_cfg sm8650_wb[] =3D { { .name =3D "wb_2", .id =3D WB_2, .base =3D 0x65000, .len =3D 0x2c8, - .features =3D WB_SM8250_MASK, + .features =3D WB_SDM845_MASK, .format_list =3D wb2_formats_rgb_yuv, .num_formats =3D ARRAY_SIZE(wb2_formats_rgb_yuv), .xin_id =3D 6, 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 c5d964e915cdde1f8a83c2793b0020d7cecde672..e1490dd6d0b35ef71b91b4b7dbc= 574b102e68652 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 @@ -278,7 +278,7 @@ static const struct dpu_wb_cfg sm8150_wb[] =3D { { .name =3D "wb_2", .id =3D WB_2, .base =3D 0x65000, .len =3D 0x2c8, - .features =3D WB_SM8250_MASK, + .features =3D WB_SDM845_MASK, .format_list =3D wb2_formats_rgb_yuv, .num_formats =3D ARRAY_SIZE(wb2_formats_rgb_yuv), .clk_ctrl =3D DPU_CLK_CTRL_WB2, 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 dc21c5c232a7ce7d8c21d3a3f30a5c1bc352ddd7..c53a0376fc3d040b69a35896aad= 613ff8aec73b6 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 @@ -283,7 +283,7 @@ static const struct dpu_wb_cfg sc8180x_wb[] =3D { { .name =3D "wb_2", .id =3D WB_2, .base =3D 0x65000, .len =3D 0x2c8, - .features =3D WB_SM8250_MASK, + .features =3D WB_SDM845_MASK, .format_list =3D wb2_formats_rgb_yuv, .num_formats =3D ARRAY_SIZE(wb2_formats_rgb_yuv), .clk_ctrl =3D DPU_CLK_CTRL_WB2, 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 c1e620ae9596f400655b64b47e6b51a8d25e1428..f72c986079803ec0d60f0bd6545= ee0812657b8f2 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 @@ -243,7 +243,7 @@ static const struct dpu_wb_cfg sm7150_wb[] =3D { { .name =3D "wb_2", .id =3D WB_2, .base =3D 0x65000, .len =3D 0x2c8, - .features =3D WB_SM8250_MASK, + .features =3D WB_SDM845_MASK, .format_list =3D wb2_formats_rgb_yuv, .num_formats =3D ARRAY_SIZE(wb2_formats_rgb_yuv), .clk_ctrl =3D DPU_CLK_CTRL_WB2, 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 8fb926bff36d32fb4ce1036cb69513599dc7b6b7..a065f102ce592311376f1186add= 7a47dca7fd84f 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 @@ -154,7 +154,7 @@ static const struct dpu_wb_cfg sm6150_wb[] =3D { { .name =3D "wb_2", .id =3D WB_2, .base =3D 0x65000, .len =3D 0x2c8, - .features =3D WB_SM8250_MASK, + .features =3D WB_SDM845_MASK, .format_list =3D wb2_formats_rgb_yuv, .num_formats =3D ARRAY_SIZE(wb2_formats_rgb_yuv), .clk_ctrl =3D DPU_CLK_CTRL_WB2, 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 af7433fc6c128c2e29381ba6bf56388bccdd93f8..8c909c41b48a18fdc54753c68bc= 2ad19001cd3b4 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 @@ -133,7 +133,7 @@ static const struct dpu_wb_cfg sm6125_wb[] =3D { { .name =3D "wb_2", .id =3D WB_2, .base =3D 0x65000, .len =3D 0x2c8, - .features =3D WB_SM8250_MASK, + .features =3D WB_SDM845_MASK, .format_list =3D wb2_formats_rgb_yuv, .num_formats =3D ARRAY_SIZE(wb2_formats_rgb_yuv), .clk_ctrl =3D DPU_CLK_CTRL_WB2, 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 81af11630202943b910cd5896f07a32e53a23c6a..448ec3def8c7e3e77ce0740e245= 88a14b0a44da7 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 @@ -315,7 +315,7 @@ static const struct dpu_wb_cfg sm8250_wb[] =3D { { .name =3D "wb_2", .id =3D WB_2, .base =3D 0x65000, .len =3D 0x2c8, - .features =3D WB_SM8250_MASK, + .features =3D WB_SDM845_MASK, .format_list =3D wb2_formats_rgb_yuv, .num_formats =3D ARRAY_SIZE(wb2_formats_rgb_yuv), .clk_ctrl =3D DPU_CLK_CTRL_WB2, 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 77126039733bbb2941aa6698bb353334efab3804..f091503840182b624471c62ada5= f8cb813a707bb 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 @@ -148,7 +148,7 @@ static const struct dpu_wb_cfg sc7180_wb[] =3D { { .name =3D "wb_2", .id =3D WB_2, .base =3D 0x65000, .len =3D 0x2c8, - .features =3D WB_SM8250_MASK, + .features =3D WB_SDM845_MASK, .format_list =3D wb2_formats_rgb_yuv, .num_formats =3D ARRAY_SIZE(wb2_formats_rgb_yuv), .clk_ctrl =3D DPU_CLK_CTRL_WB2, 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 8cdd601a5350e80a5324db42c23bdeb474a59b0c..f4cd9405cc1f0589bce7ec68db6= 8989bd24b2faa 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 @@ -142,7 +142,7 @@ static const struct dpu_wb_cfg sm6350_wb[] =3D { { .name =3D "wb_2", .id =3D WB_2, .base =3D 0x65000, .len =3D 0x2c8, - .features =3D WB_SM8250_MASK, + .features =3D WB_SDM845_MASK, .format_list =3D wb2_formats_rgb_yuv, .num_formats =3D ARRAY_SIZE(wb2_formats_rgb_yuv), .clk_ctrl =3D DPU_CLK_CTRL_WB2, 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 bb35eea64a5af844965259cd96bef10d9955b493..f4572433f352fb2c939b80c31e9= 0bc2bfaa2a057 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 @@ -288,7 +288,7 @@ static const struct dpu_wb_cfg sm8350_wb[] =3D { { .name =3D "wb_2", .id =3D WB_2, .base =3D 0x65000, .len =3D 0x2c8, - .features =3D WB_SM8250_MASK, + .features =3D WB_SDM845_MASK, .format_list =3D wb2_formats_rgb_yuv, .num_formats =3D ARRAY_SIZE(wb2_formats_rgb_yuv), .clk_ctrl =3D DPU_CLK_CTRL_WB2, 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 d21b2266909050fd20bf55b6fabe07351e445c5a..d312b7ff375ebb0bb5159c4d26e= adc6eb3094103 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 @@ -159,7 +159,7 @@ static const struct dpu_wb_cfg sc7280_wb[] =3D { { .name =3D "wb_2", .id =3D WB_2, .base =3D 0x65000, .len =3D 0x2c8, - .features =3D WB_SM8250_MASK, + .features =3D WB_SDM845_MASK, .format_list =3D wb2_formats_rgb_yuv, .num_formats =3D ARRAY_SIZE(wb2_formats_rgb_yuv), .clk_ctrl =3D DPU_CLK_CTRL_WB2, 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 305a798768c60a2ec409c1021a91efc4eccc92fd..72b2f67bb70eb09a3340097da60= 20a40cfbf87fb 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 @@ -301,7 +301,7 @@ static const struct dpu_wb_cfg sm8450_wb[] =3D { { .name =3D "wb_2", .id =3D WB_2, .base =3D 0x65000, .len =3D 0x2c8, - .features =3D WB_SM8250_MASK, + .features =3D WB_SDM845_MASK, .format_list =3D wb2_formats_rgb_yuv, .num_formats =3D ARRAY_SIZE(wb2_formats_rgb_yuv), .clk_ctrl =3D DPU_CLK_CTRL_WB2, 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 67aed1ebc78952c6dfce0cc9f1680fa75ec26e13..de7e79680a7353e73bb2c761276= edd9ddc25ce97 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 @@ -308,7 +308,7 @@ static const struct dpu_wb_cfg sa8775p_wb[] =3D { { .name =3D "wb_2", .id =3D WB_2, .base =3D 0x65000, .len =3D 0x2c8, - .features =3D WB_SM8250_MASK, + .features =3D WB_SDM845_MASK, .format_list =3D wb2_formats_rgb_yuv, .num_formats =3D ARRAY_SIZE(wb2_formats_rgb_yuv), .clk_ctrl =3D DPU_CLK_CTRL_WB2, 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 b54a208e48a8508c39b4e4e95c9e26ce28ba7c02..674192923d8c184386e46870afc= 508e53917ff6c 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 @@ -297,7 +297,7 @@ static const struct dpu_wb_cfg sm8550_wb[] =3D { { .name =3D "wb_2", .id =3D WB_2, .base =3D 0x65000, .len =3D 0x2c8, - .features =3D WB_SM8250_MASK, + .features =3D WB_SDM845_MASK, .format_list =3D wb2_formats_rgb_yuv, .num_formats =3D ARRAY_SIZE(wb2_formats_rgb_yuv), .xin_id =3D 6, 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 da2fdf01a17d29fd9a7ea46890db7a33fedee31e..6cd7ddeb2b1fceed4cebc1f8679= 3831b1cb75945 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 @@ -297,7 +297,7 @@ static const struct dpu_wb_cfg x1e80100_wb[] =3D { { .name =3D "wb_2", .id =3D WB_2, .base =3D 0x65000, .len =3D 0x2c8, - .features =3D WB_SM8250_MASK, + .features =3D WB_SDM845_MASK, .format_list =3D wb2_formats_rgb_yuv, .num_formats =3D ARRAY_SIZE(wb2_formats_rgb_yuv), .xin_id =3D 6, 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 5ca696b8cd92cefe295cc7e45974e1da0d420cad..6a96fa529508673493712d7cb72= 846c29d0f5a07 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.c +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.c @@ -101,9 +101,6 @@ BIT(DPU_WB_QOS_8LVL) | \ BIT(DPU_WB_CDP)) =20 -#define WB_SM8250_MASK (WB_SDM845_MASK | \ - BIT(DPU_WB_INPUT_CTRL)) - #define DEFAULT_PIXEL_RAM_SIZE (50 * 1024) #define DEFAULT_DPU_LINE_WIDTH 2048 #define DEFAULT_DPU_OUTPUT_LINE_WIDTH 2560 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 981d259c33631d31f0216f5cfae948b828d03592..e0efa65afd0b734234f1080baf2= d91e348882dcf 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.h +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.h @@ -142,8 +142,6 @@ enum { * @DPU_WB_QOS, Writeback supports QoS control, danger/safe/c= req * @DPU_WB_QOS_8LVL, Writeback supports 8-level QoS control * @DPU_WB_CDP Writeback supports client driven prefetch - * @DPU_WB_INPUT_CTRL Writeback supports from which pp block input = pixel - * data arrives. * @DPU_WB_CROP CWB supports cropping * @DPU_WB_MAX maximum value */ @@ -157,7 +155,6 @@ enum { DPU_WB_QOS, DPU_WB_QOS_8LVL, DPU_WB_CDP, - DPU_WB_INPUT_CTRL, DPU_WB_CROP, DPU_WB_MAX }; diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_wb.c b/drivers/gpu/drm/ms= m/disp/dpu1/dpu_hw_wb.c index 4853e516c48733231de240b9c32ad51d4cf18f0d..478a091aeccfc7cf298798e1c11= 9df56737e3dc4 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_wb.c +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_wb.c @@ -208,7 +208,7 @@ static void _setup_wb_ops(struct dpu_hw_wb_ops *ops, if (test_bit(DPU_WB_CDP, &features)) ops->setup_cdp =3D dpu_hw_wb_setup_cdp; =20 - if (test_bit(DPU_WB_INPUT_CTRL, &features)) + if (mdss_rev->core_major_ver >=3D 5) ops->bind_pingpong_blk =3D dpu_hw_wb_bind_pingpong_blk; =20 if (mdss_rev->core_major_ver >=3D 9) --=20 2.39.5 From nobody Sun Feb 8 09:32:35 2026 Received: from mx0b-0031df01.pphosted.com (mx0b-0031df01.pphosted.com [205.220.180.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 71F6E242D62 for ; Thu, 24 Apr 2025 09:31:17 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=205.220.180.131 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745487079; cv=none; b=nyT1yj+KE+AFfDhoAADyj8SLgga1RGetatR2UhqmSE7w14VNSOwMf14WF/Yeq7F+GHxEzGOLxb+tz1M33GYmefWalEliWHZ9KbMQzjeXLIIKHk2qvXgr7v9ysuNM7ljj8d9FS7IAZgA5einl703GYg5LX0+rBWclirUU1QIiEVA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745487079; c=relaxed/simple; bh=RoacreTEMFn9/+AgadLU7Bc5airyr1KCWBHPP03RBuw=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=V9TIlD69mcCzjI51dAA0K3D/lUJwWriaPyT/K6HXWfaQJ4RrobuU3ZCs+rnpx30LPOm1252OHNDI0e35oSTQHNyuHNSpbOkDVXPMd9i9/qmrsF0t+AkFIZ0CtKAOlpbz5AnVr3bBqCA00wro1EAgTMhT9i5sh0DLNUdfyZJTlwY= 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=cpRlpmjk; arc=none smtp.client-ip=205.220.180.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="cpRlpmjk" Received: from pps.filterd (m0279868.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 53O0F6kW003397 for ; Thu, 24 Apr 2025 09:31:16 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= wrHE1bOaB3NiekNvDO5+9u9GO4wap7dKxyNQIc6R/uI=; b=cpRlpmjkKG9kcZ4c iEJUgOR8r5BAuIrtJsnFEW3UIzJ6TOUzEOaurxQNi1bfZfWdHiJijXzRsBHRIgOb H4pC6cY6wLF94+9aaPXCJs/lo6SNhw2pbii4hI+Yp98nmrJRTl5BSVekEShmr36w M6F13hHd2tqv3eCtewzC4nXrXrNNR07/VnZ+mb6f7oU/zuWPyfgSU7pu0DhF6qS4 /XXOPVjphl0x29onQUsK7SHSqw15VkIvqsJqDVcLPrSiIpugpt92PFd9nEYUytkT sJ4Cy2ypGYz7WQUXWP2F+ZxtRHdAtKW1LCrf/oJ6ynoN6f15aHUasHXcHmzZ/jAj CgL7EA== Received: from mail-qk1-f199.google.com (mail-qk1-f199.google.com [209.85.222.199]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 466jh0myc4-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Thu, 24 Apr 2025 09:31:16 +0000 (GMT) Received: by mail-qk1-f199.google.com with SMTP id af79cd13be357-7c5f876bfe0so133950285a.3 for ; Thu, 24 Apr 2025 02:31:16 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1745487075; x=1746091875; 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=wrHE1bOaB3NiekNvDO5+9u9GO4wap7dKxyNQIc6R/uI=; b=jFRvtf67qJ4crfx//pBNI8hrHiNmAxnUU62Lde0VZgAoqxzHHMEhZl5nZGjqnZr2mm 8mxN7PR8t+BPLo2F5ah3vkWj3L4LeVJ3mR075b/DDirYR7p+yiUobkVg9/jtnqqzN/1X q1IDNcsUz03F04xZrDMzIOEoIhrQEcnJV7VlLlMWCemLID9hZIwuj+LGJc4HIMDOo5J1 3RAAXEIbOTC9zW9ehSoDZLhVZWPznYTXBNUiLlFjQkIpLYCDGeZi8CVKN1qjcoyQEI1Z FzppD8A6pOCTYL4BxzyC/ibgVSC2H8RSyh6SnI64elIcwEc1mE59ZADBxhKdEahIgJg1 e09A== X-Forwarded-Encrypted: i=1; AJvYcCVOsflJSe1CH7/QF81TVnYgUSqAWoIub4Ob366KTqlwdb371KidJKHilBl3ZXwvLXVdCk77U3hTmEMr0ts=@vger.kernel.org X-Gm-Message-State: AOJu0Ywy1wF12SxigoEzc452jzmdytUmznOnfXTgIbIcqJVZfqzH84tD zBdplKSGnQ272RVHFbRSKKFFiLZN4DD7j+r5FXJeNJ64Jv6h2YKvrnYgaUs71RJbN5dHPXVTUoh GAhQVm6kjWn6lo82jVdhoYP/pMqcEhRmLb7sZyS5nzVxWlHYqpg5q11tK8x56IpA= X-Gm-Gg: ASbGncuyf3caUSSd+VLdtSvGixIb8q4D8V8GWwkyvEz12FjLChlgetSQuYNnrSDF0l2 PpMcYCu1LLfk9pILElOfwhUEHoGSUed+vopAbtyI38ifyHgyCB1dhUMcdIaUg0FDA8U+UwnMQw8 AOR+9CmjNPCLrPC4w9ii6Upx/7pcq2BTZDemls7gtFM8hb34iXMeshWh7IHHZBoojCULsROcXb/ /BC0ntHwdyYx72i8qogGNGUVSywQRo64iAAobNIKjalIZaSrJyyyjm7Vn1wvHi0Hyw5gCU0RrMX uPsAI/FG3SWHu2AS3Em2FJrJK/ayrcwPYmwIZzti60q+i/wfNvRIYpXttJYGHiVillzw81KUKb9 IuRa/5h+MLOWrie0Hu0Ga+RMj X-Received: by 2002:a05:620a:44c8:b0:7c5:4caa:21af with SMTP id af79cd13be357-7c956f88f3cmr289575485a.53.1745487075637; Thu, 24 Apr 2025 02:31:15 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHzIFg1zDeiIX8vbuG/puPSsm0w6YxIMJS6CwQB6kTZP4GzarC7rZpOw7DNXg9ofkifNfCrzA== X-Received: by 2002:a05:620a:44c8:b0:7c5:4caa:21af with SMTP id af79cd13be357-7c956f88f3cmr289570085a.53.1745487075134; Thu, 24 Apr 2025 02:31:15 -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 38308e7fff4ca-317d1b9a304sm1820461fa.99.2025.04.24.02.31.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 24 Apr 2025 02:31:12 -0700 (PDT) From: Dmitry Baryshkov Date: Thu, 24 Apr 2025 12:30:30 +0300 Subject: [PATCH v3 26/33] drm/msm/dpu: get rid of DPU_SSPP_QOS_8LVL 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: <20250424-dpu-drop-features-v3-26-cdaca81d356f@oss.qualcomm.com> References: <20250424-dpu-drop-features-v3-0-cdaca81d356f@oss.qualcomm.com> In-Reply-To: <20250424-dpu-drop-features-v3-0-cdaca81d356f@oss.qualcomm.com> To: Rob Clark , Abhinav Kumar , Sean Paul , Marijn Suijten , David Airlie , Simona Vetter , Vinod Koul , Konrad Dybcio Cc: 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=3942; i=dmitry.baryshkov@oss.qualcomm.com; h=from:subject:message-id; bh=rblN28s9WApGRvSdgwWOoAg2/8R6bFt84IMaWAtpt4E=; b=owEBbQGS/pANAwAKAYs8ij4CKSjVAcsmYgBoCgSv0gl9OlrXtLqzN0AezOXYOY6txxUCsh9LH CWulThU4cOJATMEAAEKAB0WIQRMcISVXLJjVvC4lX+LPIo+Aiko1QUCaAoErwAKCRCLPIo+Aiko 1TJbCACh7guP2wcixkRto0VBCiA2LpayBzP+xMAujF2Y7DwSW0zKJ5lLv5PbFQLXqVz3P7S4Imq Bri1XMVdY3LEImpBDWpojCK+MKl4FLBpEpM/mGKpY1JDLRVnZWJyJczAneAXt5LK8Fd+6X1YVlv QIhtbBS5Ggs2/isbefFAj1PU1WljaHs/aXhhUkXpoDPErtb5JNbKMsHvRn8sNrDfYy4MnLO6OBX 6ydBR0+9/qkV9GFejoxwRUvWQogVKQ9jmKujXxW9PCR+n12XjLf4lbjDd4tN3PKgLWz7wn0wz7a 3FM0DTLPiHv52kc0XYAk5HzSftk1JUAcvXX6O1UHq+YCRq9F X-Developer-Key: i=dmitry.baryshkov@oss.qualcomm.com; a=openpgp; fpr=8F88381DD5C873E4AE487DA5199BF1243632046A X-Proofpoint-ORIG-GUID: 1cSRR6jmz3wNsbrjoBvjSXQpCDzGFaD0 X-Authority-Analysis: v=2.4 cv=ftfcZE4f c=1 sm=1 tr=0 ts=680a04e4 cx=c_pps a=HLyN3IcIa5EE8TELMZ618Q==:117 a=xqWC_Br6kY4A:10 a=IkcTkHD0fZMA:10 a=XR8D0OoHHMoA:10 a=KKAkSRfTAAAA:8 a=8GrYFQBjgVhM5uvzyoMA:9 a=QEXdDO2ut3YA:10 a=bTQJ7kPSJx9SKPbeHEYW:22 a=cvBusfyB2V15izCimMoJ:22 X-Proofpoint-GUID: 1cSRR6jmz3wNsbrjoBvjSXQpCDzGFaD0 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUwNDI0MDA2MyBTYWx0ZWRfX090qqh5hL5l8 sumg0B7vNJF9ig+Sxddbt0bMY2iP9FPjGpl94NciipefXG8Nurk7cXmMc+4MFAJsacmkt2hsF3E 6JPS374aVytI309NkW992j9rAmAGSgdjHAf9tQwKUvDEDC9LzbIRiunDPNl6pl1nPUnTJyP9cXE T1Jy+71cgDZJiEWdk6LbNop315ujqm2lhC0LFfshZZAiCUzJmnwqGHJpUtJ3U4YJtj7xFS9CHYJ b2Fxlkv1WbJRn5D6CT0ePjOI3Pcsk/UG1UIk7Php1OG/LO4dK5118Sbpwo/eJtu3KQiCKSe9KmH 8S2lHaTX2mscjJ13kqhi6Sgmeh1VMQLhJ34bCNf/0NlCia07/pyb4UzaMuJFB+mRRBbBpEphZUr bzGAiNXtz+zA7RMgPHVLaAbaru2sX8DT3EXSRiB13dZxTInWRDFi6WLu55GNf8NhRa8mmsvX X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1099,Hydra:6.0.680,FMLib:17.12.80.40 definitions=2025-04-24_04,2025-04-22_01,2025-02-21_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 bulkscore=0 mlxscore=0 suspectscore=0 mlxlogscore=999 lowpriorityscore=0 phishscore=0 malwarescore=0 impostorscore=0 adultscore=0 spamscore=0 clxscore=1015 priorityscore=1501 classifier=spam authscore=0 authtc=n/a authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.19.0-2504070000 definitions=main-2504240063 From: Dmitry Baryshkov Continue migration to the MDSS-revision based checks and replace DPU_SSPP_QOS_8LVL feature bit with the core_major_ver >=3D 4 check. Signed-off-by: Dmitry Baryshkov --- drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.c | 6 +++--- drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.h | 2 -- drivers/gpu/drm/msm/disp/dpu1/dpu_hw_sspp.c | 5 ++++- drivers/gpu/drm/msm/disp/dpu1/dpu_hw_sspp.h | 2 ++ 4 files changed, 9 insertions(+), 6 deletions(-) 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 6a96fa529508673493712d7cb72846c29d0f5a07..8496a44e2f04edeec884e1bac02= 9c513022bf79a 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.c +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.c @@ -35,12 +35,12 @@ (VIG_MASK | BIT(DPU_SSPP_SCALER_QSEED3_COMPATIBLE)) =20 #define VIG_SDM845_MASK \ - (VIG_MASK | BIT(DPU_SSPP_QOS_8LVL) | BIT(DPU_SSPP_SCALER_QSEED3_COMPATIBL= E)) + (VIG_MASK | BIT(DPU_SSPP_SCALER_QSEED3_COMPATIBLE)) =20 #define VIG_SDM845_MASK_SDMA \ (VIG_SDM845_MASK | BIT(DPU_SSPP_SMART_DMA_V2)) =20 -#define VIG_QCM2290_MASK (VIG_BASE_MASK | BIT(DPU_SSPP_QOS_8LVL)) +#define VIG_QCM2290_MASK (VIG_BASE_MASK) =20 #define DMA_MSM8953_MASK \ (BIT(DPU_SSPP_QOS)) @@ -60,7 +60,7 @@ (VIG_SC7280_MASK | BIT(DPU_SSPP_SMART_DMA_V2)) =20 #define DMA_SDM845_MASK \ - (BIT(DPU_SSPP_QOS) | BIT(DPU_SSPP_QOS_8LVL) |\ + (BIT(DPU_SSPP_QOS) | \ BIT(DPU_SSPP_TS_PREFILL) | BIT(DPU_SSPP_TS_PREFILL_REC1) |\ BIT(DPU_SSPP_CDP) | BIT(DPU_SSPP_EXCL_RECT)) =20 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 e0efa65afd0b734234f1080baf2d91e348882dcf..01763e0bf1359527b0c441ca36b= 27264dad636c0 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.h +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.h @@ -50,7 +50,6 @@ enum { * @DPU_SSPP_CSC_10BIT, Support of 10-bit Color space conversion * @DPU_SSPP_CURSOR, SSPP can be used as a cursor layer * @DPU_SSPP_QOS, SSPP support QoS control, danger/safe/creq - * @DPU_SSPP_QOS_8LVL, SSPP support 8-level QoS control * @DPU_SSPP_EXCL_RECT, SSPP supports exclusion rect * @DPU_SSPP_SMART_DMA_V1, SmartDMA 1.0 support * @DPU_SSPP_SMART_DMA_V2, SmartDMA 2.0 support @@ -68,7 +67,6 @@ enum { DPU_SSPP_CSC_10BIT, DPU_SSPP_CURSOR, DPU_SSPP_QOS, - DPU_SSPP_QOS_8LVL, DPU_SSPP_EXCL_RECT, DPU_SSPP_SMART_DMA_V1, DPU_SSPP_SMART_DMA_V2, diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_sspp.c b/drivers/gpu/drm/= msm/disp/dpu1/dpu_hw_sspp.c index 32c7c80845533d720683dbcde3978d98f4972cce..7dfd0e0a779535e1f6b003f4818= 8bc90d29d6853 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_sspp.c +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_sspp.c @@ -543,7 +543,7 @@ static void dpu_hw_sspp_setup_qos_lut(struct dpu_hw_ssp= p *ctx, return; =20 _dpu_hw_setup_qos_lut(&ctx->hw, SSPP_DANGER_LUT, - test_bit(DPU_SSPP_QOS_8LVL, &ctx->cap->features), + ctx->mdss_ver->core_major_ver >=3D 4, cfg); } =20 @@ -703,6 +703,9 @@ struct dpu_hw_sspp *dpu_hw_sspp_init(struct drm_device = *dev, hw_pipe->ubwc =3D mdss_data; hw_pipe->idx =3D cfg->id; hw_pipe->cap =3D cfg; + + hw_pipe->mdss_ver =3D mdss_rev; + _setup_layer_ops(hw_pipe, hw_pipe->cap->features, mdss_rev); =20 return hw_pipe; diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_sspp.h b/drivers/gpu/drm/= msm/disp/dpu1/dpu_hw_sspp.h index 56a0edf2a57c6dcef7cddf4a1bcd6f6df5ad60f6..ed90e78d178a497ae7e2dc12b09= a37c8a3f79621 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_sspp.h +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_sspp.h @@ -314,6 +314,8 @@ struct dpu_hw_sspp { enum dpu_sspp idx; const struct dpu_sspp_cfg *cap; =20 + const struct dpu_mdss_version *mdss_ver; + /* Ops */ struct dpu_hw_sspp_ops ops; }; --=20 2.39.5 From nobody Sun Feb 8 09:32:35 2026 Received: from mx0b-0031df01.pphosted.com (mx0b-0031df01.pphosted.com [205.220.180.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 AFE43242D71 for ; Thu, 24 Apr 2025 09:31:18 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=205.220.180.131 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745487080; cv=none; b=VyG+89+N7zBRW7iKdmwAW3rBXo7Jj8A2p9qmvlJtzpz2HUH4gxkQvlHCkMTopgCStIg5iOm7lGa2kvfScqCiCfj9FikD5Ju/hdXlFdbGrK82AKvBivrpeXY656ocOxWifBkqCo83Ew2EZ0O19VORdkHuOd1OhZdN7+6xlod3QfY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745487080; c=relaxed/simple; bh=WHnH4u7CToI9+YcbwmPKzSr4/S0NqPJ62h/AKSWsURU=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=BtY+2kFs48Y3hzaISwdNyJyQjw+my6IsnSUh4PwvTLbsUrd+UmMcJJrN3hHf5NA2ouS69aAOJFy2IEKPryB38URXOgfh1xjU+sBi4p+7K/GPNBc0NkhvMmp+ov66z87ZlG3V0yHeGNblnzdEmY88wAyqYiL5YyUXMaF+zFYlVTQ= 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=lU1fROQD; arc=none smtp.client-ip=205.220.180.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="lU1fROQD" Received: from pps.filterd (m0279872.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 53O0FoUZ007114 for ; Thu, 24 Apr 2025 09:31:17 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= nMj4nXb+FNu6Q2Juv9wtWeinh7kszmTJRVSM9T4R8Nc=; b=lU1fROQD7IA0YtY/ PVDZZzpgrSfPXrqoOmJjOkMNPX+2GY2ZmoSFjgXQOJFQccsA+BmgvevLw6CXBBjY gXmjkhU8yzf+wjBGwBPYz4l+HwbiYmy+5XX3YxLCU1DPX0C+HLkR+dl3LnLR7NZ4 plxlDKkECNxT02/qaU9Uyx6GR2EebEv1Hneo6Fw+JjGAiYDJ4kN31BBB7GyA3X97 qMdDCLdF2nDUy+POGik2xnSzrrtMGt40K9MviT/ZmdzC3KBBrHl9YRAkhA+lygo6 0nyIJzVhVIEe3UUD98inH6VbViEue9nV22GaJoru1lyoMd5bpxtSv13lNx75gQ06 /5J2yg== Received: from mail-qv1-f72.google.com (mail-qv1-f72.google.com [209.85.219.72]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 466jh05079-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Thu, 24 Apr 2025 09:31:17 +0000 (GMT) Received: by mail-qv1-f72.google.com with SMTP id 6a1803df08f44-6eb2480028cso13601576d6.3 for ; Thu, 24 Apr 2025 02:31:17 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1745487077; x=1746091877; 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=nMj4nXb+FNu6Q2Juv9wtWeinh7kszmTJRVSM9T4R8Nc=; b=C45t5DulqaQagm8MLNtYfWAB3II/8hibbpXMmZr8OGs3vcjGEj67hcAqPNyhDMPfql E+zlIbJh/w2IdGgjc3mF0GYI2m+q+vFnUjSOV/B4ozR9XlhraEyuzxeozJcoyi9Rwa+S 4r+RyHOc+Y9VIP+Dp7DeV2ChEaA3rMupIBLG6FUe+LD9DS2cbMcFO2H7iCr/7JWbhhFx BwgpHzlOh04kNWdoOwLQaAEINOWMAGNv7jEPQJeCf8u2wkfGhwHvphrfqdFMUagvxMo6 K/fv6DAd9EOu2JW+51ppUaUnfsBf0yxQmxfGdrPMubHtEbWC5BKJ8A7J3alQHLe6Nxlt ir1A== X-Forwarded-Encrypted: i=1; AJvYcCW/ZtqJKsktyLjXVDba6KWAtwGtvwq2ALE4HSjKFrYGKCOjw5OimJ39SgunQy0tmqkAagU+nbBXvmjpd7k=@vger.kernel.org X-Gm-Message-State: AOJu0YzQX0gj0cYmJ2vimQWMe8+4cI9V9XdJ3m8MjtaPA5F1r0Cz6W1z wKcH1KursneKdJXbiFlk4F0NgT/JULd//FWlJiBCuPzZNnd7hXNk09Uv67EjNa6KPRrU/YZMrOb 9b/CzPR6/G9rC6QSF/fXk59i5JUs2sH/6aV83FKyfmijSo55sXdMESkmPbjs9ejA= X-Gm-Gg: ASbGnctzj7FCzvs3aO0tc50jTEtP3aDl34Ov83Ss29jUxNgFjZhtsnnuOB+f3betAC1 wuoLyMdg0xW/as1WAE6vmdbtIzh6jQym1WfEQQeymr2hlj3hG3+RimQ1CKGN/zRaO7aI8eykrh2 l7cW3jIKsxxro64D4zlZ+qsleg5B5ejeJ34Lik+YMEkFHGsaTUiY0ady7/hjz/8cBQogw9QOeKe lumqZlMSUmP+PcRpV/KwNcGmI+aVMOl2pDDVb4X+RXE6lMjMohmUJALsk0sWg9qlNWGSFni6kPP SlwUZaznPpjmHMsoPP2VL/mZlUQpzi+ddbVdk44JnWQWSb9IoFIYWRijGfQr4bKg4QY4+jdLov0 YCiFLRXZhWOt1CXnD/6+e92LA X-Received: by 2002:ad4:5d6c:0:b0:6e4:3ddc:5d33 with SMTP id 6a1803df08f44-6f4bfbcff8cmr27765656d6.13.1745487076966; Thu, 24 Apr 2025 02:31:16 -0700 (PDT) X-Google-Smtp-Source: AGHT+IH1W5a+5gc6B7AlIvLZnfYHMfxB9iNdzMWs0zrgULP7xrYOYblEfMRe+GXwsC4GjPCz78vlVQ== X-Received: by 2002:ad4:5d6c:0:b0:6e4:3ddc:5d33 with SMTP id 6a1803df08f44-6f4bfbcff8cmr27765316d6.13.1745487076645; Thu, 24 Apr 2025 02:31:16 -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 38308e7fff4ca-317d1b9a304sm1820461fa.99.2025.04.24.02.31.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 24 Apr 2025 02:31:15 -0700 (PDT) From: Dmitry Baryshkov Date: Thu, 24 Apr 2025 12:30:31 +0300 Subject: [PATCH v3 27/33] drm/msm/dpu: drop unused MDP TOP features 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: <20250424-dpu-drop-features-v3-27-cdaca81d356f@oss.qualcomm.com> References: <20250424-dpu-drop-features-v3-0-cdaca81d356f@oss.qualcomm.com> In-Reply-To: <20250424-dpu-drop-features-v3-0-cdaca81d356f@oss.qualcomm.com> To: Rob Clark , Abhinav Kumar , Sean Paul , Marijn Suijten , David Airlie , Simona Vetter , Vinod Koul , Konrad Dybcio Cc: 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=1025; i=dmitry.baryshkov@oss.qualcomm.com; h=from:subject:message-id; bh=Rp2b7HkiPFY5uR85fuuwlCMt0ynxuJbG+1cuM8N4RUw=; b=owEBbQGS/pANAwAKAYs8ij4CKSjVAcsmYgBoCgSwjwuCAQPtAtKCggMXBPwUBGbkT7v7GHf+a Z9r2u+vdYWJATMEAAEKAB0WIQRMcISVXLJjVvC4lX+LPIo+Aiko1QUCaAoEsAAKCRCLPIo+Aiko 1YWgCACFeezcUqdWJOjr5b9efrq41SoCRN+Gl3gbB3ibrA7vRHOKAhyutBCN0y/vk2IOE2GRDzC qkud11KikADnf22r+/abp0uHrRWrLvISbb9aHl3QLsy79fH2HgN1kxYqhLpvx/udJTnqARkyAmW sJXnmAKArZllViW/LmxbDDJFHNy3GwT4PXvanCV5a05EQDmPu8ArtgpagqAauykLpJbhnKTtt3m 3AsKQj6T5dpauSOMmC03gTNpc2gXuzi2r02mPVECpfz9hnsvbGvpf8yOJkIBqJlbR/BNRoeEsgf SohlW13/BA3b04T0rthak5t+q76AbJ6J0jhPZCcKytBiuQHE X-Developer-Key: i=dmitry.baryshkov@oss.qualcomm.com; a=openpgp; fpr=8F88381DD5C873E4AE487DA5199BF1243632046A X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUwNDI0MDA2MyBTYWx0ZWRfX20tAHZXQHk/Q QgseKW5Iq10RQlWiBO+NM+cy4NJ5fRErPECTNSl9hY3mRbZ7j61jSKZh8YteFjrbyTMW1sx1sp0 o/PJEtwrdikQgyHIoKpVUJl9WJq5CY1vU0HaatyeQmkeDGf35yzEIktfFxikM/WQCwg33LLa7dn 2zqigwTT5Vo42zNu70xndtoLHR0igK5tYbO5Ko1/Ch1OLPxN3OMNuXzqA6ZTbYsao5DP4ETSo+X YBmiGJcnIFHsUMvSYgM6tu+ay8Z5dEndR6bJldC0RLxxGIhPmycAeSPYo1uVrJXyENRUgOTSwID 0/aa3FPKq3+YiO105ZJFMpSGW80neiaiyh1JfhIQtCgBb90ak0+dozT7eR/GkWR4sThR0YJ84gH L1fX4mtfqVBGdCPPCKL7jsb9ouW0Q5aOqIokYNeL5kXU1FrMdcGRuQ5YQifhAWlxY2Nen4VY X-Proofpoint-GUID: si2_rc-ncfy-XzmKkh7-kxZP1a_GDXBw X-Authority-Analysis: v=2.4 cv=ZuTtK87G c=1 sm=1 tr=0 ts=680a04e5 cx=c_pps a=7E5Bxpl4vBhpaufnMqZlrw==:117 a=xqWC_Br6kY4A:10 a=IkcTkHD0fZMA:10 a=XR8D0OoHHMoA:10 a=KKAkSRfTAAAA:8 a=8brcGD95nZB0FecW0AkA:9 a=QEXdDO2ut3YA:10 a=pJ04lnu7RYOZP9TFuWaZ:22 a=cvBusfyB2V15izCimMoJ:22 X-Proofpoint-ORIG-GUID: si2_rc-ncfy-XzmKkh7-kxZP1a_GDXBw X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1099,Hydra:6.0.680,FMLib:17.12.80.40 definitions=2025-04-24_04,2025-04-22_01,2025-02-21_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 phishscore=0 clxscore=1015 impostorscore=0 bulkscore=0 mlxscore=0 adultscore=0 lowpriorityscore=0 mlxlogscore=726 priorityscore=1501 malwarescore=0 suspectscore=0 spamscore=0 classifier=spam authscore=0 authtc=n/a authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.19.0-2504070000 definitions=main-2504240063 From: Dmitry Baryshkov Drop unused MDP TOP features from the current codebase. Signed-off-by: Dmitry Baryshkov --- drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.h | 13 ------------- 1 file changed, 13 deletions(-) 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 01763e0bf1359527b0c441ca36b27264dad636c0..4b6af58429361c49b71f6067dce= 8ca1daa6493fa 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.h +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.h @@ -28,19 +28,6 @@ =20 #define MAX_XIN_COUNT 16 =20 -/** - * MDP TOP BLOCK features - * @DPU_MDP_PANIC_PER_PIPE Panic configuration needs to be done per pipe - * @DPU_MDP_10BIT_SUPPORT, Chipset supports 10 bit pixel formats - * @DPU_MDP_MAX Maximum value - - */ -enum { - DPU_MDP_PANIC_PER_PIPE =3D 0x1, - DPU_MDP_10BIT_SUPPORT, - DPU_MDP_MAX -}; - /** * SSPP sub-blocks/features * @DPU_SSPP_SCALER_QSEED2, QSEED2 algorithm support --=20 2.39.5 From nobody Sun Feb 8 09:32:35 2026 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 8EE6722172A for ; Thu, 24 Apr 2025 09:31:20 +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=1745487082; cv=none; b=kXZHVKaJgnGhcPHcUUp2xgKadJvgM2GEK7gCKyr867fiw48PGtoHH0KzlV9e1UxTiIdAm9fMwD1FXxoKfe3iF9kRhuyBdYBc7bNQKlZKHULhZ/eknYz9kUKlaAC4lcdMA8nWDdp4YI/gBHa4GhdDYU7HLi3DXWFaq5WZsJlu4oQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745487082; c=relaxed/simple; bh=ApjXnJBfnxHVUl1P/UJxaGGxoUQvDBdH22X4bA3YQkE=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=YIq+wq3UCd2wpOrzy5qzSZNWPITGmRfYROB40zfAxEj2KHyNSOGYuNXXz44tpjriGcuYc60pWA88U16R0wDm8GRCVA2FvT3GCDq2x7TdXLythdf2U0W7vUd64BCe/L6X5oRjeleu3Id9Y0qpimgVIBZwe3GtqHFHRqZuWVy/Fqw= 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=hZqz9OHS; 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="hZqz9OHS" Received: from pps.filterd (m0279865.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 53O0F6ml007512 for ; Thu, 24 Apr 2025 09:31:20 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= TL9IohemaggxE/oPMb+lGwcuNbosvCvTrU7VBUuq6Y4=; b=hZqz9OHSEoSEbQIP ifBwB5Jw3jDZSSd/oWBRIankQxMLuxny2lmsGB6BD0lPYLXixdEOtE0z3PjqYo2/ v2+84TebJLHg+oWpuqz2elK5C3WEkLdltEb3USMG7PdqzvArCmNl51GKmkI2vR40 MW4sF6zY6U3sUUvL2L1da7ruYuJJ1aE9uIcryEvsYQnNX5LjG/iQ0WTzAjlyIo9B I9ZfsaynQgXUrcZIWR+h6u3Gk4l2jZgGCqvlaydel+A3KxRAAqYViPdImvJN9wca aOdivtmcS5Z+qTr4XWHgiAVQg2WdT0V3gv3jt91Qr0lSsz8dgqDd1BvSj1Ppr52Q /X7c+Q== Received: from mail-qv1-f71.google.com (mail-qv1-f71.google.com [209.85.219.71]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 466jh1mysy-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Thu, 24 Apr 2025 09:31:19 +0000 (GMT) Received: by mail-qv1-f71.google.com with SMTP id 6a1803df08f44-6eb2480028cso13601846d6.3 for ; Thu, 24 Apr 2025 02:31:19 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1745487078; x=1746091878; 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=TL9IohemaggxE/oPMb+lGwcuNbosvCvTrU7VBUuq6Y4=; b=pEeXTWvISbzRYMOsijZ+pgBmKH9GZFs83f45XkfTp6fqo1TeyYgWmu+IRntU+4Cl0/ 4wMXg5ezoOIbdOtD2FMiv4+NSbOcPACwovEPuirwpghScump3cdrGM2XZ+U3U82jXgk8 cBTmt/Y3L67i1CGRJJNtrQ5N+S2w4PE1eSNTKdQxhrfaPRPLga3uy0Zvy0ZBc9HvOb49 xzD3lEIj9SwyGlLQS+Rg2tnBivhiAyO/qwSAfSelfHVU9daNKfRchwnd5WC6i321Qs5/ Utkjo5K5U4/RRkp9V+5Cv+tLZ63rWniCF+z2hsDPB0DvT5Mnw0k2zkuE03JgK+rAw9kr z3PQ== X-Forwarded-Encrypted: i=1; AJvYcCXTluC10vfLF9qYwIZRXL5Y0OZUMWdmzmGwRjI93kpgA330yUvTcI9JMUe/vKXt6rsPzM9/yM2nwLdDrj8=@vger.kernel.org X-Gm-Message-State: AOJu0Ywf+hV9Hl2QS0l8mIG56axy98Uuhjk7lysL+KUBYGLZhdrAUiTZ Y1GCytEQEcnDgM1zF9C4hAWz9RGcr/hi169jsZPKZ07i9b0G+u4XHB/zoobYPmwcXnIg2frfwsN qFiuDaKV6Xrsa3D5SFe+/a1W5edn8kYPrhnNWrEJJNwfTTuFeuX3jyagTuL8GUX4= X-Gm-Gg: ASbGncv5c0GWXkeqOk2X3+KrwSNw8jKjftXjtxifAMRGvPnm651cowRzkKvigFo3nlA ajCiJx98NU5EDIJXUa/DJ7hELjfgJoz5VNOBvn5B8aqJJ9HNcstJC0hKZWnZjB/+JIX8wY3aPYf RtOjJl4Ps5+bLeLZsRMzZQK/CoL98iCmz+Q72FhHtowBKuE/ZjDI8EpIdynyIr1B3SDueVdgsXd CR2cb9QhEt9jJ5zTxPvmpPuEoopMFBbkcQAwBd3aiNVX/S5W52RDefLrd2iM9Evhvu0xbGMQTK5 dpMNAMgvJqPSocyF8sd84MOD4RJ38PhjFmn2SC5M7cK4mN1g5AzFdAklPRnAvP509w4ZPxK4727 VEWqBz2KhCbbC8jfBG+OXHoyY X-Received: by 2002:a05:6214:518c:b0:6e6:65a6:79a4 with SMTP id 6a1803df08f44-6f4bfc85415mr28111096d6.44.1745487078410; Thu, 24 Apr 2025 02:31:18 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHc7eD4luaXza3qktsi5L36/1bV1AhI7q+ALQ71WdGsi+GS/QTNj6mqkRAi4hBHWhJeZ8os0Q== X-Received: by 2002:a05:6214:518c:b0:6e6:65a6:79a4 with SMTP id 6a1803df08f44-6f4bfc85415mr28110676d6.44.1745487077932; Thu, 24 Apr 2025 02:31:17 -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 38308e7fff4ca-317d1b9a304sm1820461fa.99.2025.04.24.02.31.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 24 Apr 2025 02:31:17 -0700 (PDT) From: Dmitry Baryshkov Date: Thu, 24 Apr 2025 12:30:32 +0300 Subject: [PATCH v3 28/33] drm/msm/dpu: drop ununused PINGPONG features 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: <20250424-dpu-drop-features-v3-28-cdaca81d356f@oss.qualcomm.com> References: <20250424-dpu-drop-features-v3-0-cdaca81d356f@oss.qualcomm.com> In-Reply-To: <20250424-dpu-drop-features-v3-0-cdaca81d356f@oss.qualcomm.com> To: Rob Clark , Abhinav Kumar , Sean Paul , Marijn Suijten , David Airlie , Simona Vetter , Vinod Koul , Konrad Dybcio Cc: 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=6066; i=dmitry.baryshkov@oss.qualcomm.com; h=from:subject:message-id; bh=0Xucrl9p3RVanutrsrXG/AILscg4MPlsZPdz9DRUTfA=; b=owEBbQGS/pANAwAKAYs8ij4CKSjVAcsmYgBoCgSwyTrNj4d1e9F6CpB67cXEzRYs7VEhZfl8W eTHFyvd8g6JATMEAAEKAB0WIQRMcISVXLJjVvC4lX+LPIo+Aiko1QUCaAoEsAAKCRCLPIo+Aiko 1ZNfB/9iaYueFfz8QCVW8D2xKb5xWnzoYesnXm70L0TxaLdwRtSFbd/ajtTZ0mqLk9TJmq3sGgU Jzl4XahlCnZWpgF+iC1JmDaaOwaNKdBQWfVEizyeON2D47VvWCKRCkJ4CXC+7AZuMVJT1ZigeGR lWhMkYZu0a+w9z1Jpm02Zf4DpjGIq6Uj10LFS/I/yACBWyhUWXh5dD5DPuSGWPxObNA37BH8pVq aN5YKcI1l0yh9D2R4OxOty9C/RkPl0AgYMnxo7u2oMxeyFzpVm2PcTxbv4RTBwXS0JXy/T91lmJ vBTtjAWDlZWUro3J26bDeNWtS3TbfuCZ3R6LdBi2iwOAP3Si X-Developer-Key: i=dmitry.baryshkov@oss.qualcomm.com; a=openpgp; fpr=8F88381DD5C873E4AE487DA5199BF1243632046A X-Proofpoint-GUID: OlCXm-AKKEEohiRyzzNYyu7-2Fo_gZPK X-Proofpoint-ORIG-GUID: OlCXm-AKKEEohiRyzzNYyu7-2Fo_gZPK X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUwNDI0MDA2MyBTYWx0ZWRfXxt8nGaD9ixVW GbEdPtxK72V2BTs/ViYdzboW1jukXuGFNHgzrW6cJa2rjZhI39f4Ay/1Wz4o0CDZRlrJ26U9RrF 9H52o+WYY9JHXCeeQaORWqmGPOIntlpKti8RQp9BrzpsMSBlG0ZWWwJGf5iy/x+gCinHdZR3G2n E5Gwaoztl79CshBYNLqJTw3puXtGC1SnyhO53tebw3vmoWh54NXZA/Yq29SXMFow+/cCLjNXLFu blePrvavl7HLOLRMsQ+S1xzTXbr7fBAVYq8I2cjBKQemiIsSYbTnTMNgcZG/JMRvi7KZZ4EnqJX mdRJPLjGuJ535ulOfqM1RbpZEbHWMAcnqX51eDTjCUAcV8c0v5A4UQoupELd1XV+5c1M3heWLi3 ijq3h1vUBZ3yBQ96TPBOBOYiF32Uvyesvu+lOOzVb9o+n3brHPacDK14iw8mymqeP1NqbW6t X-Authority-Analysis: v=2.4 cv=ZpjtK87G c=1 sm=1 tr=0 ts=680a04e7 cx=c_pps a=UgVkIMxJMSkC9lv97toC5g==:117 a=xqWC_Br6kY4A:10 a=IkcTkHD0fZMA:10 a=XR8D0OoHHMoA:10 a=KKAkSRfTAAAA:8 a=BKnecdA5F2l9gEOK9gkA:9 a=QEXdDO2ut3YA:10 a=1HOtulTD9v-eNWfpl4qZ:22 a=cvBusfyB2V15izCimMoJ:22 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1099,Hydra:6.0.680,FMLib:17.12.80.40 definitions=2025-04-24_04,2025-04-22_01,2025-02-21_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 adultscore=0 malwarescore=0 lowpriorityscore=0 priorityscore=1501 phishscore=0 clxscore=1015 bulkscore=0 suspectscore=0 mlxlogscore=773 spamscore=0 impostorscore=0 mlxscore=0 classifier=spam authscore=0 authtc=n/a authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.19.0-2504070000 definitions=main-2504240063 From: Dmitry Baryshkov The DPU_PINGPONG_TE2 is unused by the current code (and can further be replaced by the checking for the te2 sblk presense). Other feature bits are completely unused. Drop them from the current codebase. Signed-off-by: Dmitry Baryshkov --- drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_1_7_msm8996.h | 2 -- drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_3_0_msm8998.h | 2 -- drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_3_2_sdm660.h | 2 -- drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_3_3_sdm630.h | 1 - drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_4_0_sdm845.h | 2 -- drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.h | 14 -------------- 6 files changed, 23 deletions(-) diff --git a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_1_7_msm8996.h b/driv= ers/gpu/drm/msm/disp/dpu1/catalog/dpu_1_7_msm8996.h index 436fa56e2ba2d867b58b59ec6b02d1d0f396c23b..7f606be1f79fe83568b467c47e7= 280537f1ce091 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 @@ -180,14 +180,12 @@ static const struct dpu_pingpong_cfg msm8996_pp[] =3D= { { .name =3D "pingpong_0", .id =3D PINGPONG_0, .base =3D 0x70000, .len =3D 0xd4, - .features =3D BIT(DPU_PINGPONG_TE2), .sblk =3D &msm8996_pp_sblk_te, .intr_done =3D DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 8), .intr_rdptr =3D DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 12), }, { .name =3D "pingpong_1", .id =3D PINGPONG_1, .base =3D 0x70800, .len =3D 0xd4, - .features =3D BIT(DPU_PINGPONG_TE2), .sblk =3D &msm8996_pp_sblk_te, .intr_done =3D DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 9), .intr_rdptr =3D DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 13), diff --git a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_3_0_msm8998.h b/driv= ers/gpu/drm/msm/disp/dpu1/catalog/dpu_3_0_msm8998.h index 38cdea019bf2b1391c242953e4c67d9dc4c2274c..a10ca16d2d63d8b6e2e2165dcd4= bf0cf915f8e3d 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 @@ -169,14 +169,12 @@ static const struct dpu_pingpong_cfg msm8998_pp[] =3D= { { .name =3D "pingpong_0", .id =3D PINGPONG_0, .base =3D 0x70000, .len =3D 0xd4, - .features =3D BIT(DPU_PINGPONG_TE2), .sblk =3D &sdm845_pp_sblk_te, .intr_done =3D DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 8), .intr_rdptr =3D DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 12), }, { .name =3D "pingpong_1", .id =3D PINGPONG_1, .base =3D 0x70800, .len =3D 0xd4, - .features =3D BIT(DPU_PINGPONG_TE2), .sblk =3D &sdm845_pp_sblk_te, .intr_done =3D DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 9), .intr_rdptr =3D DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 13), diff --git a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_3_2_sdm660.h b/drive= rs/gpu/drm/msm/disp/dpu1/catalog/dpu_3_2_sdm660.h index 176640bff1214e89606286ce572f74300f6f343f..c1fc91b3f6f85af18cf6a6c1690= ec69074fc3545 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 @@ -140,14 +140,12 @@ static const struct dpu_pingpong_cfg sdm660_pp[] =3D { { .name =3D "pingpong_0", .id =3D PINGPONG_0, .base =3D 0x70000, .len =3D 0xd4, - .features =3D BIT(DPU_PINGPONG_TE2), .sblk =3D &sdm845_pp_sblk_te, .intr_done =3D DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 8), .intr_rdptr =3D DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 12), }, { .name =3D "pingpong_1", .id =3D PINGPONG_1, .base =3D 0x70800, .len =3D 0xd4, - .features =3D BIT(DPU_PINGPONG_TE2), .sblk =3D &sdm845_pp_sblk_te, .intr_done =3D DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 9), .intr_rdptr =3D DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 13), diff --git a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_3_3_sdm630.h b/drive= rs/gpu/drm/msm/disp/dpu1/catalog/dpu_3_3_sdm630.h index e6eb95173cfef2a52f5dc606ca41a2f1f5650c2c..65975e7ebd9ba1970b48d8753a8= 7835677d58df7 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 @@ -114,7 +114,6 @@ static const struct dpu_pingpong_cfg sdm630_pp[] =3D { { .name =3D "pingpong_0", .id =3D PINGPONG_0, .base =3D 0x70000, .len =3D 0xd4, - .features =3D BIT(DPU_PINGPONG_TE2), .sblk =3D &sdm845_pp_sblk_te, .intr_done =3D DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 8), .intr_rdptr =3D DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 12), 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 21264184566493ab4e356a4e0c032ee7780cabff..8d5b7033f12f740fe7b9226e93f= cece8ed54b890 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 @@ -189,14 +189,12 @@ static const struct dpu_pingpong_cfg sdm845_pp[] =3D { { .name =3D "pingpong_0", .id =3D PINGPONG_0, .base =3D 0x70000, .len =3D 0xd4, - .features =3D BIT(DPU_PINGPONG_TE2), .sblk =3D &sdm845_pp_sblk_te, .intr_done =3D DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 8), .intr_rdptr =3D DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 12), }, { .name =3D "pingpong_1", .id =3D PINGPONG_1, .base =3D 0x70800, .len =3D 0xd4, - .features =3D BIT(DPU_PINGPONG_TE2), .sblk =3D &sdm845_pp_sblk_te, .intr_done =3D DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 9), .intr_rdptr =3D DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 13), 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 4b6af58429361c49b71f6067dce8ca1daa6493fa..5eeb693f0e282da2aa0e5a729ae= d1bc8573639dd 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.h +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.h @@ -87,20 +87,6 @@ enum { DPU_DSPP_MAX }; =20 -/** - * 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_MAX - */ -enum { - DPU_PINGPONG_TE2 =3D 0x1, - DPU_PINGPONG_SPLIT, - DPU_PINGPONG_SLAVE, - DPU_PINGPONG_MAX -}; - /** * CTL sub-blocks * @DPU_CTL_SPLIT_DISPLAY: CTL supports video mode split display --=20 2.39.5 From nobody Sun Feb 8 09:32:35 2026 Received: from mx0b-0031df01.pphosted.com (mx0b-0031df01.pphosted.com [205.220.180.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 5D164243370 for ; Thu, 24 Apr 2025 09:31:21 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=205.220.180.131 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745487083; cv=none; b=n88i6h+hB5IgY/GezBBxCS9En0nJysXze76CsZhAbKB2xjGX1e9a/mVE8JVJ7tSYg2bGZui+0kKXM6movOOTG5HQKfQ2rLJm9VAxRksllj+L6qcPeA9utgGBABISlMahJP0/QkHBI7RdO8DqUzQy7uOljWZIXxtmJBwu6poB0JE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745487083; c=relaxed/simple; bh=EOew3V4JYVhVMdQInPFFVrZz3IRvBkcsmIxIux5GuyI=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=nV+MBL2DYPsExjgCodVNWsaMxVwAUr6SkTj5dDqGBSWhxxtr1DZ0zKq0l1lYofbhoRG7Yh0zgrfjOdW+glMsXmvrfTJVBRAArpt/OC257VTsEB5clisAS7DSDeVwOnwCxk+ePZKufhuT54oh/E5mJbvZupuEKYi3BTqbgXkvL6M= 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=SaVLz3H9; arc=none smtp.client-ip=205.220.180.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="SaVLz3H9" Received: from pps.filterd (m0279870.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 53O0F96w031009 for ; Thu, 24 Apr 2025 09:31:20 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= iadpP33b3pKWja89qUIoquaVWcv2b3FF6P2FfM+kWzc=; b=SaVLz3H9YNZvZQHP dxxMBesa2pjVqluPd4V2R8eEjYELRIYPftpyCOxCiBKa149pBlhdYemtu3AXr+7B C3YRJoMNaPYngcfXdxRwsxbfF5Az7io+LthliGnQdLfaGN6Nr/St2IYj4J+QA2yO wdEU3vBX5D8opv5Vsbir6clATT+3MdTj5I8WmRTxEayOSyhFhC38tmMf0bEjlrSY h4k6OtS+w26jNQWTa3HDilvu2iUSDtga7pupp4cn+eUQGGYr8KTjV3YfV5eGCZop nj3jrFgXqBM/J0HpfiNRWvGzMjyFbRuTU2mxDeDT+exVADx1vphMulwjXlZ/+xiB i7uapQ== Received: from mail-qk1-f197.google.com (mail-qk1-f197.google.com [209.85.222.197]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 466jh5d03j-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Thu, 24 Apr 2025 09:31:20 +0000 (GMT) Received: by mail-qk1-f197.google.com with SMTP id af79cd13be357-7c5b9333642so105316785a.3 for ; Thu, 24 Apr 2025 02:31:20 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1745487079; x=1746091879; 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=iadpP33b3pKWja89qUIoquaVWcv2b3FF6P2FfM+kWzc=; b=EQExORaotVGmAIGW9ngbMi+bwNISzWvQ2JSg33DQ8h/EWL+Bmt9AfhGblSlCD2RATL EzXmB1+i9UD0zhhC0IYuNP786xUkghwKibP/fxCI0TkG5v1doLtZgfjhIIRa6oND9aCG QRtoPVZf8zRdcFakxj9yzhO2Qs6ngHvHxM42pZU6BKXxItmSKUnEsdbeUKCLJDzkzkWK PAH+gBspj66Ua/xkiHccqaWCJmxiCiB0DDkRNfmA218zv0jHwAu20muIKo1wQTvSxBpf 6+VxWNk4DXI5FWJYUU1VmRQceryWdxIS3fyVtcUrMBqOj6uvMY3gTAgwyTkg2gmMxP1z wa3w== X-Forwarded-Encrypted: i=1; AJvYcCVUFXRKt5rxOspX8WJHULVaIJYnFhNNhzgrgTD9XFedw3X5SPGr/HHDDciZkxHirBotolwLb24ZnBzIz5I=@vger.kernel.org X-Gm-Message-State: AOJu0YwSM2/hrmMujC49JXIBUcWDINcq5qauALOn5P7W/0IzSuYRF9jU jTpHTInincVYTLrIoXFptpWowZWhxeSLAZMhxjUyC8nAAI4uM/ylfbBogNz7zUZrgldIA9x1Oox 7FbfKuxnjuwSO+n0uKkXbjzMZ780NNZ9tnLV+4xEj4RiZUoP0MDoyDzDXNm/x+63LqvfENc0= X-Gm-Gg: ASbGncsIY8/6TfSLjNCeaqYSlzV+ehf5oAfL/DZYiSkASV1uaWoXwEyBPWC/P9d6Url nNSMCn7fzVYBCDygRJOe+KyW9qJ/S3LoipHX3AnM/WGW35BlC/E82SqEg/lAzfIeh5+Tb4/mr5n mAELlPPzDkZZPtE+tlaRRvfXn0BebRPPKBQNM/Rx08K5H11ipX+74oWwbPLWLg1LuXTV734GwhS 9DDMkRabhtkPeGurqe2NiwR08Icqy0Ls90TcYimF9B0l7tWQcOIlUtknT+WgHmsc3LiOF/7k3E0 zwaDUH1onepzw+iuZaSnLh68sWrXtpA/lFvCF6lDnNljlVfIa1mb3VQWUfEOacAj/lsOFVsKQKT 1MD/Dn8biEc//TF4F7mFo46o5 X-Received: by 2002:a05:620a:4496:b0:7c0:9f12:2b7e with SMTP id af79cd13be357-7c956e7db71mr265476885a.11.1745487079437; Thu, 24 Apr 2025 02:31:19 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHA8sHYulZcantfqMVMskWIoIphoholS9WfHpqT1Qyz8n0LX/T8AiyVMCBqc1zdHp5HweR7KQ== X-Received: by 2002:a05:620a:4496:b0:7c0:9f12:2b7e with SMTP id af79cd13be357-7c956e7db71mr265474285a.11.1745487079073; Thu, 24 Apr 2025 02:31:19 -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 38308e7fff4ca-317d1b9a304sm1820461fa.99.2025.04.24.02.31.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 24 Apr 2025 02:31:18 -0700 (PDT) From: Dmitry Baryshkov Date: Thu, 24 Apr 2025 12:30:33 +0300 Subject: [PATCH v3 29/33] drm/msm/dpu: drop ununused MIXER features 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: <20250424-dpu-drop-features-v3-29-cdaca81d356f@oss.qualcomm.com> References: <20250424-dpu-drop-features-v3-0-cdaca81d356f@oss.qualcomm.com> In-Reply-To: <20250424-dpu-drop-features-v3-0-cdaca81d356f@oss.qualcomm.com> To: Rob Clark , Abhinav Kumar , Sean Paul , Marijn Suijten , David Airlie , Simona Vetter , Vinod Koul , Konrad Dybcio Cc: 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=1050; i=dmitry.baryshkov@oss.qualcomm.com; h=from:subject:message-id; bh=oq1wDHFI9F1rM8Vg4jlGeQy7++4ktlgP1SkYjPIrj9c=; b=owEBbQGS/pANAwAKAYs8ij4CKSjVAcsmYgBoCgSw1nFfmM68OEYBTdCxJ48gqfCba+CQGJERe /OMrX4eE3eJATMEAAEKAB0WIQRMcISVXLJjVvC4lX+LPIo+Aiko1QUCaAoEsAAKCRCLPIo+Aiko 1QLQB/sFaBLqJ+zpLBU3UkfkDppxLIHVuMH7MRE1x9FVYciK570/QBvg+qkCHb5d8MQ5rBkvz9T NGEkbP/z75m75O30kd251apwYzRvSGC4lRmvstIkd7NXUueWRyoEtATP5cD4spbU2D8azGVV3sg YbRb1MwgW/n5tJ9gnbyl8BIYBFnzkQFnkTUmS7XnXUdWIkv7YD0tLbI8Nr2KzUl4jRLwl295K9Z FRd4UvPkKhmOozWy0m6ecvUa6RLApgHXBPmT+qLPcOx6/lHiNESr36Sd7tZM5/2jbB+e9EvQU3y S2Yvq8oTs4fl2WbD9d7gyPMXyr6Iv8sj01NBkAdHwIcPaKr4 X-Developer-Key: i=dmitry.baryshkov@oss.qualcomm.com; a=openpgp; fpr=8F88381DD5C873E4AE487DA5199BF1243632046A X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUwNDI0MDA2MyBTYWx0ZWRfX4lE/q3Srpy3w nxHPmOIWhkS46zqZCu4SJYE/ifit2mk6VQ6DpfqKb9XMZ/XKKw1vLVWXffGvr6QjrzfZwrMtUi5 wXwKd6AGjdHB+1Y4+p+EYCgfBFNE4/VS2b2/rpLV6suPVWC0/aI8kbUKIPoS6jEN/tkpO68h2to J2gJyFzYaMXqdRWdpY6o6cAcxC40fSTQzPLqBS1QE4XsCxlokuNHo5L1r8t9785Rslb9Gbl7C/E 00uUbN7BhqOynYNGMHZk3nfGDxXUY/FgypnQ0QKn/duzvaNYjgemw8mLhCFFGGR6Tpx/M057A8B 9p7bXKvRPA1c3WDLjOgvk5N1/e8KCpIAMF2dsDx9EigFS3y1Qg1hh9XoV/cVeDxLgNIY6Ln7Uw4 5xdQITWlDsPlPaFOfNwiRF5elqeA296X4CvYO+0Cd0AYIuLB3hFpN43E/mwDEvgqiVV1ym/n X-Proofpoint-GUID: XYb9k2hGbRwfNVVgfGmWDrHgROKurKXK X-Authority-Analysis: v=2.4 cv=B/S50PtM c=1 sm=1 tr=0 ts=680a04e8 cx=c_pps a=50t2pK5VMbmlHzFWWp8p/g==:117 a=xqWC_Br6kY4A:10 a=IkcTkHD0fZMA:10 a=XR8D0OoHHMoA:10 a=KKAkSRfTAAAA:8 a=87smWpNc5u_ETeg062IA:9 a=QEXdDO2ut3YA:10 a=IoWCM6iH3mJn3m4BftBB:22 a=cvBusfyB2V15izCimMoJ:22 X-Proofpoint-ORIG-GUID: XYb9k2hGbRwfNVVgfGmWDrHgROKurKXK X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1099,Hydra:6.0.680,FMLib:17.12.80.40 definitions=2025-04-24_04,2025-04-22_01,2025-02-21_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 adultscore=0 mlxlogscore=919 lowpriorityscore=0 bulkscore=0 impostorscore=0 suspectscore=0 mlxscore=0 priorityscore=1501 phishscore=0 malwarescore=0 spamscore=0 clxscore=1015 classifier=spam authscore=0 authtc=n/a authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.19.0-2504070000 definitions=main-2504240063 From: Dmitry Baryshkov Drop unused LM features from the current codebase. Signed-off-by: Dmitry Baryshkov --- drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.h | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) 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 5eeb693f0e282da2aa0e5a729aed1bc8573639dd..beffb92adf5d8a150e049811bf2= caa212dace1a6 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.h +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.h @@ -66,16 +66,12 @@ enum { =20 /* * MIXER sub-blocks/features - * @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_MIXER_MAX maximum value */ enum { - DPU_MIXER_LAYER =3D 0x1, - DPU_MIXER_SOURCESPLIT, - DPU_MIXER_GC, - DPU_MIXER_MAX + DPU_MIXER_SOURCESPLIT =3D 0x1, + DPU_MIXER_MAX, }; =20 /** --=20 2.39.5 From nobody Sun Feb 8 09:32:35 2026 Received: from mx0b-0031df01.pphosted.com (mx0b-0031df01.pphosted.com [205.220.180.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 18D33247280 for ; Thu, 24 Apr 2025 09:31:23 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=205.220.180.131 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745487088; cv=none; b=ThvFH5YP8oELBebz2k+5EHBpqpg8eb68amM0+oKUXw347XD8Ov/tshjz7ScNF/oIBUIpPSQ1ukym4i1RpPlLJWHnGmzFaGKcA5SVbZuaIIglQsGXtfEIb/28VDK+SDV8DQMDhAOpA67I2ClvgEoPX878gRDXFsHoFbFPKQiqBJI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745487088; c=relaxed/simple; bh=4Y+lugxBT9Q5ji4kje9jmmwUiuv4Vl7St29PXX/QWGY=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=imM7gkE5SdRN5jcQs+JxkByhNEfV/7/44T0iQTJ/LsMpE/BIElkqBD6Q8NSoUjMoNUtfmC9VXyRfP9xUidEuVLeGmcDVDvFJY0kd0odLgymfKpSwXRdTCGiVpsKSa1cGbJPhec9iqTXAGpS4Q151x/yaLaowfeFX2ajvHOwn+M4= 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=ZcMc504J; arc=none smtp.client-ip=205.220.180.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="ZcMc504J" Received: from pps.filterd (m0279872.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 53O0FBEh005976 for ; Thu, 24 Apr 2025 09:31:23 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= CTvivfFj86snxnhDWpggPaU2rs3LkEdWRUBSEWC7/ks=; b=ZcMc504J2YDPDoe6 zA73aWewELQOZRK9NEFvFwc385QiPW8UqrFCs+0JR5cg3f1IwHFQVIIRamjJTN9x vxG3eobywUXWs0BkpfUGZbnCV0US316JTzmUVfDr+WhS+azW77u1bTxB3FTKtFKW ztndLuL/2poRJT6OxlQNv31AQHPRHKCb/ixPNFON+C6XD8eUjCmmehr7FgBLEPx7 KznTWdaC+UzUM0Zso8ybVd/sKfJ5yBNbe+Ht9KbV18KCF1muNGZOPR0QfCN2SnGG met5p+C6Ufac+aAJCn4xj5jGLAbkmM9HsHV9/sIbGlvER//GM0e8k55Xgk11w83/ PRGAcA== 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 466jh0507x-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Thu, 24 Apr 2025 09:31:22 +0000 (GMT) Received: by mail-qk1-f198.google.com with SMTP id af79cd13be357-7c793d573b2so158475785a.1 for ; Thu, 24 Apr 2025 02:31:22 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1745487081; x=1746091881; 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=CTvivfFj86snxnhDWpggPaU2rs3LkEdWRUBSEWC7/ks=; b=spx76ryxehbROWqxBy8aKsD1cdkuTiyd6z1H/c04SxmtSRxcEh3K75fXTTIKRl2bkf eS+41HuKq5kGHHTzLO4qzsn6Yf3n/03L8wY+2pN4viy+lyMJzTBjrMCt4SEkJASFOzl/ MduT2ZLMqBdqkdjLSA2FrtS1/7+5rjPgEEH0Zk5nqvzQzRjTD5sCecicSMaXqr/9kNTU 0VafVnG8i11Zg3qc9QphxmndqSkgm3qodWtz2pFlCwvzuD+hjekgYEeTdatwOBrhyFUx EPdOoLGXjjb4tQCPZz7ctW/urrQPso1eNR2DUH5pvoTD56l2FyMGrYzTGgvOqeCa5M8t 9IXw== X-Forwarded-Encrypted: i=1; AJvYcCUoY0eVrNFXefD5ZRTrUrh2KDsOKi1/5vnLtarKDf5xCLpJEVYX4HNloZsXQySp0+kc1R+6Bn7dElpXmNQ=@vger.kernel.org X-Gm-Message-State: AOJu0YxGi8jyvNClRsexadbIEnDaA/GtsMw4bqlcqBxFtkRfSsoJfvGE W7tJ4JyhXOIuqCawXupxe2u5ypbYXQ8zSU+d//Pd6SRWmxQczIRzODxt7iAJDWYVIVB1xUfbYPZ FchxKXTcEMx6ihBpt4ha4o05mCFbZpnHyJZk5Ik+UOhepPRrDPxsQWhLuzEEdJAU= X-Gm-Gg: ASbGnctPxsBHpciR0/UCiKej+KD/4FzaaResREnXm2nUVfIOaSVtJd2WtoKWzbNEX9y E6m3HYN5Cp8JZZLzMOLodZu8eELWb3AbL0ifponSyYp7DbjdHV04UJdK6eCGDRZACZN5IFDl9o6 wMK6zsTBGMHReJX8Fxu6uRP06ClS70Iq4sL54gU6dblnAy/DCSzDDnA2Ds2WUYzJD7gzAed/Mno mW6Zc4hlHoPGQxgru6sEfJWn3xTI0CCM7b0qn4pB++cZpCHrQd41WFCdzSDcXSqo30AT87Eldck SxeitipQ8udwMi1LvYo2TwscUQuTT2wXXR+M/Podi3PaIGuUhgJ31xHmSpZscrjbNe6pyfFGGb0 cnwyNADAXWPkppUoYD0u5Nnpy X-Received: by 2002:a05:620a:210b:b0:7c7:a4b8:5753 with SMTP id af79cd13be357-7c956ef65d9mr270430385a.30.1745487081005; Thu, 24 Apr 2025 02:31:21 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHU4DEzZy4Gp1nBq1sJ9v/fMb9GmAbz0BFrdLUAAsJNqrJJV/Q6nPZGMnVEsZyEFfhqaykxxg== X-Received: by 2002:a05:620a:210b:b0:7c7:a4b8:5753 with SMTP id af79cd13be357-7c956ef65d9mr270425385a.30.1745487080377; Thu, 24 Apr 2025 02:31:20 -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 38308e7fff4ca-317d1b9a304sm1820461fa.99.2025.04.24.02.31.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 24 Apr 2025 02:31:19 -0700 (PDT) From: Dmitry Baryshkov Date: Thu, 24 Apr 2025 12:30:34 +0300 Subject: [PATCH v3 30/33] drm/msm/dpu: get rid of DPU_MIXER_SOURCESPLIT 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: <20250424-dpu-drop-features-v3-30-cdaca81d356f@oss.qualcomm.com> References: <20250424-dpu-drop-features-v3-0-cdaca81d356f@oss.qualcomm.com> In-Reply-To: <20250424-dpu-drop-features-v3-0-cdaca81d356f@oss.qualcomm.com> To: Rob Clark , Abhinav Kumar , Sean Paul , Marijn Suijten , David Airlie , Simona Vetter , Vinod Koul , Konrad Dybcio Cc: 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=36091; i=dmitry.baryshkov@oss.qualcomm.com; h=from:subject:message-id; bh=Q/o4W7e/zi8vdq5R3kZI6sxj8jj4EUnGiEayky2KEDc=; b=owEBbQGS/pANAwAKAYs8ij4CKSjVAcsmYgBoCgSwWG53p1ViHO3DQy0eO7+QV4Jb60ZTzcNED jl/IFS5ppqJATMEAAEKAB0WIQRMcISVXLJjVvC4lX+LPIo+Aiko1QUCaAoEsAAKCRCLPIo+Aiko 1dJaB/9pCfbGfgd3JZSDWkcJRr/OjANmsAM39x9AbkOK9fSDe1Th2X/bqksneqM3mgZPe1zXHDW 80PLE01r3VRrIqlnQmSj+bx0e8iXCY//8SLnTP9Hx5y6ETb2POPWLoUlZy9rCHr1jC7D68UdoX3 k/jRfPABMez+9ETFj7zva8fMBZuSsHc5MyCy6bLyaV7H71qI7TEY/RR/6JtMZVZgPdTx/s75pug FPGQ4G+GJIoyxbqD0jnldpn3on5xeta0vfkorpHx4buOchLlJfhTS3qggJgMvuUwglLiScjU/jP +gVelVvA3t//UaZRWij4NHA3qRzo4cBpQQgDxtg9mqZOUz1m X-Developer-Key: i=dmitry.baryshkov@oss.qualcomm.com; a=openpgp; fpr=8F88381DD5C873E4AE487DA5199BF1243632046A X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUwNDI0MDA2MyBTYWx0ZWRfX4HW92Qbje1nu z0j2/dydF4/dySSra7Xyfj9UMijvcJDzfI82RZSQIb7jCVTI2Lye3Se/WgwQF4miGn+UyK1i7kv gNkXr6qwQv3eDdwQZ5Z1gWbdigCLlGnLHOLZHUsUhP4rWGgKwxoHNkekW1+F+9LWFdESRH6Mzbi v6j0uU/l8EkkLDOvkPtVfuIcbG/0/yz/BIZU0vTNhE9yxy1SvL65ez3F8TizpaogWz0XYidNQU4 leGTMlGQe4svgWcPpRFpcAz0OyBw1vTig3lWReVEPt0QNJLu3DCCin2XdUKK8O8gp+b+jcWn6i0 /kSqqrHYzbHnrmnRzsAdvh1kowGgim1Q3b9+l/+7GD8QVxhAzBqFcqMlzRpXNn35r4wkTfRCw0u aEoIlrdnnjseSDKr2ZVE6pVsURwlKcG133Q0hveJFs9vLcFNxYt41jVVgL+09BbW6U6yA/Ge X-Proofpoint-GUID: Wa7xyM13iRZIQMu8bXvHoYnIq2rIhxAW X-Authority-Analysis: v=2.4 cv=ZuTtK87G c=1 sm=1 tr=0 ts=680a04ea cx=c_pps a=qKBjSQ1v91RyAK45QCPf5w==:117 a=xqWC_Br6kY4A:10 a=IkcTkHD0fZMA:10 a=XR8D0OoHHMoA:10 a=KKAkSRfTAAAA:8 a=AmcqjzelFzEpYhav6GoA:9 a=QEXdDO2ut3YA:10 a=NFOGd7dJGGMPyQGDc5-O:22 a=cvBusfyB2V15izCimMoJ:22 X-Proofpoint-ORIG-GUID: Wa7xyM13iRZIQMu8bXvHoYnIq2rIhxAW X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1099,Hydra:6.0.680,FMLib:17.12.80.40 definitions=2025-04-24_04,2025-04-22_01,2025-02-21_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 phishscore=0 clxscore=1015 impostorscore=0 bulkscore=0 mlxscore=0 adultscore=0 lowpriorityscore=0 mlxlogscore=999 priorityscore=1501 malwarescore=0 suspectscore=0 spamscore=0 classifier=spam authscore=0 authtc=n/a authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.19.0-2504070000 definitions=main-2504240063 From: Dmitry Baryshkov Continue cleanup of the feature flags and replace the last remaining LM feature with a bitfield flag, simplifying corresponding data structures and access. 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_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/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_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_4_sm6350.h | 4 ++-- 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_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 | 12 ++---------- drivers/gpu/drm/msm/disp/dpu1/dpu_hw_ctl.c | 3 +-- 23 files changed, 96 insertions(+), 111 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 02bb3d01e2dcfb881d089c68b516abe1761f692d..2007aedc0526854d3d8c4eface5= b507dc5c62c58 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 @@ -135,7 +135,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, + .sourcesplit =3D 1, .sblk =3D &sdm845_lm_sblk, .lm_pair =3D LM_1, .pingpong =3D PINGPONG_0, @@ -143,7 +143,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, + .sourcesplit =3D 1, .sblk =3D &sdm845_lm_sblk, .lm_pair =3D LM_0, .pingpong =3D PINGPONG_1, @@ -151,7 +151,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, + .sourcesplit =3D 1, .sblk =3D &sdm845_lm_sblk, .lm_pair =3D LM_3, .pingpong =3D PINGPONG_2, @@ -159,7 +159,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, + .sourcesplit =3D 1, .sblk =3D &sdm845_lm_sblk, .lm_pair =3D LM_2, .pingpong =3D PINGPONG_3, @@ -167,14 +167,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, + .sourcesplit =3D 1, .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, + .sourcesplit =3D 1, .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_1_7_msm8996.h b/driv= ers/gpu/drm/msm/disp/dpu1/catalog/dpu_1_7_msm8996.h index 7f606be1f79fe83568b467c47e7280537f1ce091..4cebdaddd797eb052acf087b1cd= 1a1302ff42fc7 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 @@ -146,7 +146,7 @@ static const struct dpu_lm_cfg msm8996_lm[] =3D { { .name =3D "lm_0", .id =3D LM_0, .base =3D 0x44000, .len =3D 0x320, - .features =3D MIXER_MSM8998_MASK, + .sourcesplit =3D 1, .sblk =3D &msm8998_lm_sblk, .lm_pair =3D LM_1, .pingpong =3D PINGPONG_0, @@ -154,7 +154,7 @@ static const struct dpu_lm_cfg msm8996_lm[] =3D { }, { .name =3D "lm_1", .id =3D LM_1, .base =3D 0x45000, .len =3D 0x320, - .features =3D MIXER_MSM8998_MASK, + .sourcesplit =3D 1, .sblk =3D &msm8998_lm_sblk, .lm_pair =3D LM_0, .pingpong =3D PINGPONG_1, @@ -162,14 +162,14 @@ static const struct dpu_lm_cfg msm8996_lm[] =3D { }, { .name =3D "lm_2", .id =3D LM_2, .base =3D 0x46000, .len =3D 0x320, - .features =3D MIXER_MSM8998_MASK, + .sourcesplit =3D 1, .sblk =3D &msm8998_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_MSM8998_MASK, + .sourcesplit =3D 1, .sblk =3D &msm8998_lm_sblk, .lm_pair =3D LM_2, .pingpong =3D PINGPONG_3, diff --git a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_3_0_msm8998.h b/driv= ers/gpu/drm/msm/disp/dpu1/catalog/dpu_3_0_msm8998.h index a10ca16d2d63d8b6e2e2165dcd4bf0cf915f8e3d..1f119f79545eb1f4c6d27fe9fcb= 2a22d038cc571 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 @@ -135,7 +135,7 @@ static const struct dpu_lm_cfg msm8998_lm[] =3D { { .name =3D "lm_0", .id =3D LM_0, .base =3D 0x44000, .len =3D 0x320, - .features =3D MIXER_MSM8998_MASK, + .sourcesplit =3D 1, .sblk =3D &msm8998_lm_sblk, .lm_pair =3D LM_1, .pingpong =3D PINGPONG_0, @@ -143,7 +143,7 @@ static const struct dpu_lm_cfg msm8998_lm[] =3D { }, { .name =3D "lm_1", .id =3D LM_1, .base =3D 0x45000, .len =3D 0x320, - .features =3D MIXER_MSM8998_MASK, + .sourcesplit =3D 1, .sblk =3D &msm8998_lm_sblk, .lm_pair =3D LM_0, .pingpong =3D PINGPONG_1, @@ -151,14 +151,14 @@ static const struct dpu_lm_cfg msm8998_lm[] =3D { }, { .name =3D "lm_2", .id =3D LM_2, .base =3D 0x46000, .len =3D 0x320, - .features =3D MIXER_MSM8998_MASK, + .sourcesplit =3D 1, .sblk =3D &msm8998_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_MSM8998_MASK, + .sourcesplit =3D 1, .sblk =3D &msm8998_lm_sblk, .lm_pair =3D LM_2, .pingpong =3D PINGPONG_3, diff --git a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_3_2_sdm660.h b/drive= rs/gpu/drm/msm/disp/dpu1/catalog/dpu_3_2_sdm660.h index c1fc91b3f6f85af18cf6a6c1690ec69074fc3545..c8008db5772498d3bb85596518a= 3a21395fc9491 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 @@ -106,7 +106,7 @@ static const struct dpu_lm_cfg sdm660_lm[] =3D { { .name =3D "lm_0", .id =3D LM_0, .base =3D 0x44000, .len =3D 0x320, - .features =3D MIXER_MSM8998_MASK, + .sourcesplit =3D 1, .sblk =3D &msm8998_lm_sblk, .lm_pair =3D LM_1, .pingpong =3D PINGPONG_0, @@ -114,7 +114,7 @@ static const struct dpu_lm_cfg sdm660_lm[] =3D { }, { .name =3D "lm_1", .id =3D LM_1, .base =3D 0x45000, .len =3D 0x320, - .features =3D MIXER_MSM8998_MASK, + .sourcesplit =3D 1, .sblk =3D &msm8998_lm_sblk, .lm_pair =3D LM_0, .pingpong =3D PINGPONG_1, @@ -122,14 +122,14 @@ static const struct dpu_lm_cfg sdm660_lm[] =3D { }, { .name =3D "lm_2", .id =3D LM_2, .base =3D 0x46000, .len =3D 0x320, - .features =3D MIXER_MSM8998_MASK, + .sourcesplit =3D 1, .sblk =3D &msm8998_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_MSM8998_MASK, + .sourcesplit =3D 1, .sblk =3D &msm8998_lm_sblk, .lm_pair =3D LM_2, .pingpong =3D PINGPONG_3, diff --git a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_3_3_sdm630.h b/drive= rs/gpu/drm/msm/disp/dpu1/catalog/dpu_3_3_sdm630.h index 65975e7ebd9ba1970b48d8753a87835677d58df7..70d7751831b738d40ab7e736ddb= 442c4d44e982e 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 @@ -97,14 +97,14 @@ static const struct dpu_lm_cfg sdm630_lm[] =3D { { .name =3D "lm_0", .id =3D LM_0, .base =3D 0x44000, .len =3D 0x320, - .features =3D MIXER_MSM8998_MASK, + .sourcesplit =3D 1, .sblk =3D &msm8998_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_MSM8998_MASK, + .sourcesplit =3D 1, .sblk =3D &msm8998_lm_sblk, .pingpong =3D PINGPONG_2, }, 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 8d5b7033f12f740fe7b9226e93fcece8ed54b890..1218a3585cbc8664194692cdd26= 39af1c7888c39 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, + .sourcesplit =3D 1, .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, + .sourcesplit =3D 1, .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, + .sourcesplit =3D 1, .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, + .sourcesplit =3D 1, .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..fd95933a41f0d604b7abb9cebb9= 5520905211d33 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, + .sourcesplit =3D 1, .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, + .sourcesplit =3D 1, .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, + .sourcesplit =3D 1, .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, + .sourcesplit =3D 1, .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 e1490dd6d0b35ef71b91b4b7dbc574b102e68652..520f5cd122dd331ca1a1d9cc1eb= d7654264f3e52 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 @@ -139,7 +139,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, + .sourcesplit =3D 1, .sblk =3D &sdm845_lm_sblk, .lm_pair =3D LM_1, .pingpong =3D PINGPONG_0, @@ -147,7 +147,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, + .sourcesplit =3D 1, .sblk =3D &sdm845_lm_sblk, .lm_pair =3D LM_0, .pingpong =3D PINGPONG_1, @@ -155,7 +155,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, + .sourcesplit =3D 1, .sblk =3D &sdm845_lm_sblk, .lm_pair =3D LM_3, .pingpong =3D PINGPONG_2, @@ -163,7 +163,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, + .sourcesplit =3D 1, .sblk =3D &sdm845_lm_sblk, .lm_pair =3D LM_2, .pingpong =3D PINGPONG_3, @@ -171,14 +171,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, + .sourcesplit =3D 1, .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, + .sourcesplit =3D 1, .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 c53a0376fc3d040b69a35896aad613ff8aec73b6..c1827c80e7efef9c57757e0b535= 35d9fbba30c05 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 @@ -138,7 +138,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, + .sourcesplit =3D 1, .sblk =3D &sdm845_lm_sblk, .lm_pair =3D LM_1, .pingpong =3D PINGPONG_0, @@ -146,7 +146,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, + .sourcesplit =3D 1, .sblk =3D &sdm845_lm_sblk, .lm_pair =3D LM_0, .pingpong =3D PINGPONG_1, @@ -154,7 +154,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, + .sourcesplit =3D 1, .sblk =3D &sdm845_lm_sblk, .lm_pair =3D LM_3, .pingpong =3D PINGPONG_2, @@ -162,7 +162,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, + .sourcesplit =3D 1, .sblk =3D &sdm845_lm_sblk, .lm_pair =3D LM_2, .pingpong =3D PINGPONG_3, @@ -170,14 +170,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, + .sourcesplit =3D 1, .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, + .sourcesplit =3D 1, .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 f72c986079803ec0d60f0bd6545ee0812657b8f2..d4c7c59e1ba845e087bcbc3394f= c972a9058943d 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 @@ -111,7 +111,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, + .sourcesplit =3D 1, .sblk =3D &sdm845_lm_sblk, .lm_pair =3D LM_1, .pingpong =3D PINGPONG_0, @@ -119,7 +119,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, + .sourcesplit =3D 1, .sblk =3D &sdm845_lm_sblk, .lm_pair =3D LM_0, .pingpong =3D PINGPONG_1, @@ -127,14 +127,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, + .sourcesplit =3D 1, .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, + .sourcesplit =3D 1, .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_6_0_sm8250.h b/drive= rs/gpu/drm/msm/disp/dpu1/catalog/dpu_6_0_sm8250.h index 448ec3def8c7e3e77ce0740e24588a14b0a44da7..50eea89a885ecf0d4ff4f478e6d= 356d86285bb3e 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 @@ -138,7 +138,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, + .sourcesplit =3D 1, .sblk =3D &sdm845_lm_sblk, .lm_pair =3D LM_1, .pingpong =3D PINGPONG_0, @@ -146,7 +146,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, + .sourcesplit =3D 1, .sblk =3D &sdm845_lm_sblk, .lm_pair =3D LM_0, .pingpong =3D PINGPONG_1, @@ -154,7 +154,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, + .sourcesplit =3D 1, .sblk =3D &sdm845_lm_sblk, .lm_pair =3D LM_3, .pingpong =3D PINGPONG_2, @@ -162,7 +162,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, + .sourcesplit =3D 1, .sblk =3D &sdm845_lm_sblk, .lm_pair =3D LM_2, .pingpong =3D PINGPONG_3, @@ -170,14 +170,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, + .sourcesplit =3D 1, .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, + .sourcesplit =3D 1, .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 f091503840182b624471c62ada5f8cb813a707bb..f7f949d2b0b3068e74bb974f4a7= f2a46257a53d3 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, + .sourcesplit =3D 1, .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, + .sourcesplit =3D 1, .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_4_sm6350.h b/drive= rs/gpu/drm/msm/disp/dpu1/catalog/dpu_6_4_sm6350.h index f4cd9405cc1f0589bce7ec68db68989bd24b2faa..2d9a20568f6956368c5efbe154c= f2ce1d3a559e8 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, + .sourcesplit =3D 1, .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, + .sourcesplit =3D 1, .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_7_0_sm8350.h b/drive= rs/gpu/drm/msm/disp/dpu1/catalog/dpu_7_0_sm8350.h index f4572433f352fb2c939b80c31e90bc2bfaa2a057..2c59f0b77a75880df18900fa406= f1ea7006927a1 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 @@ -138,7 +138,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, + .sourcesplit =3D 1, .sblk =3D &sdm845_lm_sblk, .lm_pair =3D LM_1, .pingpong =3D PINGPONG_0, @@ -146,7 +146,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, + .sourcesplit =3D 1, .sblk =3D &sdm845_lm_sblk, .lm_pair =3D LM_0, .pingpong =3D PINGPONG_1, @@ -154,7 +154,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, + .sourcesplit =3D 1, .sblk =3D &sdm845_lm_sblk, .lm_pair =3D LM_3, .pingpong =3D PINGPONG_2, @@ -162,7 +162,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, + .sourcesplit =3D 1, .sblk =3D &sdm845_lm_sblk, .lm_pair =3D LM_2, .pingpong =3D PINGPONG_3, @@ -170,14 +170,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, + .sourcesplit =3D 1, .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, + .sourcesplit =3D 1, .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 d312b7ff375ebb0bb5159c4d26eadc6eb3094103..cbc7e9081288fb8125438ad1cc0= 016042bf70661 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, + .sourcesplit =3D 1, .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, + .sourcesplit =3D 1, .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, + .sourcesplit =3D 1, .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 72110b2a2770435ac886e992b1ccce280c5ac3db..0238eb019d98ad5599cc301e47b= da43de762b24d 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 @@ -137,7 +137,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, + .sourcesplit =3D 1, .sblk =3D &sdm845_lm_sblk, .lm_pair =3D LM_1, .pingpong =3D PINGPONG_0, @@ -145,7 +145,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, + .sourcesplit =3D 1, .sblk =3D &sdm845_lm_sblk, .lm_pair =3D LM_0, .pingpong =3D PINGPONG_1, @@ -153,7 +153,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, + .sourcesplit =3D 1, .sblk =3D &sdm845_lm_sblk, .lm_pair =3D LM_3, .pingpong =3D PINGPONG_2, @@ -161,7 +161,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, + .sourcesplit =3D 1, .sblk =3D &sdm845_lm_sblk, .lm_pair =3D LM_2, .pingpong =3D PINGPONG_3, @@ -169,14 +169,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, + .sourcesplit =3D 1, .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, + .sourcesplit =3D 1, .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 72b2f67bb70eb09a3340097da6020a40cfbf87fb..3b2d99de20621a5c47a31212d7f= b236e0b784d0a 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 @@ -138,7 +138,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, + .sourcesplit =3D 1, .sblk =3D &sdm845_lm_sblk, .lm_pair =3D LM_1, .pingpong =3D PINGPONG_0, @@ -146,7 +146,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, + .sourcesplit =3D 1, .sblk =3D &sdm845_lm_sblk, .lm_pair =3D LM_0, .pingpong =3D PINGPONG_1, @@ -154,7 +154,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, + .sourcesplit =3D 1, .sblk =3D &sdm845_lm_sblk, .lm_pair =3D LM_3, .pingpong =3D PINGPONG_2, @@ -162,7 +162,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, + .sourcesplit =3D 1, .sblk =3D &sdm845_lm_sblk, .lm_pair =3D LM_2, .pingpong =3D PINGPONG_3, @@ -170,14 +170,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, + .sourcesplit =3D 1, .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, + .sourcesplit =3D 1, .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 de7e79680a7353e73bb2c761276edd9ddc25ce97..14a1781c19bd8060d338ea52684= f756258526996 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 @@ -137,7 +137,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, + .sourcesplit =3D 1, .sblk =3D &sdm845_lm_sblk, .lm_pair =3D LM_1, .pingpong =3D PINGPONG_0, @@ -145,7 +145,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, + .sourcesplit =3D 1, .sblk =3D &sdm845_lm_sblk, .lm_pair =3D LM_0, .pingpong =3D PINGPONG_1, @@ -153,7 +153,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, + .sourcesplit =3D 1, .sblk =3D &sdm845_lm_sblk, .lm_pair =3D LM_3, .pingpong =3D PINGPONG_2, @@ -161,7 +161,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, + .sourcesplit =3D 1, .sblk =3D &sdm845_lm_sblk, .lm_pair =3D LM_2, .pingpong =3D PINGPONG_3, @@ -169,14 +169,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, + .sourcesplit =3D 1, .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, + .sourcesplit =3D 1, .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 674192923d8c184386e46870afc508e53917ff6c..f6893c7ea13bc0ac84b46d50a13= 2e18e1c575a3d 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 @@ -135,7 +135,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, + .sourcesplit =3D 1, .sblk =3D &sdm845_lm_sblk, .lm_pair =3D LM_1, .pingpong =3D PINGPONG_0, @@ -143,7 +143,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, + .sourcesplit =3D 1, .sblk =3D &sdm845_lm_sblk, .lm_pair =3D LM_0, .pingpong =3D PINGPONG_1, @@ -151,7 +151,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, + .sourcesplit =3D 1, .sblk =3D &sdm845_lm_sblk, .lm_pair =3D LM_3, .pingpong =3D PINGPONG_2, @@ -159,7 +159,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, + .sourcesplit =3D 1, .sblk =3D &sdm845_lm_sblk, .lm_pair =3D LM_2, .pingpong =3D PINGPONG_3, @@ -167,14 +167,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, + .sourcesplit =3D 1, .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, + .sourcesplit =3D 1, .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 6cd7ddeb2b1fceed4cebc1f86793831b1cb75945..f2a09026abf324a3c66c17264c8= a5d8f2d75a580 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 @@ -134,7 +134,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, + .sourcesplit =3D 1, .sblk =3D &sdm845_lm_sblk, .lm_pair =3D LM_1, .pingpong =3D PINGPONG_0, @@ -142,7 +142,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, + .sourcesplit =3D 1, .sblk =3D &sdm845_lm_sblk, .lm_pair =3D LM_0, .pingpong =3D PINGPONG_1, @@ -150,7 +150,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, + .sourcesplit =3D 1, .sblk =3D &sdm845_lm_sblk, .lm_pair =3D LM_3, .pingpong =3D PINGPONG_2, @@ -158,7 +158,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, + .sourcesplit =3D 1, .sblk =3D &sdm845_lm_sblk, .lm_pair =3D LM_2, .pingpong =3D PINGPONG_3, @@ -166,14 +166,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, + .sourcesplit =3D 1, .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, + .sourcesplit =3D 1, .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 8496a44e2f04edeec884e1bac029c513022bf79a..2db27c55787791309962acf796d= 5c49aaf018fc1 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.c +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.c @@ -86,12 +86,6 @@ (BIT(DPU_SSPP_QOS) | BIT(DPU_SSPP_CDP) |\ BIT(DPU_SSPP_TS_PREFILL) | BIT(DPU_SSPP_SCALER_RGB)) =20 -#define MIXER_MSM8998_MASK \ - (BIT(DPU_MIXER_SOURCESPLIT)) - -#define MIXER_SDM845_MASK \ - (BIT(DPU_MIXER_SOURCESPLIT)) - #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 beffb92adf5d8a150e049811bf2caa212dace1a6..51b330f37c901b99c7db640a0b7= 7149c7ac8cdd7 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.h +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.h @@ -64,16 +64,6 @@ enum { DPU_SSPP_MAX }; =20 -/* - * MIXER sub-blocks/features - * @DPU_MIXER_SOURCESPLIT Layer mixer supports source-split configurat= ion - * @DPU_MIXER_MAX maximum value - */ -enum { - DPU_MIXER_SOURCESPLIT =3D 0x1, - DPU_MIXER_MAX, -}; - /** * DSPP sub-blocks * @DPU_DSPP_PCC Panel color correction block @@ -423,6 +413,7 @@ struct dpu_sspp_cfg { * @sblk: LM Sub-blocks information * @pingpong: ID of connected PingPong, PINGPONG_NONE if unsuppor= ted * @lm_pair: ID of LM that can be controlled by same CTL + * @sourcesplit Layer mixer supports source-split configuration */ struct dpu_lm_cfg { DPU_HW_BLK_INFO; @@ -430,6 +421,7 @@ struct dpu_lm_cfg { u32 pingpong; u32 dspp; unsigned long lm_pair; + unsigned long sourcesplit : 1; }; =20 /** diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_ctl.c b/drivers/gpu/drm/m= sm/disp/dpu1/dpu_hw_ctl.c index 7f6c548b626dbc5bcc3ddb27f185f336354dcb37..7b32bacb5b9cd61727a2d596c65= ac1b14eda942c 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_ctl.c +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_ctl.c @@ -505,8 +505,7 @@ static void dpu_hw_ctl_setup_blendstage(struct dpu_hw_c= tl *ctx, if (stages < 0) return; =20 - if (test_bit(DPU_MIXER_SOURCESPLIT, - &ctx->mixer_hw_caps->features)) + if (ctx->mixer_hw_caps->sourcesplit) pipes_per_stage =3D PIPES_PER_STAGE; else pipes_per_stage =3D 1; --=20 2.39.5 From nobody Sun Feb 8 09:32:35 2026 Received: from mx0b-0031df01.pphosted.com (mx0b-0031df01.pphosted.com [205.220.180.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 D42862472AB for ; Thu, 24 Apr 2025 09:31:25 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=205.220.180.131 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745487087; cv=none; b=czmYCht8p8RSS9RbsZBYaUxoWO2wFRxKnUPj0f94T4ge6UhbU5EER06b9OBs4+1xrBQ78RL7rmN6Bd8936TRE1JzMozy1iacXCsxuHY2OmMk/A9Oz2Cg4zfrRI2Koj6AgazYS61E9cm7FUV/ZGWQCyoHpW7Tz2VLTKWI5J8nN/I= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745487087; c=relaxed/simple; bh=zhba/E+DFv5DHo9IeNoDqsKEuGA/2nigK9HDz7FMsko=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=uB9YH1rECfoIbep4VkA2go1ZKeE8/rwBK36XihNXwzlld9T2/AjYNJUl4pB5urILO+K4GlQvaRPhvc7Gy8S1iIZ3KToQveUF6aeYgIrAMJXn/Z754aBN/zpFmXLh+pCv1c/n0Ps/uGiSXS86blKL3ffLyU0XAdP0iyj52mYn88g= 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=XT5n4v0O; arc=none smtp.client-ip=205.220.180.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="XT5n4v0O" Received: from pps.filterd (m0279869.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 53O0F6NE010237 for ; Thu, 24 Apr 2025 09:31:25 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= NuGkZiGp+4CHzIb0zr8gK6WChuwEMD9eO5Cd9Zm7rl4=; b=XT5n4v0O14PnqDdK j90Wx824pyuoPp77zqMiAKpTLvCBIQpEDQybS6b7rj6wDuKACoLv8acBuaQGjyT4 GUABDI0sQuIXfx6yxBjxxT72nSGc7oBU+T1hx8hWucHaEThboBMBL6rxRA0hl1HK 0SFG89B1S6/SERvRcpWSI2yYnaVWWZq24r19VqRh26VTFSqcSsc4wDQWxY9r5oXi 7fZkqin08GBsL2zI6poJ8cAbBs5zFT0sIAxmwlKyUufbGkR0Q637j0flurybtI2M NCMASF/jrNXTrj5kpRMkMKqQN20yWQ3dNT80vZggVSbolQhkx4/3m2LbLT5fzE8v hb661g== Received: from mail-qv1-f71.google.com (mail-qv1-f71.google.com [209.85.219.71]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 466jh3myum-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Thu, 24 Apr 2025 09:31:24 +0000 (GMT) Received: by mail-qv1-f71.google.com with SMTP id 6a1803df08f44-6e90b13f5c3so18531176d6.0 for ; Thu, 24 Apr 2025 02:31:24 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1745487082; x=1746091882; 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=NuGkZiGp+4CHzIb0zr8gK6WChuwEMD9eO5Cd9Zm7rl4=; b=nzS35VmnYoNDg1bvVrHnPMZFD/9J6uEqW7noy4dM2HE1HoCYTgyzOnWOoOMGVoIaXK Md6jedXd6VyHSGNT7ts8/0sMVKKWWZCSGwVk9XFTjqiKxIcJbA7OekVDUi99jnZ6/uzd ok+KuNQBJN8cqHUKV8ZnhapysOMkLe3xyzVMCIiHNihvStw4wa9nmROggVQqKhKcST4j LqIxoPJnvXAXzvx6xyGQQrQFRJVk9I2vF19WkKOZUKvTHR/hRntxmKX8MVorRFykyuTg EAODMkfYutPDiirWC0dn/ccd/xWVaK6y1P9ZdmoNbHsPO/D0dUBVM13+duBxyzWREJPE B4HQ== X-Forwarded-Encrypted: i=1; AJvYcCVS1rn+ny3Nzo7oCb/7Cd+xTTIfOR3UjFcA1K8HHdiM+4OTnXvxRFVl9Qb2ReTXYGrbr/J/5WRO0qEoZyE=@vger.kernel.org X-Gm-Message-State: AOJu0YworD2tBJzAynX/9LZdEe7KdtTyAMy/NeM+DKE5xZ/ONDc0fBaY e0TjQwKKSwt7xe/6ogw632M2sjqL76PK/mABoJkETa+TiukBpwX+SbjMhTkjVBag3+sc/czVpAi TM53k47xjmwaQosp9CKM/b5JhQQnAZcOzkGbqOKMVKTPe2PmBSMJxgMppMtPH620= X-Gm-Gg: ASbGncv/gFKX63eFJqIB3SM8m7xLqZ5jZADau1Q0J9pSw6PileMV2aIKlHdDjyyadLa cjE4KRaGNSDt90Ab0gy6Dlz13lC8RezO4mxD6UwAuHNXMrL5ue7e/eSNA70/EJ0L/28BxgjkkHg U7WNS00FVI8UIIEnmoOMW5/RKFnBLG6ILurCdYH8Te9k+TuBgk0HZjr1e4AnAxiR2+x78cjn92y LR8YCakesfuVUHomVyrXIzcFZku7GUgM89IKlgtr5WQpGsPX6+ThmBfMSa5SGJQ77N3A62PLo4f 2rE53XwEKIRU6EBg5zmuybb/udb4EOD+usE3b7za0dO/p0WTAOGONJmKVXV433xntIUE/QOCdco p5iOdcO1BI8CvdWHYGpGXlJ/6 X-Received: by 2002:a05:6214:492:b0:6f2:b551:a63 with SMTP id 6a1803df08f44-6f4bfbc3f14mr30134326d6.3.1745487082034; Thu, 24 Apr 2025 02:31:22 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEQv8RVtGoBf4nAQuwL9840Qtc9F+8IqhUyYlPmfaCr/vX/CUtJ+7o2OdPxL+GN4PC4Ebpz3g== X-Received: by 2002:a05:6214:492:b0:6f2:b551:a63 with SMTP id 6a1803df08f44-6f4bfbc3f14mr30134136d6.3.1745487081711; Thu, 24 Apr 2025 02:31:21 -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 38308e7fff4ca-317d1b9a304sm1820461fa.99.2025.04.24.02.31.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 24 Apr 2025 02:31:20 -0700 (PDT) From: Dmitry Baryshkov Date: Thu, 24 Apr 2025 12:30:35 +0300 Subject: [PATCH v3 31/33] drm/msm/dpu: get rid of DPU_DSC_NATIVE_42x_EN 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: <20250424-dpu-drop-features-v3-31-cdaca81d356f@oss.qualcomm.com> References: <20250424-dpu-drop-features-v3-0-cdaca81d356f@oss.qualcomm.com> In-Reply-To: <20250424-dpu-drop-features-v3-0-cdaca81d356f@oss.qualcomm.com> To: Rob Clark , Abhinav Kumar , Sean Paul , Marijn Suijten , David Airlie , Simona Vetter , Vinod Koul , Konrad Dybcio Cc: 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=9210; i=dmitry.baryshkov@oss.qualcomm.com; h=from:subject:message-id; bh=19/sQF6QrfTaWj5BCZQZWlAaWBLn1zVu4zT1/dnr23I=; b=owEBbQGS/pANAwAKAYs8ij4CKSjVAcsmYgBoCgSw7G/2CNYPilA2fKV1pmxvQuRa7WrmhzM0c yE6bqq3t3KJATMEAAEKAB0WIQRMcISVXLJjVvC4lX+LPIo+Aiko1QUCaAoEsAAKCRCLPIo+Aiko 1XLFB/wIdQZk3lL7rB0Wx4ENOW3+dXsazKWrZkSr1FIeLdxk1x4P2RTgB8no0YPaxcFNkrgIjjr N5krjarM1WTgL1Y7fme8xSxgeqRfnowkSgNpzxFoYbj0oFn7mMR2T0G1xTsxBAqomWA5u906LBq UEu98A8KH+ycuPnUC8EPjtbzlCaTI6nodg7UO0mVEGmtUhTDFYrqjRzu7C6t3LVSfsbUURQUVy9 2crJhvSPUMWB2wtqrlHOlwpjq4/8+m4NjYDVdIF4g+Ii0aI9Wit5Y/kL+lU6LsBfyJe2ESkioai 07bJEs3GpZzeb/svulULGtZodpjaZ0oi40yun+QinbpJsvWp X-Developer-Key: i=dmitry.baryshkov@oss.qualcomm.com; a=openpgp; fpr=8F88381DD5C873E4AE487DA5199BF1243632046A X-Proofpoint-ORIG-GUID: 72-Cr0TEulOVAG_kTYCn3bwzDYE6oaK5 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUwNDI0MDA2MiBTYWx0ZWRfXxJvOg8drsTGT xhi5DcK6IMaF5x0mF0p73FeYXjXV5b4Lb37Po49bIVkQd53eOOeloe9VoGAK+8DqdjvcuHKzggk abo7GmO16JRyZSsxEyWMb4kI02O7lOGwj9daZzzE/aoRMpn+chQcNoL6cQUwuh+mpom4WstEEyb pxn4Tk8bXFUJbm4QbfYlyzZWXDGzThEwZPNoQLfmr9Pgo75j+dpGGwRnFXg4rYpZNtR7Fnc1VYT qk6hUzu66wuyRrfAqtdZ8sOaEh3fYBGuEE4cGHjItFwZmF5EBhFQUATjJOP/DGIcyrt7yExbZjX 7HWwy1Q0vBnrajFTs7vhQVqScA2uq33qYX802kco1TA3mjRYvCnE52ap+ruqVCoxY/zknHQf5cr d0/uk81TuZQVLQ/EWTUyjnx11lm7Lm+lIVkdAOaWZFPhujds1HrZhE4yO+y6DG+5ui3YiBK1 X-Authority-Analysis: v=2.4 cv=ELgG00ZC c=1 sm=1 tr=0 ts=680a04ec cx=c_pps a=UgVkIMxJMSkC9lv97toC5g==:117 a=xqWC_Br6kY4A:10 a=IkcTkHD0fZMA:10 a=XR8D0OoHHMoA:10 a=KKAkSRfTAAAA:8 a=bDEOCHsu97kwrKHOfzcA:9 a=QEXdDO2ut3YA:10 a=1HOtulTD9v-eNWfpl4qZ:22 a=cvBusfyB2V15izCimMoJ:22 X-Proofpoint-GUID: 72-Cr0TEulOVAG_kTYCn3bwzDYE6oaK5 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1099,Hydra:6.0.680,FMLib:17.12.80.40 definitions=2025-04-24_04,2025-04-22_01,2025-02-21_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 impostorscore=0 adultscore=0 malwarescore=0 clxscore=1015 bulkscore=0 phishscore=0 spamscore=0 mlxscore=0 lowpriorityscore=0 priorityscore=1501 suspectscore=0 mlxlogscore=999 classifier=spam authscore=0 authtc=n/a authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.19.0-2504070000 definitions=main-2504240062 From: Dmitry Baryshkov Continue cleanup of the feature flags and replace the last remaining LM feature with a bitfield flag, simplifying corresponding data structures and access. Signed-off-by: Dmitry Baryshkov --- drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_10_0_sm8650.h | 8 ++++---- drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_7_0_sm8350.h | 4 ++-- drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_7_2_sc7280.h | 2 +- drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_8_0_sc8280xp.h | 4 ++-- drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_8_1_sm8450.h | 4 ++-- drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_8_4_sa8775p.h | 4 ++-- drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_9_0_sm8550.h | 4 ++-- drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_9_2_x1e80100.h | 4 ++-- drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.h | 12 ++---------- drivers/gpu/drm/msm/disp/dpu1/dpu_hw_dsc_1_2.c | 2 +- 10 files changed, 20 insertions(+), 28 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 2007aedc0526854d3d8c4eface5b507dc5c62c58..b8cac2dbec3c963b1a15337c648= 10a23ac6afc9e 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 @@ -289,22 +289,22 @@ static const struct dpu_dsc_cfg sm8650_dsc[] =3D { { .name =3D "dce_0_0", .id =3D DSC_0, .base =3D 0x80000, .len =3D 0x6, - .features =3D BIT(DPU_DSC_NATIVE_42x_EN), + .have_native_42x =3D 1, .sblk =3D &dsc_sblk_0, }, { .name =3D "dce_0_1", .id =3D DSC_1, .base =3D 0x80000, .len =3D 0x6, - .features =3D BIT(DPU_DSC_NATIVE_42x_EN), + .have_native_42x =3D 1, .sblk =3D &dsc_sblk_1, }, { .name =3D "dce_1_0", .id =3D DSC_2, .base =3D 0x81000, .len =3D 0x6, - .features =3D BIT(DPU_DSC_NATIVE_42x_EN), + .have_native_42x =3D 1, .sblk =3D &dsc_sblk_0, }, { .name =3D "dce_1_1", .id =3D DSC_3, .base =3D 0x81000, .len =3D 0x6, - .features =3D BIT(DPU_DSC_NATIVE_42x_EN), + .have_native_42x =3D 1, .sblk =3D &dsc_sblk_1, }, { .name =3D "dce_2_0", .id =3D DSC_4, 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 2c59f0b77a75880df18900fa406f1ea7006927a1..26266d36520e7499feb26da0f33= 51405bbd2f87a 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 @@ -274,12 +274,12 @@ static const struct dpu_dsc_cfg sm8350_dsc[] =3D { }, { .name =3D "dce_1_0", .id =3D DSC_2, .base =3D 0x81000, .len =3D 0x4, - .features =3D BIT(DPU_DSC_NATIVE_42x_EN), + .have_native_42x =3D 1, .sblk =3D &dsc_sblk_0, }, { .name =3D "dce_1_1", .id =3D DSC_3, .base =3D 0x81000, .len =3D 0x4, - .features =3D BIT(DPU_DSC_NATIVE_42x_EN), + .have_native_42x =3D 1, .sblk =3D &dsc_sblk_1, }, }; 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 cbc7e9081288fb8125438ad1cc0016042bf70661..3881dc839db71dd798863067a84= 69cdf3045719c 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 @@ -150,7 +150,7 @@ static const struct dpu_dsc_cfg sc7280_dsc[] =3D { { .name =3D "dce_0_0", .id =3D DSC_0, .base =3D 0x80000, .len =3D 0x4, - .features =3D BIT(DPU_DSC_NATIVE_42x_EN), + .have_native_42x =3D 1, .sblk =3D &dsc_sblk_0, }, }; 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 0238eb019d98ad5599cc301e47bda43de762b24d..f9c572be7fea9660d03284d8150= 67a17ac4abe4a 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 @@ -273,12 +273,12 @@ static const struct dpu_dsc_cfg sc8280xp_dsc[] =3D { }, { .name =3D "dce_1_0", .id =3D DSC_2, .base =3D 0x81000, .len =3D 0x4, - .features =3D BIT(DPU_DSC_NATIVE_42x_EN), + .have_native_42x =3D 1, .sblk =3D &dsc_sblk_0, }, { .name =3D "dce_1_1", .id =3D DSC_3, .base =3D 0x81000, .len =3D 0x4, - .features =3D BIT(DPU_DSC_NATIVE_42x_EN), + .have_native_42x =3D 1, .sblk =3D &dsc_sblk_1, }, { .name =3D "dce_2_0", .id =3D DSC_4, 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 3b2d99de20621a5c47a31212d7fb236e0b784d0a..08d5273554500a00a55adbe144b= 50fb4f8296ce7 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 @@ -287,12 +287,12 @@ static const struct dpu_dsc_cfg sm8450_dsc[] =3D { }, { .name =3D "dce_1_0", .id =3D DSC_2, .base =3D 0x81000, .len =3D 0x4, - .features =3D BIT(DPU_DSC_NATIVE_42x_EN), + .have_native_42x =3D 1, .sblk =3D &dsc_sblk_0, }, { .name =3D "dce_1_1", .id =3D DSC_3, .base =3D 0x81000, .len =3D 0x4, - .features =3D BIT(DPU_DSC_NATIVE_42x_EN), + .have_native_42x =3D 1, .sblk =3D &dsc_sblk_1, }, }; 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 14a1781c19bd8060d338ea52684f756258526996..d4eaf89821722bfccefe930e834= cbd83d52123e0 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 @@ -286,12 +286,12 @@ static const struct dpu_dsc_cfg sa8775p_dsc[] =3D { }, { .name =3D "dce_1_0", .id =3D DSC_2, .base =3D 0x81000, .len =3D 0x4, - .features =3D BIT(DPU_DSC_NATIVE_42x_EN), + .have_native_42x =3D 1, .sblk =3D &dsc_sblk_0, }, { .name =3D "dce_1_1", .id =3D DSC_3, .base =3D 0x81000, .len =3D 0x4, - .features =3D BIT(DPU_DSC_NATIVE_42x_EN), + .have_native_42x =3D 1, .sblk =3D &dsc_sblk_1, }, { .name =3D "dce_2_0", .id =3D DSC_4, 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 f6893c7ea13bc0ac84b46d50a132e18e1c575a3d..83dce1aef9d991afb7f30f75724= a822854be3e78 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 @@ -283,12 +283,12 @@ static const struct dpu_dsc_cfg sm8550_dsc[] =3D { }, { .name =3D "dce_1_0", .id =3D DSC_2, .base =3D 0x81000, .len =3D 0x4, - .features =3D BIT(DPU_DSC_NATIVE_42x_EN), + .have_native_42x =3D 1, .sblk =3D &dsc_sblk_0, }, { .name =3D "dce_1_1", .id =3D DSC_3, .base =3D 0x81000, .len =3D 0x4, - .features =3D BIT(DPU_DSC_NATIVE_42x_EN), + .have_native_42x =3D 1, .sblk =3D &dsc_sblk_1, }, }; 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 f2a09026abf324a3c66c17264c8a5d8f2d75a580..2938ff15299ecc5002aa1bffd02= 292212fe51f03 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 @@ -283,12 +283,12 @@ static const struct dpu_dsc_cfg x1e80100_dsc[] =3D { }, { .name =3D "dce_1_0", .id =3D DSC_2, .base =3D 0x81000, .len =3D 0x4, - .features =3D BIT(DPU_DSC_NATIVE_42x_EN), + .have_native_42x =3D 1, .sblk =3D &dsc_sblk_0, }, { .name =3D "dce_1_1", .id =3D DSC_3, .base =3D 0x81000, .len =3D 0x4, - .features =3D BIT(DPU_DSC_NATIVE_42x_EN), + .have_native_42x =3D 1, .sblk =3D &dsc_sblk_1, }, }; 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 51b330f37c901b99c7db640a0b77149c7ac8cdd7..0f78958ac4476de414d07b727c0= 8feec1c2e9f44 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.h +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.h @@ -128,16 +128,6 @@ enum { DPU_VBIF_MAX }; =20 -/** - * DSC sub-blocks/features - * @DPU_DSC_NATIVE_42x_EN Supports NATIVE_422_EN and NATIVE_420_EN enc= oding - * @DPU_DSC_MAX - */ -enum { - DPU_DSC_NATIVE_42x_EN =3D 0x1, - DPU_DSC_MAX -}; - /** * MACRO DPU_HW_BLK_INFO - information of HW blocks inside DPU * @name: string name for debug purposes @@ -474,10 +464,12 @@ struct dpu_merge_3d_cfg { * @len: length of hardware block * @features bit mask identifying sub-blocks/features * @sblk: sub-blocks information + * @have_native_42x: Supports NATIVE_422 and NATIVE_420 encoding */ struct dpu_dsc_cfg { DPU_HW_BLK_INFO; const struct dpu_dsc_sub_blks *sblk; + unsigned long have_native_42x : 1; }; =20 /** diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_dsc_1_2.c b/drivers/gpu/d= rm/msm/disp/dpu1/dpu_hw_dsc_1_2.c index b9c433567262a954b7f02233f6670ee6a8476846..42b4a5dbc2442ae0f2adab80a5a= 3df96b35e62b0 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_dsc_1_2.c +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_dsc_1_2.c @@ -62,7 +62,7 @@ static int _dsc_calc_output_buf_max_addr(struct dpu_hw_ds= c *hw_dsc, int num_soft { int max_addr =3D 2400 / num_softslice; =20 - if (hw_dsc->caps->features & BIT(DPU_DSC_NATIVE_42x_EN)) + if (hw_dsc->caps->have_native_42x) max_addr /=3D 2; =20 return max_addr - 1; --=20 2.39.5 From nobody Sun Feb 8 09:32:35 2026 Received: from mx0b-0031df01.pphosted.com (mx0b-0031df01.pphosted.com [205.220.180.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 B893924A07C for ; Thu, 24 Apr 2025 09:31:28 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=205.220.180.131 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745487090; cv=none; b=n9qmMheX67nswt+5gX4LH2/V6BH9kIgUhT2IpARArvRgHYV9wtF5r24aCquHWJjcq6u03wUPv6pJB9WfB4MmBkYehmGQ+mKlAij/72cqUK+IBvYBTA866R2m5NzJhVr1AptLNi/GLt2VbcJRaWIDDz49pGBUL4ON2Tji2UXgRfo= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745487090; c=relaxed/simple; bh=3dNs9Ag6k3c7jwYRG2w0d/lQvSjt1TVp/ua+lqoPeoA=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=R8M9+zLxbKy6UFNptYvMGrnqE++EWYJ3K4YcMxh6Nb1FVl/uR7quc8cVg7t6B1EYQF88Avch3VeB8moy0nf/JU5w7Cblpa00rRT5QOaeXa5dvdzMI5mx3MZEukbQ8wATe/xJrZPCDgkoyG6ZguJN2hGfndYBclJU1RuHNNwFOYE= 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=f8gPPTU4; arc=none smtp.client-ip=205.220.180.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="f8gPPTU4" Received: from pps.filterd (m0279873.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 53O0F6AZ028361 for ; Thu, 24 Apr 2025 09:31:27 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= 7PNBZtXubLCDCToxeC3+n/OuOG7mhkAiKUlm570YsJM=; b=f8gPPTU4A58ZU46U Y9y4hsY93cdF+W9rb8kHqrcUJL4RSA5gn9PinQTMMQGoSTNeM2Wi9VNXIB/OqHuw aqoA5TTX90SmckGSBqdPS6aRUihUobeDzvrzoLlDQQw1rNAQqPnln7LWHphnqBvD WSL+teuKWqPmqkq7LHOAoaIp1JXKECw3lNVponZnC1gCsBYovKWOH1lYGv9G8yPR YE4iVxNyL2aNKJRxY0AMij6EqYRXjJ95twyQegIxlFNuUEB58bF3GhoBOG37KfVQ SVr5RXd8Q4hGSVgxOmbrvaNhKtZB4tNgD6dQHWyqKf57Eds6uGAvfc0wudQ1D4yR wJ2tiw== Received: from mail-qk1-f200.google.com (mail-qk1-f200.google.com [209.85.222.200]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 466jgy5041-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Thu, 24 Apr 2025 09:31:27 +0000 (GMT) Received: by mail-qk1-f200.google.com with SMTP id af79cd13be357-7c760637fe5so142287185a.0 for ; Thu, 24 Apr 2025 02:31:27 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1745487086; x=1746091886; 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=7PNBZtXubLCDCToxeC3+n/OuOG7mhkAiKUlm570YsJM=; b=a7PkAA6biqK9lMJPdsjRVTdT4DRIydYK+Xuca02GtxKYct1HlvbASfplQ13YPyzlhL 0tLGJpljC57xB1Ue6Y96OX8rICxRtbOWsnXbhIByRtfrvNXvLZ8x9a5kxGSUVHaLCLKH YpHBLXxpfOWpqonVPEv8gcGZHWMqdJ8VHbn4ugfK9hLQYi+5Y+V0iaiv7hC0ao2PyYsF ullFuEenivLY1Xp5cAR/q3qlIh2OqU2p5op/X1YvCD0PEFPDeIAQPPvEdv3boEK2HqRx qCyQ7noG6FG8YNwGEY+uDUZRA6CzpTMEgK8CnundBVdqZgAY+Jn6cICVNuYDy74A/ExV 6HAQ== X-Forwarded-Encrypted: i=1; AJvYcCXDvLA5rNk2wZnQq+vmbpNyVPg9/cIKZEyAdOJZ/Hpg46dAfXqBRPXy3P+dDL52sYIxIOF8hOc0bx/6jUQ=@vger.kernel.org X-Gm-Message-State: AOJu0Yx8s3O8nNIlR8UJY1DC9PTAiEbPIpIQY1qsfsrimWk8z/UJamLP HKNg9PZr8laoFKbXcxudda5so9VMCOi1H4PqCyFFBe0h7CDAOx2b/71+dk0i4q2CajyyBF+FdVu SnpcZm7IwJSRfanhGpAJjdcRv+feKnu6931RNmr1wVmSoOxq2duIHfq3E3trNrrk= X-Gm-Gg: ASbGncvOmvVsxJYsG472usaU5jGkDydMIkS29SqvPEvHCjqz+ya/4TYA3rYVSW7Rpct Sw9wmlNP6RdZXoUT5ttLtJTpKry6wXAEKSG2ouFyq6z3dsOonYw9OI2UoJVRlXiqbdmrAmfpsAT 6CpkkDdattG9cKim9aE/dnVfmB2BKgA+p7aWGsY4WmdG1lILaXaiupXWpBl1w8vjo82qugY1lmV 4G9kOcTJ4wFtR0U7CNe3XgcRqczmUTId1wAavKLG8KfwNCNNpAmIRGkZnV1kxryl2JSpH4crbCp 2yTCeFT3nm0M+87cascHia57xr8RjI1oRUFY0EWLK9SPCXCx2JZK8YYV0c/tWMC97jQtRVtPhcY hfHBcyUVa9udbOXhiUMs94YMa X-Received: by 2002:a05:620a:4248:b0:7c5:95e6:ce1d with SMTP id af79cd13be357-7c956dd8d70mr264199285a.0.1745487085683; Thu, 24 Apr 2025 02:31:25 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFRgqWHFAo1O8CyyUzKScKs4yqG/U35Gg1gF/3mzZokEAhgjTKyDllbtIcMWUBO7Xgoaxe20A== X-Received: by 2002:a05:620a:4248:b0:7c5:95e6:ce1d with SMTP id af79cd13be357-7c956dd8d70mr264195685a.0.1745487085187; Thu, 24 Apr 2025 02:31:25 -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 38308e7fff4ca-317d1b9a304sm1820461fa.99.2025.04.24.02.31.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 24 Apr 2025 02:31:22 -0700 (PDT) From: Dmitry Baryshkov Date: Thu, 24 Apr 2025 12:30:36 +0300 Subject: [PATCH v3 32/33] drm/msm/dpu: get rid of DPU_CTL_SPLIT_DISPLAY 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: <20250424-dpu-drop-features-v3-32-cdaca81d356f@oss.qualcomm.com> References: <20250424-dpu-drop-features-v3-0-cdaca81d356f@oss.qualcomm.com> In-Reply-To: <20250424-dpu-drop-features-v3-0-cdaca81d356f@oss.qualcomm.com> To: Rob Clark , Abhinav Kumar , Sean Paul , Marijn Suijten , David Airlie , Simona Vetter , Vinod Koul , Konrad Dybcio Cc: 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=19053; i=dmitry.baryshkov@oss.qualcomm.com; h=from:subject:message-id; bh=VuzeyYdgiGBBde5Be5d/SQvYU4hkMOTM2wddPYh6vlw=; b=owEBbQGS/pANAwAKAYs8ij4CKSjVAcsmYgBoCgSx0vo/F5SF9DiHV1VOr0U7ekULYjZess+4i 3FxyxsT1jSJATMEAAEKAB0WIQRMcISVXLJjVvC4lX+LPIo+Aiko1QUCaAoEsQAKCRCLPIo+Aiko 1ciDB/9SkUi+Q45zIEPjhBcLYmG9E9nz0KRVq52GhZtyLp/Lr1TyBn0sdEtluGm9DPXoPEylx+I naefdtZKwacljx5Prcsp3n1/fwYysy4Schus4cx3H0e0XIe3DZ1Xpjui02sMf9wNP7tXYJm7ARA ofINox8PuSEomk8xQb4SQ1B3uL1sV3wAT9NXYtHPKwnuDrDpeiT72uz4tnBmVw/9nQ+UiPyInxW zxhHn5J7Rk3EsXScXy4TnBCDm6Hj/j4dyCTWjbZdlh7EtuxuK4wqW4WsZiQd9K2lUOaOG8XixJV mKwijrm4xLf6QvVGK1SO62ziNgT7w1M+Lw8v3bcxpY0nTTgW X-Developer-Key: i=dmitry.baryshkov@oss.qualcomm.com; a=openpgp; fpr=8F88381DD5C873E4AE487DA5199BF1243632046A X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUwNDI0MDA2MyBTYWx0ZWRfXzE3pbMpaD0ZT ivWUVNbiZYUpALZ5tBUnUA5J9jJacH0zXwz7pOjc0F03bvXGb+PvgyOfuckix445a/+vSC7UaB7 yR0rA02Jf0MkIJG82XTzHB7COrI/Q5tAoswHSj+tuKzuZrs3QO6LwDPg1XZjeV5A7ugtFYFvzay d0X4KJhq2sFix4TA23J7V8s38hlZwu3Z+aY7THSDIMYv6yiOulh9n7Pf7d3+pIKBntNUQIJMJl7 N6z8CARXfmQ8FSXBwxAMt2LuexI+mKCvNkpwKM35vtbXrLdtWsjHI/RszBQqphG5aRhVp5+pevN BuL/QLyhkOgePsugzVbF4j/QTVHO3lC1FZnTQ24gLSizfV+GdldMvTYmh2H6w/MMDVx+fc+DGCp mRrLDYT7QwXlCGZDUYQnINM96Om3V3/uCCOEGBfRhf8XHxYOLXHqDUaJP2xlnmopmZvU4xP6 X-Proofpoint-GUID: LimLYnOVmOfUypFmkY2C4LGsKA6Bq0Pt X-Proofpoint-ORIG-GUID: LimLYnOVmOfUypFmkY2C4LGsKA6Bq0Pt X-Authority-Analysis: v=2.4 cv=M5VNKzws c=1 sm=1 tr=0 ts=680a04ef cx=c_pps a=hnmNkyzTK/kJ09Xio7VxxA==:117 a=xqWC_Br6kY4A:10 a=IkcTkHD0fZMA:10 a=XR8D0OoHHMoA:10 a=KKAkSRfTAAAA:8 a=0OrUzzk_IYoRGeAKyEIA:9 a=QEXdDO2ut3YA:10 a=PEH46H7Ffwr30OY-TuGO:22 a=cvBusfyB2V15izCimMoJ:22 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1099,Hydra:6.0.680,FMLib:17.12.80.40 definitions=2025-04-24_04,2025-04-22_01,2025-02-21_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 bulkscore=0 lowpriorityscore=0 adultscore=0 spamscore=0 priorityscore=1501 mlxscore=0 mlxlogscore=999 malwarescore=0 impostorscore=0 clxscore=1015 suspectscore=0 phishscore=0 classifier=spam authscore=0 authtc=n/a authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.19.0-2504070000 definitions=main-2504240063 From: Dmitry Baryshkov Continue cleanup of the feature flags and replace the last remaining CTL feature with a bitfield flag, simplifying corresponding data structures and access. Signed-off-by: Dmitry Baryshkov --- drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_10_0_sm8650.h | 6 +++--- drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_3_0_msm8998.h | 4 ++-- drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_3_2_sdm660.h | 4 ++-- 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 | 4 ++-- drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_5_0_sm8150.h | 6 +++--- drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_5_1_sc8180x.h | 4 ++-- drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_5_2_sm7150.h | 4 ++-- drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_6_0_sm8250.h | 6 +++--- drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_7_0_sm8350.h | 6 +++--- drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_8_0_sc8280xp.h | 6 +++--- drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_8_1_sm8450.h | 6 +++--- drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_8_4_sa8775p.h | 6 +++--- drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_9_0_sm8550.h | 6 +++--- drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_9_2_x1e80100.h | 6 +++--- drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.h | 12 ++---------- drivers/gpu/drm/msm/disp/dpu1/dpu_rm.c | 9 +++------ 17 files changed, 44 insertions(+), 55 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 b8cac2dbec3c963b1a15337c64810a23ac6afc9e..f1adbf0db64716bba09bf88e59c= 516418c57214d 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 @@ -26,17 +26,17 @@ static const struct dpu_mdp_cfg sm8650_mdp =3D { }, }; =20 -/* FIXME: get rid of DPU_CTL_SPLIT_DISPLAY in favour of proper ACTIVE_CTL = support */ +/* FIXME: get rid of .has_split_display in favour of proper ACTIVE_CTL sup= port */ static const struct dpu_ctl_cfg sm8650_ctl[] =3D { { .name =3D "ctl_0", .id =3D CTL_0, .base =3D 0x15000, .len =3D 0x1000, - .features =3D BIT(DPU_CTL_SPLIT_DISPLAY), + .has_split_display =3D 1, .intr_start =3D DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR2, 9), }, { .name =3D "ctl_1", .id =3D CTL_1, .base =3D 0x16000, .len =3D 0x1000, - .features =3D BIT(DPU_CTL_SPLIT_DISPLAY), + .has_split_display =3D 1, .intr_start =3D DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR2, 10), }, { .name =3D "ctl_2", .id =3D CTL_2, diff --git a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_3_0_msm8998.h b/driv= ers/gpu/drm/msm/disp/dpu1/catalog/dpu_3_0_msm8998.h index 1f119f79545eb1f4c6d27fe9fcb2a22d038cc571..9a4040921db78e13c04199d0c53= 3be47c9d77f30 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 @@ -41,7 +41,7 @@ static const struct dpu_ctl_cfg msm8998_ctl[] =3D { { .name =3D "ctl_0", .id =3D CTL_0, .base =3D 0x1000, .len =3D 0x94, - .features =3D BIT(DPU_CTL_SPLIT_DISPLAY), + .has_split_display =3D 1, .intr_start =3D DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR2, 9), }, { .name =3D "ctl_1", .id =3D CTL_1, @@ -50,7 +50,7 @@ static const struct dpu_ctl_cfg msm8998_ctl[] =3D { }, { .name =3D "ctl_2", .id =3D CTL_2, .base =3D 0x1400, .len =3D 0x94, - .features =3D BIT(DPU_CTL_SPLIT_DISPLAY), + .has_split_display =3D 1, .intr_start =3D DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR2, 11), }, { .name =3D "ctl_3", .id =3D CTL_3, diff --git a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_3_2_sdm660.h b/drive= rs/gpu/drm/msm/disp/dpu1/catalog/dpu_3_2_sdm660.h index c8008db5772498d3bb85596518a3a21395fc9491..04301d2ba34f3275deee2b0e891= 05ff4616a7c2a 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 @@ -36,7 +36,7 @@ static const struct dpu_ctl_cfg sdm660_ctl[] =3D { { .name =3D "ctl_0", .id =3D CTL_0, .base =3D 0x1000, .len =3D 0x94, - .features =3D BIT(DPU_CTL_SPLIT_DISPLAY), + .has_split_display =3D 1, .intr_start =3D DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR2, 9), }, { .name =3D "ctl_1", .id =3D CTL_1, @@ -45,7 +45,7 @@ static const struct dpu_ctl_cfg sdm660_ctl[] =3D { }, { .name =3D "ctl_2", .id =3D CTL_2, .base =3D 0x1400, .len =3D 0x94, - .features =3D BIT(DPU_CTL_SPLIT_DISPLAY), + .has_split_display =3D 1, .intr_start =3D DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR2, 11), }, { .name =3D "ctl_3", .id =3D CTL_3, diff --git a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_3_3_sdm630.h b/drive= rs/gpu/drm/msm/disp/dpu1/catalog/dpu_3_3_sdm630.h index 70d7751831b738d40ab7e736ddb442c4d44e982e..35d2feea79e8c8673fafd1be83d= 554efdf21b32a 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 @@ -35,7 +35,7 @@ static const struct dpu_ctl_cfg sdm630_ctl[] =3D { { .name =3D "ctl_0", .id =3D CTL_0, .base =3D 0x1000, .len =3D 0x94, - .features =3D BIT(DPU_CTL_SPLIT_DISPLAY), + .has_split_display =3D 1, .intr_start =3D DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR2, 9), }, { .name =3D "ctl_1", .id =3D CTL_1, @@ -44,7 +44,7 @@ static const struct dpu_ctl_cfg sdm630_ctl[] =3D { }, { .name =3D "ctl_2", .id =3D CTL_2, .base =3D 0x1400, .len =3D 0x94, - .features =3D BIT(DPU_CTL_SPLIT_DISPLAY), + .has_split_display =3D 1, .intr_start =3D DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR2, 11), }, { .name =3D "ctl_3", .id =3D CTL_3, 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 1218a3585cbc8664194692cdd2639af1c7888c39..2f3564c6672ae86203629194981= e911f7ebf8bef 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 @@ -39,12 +39,12 @@ static const struct dpu_ctl_cfg sdm845_ctl[] =3D { { .name =3D "ctl_0", .id =3D CTL_0, .base =3D 0x1000, .len =3D 0xe4, - .features =3D BIT(DPU_CTL_SPLIT_DISPLAY), + .has_split_display =3D 1, .intr_start =3D DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR2, 9), }, { .name =3D "ctl_1", .id =3D CTL_1, .base =3D 0x1200, .len =3D 0xe4, - .features =3D BIT(DPU_CTL_SPLIT_DISPLAY), + .has_split_display =3D 1, .intr_start =3D DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR2, 10), }, { .name =3D "ctl_2", .id =3D CTL_2, 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 520f5cd122dd331ca1a1d9cc1ebd7654264f3e52..63ff6e9549b6289534cd41efc98= 91c5a1cb2672e 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 @@ -36,17 +36,17 @@ static const struct dpu_mdp_cfg sm8150_mdp =3D { }, }; =20 -/* FIXME: get rid of DPU_CTL_SPLIT_DISPLAY in favour of proper ACTIVE_CTL = support */ +/* FIXME: get rid of .has_split_display in favour of proper ACTIVE_CTL sup= port */ static const struct dpu_ctl_cfg sm8150_ctl[] =3D { { .name =3D "ctl_0", .id =3D CTL_0, .base =3D 0x1000, .len =3D 0x1e0, - .features =3D BIT(DPU_CTL_SPLIT_DISPLAY), + .has_split_display =3D 1, .intr_start =3D DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR2, 9), }, { .name =3D "ctl_1", .id =3D CTL_1, .base =3D 0x1200, .len =3D 0x1e0, - .features =3D BIT(DPU_CTL_SPLIT_DISPLAY), + .has_split_display =3D 1, .intr_start =3D DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR2, 10), }, { .name =3D "ctl_2", .id =3D CTL_2, 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 c1827c80e7efef9c57757e0b53535d9fbba30c05..47c2757e47a0a18350f13c57fab= 401dd5439bf08 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 @@ -40,12 +40,12 @@ static const struct dpu_ctl_cfg sc8180x_ctl[] =3D { { .name =3D "ctl_0", .id =3D CTL_0, .base =3D 0x1000, .len =3D 0x1e0, - .features =3D BIT(DPU_CTL_SPLIT_DISPLAY), + .has_split_display =3D 1, .intr_start =3D DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR2, 9), }, { .name =3D "ctl_1", .id =3D CTL_1, .base =3D 0x1200, .len =3D 0x1e0, - .features =3D BIT(DPU_CTL_SPLIT_DISPLAY), + .has_split_display =3D 1, .intr_start =3D DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR2, 10), }, { .name =3D "ctl_2", .id =3D CTL_2, 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 d4c7c59e1ba845e087bcbc3394fc972a9058943d..9a7b0de857db2d13b7a4415e345= 2c1ad4140df36 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 @@ -37,12 +37,12 @@ static const struct dpu_ctl_cfg sm7150_ctl[] =3D { { .name =3D "ctl_0", .id =3D CTL_0, .base =3D 0x1000, .len =3D 0x1e0, - .features =3D BIT(DPU_CTL_SPLIT_DISPLAY), + .has_split_display =3D 1, .intr_start =3D DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR2, 9), }, { .name =3D "ctl_1", .id =3D CTL_1, .base =3D 0x1200, .len =3D 0x1e0, - .features =3D BIT(DPU_CTL_SPLIT_DISPLAY), + .has_split_display =3D 1, .intr_start =3D DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR2, 10), }, { .name =3D "ctl_2", .id =3D CTL_2, 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 50eea89a885ecf0d4ff4f478e6d356d86285bb3e..cbf8e1f7314ee15b6f78917e2a3= 6006f6e9d9245 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 @@ -35,17 +35,17 @@ static const struct dpu_mdp_cfg sm8250_mdp =3D { }, }; =20 -/* FIXME: get rid of DPU_CTL_SPLIT_DISPLAY in favour of proper ACTIVE_CTL = support */ +/* FIXME: get rid of .has_split_display in favour of proper ACTIVE_CTL sup= port */ static const struct dpu_ctl_cfg sm8250_ctl[] =3D { { .name =3D "ctl_0", .id =3D CTL_0, .base =3D 0x1000, .len =3D 0x1e0, - .features =3D BIT(DPU_CTL_SPLIT_DISPLAY), + .has_split_display =3D 1, .intr_start =3D DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR2, 9), }, { .name =3D "ctl_1", .id =3D CTL_1, .base =3D 0x1200, .len =3D 0x1e0, - .features =3D BIT(DPU_CTL_SPLIT_DISPLAY), + .has_split_display =3D 1, .intr_start =3D DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR2, 10), }, { .name =3D "ctl_2", .id =3D CTL_2, 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 26266d36520e7499feb26da0f3351405bbd2f87a..774fe5e1c513e0cb8cb3ff4dad9= 5b03311350c61 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 @@ -35,17 +35,17 @@ static const struct dpu_mdp_cfg sm8350_mdp =3D { }, }; =20 -/* FIXME: get rid of DPU_CTL_SPLIT_DISPLAY in favour of proper ACTIVE_CTL = support */ +/* FIXME: get rid of .has_split_display in favour of proper ACTIVE_CTL sup= port */ static const struct dpu_ctl_cfg sm8350_ctl[] =3D { { .name =3D "ctl_0", .id =3D CTL_0, .base =3D 0x15000, .len =3D 0x1e8, - .features =3D BIT(DPU_CTL_SPLIT_DISPLAY), + .has_split_display =3D 1, .intr_start =3D DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR2, 9), }, { .name =3D "ctl_1", .id =3D CTL_1, .base =3D 0x16000, .len =3D 0x1e8, - .features =3D BIT(DPU_CTL_SPLIT_DISPLAY), + .has_split_display =3D 1, .intr_start =3D DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR2, 10), }, { .name =3D "ctl_2", .id =3D CTL_2, 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 f9c572be7fea9660d03284d815067a17ac4abe4a..443500970f669ea6f38dd11d4d0= c90fe92bdb455 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 @@ -34,17 +34,17 @@ static const struct dpu_mdp_cfg sc8280xp_mdp =3D { }, }; =20 -/* FIXME: get rid of DPU_CTL_SPLIT_DISPLAY in favour of proper ACTIVE_CTL = support */ +/* FIXME: get rid of .has_split_display in favour of proper ACTIVE_CTL sup= port */ static const struct dpu_ctl_cfg sc8280xp_ctl[] =3D { { .name =3D "ctl_0", .id =3D CTL_0, .base =3D 0x15000, .len =3D 0x204, - .features =3D BIT(DPU_CTL_SPLIT_DISPLAY), + .has_split_display =3D 1, .intr_start =3D DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR2, 9), }, { .name =3D "ctl_1", .id =3D CTL_1, .base =3D 0x16000, .len =3D 0x204, - .features =3D BIT(DPU_CTL_SPLIT_DISPLAY), + .has_split_display =3D 1, .intr_start =3D DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR2, 10), }, { .name =3D "ctl_2", .id =3D CTL_2, 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 08d5273554500a00a55adbe144b50fb4f8296ce7..82df68fd01dc64fcb95cbb0bd70= 991b428829479 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 @@ -35,17 +35,17 @@ static const struct dpu_mdp_cfg sm8450_mdp =3D { }, }; =20 -/* FIXME: get rid of DPU_CTL_SPLIT_DISPLAY in favour of proper ACTIVE_CTL = support */ +/* FIXME: get rid of .has_split_display in favour of proper ACTIVE_CTL sup= port */ static const struct dpu_ctl_cfg sm8450_ctl[] =3D { { .name =3D "ctl_0", .id =3D CTL_0, .base =3D 0x15000, .len =3D 0x204, - .features =3D BIT(DPU_CTL_SPLIT_DISPLAY), + .has_split_display =3D 1, .intr_start =3D DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR2, 9), }, { .name =3D "ctl_1", .id =3D CTL_1, .base =3D 0x16000, .len =3D 0x204, - .features =3D BIT(DPU_CTL_SPLIT_DISPLAY), + .has_split_display =3D 1, .intr_start =3D DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR2, 10), }, { .name =3D "ctl_2", .id =3D CTL_2, 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 d4eaf89821722bfccefe930e834cbd83d52123e0..f3fe68587dee21f059b68c1cecf= e3f68c2bf48a1 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 @@ -34,17 +34,17 @@ static const struct dpu_mdp_cfg sa8775p_mdp =3D { }, }; =20 -/* FIXME: get rid of DPU_CTL_SPLIT_DISPLAY in favour of proper ACTIVE_CTL = support */ +/* FIXME: get rid of .has_split_display in favour of proper ACTIVE_CTL sup= port */ static const struct dpu_ctl_cfg sa8775p_ctl[] =3D { { .name =3D "ctl_0", .id =3D CTL_0, .base =3D 0x15000, .len =3D 0x204, - .features =3D BIT(DPU_CTL_SPLIT_DISPLAY), + .has_split_display =3D 1, .intr_start =3D DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR2, 9), }, { .name =3D "ctl_1", .id =3D CTL_1, .base =3D 0x16000, .len =3D 0x204, - .features =3D BIT(DPU_CTL_SPLIT_DISPLAY), + .has_split_display =3D 1, .intr_start =3D DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR2, 10), }, { .name =3D "ctl_2", .id =3D CTL_2, 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 83dce1aef9d991afb7f30f75724a822854be3e78..97c4e3b74c5bcefd0d9535b9356= bc2010841597b 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 @@ -26,17 +26,17 @@ static const struct dpu_mdp_cfg sm8550_mdp =3D { }, }; =20 -/* FIXME: get rid of DPU_CTL_SPLIT_DISPLAY in favour of proper ACTIVE_CTL = support */ +/* FIXME: get rid of .has_split_display in favour of proper ACTIVE_CTL sup= port */ static const struct dpu_ctl_cfg sm8550_ctl[] =3D { { .name =3D "ctl_0", .id =3D CTL_0, .base =3D 0x15000, .len =3D 0x290, - .features =3D BIT(DPU_CTL_SPLIT_DISPLAY), + .has_split_display =3D 1, .intr_start =3D DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR2, 9), }, { .name =3D "ctl_1", .id =3D CTL_1, .base =3D 0x16000, .len =3D 0x290, - .features =3D BIT(DPU_CTL_SPLIT_DISPLAY), + .has_split_display =3D 1, .intr_start =3D DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR2, 10), }, { .name =3D "ctl_2", .id =3D CTL_2, 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 2938ff15299ecc5002aa1bffd02292212fe51f03..18773f318131265aadc6cca9b17= a73ebf2f091b7 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 @@ -25,17 +25,17 @@ static const struct dpu_mdp_cfg x1e80100_mdp =3D { }, }; =20 -/* FIXME: get rid of DPU_CTL_SPLIT_DISPLAY in favour of proper ACTIVE_CTL = support */ +/* FIXME: get rid of .has_split_display in favour of proper ACTIVE_CTL sup= port */ static const struct dpu_ctl_cfg x1e80100_ctl[] =3D { { .name =3D "ctl_0", .id =3D CTL_0, .base =3D 0x15000, .len =3D 0x290, - .features =3D BIT(DPU_CTL_SPLIT_DISPLAY), + .has_split_display =3D 1, .intr_start =3D DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR2, 9), }, { .name =3D "ctl_1", .id =3D CTL_1, .base =3D 0x16000, .len =3D 0x290, - .features =3D BIT(DPU_CTL_SPLIT_DISPLAY), + .has_split_display =3D 1, .intr_start =3D DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR2, 10), }, { .name =3D "ctl_2", .id =3D CTL_2, 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 0f78958ac4476de414d07b727c08feec1c2e9f44..ffc54f77fe5c8883e926e0c6382= 5c9424904cf2d 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.h +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.h @@ -73,16 +73,6 @@ enum { DPU_DSPP_MAX }; =20 -/** - * CTL sub-blocks - * @DPU_CTL_SPLIT_DISPLAY: CTL supports video mode split display - * @DPU_CTL_MAX - */ -enum { - DPU_CTL_SPLIT_DISPLAY =3D 0x1, - DPU_CTL_MAX -}; - /** * WB sub-blocks and features * @DPU_WB_LINE_MODE Writeback module supports line/linear mode @@ -371,10 +361,12 @@ struct dpu_mdp_cfg { * @base: register base offset to mdss * @features bit mask identifying sub-blocks/features * @intr_start: interrupt index for CTL_START + * @has_split_display: CTL supports video mode split display */ struct dpu_ctl_cfg { DPU_HW_BLK_INFO; unsigned int intr_start; + unsigned long has_split_display : 1; }; =20 /** diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_rm.c b/drivers/gpu/drm/msm/d= isp/dpu1/dpu_rm.c index f118c6caa1b9007eb03fa9b39efa87dfb46583ba..1698c5a4447c22c57c3ce9327b9= c81559a6fd921 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_rm.c +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_rm.c @@ -451,8 +451,6 @@ static int _dpu_rm_reserve_ctls( =20 for (j =3D 0; j < ARRAY_SIZE(rm->ctl_blks); j++) { const struct dpu_hw_ctl *ctl; - unsigned long features; - bool has_split_display; =20 if (!rm->ctl_blks[j]) continue; @@ -460,12 +458,11 @@ static int _dpu_rm_reserve_ctls( continue; =20 ctl =3D to_dpu_hw_ctl(rm->ctl_blks[j]); - features =3D ctl->caps->features; - has_split_display =3D BIT(DPU_CTL_SPLIT_DISPLAY) & features; =20 - DPU_DEBUG("ctl %d caps 0x%lX\n", j + CTL_0, features); + DPU_DEBUG("ctl %d split_display %d\n", j + CTL_0, + ctl->caps->has_split_display); =20 - if (needs_split_display !=3D has_split_display) + if (needs_split_display !=3D ctl->caps->has_split_display) continue; =20 ctl_idx[i] =3D j; --=20 2.39.5 From nobody Sun Feb 8 09:32:35 2026 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 79A2724BBFB for ; Thu, 24 Apr 2025 09:31:30 +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=1745487092; cv=none; b=n7IbN/cDMk+YEpnP1T/NYCUhZD6cFqdpFVLSeoZDE+7sRwr5f49YZ69e5mfQaQj2EoyipLDksJzKYxTA1NxIh305UcbS8Y0r70rz4eteaGDaqgvFV4qHMIoB+BjmnUzU9ZvQ1MTyCFzdZQH0H8L4CPad9xXiQ9NN/yueP8F5+D4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745487092; c=relaxed/simple; bh=AjcvQllrIh4quDsFspgBgzLS6C+y1YZ2zRiCyO8balc=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=aLNOblScKtIZhBC78SONMSQbKpeEEF2yi8+p6o/9maakr7oPI5VhkU6RnZ9GUKMRovOXJYUhwTFJMxbaL0HtautKUfSBEUu1WM7c8M2j/aB1yddGQKU8Y4OQciHUyQqb8S77XDajg/j6liiDSF1JoKei4BudY6D5S9+xoj8YMNQ= 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=AScjUmbi; 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="AScjUmbi" Received: from pps.filterd (m0279867.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 53O0FAr3011396 for ; Thu, 24 Apr 2025 09:31:30 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= G3QdS/mgfbkHzv27vUQzt/gfZz34xx6kcnCGBXLlcq8=; b=AScjUmbin9KJQQDc 1KQAoptXaFj3JyzeVI08B83pzvov3m1qqdJVi8RnVB1XRU+PGKbwEsHCFfEmTJRz jP5MtUWinW/GIMGX0wxswsOjNs5nekpEf+smoRNF3mLzfuPJFkCNvOsEjviCYTtB Kbphn3ly+97bNYytqlHaV2HcjBDCdN2bVRbJ2bO1Mh9TB+h3/xlbs0nHJ7u3axqw sjMKSjH270rzLo8iWkQzHJy1HWkoGn6L1UFsCZQju6pNNGMaVGizKY3hC9o4DNFC mI9NX0NCDRATFZCqrFRvM+XduKJQNwr7rMaS+O53Y4AN3CbPLZluVHgN3hYHSfZZ JR2W0g== Received: from mail-qk1-f199.google.com (mail-qk1-f199.google.com [209.85.222.199]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 466jh250jk-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Thu, 24 Apr 2025 09:31:29 +0000 (GMT) Received: by mail-qk1-f199.google.com with SMTP id af79cd13be357-7c0b0cf53f3so116383785a.2 for ; Thu, 24 Apr 2025 02:31:29 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1745487088; x=1746091888; 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=G3QdS/mgfbkHzv27vUQzt/gfZz34xx6kcnCGBXLlcq8=; b=as6QsDsxpFst93R+EMAxWpECk8Ga7vnHaRZQ31Pcl1z81r6i3kL4b8H3NEHq9hTTzB HmfxQqVv+JvWSk/3xRKwfqz/E8IPBWzTeLYDsuz5ycvYbtObV0t/i2Jl1n2RFLfKezWi I1ne3W0kCI4jKcoeuSaZomhiwL5JjTv0gqn3X5xC4mQt0vCv4gl8MIFI4cLt1dRypx50 VHbyTdVwpI0/4jTVtdTB1VhlZlYSOBGaq9sRairgB+amfDCrGleBv4HECSHjHoZOFeSp BLrFTFzCOsRZ23fVnasJgcqTLFvRdFi/NKUigBJ1kaiLZ5a9uMmoT5vd/61VQgXZG5Ds xIgw== X-Forwarded-Encrypted: i=1; AJvYcCWfe89uVlvCsbCdCQPgGud9Er4/Vhqx2hPBpSpUrNoYMLpWWvns1gHTDxFnKHheZRE2iHJPuAwx1kOGMJs=@vger.kernel.org X-Gm-Message-State: AOJu0YxsAFEN6UGyK0gLgICMMgbqIgKRSV6RU46L6CKLU829UDWl445r FZxEO4BWGaRMwC4SloB2waD67YXFCQ2V0D7Mpd9leJbqHKnPjHA7q8iD8BLgOCbzotiTELY+m+c tcu71KC+uTri6kaUjW3lWgmv31tl5GXB7z1t9A+ENrW99QfGT3/yZnBzeoljUgG8= X-Gm-Gg: ASbGnct0MQwbcjWjjhYGAdAi8qGtl3LzErOK2ogBm15Kyio5p+V16A3Du+M4b2UjI+R j+bzyMSl4wuDqm4I5jt9vF5u2hAxxpGZKwao30CNELyyvuPTE7TR996Ond2xVR3/mDt7fUADk/6 mzDZ/g19jn8HcIqMI2br6wmAu0Vmno5KT3QvwnDjoVN/2/JxhPASetE7kP3PgnHzw5xzPO0cO/f jjJmg98p9ZAx+MUosUulKNpRC0RTeQPG3/naAcwmzcgl64Gfyq1dBmLt8Ztc3+wCEiH0Cq6zf1a 8eDmD1vWxANXJySOJO4OX2JtVJobk0FNUf8OM7NYuHRT7MCSVM71b0FOCM6WdNzSXyjq5KvEX47 w3sMDrEkdnXZ046VX77SnjdD4 X-Received: by 2002:a05:620a:4455:b0:7c5:43c2:a8f4 with SMTP id af79cd13be357-7c956e7bcb0mr273118285a.12.1745487088407; Thu, 24 Apr 2025 02:31:28 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGfuf4FFckbyK0jjA6wEHiIn51l5ZbmFFhKBBP6oaOf88hXR85UcIIw+FLmcHn9+XNlZwAObA== X-Received: by 2002:a05:620a:4455:b0:7c5:43c2:a8f4 with SMTP id af79cd13be357-7c956e7bcb0mr273115685a.12.1745487088047; Thu, 24 Apr 2025 02:31:28 -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 38308e7fff4ca-317d1b9a304sm1820461fa.99.2025.04.24.02.31.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 24 Apr 2025 02:31:25 -0700 (PDT) From: Dmitry Baryshkov Date: Thu, 24 Apr 2025 12:30:37 +0300 Subject: [PATCH v3 33/33] drm/msm/dpu: move features out of the DPU_HW_BLK_INFO 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: <20250424-dpu-drop-features-v3-33-cdaca81d356f@oss.qualcomm.com> References: <20250424-dpu-drop-features-v3-0-cdaca81d356f@oss.qualcomm.com> In-Reply-To: <20250424-dpu-drop-features-v3-0-cdaca81d356f@oss.qualcomm.com> To: Rob Clark , Abhinav Kumar , Sean Paul , Marijn Suijten , David Airlie , Simona Vetter , Vinod Koul , Konrad Dybcio Cc: 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=10025; i=dmitry.baryshkov@oss.qualcomm.com; h=from:subject:message-id; bh=8tb1+qRLI7JpcBUvNssngnuycT2/Ign7Y6I5ypwrc4k=; b=owEBbQGS/pANAwAKAYs8ij4CKSjVAcsmYgBoCgSxxJHeC0gbaX0jMUzUxmcs0JidF+LOKmHLq lpx9JT6TY+JATMEAAEKAB0WIQRMcISVXLJjVvC4lX+LPIo+Aiko1QUCaAoEsQAKCRCLPIo+Aiko 1TOHB/9UgvUFqig1fgEqOHhS5Hl70Eyp+Meb0RDrRiiNM3Is7O7DyDPoMJd/A/P2C9Ct8vUrgYb hQd3qrXICxYvUKdU7Wc1pjOSi7h0PXoCYy4ykfPWIdzZUJd9X718yYv3lBrRxiYGISVGAnHif8k tdUA1sh3OFGioW1X15bxH+XkvrQ6RezqU7SnyNxupwjMcgw9jR8K+9tH67UP52tVAGWW3gui9Dd LkyLLH7TiNrrvpxRWY3/rGsFZ64tGS7qjGnviaXfPO9p6PimFHdjYOw691qqD2cYbq6YlkFUoX/ fEBG0ssMkrt6hrSQdb0A+1GLdXmVbrMy5AXP8DcTaM195jTU X-Developer-Key: i=dmitry.baryshkov@oss.qualcomm.com; a=openpgp; fpr=8F88381DD5C873E4AE487DA5199BF1243632046A X-Authority-Analysis: v=2.4 cv=EtLSrTcA c=1 sm=1 tr=0 ts=680a04f1 cx=c_pps a=HLyN3IcIa5EE8TELMZ618Q==:117 a=xqWC_Br6kY4A:10 a=IkcTkHD0fZMA:10 a=XR8D0OoHHMoA:10 a=KKAkSRfTAAAA:8 a=EUspDBNiAAAA:8 a=cFriiCX7-o5b7acnli0A:9 a=QEXdDO2ut3YA:10 a=bTQJ7kPSJx9SKPbeHEYW:22 a=cvBusfyB2V15izCimMoJ:22 X-Proofpoint-GUID: nP7xBNaNmKNJ-JdLrL-aL-9cXzEzwzoB X-Proofpoint-ORIG-GUID: nP7xBNaNmKNJ-JdLrL-aL-9cXzEzwzoB X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUwNDI0MDA2MyBTYWx0ZWRfX1e3ABlCjx2JM ubK47f9v7IWQI/90kepsuEoLOIP6Pfq/8NDPNf+kyYfZXcx0wjw5NNt1yIbfmFqtbRTAomSPtPg nu4nJTsYfv+Oewd5lL561C2Dpr93sP9k//c3Ds5e1Ai57W+HkVFnZgdXAhNagLkVcCfprPflr8k LTtfy99aTWT7KTXEvTzcq9+fqndDkRwiTbtr4O8Ks9sjGJM/r2tbhs3WumxPymr1yD8SRd24ufO 9JNddedfxDWQKZKQ+lbp/hCWzkBDlDnUHv4EsmamUgiEKURwau127hWpMnWpppvGW0I810dkQjW fLI9SZc9dqK6E9PkR8YIFTAJIVrElAfKb6e8rPTYId43EVny/p8zfMvUnpben7w+CpJT9vfy98i FDqCdjEJLqsdvoNg7BiSCgjnQ6uOLjQ7Ja7aMvfrbBUhNHZ2HaExoaj+TTWnf0SVQXGLXUBl X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1099,Hydra:6.0.680,FMLib:17.12.80.40 definitions=2025-04-24_04,2025-04-22_01,2025-02-21_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 bulkscore=0 phishscore=0 suspectscore=0 mlxscore=0 clxscore=1015 spamscore=0 mlxlogscore=999 lowpriorityscore=0 malwarescore=0 priorityscore=1501 impostorscore=0 adultscore=0 classifier=spam authscore=0 authtc=n/a authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.19.0-2504070000 definitions=main-2504240063 From: Dmitry Baryshkov Only SSPP, WB and VBIF still have feature bits remaining, all other hardware blocks don't have feature bits anymore. Remove the 'features' from the DPU_HW_BLK_INFO so that it doesn't get included into hw info structures by default and only include it when necessary. Signed-off-by: Dmitry Baryshkov Signed-off-by: Dmitry Baryshkov --- drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_5_3_sm6150.h | 1 - drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_5_4_sm6125.h | 1 - drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.h | 17 ++++----------= --- drivers/gpu/drm/msm/disp/dpu1/dpu_hw_dsc_1_2.c | 5 ++--- drivers/gpu/drm/msm/disp/dpu1/dpu_hw_merge3d.c | 5 ++--- drivers/gpu/drm/msm/disp/dpu1/dpu_hw_top.c | 4 ++-- 6 files changed, 10 insertions(+), 23 deletions(-) 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 a065f102ce592311376f1186add7a47dca7fd84f..26883f6b66b3e506d14eeb1c0bd= 64f556d19fef8 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 @@ -20,7 +20,6 @@ static const struct dpu_caps sm6150_dpu_caps =3D { static const struct dpu_mdp_cfg sm6150_mdp =3D { .name =3D "top_0", .base =3D 0x0, .len =3D 0x45c, - .features =3D 0, .clk_ctrls =3D { [DPU_CLK_CTRL_VIG0] =3D { .reg_off =3D 0x2ac, .bit_off =3D 0 }, [DPU_CLK_CTRL_DMA0] =3D { .reg_off =3D 0x2ac, .bit_off =3D 8 }, 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 8c909c41b48a18fdc54753c68bc2ad19001cd3b4..1884371736bfcf78a99661baeda= dc0450bb4376e 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 @@ -22,7 +22,6 @@ static const struct dpu_caps sm6125_dpu_caps =3D { static const struct dpu_mdp_cfg sm6125_mdp =3D { .name =3D "top_0", .base =3D 0x0, .len =3D 0x45c, - .features =3D 0, .clk_ctrls =3D { [DPU_CLK_CTRL_VIG0] =3D { .reg_off =3D 0x2ac, .bit_off =3D 0 }, [DPU_CLK_CTRL_DMA0] =3D { .reg_off =3D 0x2ac, .bit_off =3D 8 }, 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 ffc54f77fe5c8883e926e0c63825c9424904cf2d..f5ce35cd966459f0edf2dbdd2db= c2693779fac73 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.h +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.h @@ -124,14 +124,12 @@ enum { * @id: enum identifying this block * @base: register base offset to mdss * @len: length of hardware block - * @features bit mask identifying sub-blocks/features */ #define DPU_HW_BLK_INFO \ char name[DPU_HW_BLK_NAME_LEN]; \ u32 id; \ u32 base; \ - u32 len; \ - unsigned long features + u32 len =20 /** * struct dpu_scaler_blk: Scaler information @@ -348,7 +346,6 @@ struct dpu_clk_ctrl_reg { /* struct dpu_mdp_cfg : MDP TOP-BLK instance info * @id: index identifying this block * @base: register base offset to mdss - * @features bit mask identifying sub-blocks/features * @clk_ctrls clock control register definition */ struct dpu_mdp_cfg { @@ -359,7 +356,6 @@ struct dpu_mdp_cfg { /* struct dpu_ctl_cfg : MDP CTL instance info * @id: index identifying this block * @base: register base offset to mdss - * @features bit mask identifying sub-blocks/features * @intr_start: interrupt index for CTL_START * @has_split_display: CTL supports video mode split display */ @@ -381,6 +377,7 @@ struct dpu_ctl_cfg { */ struct dpu_sspp_cfg { DPU_HW_BLK_INFO; + unsigned long features; const struct dpu_sspp_sub_blks *sblk; u32 xin_id; enum dpu_clk_ctrl_type clk_ctrl; @@ -391,7 +388,6 @@ struct dpu_sspp_cfg { * struct dpu_lm_cfg - information of layer mixer blocks * @id: index identifying this block * @base register offset of this block - * @features bit mask identifying sub-blocks/features * @sblk: LM Sub-blocks information * @pingpong: ID of connected PingPong, PINGPONG_NONE if unsuppor= ted * @lm_pair: ID of LM that can be controlled by same CTL @@ -410,7 +406,6 @@ struct dpu_lm_cfg { * struct dpu_dspp_cfg - information of DSPP blocks * @id enum identifying this block * @base register offset of this block - * @features bit mask identifying sub-blocks/features * supported by this block * @sblk sub-blocks information */ @@ -423,7 +418,6 @@ struct dpu_dspp_cfg { * struct dpu_pingpong_cfg - information of PING-PONG blocks * @id enum identifying this block * @base register offset of this block - * @features bit mask identifying sub-blocks/features * @intr_done: index for PINGPONG done interrupt * @intr_rdptr: index for PINGPONG readpointer done interrupt * @sblk sub-blocks information @@ -440,8 +434,6 @@ struct dpu_pingpong_cfg { * struct dpu_merge_3d_cfg - information of DSPP blocks * @id enum identifying this block * @base register offset of this block - * @features bit mask identifying sub-blocks/features - * supported by this block * @sblk sub-blocks information */ struct dpu_merge_3d_cfg { @@ -454,7 +446,6 @@ struct dpu_merge_3d_cfg { * @id enum identifying this block * @base register offset of this block * @len: length of hardware block - * @features bit mask identifying sub-blocks/features * @sblk: sub-blocks information * @have_native_42x: Supports NATIVE_422 and NATIVE_420 encoding */ @@ -468,7 +459,6 @@ struct dpu_dsc_cfg { * struct dpu_intf_cfg - information of timing engine blocks * @id enum identifying this block * @base register offset of this block - * @features bit mask identifying sub-blocks/features * @type: Interface type(DSI, DP, HDMI) * @controller_id: Controller Instance ID in case of multiple of intf = type * @prog_fetch_lines_worst_case Worst case latency num lines needed to pre= fetch @@ -499,6 +489,7 @@ struct dpu_intf_cfg { */ struct dpu_wb_cfg { DPU_HW_BLK_INFO; + unsigned long features; u8 vbif_idx; u32 maxlinewidth; u32 xin_id; @@ -567,6 +558,7 @@ struct dpu_vbif_qos_tbl { */ struct dpu_vbif_cfg { DPU_HW_BLK_INFO; + unsigned long features; u32 default_ot_rd_limit; u32 default_ot_wr_limit; u32 xin_halt_timeout; @@ -584,7 +576,6 @@ struct dpu_vbif_cfg { * @name string name for debug purposes * @id enum identifying this block * @base register offset of this block - * @features bit mask identifying sub-blocks/features */ struct dpu_cdm_cfg { DPU_HW_BLK_INFO; diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_dsc_1_2.c b/drivers/gpu/d= rm/msm/disp/dpu1/dpu_hw_dsc_1_2.c index 42b4a5dbc2442ae0f2adab80a5a3df96b35e62b0..df6e43672422f1d796e38c32256= 582900f58523e 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_dsc_1_2.c +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_dsc_1_2.c @@ -360,8 +360,7 @@ static void dpu_hw_dsc_bind_pingpong_blk_1_2(struct dpu= _hw_dsc *hw_dsc, DPU_REG_WRITE(hw, sblk->ctl.base + DSC_CTL, mux_cfg); } =20 -static void _setup_dcs_ops_1_2(struct dpu_hw_dsc_ops *ops, - const unsigned long features) +static void _setup_dcs_ops_1_2(struct dpu_hw_dsc_ops *ops) { ops->dsc_disable =3D dpu_hw_dsc_disable_1_2; ops->dsc_config =3D dpu_hw_dsc_config_1_2; @@ -391,7 +390,7 @@ struct dpu_hw_dsc *dpu_hw_dsc_init_1_2(struct drm_devic= e *dev, =20 c->idx =3D cfg->id; c->caps =3D cfg; - _setup_dcs_ops_1_2(&c->ops, c->caps->features); + _setup_dcs_ops_1_2(&c->ops); =20 return c; } diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_merge3d.c b/drivers/gpu/d= rm/msm/disp/dpu1/dpu_hw_merge3d.c index 0b3325f9c8705999e1003e5c88872562e880229b..83b1dbecddd2b30402f47155fa2= f9a148ead02c1 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_merge3d.c +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_merge3d.c @@ -33,8 +33,7 @@ static void dpu_hw_merge_3d_setup_3d_mode(struct dpu_hw_m= erge_3d *merge_3d, } } =20 -static void _setup_merge_3d_ops(struct dpu_hw_merge_3d *c, - unsigned long features) +static void _setup_merge_3d_ops(struct dpu_hw_merge_3d *c) { c->ops.setup_3d_mode =3D dpu_hw_merge_3d_setup_3d_mode; }; @@ -62,7 +61,7 @@ struct dpu_hw_merge_3d *dpu_hw_merge_3d_init(struct drm_d= evice *dev, =20 c->idx =3D cfg->id; c->caps =3D cfg; - _setup_merge_3d_ops(c, c->caps->features); + _setup_merge_3d_ops(c); =20 return c; } diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_top.c b/drivers/gpu/drm/m= sm/disp/dpu1/dpu_hw_top.c index 5c811f0142d5e2a012d7e9b3a918818f22ec11cf..96dc10589bee6cf144eabaecf9f= 8ec5777431ac3 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_top.c +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_top.c @@ -264,7 +264,7 @@ static void dpu_hw_dp_phy_intf_sel(struct dpu_hw_mdp *m= dp, } =20 static void _setup_mdp_ops(struct dpu_hw_mdp_ops *ops, - unsigned long cap, const struct dpu_mdss_version *mdss_rev) + const struct dpu_mdss_version *mdss_rev) { ops->setup_split_pipe =3D dpu_hw_setup_split_pipe; ops->setup_clk_force_ctrl =3D dpu_hw_setup_clk_force_ctrl; @@ -313,7 +313,7 @@ struct dpu_hw_mdp *dpu_hw_mdptop_init(struct drm_device= *dev, * Assign ops */ mdp->caps =3D cfg; - _setup_mdp_ops(&mdp->ops, mdp->caps->features, mdss_rev); + _setup_mdp_ops(&mdp->ops, mdss_rev); =20 return mdp; } --=20 2.39.5