From nobody Sun Dec 14 06:40:54 2025 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 7E9BC29B773 for ; Thu, 22 May 2025 19:03:52 +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=1747940634; cv=none; b=TLE9Rrxh1wjPriOCBqY+UT9sRgOqgqGplrzCD6yxTE7itEsN9DRay+DPWPjPxrOddVlzBdl1BevPq1JsGrzO3lNVPKMhm9diiRjeB6oygnAbil5/dljBoj0epT0WufkQKfgARjhkkWZxyYn6GDsu2uqFXtc29t+gmAq7iMB5IMQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1747940634; c=relaxed/simple; bh=C/fkV4RJEbIljMUecy7d8Dm54N2WIZnBLf255ExSex0=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=U+CPFz0v8cz7ilOvuOSRu5/gA0kXTRC8cEsnCjWG1t1pCVETBZEhr74B4tF/6/AggMpNB9b5BHY8MAGVfZluvDb8M+wsRbliBLonRZ+HEymifXoyBxmg2etDpIGFi4IOkkhlXATfmswGXuCKkFtiLlZX2WowZNhap3GU17dqRCo= 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=Uv9eWw80; 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="Uv9eWw80" 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 54MGgFVg027699 for ; Thu, 22 May 2025 19:03: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= Ri/QKCy9CGa3/NJrEtAUKAKyT/Jp6jvRpLEBwHpbnVA=; b=Uv9eWw80ew6eMXkR ApORJjIl+iynL6RybQ628fvRaHsprTHztwaNAU+g8F4Ak1heClnvCRf6s/U/LjBz N9K3jPJT5ux2wkfz5oKQyoayjoV5eXHXhV/Fl4OHPje0/INf7jJJ/sI5DjlJehYF YfLVdsZHSkYWFT2IHb3wNrxYzkeZb2SVk8J5tLtaGWtQx5qot2KFf7I388Tl6z3F r1LQh+z4TiG6DNP/tMRMLHujCB1BMxeZCKYG2IsgTzUopxZK8t2e+U5PsRBUrGy3 ea7qiMKaYmSOvKdMgR5TQc9GrTK0Guesxql8rA2zU9oK1ibV5oUo4C0mnAva//tv zd6BxQ== 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 46rwf9fb1r-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Thu, 22 May 2025 19:03:50 +0000 (GMT) Received: by mail-qk1-f200.google.com with SMTP id af79cd13be357-7c9305d29abso1501560585a.1 for ; Thu, 22 May 2025 12:03:50 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1747940615; x=1748545415; 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=Ri/QKCy9CGa3/NJrEtAUKAKyT/Jp6jvRpLEBwHpbnVA=; b=lV/ne9aYANJYXs6q4X42De7LyoDnTkwrwAx9FAjfUsGGaJJ+08BFGW5HyBrb70MnBb J4wkkTeR3Yd8kYAnnbDNWvBhZRPtbBjWH+SkntbhEj92TR7+7ie+hYlmTsiYTK50gbeu t1F+S+XcPaEY1zxMr4niwG2MH9o0KARzhdbgJkuxbKmE2156uzRZZU4oU0s5Jc55wOCf NobxSq8kDPcaK7eCQsg2WNpipvAws/LvR3Nsh0Nbo0ariVKucvfI6+DYKHTuKgmVRPtk Kel53zmnbbKsNUG6115LKDRJbKskWlfbvnmmd7nL9MEpwCdpba6a8Jd0YcoaflxW6MGN MOKA== X-Forwarded-Encrypted: i=1; AJvYcCU2oRlOf+sd7Zg7n7CJVPvYBNY3YFgG1LjZZYtIFBt/R+/VW13MBJPbRd3pLp7av1c0XOV/bJqQpgT1jrM=@vger.kernel.org X-Gm-Message-State: AOJu0Yy+Jcl+TagDylx2y3ERrm88eJg60Gz4WFO7n3pE2BbGBaN5jZdp MpuMGXir01FkWCaNNgADFsMPQb8PNpeBDZikbXTuYjF6eRo2rghGwNPL1SPHJ08DFdDMD8FBbx2 ArlIOEfNc+v00oNx1XjSgVTNpur8SEjl7u6eEfcQ6NRKCp99AXtBJJFAknjp4/pLn3lo= X-Gm-Gg: ASbGncvVbIdPF12UWyCEIDUW3bf/4ci2qDDY2jYqUANhx1w3ynz0C3yJfMWUPKDrrFP L0XM5Fkmq6jEn5DSPYxtv6jhFurckeI1WKnGLlrZubg9ngx7IteFvpSZ4eb9LkeYyjsvlfWdudr znJ6c+k7FSfKyuPdcu1FWJr12Lcl6htDsy4PLxY+XFBQvEOcL4XaLSsLuwiblPZnvw0hGTesLEA JBlA7dLGye5KiNTjYJVvAa4XtMdjqYncqIItUJ0zcnNTGRajPn7/JYzKf96vAsTAnPiASieOKL9 xHhsw7x0TZAsVzxgcE3BKSGXA+5gpXkGrxBA9Pkv0Oq8FUNODen7skaTxnUfsi5JWCwB4FBDX+M 7orpgdew7NoCNDChA4TqRmZxc X-Received: by 2002:a05:620a:294a:b0:7c9:5eca:ea3b with SMTP id af79cd13be357-7cd46731a51mr3537346185a.31.1747940615049; Thu, 22 May 2025 12:03:35 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEuDtGUc4muO1Z0QfsR40omgcfSLLvYeuvR7jOav5AMf+UAhT3khSrkdB1PHtMoiqedxkYO0w== X-Received: by 2002:a05:620a:294a:b0:7c9:5eca:ea3b with SMTP id af79cd13be357-7cd46731a51mr3537339785a.31.1747940614571; Thu, 22 May 2025 12:03: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 2adb3069b0e04-550e703c2f3sm3482506e87.214.2025.05.22.12.03.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 22 May 2025 12:03:33 -0700 (PDT) From: Dmitry Baryshkov Date: Thu, 22 May 2025 22:03:20 +0300 Subject: [PATCH v5 01/30] 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: <20250522-dpu-drop-features-v5-1-3b2085a07884@oss.qualcomm.com> References: <20250522-dpu-drop-features-v5-0-3b2085a07884@oss.qualcomm.com> In-Reply-To: <20250522-dpu-drop-features-v5-0-3b2085a07884@oss.qualcomm.com> To: Rob Clark , Abhinav Kumar , Sean Paul , Marijn Suijten , David Airlie , Simona Vetter , Vinod Koul , Konrad Dybcio Cc: Neil Armstrong , linux-arm-msm@vger.kernel.org, dri-devel@lists.freedesktop.org, freedreno@lists.freedesktop.org, linux-kernel@vger.kernel.org, Dmitry Baryshkov X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=3775; i=dmitry.baryshkov@oss.qualcomm.com; h=from:subject:message-id; bh=/jtEB/eJ70Kwf3ZRDcLKCteC/8VDM7I/q74Ga6UWOgI=; b=owEBbQGS/pANAwAKAYs8ij4CKSjVAcsmYgBoL3T7fyavGriyaGHOj+ADxHUnLpxMPrK8HtV8i TMAZBo/dmCJATMEAAEKAB0WIQRMcISVXLJjVvC4lX+LPIo+Aiko1QUCaC90+wAKCRCLPIo+Aiko 1Qz4B/9/zYYjE1ZBotnVsVpgFu835IeL57emvaCd5NC4Ll9kNPtZ75ai0PL8BIf+M8dgSffevtl giD8oXN1n5hVbBh5eAxH69ztZEBrI3AJeqgZcIl3D5WXln1EwAp0soeINMuIK5J3nQimMhUFyrM 5o3eW2+kOUrPNZ19nXL0dJt75xuzpBYt7BSOqeRPunxAIfoWLlfGryVXBWHkfKG98AwM2lxhrzs CUKjnMftbz06GQJKmtte2V6ZsULO9S/TXsj25REbt+X3vW/YoOULxSWIdwTLn7OdOmwqUl+5bKy 6qOvclVm+BrIJzR5vC7oicPCr5FHeV7vulPT27AC4EnTFh+L X-Developer-Key: i=dmitry.baryshkov@oss.qualcomm.com; a=openpgp; fpr=8F88381DD5C873E4AE487DA5199BF1243632046A X-Proofpoint-ORIG-GUID: d_xbmNwV3tw6RoJuKK4ojqRkjqvHSuoy X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUwNTIyMDE5MiBTYWx0ZWRfXwtM5aRnQuPtU O5SbwHdSAfyx8XrorraFjp/6fVOQtVPqfldThU9vmC3sIvm4kTqfbhd01daCc7PMTtJ6bFv6xN0 0np90ZrjdTFZ6H2lnwHIBzgunBbi9fHLu2Wf1sDkaihoMMV2Slr6Rj2SepcPrM+nATAZHvAxWFN D+4Aye/9nDgFJqqGlxN3eDHVWRgDbS8Xks33rZVVtVOqFOvS/QTVc7Ld4gyB1Pxz36op5Cp7Z1z xquAh5Cb0/ZQJ6BsRDw383iep2nIFRt1h5A939VUK0szg/Mpl1RXSVHfmLzU8ouK3uMXBh6rQfD IjBFa2awfZmqCMYqjAN2YSuiOujToLYFqlGeBS3MO5CDaD6VdRnT8X42bLOrELdxUSKw/qDJKg1 zxFo2lTYN1Z97wbgLJVJ8ENJw4bWyWvRUimFwsULmZDziKBOPO2reTMhXegwWeA7DGeGKbJq X-Authority-Analysis: v=2.4 cv=GawXnRXL c=1 sm=1 tr=0 ts=682f7517 cx=c_pps a=hnmNkyzTK/kJ09Xio7VxxA==:117 a=xqWC_Br6kY4A:10 a=IkcTkHD0fZMA:10 a=dt9VzEwgFbYA:10 a=KKAkSRfTAAAA:8 a=EUspDBNiAAAA:8 a=Fc1Z5Xec4v_XsjI5eh8A:9 a=QEXdDO2ut3YA:10 a=PEH46H7Ffwr30OY-TuGO:22 a=cvBusfyB2V15izCimMoJ:22 X-Proofpoint-GUID: d_xbmNwV3tw6RoJuKK4ojqRkjqvHSuoy X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1099,Hydra:6.0.736,FMLib:17.12.80.40 definitions=2025-05-22_09,2025-05-22_01,2025-03-28_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 mlxscore=0 mlxlogscore=999 lowpriorityscore=0 impostorscore=0 priorityscore=1501 clxscore=1015 malwarescore=0 phishscore=0 bulkscore=0 spamscore=0 suspectscore=0 adultscore=0 classifier=spam authscore=0 authtc=n/a authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.19.0-2505160000 definitions=main-2505220192 From: Dmitry Baryshkov 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 Reviewed-by: Neil Armstrong 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 8a618841e3ea89acfe4a42d48319a6c54a1b3495..d35d15b60260037c5c0c369cb06= 1e7759243b6fd 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 @@ -309,8 +309,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 Dec 14 06:40:54 2025 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 501B32882C6 for ; Thu, 22 May 2025 19:03:52 +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=1747940636; cv=none; b=A2Pf8Kckpnv87TYizrI3ZxrNxiKKcAqlUJdMSKZQEuTcjvijALza6xM6zputMhJobZAKRoSTbtgB8xQ7b0x6nhh3Yi+vJvm3Pj3B94q0vZxPKzQvPMmGcww+xjNKEHT60sbmoSpA0zDdCGw3sVgxBxNcWEWCS6qmGuZbb7x/ug4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1747940636; c=relaxed/simple; bh=ZJw7qG5WRsF/6O1dcCrVTRqJXMgP6JzM9Pg8XLgMQSM=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=iEfycqSq6thBR5SIhFM5iY2pydXqpkQMioEDiZvdm51RrE91R1dOGDUEV3P+PoLv2mfsCkqU3Fnma3VvTS+mijuFbE1Bfent3uZv/Wobp9Vhac526vl/D3v3P6MbRc5kWX5EKvPHKVEDz1TEYnHOIwTm1D7FUyHtpx/anFHrvGE= 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=iD/AifHY; 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="iD/AifHY" 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 54MHN44W027651 for ; Thu, 22 May 2025 19:03: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= Qcr85CicE+cO+piF+cNk0hAEVQxv+ZHV4m7cUgeZRdI=; b=iD/AifHYKQICNnJ8 2cIcPopYJERLQFHodeMyiq/UEGeGcOihs7bolkKOY2MyfF5T8Qtzk7M3NpvFNYlZ /MPGH/EnZ34OScQXE48NqCboHUTiuNKDs1bI3yPhH7S3Htj5IZiUaOLrt5MZSJVE 0TmXb+qnc833LuxtEXz0sOl2z3luFmzxQOlbSC/MUX63oLXb6lr6/LVX/tyWsqmw 754kutQZEW80JyTcYm/12UZqUCtO4rOnbEMUFxuxewaJjuqjE7uhJF9Q8YZJ8lkS G/qNdtuw8aEHF/brjuzRU/Cz3gFdT3jPdGGLfJDVUTc/P55xTpZCZ6K+/DMSPG3E 7OnEWg== 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 46rwf9fb1t-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Thu, 22 May 2025 19:03:51 +0000 (GMT) Received: by mail-qk1-f198.google.com with SMTP id af79cd13be357-7c5f876bfe0so1463997885a.3 for ; Thu, 22 May 2025 12:03:50 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1747940617; x=1748545417; 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=Qcr85CicE+cO+piF+cNk0hAEVQxv+ZHV4m7cUgeZRdI=; b=ZZFzbLki8Hc0mUb5/hltnAF5ZTv3VY/Gt6VPMddh6ySF5zsviinKCvcAfk5EM9/21D UlzEHR5j/txyNMWRl5zWt6xomaIMIfuZlHCcB2HhpM/5m175YUVnLQhIHQlZfHqn2GAJ hDevwH29SaoZ6nyvLhLDvTRfH+4qefbePonz/C+8l8BdHQ7rmil9MtQ7FYIVUWVgAvkZ A9DVdWVT4hlyTkcCKB3hPVvECMGU5/GkbHBzk9ZkMhO6cOUk5FL66+aZHWkK3EGClwzX sWkxd6+BvLwhhOUj4E+Rej1I9phZ6LyhS465PuKqV+xESmk8I8+tooVKblI3iOXoQ9Jp feqg== X-Forwarded-Encrypted: i=1; AJvYcCUSqCzxb7etspdxXCGK9jdeLgg20P2hPr+1aI1l5+EuntyjDouG7ZVhe+3vCXAtWvKP6O8g9sDMTJZ80sI=@vger.kernel.org X-Gm-Message-State: AOJu0Yxt7eklKlx5OXQgN5jf/QuHZB5jqQwLo1ahip9S6EYbNhUvck6W i5VeA/wyO1n6yjrJbpI3BInmYmPeVHEr4oM/spb/8MJr0Gbkwsau7HabhLOAEOZWwyg2zXM18rw BflQU3RYlZkXlhMDDn7e9Q3+NMvvTM98mR/gzMeIzEzkUofpol6h/3Crmkd1A7tFBCP8= X-Gm-Gg: ASbGnctbUTEKMEv3tYxBrbf4NgNpm9pAImNhco84QxN1xqw19g3l06zAMYXbkiQ+yPw bwDM0MDrn/fErslA+ReWNciP1X7ctkXjRqMNFHmdcMI1kVQF0K3/HN1K1hPMTY71lD+XW7yhHur Dzj24KTk6+sIjv9Wjl/oCqXAedcI9CpILS0F13gSnJHoIA4L3y8Zk1MV1egcfaC+fqoZXedLQYx QBiJPBxSsVMLvZ8sSFmrOjt+XAdv0y4NfajY/GRY6O1cULgQmdvWmfdCrs3kbH/WogFbQSKLpQh P4rS7q0isDHwZKz+wNapWkNFYr1G3mgblItmEmHwC62i1vy2ErDaTKpvpn4Ie9hFjKszzzy/iB0 hjGNdMwzw9hyuz95G+TO4lhXe X-Received: by 2002:a05:620a:4593:b0:7c5:962b:e87c with SMTP id af79cd13be357-7cd46779c9dmr4397484285a.44.1747940616793; Thu, 22 May 2025 12:03:36 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEErjQgTGhDY48RV3+8n50/fZxem4RLumDvfcEsj/z9bXlVbzR8Ve9wCCGwubSQ5RQ5e0GWTA== X-Received: by 2002:a05:620a:4593:b0:7c5:962b:e87c with SMTP id af79cd13be357-7cd46779c9dmr4397477685a.44.1747940616339; Thu, 22 May 2025 12:03: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 2adb3069b0e04-550e703c2f3sm3482506e87.214.2025.05.22.12.03.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 22 May 2025 12:03:35 -0700 (PDT) From: Dmitry Baryshkov Date: Thu, 22 May 2025 22:03:21 +0300 Subject: [PATCH v5 02/30] 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: <20250522-dpu-drop-features-v5-2-3b2085a07884@oss.qualcomm.com> References: <20250522-dpu-drop-features-v5-0-3b2085a07884@oss.qualcomm.com> In-Reply-To: <20250522-dpu-drop-features-v5-0-3b2085a07884@oss.qualcomm.com> To: Rob Clark , Abhinav Kumar , Sean Paul , Marijn Suijten , David Airlie , Simona Vetter , Vinod Koul , Konrad Dybcio Cc: Neil Armstrong , linux-arm-msm@vger.kernel.org, dri-devel@lists.freedesktop.org, freedreno@lists.freedesktop.org, linux-kernel@vger.kernel.org, Dmitry Baryshkov X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=20890; i=dmitry.baryshkov@oss.qualcomm.com; h=from:subject:message-id; bh=4lOReniyl5hQmf7R+K3ps3iGqGzEzVVioPHVCuaJzLY=; b=owEBbQGS/pANAwAKAYs8ij4CKSjVAcsmYgBoL3T7f5YFzZ0/BtQcx1tXtygIOXMMuPcmNQUfX Q5AXFiMLaaJATMEAAEKAB0WIQRMcISVXLJjVvC4lX+LPIo+Aiko1QUCaC90+wAKCRCLPIo+Aiko 1XYaB/9ErWqL0o0PMKXiXzvprUY5RAh2ryiW8bR3j6ETqyJ3xSRvimQLZkK8FqZU122Fo9vwJUG fvQznQHunAKBHtRid8RRUwBJ+tOcPvxWEx6QbcOc1I7J4wyGMBDnS+PQA7TPj+o/lywrQILZJKd V7uekay5PoyzTkB+oHy9/Hc4uQOk4EIaR4aGiAlwPxeIF6T0IYhQdBkrd92FR8djKrv8Z0+n7PF clmmr3uFYe2GY2r1LSiUmI5A6rSJlWZrpm+AXJgykcHLP2Cka5gX3AOuXTPZGCGLrkn4U8symlO 9+O4pmYJvZ1yI1PxtFbCLkmCQ2rurxjYJ//+iJs4MJXJ2h3/ X-Developer-Key: i=dmitry.baryshkov@oss.qualcomm.com; a=openpgp; fpr=8F88381DD5C873E4AE487DA5199BF1243632046A X-Proofpoint-ORIG-GUID: 9gGqxOt0tFSo3iHUbdq3TYqWJsXhm0BE X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUwNTIyMDE5MiBTYWx0ZWRfX71T4/j4mvLN6 fnbtVKJ0qnQbPegtjfekjToqNgEoyrcbCXjZTZqJVVnf8f0ZoW0DyuyD0P/S2NJzOEDZr4IBinm HalvglzuPfPnCkZdgFKolaVSmQY/F86733vhGn5horzJgPwa9Yj95C6LyItYvv7a9W+PRTUV/Jf mDYidhG+Nz3vfLfoDJFtRKTL8eLIIpLDeijSacptiu6CS8Fucm05kLn0uzo1ZpvL4KTpoCDJdKf ZeKCy/eFdto13O2ezp1ZqPijEfup1b7bRyAifSk+fFIBlN9LBE4/+VDj15DZp9mHKJqs5yKsebg wK37+2uTHD9+UhubMjZB0T9WGnRyaW5uq1qhFxQpCetJ7le5Xp56bvh0UhnbuwQejCs2VDbTOa8 8xcpR2u22s9WarUqy5+49Q0FCCqX48YkfA9egQ+TrKn53LaUjf9ZgVcQ1dc95LrkA0ZOfrzJ X-Authority-Analysis: v=2.4 cv=GawXnRXL c=1 sm=1 tr=0 ts=682f7517 cx=c_pps a=qKBjSQ1v91RyAK45QCPf5w==:117 a=xqWC_Br6kY4A:10 a=IkcTkHD0fZMA:10 a=dt9VzEwgFbYA:10 a=KKAkSRfTAAAA:8 a=COk6AnOGAAAA:8 a=EUspDBNiAAAA:8 a=LdkPZyY3_TlY3W2BU1QA:9 a=QEXdDO2ut3YA:10 a=NFOGd7dJGGMPyQGDc5-O:22 a=cvBusfyB2V15izCimMoJ:22 a=TjNXssC_j7lpFel5tvFf:22 X-Proofpoint-GUID: 9gGqxOt0tFSo3iHUbdq3TYqWJsXhm0BE X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1099,Hydra:6.0.736,FMLib:17.12.80.40 definitions=2025-05-22_09,2025-05-22_01,2025-03-28_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 mlxscore=0 mlxlogscore=999 lowpriorityscore=0 impostorscore=0 priorityscore=1501 clxscore=1015 malwarescore=0 phishscore=0 bulkscore=0 spamscore=0 suspectscore=0 adultscore=0 classifier=spam authscore=0 authtc=n/a authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.19.0-2505160000 definitions=main-2505220192 From: Dmitry Baryshkov 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 Signed-off-by: Dmitry Baryshkov --- .../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_1_sar2130p.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 -- 10 files changed, 49 insertions(+), 51 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 ffc4d4257ae52553bada7a7a270ab02f566359f5..61420821a5f2dd5e56b8336c898= 290a2552c77fa 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 @@ -374,7 +374,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, @@ -383,7 +383,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, @@ -393,7 +393,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, @@ -403,7 +403,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 90e86063a37277c0e15c6ba5b41c29fa769e25d8..e887e78059a81569fac8a4246ad= 63856dc48cfcb 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 @@ -318,7 +318,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, @@ -327,7 +327,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, @@ -337,7 +337,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, @@ -347,7 +347,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 139f11321fea8cf96d6315abf1a8d2f9b9663c02..9d60208745138bf29a7bdbd14ef= 28a2102f36f9f 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 @@ -314,7 +314,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, @@ -323,7 +323,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, @@ -333,7 +333,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, @@ -343,7 +343,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, @@ -352,7 +352,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, @@ -361,7 +361,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, @@ -370,7 +370,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, @@ -379,7 +379,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, @@ -388,7 +388,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 461294143a9004ac2d18afbd57c2dc235e676fea..631154059c31e8ce1b9e3631552= ce49aa589d4cf 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 @@ -334,7 +334,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, @@ -343,7 +343,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, @@ -353,7 +353,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, @@ -363,7 +363,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 c248b3b55c410d8e374b8b659eeddbb657bbe854..3547fdfb28cae6cd8d1909b268b= 88676afad0be7 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 @@ -344,7 +344,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, @@ -353,7 +353,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, @@ -363,7 +363,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, @@ -373,7 +373,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, @@ -382,7 +382,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, @@ -391,7 +391,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, @@ -400,7 +400,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, @@ -409,7 +409,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 59c7fdf28e890f0c4c15e869e549488003fcd087..e16e47a6f426359548434569ad6= 32aa68f32908d 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 @@ -329,7 +329,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, @@ -338,7 +338,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, @@ -348,7 +348,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, @@ -358,7 +358,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_1_sar2130p.h b/dri= vers/gpu/drm/msm/disp/dpu1/catalog/dpu_9_1_sar2130p.h index 5667d055fbd1d8125c3231302daa3e05de5944c9..f85d5d7ae51d64203647a8bcec9= 1f524c6e33528 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_9_1_sar2130p.h +++ b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_9_1_sar2130p.h @@ -329,7 +329,7 @@ static const struct dpu_intf_cfg sar2130p_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, @@ -338,7 +338,7 @@ static const struct dpu_intf_cfg sar2130p_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, @@ -348,7 +348,7 @@ static const struct dpu_intf_cfg sar2130p_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, @@ -358,7 +358,7 @@ static const struct dpu_intf_cfg sar2130p_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 52cc10aec1f9f539a1ca26339704a053d5c38a82..0d6511f90975508b36b0fa00a92= 349a82eff4d52 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 @@ -330,7 +330,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, @@ -339,7 +339,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, @@ -349,7 +349,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, @@ -359,7 +359,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, @@ -368,7 +368,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, @@ -377,7 +377,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, @@ -386,7 +386,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, @@ -395,7 +395,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, @@ -404,7 +404,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 c878fe196aeb6c6b19fc3173fb8615f184ccf2d1..d383368c743b202d7256f6759de= ecaf9d756bb02 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.c +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.c @@ -120,8 +120,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 Dec 14 06:40:54 2025 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 92774186295 for ; Thu, 22 May 2025 19:03:40 +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=1747940624; cv=none; b=Q97GjP35PVSjBdT8T2U+7UiJGZwD8YFWZ1+feLiOMzAmmR8Jr0ODvhkhpgJvxkYvhQfqkZH1VU7S8U+l/Tj7si0AtMBML0yWzRN9Go2FUsg8tHlvzcwCR/9nWNt/4FknPbChqCWXJDJVTuSaFnWGAlaertQ5ZGPxe7ptNzD/Bbw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1747940624; c=relaxed/simple; bh=WrPL+Fds/SdvaK5M9rAQ/MNc3BQLSxfriO2pPAkHVSI=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=QZ2G/iwXELtn0D4R0B32U+WFEYi0p/RaIptoqT0dGV0F5/23RMg/BH+mxlBVqMviZTNkqS3TsYonSuO5+3jBlAcrJwDLLATkbLfRdjljQJlqMBkNhtTXUqvITy/5qY/tL46Z0bJ9pmRLfHGLQRRd/lXjmPQMVWUetnte9F37j4c= 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=LefIQefk; 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="LefIQefk" 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 54MIA24P025025 for ; Thu, 22 May 2025 19:03: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= MJU63GAk4KF2HCv2pS83TCU9KZKeyp5RVvMFBroQ4R0=; b=LefIQefkC5J1Mg5U vULUseC46+RcXBdHW66r5EontOo+kcDN+2YmheEhTik1tMveS2uv4wc2UpPgkUBG zZN9d81ogP08it7WEGMAuuGJZ77fqRnFOTdIhh8xlIly4Rm8ClrypIrvoNkz+Lz5 V+gFXT+kT3ZwPj4GPNh2AzO/g0m75zYOWAKa9V9xUwrZtvMYI4ZSYo+yvjTKXrjZ 3fEcaAFRV57xGDkaRa2h7pqC0TKirS1YDBc1jwz2j0fRwbBFutoIHGMFNG33vqiq TCccs/p0OC4SUDJxzWrqM3TzZtpg0vKCyd1ovgl+S4cWOkIRuP8fxUuyLC/rqd/C HdzCvg== 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 46rwf6ybcd-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Thu, 22 May 2025 19:03:39 +0000 (GMT) Received: by mail-qk1-f198.google.com with SMTP id af79cd13be357-7c543ab40d3so1230573785a.2 for ; Thu, 22 May 2025 12:03:39 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1747940618; x=1748545418; 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=MJU63GAk4KF2HCv2pS83TCU9KZKeyp5RVvMFBroQ4R0=; b=uTNHOenWtnIedNQQzfaMK5HLDqgQlKhsH3teujuFo491kvNcyoMxguKxf5gJH9Cm8+ CGmctu9TELD2y318W95mxGPu+vxhRZwuYaIjiQrHAazte54ERdc0VGATMhPYbT+/lTXn iTOGfijuJN64zCs9sUzxJB6NANpcgvDn0qQbKxAyyjv0aYEs3+SzgD2JK0e0tYL7WHzc WWi1lghpH3jz+szaj0iq53NDZh2Bf2dq7NPh9bHokJJLBsXyUHnsf7Tkcr4AP2Vv5MZg tXxEAEYf4cq8NH9v0ZNyEkJfl+VjDEG9Kypv2HuaXIdw6O0T0leE+SkD1nyiyBcUz/fi mlGg== X-Forwarded-Encrypted: i=1; AJvYcCX28uYW1Jy4rYfvX5d9/OEfm5ZG6/IGg0JMN+getmNXToZy1Oq6YA3rIpEewOkYuKNFFeKXlE7a0UKJmmQ=@vger.kernel.org X-Gm-Message-State: AOJu0YypocstJgA4Z3jYvFe04KBWor+h+eHzd7HzozVcGYKoDlUdkec7 PkrImgdpvMsUw6j83c5ZjKUBuOTe9RrvfXi8N4NM1Ji7eDw2ny1U4qtY7EejDnx0fgobhfNU41H j2aq5Iv0Krc+u49kHyXpCBGsqCv8NHN0alFE2f5Kvv7ZAjOCczB2bCDDCMgVdztvnsAA= X-Gm-Gg: ASbGncs2jOI/1en0QU6C/0bGSkXGzOaBDU4aqb3ai+hB7QEwKYIzwwnV62OK0HB42iU PD3kkfMlR6NedlFNn0gVm+lojET+kgbrC4esMd7gA0IXeu+lPXcZicmG3bQEwjBRwI3y6HbYJli zULMi84Pj8eOh0IfNybJD2uVGrDEoxTEW69CH8t5MJmIIL2qYW4cPCXqqPKUHooeL9/nl2WK592 9HFLN9TfoWEy+KEkwAZ5yyVoMySAtu9m3fZCOwS8Pq8sF1OqCpPO0UZUJBmFrRBQ4+y34ttzx5R 7m2gno1vsMVXWoHaWoO0Zc0TBlckSFphL5J2db+/PRfPGfP09b9paclEx32jOc8Ph70QwwWlXHA JcTdzEphNVtlPDl2SkUWPQ+dJ X-Received: by 2002:a05:620a:1726:b0:7c5:f696:f8e5 with SMTP id af79cd13be357-7cd4672499amr3483752485a.14.1747940618202; Thu, 22 May 2025 12:03:38 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGJUNU+rm/Ph9/vz8kwtEwwdRHJFL/bChnN6Hrfa7DmeGkmkC4jRRpunmPXwB6Tp5vuDe91wQ== X-Received: by 2002:a05:620a:1726:b0:7c5:f696:f8e5 with SMTP id af79cd13be357-7cd4672499amr3483747485a.14.1747940617664; Thu, 22 May 2025 12:03: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 2adb3069b0e04-550e703c2f3sm3482506e87.214.2025.05.22.12.03.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 22 May 2025 12:03:36 -0700 (PDT) From: Dmitry Baryshkov Date: Thu, 22 May 2025 22:03:22 +0300 Subject: [PATCH v5 03/30] 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: <20250522-dpu-drop-features-v5-3-3b2085a07884@oss.qualcomm.com> References: <20250522-dpu-drop-features-v5-0-3b2085a07884@oss.qualcomm.com> In-Reply-To: <20250522-dpu-drop-features-v5-0-3b2085a07884@oss.qualcomm.com> To: Rob Clark , Abhinav Kumar , Sean Paul , Marijn Suijten , David Airlie , Simona Vetter , Vinod Koul , Konrad Dybcio Cc: Neil Armstrong , linux-arm-msm@vger.kernel.org, dri-devel@lists.freedesktop.org, freedreno@lists.freedesktop.org, linux-kernel@vger.kernel.org, Dmitry Baryshkov X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=5939; i=dmitry.baryshkov@oss.qualcomm.com; h=from:subject:message-id; bh=GFf0v3WAmRcTA8zxH+uCVN7GSoj6mJ0DVirlWlbweGk=; b=owEBbQGS/pANAwAKAYs8ij4CKSjVAcsmYgBoL3T7iekawvAScfsheKNdhh9/EXfE+ZBTWarVm w8TTRGxrLuJATMEAAEKAB0WIQRMcISVXLJjVvC4lX+LPIo+Aiko1QUCaC90+wAKCRCLPIo+Aiko 1YYAB/4pjBHc4s+lMqo5GCRmL8vStn+1DiNM0XJP/FBfY2OE9pmjW/mNwYIAdbpZF7hRv6IRnn7 M0SE2BJa3Mn80G+2E7j7buJbbCKgYv48X/wbWbC8mYMYRbl4KdmQHfahOr/Zt35O19YGXgx8SxL uwsGw37xcpm7vTt/y8CyEq9sgf8B79MCI+nxQfSv6UC76dRoJDiwQ+BcGmC7/1htYYSw6TKgO2n L+4GSEaZvWSUPDtaAiSKpP2mkOZuLUPyYNf3DPsig5Yg0xgOOE+/j3mC0eXXrK1ji/XkttL14XG //YtF2gzkon1B5kQ9svLTBGNtIkDUSyq4RufxovDCkEW0sSL X-Developer-Key: i=dmitry.baryshkov@oss.qualcomm.com; a=openpgp; fpr=8F88381DD5C873E4AE487DA5199BF1243632046A X-Proofpoint-GUID: YXEUSm4w2OPBa14FiAj6G-5x6fDQX16y X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUwNTIyMDE5MSBTYWx0ZWRfXyTqAHyFnwQt7 9r0Zv1vLdHG0pHjL8mXLpo6ZgxCjL2zfEdSVQQyHb2CqFu5eTj9tVrQ5ZPllKSSq7uudnhlFTxH qDCSwH1XKdzj8A7QthcB/bntWZsLVtZ8/xuYSt5QQkDZ9pphOyF70vlsfYiXtuef9exoUKZDowA NUU0ryAIZzScGhbZAx9IPDCZ2pE5bmjDODJn2jU9iwda81/dhmiSabadNNY+Ndv4+BcWWIKgy0S K0T9iWGY2ywvTEjSQ0LkcyNlEXHnclva7DUFc7AucUq5suc9WY9Rg1Zet/5XideGr9g+qmurP6R 9juAqkup7bXF9itasCxh78D8v27NojNPRVYzQyqfotM5AKtKpfaHYQFQlTiZiqLU4BlLn6T09JH OtXIOtJJ9Y4jitreiLvbCla3VIrzYaqiR4+B7ffs2tTNJwnn9gOPeO2TgY3sui8zZMg8WGzH X-Authority-Analysis: v=2.4 cv=fZOty1QF c=1 sm=1 tr=0 ts=682f750b cx=c_pps a=qKBjSQ1v91RyAK45QCPf5w==:117 a=xqWC_Br6kY4A:10 a=IkcTkHD0fZMA:10 a=dt9VzEwgFbYA:10 a=KKAkSRfTAAAA:8 a=EUspDBNiAAAA:8 a=J8zulDhgwS0aM89Qmk8A:9 a=QEXdDO2ut3YA:10 a=NFOGd7dJGGMPyQGDc5-O:22 a=cvBusfyB2V15izCimMoJ:22 X-Proofpoint-ORIG-GUID: YXEUSm4w2OPBa14FiAj6G-5x6fDQX16y X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1099,Hydra:6.0.736,FMLib:17.12.80.40 definitions=2025-05-22_09,2025-05-22_01,2025-03-28_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 clxscore=1015 mlxscore=0 adultscore=0 spamscore=0 bulkscore=0 suspectscore=0 malwarescore=0 priorityscore=1501 impostorscore=0 mlxlogscore=999 lowpriorityscore=0 phishscore=0 classifier=spam authscore=0 authtc=n/a authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.19.0-2505160000 definitions=main-2505220191 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 Reviewed-by: Neil Armstrong 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 573e42b06ad068445b947c59955281ba6e238dad..d58a0f1e8edb524ff3f21ff8c96= 688dd2ae49541 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_ctl.c +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_ctl.c @@ -737,56 +737,6 @@ static void dpu_hw_ctl_set_active_fetch_pipes(struct d= pu_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_fetch_pipes =3D dpu_hw_ctl_set_active_fetch_pipes; -}; - /** * dpu_hw_ctl_init() - Initializes the ctl_path hw driver object. * Should be called before accessing any ctl_path register. @@ -812,7 +762,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_fetch_pipes =3D dpu_hw_ctl_set_active_fetch_pipes; + c->idx =3D cfg->id; c->mixer_count =3D mixer_count; c->mixer_hw_caps =3D mixer; --=20 2.39.5 From nobody Sun Dec 14 06:40:54 2025 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 662C429A32F for ; Thu, 22 May 2025 19:03:49 +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=1747940631; cv=none; b=RR+holiSVdzu5xNZxE6IlKZHFWUIW68cZCaFrUpI8XF9aNI/+CaG+6Pk0nkovckmf5cCPJLEuDgkiQ45kKec6MaGS/s8kiCkX4qQRhz3S1XClGVMvueGpI974JlYj4TVHMBwxIq0x//WhAEmUNoN8cjDCqPd1dI+Nobxk8qMTfE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1747940631; c=relaxed/simple; bh=zQxYeUAVHo+xt0jOkEWcT10mYuzzGMKBHrI/C8TQAuU=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=TjbOwsF+63Y/vQB6N5AX5UC4jC+VM1+aPyPcdxW24raqf51E/uD1wV0pUqHWRBfueFYyN7IEloNb02y2YFAT2ug2Q62RLSePtuvDADGWsdzHvcmny9IkY/UnVHAwmwCcModYHrJJCZoC7Raano06qDl5oxyhYqWt07Q+9NV5uMA= 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=Qbu80mvU; 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="Qbu80mvU" 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 54M9Fqux004048 for ; Thu, 22 May 2025 19:03:48 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= 4Qp7jh1itM43n3wIU7h6lhpLC0Hmbksbm37fexlcjaM=; b=Qbu80mvUioc4fmN7 UNATFhvrLnAQflx8F5+aZWsWGXYLV+fRJp6hQ/XNz50V1uvClGLyLRaCMpDyoPQ/ vbFpu05XVIJnp4YWRSj6x1sO0hBX9V8mo6KyttbVsuU1P6m65L/i6CBHa+StCfUz fwf7buYsIxa5GepOdVwhtU6saBm1Ii/JofAmgpDZtc5cczaNdchj4+3zMg/c70S3 z+8Tr4aHA+T34j4ZV+fo+PjcO25xdUqN+Be1EPX0Sx/nH9sdeaSKNOd8gO5QzODY Ax2dPnY+V+JLGe8i3qFaTG3QLuxcrxJ4Ud4vgQY56Wc73xOPU7LfIpLC6FeUuoRC jltO5g== 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 46rwf4ycxp-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Thu, 22 May 2025 19:03:47 +0000 (GMT) Received: by mail-qk1-f199.google.com with SMTP id af79cd13be357-7c5e2a31f75so256013485a.1 for ; Thu, 22 May 2025 12:03:47 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1747940620; x=1748545420; 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=4Qp7jh1itM43n3wIU7h6lhpLC0Hmbksbm37fexlcjaM=; b=F0JFyfz5zJRcFelX4MeFn/3293MLfTu0H0ISoO8AlDbUuGb0d3MoFVkRvA1PBracs3 uwOXbcWNNvZtzFAV+CSerOgewnwUAeriCOikrUhDLcj4BIWcIszrWFA8eX3CcOVwPMBE +nDnG6Z5L1/4TlxZ/tAKnIPgtqHKvR421fjigAsg0ZZq9MVETqKxScneAYtVnZqh4Zpt c1T7cQPnkre02meBEQ6f7vMp954esYmfrhs9K5BzzBd2xZlYfPPx0Uu4TD23nOEGhpi6 sm2GYVyD6bAwwCBT/ApM0S0NwMIEXyQkQN5mb+XTpyV2GxHrLueHVgc0PVT8rBDXHUyD 1HgA== X-Forwarded-Encrypted: i=1; AJvYcCWvlLkUm3NmRVGUBKJgGuIRgLOd5K+7sHtUzkgt/JmfhUQDegBvxfrjBlz7TLdcNMj3YZ/yp+PVhzGw2x0=@vger.kernel.org X-Gm-Message-State: AOJu0YyEMi84y7sOPY725aKxd6/SFi2MctoeaSWoYRVnbEUVYM5+6odc VdhYHf2BQhS4MiJfD2Qb0KypYbYze7gDXmSMl5YYRBOEhqdkiKc1NntP0hzvayWvkhos+ZvVgQU AP8rB73iZfhLLN4KsSvbyqmWHq55RX9yd5cX3iQiNGW92z8YfQ7A3jXM/95uBWlC9urE= X-Gm-Gg: ASbGncuUVIG4fxNoUqoFvxu2jlwadYmDdbsPdhSdTeS9TTDpcNF7DYKE1V/ML3ncPQ8 F8ezODgWUMbktH1ceKTaVJZ5JFH9a+w+YOfyfH6536ka38l+4IpZNQXnr+pOKnt1OvfxL8YlW7n TYk+R0NYDr8n50ssXFDtEaj4e10vg8887m8PSUP4+WRcYDB+BwLeHevW/IFbjemHYYmHe8TIzHN WLU7opSoUt74Hm06TBfpMVql3jdAQJnsaVuim94E07FUxoMwvK51mLNDohmylW6TjKx+nVBy8en LwppYnSTfdw1+vBqglIRM6vDTt9JpepNMMhFhMAKZs0T2bFVyaCJAGqRwHIVFme9ZQv6uSslNkp wcKfdO46BRCyusrkgfRdddkOT X-Received: by 2002:a05:620a:404f:b0:7c5:6140:734f with SMTP id af79cd13be357-7cd47f1dbe5mr3834188485a.18.1747940619830; Thu, 22 May 2025 12:03:39 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFUWhtLxfwnjOCeFjmQwfRQz8WK84FyU9B8tUZnS1CJObKXZJplV3E2lQi6/zI5UpsVwRyzxQ== X-Received: by 2002:a05:620a:404f:b0:7c5:6140:734f with SMTP id af79cd13be357-7cd47f1dbe5mr3834183385a.18.1747940619425; Thu, 22 May 2025 12:03:39 -0700 (PDT) Received: from umbar.lan (2001-14ba-a0c3-3a00-264b-feff-fe8b-be8a.rev.dnainternet.fi. [2001:14ba:a0c3:3a00:264b:feff:fe8b:be8a]) by smtp.gmail.com with ESMTPSA id 2adb3069b0e04-550e703c2f3sm3482506e87.214.2025.05.22.12.03.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 22 May 2025 12:03:38 -0700 (PDT) From: Dmitry Baryshkov Date: Thu, 22 May 2025 22:03:23 +0300 Subject: [PATCH v5 04/30] 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: <20250522-dpu-drop-features-v5-4-3b2085a07884@oss.qualcomm.com> References: <20250522-dpu-drop-features-v5-0-3b2085a07884@oss.qualcomm.com> In-Reply-To: <20250522-dpu-drop-features-v5-0-3b2085a07884@oss.qualcomm.com> To: Rob Clark , Abhinav Kumar , Sean Paul , Marijn Suijten , David Airlie , Simona Vetter , Vinod Koul , Konrad Dybcio Cc: Neil Armstrong , linux-arm-msm@vger.kernel.org, dri-devel@lists.freedesktop.org, freedreno@lists.freedesktop.org, linux-kernel@vger.kernel.org, Dmitry Baryshkov X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=1778; i=dmitry.baryshkov@oss.qualcomm.com; h=from:subject:message-id; bh=V1gYZpITbFHVwsL98bgMq1gW9yj3xDgdHDTSQqGTqRI=; b=owEBbQGS/pANAwAKAYs8ij4CKSjVAcsmYgBoL3T8U24JiUoIwCb2cb4lL90avZ25jIcPH9tnQ pm8S/lgNBaJATMEAAEKAB0WIQRMcISVXLJjVvC4lX+LPIo+Aiko1QUCaC90/AAKCRCLPIo+Aiko 1acvB/4yq2iMOwDZTbHU9A2g9u3rON7AJ+oqYKcsLzdrCpqTzvxHncYO/qMgQbv0QsJMwTSYxC5 qMp4hIq+t2Vma1YyiZMXgae2tnodTMiA5QGfy3R4MejvdoPf2vWROyIJHaZ5q9+6jjwwT0vG1cw ujnxqFy6WnJ1DNSCDIp89Hk7XE0gDbL0iy27BeJ2c3606zZZ8LAy3Lktjcv5X6D4fDieCXVyShS i9aVgAfUUMGFrqfCKFIfzc/uKRWVh/zAL+dkAb/SN31YSaxd6MVJyIUcN1eE96bAGdwW33Ij1md FePu1u2uE8S3WXEciqH3O5qHHTxWbaGoPhQTRudDI7CJX+jk X-Developer-Key: i=dmitry.baryshkov@oss.qualcomm.com; a=openpgp; fpr=8F88381DD5C873E4AE487DA5199BF1243632046A X-Proofpoint-GUID: tFdgj85Q0iNj-fiH805RuuMaV38d_Njn X-Proofpoint-ORIG-GUID: tFdgj85Q0iNj-fiH805RuuMaV38d_Njn X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUwNTIyMDE5MiBTYWx0ZWRfXwVPkIXo3D1ix b68CACQKIqiXS4BoMHEpffx75LlTvq/FVVjidKVmP8XmeCKy8wFQ97V/GaCJb22mXq3Z2agQ6vr wqBMc5qDyERHFCPbmmFnlijrYk1JeUgs7h13rBaamNejC+/JhwBADTjz5vC26i+myFm4xMkJeYR fe7Ub2BXrEPpPzRAFZg0ppnPxE/Z5xxLNQuMp7uzVLtMEPfuTUuUMhEIQp+DdfxL4Wi/+5RTEHy +78ENDwuaPAhwZgpbYSD90yEp7bovWiHIZBj4SE/Qb2kI16J041odXmXK6Es1wY8AZ5FecgXMQx xRNyocPvHJWg/qG/ndAEzp0jMpuZvxDbAmcK/ACKaxAA1LCdkW/Xv3/CBQWQDXu0jtc1u7gtGds CDs5Lwfu7d2j2dZKiW9x/O4cQhzXEqoYimNp2uiL/TwxKUpb2HIhAgs8HsDmaO4uDQkfHX51 X-Authority-Analysis: v=2.4 cv=R7UDGcRX c=1 sm=1 tr=0 ts=682f7513 cx=c_pps a=HLyN3IcIa5EE8TELMZ618Q==:117 a=xqWC_Br6kY4A:10 a=IkcTkHD0fZMA:10 a=dt9VzEwgFbYA:10 a=KKAkSRfTAAAA:8 a=EUspDBNiAAAA:8 a=aBwJmt2KlYBR8C_sNNsA:9 a=QEXdDO2ut3YA:10 a=bTQJ7kPSJx9SKPbeHEYW:22 a=cvBusfyB2V15izCimMoJ:22 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1099,Hydra:6.0.736,FMLib:17.12.80.40 definitions=2025-05-22_09,2025-05-22_01,2025-03-28_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 phishscore=0 clxscore=1015 mlxlogscore=999 priorityscore=1501 spamscore=0 bulkscore=0 lowpriorityscore=0 malwarescore=0 suspectscore=0 mlxscore=0 impostorscore=0 adultscore=0 classifier=spam authscore=0 authtc=n/a authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.19.0-2505160000 definitions=main-2505220192 From: Dmitry Baryshkov Inline the _setup_dsc_ops() function, it makes it easier to handle different conditions involving DSC configuration. Signed-off-by: Dmitry Baryshkov Reviewed-by: Neil Armstrong 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 Dec 14 06:40:54 2025 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 BC45A28C5A8 for ; Thu, 22 May 2025 19:04:08 +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=1747940650; cv=none; b=N6HBklaVgbdevRzFRo7KoRwgkoF0E1hAPVj1oNoe7zUxWV8UEmjQh3oChg0znnRc1FUN/7eWIIXeKAejbukc1qbpVrLxH/5dss+yXXJv8AJiSgxpU2b7MpolgPGtZf9D8PXeJU8S3NxS8nvyGuCjFOGoZ2MJXw4hW9ho1el7xLE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1747940650; c=relaxed/simple; bh=epai2Cytfes2l89hNY2GN70oZfBzr8X1ylrMw0g4/O4=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=MV3lSso8DSt+ltB7Fmf70oRuoXkZ26bfUNoZxVnayjBD99Fxhouwqh0Frz3alk7IA6t+b9YLpLzzLVjuVAtrfxquSZrNJ7li5tAwoRanUQ8WMI5D011/TQNQA/fbnHDNGQ/t2+2MKTS7MrEEnz4Ofq0ZbkQoz1odgx1VHX2kSEA= 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=c3mb5SO8; 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="c3mb5SO8" 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 54MHIs8x011346 for ; Thu, 22 May 2025 19:04: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= DVSKO5Tz7Xwh54RBpw6e9ejvFwUu+HWI/6GMShXKYcw=; b=c3mb5SO8ybDVB2FJ IE6JfkbXyx5MmfklP8Jl+s3auExSL+0ksHdQ/+t3NPEUToq33SCyGcG8cgG71Adr pVXUuI96kUwgyWj+jWaM2p8MAk27JEFi2RgDKPQ0wX51ZJAtXIXMIRwEVrw86kKI ub7Oi76H7nBMCjLWI7Fda8Oxp027KJrM5sSSsqVi7f7jI/yQk2jaW2SCqpZSMnI6 SgpZx6JKniqRT0UW0iQCj1zKfIbFnpYk4QKHb24fK+k1XVGqsfeVt45GP+4P+FYK 2QfNoN0kx2CEkFzhUXOoWdyn/cmvF2H+Q4EXWfvZS/y2RLhMkefUX+fTzqmqXloT f2BaLg== Received: from mail-io1-f72.google.com (mail-io1-f72.google.com [209.85.166.72]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 46rwfb7b5j-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Thu, 22 May 2025 19:04:07 +0000 (GMT) Received: by mail-io1-f72.google.com with SMTP id ca18e2360f4ac-86caab2dad2so88650339f.2 for ; Thu, 22 May 2025 12:04:07 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1747940644; x=1748545444; 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=DVSKO5Tz7Xwh54RBpw6e9ejvFwUu+HWI/6GMShXKYcw=; b=QD86hFRsLm7WYcfRC7880WjiwkoyrFr4vDk/Db74XRLDUOorRTkmNgO6ACcUM88xU+ MIXO5EvPB4vR6pafvK3ojlhhstg1iZdW2zYUQk1RFN3FT+A/czBd0UYhJMrh4WGZ/Juc F6VGgWiEXHnJn/kEKtoBBVi0jUXAkF+EGHn+uHmqhr/w7fyeDQU/0WahFCC4QySuups/ hhyKdtodAQXtZu55ubwgJJ1I0Hio4rIRt/3/mkFkdr3Ega0MzC641BFl+mfKXtk6MRLI TH6Xh2XWdMgcNohT1pIX1pNg1iUzxrj8gQY1rdxyeMeZljN6NNfVh2On5NmwT4x3mRl7 ONLg== X-Forwarded-Encrypted: i=1; AJvYcCUrLClhCQ92qRwJZb83sxsNPCGQb/AuVPJHTz2WUzzkeGgEAWuym0Pl1cHwEgflOyNawov8r+utgG9ocfE=@vger.kernel.org X-Gm-Message-State: AOJu0YybVy01IvWgf4qwe8q6oJ/II3SLOdGCKLk2Y9Y/vdNKucLy9gYV Z+HR1JE4fHkh7XOCTqX2/VgjJwiuDpeYWOREga3vfhTeN2ITnVP9NAaMIouaZYlkToKQM1AFdYE AnO8l59PCZsWS8KtRk1zB08lS2LG4TZtqP03mpPmD3KhKdZpCgja1C1I0dCzCQEAkJccTJP28DC 8= X-Gm-Gg: ASbGncsCxD8T227lydVvu4yMM5ztJ4KDMQXCg9xfdSy6mNUetQC1ba+zvENpVj++rEh zyccPDUDZE08N+h2H5VG+beoWGA8pr8wn4tKvupOif9xZkNKX7mHb6R3W9961q+sz26eTz4iBrq YtBMoIgn1ib2KbQqrQqMv4+o9PD9M//QZn+OvuL7liIo0aGja9R2ZeWJFjCnFuoarSzL+LSRSXB 3OvOgOZv+awnffmEloScWl78u/kZiaQ7dSzp6HQjfIhLBGKZm/LAGxz+NvT9yraN0haPovs1Jcs y/iUo5ojBAFPKlJ4jAX06nO3WML+REaGV9JvAv1GiIinJJcSwfCsUDL23UOGuvx1Gz2FNL9K/s2 KN4hxSHq4Sv/cOsTwzuPfz6tm X-Received: by 2002:a05:6808:22a3:b0:3f3:d802:14f1 with SMTP id 5614622812f47-404d869bc4cmr17885644b6e.12.1747940632924; Thu, 22 May 2025 12:03:52 -0700 (PDT) X-Google-Smtp-Source: AGHT+IH/jT6jn1Z060H1BWgbFPP/zII0OmBF9bsCViyPeLmWLw3ZixHCeAogA41QGyYKJQBsWAf6tg== X-Received: by 2002:a05:6808:4445:b0:3f9:f923:cc46 with SMTP id 5614622812f47-404d8698a37mr17537811b6e.9.1747940621967; Thu, 22 May 2025 12:03:41 -0700 (PDT) Received: from umbar.lan (2001-14ba-a0c3-3a00-264b-feff-fe8b-be8a.rev.dnainternet.fi. [2001:14ba:a0c3:3a00:264b:feff:fe8b:be8a]) by smtp.gmail.com with ESMTPSA id 2adb3069b0e04-550e703c2f3sm3482506e87.214.2025.05.22.12.03.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 22 May 2025 12:03:41 -0700 (PDT) From: Dmitry Baryshkov Date: Thu, 22 May 2025 22:03:24 +0300 Subject: [PATCH v5 05/30] 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: <20250522-dpu-drop-features-v5-5-3b2085a07884@oss.qualcomm.com> References: <20250522-dpu-drop-features-v5-0-3b2085a07884@oss.qualcomm.com> In-Reply-To: <20250522-dpu-drop-features-v5-0-3b2085a07884@oss.qualcomm.com> To: Rob Clark , Abhinav Kumar , Sean Paul , Marijn Suijten , David Airlie , Simona Vetter , Vinod Koul , Konrad Dybcio Cc: Neil Armstrong , linux-arm-msm@vger.kernel.org, dri-devel@lists.freedesktop.org, freedreno@lists.freedesktop.org, linux-kernel@vger.kernel.org, Dmitry Baryshkov X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=1470; i=dmitry.baryshkov@oss.qualcomm.com; h=from:subject:message-id; bh=FhcUxkN33lcwKaCVhynJTwrCtUJjENXomVxBonQ7s00=; b=owEBbQGS/pANAwAKAYs8ij4CKSjVAcsmYgBoL3T8SI8KCVGVVr1Y9EWMFHMO9KEgvuRRKVX0J x20oP/lOPiJATMEAAEKAB0WIQRMcISVXLJjVvC4lX+LPIo+Aiko1QUCaC90/AAKCRCLPIo+Aiko 1fXWB/9Fo45s651Gj1TyeLBW5+ITB5kjKlbCn9FNuFukuVufMW+UMpWeTehBYxmQlc+7z6FC7wf YlI97N7+IcRbAfH96cIN8hTe5YTgkS+9oqT90LjP2M0ppBYZsHGvquHUkmFnhIH/EHSZ86Gz8z5 R7Hcqh++KiHzQsWOizm4qPLOEO0PHhrPk0atiF8vC/xvKj9+MDzNMfk2JMOuCXOjGIKQypVKmJy QzC2NY9Dh7MF7ZufSrqpf0bhiB7rxFbrZveBnE7dz6KEnmo1CY5RfvCVY4/ngoJ31kcauX7w8a3 QvWCjw3jl87N7QTx+4yp1nA8qu8Q3UXN8qo9uy3rFymXOuNj X-Developer-Key: i=dmitry.baryshkov@oss.qualcomm.com; a=openpgp; fpr=8F88381DD5C873E4AE487DA5199BF1243632046A X-Proofpoint-ORIG-GUID: Tv0_NQdwCBCJvQg9j9KS2PJtsrQA2j30 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUwNTIyMDE5MSBTYWx0ZWRfX1hkT1+OYk0w9 RICVYnwMZbz7gTHPElQkSPtqZWlEXOcEOLIH6VzxzTICCiuKCKT8/jAxogVnq3jxTQ9HnOrQmCD Z3Lqw7CDQqv9zTJ7+VwPSzIbNR3OG8FpkMFDyB/QE51Lx28RKxQmtucob5T+Bg2ax4pKbxRevh3 pm/uS6sHMQlDosEO0Y6ZfQf0y5SkETOPSWGxBW9kNRcz7c6JpLH9EIXm6/TOOJk8aOU0CZYEV4T JW8uoM0UsJEm0Q5rpkMlgSplXZJW8n3toUvfsj8lhyUN4ElXv6AKeF5S+EaDaFPdlrvpm/hcYrN /TvuHr+GNbpsppRSYS+LVuHpIGezzf6E48PhN1O32BmOIoaCvn1K3T4A1SoVNIdfeYZSHT6GT+I B94D1aUS5smjVnOllVHftvh/COBbln7W/Zs9VLk4gBa259qkqWrxLIgP54Zjg0MlrNToSZLp X-Proofpoint-GUID: Tv0_NQdwCBCJvQg9j9KS2PJtsrQA2j30 X-Authority-Analysis: v=2.4 cv=dLCmmPZb c=1 sm=1 tr=0 ts=682f7527 cx=c_pps a=uNfGY+tMOExK0qre0aeUgg==:117 a=xqWC_Br6kY4A:10 a=IkcTkHD0fZMA:10 a=dt9VzEwgFbYA:10 a=KKAkSRfTAAAA:8 a=EUspDBNiAAAA:8 a=ezFYmCdhRMHQQexkQpIA:9 a=QEXdDO2ut3YA:10 a=61Ooq9ZcVZHF1UnRMGoz:22 a=cvBusfyB2V15izCimMoJ:22 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1099,Hydra:6.0.736,FMLib:17.12.80.40 definitions=2025-05-22_09,2025-05-22_01,2025-03-28_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 mlxscore=0 clxscore=1015 adultscore=0 bulkscore=0 phishscore=0 suspectscore=0 impostorscore=0 malwarescore=0 lowpriorityscore=0 mlxlogscore=999 spamscore=0 priorityscore=1501 classifier=spam authscore=0 authtc=n/a authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.19.0-2505160000 definitions=main-2505220191 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 Reviewed-by: Neil Armstrong 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 Dec 14 06:40:54 2025 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 D061A287504 for ; Thu, 22 May 2025 19:03: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=1747940627; cv=none; b=WT18jJ/6owHdmAiZd1zq1ZUgkVxaCqZ9GkxQsByutKxSEvSNOVD3Iz3qxHm1f54blRvoLvlmIlTRYBv/KGADHoOSaRdORbMzyV+JVhBSXtTNfJpSwIxpOIUl+gRN+AK4M7RCk+jNhQMUo7IL1SXkFeVBAJu7VVLetS9n2eXmsBY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1747940627; c=relaxed/simple; bh=YQ5B5oB0M1GxXXeGU1Mj5ulVe9j+iVrAat2kcJ+hCFA=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=WOsX6yXHj5Q/U2sVawIr4achhLudrIGWWJqoR34vzw7YqmJF+7HS9rVlQfcvlfNulTqwrUgMZaTUVRqCPW4xUWiuCm5HOtUCNA66N541OX2d5k0iVNf9EULmcRYy21hclal7aJfw8h6RLfrsVN4JgJq5IFuxjhm9qlGkEUW5fQo= 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=IlcOUh93; 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="IlcOUh93" 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 54MHEGgG000862 for ; Thu, 22 May 2025 19:03: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= NYnzMBmIWlsfdGw4huDhs42iPHpQ0FxmQDjZ9WoLD+M=; b=IlcOUh93lYezYwvr LnNaooikxqLqZqK0nhWYlqBtp0+KvJzGWnuKiKwhst3hTiI66DCT0nk3OA7UbiAs Um5saEQowaO6UfWHo3vtnoZ5+Cbnq/EOJ+noo2V3s5k1hv69GN5U5uBBXVF2D8f1 6KxUQ80fbK9agHdRqmFBmhtNyjWedxvEOg6xNg2IYra2bULxcs93gcwCPF782DNH WKsLuXZqqCBCvkAHVDS+LQu9PByl5spGMeVIHm9J7Lzm+yvQGVPCj19VEJAIoKoi vF4xNLaIDznvSYo3nYGar1+j09lEHStHoUDhFiCV5MWevr03FkQdY7ccRzVavT54 m9xPYA== 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 46rwf6ybd1-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Thu, 22 May 2025 19:03:44 +0000 (GMT) Received: by mail-qk1-f199.google.com with SMTP id af79cd13be357-7caee990722so77112885a.2 for ; Thu, 22 May 2025 12:03:44 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1747940623; x=1748545423; 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=NYnzMBmIWlsfdGw4huDhs42iPHpQ0FxmQDjZ9WoLD+M=; b=KY0UDTsBbdT3iXi7mG/U2mL3aUaEdN3cONK+jIblU1qMKG62C/ALZ4NcKAMqg+Av6X +5Hkw3msU3PS+MwhFoMghfbxtDOGTOc+l9Px6xblqcGC4RSKLu+ryLKfNoZWAHTJUoCg fElDmjinRu9Y4zI3WYjkKNSlZUFRPhbuIzjpR01m+Gf5jO1fCsJ/J+Y7ZouHdAH9AR/8 QtwkMI0lTt1tCC7FMR7WddYCxOun9/cVxP1477jmVG8UGy/FLsd/M89HaqzC4x4w1NJk rpj2oKRG08fmZkEqYGuVmRoM2s30koXDhwn3OMwpFEu3evnCDhbDLhYbkHvkU7lp6wJN iGAw== X-Forwarded-Encrypted: i=1; AJvYcCVuU1HeiWwKnpqZwHDoPkMLSpI271vypxs1rjK7hRq41hIISj3lTWFg6MLHcbUcOodk+wLCO8gtg9xomlk=@vger.kernel.org X-Gm-Message-State: AOJu0Yz52WZ7gqEcJrR4FZDU9Ro1/D5FY+aTqk6JvrFvz8P5FPTvmGbW mZQ3xFcQGhNx8QVwGgJMzxIgRVfx6mICeGRej++tm0njLmM3BXwIyH1rg8N20OdvjV/hrp+GXiv 6fKUDNDnKGH85Muu836ZzVoAMc6g1CcdWHVAXgWnSJ5gw5ihhj40kxLVTu/HYiIaPFyY= X-Gm-Gg: ASbGnctN2gQn6XgdAmhnjIzb7YKRNeH1tTYUVYdDeqrmjOVCcDoTpjoYuYOLWBbJF7t V/8M+vhToqWOOolvoBQqyQtlXPQbPDfFaKKGoOJASMTc8dsF8HFawXIBG9KXfFCvDiqLJ3aM2LS Q7vPaMzjAinaaAOEaOtCr1zr82DnSFPXbqOTzdKaPZsKxAdSmXSipB8asYwUn709vIlT1HlVE+l MKhdf+dutugUS0BwA72bK6rGpf8wLv2lw/f35aTj6q+CXNHg9NJJiMsA9WTJDLxMeg2auQK8wTu IA8bFnFJT9IC5enRwmQQXROaYE6ogg4Va7PRd85VPMumENlhafcn/YoVkR7yxZuF5OWgcd/zMg4 U8O5e30HqPOnHkDOfW2lgrevd X-Received: by 2002:a05:620a:1994:b0:7c5:9a1b:4f22 with SMTP id af79cd13be357-7cd47fef371mr3705858085a.56.1747940623629; Thu, 22 May 2025 12:03:43 -0700 (PDT) X-Google-Smtp-Source: AGHT+IE6nclAd8Oh6p4d0w/pm4oPMdyXdN0sNQ9apgHVbjhlRv2lU1Ok/VlbVzdZAx2HRmhRyJKCKQ== X-Received: by 2002:a05:620a:1994:b0:7c5:9a1b:4f22 with SMTP id af79cd13be357-7cd47fef371mr3705854285a.56.1747940623235; Thu, 22 May 2025 12:03: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 2adb3069b0e04-550e703c2f3sm3482506e87.214.2025.05.22.12.03.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 22 May 2025 12:03:42 -0700 (PDT) From: Dmitry Baryshkov Date: Thu, 22 May 2025 22:03:25 +0300 Subject: [PATCH v5 06/30] 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: <20250522-dpu-drop-features-v5-6-3b2085a07884@oss.qualcomm.com> References: <20250522-dpu-drop-features-v5-0-3b2085a07884@oss.qualcomm.com> In-Reply-To: <20250522-dpu-drop-features-v5-0-3b2085a07884@oss.qualcomm.com> To: Rob Clark , Abhinav Kumar , Sean Paul , Marijn Suijten , David Airlie , Simona Vetter , Vinod Koul , Konrad Dybcio Cc: Neil Armstrong , linux-arm-msm@vger.kernel.org, dri-devel@lists.freedesktop.org, freedreno@lists.freedesktop.org, linux-kernel@vger.kernel.org, Dmitry Baryshkov X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=2225; i=dmitry.baryshkov@oss.qualcomm.com; h=from:subject:message-id; bh=A0zH0+x9BjgKXdk/u2Bzaxpf3wDWrsUR19FXOhuXrqs=; b=owEBbQGS/pANAwAKAYs8ij4CKSjVAcsmYgBoL3T8kb8nDY5+e9egcdsa0xvZpYX+N37LDMokn E4Ml7Al2TeJATMEAAEKAB0WIQRMcISVXLJjVvC4lX+LPIo+Aiko1QUCaC90/AAKCRCLPIo+Aiko 1Td2CACR2bs5yQxdsmKpKEl3FQ+iiWkJS1b4rtxw0v6U0zh6ysU6ub9bMGofPrwEt+qhEbKUirz Vse7z/3QA26rziYAGFobQqS0hSd+LZUEQ3nL3YaVZNc0GdDvcr09AZVkhmA56F5mJaseZpALdGF 5SAMKJy5a7opD/LrJdr/v9iVb6pfEHsUubcXYhymk1AhdzUimgKqf5ULvgzqXuuAI0s4rd0UPGh +e6JIz4dWaUTyJqTSfgKQ07ocWf5IQ6czZtYqbH5rVnQd8JIQ+iFNqU/JYMPF8kyFKaOrDDGpPd AmczS+Bi5sZLavW7Q3h3FrCdzlWQXhKKMBqb6aUMvdf93tKL X-Developer-Key: i=dmitry.baryshkov@oss.qualcomm.com; a=openpgp; fpr=8F88381DD5C873E4AE487DA5199BF1243632046A X-Proofpoint-GUID: Icjq8rzeQ_zV-cqI-gVQdEGRPKMgxuBu X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUwNTIyMDE5MSBTYWx0ZWRfX9z33Y3W/MyQB DmXueQn7R4/kE49Onnz9ao3wQ3mZSe/0rkppYmpnuDJuM+P2J5NyMbI7iKHOCfGUFACECHJxrL5 jXVULoisNCx6RRrhuQbZZnqaU0uuj7PiSBKW+r3Cy0IiV57AzvDSt5iHnFI49tekjsY+Y75hn2a pXR++0KNKB3hR3D3HAs2W9gOdYNwaQxQw1oAEx6QusCnjZbEnVKarqk4J9usQozv3S5C7qWxHa0 w11yQ1Nw7GJCN5OiIL/7CvHN3YyvS02780qwjjpXV1fa5qbMbEF5T67KiQGGrzVjLF+YNVrXdcE iqjnQZWsXGtZekhFfC/1q2I1CxfmZxEl1lsxYkBNa/KR7bosHkEnWlVxn4AP6doy//o7Q4/Bo0e 9lq28Fyg2ew3YoO1yZ+NBYYSW8ftqUSp9v1DieMLpLtg5UAFHREgXJA6fG2zy9LOGc7Kg89v X-Authority-Analysis: v=2.4 cv=fZOty1QF c=1 sm=1 tr=0 ts=682f7510 cx=c_pps a=HLyN3IcIa5EE8TELMZ618Q==:117 a=xqWC_Br6kY4A:10 a=IkcTkHD0fZMA:10 a=dt9VzEwgFbYA:10 a=KKAkSRfTAAAA:8 a=EUspDBNiAAAA:8 a=2ONPo-prfMSwqFkLVuAA:9 a=QEXdDO2ut3YA:10 a=bTQJ7kPSJx9SKPbeHEYW:22 a=cvBusfyB2V15izCimMoJ:22 X-Proofpoint-ORIG-GUID: Icjq8rzeQ_zV-cqI-gVQdEGRPKMgxuBu X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1099,Hydra:6.0.736,FMLib:17.12.80.40 definitions=2025-05-22_09,2025-05-22_01,2025-03-28_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 clxscore=1015 mlxscore=0 adultscore=0 spamscore=0 bulkscore=0 suspectscore=0 malwarescore=0 priorityscore=1501 impostorscore=0 mlxlogscore=999 lowpriorityscore=0 phishscore=0 classifier=spam authscore=0 authtc=n/a authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.19.0-2505160000 definitions=main-2505220191 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 Reviewed-by: Neil Armstrong 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 Dec 14 06:40:54 2025 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 561FA29ACC1 for ; Thu, 22 May 2025 19:03: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=1747940634; cv=none; b=k5kAGujruNEZGHivPY0y0UT5licJ9zPry1uwzCyj58WQQVwFvzIVfDT6NwG3JK9n6BlfpHbX+GN3OFfFBRQpdQ9AxTNjebq96WKBU5sip6c3lWJ1vKPumxKNC5jNO7FBhap+tunbr6Dshva/hBVH3vovJ+TU+cFG99BfJGGaGKA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1747940634; c=relaxed/simple; bh=PbNwFPnsz2j2NXJWY3qtYusppXZegcaNrDYsRqjbEEc=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=XuQXK940DLNMAF1GkKxZ5MmzQ/AfejMJWSq9cS8AmcSFQtPwnTuIxCcNBL2y5QFaHmBpFGRI2SxJEe5DEIIIR2qzaKPFKHmTbBsnyzT40NNhJzmEf/MBoKqt5vpZEj7xqcZ3Qb/kdfIbFdtzmq1idPURZsE3uA9PFaYqGZIJzoA= 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=OI5C51V5; 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="OI5C51V5" 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 54MIA24R025025 for ; Thu, 22 May 2025 19:03: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= AAL0npdqQBtYjwOdI2efX91wkcMPDhe43jrL70BGKqo=; b=OI5C51V58XrgB4jR /79haq5airvb76Q3Qqi4Xde6PKL74Lala3Lc7CmS8ClC1ztN+g9luDkvnGx2IihX 2tMlOjz3EIPLdZ7S7rBPB3dZ2OThOFsQRai0ltgq+zu7aNgeAc4skkk5hrSZIwY7 AjqInEhNaJTa+EWENdm2c/nQzBVSDxV+8f4KESneZX9GxABCrSCQ/xJPk05aexUP H/yTW14qmThgpulWf3NG9NB2h3VME6AOy3+vvg1hdGkfYEAyiHzN6bzwxRAh0VpN kgwNYerD3vYoAm7KChXCOJ00gBkJvmOAwjiAQKVP7Zd5rvii2c21ewfG6Xhv1oN8 uL+KjQ== 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 46rwf6ybdm-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Thu, 22 May 2025 19:03:48 +0000 (GMT) Received: by mail-qk1-f199.google.com with SMTP id af79cd13be357-7c9305d29abso1501597085a.1 for ; Thu, 22 May 2025 12:03:48 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1747940627; x=1748545427; 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=AAL0npdqQBtYjwOdI2efX91wkcMPDhe43jrL70BGKqo=; b=SllCb7YZJORUAitLF4jQMEEMXB5QD+BYq7HOWJlWQ+BkDTU/9zPD0NSQUSCMS+xfIQ /rxOn25gcxvq6CeKX3MmM+fikh03ZDwkhL9oHORbch7onvIrbstyE35MY8J96aqMBHnO ZFqGv+sBwZdMMqsLXbgWpSaWys+XColCBHFr52yoZThFvAM6aetjaoYenEy6VKddthQN pB30XRq/+R/gqENuALCDrx9Kn1zMWQeAt44MoGUFoB1zyM+e9pB6rifsi1cqBzzOkoJ6 gZE0uZgLO3EiefUP9zgN9ak2qMipsCBzVlkflNsvZhqxrJPym2oE0iaeKbGv5mUYoVm3 1LXg== X-Forwarded-Encrypted: i=1; AJvYcCV0CrD97JVl9Qpz3Nd6hqXf8gZpQCt2ooFRDUkc8cKhv+Zvky0xWJx6jhZvgLaLG4IhMk5D/9v9ESJP+Lc=@vger.kernel.org X-Gm-Message-State: AOJu0YyyOSYJwA1f6M14iOgwUpv6WL221REJGHSLuTtvO8vyL+AOKdPT 2vvSPKrT7fobw5MgGV29u2Zoyq3fgQs8fb3IufKR+KmHwD161U9ga0rkdpgau1y6BX8nJaH1lBL ys9KACMxOhnmhJ9MIiDpC1NV6wr93ETIMivuFKBkbfCPjWag2r/vRUvM3gwt63PB1DeGhkrzbF6 c= X-Gm-Gg: ASbGnctMdWeiQWnqoSXNOmHMS5/M4B/QVXWAknALpn5eCgW6UCFXQwtPfxQWJwCNX/Q WIXN9SQUxpQZzPko+vf9QUggM9xxlPHQubCEOrF5vwKKHRFQ7oIw4Qjk6qaO0LaqdxTPPymwGa1 CDPp403kuvgo1nNait90EoKd9mLa2Q/8pTAajOcmovuuHAPRvu+jzI2d+z+0ZfwKabPtqV++6uT 7svaVWspYfapbTYsN57fQ9t44Sg4/KP+79yCyD6rkpcyYZ/8ol4US4ZRse09wcl0d41CTabJu6q DH2zwGJchHDxRIGifpLiXrYxwg0c6RiP3bCp9e+qVmMSMZ04FOtKMABDNknOzy+41ZPdG2DADe/ Aj55TkYIJIOGuUXNLIgdRRTH2 X-Received: by 2002:a05:620a:2987:b0:7ce:d0cf:6213 with SMTP id af79cd13be357-7ced0cf65e0mr1205900885a.3.1747940626392; Thu, 22 May 2025 12:03:46 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHh1FDtRf3SaVWGRb6O1J8PwQnn0BNGU6mLywxpiw8q9pFBZc4zPmqFEWslOOzt+gG7ohEFsg== X-Received: by 2002:a05:620a:2987:b0:7ce:d0cf:6213 with SMTP id af79cd13be357-7ced0cf65e0mr1205896785a.3.1747940625865; Thu, 22 May 2025 12:03: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 2adb3069b0e04-550e703c2f3sm3482506e87.214.2025.05.22.12.03.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 22 May 2025 12:03:43 -0700 (PDT) From: Dmitry Baryshkov Date: Thu, 22 May 2025 22:03:26 +0300 Subject: [PATCH v5 07/30] 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: <20250522-dpu-drop-features-v5-7-3b2085a07884@oss.qualcomm.com> References: <20250522-dpu-drop-features-v5-0-3b2085a07884@oss.qualcomm.com> In-Reply-To: <20250522-dpu-drop-features-v5-0-3b2085a07884@oss.qualcomm.com> To: Rob Clark , Abhinav Kumar , Sean Paul , Marijn Suijten , David Airlie , Simona Vetter , Vinod Koul , Konrad Dybcio Cc: Neil Armstrong , linux-arm-msm@vger.kernel.org, dri-devel@lists.freedesktop.org, freedreno@lists.freedesktop.org, linux-kernel@vger.kernel.org, Dmitry Baryshkov X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=26280; i=dmitry.baryshkov@oss.qualcomm.com; h=from:subject:message-id; bh=HFoHoFOmqjM+HB4fAK3V/eauXLyAtHo7gfN3JCzXVn8=; b=owGbwMvMwMXYbdNlx6SpcZXxtFoSQ4Z+yZ+krrs/elb1fN1Z+vqAXX6i979JPX7Td6nvsJqQd P0+I39qJ6MxCwMjF4OsmCKLT0HL1JhNyWEfdkythxnEygQyhYGLUwAm4rCA/a9U+U1RaQM+L7Op fEe0fHpiQ9rjb78syb/adrcq8/c/312TSl7Em0+p+9+TOuVGqgWTxN1nPmfitGUuX1E/Mt3H7Za +g8GuzZsudQaU9z6aWnWK6czLszyzXN+F9KwSkH21/OXXdX9WVrbsreKxk9OpXvlfU9380DcZYc EtVtxVkgwfdN736uQF7qpRnMAtcjfZQt+8ft7KjYL6JjUJKcyny/asi59RkrU33o391z5pFo2SA O8NVzfudVzdzMM5/2LCnP5etRUOr0O3TAgWb7TqdWlYwRihkB3GeymthPXtgr0scy8pvXBYZ1y9 9GiHUxVvSsifOKvghn8P0ztrmdpKK572rNNqZJ3GIfsAAA== X-Developer-Key: i=dmitry.baryshkov@oss.qualcomm.com; a=openpgp; fpr=8F88381DD5C873E4AE487DA5199BF1243632046A X-Proofpoint-GUID: cVh-glGIN5vX-ywJUD63C2Yb1gc8swZW X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUwNTIyMDE5MSBTYWx0ZWRfX27/VQWGxYBk9 ah7bWLkgvom1FQlbDugwX+g4U+QYJyxyEspJo4AUScULCUnnjIBNImXPZcxeqoFBS/9kl0zy/P3 /6lJj4irLMYVAbMYp8MaoobLM5MKKsrV8fyfz3mC0kzv4f1QfkW4nHnswNm1VetwMPcg0u4rYjF YIK4869zQvcCGANY42Na66RuQkoqdPikePmA7tUjMwe4jGcIcJ2knvv+UwBa5uTEb8tnF8N8n+g PSQrRzy36rhM+TPzOHCkWVFxibTSSo6zUkHQkL1YmOg7KhWmG9b4Qpx/5ei63UE6fyNtpjcwBwr pDi+Vy+WSpDSQ34AY0EwwcyWw0v3STv3BkwQ4eMFELkQV4P7b72NX/ojggE/1DX3XZlkmHBJg84 qUIQyJURk3EjJwkF1Uc447rhww7LElCWFDapSg/fK6+sfKqwhVy3PTLh6JNTc8TsN19kIxoQ X-Authority-Analysis: v=2.4 cv=fZOty1QF c=1 sm=1 tr=0 ts=682f7514 cx=c_pps a=HLyN3IcIa5EE8TELMZ618Q==:117 a=xqWC_Br6kY4A:10 a=IkcTkHD0fZMA:10 a=dt9VzEwgFbYA:10 a=KKAkSRfTAAAA:8 a=EUspDBNiAAAA:8 a=mYGjOyR_Ic6jQ6k2fpMA:9 a=QEXdDO2ut3YA:10 a=bTQJ7kPSJx9SKPbeHEYW:22 a=cvBusfyB2V15izCimMoJ:22 X-Proofpoint-ORIG-GUID: cVh-glGIN5vX-ywJUD63C2Yb1gc8swZW X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1099,Hydra:6.0.736,FMLib:17.12.80.40 definitions=2025-05-22_09,2025-05-22_01,2025-03-28_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 clxscore=1015 mlxscore=0 adultscore=0 spamscore=0 bulkscore=0 suspectscore=0 malwarescore=0 priorityscore=1501 impostorscore=0 mlxlogscore=999 lowpriorityscore=0 phishscore=0 classifier=spam authscore=0 authtc=n/a authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.19.0-2505160000 definitions=main-2505220191 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 Reviewed-by: Neil Armstrong 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_1_sar2130p.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 +- 31 files changed, 1 insertion(+), 73 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 61420821a5f2dd5e56b8336c898290a2552c77fa..b14d0d6886f019c8fa06047baf7= 34e38696f14ce 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 @@ -189,22 +189,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 39027a21c6feecfba2d164799d9d982fc282d06b..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 @@ -116,7 +116,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 8d1b43ea1663cfbf35bed7b913d5d0bd16757162..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 @@ -103,7 +103,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 16c12499b24bb4cb4a7f126dd6580d9d366142d8..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 @@ -116,7 +116,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 91f514d28ac62deeafa843b5fbd0c8eb856fa49e..8fe07a5683f734a058e7e7250f0= 811e3b7b7cf07 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 413cd59dc0c4270973b34fc3a19405feff5b47e3..91285519c540025abce5c51f2f2= 8442ed9d479b0 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 b2eb7ca699e3ddacee441216be647784c9bbfcb5..50e0e3aec23c02acc1ce2d2a8a5= 658d6d49a62ac 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 85e121ad84a0f35fe2ba45cb76856ad83effdf44..1c299491e61f0465a164be74b7a= 754435f347cb6 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 49363d7d5b9384dd66ed02ee9ada05b24355f1bf..50e40405a5271ea6b12caa7a931= ff7fe3f2478a8 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 08d38e1d420c1ceb9cc527b260c08edcddb139f4..b2ee5ee01870507d9f01020443c= 30dc573414c72 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 @@ -193,22 +193,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 d6f8b1030c68a428a144428b422b63b960c2fdba..6db04c668a87a9f7baea01a9ea2= a0f1bbb1212bf 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 71ba48b0565648a02044d444d0242fe04cb34478..6f61ce85c536e36b65b98ba4740= 711cb495a7c9a 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 fcfb3774f7a18d8e01546a3ac72aa29f7b750443..192e90b570dbf8f5c3c24f57244= 3e111f6cf3db2 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 a86fdb33ebddc7f2a9914ef04899397e3271b79e..bdd92b5a61eabc6a1d5e0bfe740= ed6d9f1e8e94f 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 @@ -191,22 +191,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 842fcc5887fef15789fbc686fe2156b6b509b45c..ce2ec6af5f53e2177009ca8826c= a510fa08c03c7 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 c5fd89dd7c89046bdbf1b1bf223aac2e3c4c0b26..986179b53f8b59200d10f5159ca= c630732dc7196 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 a234bb289d247d065b336564faea8dc35b00def9..c2321a4a7d3894d85062d083b45= 402950122007b 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 53f3be28f6f61bb7e3f519b0efa4cb2f68d38810..c3dd2383bd5f32926b50d98c937= da25ed59d7cb3 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 3a3bc8e429be0ba86185741b6b27d8a62489779f..abeaa2b8e06fdf6ce5cec2c1a4f= d025a342f5a2f 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 e887e78059a81569fac8a4246ad63856dc48cfcb..bbef0e1c597299d24a923e1f0d9= 77c99afedb8fb 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 @@ -191,22 +191,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 9d60208745138bf29a7bdbd14ef28a2102f36f9f..1dd0a1aa222d65f03013d634a87= 371dc552b5bd8 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 @@ -191,22 +191,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 631154059c31e8ce1b9e3631552ce49aa589d4cf..50142b14e24eb875e72e5cff3b2= 8ff8aba89fc9c 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 @@ -192,22 +192,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 3547fdfb28cae6cd8d1909b268b88676afad0be7..264cd6d3640be1bf321fda42974= 8ecdafbeed214 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 @@ -191,22 +191,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 e16e47a6f426359548434569ad632aa68f32908d..4c5785332b5240109af36a1256d= 4ea29c348bced 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 @@ -189,22 +189,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_1_sar2130p.h b/dri= vers/gpu/drm/msm/disp/dpu1/catalog/dpu_9_1_sar2130p.h index f85d5d7ae51d64203647a8bcec91f524c6e33528..960c68f33074e0cec0f33aa7d4f= 8f3b4cc69bac5 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_9_1_sar2130p.h +++ b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_9_1_sar2130p.h @@ -189,22 +189,18 @@ static const struct dpu_dspp_cfg sar2130p_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 0d6511f90975508b36b0fa00a92349a82eff4d52..85dcf577b844995fe11322ec506= 885bc4a85e33c 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 @@ -188,22 +188,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 d383368c743b202d7256f6759deecaf9d756bb02..00e6f3e56ed1f9af581bad98459= 71fad315ef83c 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.c +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.c @@ -113,8 +113,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 Dec 14 06:40:54 2025 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 C916A29B783 for ; Thu, 22 May 2025 19:03:52 +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=1747940637; cv=none; b=Mf9JE1HHs30P+SX9cDCaM3GQ4ysp0DykhObG1ntTUYLkVxmrMO35QVgAepw3bE6ATffHCcjOeETTxnH7GVuUrrvlH3PD1oFkzLs+Uav6xT5Vsu0fwUY5ySuLai/nNd1HH0IQTGtSMQ5sob2ACpeQSbpC44xeKpH0LtgsOErlk5Y= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1747940637; c=relaxed/simple; bh=YO+LJgPB2sUv9zV+TBA3Adinx+u6+ACxwJDmLqlTfcM=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=cMymvdKu2VYvSi6c4LE9P4hwod451bgIJdDWi0ij8vgEzCRhk3HRzoDA8VxTtdTLsBeJmXNBFiUW2AjDoRCuoezSi3GcEZSNoY5O441KnH7xE8Qj2jtsrquummNfIseTu2PBXJS5xpdQ0w3dS7kMNGjyhoJ3nS32pI9ZJ6WxXt8= 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=aXziyaf7; 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="aXziyaf7" 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 54MGBSbG027623 for ; Thu, 22 May 2025 19:03: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= doyGW8O/Xco8V9yLF0/uf9AUJ/H+R5KzGPi3tpjBDtQ=; b=aXziyaf7DOkVVzTs lDuhLYZLiDtV3jjVwqBxI1Fa4JJQ1AJc6v1AV8IEatniEBMpjtix1luYorkIDjdd k72G6w6huF7I1OgJNWnqaOWfpxptrLx/EO1fs4AmmuQj1RsDj+WchDyalhe0Bu2V 2T1ZBd3d30Ott1O6aauEkIbixaEMKoA8FEXVo8fpR4FW6Ks5im/E5tBRFdeWKeBq ghrR0FUvQ2I/2Ln+d+VqiXGZu4sqLEHwWeSU8+MQ8hmjInZI9GcGQlYfcqy/lcK/ pK5iSQ+5+A4oh6FX+azmhMHujwPS2cBloTqo+tLjUbh90TChIbVPHyXaDSad3jMb r5ZJow== 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 46rwf9fb2m-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Thu, 22 May 2025 19:03:51 +0000 (GMT) Received: by mail-qk1-f197.google.com with SMTP id af79cd13be357-7c579d37eeeso1250329585a.0 for ; Thu, 22 May 2025 12:03:51 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1747940630; x=1748545430; 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=doyGW8O/Xco8V9yLF0/uf9AUJ/H+R5KzGPi3tpjBDtQ=; b=Z3BHHM1GdUgDpbXjBAfAKY8yYZ+LHl3d47Y4aiBxDo10lzlRKnBQeKvKzxLScqjDV6 GjFBrqeCGdSUukEp5GJoY9ryf9b1Ux4P4rDPS2A4+AwHdEW/6ila2WITvYdo+dQwaNTl olE1UKY20xbgUTJy5X59hOt7JdXUTB+5MHN31QEHVNXf3hUIqpTuP7ySzR5IWsd74GC7 puNeNrYE3PdhVWqa88lAwagR6PFYu3VNXkxjIn530ewiYBKCM+Fsv8rmE+j4XFi0wEEb pFb8xZrymlAeqxQeS8ZqvtjKbgWTW5KDSDh0xg22XSzfgf0d+IxqHaokPvwpXMpwtUSm cwHw== X-Forwarded-Encrypted: i=1; AJvYcCUgYHpkPpF39ZeSjO1Iz3K6/02bgWvUXCbAGIJWVCxel8izkilcMlSyvssMUu2VHYvC6/8BGd6CzbcEH6A=@vger.kernel.org X-Gm-Message-State: AOJu0YzbimXPzQnv11OnPSzxtR7kwMMpY/LlXGJpvTUviLDXt0dRZXER SNqc1p2c87ZWIvC0tjICUDOivpW34I+ROsl39pF/p1hSiFx8jRXKwRqGXFEOOLD82FmwDjVHppS yMI/sRc19B0Zk47LYfWa8jGxrKKkBotKvYS/MQmyfUlKGbXlS7GfB/b4XTgx3wxpBgXI= X-Gm-Gg: ASbGncvFYimCchPRWlGTXsYZedI4Kv8jYdKmbBYZHfR9TicB3q7i7fY8Oh1jaKePnbf gZhjAaYRyFj7FbadK9vWHRkyvmT0jUT3tJspxLb8dkItdyd8zEttDwy+zVu4sx8ajlseSlxxhtI IdYdS+qaIpX7AGpaBSK+IkgHZII8BRdc4YDufvqaY7KYpztKBmLqC4XA7p+OKgJGrI5Xp7e+rly IWabxdKgIW+cch/wrkVNxbsU2EpH0hfQjXODbR/RFzxPJ56mb8biEEBuKs9vN4FQCMrxOxjqBgI EPoHpCrbNTBEklSavURylo4/4X/GVTIawAcx1yfWSRtyyC3Q+M3oJjHQbA3nX7exGWq9B9JoDT5 F4804f0bpTPeeCl12PSJDXonz X-Received: by 2002:a05:620a:254c:b0:7ce:bd16:a1a5 with SMTP id af79cd13be357-7cebd16a676mr2372257785a.18.1747940630218; Thu, 22 May 2025 12:03:50 -0700 (PDT) X-Google-Smtp-Source: AGHT+IE3hbv/cTHAw65BvG2zaFOMFiF3fJdKYVP7zSo2BWJyotM4JV/mvglu/EFCngRdW50lKsgCZg== X-Received: by 2002:a05:620a:254c:b0:7ce:bd16:a1a5 with SMTP id af79cd13be357-7cebd16a676mr2372252985a.18.1747940629706; Thu, 22 May 2025 12:03:49 -0700 (PDT) Received: from umbar.lan (2001-14ba-a0c3-3a00-264b-feff-fe8b-be8a.rev.dnainternet.fi. [2001:14ba:a0c3:3a00:264b:feff:fe8b:be8a]) by smtp.gmail.com with ESMTPSA id 2adb3069b0e04-550e703c2f3sm3482506e87.214.2025.05.22.12.03.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 22 May 2025 12:03:47 -0700 (PDT) From: Dmitry Baryshkov Date: Thu, 22 May 2025 22:03:27 +0300 Subject: [PATCH v5 08/30] 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: <20250522-dpu-drop-features-v5-8-3b2085a07884@oss.qualcomm.com> References: <20250522-dpu-drop-features-v5-0-3b2085a07884@oss.qualcomm.com> In-Reply-To: <20250522-dpu-drop-features-v5-0-3b2085a07884@oss.qualcomm.com> To: Rob Clark , Abhinav Kumar , Sean Paul , Marijn Suijten , David Airlie , Simona Vetter , Vinod Koul , Konrad Dybcio Cc: Neil Armstrong , linux-arm-msm@vger.kernel.org, dri-devel@lists.freedesktop.org, freedreno@lists.freedesktop.org, linux-kernel@vger.kernel.org, Dmitry Baryshkov X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=12569; i=dmitry.baryshkov@oss.qualcomm.com; h=from:subject:message-id; bh=lrWl0XlZmN0GhCDydy/MQKjwHmM7pRU0zNi71UJ7p/k=; b=owEBbQGS/pANAwAKAYs8ij4CKSjVAcsmYgBoL3T8GhcV+UO/n+bxBYa6wACIsnTTnr4aJnZWN /AMu1iTiXaJATMEAAEKAB0WIQRMcISVXLJjVvC4lX+LPIo+Aiko1QUCaC90/AAKCRCLPIo+Aiko 1azjCACoG/azUaYIHbo7mD8gMQo8EnzlFT7PEU3CKneY2hZKIl8aY3R3fhlclff0pppoQlsK8lZ BMfazJJYS8VzV6qb/wXlESG5cQ16Cwu+dluBJWJpUgIIE1cx16NL/m/qw7HsZ3MV0KrYMCoD/Je 9U+OXVDdJJvlz/MmwSe62lvNegwVU6h49BI30ytGrWDHxB3NtF2i3/2t1TyArZVxallhvWfyWTN MzfWO0pmdxkwoZG1VsWzagcRb0Zg4tr7+nE2pLUooAMPBJTeM7J5PPSlBVjHUa61tWnmLZuyV2a SXnekqM0yBxW5hGmdK0GFzBwnXzSMEv83Y4AmWW8XBGKUUgj X-Developer-Key: i=dmitry.baryshkov@oss.qualcomm.com; a=openpgp; fpr=8F88381DD5C873E4AE487DA5199BF1243632046A X-Proofpoint-ORIG-GUID: sbMK7zcItWAD8PTMin4mISx2-DPGgxNg X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUwNTIyMDE5MiBTYWx0ZWRfXyY1Rku910uC2 faRDxd70jCTRgVS/0F20dcPacceZmy73fmZ5iYweql99mduYCN2iE2GeJYxwTDS4++2Zm22uROO d13maZaBADZtKH0JeQ5XbF0oD1xEJAaWLj/J0bKqIOBzJ8tq1ztc09/1yYX+W5X3BsNgZS93Ifm tB3juHgemT4lvWxGnuaEwisGOsOQ9JD7dqOIZDGxnxq0HJ5y9riY6HYAVjSJPqSr/+Dt7sX02g5 RmRvDVOPdc4n/7kVHD5tUG3gwc/LC27oCxIcnpSMMhh6iQLHNnZQsyv2L2i4pezx8Wd4FtUJH+7 9ouYBXlgTD06UD1w03zCfvckCJ2nmznihZFQ6Xo4d1VZOhZkTCwX/0x6jNShUoJfdogO60+T86M sd79+uD3aigQAf3KQ288RauBme+N8jQqNYJ9YxEWlZk2k+thWdeTCvkAdceo5+lfS1Ra1FNr X-Authority-Analysis: v=2.4 cv=GawXnRXL c=1 sm=1 tr=0 ts=682f7517 cx=c_pps a=50t2pK5VMbmlHzFWWp8p/g==:117 a=xqWC_Br6kY4A:10 a=IkcTkHD0fZMA:10 a=dt9VzEwgFbYA:10 a=KKAkSRfTAAAA:8 a=COk6AnOGAAAA:8 a=EUspDBNiAAAA:8 a=KCnXgIHxdjs5WteQjqoA:9 a=QEXdDO2ut3YA:10 a=IoWCM6iH3mJn3m4BftBB:22 a=cvBusfyB2V15izCimMoJ:22 a=TjNXssC_j7lpFel5tvFf:22 X-Proofpoint-GUID: sbMK7zcItWAD8PTMin4mISx2-DPGgxNg X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1099,Hydra:6.0.736,FMLib:17.12.80.40 definitions=2025-05-22_09,2025-05-22_01,2025-03-28_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 mlxscore=0 mlxlogscore=999 lowpriorityscore=0 impostorscore=0 priorityscore=1501 clxscore=1015 malwarescore=0 phishscore=0 bulkscore=0 spamscore=0 suspectscore=0 adultscore=0 classifier=spam authscore=0 authtc=n/a authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.19.0-2505160000 definitions=main-2505220192 From: Dmitry Baryshkov Continue migration to the MDSS-revision based checks and 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 Reviewed-by: Neil Armstrong Signed-off-by: Dmitry Baryshkov --- drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_10_0_sm8650.h | 12 ++++++------ drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_9_0_sm8550.h | 12 ++++++------ drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_9_1_sar2130p.h | 12 ++++++------ drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_9_2_x1e80100.h | 12 ++++++------ drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.c | 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 +- 9 files changed, 33 insertions(+), 31 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 b14d0d6886f019c8fa06047baf734e38696f14ce..52ad7e2af0148c9ea81a2c95b27= 0be7058fbaec1 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 @@ -31,32 +31,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, + .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 0x1000, - .features =3D CTL_SM8550_MASK, + .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 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 4c5785332b5240109af36a1256d4ea29c348bced..83f73c7cdcc3a280285fa322307= 96fac57167ed6 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 @@ -31,32 +31,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, + .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 0x290, - .features =3D CTL_SM8550_MASK, + .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 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_1_sar2130p.h b/dri= vers/gpu/drm/msm/disp/dpu1/catalog/dpu_9_1_sar2130p.h index 960c68f33074e0cec0f33aa7d4f8f3b4cc69bac5..b21aab274703ac1f38698bee82d= 5d28b0fb6a0d0 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_9_1_sar2130p.h +++ b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_9_1_sar2130p.h @@ -31,32 +31,32 @@ static const struct dpu_ctl_cfg sar2130p_ctl[] =3D { { .name =3D "ctl_0", .id =3D CTL_0, .base =3D 0x15000, .len =3D 0x290, - .features =3D CTL_SM8550_MASK, + .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 0x290, - .features =3D CTL_SM8550_MASK, + .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 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 85dcf577b844995fe11322ec506885bc4a85e33c..d7e5f4dd3bccab125b0a42f67ed= df194359dc761 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 @@ -30,32 +30,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, + .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 0x290, - .features =3D CTL_SM8550_MASK, + .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 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 00e6f3e56ed1f9af581bad9845971fad315ef83c..a162c4f9ebd79d3ba16b50117ee= 7462afdbbf3d4 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 @@ 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 01dd6e65f777f3b92f41e2ccb08f279650d50425..3d6c2db395b65b89845cb728119= 5ca5ca16c22e6 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.h +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.h @@ -134,7 +134,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 */ @@ -143,7 +142,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 d58a0f1e8edb524ff3f21ff8c96688dd2ae49541..58bdd4d33b37d83f30931f09fdf= 80bef41e1f0fe 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_ctl.c +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_ctl.c @@ -555,7 +555,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 @@ -743,12 +743,14 @@ static void dpu_hw_ctl_set_active_fetch_pipes(struct = dpu_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) { @@ -762,6 +764,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 feb09590bc8fc5c77c2c673fd888c28281a98b5a..9cd9959682c21cc1c6d8d14b8fb= 377deb33cc10d 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_ctl.h +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_ctl.h @@ -274,6 +274,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 { @@ -295,6 +296,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; }; @@ -312,6 +315,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 2e296f79cba1437470eeb30900a650f6f4e334b6..d728e275ac427f7849dad4f4a05= 5c56840ca2d23 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_rm.c +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_rm.c @@ -142,7 +142,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 Dec 14 06:40:54 2025 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 BB2ED2BDC25 for ; Thu, 22 May 2025 19:03: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=1747940642; cv=none; b=palVvrzyzB83/MhkhuEcSiY7u6LqY41zHy6N71w0dSgI+yhZg7LyMmJfsX9isnjJYco18mKrhSeQb3JAhAWtYbm9oR6CwBPYO7r3SCrFV0kxjVeEhSHpdZef9sADmgj0GALdqQjcGtLUyLQWBAPLQQBQTlk1bQhymozCY76oaK8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1747940642; c=relaxed/simple; bh=at1HIcx7xG+5Y+V3sblTVBn+/viLWBMIj/QqChtxbLg=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=WYioMY7vURI7Bj0R7hgqPgE+rEe7UIrRBkRrET/MwVwzqvRiUCz28aucHXsZSfTNUbp9FCSAK8xYN4c66pjJewLAdyzpE2aB86mG59elj4p5Vufk8+vq7P3YFeiY6PFnA+wqOpmOlulqFQjtoJSfvmyYKL1mofZK1cZw92+4SJM= 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=IWOvhPtA; 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="IWOvhPtA" 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 54MGvTnc011326 for ; Thu, 22 May 2025 19:03: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= BAP6WeQKgosrVjQ6OCVmuByHou+VXdgsSFyWdC8YkMM=; b=IWOvhPtAjanZjQ5I qEhCD7YBxf3QJhphuMOjXQ9MqC9xPlzxOYhBp6Et/4ntsdxhsfjK+YxEil4exF5Z Anj1SlYNdRMyhxwGnIuLYQYqnzu8xohArsRBmu2dnW+7TDQFBT8hzd16fu4gN5MR Brpmk0q7x4nKtYokz/orgmzHm4xHe/4YiXLWu4jdV0p3PpJl/+BcuZJqXeGGZnko rneNOra1YFbwK9xml3Qos53NHQAvTXCzmZb2pkyrKuv1GGh4bOvbK+ye0fU6d1nQ mOZzoHpc4R/VuI4OJJ5KSSrLOV2kmsXspPqaLY/G4Eub9Qkk8ranqYzIhGTFTo0j xtVXMw== 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 46rwfb7b4a-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Thu, 22 May 2025 19:03:58 +0000 (GMT) Received: by mail-qk1-f198.google.com with SMTP id af79cd13be357-7c7c30d8986so255861785a.2 for ; Thu, 22 May 2025 12:03:58 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1747940636; x=1748545436; 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=BAP6WeQKgosrVjQ6OCVmuByHou+VXdgsSFyWdC8YkMM=; b=fWlVj/J66L4UIWgVt1HdZ+uDh4RgBfJGbPc0GgTWi1b92590dWCb6oEf9dkjnNoF+1 Mftgk672qnj6TS20i4Msr5ZincAzMGyLoQcmVF79xZgreTVQvFZXVtH/wfViCm51C6v2 lXvXmjO6z3Ui5HYMjnSbbXH+14U65kN7G0bkQaVthSkbp1+zwPdeAnUXTDyLY3Y3CQyV HLgTwzSi+taDt0vaTc2ysSLdvg6Xue2CuxZKIuY9jkIh0Lwcje6r+RUMPmrTORibc/VK M3t6ANpM7bLmFcaTSYXrDOaoT4Dr+jdNUGWqCVuSiHi7YfyJ+asAZesN+qXX1GfkgTTd FuRQ== X-Forwarded-Encrypted: i=1; AJvYcCU7VAIc2OlziURt/cZiU7jx0J6yF8ujIgnYHqBrPYs1J37YbKUwuxiYiy8E/B4CdsfsJCbmpglX03bYluk=@vger.kernel.org X-Gm-Message-State: AOJu0YwTn+qNE/ucfxyqIXf3vFE3EwxEHMf629r3R1NvnwEPfZOC594/ JR9ZkbzGkTv8cV9EJk4zkrERc43r7AiaTVZHjcctyyP2eU3q5PR05OyLKG+KpknMUAzy/j1EdR+ Uh+uy382/SAIAVnECK1tDzCMCbEQ+4uXWa/wlNF/TLEe3WQgCUpJEizbyLPG2NqGnlTE= X-Gm-Gg: ASbGncu5HUOgfnnzc1pGzntFXiM+6iB9zqmZ/4I0EjB69Ts/UVoK4ZZMD+0Ux4i4A99 qDFUB9fe2ddfrutHEraEwdvS9WMRoqN4mXDZoSXDmTDfeMldznPiwa5YxsIYzHEdEtadta0fLvj ErqFeCeemRh997lETPa/NfnTkUUriUd2ZTDRDODNdzzOjCVD0l0pbeI+7kWAg3Op/a+7HVRJ2Ur W3Kgs+uoppzIfsrm1KkRTQin4GRitaUROFqxvERni+uCq/e6GSV+tD9FMjI+vyrIOT/KdxR2XGI tSVPbDid/Kd1bS1V0H6Bry5Ge/2IiV7ss3WnuhkZMV/yQxPo5cHCgP/vIDp+di779dp9qad1te3 o158iFGRh8dAUHMc/14pyxhC7 X-Received: by 2002:a05:620a:31a5:b0:7c5:9993:ba7e with SMTP id af79cd13be357-7cd47fd8e86mr3505559485a.50.1747940635573; Thu, 22 May 2025 12:03:55 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHIu9SmIDr556eJ+RcKcx70FrdyG6fKbS2tziw0f1+fNmd8WfIgEAKGKonrjL9nyY6dna+JvA== X-Received: by 2002:a05:620a:31a5:b0:7c5:9993:ba7e with SMTP id af79cd13be357-7cd47fd8e86mr3505554585a.50.1747940635110; Thu, 22 May 2025 12:03:55 -0700 (PDT) Received: from umbar.lan (2001-14ba-a0c3-3a00-264b-feff-fe8b-be8a.rev.dnainternet.fi. [2001:14ba:a0c3:3a00:264b:feff:fe8b:be8a]) by smtp.gmail.com with ESMTPSA id 2adb3069b0e04-550e703c2f3sm3482506e87.214.2025.05.22.12.03.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 22 May 2025 12:03:51 -0700 (PDT) From: Dmitry Baryshkov Date: Thu, 22 May 2025 22:03:28 +0300 Subject: [PATCH v5 09/30] 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: <20250522-dpu-drop-features-v5-9-3b2085a07884@oss.qualcomm.com> References: <20250522-dpu-drop-features-v5-0-3b2085a07884@oss.qualcomm.com> In-Reply-To: <20250522-dpu-drop-features-v5-0-3b2085a07884@oss.qualcomm.com> To: Rob Clark , Abhinav Kumar , Sean Paul , Marijn Suijten , David Airlie , Simona Vetter , Vinod Koul , Konrad Dybcio Cc: Neil Armstrong , linux-arm-msm@vger.kernel.org, dri-devel@lists.freedesktop.org, freedreno@lists.freedesktop.org, linux-kernel@vger.kernel.org, Dmitry Baryshkov X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=19282; i=dmitry.baryshkov@oss.qualcomm.com; h=from:subject:message-id; bh=frwFHLWaApr4qEvZ986JnCHMnqO/l4KeolCxEQSYEGA=; b=owEBbQGS/pANAwAKAYs8ij4CKSjVAcsmYgBoL3T8Xx04ta//KKoV5gcFr/8/9SnxeoJI+QN5g 6FO8q19ScuJATMEAAEKAB0WIQRMcISVXLJjVvC4lX+LPIo+Aiko1QUCaC90/AAKCRCLPIo+Aiko 1dBGB/wIUhc3RegDi1dXUBqqlcdzuUgi+ggCiyhNbjZAD9UumsUPI8wl79nY3jziBCzoWL4poB+ Mm6ArtGhCyDo18JP+LL4FJbX+wQL7E1R/5W0+gJWPHCgycaPSEseBvxDT0QNg/gqoWpzTy+zARW YEvEvx12M1GPYZYdfONAEmJH1MJyWHMaLgysYZlR2xjtH5W9jaHdPjgxHsMqDy4RYkBB/kNqUOn uBVxRzHHpROYj7wW8M3ANG5o4vcpmn1rI8ESHcme5p5oiJtxsDCqvggd+gC8Ea4Td+FSJVJO7kb m83e/K1DIrvWyLz9dbBH+O7pCPgzhGvSYHA5CUPZeRAgO+de X-Developer-Key: i=dmitry.baryshkov@oss.qualcomm.com; a=openpgp; fpr=8F88381DD5C873E4AE487DA5199BF1243632046A X-Proofpoint-ORIG-GUID: xJ2jBz1wc61ZgBJXqjD08OfxCDEKjzTm X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUwNTIyMDE5MSBTYWx0ZWRfX8y7F7xEksSHZ PPpuJER1odqDmCPs5OaIyMrlS22PBgOJyJwzednOfZWfSbq30JSzS1Vtx+oS0q8Lo64T3QVEiXC jMgKESexP3A9Vl9+wvi/RCGFdi1VEegPZ8PtcZRe/eDY+rzTuS+Ydbx7tHCAQdGf4Y0OS5UJxPj ptmRPSakTQ668ARMax6qRNFQ+HNp5CrgewRwLsw05agMJtHeCsrOxUWLQtaYPswBwEW5YW9zV/P DWarQlLuc84itKjDS0PAqz7Csu/RNhrQbD4vb+iBFDDsvJ9F4lR8qEE6HeDKzO2UPyJx4INjx+M hAA5Nv97TT4nm1j/J+pfKacXWNsJYUvmcFoylMLTBu+qqunJv6hgZ9ErYb6IpQwWuFcyYNxyI8/ tgs+9OEczbehGj/Sk7m3FZaXTWbAQNFMidy/5KNugbqH89kRnlWUaFp9Eh6cqNDw6pnBI0c2 X-Proofpoint-GUID: xJ2jBz1wc61ZgBJXqjD08OfxCDEKjzTm X-Authority-Analysis: v=2.4 cv=dLCmmPZb c=1 sm=1 tr=0 ts=682f751e cx=c_pps a=qKBjSQ1v91RyAK45QCPf5w==:117 a=xqWC_Br6kY4A:10 a=IkcTkHD0fZMA:10 a=dt9VzEwgFbYA:10 a=KKAkSRfTAAAA:8 a=COk6AnOGAAAA:8 a=EUspDBNiAAAA:8 a=QkM7UoOa6lEXaYzOGzoA: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.736,FMLib:17.12.80.40 definitions=2025-05-22_09,2025-05-22_01,2025-03-28_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 mlxscore=0 clxscore=1015 adultscore=0 bulkscore=0 phishscore=0 suspectscore=0 impostorscore=0 malwarescore=0 lowpriorityscore=0 mlxlogscore=999 spamscore=0 priorityscore=1501 classifier=spam authscore=0 authtc=n/a authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.19.0-2505160000 definitions=main-2505220191 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 Signed-off-by: Dmitry Baryshkov --- 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 | 6 ------ 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 | 6 ------ 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 | 3 ++- drivers/gpu/drm/msm/disp/dpu1/dpu_encoder_phys_vid.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 +- 17 files changed, 7 insertions(+), 57 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 b2ee5ee01870507d9f01020443c30dc573414c72..6c8ef23099a8212f33780d27a76= 991e9955a9bc3 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 @@ -41,32 +41,26 @@ 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), .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_1_sc8180x.h b/driv= ers/gpu/drm/msm/disp/dpu1/catalog/dpu_5_1_sc8180x.h index 6db04c668a87a9f7baea01a9ea2a0f1bbb1212bf..37d18803af4b850c40ab855b1f1= 3db96f3ee96ea 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,26 @@ 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), .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_2_sm7150.h b/drive= rs/gpu/drm/msm/disp/dpu1/catalog/dpu_5_2_sm7150.h index 6f61ce85c536e36b65b98ba4740711cb495a7c9a..41b43fb258508f1a5f285c88a3c= 1dc2f5f271cd0 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,26 @@ 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), .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_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 192e90b570dbf8f5c3c24f572443e111f6cf3db2..6e571480c4a44b4f4663574c312= 70657b9a06a7a 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 bdd92b5a61eabc6a1d5e0bfe740ed6d9f1e8e94f..6f9dc261e667fca3e94ec24e00d= 45f9af46e401e 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 @@ -39,32 +39,26 @@ 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), .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_2_sc7180.h b/drive= rs/gpu/drm/msm/disp/dpu1/catalog/dpu_6_2_sc7180.h index ce2ec6af5f53e2177009ca8826ca510fa08c03c7..373c7d605a04a1fc72f45e993ec= 176e8f5e015fe 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 986179b53f8b59200d10f5159cac630732dc7196..1cf9f99d0542cf7037d2a9672d5= 1ca7c437c364e 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 c2321a4a7d3894d85062d083b45402950122007b..a3db71676f468526ea129c4b846= 5fb2c47885162 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 c3dd2383bd5f32926b50d98c937da25ed59d7cb3..719cfaa98ab9e735d9255d9a5f1= a4275739b4b1d 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 abeaa2b8e06fdf6ce5cec2c1a4fd025a342f5a2f..04cdda85e6828a83e99d146ee9d= 9f809f1acc007 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 a0ba55ab3c894c200225fe48ec6214ae4135d059..0ec6d67c7c70b15f0af5685d783= d49a3c7ea8cfd 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 @@ -69,7 +69,8 @@ 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->dpu_kms->catalog->mdss_ver->core_major_ver >=3D 5 && + 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_vid.c b/drivers= /gpu/drm/msm/disp/dpu1/dpu_encoder_phys_vid.c index d35d15b60260037c5c0c369cb061e7759243b6fd..e12bca8a26ec98565a96919b1c4= 3f7fa2ea8a0df 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 @@ -373,7 +373,7 @@ static void dpu_encoder_phys_vid_underrun_irq(void *arg) static bool dpu_encoder_phys_vid_needs_single_flush( struct dpu_encoder_phys *phys_enc) { - return !(phys_enc->hw_ctl->caps->features & BIT(DPU_CTL_ACTIVE_CFG)) && + return !(phys_enc->dpu_kms->catalog->mdss_ver->core_major_ver >=3D 5) && phys_enc->split_role !=3D ENC_ROLE_SOLO; } =20 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 a162c4f9ebd79d3ba16b50117ee7462afdbbf3d4..0863e5cfb3283ed32f61ddd4483= 220742df8633d 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.c +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.c @@ -105,8 +105,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 3d6c2db395b65b89845cb7281195ca5ca16c22e6..9981d090b689b46bbc378d1965b= 0efd1df0efa8b 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.h +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.h @@ -139,7 +139,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 58bdd4d33b37d83f30931f09fdf80bef41e1f0fe..2dfb7db371a3915f663cf134e4d= d62f92224185b 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_ctl.c +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_ctl.c @@ -766,7 +766,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 Dec 14 06:40:54 2025 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 5D1432BDC28 for ; Thu, 22 May 2025 19:04: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=1747940644; cv=none; b=fIA6IF4mcMZoK3YXQrxCyTq6mGJNEjC+16COg/mWz2PJd58X+WbjJxlZLbbGKbeTlFfLUK3pyMawcthWwnXY+lVrdgT37cS6agQbt3q1Cs+Bq6O9RdCmjNMVX+uLU8odBGW1l/2nuzD+iHlt/TF3B0rn9D8KlxfHs9qPypZ+dbM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1747940644; c=relaxed/simple; bh=/l6FnDU8h9v7nqRGrkMpZ1JZrw+P23WN5JgLXhQ6sBY=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=Kbape2zjRWYp21xSSBpzRQtPj0l6kouCnBTYN3KURZ+vwPszZ1IdIpyLUSzYjbJ0I9gVNyzUyNPRZCv/ZO12SH6BPiLbTRGESMKtcyDZcpVNqdebSypGDwij3QnTzLDyPMJXdVnnaV3E5i+Ksg9HVHuKGpzstVwXG8ADkAFjkvE= 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=mPHlmqgd; 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="mPHlmqgd" 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 54MGd0Wu011357 for ; Thu, 22 May 2025 19:04: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= SAXuCHIXzob7I7yDg4by0JQEOARzxYVn7zXbtJ2VPvk=; b=mPHlmqgdOd+nPfI0 NHDnL8hyhJjcyor/EpLFFA546rCa0gX5hsTTx8ACMqWiTlCdaRddg/py1jqfFpAI A/xxHkY8/2nn15WM/xohI9f+sn6+EQo8CloAE4LZRSrIVcZOorbBmzpXrLKVBDBv KOa466GL4dwwtsW1/gDsvcAcULvDIZClTN6epOhVRVbp8dLBbMzoxVopd7pP3jyg Jgc4CeFkg17280DBE2pFh7Eq3MqDCMdYrD/GE4T+Iz9EJos2NWUSFtE9PqdCdWEd xAaNGlBS+J6nq3XKyDT/TLjK8VLyUm2DvQ1IxeTP8to+JbhzLDEIWv1q9Ip4qT1a NtgdDA== 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 46rwfb7b4n-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Thu, 22 May 2025 19:04:01 +0000 (GMT) Received: by mail-qk1-f200.google.com with SMTP id af79cd13be357-7cabd21579eso1446885385a.3 for ; Thu, 22 May 2025 12:04:00 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1747940640; x=1748545440; 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=SAXuCHIXzob7I7yDg4by0JQEOARzxYVn7zXbtJ2VPvk=; b=ACYgCRc/efOrFFz9Fna5cblL5CcUM3blbM0BvbPO1ZQdB//x8vACEHTZ9syjUoywv8 oR4vhN5T337v5De4DpgmINp5jSa9oE4HyCZfa9kK7c8rAiJBS1SfPBnz6Kd3hLqTP2wJ BskyVBwVgKlo3K7I9ms6aobbnEj4cfPl+93vgB9VlW5hGDiX1D6uzKaSnZSuOfU9snDp 3hZXkW+5JpnTisG8k21PGYkS2LVaDkqRaDyA+77OjNkNyi4ndh39duJC8dRBAEpAdLsW /dy0/aB95XSo2DUlf5bkkRyjRwJjlMN5p525waJntRPCc1mfniSLyMdddUTzqhGYbtT4 S9DQ== X-Forwarded-Encrypted: i=1; AJvYcCXHGkZHzdOtLBY8RFMvyy7qfAd/hPxrFWm4Ddv2yOp5kf/PuxZRg5yzq5xW1+w4UnMbe+CnzCb2ffeuJ5U=@vger.kernel.org X-Gm-Message-State: AOJu0YwVHUw/Ve8ohpCVX9TcuOGkjA5QQ4jo2yzSWJYqGCkACRESq3Wh qY4CaLHauKPDf9dPDP2Sd6068z/qlafm36rxJO7lfikt2GgFDLg53qiiSqTh9Y3F4PQEb5Wutj6 NasfGqf/FXmIiFZx/c0tVUnwXErK1muIkMluqARMMFpVjp5wcqDkP1RfdpCTRNJBrm8g= X-Gm-Gg: ASbGncuJwCUmh/PXuMTF/P5p1AIIxwiTMMGJuh5AIjP1Cm2RbRyLlikX3A/qResA4ri 0vaNxoniG/+PpMMMVagKCzpFliRUJMHAfQk90Z+VlBpJkR/9n7m2eynw47Dv8nw6//gsxZy09v4 hzILTxKzrOjvQw7cnl0DqffPzoiq14Ex6vAUwVWk5ZfIoUJg+9iAKC/dml+3ykwpRJCklhZFYSs 7186QrTtJG4X8dLtKckX7l3gjKnxGNDWbBvhe65kSSFRLPT9j+bVcoAxCo4IMqj8E0Yi21Scgsd ghN8rd+9RjVecdumnrHqPH9k1pRQUSu2t2lbyyTkW11PuSRM0ByQjJWp1Nlm2j3by3KvkXVey7L Pqv4OKoQC3LCpquaL4LbStqcX X-Received: by 2002:a05:620a:400f:b0:7ce:d352:e2c0 with SMTP id af79cd13be357-7ced352e386mr1146829285a.25.1747940639720; Thu, 22 May 2025 12:03:59 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFtop1DYOBlB+JkelLga98KWOgpBTnz/VdiqX4EP3GRjMG13kaJhcMsqY3geHDRZhiht48xFA== X-Received: by 2002:a05:620a:400f:b0:7ce:d352:e2c0 with SMTP id af79cd13be357-7ced352e386mr1146825485a.25.1747940639378; Thu, 22 May 2025 12:03:59 -0700 (PDT) Received: from umbar.lan (2001-14ba-a0c3-3a00-264b-feff-fe8b-be8a.rev.dnainternet.fi. [2001:14ba:a0c3:3a00:264b:feff:fe8b:be8a]) by smtp.gmail.com with ESMTPSA id 2adb3069b0e04-550e703c2f3sm3482506e87.214.2025.05.22.12.03.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 22 May 2025 12:03:55 -0700 (PDT) From: Dmitry Baryshkov Date: Thu, 22 May 2025 22:03:29 +0300 Subject: [PATCH v5 10/30] 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: <20250522-dpu-drop-features-v5-10-3b2085a07884@oss.qualcomm.com> References: <20250522-dpu-drop-features-v5-0-3b2085a07884@oss.qualcomm.com> In-Reply-To: <20250522-dpu-drop-features-v5-0-3b2085a07884@oss.qualcomm.com> To: Rob Clark , Abhinav Kumar , Sean Paul , Marijn Suijten , David Airlie , Simona Vetter , Vinod Koul , Konrad Dybcio Cc: Neil Armstrong , linux-arm-msm@vger.kernel.org, dri-devel@lists.freedesktop.org, freedreno@lists.freedesktop.org, linux-kernel@vger.kernel.org, Dmitry Baryshkov X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=2649; i=dmitry.baryshkov@oss.qualcomm.com; h=from:subject:message-id; bh=73PNb9U9hPhtgDIYoKDO+U5RvVBCB7fQuR7leMk88VQ=; b=owEBbQGS/pANAwAKAYs8ij4CKSjVAcsmYgBoL3T9Ulgcc13VbVg3mZTLs57CraySRoXFZ3SMP Xnb3jmUDjiJATMEAAEKAB0WIQRMcISVXLJjVvC4lX+LPIo+Aiko1QUCaC90/QAKCRCLPIo+Aiko 1cwyB/0VZxlJnkCsz1D9/IronGDMdIKooY2W+C8xzh923SPBrMQs1H1xI2jVhTZx+u14OTyjE0R SNUFfR0RDAbgcVxRmjtHM2iQFpLNCfzZae+qPvsw4LhwZEI+dQN0Q0nmtaHUnCNiWt2cBtUni0E DB2ow8sHTIMbXq7vWcOgMFJ28Yn/ZDvsp24MMI4UO4uGoVmkT/h79xCSDZ29k3Olh61DreMw8a+ +kC2lb4oW1WemQu1BMBLsgGzUHRr/bl4grnC1Ma7M8kZlUw/dT6Atug8bzxJyvgIPg+THdsEzH5 Y0nlt3/br5DFL3aipAVNa/V+I1gIxso1XumVWcETHsAKxFaP X-Developer-Key: i=dmitry.baryshkov@oss.qualcomm.com; a=openpgp; fpr=8F88381DD5C873E4AE487DA5199BF1243632046A X-Proofpoint-ORIG-GUID: Cqqg8FzlYDsFQoZfdrjX9eIIbpcXkCKK X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUwNTIyMDE5MSBTYWx0ZWRfX0Wq2tZyVvm1e HltclnYFBMKZ08Nz0d6p0W9fVUnD6ITxmbU6gXYYSX9EtAJCRAaBGOTNv2J47hJJqlxocpJFyKC XVZpu9+ex0kcbo3GCPABc5ZH7TOK8WKGCua4DOnpQ1VxWKOFbJjjjBdtQS1nTXG4blkVDtpxlw2 vTbEvnEwPORlfY7P0vzVaENYAB9SqIYeHejjcGIs0Hw8H7K8odLxsI0c2UdYOTq+IDfgUaYMTID nIK0R/Dq1I4x7jYDsIx/MJtEw2RYWaE1vYSHSVTR10RTv85mcMwl+iVnv/XoRZlUVW8bgqB5eym +OyJUUBUufIMc/OduVeMCeumFLVUnPLEKyVEs0B7bvuSw+0artSqt8grZ7avVcDWno5lOpWHDYW LGcMvJ8M35Tu+hFLlmG4nwINWqqjHtBGHB41cXU8DkSbPsqVTppiZ+zRDL0dUXvvdm4PteqD X-Proofpoint-GUID: Cqqg8FzlYDsFQoZfdrjX9eIIbpcXkCKK X-Authority-Analysis: v=2.4 cv=dLCmmPZb c=1 sm=1 tr=0 ts=682f7521 cx=c_pps a=hnmNkyzTK/kJ09Xio7VxxA==:117 a=xqWC_Br6kY4A:10 a=IkcTkHD0fZMA:10 a=dt9VzEwgFbYA:10 a=KKAkSRfTAAAA:8 a=COk6AnOGAAAA:8 a=EUspDBNiAAAA:8 a=1CFBwsujT04XwbEipTUA:9 a=QEXdDO2ut3YA:10 a=PEH46H7Ffwr30OY-TuGO: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.736,FMLib:17.12.80.40 definitions=2025-05-22_09,2025-05-22_01,2025-03-28_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 mlxscore=0 clxscore=1015 adultscore=0 bulkscore=0 phishscore=0 suspectscore=0 impostorscore=0 malwarescore=0 lowpriorityscore=0 mlxlogscore=908 spamscore=0 priorityscore=1501 classifier=spam authscore=0 authtc=n/a authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.19.0-2505160000 definitions=main-2505220191 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 Reviewed-by: Neil Armstrong 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_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 0863e5cfb3283ed32f61ddd4483220742df8633d..6fed2cce082c476c1f7f8ee683f= 2a6f3eeaa5231 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.c +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.c @@ -105,8 +105,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 9981d090b689b46bbc378d1965b0efd1df0efa8b..82f04de6300eca7d05ece3ac880= c26f3a56505b9 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.h +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.h @@ -132,14 +132,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 2dfb7db371a3915f663cf134e4dd62f92224185b..772df53bfc4fcc2ff976f66ef73= 39be1ae3da8f4 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_ctl.c +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_ctl.c @@ -809,7 +809,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_fetch_pipes =3D dpu_hw_ctl_set_active_fetch_pipes; =20 c->idx =3D cfg->id; --=20 2.39.5 From nobody Sun Dec 14 06:40:54 2025 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 5C5B428C00A for ; Thu, 22 May 2025 19:04: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=1747940646; cv=none; b=QA8jqVEWxP82EeO/XLZ9Wxf55nBvLw1m1F9ZhRIBsVNVPRtAiyGjQVFyR6vdmQfDEHCvM5ahOby1m+jvO614ykwefMwFBMP6oPUw9m4Ynl4kMTgZdkACxCq0VvO4dSJ6J6DsrweZ+EQWXMI7RA9AuKWHJwEXVnhx/JWQrp4NTbA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1747940646; c=relaxed/simple; bh=BWvuJG5du6uXeVO2i4s5QVwpOOM2vebWTzYrE63jd94=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=OgSMnek1pftkwOKOPH/64lcyR5zrNuCwminfpNyZHHrXg8LeUJPQvem4eWNWZl/N3/LS+U6sdX1gfwXFB2lDjmPyrlAXMSDOlLlr5RpwT56/TU82+LuGhGNnFg25yFsaedRAYALaZPP2pjmME+BmdvdybjQo+RWuvGV+aEPRLUw= 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=KhpLG+sq; 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="KhpLG+sq" 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 54MIMSaw029233 for ; Thu, 22 May 2025 19:04:04 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= 520oFGgAVIHzUGYZ4vVIsy4Q9fI3b2Y3ZlgCsgK2yUc=; b=KhpLG+sqWiXdcRLC BWyw2duimxDxkvLngJpTkpPY/00G1Wg9QUTYOT4JgSn8PuRUl8i0VwbnBVX0Abeu 95MCov5VQ2xoH997/J/6O4Y+ZK+X27769+ZYtwFZ3SRA2IAQgAtz38TIwFRLfIMK pcfKyxThBe/cpR6h8vGrE88eAyYNhVQuBaYm5IJmMCEYT3fJMiF3uZ2Zyjj0/0K9 4eMPckThdV0Nbc/l1o4tLlkY/Fa34+ci7Uc8dM2gZBJHwVO6nYp8DYO/tBdTwMIa K3zP3LnByqwPNpN9nJytwAbZesjgGc/B5CS9JeMsALr0ftkQToaxNIPlFzxIPV7U TRAPCw== 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 46rwfb7b55-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Thu, 22 May 2025 19:04:03 +0000 (GMT) Received: by mail-qk1-f199.google.com with SMTP id af79cd13be357-7c5c9abdbd3so849416985a.1 for ; Thu, 22 May 2025 12:04:03 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1747940643; x=1748545443; 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=520oFGgAVIHzUGYZ4vVIsy4Q9fI3b2Y3ZlgCsgK2yUc=; b=oWz8+zowGUAO7O9Q9Ba3pV9k1P7kLZIFe7120mjXMBVL1c7icv4Cb3pITbfZR2o9YC TqrYKY7E8RwXcepMm6b5lUtZEn/YiHdMipJhl9eVlhnyBZ28/qLggPDbCuN7FKEnjh47 ips7Dyoq8c6JI/GRoZR02X3BVHaS9RuOb4OKZf823xdui2jq+OKc9ZUo2Cov9H/QQSbb GNWB3/aMBoxe+eo4IP13pLa1GRXfbT+siiFZ4vKL7f30WXnygt6dDXr1Epthg8IIe5Li v8c4dWlco7tsCysduKkAZiqbqiShTcsdrfm/V5U/94gfqWlE/BZ0Zd47po7L6apaBVwN yr0w== X-Forwarded-Encrypted: i=1; AJvYcCV2kinqSgoAcIyjIKz0wJKz1coue3/RYf2aJuRqdKk+Z84Eh3BuBJZNgIHXR0SlSiPT8sxbU/1LZUeWDUU=@vger.kernel.org X-Gm-Message-State: AOJu0Yxf9R/RKOH0maqUvQIxh6u62fVcG3P9OD+8pHt4k1Jh4f6C8t/j iMWYQCZjxIOGCEp/fK2Ymv+oNoT9kuSMT4gCzL7BjMyP+cfQPBnlaFOb2+8LchcpBDpUJVKIMEH e62q4V8sF++oXyF7YgMu61jlO6Dww3p88lUSt1VG7s5Iyby2I89BUa5A5LUcFdL6D5v8= X-Gm-Gg: ASbGncsA5qnY+s8m4hHpPCWifzAhKjpPykTorpjgFSR9aCY/PB3Km2381tUPnpZosOp jU8sAn7W0stYUEPZtn5olfrFKfjDi3/WaF4egBFrB8T8xNNcFM3t41mfTKaaR0OemUtJvPUaRid tiC1B42eWA65Yoyc+dldEq8ATvpRiDEQPum2JpiX8NIB9fUxJ5sHnYhWb6+YMTgPyCYDRSNMVM2 t57TSuM8nt0sDUrdHCic1B4lhKRg+Px/sDeLT+uFE+jl+ne5k16hzkMvZtHIGiHMfn8VLg5YUzK I/vPTkcAnwRpTSFMrUxeXOw+VGct1JZcLrBk5ZEhgA6uUEKfRU3bcDKJKjdkHBHaSwTBRiRHHkY kjf6WET9zra8zX+ZTRIx4McZB X-Received: by 2002:a05:620a:25c6:b0:7ca:df2c:e112 with SMTP id af79cd13be357-7cee326c929mr6911185a.45.1747940642873; Thu, 22 May 2025 12:04:02 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFzxquIY8HhNhqWCNPDmBe+j5FWdsACOdAapT72f/I0iKVGXenxbZCexTv1LjK3ndZUkz5kFw== X-Received: by 2002:a05:620a:25c6:b0:7ca:df2c:e112 with SMTP id af79cd13be357-7cee326c929mr6906585a.45.1747940642445; Thu, 22 May 2025 12:04: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 2adb3069b0e04-550e703c2f3sm3482506e87.214.2025.05.22.12.03.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 22 May 2025 12:03:59 -0700 (PDT) From: Dmitry Baryshkov Date: Thu, 22 May 2025 22:03:30 +0300 Subject: [PATCH v5 11/30] 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: <20250522-dpu-drop-features-v5-11-3b2085a07884@oss.qualcomm.com> References: <20250522-dpu-drop-features-v5-0-3b2085a07884@oss.qualcomm.com> In-Reply-To: <20250522-dpu-drop-features-v5-0-3b2085a07884@oss.qualcomm.com> To: Rob Clark , Abhinav Kumar , Sean Paul , Marijn Suijten , David Airlie , Simona Vetter , Vinod Koul , Konrad Dybcio Cc: Neil Armstrong , linux-arm-msm@vger.kernel.org, dri-devel@lists.freedesktop.org, freedreno@lists.freedesktop.org, linux-kernel@vger.kernel.org, Dmitry Baryshkov X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=2781; i=dmitry.baryshkov@oss.qualcomm.com; h=from:subject:message-id; bh=R2pfqwbiufRy26Qr61RXns309s3JHy9UAH0Tqdyv7QE=; b=owEBbQGS/pANAwAKAYs8ij4CKSjVAcsmYgBoL3T95UgV39T4ep2h1SCm0PcapDyxtsT11KWVj 05MDktyaQCJATMEAAEKAB0WIQRMcISVXLJjVvC4lX+LPIo+Aiko1QUCaC90/QAKCRCLPIo+Aiko 1cgdCACccb8v+ZZmGPkgp6/u9+Y0q/lteJhu/gtu0N1swCzsf6TSIejBwxhN3hXB0QniQYc01ii olrJpEPhQMDysiBdkPLX4+xicK3NOFy5Fgw+HGLgxKfN4/4dYS6/OWqYcfBC5d0N/fGZ9mtqlBF CztSUKRQLC3wh7bkEjiPAcQwPn6N5Pcne2BobCrW7haNU4Fm3I2UMyoJ6l+N3gmED/NcyvjDQxj +mTdZnPle9yLLA9OII/QQGYyQ+rFKIZtNRxjs82zYbw0xFY5Yvkahq/OHH4M8ILYzdWcMMd6GTI zSCNJoTeh3AGRv5yiP/Q5A6tuXgQahGdG6LbOsOoAjpugz3O X-Developer-Key: i=dmitry.baryshkov@oss.qualcomm.com; a=openpgp; fpr=8F88381DD5C873E4AE487DA5199BF1243632046A X-Proofpoint-ORIG-GUID: oIjqU4tUQmpoInw6oHG1IhBl8enKqlpO X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUwNTIyMDE5MSBTYWx0ZWRfX909vnBnFCfH8 f4jlrQJ9KL68deHLf2hq1WY/eV2+dS9nqTV3qGFQWnJ2T1EqyCelIoOnHaat1LXxT47nncRf3z7 BlIgYKZhQ63pLBvj++AHw4OE8/GbQx+HMD1/j9Tyerb/ERNlb4lAn84Q9OR89fs5uvcaTNhyK58 vps7JojEyr5Y/xLugHXH/bm5IzsCw+8CZJhuPbNFOGao9AvJLP4VC6ChYCLaQk40FtOf/vwt2db YhnIzB1EfMRhtW+tIE+OGrH1lplnAx++5da30Q70bTk3asIP+Y79IyPMMnhPxEQ8K7b5eJNvpxX KCNbov+SnlaTFWnecFN10gr6InKfm1rch7ouMRg3PBx9v0cT52vxub/7pQW3AubcuhPMWSnL/ch g7GS65S6K3BF38RCduvUV/IplLcNvhRdOgVXwQ64ugnzvD3t1mXDhd1GUM097cZ/GC9+SQZF X-Proofpoint-GUID: oIjqU4tUQmpoInw6oHG1IhBl8enKqlpO X-Authority-Analysis: v=2.4 cv=dLCmmPZb c=1 sm=1 tr=0 ts=682f7523 cx=c_pps a=HLyN3IcIa5EE8TELMZ618Q==:117 a=xqWC_Br6kY4A:10 a=IkcTkHD0fZMA:10 a=dt9VzEwgFbYA:10 a=KKAkSRfTAAAA:8 a=COk6AnOGAAAA:8 a=EUspDBNiAAAA:8 a=Yf7QHpgQJbPwferW474A:9 a=QEXdDO2ut3YA:10 a=bTQJ7kPSJx9SKPbeHEYW: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.736,FMLib:17.12.80.40 definitions=2025-05-22_09,2025-05-22_01,2025-03-28_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 mlxscore=0 clxscore=1015 adultscore=0 bulkscore=0 phishscore=0 suspectscore=0 impostorscore=0 malwarescore=0 lowpriorityscore=0 mlxlogscore=999 spamscore=0 priorityscore=1501 classifier=spam authscore=0 authtc=n/a authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.19.0-2505160000 definitions=main-2505220191 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 Reviewed-by: Neil Armstrong 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_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 6fed2cce082c476c1f7f8ee683f2a6f3eeaa5231..19a859e2a1f80c2321789af4ec7= c5e299f0fb873 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.c +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.c @@ -105,8 +105,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 82f04de6300eca7d05ece3ac880c26f3a56505b9..1e5fc1d5873975189a1759212b8= a6c6078de22f9 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.h +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.h @@ -133,13 +133,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 772df53bfc4fcc2ff976f66ef7339be1ae3da8f4..edb82c81b0a449b1a7273fc2589= 61b9447be8d9d 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_ctl.c +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_ctl.c @@ -804,7 +804,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 Dec 14 06:40:54 2025 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 1A9542BF3C2 for ; Thu, 22 May 2025 19:04:12 +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=1747940654; cv=none; b=HFwa6lHjeMjfKdjGTJQ9GqLP5Ju1qWGx7aSJXPs99y5VNUuuJkpEHOFoyjk9aBhWTdJfVzISz/NY6PdAeKv7SKcmOhOohJLb5wW+usbIjUoDFEhm8OFFcyYoe1fi8fkbjztsIJ/97icLBT4cI/Sq332Dkkk3EQWyYk5Ut9YooZg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1747940654; c=relaxed/simple; bh=IBOdvAi4zoG/rA+TrDbUIbU5YKy9vCpRbdTOVGzRJjc=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=DWYy1jHTEGCrrsSsu27GYVQi4mr6nxpfdBAJ34mL6N2wEaskyqIZpYv16BpjMqO1A+KxRONNsD3/Y4v892dMbHCxZnPavfSl+OHPxCyYadhyrMySmwPdeo5DQaTGLgvmqga84PIy4Md7MYjVBfQ2nFciVpuB4Y/DcZXfr9/jgRE= 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=W4PHLOBA; 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="W4PHLOBA" 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 54MI5NLL011354 for ; Thu, 22 May 2025 19:04:11 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= jrmL4KXzGUfPUzCokAbLgPfU4jMCQqdkBU6ZAzVap6A=; b=W4PHLOBA6yWirSIR mXchwlDn673u2YqSq/ewahy6JASksyB47wKhaR/dhAc0t6TUVgAOyhqhXq731Cq6 miPVPsnAezCSoQTFc57dECzJLwx9CKOtEtAs76O8NJY5rpaN7EgMSje9y7o8YhfM bdkPHqE3KuIDh0cflprUX2Hu0NRSf3z8ihP4RLYkO54H9Lb9ObJVKNp8oTiVAfyI N52FKz6UG7d1Tw8VkpDjSZmVODQzYicikCtNRpr9pgqQByx+CyPNll5l5iQf/6JM c/Wu6rKJPsaOPA68HFGJ8v8lZie/A++Mg8kFOZ/EEIAaQ6DbX/4jfJ6C7FFtWBKg weWpBw== 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 46rwfb7b5w-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Thu, 22 May 2025 19:04:10 +0000 (GMT) Received: by mail-qk1-f199.google.com with SMTP id af79cd13be357-7caef20a528so2141705785a.0 for ; Thu, 22 May 2025 12:04:10 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1747940647; x=1748545447; 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=jrmL4KXzGUfPUzCokAbLgPfU4jMCQqdkBU6ZAzVap6A=; b=LudqVuxFZH0zlpp0noFE6Q6b2Eg9qdW/b120yM6gPPZDsil/V8qBqJEkhagUtFOvBS riJEoXgQK9d01MS3PWLUY2B0lJEoTy3y+ZTwEs7b9nEYgsTC3N0ddg0QnnxJqqRXdpQe 4V4jdQLk8uPPU9zcVRVQL93ffOJ/rMW1VIWvCQbUNz7OCu9W0iBG02g9k6JJu79FaPRb PN0DbGQ1ayUmX8RtgnijvQ0Ygpb2cj4iAX8cDClH+bjBriiuoOlNRRF3x58J2F8NFwo7 lOvNoFCLQ1alail4wzN26Wj343qVLYJ5Ecxm9LoV+JOZpYUll7o2B8D19vD4rPW2q13D gq5g== X-Forwarded-Encrypted: i=1; AJvYcCVc2getjoeVeqKKneZUq6Bo8Wg15gM0Ao4U29FeYxJMuQSSpjeCLyHBSeF58d95FR2nPit01qQocH5XZDg=@vger.kernel.org X-Gm-Message-State: AOJu0YwXZgDgtS/pSPG1rEHguj4+NrN5vklCyp1jEXfJs6IzIspyAhwa kkb3yoiWf0OZXBxzmQaetUJnaHfdfAQSZhiZKzrb056ufQLv85gikOLcdgc8i3mYNJoiIeBrHCV 06v2qSD9mp2SGMO74LtqIUqfgcp3Vsf+HsZcdpqc1Qe3QzVRiHPpiqz58Qao4NX1sMg3WZ9peyf 8= X-Gm-Gg: ASbGncva5ULMj+k95lBGN8rWbTz7uS2+zBe0tB16R0TCWPIrCEm3dQfweEd4foNW/76 6p8X3vcX6MiXSvNCfwVO2Hq9R7XM1GAWJPI5MqM23D0HZlRYH0ZJ4A/2mZ7iIvEcLT1gzDsXCTh J4fnJVsOhfIDzIBK2H4VYk8rsK3Fq743kK7i3Ift2rtOPjZTkTRF1d7o/3oyb9LAqPv7idEdYKq APeUab41d8gFHB/iUSXLeAfQpjRsP64yg72UlHguqdU/7IYOjvrCYY43pNwVLAFBI0KdZyn1PsL orbVQMMqmXfbXAdvFSuwTBV8bP6rJur53FCqQdApxmOq0xVV59Ozj2X+BJoIeIeiSsY3hXaOMIA o4u6w2lMUvkxRy/w7mL743yl7 X-Received: by 2002:a05:620a:bc4:b0:7ca:f3ac:9eae with SMTP id af79cd13be357-7cd47f4e05bmr3524019985a.30.1747940647150; Thu, 22 May 2025 12:04:07 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEaok1w26NpJcA+0Y6ZF/oWrRabFmCrBIdEFyxytQ5/z49p8Kd4nxIBccPjDkri+2xFFysNmQ== X-Received: by 2002:a05:620a:bc4:b0:7ca:f3ac:9eae with SMTP id af79cd13be357-7cd47f4e05bmr3524016785a.30.1747940646731; Thu, 22 May 2025 12:04: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 2adb3069b0e04-550e703c2f3sm3482506e87.214.2025.05.22.12.04.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 22 May 2025 12:04:04 -0700 (PDT) From: Dmitry Baryshkov Date: Thu, 22 May 2025 22:03:31 +0300 Subject: [PATCH v5 12/30] 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: <20250522-dpu-drop-features-v5-12-3b2085a07884@oss.qualcomm.com> References: <20250522-dpu-drop-features-v5-0-3b2085a07884@oss.qualcomm.com> In-Reply-To: <20250522-dpu-drop-features-v5-0-3b2085a07884@oss.qualcomm.com> To: Rob Clark , Abhinav Kumar , Sean Paul , Marijn Suijten , David Airlie , Simona Vetter , Vinod Koul , Konrad Dybcio Cc: Neil Armstrong , linux-arm-msm@vger.kernel.org, dri-devel@lists.freedesktop.org, freedreno@lists.freedesktop.org, linux-kernel@vger.kernel.org, Dmitry Baryshkov X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=15653; i=dmitry.baryshkov@oss.qualcomm.com; h=from:subject:message-id; bh=VMCzGo1aaigqZYNYCi6bGBuVqybCE2/hi7mFwhs0Juc=; b=owEBbQGS/pANAwAKAYs8ij4CKSjVAcsmYgBoL3T9dfYtg41QXV7Yw5HOMjk+fx8OovjyuXoQq JiDjgbvzquJATMEAAEKAB0WIQRMcISVXLJjVvC4lX+LPIo+Aiko1QUCaC90/QAKCRCLPIo+Aiko 1RRxCACcyXNEWtdsYW+XUefcA5/e1n/FxSg4ed2c6qJXpx9fh+wIimBb3MxbaZL19xUEUE3PPnh yJpU/IbFcSbQWvJ5n97GdQsaGvi15MCdqnCRCjI29C7ind3rX2xNxXaKfE4dZ0HhLuvfxWFxadQ +6FyRGL1BAu6z0EPImSI079qccH84UEqEcsrRHnb9ZvOfPqaG3OeGavFM3GZ8Oze9b5Uv+FbE79 1wQV1iOftRvwFwxvT5T+lSQJpffuKgidVzdSb9YHW/gAfSn+Thzii/ZM4TbmBAcb+FvDWjRoZqk SEYyMgjHyZAMh9ed7d+Yp4ym9VQAobBJSc1suhABQENLSGOe X-Developer-Key: i=dmitry.baryshkov@oss.qualcomm.com; a=openpgp; fpr=8F88381DD5C873E4AE487DA5199BF1243632046A X-Proofpoint-ORIG-GUID: hisXUp52ex0fl8HmRPi1UpVYC3F6_uoV X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUwNTIyMDE5MSBTYWx0ZWRfX8S9cm88bC8eL ao9ALeLt/vcySGMRXKpjzURWS9sWLxsd5R/ij2VZCXhhXAO+fE/sZ/3Q7spdu8A0yhF4ZshYVJn i4Q2+lfMZQVJ28yXsHilXb4Ydf3v3HueK8WiOZFTSvBWeqVJjNQgBfvIIx9PJiD3wmhGNBuAoQQ WoQIEYOV9ASlIPVVazN8weYznRytSOcrtJjz34cF7dNtdvLpZYwPz56esmS7lE0xhh8OmhWdUAx Gh2bEBucfC0mBNOTsNjBIou3IEO5v3kNU/GwsPzmx6VXPPGK9cPG+raeZ/wrPzsQKmPkgDopFMR moZ4CVcB+fv/CYcWDILBUfjDnnOZ45v6kBEn1q3uls7fViKgb46RCnKXlSbfggR1d/zyHO9aR1p OJlcCJreLbKZf8QhXBBeBxWEKs3dKttgkjT4fWfnVAH4UYT4MZDrqCkE1zumhWP0zLbzwi6Q X-Proofpoint-GUID: hisXUp52ex0fl8HmRPi1UpVYC3F6_uoV X-Authority-Analysis: v=2.4 cv=dLCmmPZb c=1 sm=1 tr=0 ts=682f752a cx=c_pps a=HLyN3IcIa5EE8TELMZ618Q==:117 a=xqWC_Br6kY4A:10 a=IkcTkHD0fZMA:10 a=dt9VzEwgFbYA:10 a=KKAkSRfTAAAA:8 a=COk6AnOGAAAA:8 a=EUspDBNiAAAA:8 a=HAIgJQPtztWyLQ5mXWkA:9 a=QEXdDO2ut3YA:10 a=bTQJ7kPSJx9SKPbeHEYW: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.736,FMLib:17.12.80.40 definitions=2025-05-22_09,2025-05-22_01,2025-03-28_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 mlxscore=0 clxscore=1015 adultscore=0 bulkscore=0 phishscore=0 suspectscore=0 impostorscore=0 malwarescore=0 lowpriorityscore=0 mlxlogscore=999 spamscore=0 priorityscore=1501 classifier=spam authscore=0 authtc=n/a authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.19.0-2505160000 definitions=main-2505220191 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 Reviewed-by: Neil Armstrong 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_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 | 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_1_sar2130p.h | 6 ------ drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_9_2_x1e80100.h | 6 ------ 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 +- 12 files changed, 1 insertion(+), 58 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 52ad7e2af0148c9ea81a2c95b270be7058fbaec1..bbdb7e1668fee33cb7d99a7cb8a= b001e58f079be 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 @@ -31,32 +31,26 @@ 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, .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, .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 bbef0e1c597299d24a923e1f0d977c99afedb8fb..3c6da0acdc3b81db65e2544f16d= 90322fe7e92a6 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 @@ -39,32 +39,26 @@ 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 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), }, { .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 1dd0a1aa222d65f03013d634a87371dc552b5bd8..2f20d0014a94e707a5f0548fc1c= 6bf0983b0cad0 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 @@ -39,32 +39,26 @@ 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 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 0x204, - .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 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 50142b14e24eb875e72e5cff3b28ff8aba89fc9c..314875e2dca96b3b5c40aae0d15= fb80da8ebd42c 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 @@ -40,32 +40,26 @@ 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 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 0x204, - .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 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 264cd6d3640be1bf321fda429748ecdafbeed214..36775f444af4b2654231cd9456a= c4eea1f0f18e6 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 @@ -39,32 +39,26 @@ 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 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 0x204, - .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 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 83f73c7cdcc3a280285fa32230796fac57167ed6..624f24c8a33a182634d49058014= fc3175f5ac9d3 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 @@ -31,32 +31,26 @@ 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, .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, .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_1_sar2130p.h b/dri= vers/gpu/drm/msm/disp/dpu1/catalog/dpu_9_1_sar2130p.h index b21aab274703ac1f38698bee82d5d28b0fb6a0d0..857dc8465bf5571cd08cf3115fb= 96002873c004b 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_9_1_sar2130p.h +++ b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_9_1_sar2130p.h @@ -31,32 +31,26 @@ static const struct dpu_ctl_cfg sar2130p_ctl[] =3D { { .name =3D "ctl_0", .id =3D CTL_0, .base =3D 0x15000, .len =3D 0x290, - .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 0x290, - .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 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 d7e5f4dd3bccab125b0a42f67eddf194359dc761..05b0962c2d937f077d0b42fa8af= 6e2da40c7dcae 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 @@ -30,32 +30,26 @@ 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, .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, .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 19a859e2a1f80c2321789af4ec7c5e299f0fb873..5cd87b13e839e7ad60356cde162= 405fdfb6f9498 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.c +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.c @@ -104,9 +104,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 1e5fc1d5873975189a1759212b8a6c6078de22f9..3b6133e1bb581741fe87b049ad0= c89bf30b76019 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.h +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.h @@ -132,12 +132,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 edb82c81b0a449b1a7273fc258961b9447be8d9d..fe4fdfb8774b176fb024d76dc0b= d269d9736d226 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_ctl.c +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_ctl.c @@ -575,7 +575,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 Dec 14 06:40:54 2025 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 F209A2BF3C8 for ; Thu, 22 May 2025 19:04:13 +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=1747940656; cv=none; b=krP8ofENJzY8kRylKtPU8nPHvtBKs4l8NEV9haqpDWudaze/0IE+B+CRyflOakMyAGCElzy8E4kPlkaX4rvm8X+eSyNbMCSrFSRhNSvD2leEByFiagX3CZ2YdO//mGfdZWymV7tK1cHPRtTA622T97d08CwymL9bQUKzO81uHSo= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1747940656; c=relaxed/simple; bh=fTuNHOrZR8+UE33Sy3Ln0Euz0vruyL2hvOfzibR0RLY=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=EWMMyPQWPdVB9BgoTLfzLoGsyj0gTAxPTXOgPB5cj9SGD7f9MztGryfSLFOnMbf2Xl9Zz6pp/Tg8HiCTv3L81BXekNcFY5CW/e61pqmH1/a2Mn5rC9sWjU8E4VUJ1qdLIkGFAKHH7feBMc4uWcjvA/9y7LIUN8TAgJfFZBcxT08= 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=UamWd7ZI; 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="UamWd7ZI" 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 54MHCQjG001325 for ; Thu, 22 May 2025 19:04: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= tuF7BT/smpyZ5hksDUNBWNXde57Xof9XJdw38MQS0rY=; b=UamWd7ZIFliem7G3 biad8ghYhaYxm7+v/HQ0u1vTpLv/Kp/R+1WwBmXlZCa9lLQzUauD2yotqJz8jFC2 Aob3MGt4xNCeOtNFD4GuKcozmE+ycDTWLQBw7hkvkiLJp2qcWKVyw9ZTkrvBhiZy PGZlVrdsbgTGGMASZ7pe4VlGT+a/h5gngetKGz/MCnstfIFFwIHkDP7ut7pW6yg+ vaG8rVsDtUq2Wxp3jKnAWym6i+1nt4cuvYUAyUOey/9eQYa0MvYUJjSrWBmOWC2a JRCmM1nnJmusTwy+AvHWDbgyBSoNo15NFCwPz/utXwct75Ct/oqLqYX3YMjNKZVJ 4ky3xw== Received: from mail-il1-f200.google.com (mail-il1-f200.google.com [209.85.166.200]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 46s95tntff-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Thu, 22 May 2025 19:04:12 +0000 (GMT) Received: by mail-il1-f200.google.com with SMTP id e9e14a558f8ab-3dc8b60169eso2966795ab.1 for ; Thu, 22 May 2025 12:04:12 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1747940651; x=1748545451; 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=tuF7BT/smpyZ5hksDUNBWNXde57Xof9XJdw38MQS0rY=; b=gByRE34q2UhVO+uxT0mjQAsHDWxB8MWGEQDzg1VHE9cNGJch0xjx1a3sJ8RO+bJBcP CRhLriYdVkvetyoHsYE0VK0hoF8JMp2Q1G8Pm1fBDkWQ856yBMo0Zb0pBHFUhtzvf6tC g6Nikm7RtuuQX3hu2fXqdoc4PG7lD2TA6lYLQCe96LNz0K3BzJnnvGTd8meWXOLBWJhB QxY5R84adtsnUPETB8RfSi40CF8YEGdxopt7F5P796kuc3qib+AQagICBGbNkQC6WDss ufrBi8QwLHIn+3yD7etAxaju/VR2rT6b20ta4YV6gBohURguF/cJ8zAkvgyht7ps8XnU F+iQ== X-Forwarded-Encrypted: i=1; AJvYcCVgDP4ZxxdUZtlm7N53kDDeY/ZTMwwjeFEQTrPr16uAcep3jH2yvhzXY5vIwdAI0st2fse/I3BuMjgGl90=@vger.kernel.org X-Gm-Message-State: AOJu0YyfdY5XxnMjMIDOlzkyrbWL/MoGnpTHDyW3SzBxGqCUGPq59Fk7 k8nTRiwNlyWMOywa128id2PTIFLtm4o/SiOjL3XKA6gu5l/vuYJFVLYY5uHZrr+o5iVhqcQx5/q bOoRhIMS53H9dwUreftu/1R4I+iazLuIDvcgwVnRGH7EM5W9sBJAFTWl9UoKq8yvkd6A= X-Gm-Gg: ASbGnctKKA7WaZzVfdfNR/LWZtabK7XXj7xQrihj6HaZ33SOEJFwyD4i9BZreYmVaGp oA7T7M2xdiYecIM2Pr/Ua1RFNadUbnHnE6JZDGFED7DR6k/Z6spBmtmfODzZaVcFzrklbIhshWz xHNUKR7kVmgV4WLPBJc7gA/mwcip/3LUfd/v2LDS+j/49LgmXHYDgLaowYgCAoyuEfb2rJYzNK8 E9T349snX8Dh7DGbDFYlpGF7YQin5iCsgXNjj3HCiaChLVo3BJo7IzHz6uEimNkjz5rcib5LeEj 5ntaGQHut4y5ZHAxaDsBbM9FypWvuBAxZ3TkfygdrdGZsRCFwktcbjZbLz45StNJYKTfw795jgY lNjxh/mTa9p5omOlaOCp13k/g X-Received: by 2002:a05:6e02:1fcf:b0:3dc:6615:c0a2 with SMTP id e9e14a558f8ab-3dc92bb10ffmr9217275ab.1.1747940651120; Thu, 22 May 2025 12:04:11 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEKwx1VFjT/7lIiX0OUkq4jsGktrukNf/vR//viyzkUZqWvQ9ptNiCoeXJJ2QcNjV4QDDaMkg== X-Received: by 2002:a05:6e02:1fcf:b0:3dc:6615:c0a2 with SMTP id e9e14a558f8ab-3dc92bb10ffmr9216855ab.1.1747940650730; Thu, 22 May 2025 12:04:10 -0700 (PDT) Received: from umbar.lan (2001-14ba-a0c3-3a00-264b-feff-fe8b-be8a.rev.dnainternet.fi. [2001:14ba:a0c3:3a00:264b:feff:fe8b:be8a]) by smtp.gmail.com with ESMTPSA id 2adb3069b0e04-550e703c2f3sm3482506e87.214.2025.05.22.12.04.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 22 May 2025 12:04:07 -0700 (PDT) From: Dmitry Baryshkov Date: Thu, 22 May 2025 22:03:32 +0300 Subject: [PATCH v5 13/30] 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: <20250522-dpu-drop-features-v5-13-3b2085a07884@oss.qualcomm.com> References: <20250522-dpu-drop-features-v5-0-3b2085a07884@oss.qualcomm.com> In-Reply-To: <20250522-dpu-drop-features-v5-0-3b2085a07884@oss.qualcomm.com> To: Rob Clark , Abhinav Kumar , Sean Paul , Marijn Suijten , David Airlie , Simona Vetter , Vinod Koul , Konrad Dybcio Cc: Neil Armstrong , linux-arm-msm@vger.kernel.org, dri-devel@lists.freedesktop.org, freedreno@lists.freedesktop.org, linux-kernel@vger.kernel.org, Dmitry Baryshkov X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=2871; i=dmitry.baryshkov@oss.qualcomm.com; h=from:subject:message-id; bh=4PLdtBToyaCTWjSOru20Q+hzOpy3/IdoLPd2nM633h0=; b=owGbwMvMwMXYbdNlx6SpcZXxtFoSQ4Z+yV/vzMuZf2fFSGU9dFwi9afmwU5BYZepFX8sV0XIn k0xZ+jsZDRmYWDkYpAVU2TxKWiZGrMpOezDjqn1MINYmUCmMHBxCsBEQk6w/1OSS81s11H+vyA+ ZPOVU9yuR0o2LTFn7Va7vvjEoeneUgpX9yV6c5uY97SpJAkZ3FGYtyQh0//SKw8xFaU9CqUvpA9 HC9ypLFA3c97aW1Xdz/hxyUWr3kOK28+cO7Rz1g+uuNdz7y7/E60k85IhwV6waapwr4brR/1Zpt kL64NbmDcHtoUndUu+DDqdfuntbZk6q4X/qkN23y5eJvm44m5QS+OzSs+Htz+/O35SaefMu8lsG iqF9Vfaop6c73m7ppg7cm762sdcZc+NK96qb9xs4yO8sH/9/GWeLKUJZXIZVuod6eUxZbGn36/Q S0gSMQivEmR7EBuxuLdDP6IroeLcVV6NrTecmBaahu0EAA== X-Developer-Key: i=dmitry.baryshkov@oss.qualcomm.com; a=openpgp; fpr=8F88381DD5C873E4AE487DA5199BF1243632046A X-Authority-Analysis: v=2.4 cv=QKBoRhLL c=1 sm=1 tr=0 ts=682f752c cx=c_pps a=i7ujPs/ZFudY1OxzqguLDw==:117 a=xqWC_Br6kY4A:10 a=IkcTkHD0fZMA:10 a=dt9VzEwgFbYA:10 a=KKAkSRfTAAAA:8 a=COk6AnOGAAAA:8 a=EUspDBNiAAAA:8 a=BlGH1-kmwhya4yQ-KWAA:9 a=QEXdDO2ut3YA:10 a=Ti5FldxQo0BAkOmdeC3H:22 a=cvBusfyB2V15izCimMoJ:22 a=TjNXssC_j7lpFel5tvFf:22 X-Proofpoint-ORIG-GUID: OE124zaZ3liKw3YTJp0pv5RKJlg60h1Z X-Proofpoint-GUID: OE124zaZ3liKw3YTJp0pv5RKJlg60h1Z X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUwNTIyMDE5MSBTYWx0ZWRfX9nHUwR8VnZtR EOfBtMNhe3e3veV5+uhmexIlFSPHEb8Kf+jNkdctBvnY89YccLvcUu5khRYZSuUL8KXH9XKgcCe TII9UrzD97K36vs1MY7sHmRj1EUcmuLSnzMNy1XrrMxZCUx3KI396gOZpQIS8lUQQ7hvuGOcxai Lx4if6lqbUoSyONdged+ZJ5RNU0CKGOU8KFLwFb6w8BBCfFWgEAU35wYXEy3UZO9n9dy/nkosh+ kmIjJ5mgAOiRNJuAV/fVJsm5utKZ//0eFFKGRJrKJZr5CUJPrKf9cFdlsSTOAzLY61VftSWND7p hSZtZP3y2j7kp0KQBpi9u8E9o4tuhGUB1bxNZXhubCJFg3wSq1sMF++0Bt9RlBeA69KAZ2dJA+E 3PpMRL0Qy0gpp6bwSGp7J96XKPhOFbE2bkPWMBerxMzMOiKvT0sLoSzCcCiKWreLOqH9f0QR X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1099,Hydra:6.0.736,FMLib:17.12.80.40 definitions=2025-05-22_09,2025-05-22_01,2025-03-28_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 mlxscore=0 spamscore=0 clxscore=1015 phishscore=0 lowpriorityscore=0 adultscore=0 mlxlogscore=999 suspectscore=0 bulkscore=0 impostorscore=0 priorityscore=1501 malwarescore=0 classifier=spam authscore=0 authtc=n/a authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.19.0-2505160000 definitions=main-2505220191 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 Reviewed-by: Neil Armstrong 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 | 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 5cd87b13e839e7ad60356cde162405fdfb6f9498..1244dd59648d11123c507a1369f= 28f952d047fd5 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.c +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.c @@ -106,8 +106,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 3b6133e1bb581741fe87b049ad0c89bf30b76019..bf6b2392efb47fa8c3e3c5d17f1= a72341872e18b 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.h +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.h @@ -143,14 +143,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 Dec 14 06:40:54 2025 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 F36272BF3D9 for ; Thu, 22 May 2025 19:04:15 +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=1747940657; cv=none; b=caFGPpaNVd03P7+mMXEPLx3LrZp80FEJXLmjBhv2cJZtI6JCj14rB6LP3pgVuV30F9vleD3isU9A6Pg4uOaUbiP5+GrJ23SqD8IrE9Lcjg+ww4wml6/eRBUuVzQmysbA+4xCewGVUGdwqFl1FM2L34C6HyNVWWRN9ShtnHXRliI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1747940657; c=relaxed/simple; bh=Yt3mSGf+0WKdOXnoSWbgdfjz97ORzWCa9DQMuZ1UL+4=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=iEUFJj82G4OLzMxBmS0y2zK1kv30cAAKGwazrk9nAU07GOUdKdiQxlNTRpuy7bhy9+DBKS2SReCofbgmzuFMub2lW5ZcV3QKLiUswjp2v29tUYNPTf5keckCuomYskgYmzcyjGwLLltJyZs9mM4+VgYi+/bKmobbwBY6oxoPHz0= 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=My/lwRct; 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="My/lwRct" 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 54MH9e3p016524 for ; Thu, 22 May 2025 19:04: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= meSvyd78U1CHNUSu1sjX6MVvdc93GQx+HAJc+T3ka+M=; b=My/lwRcteVTKz3B5 lyMfSYmXpea+e8fBktUmgG1OfNTLd/1xDDUQyF+5b10vMyErxH2hhs8fjPwP2eA4 6JD6/WeS0OAT8ZGtzFpfQUwjpachftX8VVJhAc0fWKDEJmxgFsxbNMypo/roImmP 8O538JZXkzFXuMrhqT/zXVPPxv5CPzzvXJHlYm10xhr3Kn6yKOu3TRhNVPInKcas Hya+d2+Df8tGCPDY79VkDgCMOUqUi9I7t7jH6Rexyxttydd9FMKF37x48pCuRQKZ 6VWGQGQRkbrCK9lpUk6yQEeeKcTFl/jlwWE29PARImClkNV5aRzDemkNFi56k6eV aaqFBQ== 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 46rwf9yfan-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Thu, 22 May 2025 19:04:14 +0000 (GMT) Received: by mail-qk1-f198.google.com with SMTP id af79cd13be357-7c955be751aso1483855785a.2 for ; Thu, 22 May 2025 12:04:14 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1747940654; x=1748545454; 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=meSvyd78U1CHNUSu1sjX6MVvdc93GQx+HAJc+T3ka+M=; b=NN4Rb6XL4KpwCq9UvmWBTh2Y7FkTSqJYLn6PfVTLM9+/C+LR5mD918DMIZDNQuaitT qiFEBEy7bExgUvhsdqc647iJLxnBOV0tQz/Y0JS4CtktqYcdtpVORGeI5xLrewcDTd+1 kLYzfTi4l+7XiMIFO0xsvsnIcN3PMkzq82krdoEh4uUrETbdSFUtlUaEwcQJ0L2NEbuX rp3djbbk+FcVr4jEdpyoFIMoaAs18u/q1KdvIZTLhJzpoRvwKh4ZYcHBR2K6uYoBO+BP byCeEf8Ofy1Gu5/FS//3ppTBON4HWqaVJeL5n+gQyO2KgNGFXaCfBIGhZyZpWd+A2/Bz B/hQ== X-Forwarded-Encrypted: i=1; AJvYcCV2PJ6xS+s+mlag6wOW6l8cjBKv2Vqf7KrxxXmgMlPBpNzv1qmQ/7SxZnvr6NzW/U/Cs/F6hfWAzfPbSIU=@vger.kernel.org X-Gm-Message-State: AOJu0Yw9KVg46ivpmrxcF1I7e2c9GGl0rMwA25dB91dPRiZ6o/52YBRl jAcsIv7if/L24hRCZcQ4ZJ0Fi31AWjHf9oL79TVLNP3RdcHo6FI8hpDC61SdqrbWdFjt+tcLEzF Mn/q87e0rDE3P02IhvWFSxXNREL7+SQOdCWRP6lmds/N/7GvLUumjp6dTOy0AzfGPpPA= X-Gm-Gg: ASbGncve7B/6HgM6yY8qXG+Q6jTBKcQELWESoVcWcFkXBwRudkfqnL7LAZhwyKFYu+X QUhPWR6qMf7ooL87uv32X6m/e2zlA2hHRToAcFSlzJPXW16iQBfKyZp5h5XM8mytGc37LG3YQtD mo8bioki0AwKBr7ElyqU1qozRBGEawdzLEtd2kcyRur4x4SkdM25UdnBdYNfxmhYw+9QXOK8aHq wENbxPDG9rECqc+9x2VAtPThfOC61Ffl51/zTeTDbXM6OFMJVZlCxbNEpK1k4UmehQyykNNvNYK WmkTYQwkAi4Bg28PCq5b2f1oaIHJvb2jqaks5MB4NguaUJJHt74Ss1Zzr67dEhBMLHySwgTDgw7 i68isacHlpni2PK1By3kh9abG X-Received: by 2002:a05:620a:269a:b0:7cd:c6:40f3 with SMTP id af79cd13be357-7cd46707ca2mr3516548385a.2.1747940653717; Thu, 22 May 2025 12:04:13 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHEoBlcr8uJlH7OZ06CowCuAOkcwitzCRot/aYYoXoCrZstqB6iXIlg4LXR2UGY+FiR+3ACNQ== X-Received: by 2002:a05:620a:269a:b0:7cd:c6:40f3 with SMTP id af79cd13be357-7cd46707ca2mr3516544885a.2.1747940653362; Thu, 22 May 2025 12:04:13 -0700 (PDT) Received: from umbar.lan (2001-14ba-a0c3-3a00-264b-feff-fe8b-be8a.rev.dnainternet.fi. [2001:14ba:a0c3:3a00:264b:feff:fe8b:be8a]) by smtp.gmail.com with ESMTPSA id 2adb3069b0e04-550e703c2f3sm3482506e87.214.2025.05.22.12.04.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 22 May 2025 12:04:12 -0700 (PDT) From: Dmitry Baryshkov Date: Thu, 22 May 2025 22:03:33 +0300 Subject: [PATCH v5 14/30] 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: <20250522-dpu-drop-features-v5-14-3b2085a07884@oss.qualcomm.com> References: <20250522-dpu-drop-features-v5-0-3b2085a07884@oss.qualcomm.com> In-Reply-To: <20250522-dpu-drop-features-v5-0-3b2085a07884@oss.qualcomm.com> To: Rob Clark , Abhinav Kumar , Sean Paul , Marijn Suijten , David Airlie , Simona Vetter , Vinod Koul , Konrad Dybcio Cc: Neil Armstrong , linux-arm-msm@vger.kernel.org, dri-devel@lists.freedesktop.org, freedreno@lists.freedesktop.org, linux-kernel@vger.kernel.org, Dmitry Baryshkov X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=2585; i=dmitry.baryshkov@oss.qualcomm.com; h=from:subject:message-id; bh=aJLcwGKHuUuyJyLVdSDXU6TlIm9ioIVYSavHMvjyGfs=; b=owGbwMvMwMXYbdNlx6SpcZXxtFoSQ4Z+yd8mTk2bq+c+3TmX5ynanBR5/773oyf8stvcI+eqP 5xp8ra/k9GYhYGRi0FWTJHFp6Blasym5LAPO6bWwwxiZQKZwsDFKQATuRTHwbBc9W6r95vWw+vO fEo33H74bI/AE3GlkzUmPAceJlx7W6nltuSGa/Cfnu9PgpfZ8dQ5y2d4WaU8/cZoa53SWLSzhXH axj0qGb67lFL1Cu4GN/Z1NzzNDGRqeF5/ZL2Ng/qpIzOebbr7bRpf8LJivVq25Nec3SeMQzJbeh iqt/zjqxS9Nfv+5t8Wa5sz/Pivp8h0MDoYn7Ew+/5rsrqPzOlGreCOWhcjsfu3jbxaan77z9B49 ZdP1v3L+rzV6mJZm2t3OWxqVZVaEh/HzXzAo0bXgemC+/3WegtTnRB1c9/6wDVXt0lJ3f/Gu0aZ m3cjr/1ZFr2+vrTST6amdU827Co+kc5yOMKYYf/j57MA X-Developer-Key: i=dmitry.baryshkov@oss.qualcomm.com; a=openpgp; fpr=8F88381DD5C873E4AE487DA5199BF1243632046A X-Authority-Analysis: v=2.4 cv=V9990fni c=1 sm=1 tr=0 ts=682f752e cx=c_pps a=qKBjSQ1v91RyAK45QCPf5w==:117 a=xqWC_Br6kY4A:10 a=IkcTkHD0fZMA:10 a=dt9VzEwgFbYA:10 a=KKAkSRfTAAAA:8 a=EUspDBNiAAAA:8 a=z6iiZyybfqEMMI01lysA:9 a=QEXdDO2ut3YA:10 a=NFOGd7dJGGMPyQGDc5-O:22 a=cvBusfyB2V15izCimMoJ:22 X-Proofpoint-ORIG-GUID: DJsoLK6fDh1k3a2C_n1aidRCW5zo7WVj X-Proofpoint-GUID: DJsoLK6fDh1k3a2C_n1aidRCW5zo7WVj X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUwNTIyMDE5MiBTYWx0ZWRfX+y7QfX3LxfzC MDg/vm2gy0zlfXH7gDpaI9f/yK3vnpsNjjUooM4isKTQwPmG7Uwk1JoBKfhhzzAfbZVVBVB+2UN wRMKbY9fKO3K1Rny2YKqxlpEOWQc/3xbTZnM/rPzzT7ZV/Ty8SljA4ygew3eoPb/wUpFhn5/G1k 5+isFTLiy7svI2CsZOcbjYMtKVRa+gSa7FrTwnB/b/wtThSb04MiDspHS4FUaOyi9PktOOLg0BB kvWB9GpY19bLaoqMaDL43TWowxDDG5bLTOS8KdZtNEQ3i6+8pdvESotWcfQ246CIMXMj+oyRVD1 gv/1MzJkCjeaBjcFP08HK/GFGld/2yw/B7CqBTcKNHr5hgRVP471qVNBTZOaDyb+Juau2iLZV9S X4QBpFEStmqsCsgZoTR8ABV5EOVyoVvo2/ZplmecYuT6qu1Eq89l4znDhUG4vWzFZw1/t3aE X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1099,Hydra:6.0.736,FMLib:17.12.80.40 definitions=2025-05-22_09,2025-05-22_01,2025-03-28_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 mlxlogscore=999 bulkscore=0 impostorscore=0 clxscore=1015 priorityscore=1501 lowpriorityscore=0 mlxscore=0 spamscore=0 phishscore=0 suspectscore=0 adultscore=0 malwarescore=0 classifier=spam authscore=0 authtc=n/a authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.19.0-2505160000 definitions=main-2505220192 From: Dmitry Baryshkov Continue migration to the MDSS-revision based checks and replace DPU_INTF_STATUS_SUPPORTED feature bit with the core_major_ver >=3D 5 check. Signed-off-by: Dmitry Baryshkov Reviewed-by: Neil Armstrong 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 1244dd59648d11123c507a1369f28f952d047fd5..4482f2fe6f04e58408b55994d88= 5ea1c717c6a07 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.c +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.c @@ -105,8 +105,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 bf6b2392efb47fa8c3e3c5d17f1a72341872e18b..e1c6df3a3b72ffb5a816bd18266= a35abe723fbd9 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.h +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.h @@ -143,12 +143,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 Dec 14 06:40:54 2025 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 BDA782BF3D9 for ; Thu, 22 May 2025 19:04:20 +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=1747940664; cv=none; b=GpHUmTJC/b5q+msB8n2WVy17XJ6W199e8sdWn7kqxIiengyMguY7FH8pAtUZaWRdBjKpj1JcMnfB4S5NRgNkKybZI41VQpQ4GP0rsnpjQIEnnoWVxMK6T3x3YPCZ+WEnXvQaN56OHAmLl855yKS+n5YXIl0u6S5+QTGmOhOFeFE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1747940664; c=relaxed/simple; bh=xqIcbHwoNUnDa2/8LQ0DKWIdnecnA0cyeH9ZrFcL75M=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=ZycFDF7J/22HXou8Xi+dFjY2luc+xs5D6zJMq/PFw/wKVqF6mR2I1gE6HOQoTpcS4Ik0RpG2CplpciguJQLSdzmPTVblK/tPhVbpGgxslOZg8cSMtVvvGE6OkQloWK3AZno72JsfMdeCe+dOZxlUrTTpuG5Fwm8taU/QXE4pfZE= 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=e0DnI2Mp; 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="e0DnI2Mp" 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 54MGgFW7027699 for ; Thu, 22 May 2025 19:04:19 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= cQA6xvRl8QTPvqE6VQD3dupYxF0cB2j/UUqbRhR7ysM=; b=e0DnI2MpZYY7/bMa zbFDYRjfIrJHb6u8FgFS5pFw4mFnZMN6dI9FMy9sNMhgVdhi7Elde/mkLxbrcbgo 6SwYrglMg7Y1ekSi+XXC7lI0LxGwM5sIWsAU1Te6P/tdGu5Z94d4E/gZg/L/G7CR gY77jqC10id6PCAzVk71v40ZEwMophoNSASPVPIWN96P6fv4UPX63/SoA86HBVWY NyEjQ0SikAI+tIRlZ0DygKwoL9b14qUko3CbQQxgX4UzGdadiBvWyd3Up3kX1okb gDpNMdGMr9cDHq0zoXdUuuhW3jTRcAx0+e5rHUlwg6PKHDB6sa9I6gH0JzOTR3J0 cqeyKA== Received: from mail-il1-f199.google.com (mail-il1-f199.google.com [209.85.166.199]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 46rwf9fb55-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Thu, 22 May 2025 19:04:19 +0000 (GMT) Received: by mail-il1-f199.google.com with SMTP id e9e14a558f8ab-3dc880e5fa1so35451375ab.1 for ; Thu, 22 May 2025 12:04:18 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1747940657; x=1748545457; 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=cQA6xvRl8QTPvqE6VQD3dupYxF0cB2j/UUqbRhR7ysM=; b=m9IhQtRlSQMM6C4Fqgy/V5lvlS/5+XZZjSR9AcEAkTTuV9/JaK98gc6OtlCY4yV7tp geufKyXpAsymDnyAN9icS371psRTvX4mG9pRLYsaFemBA+qzU97imAh4g4mbUUgNLlLw tYZ5DzNdvqqwJU6qmIKJTJL/ogYaaGZbiJ7jhyWXbCGyYJF2wkMspXQ/J1NxRUBwEg+K b8K6XLxtUO284apbNwqzZvEyBK2k9s9JJynCWLFyC+IPJGrfLYKeBU68mR200VIdGbSv Q0mnhV9YKKrCONooRJAXpB+xxpiIe00jJT5J3iSxjTZ6Ud47PO046+k0oWjozkeH0M9B 3WGg== X-Forwarded-Encrypted: i=1; AJvYcCVEzwwuadaf0X6+9VCVOKyoPKMIu6v/uiV7UjAzHApj9IF1rFSWm8NJO0exDQOiTyS6dOP2mP94wzjHt50=@vger.kernel.org X-Gm-Message-State: AOJu0Yw57g38s56XbeymfXf3XXgSKCqH9a2wfW3aECmBDLewj6MnMWqi W+A2PpIVAv6Q31xLlNa/4EiBcrDNEkTNa58bc0Kphtpv7KQvlCAGOTerVpATtHk2wPpq4H+aYVZ VXBPOew+n/5ADCUy1ilvk4qXuS2I8ooKEBymumSUkpYbktjX+WW1XvDh2HPBCXWA5KYo= X-Gm-Gg: ASbGncsTJuTsqyoAT0st3ddHhTobt3/pJbkDGGVHaNESeqcMB4jabtL31KGPnkIs9bN Gig8FxuEUz071DtzOn4Ct5VnGrBHXWTfBubzO+Ct2gLuw1A/j//jGWX9+Th7zNcwqGCB/ACDfYH X5LFsavj2js5q93IPXjX2eO1vzwTb6zkvRSkBvkk/uWqQ1lFAjg+wMNlyWBQ6F588LaLs5OTiRf 4ZX3J8FVEi1CHXTgqcUACFcFD4MS7+DeCrHnN1Tb+jkWqh3sr+5cwrVEKhYWm2eu/XbWdrwiG5U eg9B8Dl0w88246qz4hoJIsOkvFeRt+b6dsbp61BX8L0kzokrJztwckUY8+1YhM/4a8Rj0MlBUFz /QchgNG63gkyeU2KxsxBy4EIv X-Received: by 2002:a05:6e02:2592:b0:3d4:3db1:77ae with SMTP id e9e14a558f8ab-3db843313f3mr336245345ab.18.1747940656602; Thu, 22 May 2025 12:04:16 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEb99POMeEr/VltQheZndv51/+decc8YHrjfLNAPFF32juz50A4UPKaxaG+2uEMCy8EfaMTNA== X-Received: by 2002:a05:6e02:2592:b0:3d4:3db1:77ae with SMTP id e9e14a558f8ab-3db843313f3mr336244635ab.18.1747940655991; Thu, 22 May 2025 12:04: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 2adb3069b0e04-550e703c2f3sm3482506e87.214.2025.05.22.12.04.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 22 May 2025 12:04:13 -0700 (PDT) From: Dmitry Baryshkov Date: Thu, 22 May 2025 22:03:34 +0300 Subject: [PATCH v5 15/30] 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: <20250522-dpu-drop-features-v5-15-3b2085a07884@oss.qualcomm.com> References: <20250522-dpu-drop-features-v5-0-3b2085a07884@oss.qualcomm.com> In-Reply-To: <20250522-dpu-drop-features-v5-0-3b2085a07884@oss.qualcomm.com> To: Rob Clark , Abhinav Kumar , Sean Paul , Marijn Suijten , David Airlie , Simona Vetter , Vinod Koul , Konrad Dybcio Cc: Neil Armstrong , linux-arm-msm@vger.kernel.org, dri-devel@lists.freedesktop.org, freedreno@lists.freedesktop.org, linux-kernel@vger.kernel.org, Dmitry Baryshkov X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=33949; i=dmitry.baryshkov@oss.qualcomm.com; h=from:subject:message-id; bh=DybaAIpNpFJPl0IzPy0DxF0ZdrqrkuIwFg3KE29eGPI=; b=owEBbQGS/pANAwAKAYs8ij4CKSjVAcsmYgBoL3T99C5qKjUhnFrBbGY6qbaMTFuqwn55tJPqz tc8CfSnxtGJATMEAAEKAB0WIQRMcISVXLJjVvC4lX+LPIo+Aiko1QUCaC90/QAKCRCLPIo+Aiko 1ap8B/4mKdqe/LP+hEscNsZrgCRY7wJTbXrzM525apn4ce4DwSBIHgIS3PbMMganVVx5WN+AeCH V1YdDJqb9V2q3ldWQ6LeqTnohTyYy0QgKu4on+pVGHn/iy+Mlixu+F6B4QX5K/qOp0TB5WY7P1n 0cE/8yUfz4h9OMz2hCdIcsCniqWILJ3xKaz1ZCfzP+FBnSVP0uOXQaSYWuex2mEbFQP5FkOxWrd 6X3GWG9mV5K/8yBk71wFnhPMkxBOBzH6shyu8OglwIz0lIHEpgeGV/5aRC042wV46MO4RiFJHRZ cxQh7CodAWXCwNYYty3+r9NgYEdhcZe01m8rXM5Ao0tZpLrv X-Developer-Key: i=dmitry.baryshkov@oss.qualcomm.com; a=openpgp; fpr=8F88381DD5C873E4AE487DA5199BF1243632046A X-Proofpoint-ORIG-GUID: yyBN8Z346xCH3as-MfiDqKIHsw9ShfKE X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUwNTIyMDE5MiBTYWx0ZWRfX/BRavBmmpAZh BCq79SmNGka5SCbnrzr4cHuPVaE+G/kb8tXALDey0SDT//wmFugDkR0Dj0ZiqaXBLD/uYkiQAwA K9mRPUXZTtApPvsf/Mzo0AjutyBCMApmdkopuJCn1JS/KtdDUjb24JLr+wcVp1PmElT285yOED7 vzQ1yVfvGsZSZ4umfMHKcmgsytzmpwfVjllLg5DtpVpj5ZFBL0P/Gqzk61Is3Mr8BVXf4DUA7I5 P/CFvXzeKpQuV+9xTtUfnV0avL1q539BNI2K4RfuJYS1WKV8mDPM/7isDSI0G9/O0z11dVxi1a2 RKsgabmBQMYF99buPOHevA/QkFact5YXsJVPYZ+orfE4buRbIrq0GvxIc1p4EwrzGt3zsNnal39 LHlNW1hb1/yFNQEdsZpcu8L+l2wM0kHyAbOp48JAnSWZ+JZh3d5P6yCua6HSoxkC8yxxLqvi X-Authority-Analysis: v=2.4 cv=GawXnRXL c=1 sm=1 tr=0 ts=682f7533 cx=c_pps a=vy3nvQW9C2dqy/lMnN3IYg==:117 a=xqWC_Br6kY4A:10 a=IkcTkHD0fZMA:10 a=dt9VzEwgFbYA:10 a=KKAkSRfTAAAA:8 a=EUspDBNiAAAA:8 a=1O7iqZxHH2NOC_bIgO8A:9 a=QEXdDO2ut3YA:10 a=mHQ74H5e8mo-RpSg_uaF:22 a=cvBusfyB2V15izCimMoJ:22 X-Proofpoint-GUID: yyBN8Z346xCH3as-MfiDqKIHsw9ShfKE X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1099,Hydra:6.0.736,FMLib:17.12.80.40 definitions=2025-05-22_09,2025-05-22_01,2025-03-28_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 mlxscore=0 mlxlogscore=999 lowpriorityscore=0 impostorscore=0 priorityscore=1501 clxscore=1015 malwarescore=0 phishscore=0 bulkscore=0 spamscore=0 suspectscore=0 adultscore=0 classifier=spam authscore=0 authtc=n/a authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.19.0-2505160000 definitions=main-2505220192 From: Dmitry Baryshkov Continue migration to the MDSS-revision based checks and replace DPU_INTF_INPUT_CTRL feature bit with the core_major_ver >=3D 5 check. Signed-off-by: Dmitry Baryshkov Reviewed-by: Neil Armstrong Signed-off-by: Dmitry Baryshkov --- drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_10_0_sm8650.h | 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_1_sar2130p.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 +- 23 files changed, 1 insertion(+), 94 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 bbdb7e1668fee33cb7d99a7cb8ab001e58f079be..88582fc257dea342f05b93dae6a= fe986eb7f32d0 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 @@ -364,7 +364,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, @@ -373,7 +372,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, @@ -383,7 +381,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, @@ -393,7 +390,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 6c8ef23099a8212f33780d27a76991e9955a9bc3..bcab869aafbe1e23e0267bbad37= 7fc10d8c6256d 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 @@ -301,7 +301,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, @@ -310,7 +309,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, @@ -320,7 +318,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, @@ -330,7 +327,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 37d18803af4b850c40ab855b1f13db96f3ee96ea..4b61bc7eb79f00a184c95b2319b= 737fcee6c4cbb 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 @@ -309,7 +309,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, @@ -318,7 +317,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, @@ -328,7 +326,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, @@ -340,7 +337,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, @@ -349,7 +345,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, @@ -358,7 +353,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 41b43fb258508f1a5f285c88a3c1dc2f5f271cd0..2e7ae68f7e922e9b71d79627806= 042f645cb4ad2 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 @@ -210,7 +210,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, @@ -219,7 +218,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, @@ -229,7 +227,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, @@ -239,7 +236,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 6e571480c4a44b4f4663574c31270657b9a06a7a..72f1328deda87ccc0b97f3f03d5= 840a77426b2b7 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 6f9dc261e667fca3e94ec24e00d45f9af46e401e..aee4adb3b73d2efb074abc58dff= 7d213a73207d9 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 @@ -284,7 +284,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, @@ -293,7 +292,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, @@ -303,7 +301,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, @@ -313,7 +310,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 373c7d605a04a1fc72f45e993ec176e8f5e015fe..05c0f81b263c4a9aab8adbfa487= f6cd20ce94079 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 1cf9f99d0542cf7037d2a9672d51ca7c437c364e..b729a01e8ff8443721bf993726a= e9ebe21e89440 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 a3db71676f468526ea129c4b8465fb2c47885162..25f56c55f373ef5e57082448bc1= a1d1d17968b06 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 719cfaa98ab9e735d9255d9a5f1a4275739b4b1d..20b12a68fb9dfe0291486ca827c= 6ca25a1711014 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 04cdda85e6828a83e99d146ee9d9f809f1acc007..6935ff7da3162dd7b86f3786b0f= 604d113e51649 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 3c6da0acdc3b81db65e2544f16d90322fe7e92a6..b6b1a4383efa72fc0bc8a6feac1= c3adb7773ba42 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 @@ -308,7 +308,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, @@ -317,7 +316,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, @@ -327,7 +325,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, @@ -337,7 +334,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 2f20d0014a94e707a5f0548fc1c6bf0983b0cad0..481d36b80c4eddda53d2f996339= 2d9499f966792 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 @@ -304,7 +304,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, @@ -313,7 +312,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, @@ -323,7 +321,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, @@ -333,7 +330,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, @@ -342,7 +338,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, @@ -351,7 +346,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, @@ -360,7 +354,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, @@ -369,7 +362,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, @@ -378,7 +370,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 314875e2dca96b3b5c40aae0d15fb80da8ebd42c..32649f25fdcbc1fe45d7028352d= fd4c0daa11d84 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 @@ -324,7 +324,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, @@ -333,7 +332,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, @@ -343,7 +341,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, @@ -353,7 +350,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 36775f444af4b2654231cd9456ac4eea1f0f18e6..4679b7e47d50e21d5b6df69fd04= 79b804ac69979 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 @@ -334,7 +334,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, @@ -343,7 +342,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, @@ -353,7 +351,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, @@ -363,7 +360,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, @@ -372,7 +368,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, @@ -381,7 +376,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, @@ -390,7 +384,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, @@ -399,7 +392,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 624f24c8a33a182634d49058014fc3175f5ac9d3..def7c161d787d9cecd219b4db04= 82158d3e5bc12 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 @@ -319,7 +319,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, @@ -328,7 +327,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, @@ -338,7 +336,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, @@ -348,7 +345,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_1_sar2130p.h b/dri= vers/gpu/drm/msm/disp/dpu1/catalog/dpu_9_1_sar2130p.h index 857dc8465bf5571cd08cf3115fb96002873c004b..979a674517d8b270309a4ce9253= 4face0f2ba855 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_9_1_sar2130p.h +++ b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_9_1_sar2130p.h @@ -319,7 +319,6 @@ static const struct dpu_intf_cfg sar2130p_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, @@ -328,7 +327,6 @@ static const struct dpu_intf_cfg sar2130p_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, @@ -338,7 +336,6 @@ static const struct dpu_intf_cfg sar2130p_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, @@ -348,7 +345,6 @@ static const struct dpu_intf_cfg sar2130p_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 05b0962c2d937f077d0b42fa8af6e2da40c7dcae..ffee0740ddb5c13dbbd2ca0d708= 55cba27f73ca6 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 @@ -320,7 +320,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, @@ -329,7 +328,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, @@ -339,7 +337,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, @@ -349,7 +346,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, @@ -358,7 +354,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, @@ -367,7 +362,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, @@ -376,7 +370,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, @@ -385,7 +378,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, @@ -394,7 +386,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 4482f2fe6f04e58408b55994d885ea1c717c6a07..df1eeb9082f74ab734c235f0cd0= baf8c0eda14b5 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.c +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.c @@ -104,9 +104,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 e1c6df3a3b72ffb5a816bd18266a35abe723fbd9..bc71ec9a5bc8b6e15d7af13c42b= a5d4197729822 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.h +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.h @@ -139,17 +139,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 Dec 14 06:40:54 2025 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 CA5932BFC7F for ; Thu, 22 May 2025 19:04:24 +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=1747940666; cv=none; b=Rd//ADEliadowrinC+NQbtfWRZLy3zOwiD5LluU+OKs3JSZQsujjz1b0r2XNf/MSMkzRsv/l7Ie1SYckQDkysOfqkQ/X5NlTaX339DdOjkhzmGechawHULGeNUoJVp6qC+zM3szs1JhtJcWB4PdIKj/jXnkxzbMhR1y9e+3ot9w= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1747940666; c=relaxed/simple; bh=Cr7EYJ1w7Ui/eeX7TDCei01GmlH644WBdvwzxUndo5I=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=Q8QPu0WVCTfV3s4a9lByvlpfC5WofDiFxMA8vgc3heSqjaqmhJIIccb04hW55icYPKpwWREKA/K/NyJkH5HLPQGHAVOrrf9JKjX1dnjvLF7f+v4aP742+VxrawtA1FB4ATimmaezb2cip3yHVov21o7pOZC33OQY+zNx78NPUl4= 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=DyQ52Vz3; 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="DyQ52Vz3" 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 54MG7JCd000730 for ; Thu, 22 May 2025 19:04:24 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= z2mG8cxIS8Q8W9z59itb+4PstMNGCr+eIADuRS6MBbI=; b=DyQ52Vz3op5hpbex yy8o0Rm+KSiGSZu3MpG7bgDXpdFmBKlORX6yMnaFtItgAPE3DBKC2dQgEEvjDxhh 1/ImlMofE6ctESSLgWGgvdN2xHnkX398Danx9LJ6BkwtZb/McM1UdS5+RTcfGDV4 /gLsHFs7bMP5ZfLuC3Y6M5B5cdNdqT6EUnuVcUOowfzt6nQWxpwYE6LfGGxw8NQy kVIr1j4tTC2yO2dRRQD7nX1OZJL0XidXHr6vRFAkyuzbEzfGuHqSrhsx60WPU33W QdfRs3bD3mQ4itiU5OA4/x3XxWT9h6UqdgD49df6VupywVFOGBI+xYejImY8zerl mM29/g== 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 46s95tnth5-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Thu, 22 May 2025 19:04:23 +0000 (GMT) Received: by mail-qk1-f200.google.com with SMTP id af79cd13be357-7c5750ca8b2so1214630585a.0 for ; Thu, 22 May 2025 12:04:23 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1747940662; x=1748545462; 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=z2mG8cxIS8Q8W9z59itb+4PstMNGCr+eIADuRS6MBbI=; b=W3DTG3MQqD01XJqtiO0CWktvLKNCSzDoJxqs2WSqU2F7h1jGdxl/I6iMPDJruVWUZl mMvGXOiQP9CXG2G4CFBny0OxNA2JdrYtYovnWFOeW/ZNxJ8VGQ32LpgCEbHw/clqNL7R 8Yo7Nu/QzpmFIl9TquoBeaAuCRNCJYGQkzvtSJMFEKO6lRM8KrW5lMgQorw/nYMnazXy qhCpH1kD/uuFs5cZ4VDDcEMam7Y3AWbn4kxVm7XOUzHS4nagRp5iayB0acaYvj0ih7rs OdjafIGwPgmU26y2cl+I9UzuB0lyWzxhUyMeeOpvRYyiKaxvRY4qFWIxjtXQxFoVd2mp NM+A== X-Forwarded-Encrypted: i=1; AJvYcCU6d8N3dGyNuG8dOeZ5pGwWq/EcEbcA38Rd14oszA1pr580SXP3jpUOfsM8+W2FrpXxN85XYzFvkSjb7Zg=@vger.kernel.org X-Gm-Message-State: AOJu0Yxae/MP3AIx9J7HRyzzPAQ0P/QlSkH+X3jfgtcvgLJUwc9lXb2F Q/b+GhtxTSJSOO2Z+NwhPjcP3FTFMyg9GwkNeM5z/aFk83FmcKidYp9Odi7UjUwU8f8dxM41UpD jZ2pmCQPVVAGhUrLqoWkPZYu6Bw1WMpVyJaLvqlKm/LOkS/mF+E/EsMqNXH+LxQjwbMI= X-Gm-Gg: ASbGnctm+6N6INhzkrVvELQWKfCXmJMl9DKfCAE2qsiyjI2+O4/ZzusyhALLFy9XqId xpkyAQBFYKOiPpEWYbRhcx6CHKqzurI7dQGR73usSWwztzPzfDH+6ZeeytOk8pJEGpJloHbnqvO Kbg+CvdjpPd1SJpQj+yYtVYcg/eFFN5JJ+dk2H/ojwqEnELJ62iQt9gFGjMzShve3Dhj9NA7m/t 9pqvxdfQjAes609o0KPvNwo8QovIiBXg0R3/+i2ua43s4vtVZ0SpJtZwQB38p7fSg340ApiN7tb IcHFe1zS+DiBBG1QxY7TXkOGVw1d1EEzt5m52s1DrTAdGe6gH608DZG9ydnc5sUKCCd3NJnfuWA jykX42UaTK8VRvRW9Iq+LN6sq X-Received: by 2002:a05:620a:31a3:b0:7c5:4001:3e9f with SMTP id af79cd13be357-7cd467334c2mr3649009485a.29.1747940661791; Thu, 22 May 2025 12:04:21 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHUtTiP4/ujnM4/f1UIjeVCJ0tIpWKtmtJlDx8u6T2C+sSF4p2i3t8uQNPgbghUmIQrDlFXCQ== X-Received: by 2002:a05:620a:31a3:b0:7c5:4001:3e9f with SMTP id af79cd13be357-7cd467334c2mr3649004185a.29.1747940661342; Thu, 22 May 2025 12:04: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 2adb3069b0e04-550e703c2f3sm3482506e87.214.2025.05.22.12.04.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 22 May 2025 12:04:19 -0700 (PDT) From: Dmitry Baryshkov Date: Thu, 22 May 2025 22:03:35 +0300 Subject: [PATCH v5 16/30] 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: <20250522-dpu-drop-features-v5-16-3b2085a07884@oss.qualcomm.com> References: <20250522-dpu-drop-features-v5-0-3b2085a07884@oss.qualcomm.com> In-Reply-To: <20250522-dpu-drop-features-v5-0-3b2085a07884@oss.qualcomm.com> To: Rob Clark , Abhinav Kumar , Sean Paul , Marijn Suijten , David Airlie , Simona Vetter , Vinod Koul , Konrad Dybcio Cc: Neil Armstrong , linux-arm-msm@vger.kernel.org, dri-devel@lists.freedesktop.org, freedreno@lists.freedesktop.org, linux-kernel@vger.kernel.org, Dmitry Baryshkov X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=4399; i=dmitry.baryshkov@oss.qualcomm.com; h=from:subject:message-id; bh=8C+zkxaDTJSXItCIlDecEEvq4hEyx2Q9rh41cf2R1uI=; b=owEBbQGS/pANAwAKAYs8ij4CKSjVAcsmYgBoL3T+6Vo7A/TuAXzcpo59a4AgI6+6FZw9GJd8B sf0vWei7P6JATMEAAEKAB0WIQRMcISVXLJjVvC4lX+LPIo+Aiko1QUCaC90/gAKCRCLPIo+Aiko 1Wp+B/wJg1F2PJfrSjFkAINTs5XuNswb7x7B1Ixmq1lGX092C2NUyO7AxiFXQkS5LtIoLqkdmkr ZhgmtyKxFbUnkWKPbJ9cuqztCx/NEciZwbwZmVB7X2XU4LXH8VYW/tcQTXRzifiblEW8oNqL825 fXwkGLlDKjJ1ztC8SP/Le92yu8rTtYvfG6A1d3bs7r/oj5HeGp0CceRJdVKQ8mdSrV9q7Tf9UwV glKUqDKuOqI0Zw++hbZSMXRqB+sDKd/4XwbVOBzxaXD/wV5Md33QxfP010YR3ZI++xgjDyZWEfB vTXgDfWaNup9OnVgcOwO/Nvc1Eu6HkOox3gvNvRvxYTyP516 X-Developer-Key: i=dmitry.baryshkov@oss.qualcomm.com; a=openpgp; fpr=8F88381DD5C873E4AE487DA5199BF1243632046A X-Authority-Analysis: v=2.4 cv=QKBoRhLL c=1 sm=1 tr=0 ts=682f7537 cx=c_pps a=hnmNkyzTK/kJ09Xio7VxxA==:117 a=xqWC_Br6kY4A:10 a=IkcTkHD0fZMA:10 a=dt9VzEwgFbYA:10 a=KKAkSRfTAAAA:8 a=EUspDBNiAAAA:8 a=K8QCOMLVtaD6p7eYglIA:9 a=QEXdDO2ut3YA:10 a=PEH46H7Ffwr30OY-TuGO:22 a=cvBusfyB2V15izCimMoJ:22 X-Proofpoint-ORIG-GUID: GfgQcHLA7ns7fVlj7hiXTvojnbi7G-GO X-Proofpoint-GUID: GfgQcHLA7ns7fVlj7hiXTvojnbi7G-GO X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUwNTIyMDE5MSBTYWx0ZWRfXzINQ6uqnOx/H lM2kCu0o4O6UrD3UBHUcrIBMnj6WC3HyEW09U7maL0dWbnWCUxOwRCn7eAdz/UuEC8c+4THL8uU Id2aUE/YRaB3GuTffMldt4z+rt/pGuMlXPTjTeMxAnZ6raHaPZBs7dPtbu2XlOVRr6fPfcmotkS OUgyNwlIFSvbIXnMYH7JsjBpjGmlvid+UwJRORgTZm4UmfnNtoIwuDEOqDHccX1F4C3/sd/n9Bf T6W3ZalXPD24iOBLNDsdd+KnMGdLcSbko+FhPZ8IY4BN+4pcPcZ6e9t2DqH9ZH8bUvsjaJ5o09v qTdpY/wiiicN2WCWtBxDWg4KDut8MIubaLR3HV2JCrIsHYhVmpULb09l695G7lcpNoQAaI/CxSw 9vZ6rmsRzDpvLXQYo6HE0hMQP8Mc8/dzOfQxqmwDLgGNi5HlsfhsXuXYox5RwqReYB65HcUX X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1099,Hydra:6.0.736,FMLib:17.12.80.40 definitions=2025-05-22_09,2025-05-22_01,2025-03-28_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 mlxscore=0 spamscore=0 clxscore=1015 phishscore=0 lowpriorityscore=0 adultscore=0 mlxlogscore=999 suspectscore=0 bulkscore=0 impostorscore=0 priorityscore=1501 malwarescore=0 classifier=spam authscore=0 authtc=n/a authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.19.0-2505160000 definitions=main-2505220191 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 Reviewed-by: Neil Armstrong Signed-off-by: Dmitry Baryshkov --- drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_1_7_msm8996.h | 4 ---- drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.c | 7 ++----- drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.h | 2 -- drivers/gpu/drm/msm/disp/dpu1/dpu_hw_pingpong.c | 2 +- 4 files changed, 3 insertions(+), 12 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 8fe07a5683f734a058e7e7250f0811e3b7b7cf07..0e8e71775f2c1c38af018353c85= ffeb6ccddb42f 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,24 @@ 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_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), }, { .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 df1eeb9082f74ab734c235f0cd0baf8c0eda14b5..75b679cd2bd27dd25971489a2d3= a6f516b248235 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.c +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.c @@ -95,14 +95,11 @@ #define MIXER_QCM2290_MASK \ (BIT(DPU_DIM_LAYER) | BIT(DPU_MIXER_COMBINED_ALPHA)) =20 -#define PINGPONG_MSM8996_MASK \ - (BIT(DPU_PINGPONG_DSC)) - #define PINGPONG_SDM845_MASK \ - (BIT(DPU_PINGPONG_DITHER) | BIT(DPU_PINGPONG_DSC)) + (BIT(DPU_PINGPONG_DITHER)) =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 bc71ec9a5bc8b6e15d7af13c42ba5d4197729822..ac63f753b43615f7c34d2da51fc= e919fd77142bf 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_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 { DPU_PINGPONG_SPLIT =3D 0x1, 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 Dec 14 06:40:54 2025 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 CF12B2BFC9A for ; Thu, 22 May 2025 19:04:29 +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=1747940672; cv=none; b=MpK841XqA7QGt12qf+Hdc6dzFEd4ybRWlX0k4a8NQGGI6Xz1v+FBGEivtBQB5okw7iFpW66RzH/wEdd+0pdaUll83fhrXG6Y5qvNe9ILpGocdSK5RILqZ1xq+h4OR1RMqmdQEC3lfHZCQRFJHwxOtGdOHCQYBYinKI6nNBTQYSI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1747940672; c=relaxed/simple; bh=d2r90GjNESmKuujl4VMTakUSj6BuiClLd47hbhVoUKc=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=by6IqtQgbkhUbJTv7DfUO0PFVGjyRbJQ+iIL1LZr9d2m4NxkZi2HmV0W2NVqBGP0Nfaz5d3cFeCIu/bBjxUv0p90fRcZqzfcM4edKRtITHCweYsvf3+TJg2XJaxdfBlLev6IqUwxO5smpQ4R7LZ66A5YjOBNoyWlJfAxyhwC4Hk= 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=JUK17Yq1; 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="JUK17Yq1" 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 54MHN450027651 for ; Thu, 22 May 2025 19:04:28 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= e+3vxeQgZb/+EvfdD6NNs3280220Y4jEQ1RFC1jbESg=; b=JUK17Yq1qEd1KuNa hn1Cy2qRVI7OpWBxEq6VMemQBwzAka8dZSMKjuEK4keTxWhbzDzceCtzczV8BfBZ xwVgCUFywr++G4ZE3jaOuKnIA+ePvtqkslYus81/eQZMOl1padu1QarO1J5SEZ6W F/0NM7n9KIK6r30MkoCkR7kenU5RciMrqFebBO1zrEbAzIral1V2YALoQUelTyde +a60iX4xwDa20t6Heb5pmhw5+CwgKa9fYyQcRWghAYfCSV803/wrXdcSyLAGfiIe rS2vEZFpPuPUVS8GuKPH1Ry2JLGyycbgBBfTeon481JrOLNMF/sTqCEkit+FV2Hg JvU6Pw== Received: from mail-il1-f200.google.com (mail-il1-f200.google.com [209.85.166.200]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 46rwf9fb67-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Thu, 22 May 2025 19:04:27 +0000 (GMT) Received: by mail-il1-f200.google.com with SMTP id e9e14a558f8ab-3dc8ab0ac67so26119295ab.2 for ; Thu, 22 May 2025 12:04:27 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1747940667; x=1748545467; 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=e+3vxeQgZb/+EvfdD6NNs3280220Y4jEQ1RFC1jbESg=; b=bC6k8ikvDR9xPLV58yitk2gxuTQA17TvQqWjbY4Bt0WOdKeZFFiOs1jhzRVOmBDNs1 KBIUOL3ZajhRw9hoYE4otfrJeXlp7RB0FypA+FlEMLvX3gTVisMHfOPd/TGSDDxEyK8y sqyC2VIN71fsiLwiXc9Nd9icS/fpt6jmsFxS3jUbhnoPsu6I9t7XHTf8/Fucp6GACW+W 8F4mDRgVkXI96A1L8rkVdh/sxdxHRsxBnYfn7KlkqwP0QDuaJ0FAq53cW3M7ildis8ZC bvq5xIAhLzQO9Xeh8pIeRl08LDOMPDIHLtGbU4eu69S8rQfqNcyqSShZT7Akqbin95kq jaKg== X-Forwarded-Encrypted: i=1; AJvYcCW/FUHJ/FKKCq/M2DtRi5HbLZ6XqXFrWI5t3zqGsD6shhzHsxbS1H4Pa6lf2FFI8414cPC7X/r8Rf0NKy0=@vger.kernel.org X-Gm-Message-State: AOJu0YwA20Ssb9CjxPMoxvJTHssJideZ4nB4oijOd35AuIBFzUIOBKpN 2cqMPef3TWuiicBKgPlU/W7E/VEUYmPRsLYFf5nVxHbVANrEgSLme17ZA4oV+r9iYBthIv4XhzC 6lUWJtNVMATwbcFv7I6f6icgBdJbK57h/1kpGIsOTh6lq+yM5cuQPja6CXFfCCXdrjw8= X-Gm-Gg: ASbGncuDAZJ7MxfT3C19b0kh9JlnvOcezVGNSi4mLmWrUfgqfv0pqrUE52E1s7gjmS5 9z/mtUVvo/pUmV/vPYICaQb+IYVcXUiCmcMjJuC59RFACJVEfU1yIaq6Kx7i6vtnL2uG8EgAIQZ KUJIW6bDq4UulrH4VNOvU8uhgYs5F5HIa8GNL7McYt2OjdAwXkzhha+Hshfxjrf7RvjM7VBtsdV OIWv2Z23I7BhG5UvK5I0266qiiumdZAshxO132AmfsausA2Ez+58+GBgj/7+uZ9aBuv6cxXayWq bR2aCpwckaT8B19kxpxeAf1CB9npnGt0a2XBqdLEbpeYc1KOUaCVDouCARIlGeLBsN6wQK6yMSm VZISERfz1x2ovvHwJcOso8L21 X-Received: by 2002:a05:6e02:1887:b0:3dc:8b57:b759 with SMTP id e9e14a558f8ab-3dc8b57b7famr60538165ab.21.1747940665981; Thu, 22 May 2025 12:04:25 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGIJhPkrG3e4ZSHp7W8XRkkhwo57mNvuLxEVE4f/wpu8rsPSXLsZ4xYi+f8MZTXzjuwuHs2Gg== X-Received: by 2002:a05:6e02:1887:b0:3dc:8b57:b759 with SMTP id e9e14a558f8ab-3dc8b57b7famr60537545ab.21.1747940665321; Thu, 22 May 2025 12:04: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 2adb3069b0e04-550e703c2f3sm3482506e87.214.2025.05.22.12.04.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 22 May 2025 12:04:23 -0700 (PDT) From: Dmitry Baryshkov Date: Thu, 22 May 2025 22:03:36 +0300 Subject: [PATCH v5 17/30] 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: <20250522-dpu-drop-features-v5-17-3b2085a07884@oss.qualcomm.com> References: <20250522-dpu-drop-features-v5-0-3b2085a07884@oss.qualcomm.com> In-Reply-To: <20250522-dpu-drop-features-v5-0-3b2085a07884@oss.qualcomm.com> To: Rob Clark , Abhinav Kumar , Sean Paul , Marijn Suijten , David Airlie , Simona Vetter , Vinod Koul , Konrad Dybcio Cc: Neil Armstrong , linux-arm-msm@vger.kernel.org, dri-devel@lists.freedesktop.org, freedreno@lists.freedesktop.org, linux-kernel@vger.kernel.org, Dmitry Baryshkov X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=40786; i=dmitry.baryshkov@oss.qualcomm.com; h=from:subject:message-id; bh=RDzfZy/sCoFvf2muatFq/Jbg4VltdL+l38lI22URxFY=; b=owEBbQGS/pANAwAKAYs8ij4CKSjVAcsmYgBoL3T+Sv7v4n4MLrPg4kD+PDXs4n99UK3reKFxL NiJe/Mec4WJATMEAAEKAB0WIQRMcISVXLJjVvC4lX+LPIo+Aiko1QUCaC90/gAKCRCLPIo+Aiko 1SYUCACjKC7dsNwvUPf4KHF/3thoKXXQWh6sRHPnSgoEYIGBLHyRMrUtbz1FGvjs1ql5lbVufHJ zZ68vLPcb4sbxHk7VDVLRykHd64r0gBG9MBhNvYfISEBJNMqLCp9Sx+zK7Aj946XI3DuPmKq1fW eRkWozcKmzbRF6WUrQAQf8c6xcvjLRKNPzjIZES5hOVL7wFwBF5d5fyEPcGeh8pw+gx6MS0CoRB idfQkTuYRD6lbNeVzhTJ7v+Otpl/hjtaIlUh/pG3sC7eHNOwr6D54MW6TzbrtubsYUb8XNaEd/a ks/HWaFZD0Cb6Zp070QRF7G4qxtKVELhZoMhMhWZ+dv6sKuA X-Developer-Key: i=dmitry.baryshkov@oss.qualcomm.com; a=openpgp; fpr=8F88381DD5C873E4AE487DA5199BF1243632046A X-Proofpoint-ORIG-GUID: AweXxzmeKEUJAtqEh7KI_naFOwWcELcX X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUwNTIyMDE5MiBTYWx0ZWRfX7H04TBCFbvUI vyq9NsLU8PkY7JA5NLRiz39qe9qhQblgdRgLIvPztzstsu5EiZUZ9d/sBBx2Fgz98AiyzQmq8iC E1khd7pvAoG7b8jGb9BkB7Qf1yugW97OIAe3Foz41RDY3CSsm/ADH0FetuicLzXQcDxNawEKQB6 NcN28ZXSYvSIhSuN68vTVp19OVeydmcookIavmn7HswGQpYZEkgv+UrRYcx3IaAGEPfXRsVMiJD Z8RVZ+BJUV+6EpaBjIVBy190SImr7Ou7+LYFjz7RZEzF+J9eQNQnr0EYI4x90baDyry6AMVswlu FVextqK7cAnl8ibYh+QVTlEZfNXQe3z2dQABm5QhGKOWbQ2vcdmt3g1bPP/Yas1316hwmFRJ6/g 33q5CJ2CqHMxvRdG34EfjxdG7/173S24gmwheXHzEPgxAoZv/HyQcj8CBT0eXwLk92vCiev4 X-Authority-Analysis: v=2.4 cv=GawXnRXL c=1 sm=1 tr=0 ts=682f753b cx=c_pps a=i7ujPs/ZFudY1OxzqguLDw==:117 a=xqWC_Br6kY4A:10 a=IkcTkHD0fZMA:10 a=dt9VzEwgFbYA:10 a=KKAkSRfTAAAA:8 a=EUspDBNiAAAA:8 a=jSculV4HJkadHmGop6oA:9 a=QEXdDO2ut3YA:10 a=Ti5FldxQo0BAkOmdeC3H:22 a=cvBusfyB2V15izCimMoJ:22 X-Proofpoint-GUID: AweXxzmeKEUJAtqEh7KI_naFOwWcELcX X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1099,Hydra:6.0.736,FMLib:17.12.80.40 definitions=2025-05-22_09,2025-05-22_01,2025-03-28_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 mlxscore=0 mlxlogscore=999 lowpriorityscore=0 impostorscore=0 priorityscore=1501 clxscore=1015 malwarescore=0 phishscore=0 bulkscore=0 spamscore=0 suspectscore=0 adultscore=0 classifier=spam authscore=0 authtc=n/a authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.19.0-2505160000 definitions=main-2505220192 From: Dmitry Baryshkov Continue migration to the MDSS-revision based checks and replace DPU_PINGPONG_DITHER feature bit with the core_major_ver >=3D 3 check. Signed-off-by: Dmitry Baryshkov Reviewed-by: Neil Armstrong Signed-off-by: Dmitry Baryshkov --- drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_10_0_sm8650.h | 10 ---------- 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 | 2 -- 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 | 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_1_sar2130p.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 | 6 ------ drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.h | 2 -- drivers/gpu/drm/msm/disp/dpu1/dpu_hw_pingpong.c | 2 +- 27 files changed, 1 insertion(+), 123 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 88582fc257dea342f05b93dae6afe986eb7f32d0..37c88b393c12d8a04395b6e5dff= b67211d2db9cd 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 @@ -203,67 +203,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 91285519c540025abce5c51f2f28442ed9d479b0..f2ec30837f9ccbff1041f0465d0= 123382a00355a 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,24 @@ 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_MASK, .sblk =3D &sdm845_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_SDM845_MASK, .sblk =3D &sdm845_pp_sblk, .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 50e0e3aec23c02acc1ce2d2a8a5658d6d49a62ac..26f39acd82e07c71cbeaaa72c14= d9b7e14d2dcc3 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,24 @@ 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_MASK, .sblk =3D &sdm845_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_SDM845_MASK, .sblk =3D &sdm845_pp_sblk, .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 1c299491e61f0465a164be74b7a754435f347cb6..657f733c9ffff73f9eb5051ba55= ed2e4e7bb496d 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,12 @@ 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_DITHER), .sblk =3D &sdm845_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_2", .id =3D PINGPONG_2, .base =3D 0x71000, .len =3D 0xd4, - .features =3D BIT(DPU_PINGPONG_DITHER), .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 50e40405a5271ea6b12caa7a931ff7fe3f2478a8..15da5ded19267711e6df8605d57= 6539475fe634c 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,24 @@ 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_MASK, .sblk =3D &sdm845_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_SDM845_MASK, .sblk =3D &sdm845_pp_sblk, .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 bcab869aafbe1e23e0267bbad377fc10d8c6256d..e07c2cc4188bb12e2253068ca86= 66ce9364c69c1 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 @@ -207,42 +207,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 4b61bc7eb79f00a184c95b2319b737fcee6c4cbb..b350dba28caed77e542d6a41cea= c191a93e165a7 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 @@ -207,42 +207,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 2e7ae68f7e922e9b71d79627806042f645cb4ad2..27c71a8a1f31921e5e1f4b6b15e= 0efc25fb63537 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 @@ -156,28 +156,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 72f1328deda87ccc0b97f3f03d5840a77426b2b7..62136811a530a6072accbd1ab3e= 02e7e24220ccb 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 aee4adb3b73d2efb074abc58dff7d213a73207d9..34f11fb084c02cf994c27219629= 9bb9f7bced4f1 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 @@ -205,42 +205,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 05c0f81b263c4a9aab8adbfa487f6cd20ce94079..135b4f8171360493e58a1945105= f8722d513d720 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 b729a01e8ff8443721bf993726ae9ebe21e89440..1189a5ecb3b7b50430eb275280c= 2309ee9d90b63 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 25f56c55f373ef5e57082448bc1a1d1d17968b06..13ff6bdcc517fd566e7701f7a7c= efe5ff19c5421 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 20b12a68fb9dfe0291486ca827c6ca25a1711014..d4c2d2da91aac0bce46c4d65079= f01484a769ae3 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 6935ff7da3162dd7b86f3786b0f604d113e51649..9135853a0225fa60acb80d17f62= 7153d25c612e6 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 b6b1a4383efa72fc0bc8a6feac1c3adb7773ba42..6503f11f65c11806c5b9558a0f9= fd05b228340be 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 @@ -205,42 +205,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 481d36b80c4eddda53d2f9963392d9499f966792..785ca2b2e60f073b0a2db0c0c4e= d3b2722de033c 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 @@ -205,42 +205,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 32649f25fdcbc1fe45d7028352dfd4c0daa11d84..1401a84e0da5754fd2a3661d142= 1bb9b998271ca 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 @@ -206,55 +206,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 4679b7e47d50e21d5b6df69fd0479b804ac69979..fbbdce36f0ad99d0b1d32d90627= ff5b7f3fc2fc9 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 @@ -205,55 +205,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 def7c161d787d9cecd219b4db0482158d3e5bc12..cc4413432cfdc636e38a56011d3= 9f18d7e94c23a 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 @@ -202,55 +202,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_1_sar2130p.h b/dri= vers/gpu/drm/msm/disp/dpu1/catalog/dpu_9_1_sar2130p.h index 979a674517d8b270309a4ce92534face0f2ba855..32f88533154584dc98a515b1dde= f27ab2005fecd 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_9_1_sar2130p.h +++ b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_9_1_sar2130p.h @@ -202,55 +202,47 @@ static const struct dpu_pingpong_cfg sar2130p_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 ffee0740ddb5c13dbbd2ca0d70855cba27f73ca6..e053324d76a2e5020e6a7477dda= dc9f7d94fe57e 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 @@ -202,55 +202,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 75b679cd2bd27dd25971489a2d3a6f516b248235..4777a4a852da0d65e20cebc31fd= 05647e0b4c4b2 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.c +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.c @@ -95,12 +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_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 ac63f753b43615f7c34d2da51fce919fd77142bf..d48c26a7cb6b69961cebc19576e= 3f7fc3b8dd2c5 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.h +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.h @@ -117,13 +117,11 @@ enum { * PINGPONG sub-blocks * @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_SPLIT =3D 0x1, 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 Dec 14 06:40:54 2025 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 A90462C0307 for ; Thu, 22 May 2025 19:04:30 +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=1747940672; cv=none; b=KrBhwJEqitL8JHbHYI9KcEWlas1R8h0SRHCYakdWVS/VYuIX8JSafZDxJ11cqJXtRnu/k1KmonJn6Xik0SQP4b8PkT59AgxDpk4aDj+ZG0jkuWW5zZ09eYo909sjpaS3JLuFdcie4RckhIpt5hG4/9BeSHl+voiZMR87odj6F7w= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1747940672; c=relaxed/simple; bh=0Z18wmYz6vI5iy0HTnequFEV6jc8LDOzxS3aEXuZrUU=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=CiO0fTMB5rLvop98t+iL26IKqM1FqvGDIfGuHVpudlgOOwQ7B0yu3TSHPai76V0GBgBYmfOQ2W7QOtJMCA5Ezc/woR8BWeUOh3HCzSWSn1XNmANJHC/OxyTe3u13CJ53UHQ7KAmPaVElWM1qWeijFUFs1e9mpwN/LjCQ3bxZm1A= 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=mWaqssDX; 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="mWaqssDX" 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 54MGwOvV000896 for ; Thu, 22 May 2025 19:04:29 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= oDJ+E3AHEwe2QaUDTH9rzBaRNHpj0Q7gi6qHaCF2e+k=; b=mWaqssDXr+eSX3oG q+pCGxeSbmrBmnFV0KzoF9UOUMiZb94ruTf/sCG2qciPfPUY47stqzyrCMwaKK5v GZPvxlsNVPaJpbepU6BcEvAOXtC2oTv94/QU1I+o+u43LfbX3qD07KCArN8pDxZ1 /zgjsRwjnsrgr64D3eallurGacpgXKxRPiO0SU07yDd+6lXPXdgeK2hKBOOabt/D 9ECHnJmVsE+97HgYfP9aW9T/os5GX2hrADd9lQQFHgiGXObfBN7UUrIwiQKa88Ao Lfw6rjqDkRiT7O46r9+U8W8stzA6jsh3aauEKVY1L3CRwLROg0uuC7Z5rzf8b7a7 zSCDZg== 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 46s95tnthu-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Thu, 22 May 2025 19:04:29 +0000 (GMT) Received: by mail-qk1-f197.google.com with SMTP id af79cd13be357-7c5d608e703so1412476085a.3 for ; Thu, 22 May 2025 12:04:29 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1747940668; x=1748545468; 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=oDJ+E3AHEwe2QaUDTH9rzBaRNHpj0Q7gi6qHaCF2e+k=; b=an3sTgFgMRA/bkKKfDHg1U3C6adV6vjpT/lkBYd5AMgv5x9WsE2m+s/BLFeAJDSCRE V0AdFxY6GyY2RUoabU2iEQvjiawbAeMsDtVctMOl38Rdpj/3v5FOHs6CK+kB6DUFX8YZ 5Y6WbjWEuBnBi2lFQgyOoaKQEfrIMaYIgXcls19s93EfUgpEsd3lhAl1+fak7FUfm4TX C3J46cAll419u5kFrGGeaSnyhzTDP7p2jFkNc1QfWOCXlwS9vufyV1PD2bwu9i0rAQh2 wv1Cfn7PLv4wgsQvsyQgyEScF06x6X3zq9uwopzuX0qgwGEp3gicXMjlWq0vRxht0qG+ HUdg== X-Forwarded-Encrypted: i=1; AJvYcCXJBCsDbyuDyOld16UdOxEwmxBCpW5COcm87Obcqy2do2nWmRVq1BJbrXkDpb/yG/owvOfYkDbg7OYsFgQ=@vger.kernel.org X-Gm-Message-State: AOJu0YzQkw9Z3EtsI9NmKpDew+67rlBOGJZg6L59YF37TSJFK2Bxc2xf OR7ND1WikzvrUEvrPw0vyjlbfrooW21XwnieRsArrCc1C1/rhm1lvq6QMdEWypwmUKTLeyEyIQB ofAxZq/eTYcv2wtM6gn1FMuc/Z/Ru7q8jqvZqLdvM2pf4LwbSBZjX81jOEt1ZjlZYMBo= X-Gm-Gg: ASbGncuHY65voq3DdzM3TShcE1QqDb86/fLO5M1mGfOIFRJZVcRCDsTqyFRnUR8lElB gVoCG6LnklcG+XIwSMyIMEU/j451g8UQNglzZnTTDU+51O8KYVDMGMLHOpdsgERd5cB9X5QC+Mm VteaDwiPpeVpxL8sy4UOzy20pvvgefYm+yOAS8i42Ogwc7IJzNQdgpP6KMPi71+ccIijgl3u05a h9f7j3rOjKohxckuTdPPiVdaY4FKT+A2UEd8GkR+ZFwqvvixFnPQObMvtus0husArGiV4HB052I K3YR/2in1XTRUmUtv7EJJVKyAh+gy2sckJJUYrYLXJNJyC2sVBLkSQ3fbM7tnvgGE6mDK4qFLay gTLzwmjbcT56FXoORQMm1UDhj X-Received: by 2002:a05:620a:2495:b0:7c5:3b3b:c9d8 with SMTP id af79cd13be357-7cd47fc65cbmr3657754785a.45.1747940668368; Thu, 22 May 2025 12:04:28 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFrjizfeYUVLg6OhsDSjrFTslVxOV3Fl+jMi4ostwqXynpZ+WrAkCsHl95B/eySWhyncKYAvA== X-Received: by 2002:a05:620a:2495:b0:7c5:3b3b:c9d8 with SMTP id af79cd13be357-7cd47fc65cbmr3657749285a.45.1747940667946; Thu, 22 May 2025 12:04: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 2adb3069b0e04-550e703c2f3sm3482506e87.214.2025.05.22.12.04.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 22 May 2025 12:04:25 -0700 (PDT) From: Dmitry Baryshkov Date: Thu, 22 May 2025 22:03:37 +0300 Subject: [PATCH v5 18/30] 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: <20250522-dpu-drop-features-v5-18-3b2085a07884@oss.qualcomm.com> References: <20250522-dpu-drop-features-v5-0-3b2085a07884@oss.qualcomm.com> In-Reply-To: <20250522-dpu-drop-features-v5-0-3b2085a07884@oss.qualcomm.com> To: Rob Clark , Abhinav Kumar , Sean Paul , Marijn Suijten , David Airlie , Simona Vetter , Vinod Koul , Konrad Dybcio Cc: Neil Armstrong , linux-arm-msm@vger.kernel.org, dri-devel@lists.freedesktop.org, freedreno@lists.freedesktop.org, linux-kernel@vger.kernel.org, Dmitry Baryshkov X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=8158; i=dmitry.baryshkov@oss.qualcomm.com; h=from:subject:message-id; bh=fVPfpF4w+ayXwxcVscTWY4CSNiLYlfpbZi4KzYirIPU=; b=owEBbQGS/pANAwAKAYs8ij4CKSjVAcsmYgBoL3T+8ahFLa5BT0qEgeq5IR2gfo3xcCU6wcNmz erR/uvpYI6JATMEAAEKAB0WIQRMcISVXLJjVvC4lX+LPIo+Aiko1QUCaC90/gAKCRCLPIo+Aiko 1UhRB/0VarUe33UPMwOnC6/Uv9w3v1bQ15adixoFlQTGyGFgErbpq8p9d2TLyBcBRjO5aVqNMaY I8v58a7Hv3ZUrgg3CGfI9xvFpZbldjBnIK0tk0S8uRo0AYPj248wvYeOhiE8U3cLIBeEbh3Sgjo 01yl3egwPdxG+JX+yLV16TK57gPsKQTvnmjBWDagka0O/MF/1u1vIjd2gjI0Ii9ivd/mnEzVnlc aIAjz6uqdBRJQ3j0KVQ8tLIBaQGqVQMbXaUg0mQGWfLs7LQPEIwiOUeE0KgAFgLgdFLIA+Nh1m0 eHh+9vP1Toj7SdpRw9n8L572Rf0wZKloxx2MuKoX5tyOjjxc X-Developer-Key: i=dmitry.baryshkov@oss.qualcomm.com; a=openpgp; fpr=8F88381DD5C873E4AE487DA5199BF1243632046A X-Authority-Analysis: v=2.4 cv=QKBoRhLL c=1 sm=1 tr=0 ts=682f753d cx=c_pps a=50t2pK5VMbmlHzFWWp8p/g==:117 a=xqWC_Br6kY4A:10 a=IkcTkHD0fZMA:10 a=dt9VzEwgFbYA:10 a=KKAkSRfTAAAA:8 a=EUspDBNiAAAA:8 a=MP74wIc9YfZe_pNrw8AA:9 a=QEXdDO2ut3YA:10 a=IoWCM6iH3mJn3m4BftBB:22 a=cvBusfyB2V15izCimMoJ:22 X-Proofpoint-ORIG-GUID: kis2BSmb4idd04rr-hXYtNHcKAUlHGKD X-Proofpoint-GUID: kis2BSmb4idd04rr-hXYtNHcKAUlHGKD X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUwNTIyMDE5MSBTYWx0ZWRfX1jn9kRYdPCzJ PNyjsCRUkPy0H491Fo4tLRpPJMIdfjBLqNS4v8uqpvo9RIJSBrThP07Lw3DREhnuXMCVeheWcjB OxH/rQNLJEbpuTUw5pQLFDpSzwjB/OAKJtazRoW/m3qkVXLOoeBMbRIR9WuQjkWPYhcvi6YJCHW zldGYrHUAsjNBleM6YMNvcbnBsnELGYYlt2cb2J373ferfyzlEnLx26UjJFjNrWnAq7HWbYWMpy 8/qD6smaQvpNKbx9tV5b4VoTcdufVkXYhQo3LWVk97lk92FW3p80/giBT8+ex8+U+oWWstvHAKA GUNwVyig9eEtoYMBKNhmXG0DMGD1qKXyeRuh3qXPm5AiEhjOHTyz30E7HbPDHQ0Llzf3ag2WcxD 4YtQMjpanMr+mkMnKoDv1iCCFmH7sNKEERGlj8LgwONR28gMMgLzMLrlrIGR5I2m/r2cBa+c X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1099,Hydra:6.0.736,FMLib:17.12.80.40 definitions=2025-05-22_09,2025-05-22_01,2025-03-28_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 mlxscore=0 spamscore=0 clxscore=1015 phishscore=0 lowpriorityscore=0 adultscore=0 mlxlogscore=878 suspectscore=0 bulkscore=0 impostorscore=0 priorityscore=1501 malwarescore=0 classifier=spam authscore=0 authtc=n/a authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.19.0-2505160000 definitions=main-2505220191 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 Reviewed-by: Neil Armstrong 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 0e8e71775f2c1c38af018353c85ffeb6ccddb42f..8af63db315b45a5a44836303c8c= e92eeccc5b1f8 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 f2ec30837f9ccbff1041f0465d0123382a00355a..f91220496082bd101099c1817c4= 1699215980d53 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 26f39acd82e07c71cbeaaa72c14d9b7e14d2dcc3..8f9a097147c02b538e720dd52f7= 7e705f7ff1ca2 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 657f733c9ffff73f9eb5051ba55ed2e4e7bb496d..0ad18bd273ff8c080f001f0bee6= 54393cf0c24cd 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 15da5ded19267711e6df8605d576539475fe634c..3e66feb3e18dcc1d9ed5403a429= 89d97f84a8edc 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 d48c26a7cb6b69961cebc19576e3f7fc3b8dd2c5..92dfbb5e7f916bf32afeffdb6b8= 43f1da3f3fd44 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 Dec 14 06:40:54 2025 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 159EF2C17B1 for ; Thu, 22 May 2025 19:04: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=1747940688; cv=none; b=UZtK5rqM08NTCw/pRk+PkaWWd2LtHY48wvYHrIFQFaNttsQ8wh3j2o8OUoSkzTSZ+McTFe3cFXA4Deu9+lW4AfVrJZdCL4MAAgyjZ3SKsLGT60jrDpAk+90FbmcfXD/MyGKncCeRGhYajNKIulc1JOYXyR4DCAjXFx2eF4+hGjk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1747940688; c=relaxed/simple; bh=JtnwSzCWHzwna/uyn/h/bOlbUw6XPXd/lQWqYDReZGk=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=iLpydRD2Waw/xYYLIx1rROzCSK0qWEMTmk6YGQ71/5Co6pBcLw8fs6113EKSjFzwzDoZz/SZ98du2ZJufvtsXm/rg2Mo9R6Cx5ROvwjVu9vSrvpKuMjDeir7hGI/i4T/MX7vL+9sq2rseuc+ovYwniSL/2dIuGSquMgnBv5tJBQ= 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=ELqIjsQO; 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="ELqIjsQO" 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 54M9jsuV021071 for ; Thu, 22 May 2025 19:04: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= bpN/CnUlP7ExEMFJ6Lj0n+5sEZlYXBRWKrZN9ll5aNo=; b=ELqIjsQOOeXzd/d5 9zO+E71GAEOLoYz1waVrrz/xjI0EZUK8IQ3kRR0A17d7I/jPK9IDd+pkIWPhhlh3 /zak7vQjGChhQ+hV4YuDPVSYOUzTgWoCYaR5y1xmEK3QIk1phSY0AycizMcBiVDe NEkK1AJ9MB7x4DXMNlr8dGXgksUPBJVSXBidP9hyUy/PJeBbH2seOAG0pHw84CHI EZW9oSr6kb8PRRT4KJMNvK86U8nudxCzDcWeLW2UsMmnSVhFsWxQ8UtwVw/FdiaH NaAi/xMFpk3CTOnBQdAbEHxUHC3rQNK8Gqe/C5eN1Mo4M0UMxDdXaQaCR/QnIgSp 7tkV1w== Received: from mail-oi1-f197.google.com (mail-oi1-f197.google.com [209.85.167.197]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 46rwf9yfde-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Thu, 22 May 2025 19:04:41 +0000 (GMT) Received: by mail-oi1-f197.google.com with SMTP id 5614622812f47-400a20ffed7so140683b6e.1 for ; Thu, 22 May 2025 12:04:41 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1747940680; x=1748545480; 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=bpN/CnUlP7ExEMFJ6Lj0n+5sEZlYXBRWKrZN9ll5aNo=; b=A2g8PplZX7kJzNydIGDOkPuIw8bFfPl89D7MWfFUsU+rTfW20wlTSSq4Le98fb7img 53Ag2hWrW2yJw2YidaLjHWVgD99ROTyUVinPbsTjBgoYmFEiO7Ki304nNIntQBQfeWdh sQejGuZimS1UofDzcZwmgnMhsjYA4NijXf7HX4tZhDnIPb5VWv1HMM/mtS0H4Pqcupdi ew3zNXE+bzxQyaidaLJnMIqwTzJKX0A/J58huHHGw/XXDFf1JtanhFqagP2MESPTYZSf bJb6X3Ylq5fxvreupmUPYjKjvvG8OHtTJQ3lH26OYNOE/dVelS+WehHZdg9QKXVyBSoC qOCw== X-Forwarded-Encrypted: i=1; AJvYcCUnpnrqKrYzMGSRWj/ihqXZkFK9a2w8wf6e8BsMKH9YXvauiCIn1sZP3PcFNsfkPM3d96jD352jQNyf/QY=@vger.kernel.org X-Gm-Message-State: AOJu0YzoTAy+WCyulCnqaRWdRp2zq4ZuEgJkz7w6Kf1tQXRYMxKNMb8r geZS7NWMF77mxw/udt5d0rfda7WUJ0lTrNJpDC5JG/UuZJXh6aonBHpskWx68VopPaOhV3EUE3G tCvVPuDMoSjmHjeTz+94L0+BjU5kM+DtrYGrYv0ioeHCvFz0nWVUzZyKhw3Vf1G7p26841MrVVM k= X-Gm-Gg: ASbGncs1WzVVERoOVh0rvJW/eqO17lJTuY/hVw1rH0TvWFQLQYa9LXpGHnxsRdutKrS F8cOZTqU85iUed6i5AOV5/uPHVGi8KBuWfMTFDoe/7nIljtg26Mthrp1LIYujhcJB8uh+GjvRDu GF9rptcFfrM8UeVSmB/IAZFp1l39e1mCKmTP2TlguUm5v/2sUMTzOFR73uSHOMokYfCwDN+YeVJ 5/BCz8yDnRJxS0gX1TSxqzA/tPFxRT/BPx5hhBK9/1ChioQSG0HTV+BZNx4eFvD6pxL4VIyeb3j EqwglxQemND/85mJj+uTcu8bfiv/Z2/91LkGtku9EFF7UObB5Hoo7gvdhPh+STf1rrE1b9uhFBO IZqDJhQ4+wKP/vwUYTaAQXjYq X-Received: by 2002:a05:6808:6f94:b0:3f6:7091:d297 with SMTP id 5614622812f47-4063d081a12mr556355b6e.18.1747940680325; Thu, 22 May 2025 12:04:40 -0700 (PDT) X-Google-Smtp-Source: AGHT+IENtqBQt+1WYZNwKjioV78TnS+WxdyA8WhQwdOWtpOws+o5tY8072/kvApkSjMAxq5ma6aYew== X-Received: by 2002:a05:620a:6290:b0:7c0:a1c8:1db3 with SMTP id af79cd13be357-7cee2264493mr125658885a.11.1747940669485; Thu, 22 May 2025 12:04: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 2adb3069b0e04-550e703c2f3sm3482506e87.214.2025.05.22.12.04.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 22 May 2025 12:04:28 -0700 (PDT) From: Dmitry Baryshkov Date: Thu, 22 May 2025 22:03:38 +0300 Subject: [PATCH v5 19/30] 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: <20250522-dpu-drop-features-v5-19-3b2085a07884@oss.qualcomm.com> References: <20250522-dpu-drop-features-v5-0-3b2085a07884@oss.qualcomm.com> In-Reply-To: <20250522-dpu-drop-features-v5-0-3b2085a07884@oss.qualcomm.com> To: Rob Clark , Abhinav Kumar , Sean Paul , Marijn Suijten , David Airlie , Simona Vetter , Vinod Koul , Konrad Dybcio Cc: Neil Armstrong , linux-arm-msm@vger.kernel.org, dri-devel@lists.freedesktop.org, freedreno@lists.freedesktop.org, linux-kernel@vger.kernel.org, Dmitry Baryshkov X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=8072; i=dmitry.baryshkov@oss.qualcomm.com; h=from:subject:message-id; bh=Qi0NNNo/ojFGNk6vS+7/bJMwBSgR2imtHjPMD1duIkM=; b=owEBbQGS/pANAwAKAYs8ij4CKSjVAcsmYgBoL3T+wySmWg7YfVngh+Td4RycmAZl5rljsGgEs WySFuwl+AWJATMEAAEKAB0WIQRMcISVXLJjVvC4lX+LPIo+Aiko1QUCaC90/gAKCRCLPIo+Aiko 1U9eB/40od/EbrZgTV/Hf/dOGbu59uGgoLNGpP4xxBPkpiO9O+8bmNGuL2Fmc4TiqhlFuE+/vyO UhsB8MbbmVa+m+QQK9QLJpUIMfQ/HmD8sSy3PrzAiriXHEDc0+6Sd4xvFKxV2XtB8GF0Ae340iw 6r+z0y6ICPKDxEtRVKhhtdQOOcyiVdVNQWNzlsxktgS8BwE/aAy76d0sKvrLnMoBmoyyAuIk1s5 m2W1IM8eHy/gB9ITjbAZnTG4/ryojO1VOCwCDD9bf99V8BUxBeYf3l9TBz45zQbx6mj3aAUl0RV pp0hgJYzX10FaJtk4GRx0rU4wS9U9y+2Q922L89I3gzNjm/f X-Developer-Key: i=dmitry.baryshkov@oss.qualcomm.com; a=openpgp; fpr=8F88381DD5C873E4AE487DA5199BF1243632046A X-Authority-Analysis: v=2.4 cv=V9990fni c=1 sm=1 tr=0 ts=682f7549 cx=c_pps a=WJcna6AvsNCxL/DJwPP1KA==:117 a=xqWC_Br6kY4A:10 a=IkcTkHD0fZMA:10 a=dt9VzEwgFbYA:10 a=KKAkSRfTAAAA:8 a=EUspDBNiAAAA:8 a=mpK4J0can4W2gMZkP7IA:9 a=QEXdDO2ut3YA:10 a=_Y9Zt4tPzoBS9L09Snn2:22 a=cvBusfyB2V15izCimMoJ:22 X-Proofpoint-ORIG-GUID: 47oY0Y06PypzC-RSWHSeGpPWeOroe2u1 X-Proofpoint-GUID: 47oY0Y06PypzC-RSWHSeGpPWeOroe2u1 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUwNTIyMDE5MiBTYWx0ZWRfXwk7KEf+/JbOo Uc0ci69XY7XSfV+opCXSYf/TXtfBNDU9R0BbfH7GNjSbDqa1oJyQKaHBk6j4Z6hHoeN+bvlP4o9 iZG1RGBd5VyNS0Nolnu5CnDHEpkDm5WuAxkGuzUO6SvKivBrmrTk836CFfGYr9Y9QGRBIm7ubWb Z9GnGpE4wZL1fxP+jxdhFEAMlpWarrid+bJUBWifm4B4uyy6M2zic6JgTumjFlTTa1AIKznu6cd rY6eqRBUo33vl0NCfhtRiYRes9s+4NT4wQs9qv5OkSicd3HTK15osKOKT1PtPPxd4oXZBYyT9dJ BlsUNzsijioSTKzxgbG4L0CkuiZ32ny3gPQUw6aSaF5PQsF2MI+cRg8GeeU1iBeZ8w9HHw9MsK7 bdeeIQxMZQMM8WObRwZS/6/rb2ehdV7zVB6XVMFGVsTDJ1Wmz0xqbdKBrwIgjPJdzu0+yNvn X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1099,Hydra:6.0.736,FMLib:17.12.80.40 definitions=2025-05-22_09,2025-05-22_01,2025-03-28_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 mlxlogscore=999 bulkscore=0 impostorscore=0 clxscore=1015 priorityscore=1501 lowpriorityscore=0 mlxscore=0 spamscore=0 phishscore=0 suspectscore=0 adultscore=0 malwarescore=0 classifier=spam authscore=0 authtc=n/a authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.19.0-2505160000 definitions=main-2505220192 From: Dmitry Baryshkov Continue migration to the MDSS-revision based checks and replace DPU_MDP_PERIPH_0_REMOVED feature bit with the core_major_ver >=3D 8 check. Signed-off-by: Dmitry Baryshkov Reviewed-by: Neil Armstrong Signed-off-by: Dmitry Baryshkov --- drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_10_0_sm8650.h | 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_1_sar2130p.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 +- 10 files changed, 2 insertions(+), 12 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 37c88b393c12d8a04395b6e5dffb67211d2db9cd..ae66c338250664f9306a7d431cf= a18ca07a916a5 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 785ca2b2e60f073b0a2db0c0c4ed3b2722de033c..85778071bc1347008dbe4522aeb= 9ca4fd21aa097 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 1401a84e0da5754fd2a3661d1421bb9b998271ca..f9676f804f9132296467bc751e1= 1036696afa942 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 fbbdce36f0ad99d0b1d32d90627ff5b7f3fc2fc9..7462cfc4cf8de4a10326c83d334= 1dbee76e437e8 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 cc4413432cfdc636e38a56011d39f18d7e94c23a..695ae7581a88b36fa1f28aa3cd0= c9166090e940c 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_1_sar2130p.h b/dri= vers/gpu/drm/msm/disp/dpu1/catalog/dpu_9_1_sar2130p.h index 32f88533154584dc98a515b1ddef27ab2005fecd..9a25113df5aec527baa514aaa61= f2b47c2443d27 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_9_1_sar2130p.h +++ b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_9_1_sar2130p.h @@ -21,7 +21,6 @@ static const struct dpu_caps sar2130p_dpu_caps =3D { static const struct dpu_mdp_cfg sar2130p_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 e053324d76a2e5020e6a7477ddadc9f7d94fe57e..54815c613f087454aa7b4befc84= 462265d8dfc23 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 92dfbb5e7f916bf32afeffdb6b843f1da3f3fd44..d3a7f46488a21e81a24a9af5071= a9a7f5f48cdac 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 1fd82b6747e9058ce11dc2620729921492d5ebdd..80ffd46cbfe69fc90afcdc1a144= fc5de7bb6af42 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 Dec 14 06:40:54 2025 Received: from mx0a-0031df01.pphosted.com (mx0a-0031df01.pphosted.com [205.220.168.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 9ADA92C0332 for ; Thu, 22 May 2025 19:04:36 +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=1747940678; cv=none; b=FBap4Ow9Krq8fliZmAb9i3XA1bXgBCOvd7ha7q9ZIttTWb4MaJbtZWPilG03qc6hzHVwVVLbOhhN/7VTIOdSz1WF5oaPvfyd6+0jx17R5PtMkeVmikKzpUVVRPjkL0f9kGKAWQP3Ju+WnaeKnjKQgAUE8R198DWe73l6iFlbqOE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1747940678; c=relaxed/simple; bh=f7BnpaabmkZzYXks1nYI6/Xm+ABOPZXmoThfWynb2jE=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=JGsDuUHtY7tkMbmIETC37CyJ/dP+G7EwpIfKWpcSbsnVjmBAo/JJoXuvYg+U2zPvsQnjLmTTLV60vrV1UnLoXhSkPODviZ+AazG8Wu35/1sQlK9AxsVZObexuZqAlWw+kRqZx4kw4RKRVBd0OenhlkLEITwjY7pqymXgf5fl4Dc= 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=fVgc0Cbl; 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="fVgc0Cbl" 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 54MHDbxS027524 for ; Thu, 22 May 2025 19:04: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= 7HsiO9nvlxXdFJJDBzSKNq1D7dmn27MSBINb3D3hdKI=; b=fVgc0CbluQwyKtgN RYN1D6CdZ+5qOyJDwLFHfyO0gSnodZAbQxuBqnUGjhhdlurt9290Z+AbdH9TeLLW fiqnArIR85NI+z7D2wKx8MYqYfvUiyIcqd7UPxWfeRfYtDtl9HFCpph5AOYISFG9 W0U00KIanxja2ef2Z4clloY9SwlilxjAznS9c9LPfL2eZdAh/1VtIN7li+grMxHp 27nGkCdcyb1fk/fRUe04gHU9sXpLxOpwhoQBMlOmr4aPyNTKVsL3n82WOt2ntiVZ 3eJTaXMzaB0/CNshXNHjAxW6qcjCTLfcolzIGmXCgAa8CUM3V5g0phWjvh35SvSM +bg0Wg== 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 46s8c264fp-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Thu, 22 May 2025 19:04:35 +0000 (GMT) Received: by mail-qk1-f197.google.com with SMTP id af79cd13be357-7c5e2872e57so1482881085a.0 for ; Thu, 22 May 2025 12:04:35 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1747940674; x=1748545474; 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=7HsiO9nvlxXdFJJDBzSKNq1D7dmn27MSBINb3D3hdKI=; b=tdVD51RzYWDkk7+JMmGrzUjm2yrq4IP720gx3ytpV48b/rmBVSycnHZs0mCEuoTCPj /mdplzGeQ6Z8pIkj4dJRuOC919niun6Jys/s+DDTJOn9A6KG9v+ArxZhDrarJwIVJaCL LqGnc0H8lEmBWwBRifvM5yRPpgwjTw/r4rACJtTFaPK6668aVblUPW7wRzPKjf85EwyZ f7pecBVHJElJ2D+FmVBwNABTvxg68A7mEYMkmUu6eM4+HasEzsUAdS3nfYxp3/orORlI C9Er4srfmLkKADn0Oo7PhGX2d08yaKUwRG+36S7sSDk1nk036eAMSSttz8EL3axYIa6I pNGA== X-Forwarded-Encrypted: i=1; AJvYcCUFrWzGXFInLwiByFMdv8H73VUMHpxr/Z8lsNfDHxDhXl9XLr6mC0d7QYZjwAj5iJGeRAYo4xeU5sQnw+8=@vger.kernel.org X-Gm-Message-State: AOJu0YyVP4ax8NKidQtt3WFgNjcnqUXB9MxMDk/RDtyCbV2leLbzhsrH BxUVsDdOAA3KcGBc96Kn4nadEmfhuES/Rd1ns6kcoAmQm5nE37DI5ValzBqL6zVQO2LG/Kyq7zS DqkdxvNPI8Ev3Rcz3jHuVBQS6CUdpE9cCBJsnlK9Nb1Jo9PgxCkYigGYJvVNDZRf3x3Y= X-Gm-Gg: ASbGncucv7C61d3ePywjhF5Jqhd++ysPxkazXLoZTrPpyu8wxAeQ2yW6jMD4382gXkz FgNpW06uhU+nnzI8w1ycp/RoXXZiCOhOMNQ5CO4k4jaKCec76MwW12y4zg6s1hP3VPrxz1ffxh3 SPuc3cwzhjaepaE/pIvzOG9p9CKwnrl9bVoYDSIfHEVLVJQ2hLqLFPjuk9olJlNZgS5CZ/eDrHF VwLtEGdJpwZEbQx85tnFXPM/VlNbXQG+L9eL2Dxp11svXFcto4zklnHKm5YVh7hmUoN+Nljwspu kATW14Tdl3l/Im4nC4GiFD79qb1JmpPLs7fpi6MPDnJRWLAfj/tKJTaI/T1x/Wl5S7gtGvLL10o Q3ymk2DdcgzqgwG7tSmLdd2+i X-Received: by 2002:a05:620a:4411:b0:7c5:61b2:b95 with SMTP id af79cd13be357-7cee3230016mr7529985a.30.1747940673704; Thu, 22 May 2025 12:04:33 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHJcXEgTURECrguAMGCJITwpfPIaiuRByyUvFM42DipuZogyzdEEtK6OQENBI8j1ynmBL8qgg== X-Received: by 2002:a05:620a:4411:b0:7c5:61b2:b95 with SMTP id af79cd13be357-7cee3230016mr7526085a.30.1747940673287; Thu, 22 May 2025 12:04: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 2adb3069b0e04-550e703c2f3sm3482506e87.214.2025.05.22.12.04.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 22 May 2025 12:04:31 -0700 (PDT) From: Dmitry Baryshkov Date: Thu, 22 May 2025 22:03:39 +0300 Subject: [PATCH v5 20/30] 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: <20250522-dpu-drop-features-v5-20-3b2085a07884@oss.qualcomm.com> References: <20250522-dpu-drop-features-v5-0-3b2085a07884@oss.qualcomm.com> In-Reply-To: <20250522-dpu-drop-features-v5-0-3b2085a07884@oss.qualcomm.com> To: Rob Clark , Abhinav Kumar , Sean Paul , Marijn Suijten , David Airlie , Simona Vetter , Vinod Koul , Konrad Dybcio Cc: Neil Armstrong , linux-arm-msm@vger.kernel.org, dri-devel@lists.freedesktop.org, freedreno@lists.freedesktop.org, linux-kernel@vger.kernel.org, Dmitry Baryshkov X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=5361; i=dmitry.baryshkov@oss.qualcomm.com; h=from:subject:message-id; bh=az28wfky32U5SgMhpoF+tYvjM19a/MptsxvGvB1wCoU=; b=owEBbQGS/pANAwAKAYs8ij4CKSjVAcsmYgBoL3T+kgJRh0VJUkdpLWj7JpjFCqi/7X4kuLv9k r/eo2ZnnG2JATMEAAEKAB0WIQRMcISVXLJjVvC4lX+LPIo+Aiko1QUCaC90/gAKCRCLPIo+Aiko 1WWjB/4rL52zxUufz7e12/e0wnxgWgUeafsbWvO7tRUXuNgJ72N3GPODg+viUKOLpSrhYK/nPR0 7/i211xrp36st9uOaoYZspT8qWY2SwuWkD+SA1beG3gELAbOCtjMcfdrmNLC8Iv++q8cCIQfhqM FZEjPHeOUQ/2Kzxq39BpW3GlzfFqc6dfBlbypKA6Ta5UwMWO0/ETLg4ybJdLsTvsgDG6/FJxCDB igMRCIHxhcCjwNuYN8DTm7EGEnu8vC+T3bQOAUCKA8NmcvUxj/nVbL65RSBX0KzqQYBKNDntIpi v4sgwJbkDbkIokLx2JuPLCq6S9nysueBD8GUVVSRJZr3p67Q X-Developer-Key: i=dmitry.baryshkov@oss.qualcomm.com; a=openpgp; fpr=8F88381DD5C873E4AE487DA5199BF1243632046A X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUwNTIyMDE5MiBTYWx0ZWRfX2O5vjWZC0LXK D5Gk3ZqACnKcpEpxRHn/mSELHeip9VeFZhDoR9RkmtvNqlrqrQhUl6Rp9q3OuOkVnFo36LaWd3j i4XamI9XicR8s4HnWbXX0GRgEg0J0ClJ2DZgYGEp6GHbPOBuSGXKdCYJIg1P1oNsAvdfSSrv1RF 2UkCB9QAc72knGmbFckUFdYXbYExIdX1My5DjZQVp53cbKveLki3HBzNMSLA2PlykxFVxBFMX4l 3InRki6a2lAWF6yrzGXwhrDdlAPOAji6YkmaZajxcXBMNZzxqo/T3pkz82YKBcXoR1P1v86pZDA xbbOzHQmp/gF2BCFj81MGxvgKfDJa3OAh9GSu9g+KBZMZUtQApSxMl+qQPRfA/0RIAI27C7cczI BnGB6FUppXTapY0Xe0ilOI0+q6t0FaCiRx4BKrjBVW2wd4wEeC7Jyi0Be+bx1Yy9rOW4WxrM X-Authority-Analysis: v=2.4 cv=RIuzH5i+ c=1 sm=1 tr=0 ts=682f7543 cx=c_pps a=50t2pK5VMbmlHzFWWp8p/g==:117 a=xqWC_Br6kY4A:10 a=IkcTkHD0fZMA:10 a=dt9VzEwgFbYA:10 a=KKAkSRfTAAAA:8 a=EUspDBNiAAAA:8 a=H1s5W502GRu5WLOynKcA:9 a=QEXdDO2ut3YA:10 a=IoWCM6iH3mJn3m4BftBB:22 a=cvBusfyB2V15izCimMoJ:22 X-Proofpoint-ORIG-GUID: bYrOX-9RarlMy8owRk3w68ndl1d--Pu9 X-Proofpoint-GUID: bYrOX-9RarlMy8owRk3w68ndl1d--Pu9 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1099,Hydra:6.0.736,FMLib:17.12.80.40 definitions=2025-05-22_09,2025-05-22_01,2025-03-28_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 clxscore=1015 phishscore=0 suspectscore=0 malwarescore=0 bulkscore=0 mlxlogscore=999 spamscore=0 lowpriorityscore=0 mlxscore=0 priorityscore=1501 adultscore=0 impostorscore=0 classifier=spam authscore=0 authtc=n/a authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.19.0-2505160000 definitions=main-2505220192 From: Dmitry Baryshkov Continue migration to the MDSS-revision based checks and replace DPU_MDP_AUDIO_SELECT feature bit with the core_major_ver =3D=3D 4 || core_major_ver =3D=3D 5 check. Signed-off-by: Dmitry Baryshkov Signed-off-by: Dmitry Baryshkov Reviewed-by: Neil Armstrong --- 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 3e66feb3e18dcc1d9ed5403a42989d97f84a8edc..72a7257b4d7ba5bfe89ec76bac1= 9550e023a2b50 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 e07c2cc4188bb12e2253068ca8666ce9364c69c1..23a3a458dd5c260399a42e5f4d4= 361b3c4e82c4f 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 b350dba28caed77e542d6a41ceac191a93e165a7..75f8f69123a4a6afe8234a9de21= ce68b23c11605 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 27c71a8a1f31921e5e1f4b6b15e0efc25fb63537..6b895eca2fac53505f7a1d857d3= 0bb8a5d23d4c8 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 d3a7f46488a21e81a24a9af5071a9a7f5f48cdac..9ba9e273f81ab1966db1865b4ce= 28f8c18f750b8 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 Dec 14 06:40:54 2025 Received: from mx0a-0031df01.pphosted.com (mx0a-0031df01.pphosted.com [205.220.168.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 984552C1795 for ; Thu, 22 May 2025 19:04:41 +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=1747940683; cv=none; b=guZ9ZwX6XsuwLHrdA6oQFsI6tfqKtzFZZppLQ+G+W4ezbM0jEJO4jUp44XvBl9jSC/w3mLt2PUJpGvja5QCBbA63nHkbg0r5OO33PW3m88KTptX3iBUUI2VF4LG3KG39azyGQVqTLKMlZlJ0wVH8dyJAAlcJYNspg5bWz8bhRT8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1747940683; c=relaxed/simple; bh=GKphq/hvUyrdOVLtC7+WfOmreoz6AeHVTUfRZjhwhXk=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=bKyBzidESq4F33t9PCjfwertWMmEz0dWu/FsNrktuypahUFHwH12wk02bh4TphqTPMYElhfXDfFatDwSF5jaY1YqqLbHiZypa9aFhDq2nSC/tjDl/nCPT9PlI64AiwgFL/MFxV01emI4wXYyW+Pt3ufF8lmEa/0E16AnciTNx4A= 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=S1LnX3SH; 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="S1LnX3SH" 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 54MHK7Un028791 for ; Thu, 22 May 2025 19:04: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= R1mI765wfM1dVKKFlWK3vO++jnmcSm6tm3TXel+1Ajg=; b=S1LnX3SHOGCcat1o Q7dpZqJmKMoXE6aaLO38jWpxCTg6cRJg6S+e4Y2FUKsFDBv3eISLPzlnTjMzXD+F cMzWjOOKSBG6C00qwijamg2UwVE/bljchSDMWkMtzo/At3WJ6XAy8xPeX1C/JxFX yOYEdkjW5ovklp77sjL6+O1LTIZHbt8lJ9WOd68uGys6h0Kq8FEhvdO44bQftpMx p9mqjIKVYAQInbme2kU9ggkECQTRJykCswye7nHuRSdz3NYrSc2UYuKeHHSyg2Le X0bOFxoKmE7Ujd6Ysz40dQKZrswoZEiXW35Gpw8QMi78MduPvdeJMyJ13rMexcCB w1IJCg== 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 46rwf0qku7-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Thu, 22 May 2025 19:04:37 +0000 (GMT) Received: by mail-qk1-f197.google.com with SMTP id af79cd13be357-7c5b9333642so1020462685a.3 for ; Thu, 22 May 2025 12:04:37 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1747940676; x=1748545476; 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=R1mI765wfM1dVKKFlWK3vO++jnmcSm6tm3TXel+1Ajg=; b=a5dladqlPZ3oCZ7SbNki+nX+AR8O8+qNqBmkZ//b30iNGK6q68Riyx2jRH9EhD7jjw Gy+XQQ41CDoNsAD6vL2DC84miyQx4X3LP+B0sFK8o5kYxJX+0RXQw4U8AA5CzX7zqab2 MggpCo8fv7VoXHcMXBL0Ah6u1IkzmUhC08Z9UK+t7bp5F2RAEjfTnHbepl7AvnLESQMM LS2sOQepufIBwk7AkNSVyitF++kdAXwNvR/S6ET4aX0eOTXm5zxGIQuiG8FWWVYuz+YI TEVP4ghxMSMKcyf1fLmO3Z25DszBryMQyfBYWEs56ZGRuIjXWgCJeaPQmk+uM+YEO6JM A2qQ== X-Forwarded-Encrypted: i=1; AJvYcCXhBoUSfO0NmFFTyLRe1tArbIMraYj8pwfsrNnTDdtObV6vbPfRZUawlwMHSu+stJzYAr6nGa32ZtN1OKo=@vger.kernel.org X-Gm-Message-State: AOJu0YyiF7hLm2lH1DFSRcGD1eFEDIVb2jqFjvCh097QBAMoJ2St1MWq SPBjYZBZVyhehrN+1OOJOQN45W1VSkZYiWY6iIZjAvvYvtPZFz88Xq6q7nbbXFwhZp/bS1+ZOVD 9+STld2Sy8WW46rGexs+4uq8OBh5xhE0nYsDhSJRBtiDYOQRiNcOnsZIAUAZNWZq3v8E= X-Gm-Gg: ASbGnct9MdYVmNk5Erzyc7istGWaXwj3UNA13xJoRpIHCX7ZAYq79bYPGnvwQHyIfnp 7gToB3fekIlU/z2tp439r99Rbkls82AHygA3h4etJP1nJ+RxtWgAcCxu5oIhhE06bwsL4/xcQI1 6TflUy4wvHXbIRs0pMmWZhiM6QTrFJTpdUTSuzl9ErFoowGs6hH36InXykTIvlH6c9Iv0l14sJz pSB+oWJut9jI4evvvWasoHiPoFx9Cy7AUj174JpjRlPE1hedkXf2gvJFNQ1UYuj5IoNddxejm6+ XeqKlYeczIQCFsZtjBvKpzHUZ4vBuytrNGUklBJtlXugci44mQvQePpcgg1zUb0sU6azIi9wTR6 cZnon+jZfVKqMo3Z6yuciNwJM X-Received: by 2002:a05:620a:438f:b0:7c5:a435:8c98 with SMTP id af79cd13be357-7cee3102bd5mr12928385a.0.1747940676145; Thu, 22 May 2025 12:04:36 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGUJlIq7h8+d8sS9PYlCoIdU3VLgrTqhW1w6JVHLMfpH7+4OrYVZNw7MdG7bp0BeY4eES0rpA== X-Received: by 2002:a05:620a:438f:b0:7c5:a435:8c98 with SMTP id af79cd13be357-7cee3102bd5mr12924285a.0.1747940675765; Thu, 22 May 2025 12:04:35 -0700 (PDT) Received: from umbar.lan (2001-14ba-a0c3-3a00-264b-feff-fe8b-be8a.rev.dnainternet.fi. [2001:14ba:a0c3:3a00:264b:feff:fe8b:be8a]) by smtp.gmail.com with ESMTPSA id 2adb3069b0e04-550e703c2f3sm3482506e87.214.2025.05.22.12.04.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 22 May 2025 12:04:34 -0700 (PDT) From: Dmitry Baryshkov Date: Thu, 22 May 2025 22:03:40 +0300 Subject: [PATCH v5 21/30] 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: <20250522-dpu-drop-features-v5-21-3b2085a07884@oss.qualcomm.com> References: <20250522-dpu-drop-features-v5-0-3b2085a07884@oss.qualcomm.com> In-Reply-To: <20250522-dpu-drop-features-v5-0-3b2085a07884@oss.qualcomm.com> To: Rob Clark , Abhinav Kumar , Sean Paul , Marijn Suijten , David Airlie , Simona Vetter , Vinod Koul , Konrad Dybcio Cc: Neil Armstrong , linux-arm-msm@vger.kernel.org, dri-devel@lists.freedesktop.org, freedreno@lists.freedesktop.org, linux-kernel@vger.kernel.org, Dmitry Baryshkov X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=4766; i=dmitry.baryshkov@oss.qualcomm.com; h=from:subject:message-id; bh=jtOXyXHDRmJWuIKMWGXi30J4+hk/a7h1wLTjHZpcPuo=; b=owEBbQGS/pANAwAKAYs8ij4CKSjVAcsmYgBoL3T+y5kjxRNbxIhNrWLBFU+i1oFwbN1TKgsSj f9qGz2PzyuJATMEAAEKAB0WIQRMcISVXLJjVvC4lX+LPIo+Aiko1QUCaC90/gAKCRCLPIo+Aiko 1VnlB/9PxzfrKitYjj+T2er3MjgHyDxc5v4xFSGIP8KSQkq+TlyMj46b/e5vHGbXPq/lA7EhxCV tZfZX2ibTnqgk8/lJqkLKX0Dvgm1lPbvII+qcHhWp40LHRRO0aT4iw8c+ZAIct3eMiEfDeXeh8J pEcMiTJyrnmvjCIpzMdASITJzSw+N+nKkKDZEw0Arsah2hDu77J7V1mMg2ZZQ0fduPL7YZydDxl mJCKMISW1FGorGhmK1CudgY4nPIsD5nEy6LEKGxN818KXqB6KGMDCOuzFiThaqcbAOj3YuUObMZ 81XB89WmtAEX9mCIHDyWQppe24JTrzJGqfivIvN8PpMCUD+V X-Developer-Key: i=dmitry.baryshkov@oss.qualcomm.com; a=openpgp; fpr=8F88381DD5C873E4AE487DA5199BF1243632046A X-Proofpoint-GUID: x6-eQtEdZCyqcwA3oPan2nwijlfguTaY X-Authority-Analysis: v=2.4 cv=J/Sq7BnS c=1 sm=1 tr=0 ts=682f7545 cx=c_pps a=50t2pK5VMbmlHzFWWp8p/g==:117 a=xqWC_Br6kY4A:10 a=IkcTkHD0fZMA:10 a=dt9VzEwgFbYA:10 a=KKAkSRfTAAAA:8 a=EUspDBNiAAAA:8 a=xxl3IjUXEjn2PN8_a8EA:9 a=QEXdDO2ut3YA:10 a=IoWCM6iH3mJn3m4BftBB:22 a=cvBusfyB2V15izCimMoJ:22 X-Proofpoint-ORIG-GUID: x6-eQtEdZCyqcwA3oPan2nwijlfguTaY X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUwNTIyMDE5MiBTYWx0ZWRfX4BKke4RpVivD lnZSF0lnutueqx55uDnic8n4XM9OgAGxdIb/OYy9B0jbEFnwN8dGFwSRRMqJeBBqRZIe3MzBki6 jOADYO2cu0mY2f9KblNvZ66+TkgEMKu4GDB6NZ7kw8tHRzk+fNPtkZkYjPcXAdfsFuBIUF7uqWs hHRR6QKo1pfAFr8r2j7+7YsTEl+XXiHJfaQHxU8Nglhg6NSQUdpgPpGzylZUgvMKCxHw4o8Dt2k dxIEibecqr5c6OdlxQ7r7Y6HeULVy5PkAthuK1JicJiPMp2FRxfblvNvvf1vNCndsoC6Ii9Bevb KhA7AZQHn1N0uq8V0i5IP0oQ8mIeTjcM/uiS0wUTjQ1kBmLsQDFf0NYdFdOpKSZo5B2g/LJhNJr iuZNIy9RoAYBADACbYpZk0Euq5g4D+mfLLo3pYDQf7J8WH/lEzU/mxCO7Jotpe+mm1xVVlcF X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1099,Hydra:6.0.736,FMLib:17.12.80.40 definitions=2025-05-22_09,2025-05-22_01,2025-03-28_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 mlxscore=0 clxscore=1015 mlxlogscore=999 suspectscore=0 spamscore=0 priorityscore=1501 bulkscore=0 phishscore=0 impostorscore=0 lowpriorityscore=0 malwarescore=0 adultscore=0 classifier=spam authscore=0 authtc=n/a authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.19.0-2505160000 definitions=main-2505220192 From: Dmitry Baryshkov Continue migration to the MDSS-revision based checks and replace DPU_MIXER_COMBINED_ALPHA feature bit with the core_major_ver >=3D 4 check. Signed-off-by: Dmitry Baryshkov Reviewed-by: Neil Armstrong Signed-off-by: Dmitry Baryshkov --- drivers/gpu/drm/msm/disp/dpu1/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 4777a4a852da0d65e20cebc31fd05647e0b4c4b2..d64ebc729bfb589bf90af89c094= 181f879d5b1ef 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 9ba9e273f81ab1966db1865b4ce28f8c18f750b8..5e4608d10c6d4fee387c9a599a7= 3b15661148430 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 d728e275ac427f7849dad4f4a055c56840ca2d23..7bcb1e057b143a5512aafbd6401= 99c8f3b436527 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_rm.c +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_rm.c @@ -60,7 +60,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 Dec 14 06:40:54 2025 Received: from mx0a-0031df01.pphosted.com (mx0a-0031df01.pphosted.com [205.220.168.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 377812C3752 for ; Thu, 22 May 2025 19:04:54 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=205.220.168.131 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1747940697; cv=none; b=cKp9gwZoEwf5GbqjCLwW4yJkDzyiaqPEL4AeYWONGjbHgE/TNvsqpuKZIUxigAMA6Z7/5znVnVhzlxCCbjP9pbupcAQ/BQxlMzVRdYn1cy+XYDadpU3B8fr1gsB6R4jeOvSZtEPEgeb0o05g7/PIJYoAX47l1nFUWTwvimEp2kY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1747940697; c=relaxed/simple; bh=yMylM5q2SumCKQICfch3yCGCj/FmvjrEEGOz3RHRJig=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=BhyHIlsGtmZLpf4jzdiJmLUC4BDVCSfwUG5DhBN1jrfOlLRfdBwBDZEu5axrJJIAVFkYEtTc+iT75kP8dXHu9y6mAfcD/Ma90RsC1bJI5piQ33kA9cEXA1RPVX6taS2bXHbD7T5Z52RJ6fliUXiYQPNZ8ZUj2kr1ACh4pcDmxX4= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=oss.qualcomm.com; spf=pass smtp.mailfrom=oss.qualcomm.com; dkim=pass (2048-bit key) header.d=qualcomm.com header.i=@qualcomm.com header.b=TBFI5z+K; arc=none smtp.client-ip=205.220.168.131 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=oss.qualcomm.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=oss.qualcomm.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=qualcomm.com header.i=@qualcomm.com header.b="TBFI5z+K" Received: from pps.filterd (m0279864.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 54MFkNwT020598 for ; Thu, 22 May 2025 19:04:53 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=qualcomm.com; h= cc:content-transfer-encoding:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to; s=qcppdkim1; bh= VwZo5rFO+Fo9r6sEtki6tvyPanlZZDkaCTSawEXgDN4=; b=TBFI5z+KMHDRskSj weQJV7F0bCw4LJtVyGTJw7N5bPxs9hQBWXl4uDhzgEgV/NXBfXIJt8RUTcYPP2Lk uCAXE7JdhM8PuxEZDCYVyE2W9w6RCmFskkDApA5lqERN+4fSNiRjJXIc9aeY+BmI 0IrbikpE0FpuzISCR/uWrp/4Xi95bVGbbLS4QNoENnKrHSTHN1pquir1xs7zAO/S Fe/EqeFr5oLDhTUvRKEmrUu2G+etBMwLaZV15uxSISyrLfpJCGdJWFutpE2+xrTU sCzH1DGcw+Oc7aL24lUPxwHRtcd+80Q/MlWcjFeu3y26/ACEACOvku2/zGltw2ae zl735Q== Received: from mail-qk1-f198.google.com (mail-qk1-f198.google.com [209.85.222.198]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 46s9pb5v61-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Thu, 22 May 2025 19:04:53 +0000 (GMT) Received: by mail-qk1-f198.google.com with SMTP id af79cd13be357-7c5f3b8b1a1so1363559985a.3 for ; Thu, 22 May 2025 12:04:53 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1747940691; x=1748545491; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=VwZo5rFO+Fo9r6sEtki6tvyPanlZZDkaCTSawEXgDN4=; b=O4ulxar9yNO7msFgbCt2M9hvGnWIg4doM/6QNuCNuZ3UrvmWE8cO9wmFFvOKMlA8/w zFalcLbM7Wmu8qkxXU3LvyXYwjToT2cbeNfLOOYzcxdkA1FsZMo2vQxcciN+dAZ/ECHS TO0dug9+VGphvVhgymLPQeQ+wq+LZ+J1Xj3h14fiGD7/5wstS2P+EYB7bV6rcpuE+AO6 O6pKV8WK6BV6e5Kjjpq/UVjH8C3iJ6RqXcopk76DvCif4+f9nn9JVsfX4qNErxeVWNqk jfD+dI0LaFSya4ivDMkimLn5LeJA96QfxFGFQtQhVOMRuvwIMf0clLTrnqFopRkcTsVq YeMA== X-Forwarded-Encrypted: i=1; AJvYcCX0yVsbfn2zep83mBvkYBm7QCP5yggEUrG8c1wv7NdR3MliKKd04VsFtAvpyPrWLOY1HrDc6wmed+Q4lzI=@vger.kernel.org X-Gm-Message-State: AOJu0YxD4+dlwx5Io/mZgHA99pSM07hO4FKWk0HChHO76Ev9SfbUx4p6 64fE2L9h2iNtP5OOjUnmo9avBUJwrl2HSX1X5eqLqdhp2pIR6bWo+g7kYM+VPbOzktgtYl8INxE u5kuOH8MvjQPOxhVYZNHumSraf19HP4Ao2r1qft3B/e62+JE0X38Ell3pUhvMeTSKvOD8t8uZjs 0= X-Gm-Gg: ASbGncsiuoMyoq4Ms+xNvI+x5mmoWYGO9cY/7/lXGaDoPbBiOvCNjn/rl7wxnxFhdFn wx63vP4pBlNuSEW78BUq2Vp/AtAnUFwQTNoUyB6ivF6BCsGfeb6p7NwvPe584aKyB2w4Lt2MLEw Cp98gBM4dch0JosU50dp7aq5zwm60AGxgHGXIYaa7l3/v8LQKi0qbjyCEOB9PJ+rWlo9w/Wk/aD osKBHVxCwbdDKC2h4tlO/DQOR0+1m59cz8lvy4sXSpbG/lofSYGbTe4R8/ebTbDctNvBBENAExL ahg3S73w15p0YaTLz339sa9H8nTgAGLI1XfutqVeNDt1gQ3xe0aFl3qLjRlTLAN772eJuG8BHHa t+oz9apRdhiEqMpnVo2PGP5DL X-Received: by 2002:a05:620a:1999:b0:7c5:5003:81b0 with SMTP id af79cd13be357-7cee31f6a61mr9208785a.23.1747940690938; Thu, 22 May 2025 12:04:50 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEGyBoxBiQu+R7TxjU/9FO7jh834AKrFaGdFjzBhtfd5AnK14VFdGaOTFWnZJjxCGXUmmEqvA== X-Received: by 2002:a05:620a:4445:b0:7c8:4634:51d3 with SMTP id af79cd13be357-7cee3297985mr6441085a.55.1747940679606; Thu, 22 May 2025 12:04:39 -0700 (PDT) Received: from umbar.lan (2001-14ba-a0c3-3a00-264b-feff-fe8b-be8a.rev.dnainternet.fi. [2001:14ba:a0c3:3a00:264b:feff:fe8b:be8a]) by smtp.gmail.com with ESMTPSA id 2adb3069b0e04-550e703c2f3sm3482506e87.214.2025.05.22.12.04.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 22 May 2025 12:04:37 -0700 (PDT) From: Dmitry Baryshkov Date: Thu, 22 May 2025 22:03:41 +0300 Subject: [PATCH v5 22/30] drm/msm/dpu: get rid of DPU_DIM_LAYER Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20250522-dpu-drop-features-v5-22-3b2085a07884@oss.qualcomm.com> References: <20250522-dpu-drop-features-v5-0-3b2085a07884@oss.qualcomm.com> In-Reply-To: <20250522-dpu-drop-features-v5-0-3b2085a07884@oss.qualcomm.com> To: Rob Clark , Abhinav Kumar , Sean Paul , Marijn Suijten , David Airlie , Simona Vetter , Vinod Koul , Konrad Dybcio Cc: Neil Armstrong , linux-arm-msm@vger.kernel.org, dri-devel@lists.freedesktop.org, freedreno@lists.freedesktop.org, linux-kernel@vger.kernel.org, Dmitry Baryshkov X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=36957; i=dmitry.baryshkov@oss.qualcomm.com; h=from:subject:message-id; bh=qFUB/zmAszMmoynn89d0rjEkbVCuOItarDz5KzyErKg=; b=owEBbQGS/pANAwAKAYs8ij4CKSjVAcsmYgBoL3T/OwHbV96aoTlGL0NlD2cJajjKIVY9RPMl1 ee2KAeiLT+JATMEAAEKAB0WIQRMcISVXLJjVvC4lX+LPIo+Aiko1QUCaC90/wAKCRCLPIo+Aiko 1Wq9B/4rUrCsa4sz/a1bhywLG2mDQ91bdn4WzsTtbHKwRWfJvfwwfVtbH30yH531fhRlGVzgLSj YioVgsrFu6+0Lvm144bAeCFW4J8xD2JwxxutXw1WohtNqMKpNd64m2apN9TNtpe1xuMErhpfPAs b6ciRtTHZvRe4RoLfh3L4/I7W+NUWhdtuL7AVMQRrCz+c0DLU6Ey51CiV3Nq6Mv5bmU/n0DAWTf mdiOxB+T0z50KJ0A/Jrfhuai6w05OVWpqZY0offyXO4amf+4mxgjNPcPdFTpwBndKr8oKlIGJfq omrfborAx9dFHGY2MOIheMDrORKcKnwpCj5hLpKGVo8HoELD X-Developer-Key: i=dmitry.baryshkov@oss.qualcomm.com; a=openpgp; fpr=8F88381DD5C873E4AE487DA5199BF1243632046A X-Authority-Analysis: v=2.4 cv=WJl/XmsR c=1 sm=1 tr=0 ts=682f7555 cx=c_pps a=qKBjSQ1v91RyAK45QCPf5w==:117 a=xqWC_Br6kY4A:10 a=IkcTkHD0fZMA:10 a=dt9VzEwgFbYA:10 a=KKAkSRfTAAAA:8 a=EUspDBNiAAAA:8 a=kQUVcpSUXEBHcVziRcEA:9 a=QEXdDO2ut3YA:10 a=NFOGd7dJGGMPyQGDc5-O:22 a=cvBusfyB2V15izCimMoJ:22 X-Proofpoint-ORIG-GUID: 31T4pHmam_bleDZiMz2fTLXHWjj_sNNt X-Proofpoint-GUID: 31T4pHmam_bleDZiMz2fTLXHWjj_sNNt X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUwNTIyMDE5MiBTYWx0ZWRfX2SWOXpQk7jHD yqFekNMnmIM3N5Fi3CWTbYA+GSMon2MYHpgVi/aOyH/huaYsuKmfVo0FYrwGIJAS5rQZ+b5Zu7g EyfUp/QD7AbNVo+rC4Gx6O2LkBciTg/f7E1knz1t+mSgNjmRgp/cuN7tEU71C98PKKoRJSRAhXa HgbMuUAPgW1+avNDrGaKmhXEdljP8wLml0IrrZvPwElomf3dlSWNZu389O4onzhEn/2waFWK+nP lwgs0DWDYqwKNUfXH61osZ19Wy4i9w5nmWBNbIAyKQi3R98cPJmsJ2Y6xFw79Wi5Xv804hYGOQA GWI/wt1ffqpk41rUpUzoypyRVsN9mSdQ5PAkKl5Yifxht2jVaZCCcIwA4eEhz/Ir0l4M6IFmdFy mWTiyL6s7u5cCuW3UH4dAnQIybYQuvzcqurGZUkZ0q/6Vy/wvVy/ixttulRyE5aFgJgPc1Q1 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1099,Hydra:6.0.736,FMLib:17.12.80.40 definitions=2025-05-22_09,2025-05-22_01,2025-03-28_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 spamscore=0 lowpriorityscore=0 clxscore=1015 suspectscore=0 bulkscore=0 malwarescore=0 impostorscore=0 mlxscore=0 adultscore=0 phishscore=0 mlxlogscore=999 priorityscore=1501 classifier=spam authscore=0 authtc=n/a authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.19.0-2505160000 definitions=main-2505220192 From: Dmitry Baryshkov Continue migration to the MDSS-revision based checks and drop the DPU_DIM_LAYER feature bit. It is currently unused, but can be replaed with the core_major_ver >=3D 4 check. Signed-off-by: Dmitry Baryshkov Reviewed-by: Neil Armstrong Signed-off-by: Dmitry Baryshkov --- drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_10_0_sm8650.h | 12 ++++++------ drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_4_0_sdm845.h | 8 ++++---- drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_4_1_sdm670.h | 8 ++++---- drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_5_0_sm8150.h | 12 ++++++------ drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_5_1_sc8180x.h | 12 ++++++------ drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_5_2_sm7150.h | 8 ++++---- drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_5_3_sm6150.h | 3 --- drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_5_4_sm6125.h | 2 -- drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_6_0_sm8250.h | 12 ++++++------ drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_6_2_sc7180.h | 4 ++-- drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_6_3_sm6115.h | 1 - drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_6_4_sm6350.h | 4 ++-- drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_6_5_qcm2290.h | 1 - drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_6_9_sm6375.h | 1 - drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_7_0_sm8350.h | 12 ++++++------ drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_7_2_sc7280.h | 6 +++--- drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_8_0_sc8280xp.h | 12 ++++++------ drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_8_1_sm8450.h | 12 ++++++------ drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_8_4_sa8775p.h | 12 ++++++------ drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_9_0_sm8550.h | 12 ++++++------ drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_9_1_sar2130p.h | 12 ++++++------ drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_9_2_x1e80100.h | 12 ++++++------ drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.c | 6 ------ drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.h | 2 -- 24 files changed, 85 insertions(+), 101 deletions(-) diff --git a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_10_0_sm8650.h b/driv= ers/gpu/drm/msm/disp/dpu1/catalog/dpu_10_0_sm8650.h index ae66c338250664f9306a7d431cfa18ca07a916a5..9a8f6043370997cb12414c4132e= b68cc73f7030a 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_10_0_sm8650.h +++ b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_10_0_sm8650.h @@ -132,7 +132,7 @@ static const struct dpu_lm_cfg sm8650_lm[] =3D { { .name =3D "lm_0", .id =3D LM_0, .base =3D 0x44000, .len =3D 0x400, - .features =3D MIXER_SDM845_MASK, + .features =3D MIXER_MSM8998_MASK, .sblk =3D &sdm845_lm_sblk, .lm_pair =3D LM_1, .pingpong =3D PINGPONG_0, @@ -140,7 +140,7 @@ static const struct dpu_lm_cfg sm8650_lm[] =3D { }, { .name =3D "lm_1", .id =3D LM_1, .base =3D 0x45000, .len =3D 0x400, - .features =3D MIXER_SDM845_MASK, + .features =3D MIXER_MSM8998_MASK, .sblk =3D &sdm845_lm_sblk, .lm_pair =3D LM_0, .pingpong =3D PINGPONG_1, @@ -148,7 +148,7 @@ static const struct dpu_lm_cfg sm8650_lm[] =3D { }, { .name =3D "lm_2", .id =3D LM_2, .base =3D 0x46000, .len =3D 0x400, - .features =3D MIXER_SDM845_MASK, + .features =3D MIXER_MSM8998_MASK, .sblk =3D &sdm845_lm_sblk, .lm_pair =3D LM_3, .pingpong =3D PINGPONG_2, @@ -156,7 +156,7 @@ static const struct dpu_lm_cfg sm8650_lm[] =3D { }, { .name =3D "lm_3", .id =3D LM_3, .base =3D 0x47000, .len =3D 0x400, - .features =3D MIXER_SDM845_MASK, + .features =3D MIXER_MSM8998_MASK, .sblk =3D &sdm845_lm_sblk, .lm_pair =3D LM_2, .pingpong =3D PINGPONG_3, @@ -164,14 +164,14 @@ static const struct dpu_lm_cfg sm8650_lm[] =3D { }, { .name =3D "lm_4", .id =3D LM_4, .base =3D 0x48000, .len =3D 0x400, - .features =3D MIXER_SDM845_MASK, + .features =3D MIXER_MSM8998_MASK, .sblk =3D &sdm845_lm_sblk, .lm_pair =3D LM_5, .pingpong =3D PINGPONG_4, }, { .name =3D "lm_5", .id =3D LM_5, .base =3D 0x49000, .len =3D 0x400, - .features =3D MIXER_SDM845_MASK, + .features =3D MIXER_MSM8998_MASK, .sblk =3D &sdm845_lm_sblk, .lm_pair =3D LM_4, .pingpong =3D PINGPONG_5, diff --git a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_4_0_sdm845.h b/drive= rs/gpu/drm/msm/disp/dpu1/catalog/dpu_4_0_sdm845.h index 72a7257b4d7ba5bfe89ec76bac19550e023a2b50..5cc9f55d542b79bd2859cdd13d7= f9640bf385866 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_4_0_sdm845.h +++ b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_4_0_sdm845.h @@ -133,7 +133,7 @@ static const struct dpu_lm_cfg sdm845_lm[] =3D { { .name =3D "lm_0", .id =3D LM_0, .base =3D 0x44000, .len =3D 0x320, - .features =3D MIXER_SDM845_MASK, + .features =3D MIXER_MSM8998_MASK, .sblk =3D &sdm845_lm_sblk, .lm_pair =3D LM_1, .pingpong =3D PINGPONG_0, @@ -141,7 +141,7 @@ static const struct dpu_lm_cfg sdm845_lm[] =3D { }, { .name =3D "lm_1", .id =3D LM_1, .base =3D 0x45000, .len =3D 0x320, - .features =3D MIXER_SDM845_MASK, + .features =3D MIXER_MSM8998_MASK, .sblk =3D &sdm845_lm_sblk, .lm_pair =3D LM_0, .pingpong =3D PINGPONG_1, @@ -149,7 +149,7 @@ static const struct dpu_lm_cfg sdm845_lm[] =3D { }, { .name =3D "lm_2", .id =3D LM_2, .base =3D 0x46000, .len =3D 0x320, - .features =3D MIXER_SDM845_MASK, + .features =3D MIXER_MSM8998_MASK, .sblk =3D &sdm845_lm_sblk, .lm_pair =3D LM_5, .pingpong =3D PINGPONG_2, @@ -157,7 +157,7 @@ static const struct dpu_lm_cfg sdm845_lm[] =3D { }, { .name =3D "lm_5", .id =3D LM_5, .base =3D 0x49000, .len =3D 0x320, - .features =3D MIXER_SDM845_MASK, + .features =3D MIXER_MSM8998_MASK, .sblk =3D &sdm845_lm_sblk, .lm_pair =3D LM_2, .pingpong =3D PINGPONG_3, diff --git a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_4_1_sdm670.h b/drive= rs/gpu/drm/msm/disp/dpu1/catalog/dpu_4_1_sdm670.h index ce169a610e195cbb6f0fee1362bcaaf05df777cb..0f5e9babdeea837c77546cd60cf= 9b545434c9746 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_4_1_sdm670.h +++ b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_4_1_sdm670.h @@ -68,7 +68,7 @@ static const struct dpu_lm_cfg sdm670_lm[] =3D { { .name =3D "lm_0", .id =3D LM_0, .base =3D 0x44000, .len =3D 0x320, - .features =3D MIXER_SDM845_MASK, + .features =3D MIXER_MSM8998_MASK, .sblk =3D &sdm845_lm_sblk, .lm_pair =3D LM_1, .pingpong =3D PINGPONG_0, @@ -76,7 +76,7 @@ static const struct dpu_lm_cfg sdm670_lm[] =3D { }, { .name =3D "lm_1", .id =3D LM_1, .base =3D 0x45000, .len =3D 0x320, - .features =3D MIXER_SDM845_MASK, + .features =3D MIXER_MSM8998_MASK, .sblk =3D &sdm845_lm_sblk, .lm_pair =3D LM_0, .pingpong =3D PINGPONG_1, @@ -84,14 +84,14 @@ static const struct dpu_lm_cfg sdm670_lm[] =3D { }, { .name =3D "lm_2", .id =3D LM_2, .base =3D 0x46000, .len =3D 0x320, - .features =3D MIXER_SDM845_MASK, + .features =3D MIXER_MSM8998_MASK, .sblk =3D &sdm845_lm_sblk, .lm_pair =3D LM_5, .pingpong =3D PINGPONG_2, }, { .name =3D "lm_5", .id =3D LM_5, .base =3D 0x49000, .len =3D 0x320, - .features =3D MIXER_SDM845_MASK, + .features =3D MIXER_MSM8998_MASK, .sblk =3D &sdm845_lm_sblk, .lm_pair =3D LM_2, .pingpong =3D PINGPONG_3, diff --git a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_5_0_sm8150.h b/drive= rs/gpu/drm/msm/disp/dpu1/catalog/dpu_5_0_sm8150.h index 23a3a458dd5c260399a42e5f4d4361b3c4e82c4f..8e37c40620b62aacdcb47c7a04b= cfce944ab0b4c 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_5_0_sm8150.h +++ b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_5_0_sm8150.h @@ -136,7 +136,7 @@ static const struct dpu_lm_cfg sm8150_lm[] =3D { { .name =3D "lm_0", .id =3D LM_0, .base =3D 0x44000, .len =3D 0x320, - .features =3D MIXER_SDM845_MASK, + .features =3D MIXER_MSM8998_MASK, .sblk =3D &sdm845_lm_sblk, .lm_pair =3D LM_1, .pingpong =3D PINGPONG_0, @@ -144,7 +144,7 @@ static const struct dpu_lm_cfg sm8150_lm[] =3D { }, { .name =3D "lm_1", .id =3D LM_1, .base =3D 0x45000, .len =3D 0x320, - .features =3D MIXER_SDM845_MASK, + .features =3D MIXER_MSM8998_MASK, .sblk =3D &sdm845_lm_sblk, .lm_pair =3D LM_0, .pingpong =3D PINGPONG_1, @@ -152,7 +152,7 @@ static const struct dpu_lm_cfg sm8150_lm[] =3D { }, { .name =3D "lm_2", .id =3D LM_2, .base =3D 0x46000, .len =3D 0x320, - .features =3D MIXER_SDM845_MASK, + .features =3D MIXER_MSM8998_MASK, .sblk =3D &sdm845_lm_sblk, .lm_pair =3D LM_3, .pingpong =3D PINGPONG_2, @@ -160,7 +160,7 @@ static const struct dpu_lm_cfg sm8150_lm[] =3D { }, { .name =3D "lm_3", .id =3D LM_3, .base =3D 0x47000, .len =3D 0x320, - .features =3D MIXER_SDM845_MASK, + .features =3D MIXER_MSM8998_MASK, .sblk =3D &sdm845_lm_sblk, .lm_pair =3D LM_2, .pingpong =3D PINGPONG_3, @@ -168,14 +168,14 @@ static const struct dpu_lm_cfg sm8150_lm[] =3D { }, { .name =3D "lm_4", .id =3D LM_4, .base =3D 0x48000, .len =3D 0x320, - .features =3D MIXER_SDM845_MASK, + .features =3D MIXER_MSM8998_MASK, .sblk =3D &sdm845_lm_sblk, .lm_pair =3D LM_5, .pingpong =3D PINGPONG_4, }, { .name =3D "lm_5", .id =3D LM_5, .base =3D 0x49000, .len =3D 0x320, - .features =3D MIXER_SDM845_MASK, + .features =3D MIXER_MSM8998_MASK, .sblk =3D &sdm845_lm_sblk, .lm_pair =3D LM_4, .pingpong =3D PINGPONG_5, diff --git a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_5_1_sc8180x.h b/driv= ers/gpu/drm/msm/disp/dpu1/catalog/dpu_5_1_sc8180x.h index 75f8f69123a4a6afe8234a9de21ce68b23c11605..a05d2ef8fc9d217898b8c12d463= 9563b28b4477b 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_5_1_sc8180x.h +++ b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_5_1_sc8180x.h @@ -136,7 +136,7 @@ static const struct dpu_lm_cfg sc8180x_lm[] =3D { { .name =3D "lm_0", .id =3D LM_0, .base =3D 0x44000, .len =3D 0x320, - .features =3D MIXER_SDM845_MASK, + .features =3D MIXER_MSM8998_MASK, .sblk =3D &sdm845_lm_sblk, .lm_pair =3D LM_1, .pingpong =3D PINGPONG_0, @@ -144,7 +144,7 @@ static const struct dpu_lm_cfg sc8180x_lm[] =3D { }, { .name =3D "lm_1", .id =3D LM_1, .base =3D 0x45000, .len =3D 0x320, - .features =3D MIXER_SDM845_MASK, + .features =3D MIXER_MSM8998_MASK, .sblk =3D &sdm845_lm_sblk, .lm_pair =3D LM_0, .pingpong =3D PINGPONG_1, @@ -152,7 +152,7 @@ static const struct dpu_lm_cfg sc8180x_lm[] =3D { }, { .name =3D "lm_2", .id =3D LM_2, .base =3D 0x46000, .len =3D 0x320, - .features =3D MIXER_SDM845_MASK, + .features =3D MIXER_MSM8998_MASK, .sblk =3D &sdm845_lm_sblk, .lm_pair =3D LM_3, .pingpong =3D PINGPONG_2, @@ -160,7 +160,7 @@ static const struct dpu_lm_cfg sc8180x_lm[] =3D { }, { .name =3D "lm_3", .id =3D LM_3, .base =3D 0x47000, .len =3D 0x320, - .features =3D MIXER_SDM845_MASK, + .features =3D MIXER_MSM8998_MASK, .sblk =3D &sdm845_lm_sblk, .lm_pair =3D LM_2, .pingpong =3D PINGPONG_3, @@ -168,14 +168,14 @@ static const struct dpu_lm_cfg sc8180x_lm[] =3D { }, { .name =3D "lm_4", .id =3D LM_4, .base =3D 0x48000, .len =3D 0x320, - .features =3D MIXER_SDM845_MASK, + .features =3D MIXER_MSM8998_MASK, .sblk =3D &sdm845_lm_sblk, .lm_pair =3D LM_5, .pingpong =3D PINGPONG_4, }, { .name =3D "lm_5", .id =3D LM_5, .base =3D 0x49000, .len =3D 0x320, - .features =3D MIXER_SDM845_MASK, + .features =3D MIXER_MSM8998_MASK, .sblk =3D &sdm845_lm_sblk, .lm_pair =3D LM_4, .pingpong =3D PINGPONG_5, diff --git a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_5_2_sm7150.h b/drive= rs/gpu/drm/msm/disp/dpu1/catalog/dpu_5_2_sm7150.h index 6b895eca2fac53505f7a1d857d30bb8a5d23d4c8..cb0b5687b5239418f50c539447f= 9cfa56e81fcc6 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_5_2_sm7150.h +++ b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_5_2_sm7150.h @@ -109,7 +109,7 @@ static const struct dpu_lm_cfg sm7150_lm[] =3D { { .name =3D "lm_0", .id =3D LM_0, .base =3D 0x44000, .len =3D 0x320, - .features =3D MIXER_SDM845_MASK, + .features =3D MIXER_MSM8998_MASK, .sblk =3D &sdm845_lm_sblk, .lm_pair =3D LM_1, .pingpong =3D PINGPONG_0, @@ -117,7 +117,7 @@ static const struct dpu_lm_cfg sm7150_lm[] =3D { }, { .name =3D "lm_1", .id =3D LM_1, .base =3D 0x45000, .len =3D 0x320, - .features =3D MIXER_SDM845_MASK, + .features =3D MIXER_MSM8998_MASK, .sblk =3D &sdm845_lm_sblk, .lm_pair =3D LM_0, .pingpong =3D PINGPONG_1, @@ -125,14 +125,14 @@ static const struct dpu_lm_cfg sm7150_lm[] =3D { }, { .name =3D "lm_2", .id =3D LM_2, .base =3D 0x46000, .len =3D 0x320, - .features =3D MIXER_SDM845_MASK, + .features =3D MIXER_MSM8998_MASK, .sblk =3D &sdm845_lm_sblk, .lm_pair =3D LM_3, .pingpong =3D PINGPONG_2, }, { .name =3D "lm_3", .id =3D LM_3, .base =3D 0x47000, .len =3D 0x320, - .features =3D MIXER_SDM845_MASK, + .features =3D MIXER_MSM8998_MASK, .sblk =3D &sdm845_lm_sblk, .lm_pair =3D LM_2, .pingpong =3D PINGPONG_3, diff --git a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_5_3_sm6150.h b/drive= rs/gpu/drm/msm/disp/dpu1/catalog/dpu_5_3_sm6150.h index e2306d314ef8f8b59078a8ca8c529f2e56385c98..8fb926bff36d32fb4ce1036cb69= 513599dc7b6b7 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_5_3_sm6150.h +++ b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_5_3_sm6150.h @@ -107,20 +107,17 @@ static const struct dpu_lm_cfg sm6150_lm[] =3D { { .name =3D "lm_0", .id =3D LM_0, .base =3D 0x44000, .len =3D 0x320, - .features =3D MIXER_QCM2290_MASK, .sblk =3D &sdm845_lm_sblk, .pingpong =3D PINGPONG_0, .dspp =3D DSPP_0, }, { .name =3D "lm_1", .id =3D LM_1, .base =3D 0x45000, .len =3D 0x320, - .features =3D MIXER_QCM2290_MASK, .sblk =3D &sdm845_lm_sblk, .pingpong =3D PINGPONG_1, }, { .name =3D "lm_2", .id =3D LM_2, .base =3D 0x46000, .len =3D 0x320, - .features =3D MIXER_QCM2290_MASK, .sblk =3D &sdm845_lm_sblk, .pingpong =3D PINGPONG_2, }, diff --git a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_5_4_sm6125.h b/drive= rs/gpu/drm/msm/disp/dpu1/catalog/dpu_5_4_sm6125.h index 62136811a530a6072accbd1ab3e02e7e24220ccb..5c2c8c5f812347970c534769d72= f9699e6e7049a 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_5_4_sm6125.h +++ b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_5_4_sm6125.h @@ -91,7 +91,6 @@ static const struct dpu_lm_cfg sm6125_lm[] =3D { { .name =3D "lm_0", .id =3D LM_0, .base =3D 0x44000, .len =3D 0x320, - .features =3D MIXER_QCM2290_MASK, .sblk =3D &sdm845_lm_sblk, .pingpong =3D PINGPONG_0, .dspp =3D DSPP_0, @@ -99,7 +98,6 @@ static const struct dpu_lm_cfg sm6125_lm[] =3D { }, { .name =3D "lm_1", .id =3D LM_1, .base =3D 0x45000, .len =3D 0x320, - .features =3D MIXER_QCM2290_MASK, .sblk =3D &sdm845_lm_sblk, .pingpong =3D PINGPONG_1, .dspp =3D 0, diff --git a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_6_0_sm8250.h b/drive= rs/gpu/drm/msm/disp/dpu1/catalog/dpu_6_0_sm8250.h index 34f11fb084c02cf994c272196299bb9f7bced4f1..17fa0ef9ac03e4649a218cd837b= 296211ef4506c 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_6_0_sm8250.h +++ b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_6_0_sm8250.h @@ -135,7 +135,7 @@ static const struct dpu_lm_cfg sm8250_lm[] =3D { { .name =3D "lm_0", .id =3D LM_0, .base =3D 0x44000, .len =3D 0x320, - .features =3D MIXER_SDM845_MASK, + .features =3D MIXER_MSM8998_MASK, .sblk =3D &sdm845_lm_sblk, .lm_pair =3D LM_1, .pingpong =3D PINGPONG_0, @@ -143,7 +143,7 @@ static const struct dpu_lm_cfg sm8250_lm[] =3D { }, { .name =3D "lm_1", .id =3D LM_1, .base =3D 0x45000, .len =3D 0x320, - .features =3D MIXER_SDM845_MASK, + .features =3D MIXER_MSM8998_MASK, .sblk =3D &sdm845_lm_sblk, .lm_pair =3D LM_0, .pingpong =3D PINGPONG_1, @@ -151,7 +151,7 @@ static const struct dpu_lm_cfg sm8250_lm[] =3D { }, { .name =3D "lm_2", .id =3D LM_2, .base =3D 0x46000, .len =3D 0x320, - .features =3D MIXER_SDM845_MASK, + .features =3D MIXER_MSM8998_MASK, .sblk =3D &sdm845_lm_sblk, .lm_pair =3D LM_3, .pingpong =3D PINGPONG_2, @@ -159,7 +159,7 @@ static const struct dpu_lm_cfg sm8250_lm[] =3D { }, { .name =3D "lm_3", .id =3D LM_3, .base =3D 0x47000, .len =3D 0x320, - .features =3D MIXER_SDM845_MASK, + .features =3D MIXER_MSM8998_MASK, .sblk =3D &sdm845_lm_sblk, .lm_pair =3D LM_2, .pingpong =3D PINGPONG_3, @@ -167,14 +167,14 @@ static const struct dpu_lm_cfg sm8250_lm[] =3D { }, { .name =3D "lm_4", .id =3D LM_4, .base =3D 0x48000, .len =3D 0x320, - .features =3D MIXER_SDM845_MASK, + .features =3D MIXER_MSM8998_MASK, .sblk =3D &sdm845_lm_sblk, .lm_pair =3D LM_5, .pingpong =3D PINGPONG_4, }, { .name =3D "lm_5", .id =3D LM_5, .base =3D 0x49000, .len =3D 0x320, - .features =3D MIXER_SDM845_MASK, + .features =3D MIXER_MSM8998_MASK, .sblk =3D &sdm845_lm_sblk, .lm_pair =3D LM_4, .pingpong =3D PINGPONG_5, diff --git a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_6_2_sc7180.h b/drive= rs/gpu/drm/msm/disp/dpu1/catalog/dpu_6_2_sc7180.h index 135b4f8171360493e58a1945105f8722d513d720..f6a0f1a39dcc3c9e82c07889d71= 905434274cdf9 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_6_2_sc7180.h +++ b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_6_2_sc7180.h @@ -84,7 +84,7 @@ static const struct dpu_lm_cfg sc7180_lm[] =3D { { .name =3D "lm_0", .id =3D LM_0, .base =3D 0x44000, .len =3D 0x320, - .features =3D MIXER_SDM845_MASK, + .features =3D MIXER_MSM8998_MASK, .sblk =3D &sc7180_lm_sblk, .lm_pair =3D LM_1, .pingpong =3D PINGPONG_0, @@ -92,7 +92,7 @@ static const struct dpu_lm_cfg sc7180_lm[] =3D { }, { .name =3D "lm_1", .id =3D LM_1, .base =3D 0x45000, .len =3D 0x320, - .features =3D MIXER_SDM845_MASK, + .features =3D MIXER_MSM8998_MASK, .sblk =3D &sc7180_lm_sblk, .lm_pair =3D LM_0, .pingpong =3D PINGPONG_1, diff --git a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_6_3_sm6115.h b/drive= rs/gpu/drm/msm/disp/dpu1/catalog/dpu_6_3_sm6115.h index 1189a5ecb3b7b50430eb275280c2309ee9d90b63..343ff5482382645fbd440d18d7e= e46e5b3fc868c 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_6_3_sm6115.h +++ b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_6_3_sm6115.h @@ -57,7 +57,6 @@ static const struct dpu_lm_cfg sm6115_lm[] =3D { { .name =3D "lm_0", .id =3D LM_0, .base =3D 0x44000, .len =3D 0x320, - .features =3D MIXER_QCM2290_MASK, .sblk =3D &qcm2290_lm_sblk, .pingpong =3D PINGPONG_0, .dspp =3D DSPP_0, diff --git a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_6_4_sm6350.h b/drive= rs/gpu/drm/msm/disp/dpu1/catalog/dpu_6_4_sm6350.h index 13ff6bdcc517fd566e7701f7a7cefe5ff19c5421..06bcaf4d8b0db74c349112af688= 4f7f3139a7ff8 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_6_4_sm6350.h +++ b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_6_4_sm6350.h @@ -91,7 +91,7 @@ static const struct dpu_lm_cfg sm6350_lm[] =3D { { .name =3D "lm_0", .id =3D LM_0, .base =3D 0x44000, .len =3D 0x320, - .features =3D MIXER_SDM845_MASK, + .features =3D MIXER_MSM8998_MASK, .sblk =3D &sc7180_lm_sblk, .lm_pair =3D LM_1, .pingpong =3D PINGPONG_0, @@ -99,7 +99,7 @@ static const struct dpu_lm_cfg sm6350_lm[] =3D { }, { .name =3D "lm_1", .id =3D LM_1, .base =3D 0x45000, .len =3D 0x320, - .features =3D MIXER_SDM845_MASK, + .features =3D MIXER_MSM8998_MASK, .sblk =3D &sc7180_lm_sblk, .lm_pair =3D LM_0, .pingpong =3D PINGPONG_1, diff --git a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_6_5_qcm2290.h b/driv= ers/gpu/drm/msm/disp/dpu1/catalog/dpu_6_5_qcm2290.h index d4c2d2da91aac0bce46c4d65079f01484a769ae3..47053bf9b0a205302b3937e625f= beca8d17f0c82 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_6_5_qcm2290.h +++ b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_6_5_qcm2290.h @@ -57,7 +57,6 @@ static const struct dpu_lm_cfg qcm2290_lm[] =3D { { .name =3D "lm_0", .id =3D LM_0, .base =3D 0x44000, .len =3D 0x320, - .features =3D MIXER_QCM2290_MASK, .sblk =3D &qcm2290_lm_sblk, .pingpong =3D PINGPONG_0, .dspp =3D DSPP_0, diff --git a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_6_9_sm6375.h b/drive= rs/gpu/drm/msm/disp/dpu1/catalog/dpu_6_9_sm6375.h index 9135853a0225fa60acb80d17f627153d25c612e6..9c4e8450b67760c880d9bd2528c= 6a954a0282e08 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_6_9_sm6375.h +++ b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_6_9_sm6375.h @@ -58,7 +58,6 @@ static const struct dpu_lm_cfg sm6375_lm[] =3D { { .name =3D "lm_0", .id =3D LM_0, .base =3D 0x44000, .len =3D 0x320, - .features =3D MIXER_QCM2290_MASK, .sblk =3D &qcm2290_lm_sblk, .lm_pair =3D 0, .pingpong =3D PINGPONG_0, diff --git a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_7_0_sm8350.h b/drive= rs/gpu/drm/msm/disp/dpu1/catalog/dpu_7_0_sm8350.h index 6503f11f65c11806c5b9558a0f9fd05b228340be..e81a2a02e0a6379382058fd8950= 0cf2064a2193f 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_7_0_sm8350.h +++ b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_7_0_sm8350.h @@ -135,7 +135,7 @@ static const struct dpu_lm_cfg sm8350_lm[] =3D { { .name =3D "lm_0", .id =3D LM_0, .base =3D 0x44000, .len =3D 0x320, - .features =3D MIXER_SDM845_MASK, + .features =3D MIXER_MSM8998_MASK, .sblk =3D &sdm845_lm_sblk, .lm_pair =3D LM_1, .pingpong =3D PINGPONG_0, @@ -143,7 +143,7 @@ static const struct dpu_lm_cfg sm8350_lm[] =3D { }, { .name =3D "lm_1", .id =3D LM_1, .base =3D 0x45000, .len =3D 0x320, - .features =3D MIXER_SDM845_MASK, + .features =3D MIXER_MSM8998_MASK, .sblk =3D &sdm845_lm_sblk, .lm_pair =3D LM_0, .pingpong =3D PINGPONG_1, @@ -151,7 +151,7 @@ static const struct dpu_lm_cfg sm8350_lm[] =3D { }, { .name =3D "lm_2", .id =3D LM_2, .base =3D 0x46000, .len =3D 0x320, - .features =3D MIXER_SDM845_MASK, + .features =3D MIXER_MSM8998_MASK, .sblk =3D &sdm845_lm_sblk, .lm_pair =3D LM_3, .pingpong =3D PINGPONG_2, @@ -159,7 +159,7 @@ static const struct dpu_lm_cfg sm8350_lm[] =3D { }, { .name =3D "lm_3", .id =3D LM_3, .base =3D 0x47000, .len =3D 0x320, - .features =3D MIXER_SDM845_MASK, + .features =3D MIXER_MSM8998_MASK, .sblk =3D &sdm845_lm_sblk, .lm_pair =3D LM_2, .pingpong =3D PINGPONG_3, @@ -167,14 +167,14 @@ static const struct dpu_lm_cfg sm8350_lm[] =3D { }, { .name =3D "lm_4", .id =3D LM_4, .base =3D 0x48000, .len =3D 0x320, - .features =3D MIXER_SDM845_MASK, + .features =3D MIXER_MSM8998_MASK, .sblk =3D &sdm845_lm_sblk, .lm_pair =3D LM_5, .pingpong =3D PINGPONG_4, }, { .name =3D "lm_5", .id =3D LM_5, .base =3D 0x49000, .len =3D 0x320, - .features =3D MIXER_SDM845_MASK, + .features =3D MIXER_MSM8998_MASK, .sblk =3D &sdm845_lm_sblk, .lm_pair =3D LM_4, .pingpong =3D PINGPONG_5, diff --git a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_7_2_sc7280.h b/drive= rs/gpu/drm/msm/disp/dpu1/catalog/dpu_7_2_sc7280.h index 202de6f9b0c65c6f2caa9e9d5232f5b92d8bdf01..b0e94ccf7f83e9c3c41f1df363c= b6a8c24f1503d 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_7_2_sc7280.h +++ b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_7_2_sc7280.h @@ -88,21 +88,21 @@ static const struct dpu_lm_cfg sc7280_lm[] =3D { { .name =3D "lm_0", .id =3D LM_0, .base =3D 0x44000, .len =3D 0x320, - .features =3D MIXER_SDM845_MASK, + .features =3D MIXER_MSM8998_MASK, .sblk =3D &sc7180_lm_sblk, .pingpong =3D PINGPONG_0, .dspp =3D DSPP_0, }, { .name =3D "lm_2", .id =3D LM_2, .base =3D 0x46000, .len =3D 0x320, - .features =3D MIXER_SDM845_MASK, + .features =3D MIXER_MSM8998_MASK, .sblk =3D &sc7180_lm_sblk, .lm_pair =3D LM_3, .pingpong =3D PINGPONG_2, }, { .name =3D "lm_3", .id =3D LM_3, .base =3D 0x47000, .len =3D 0x320, - .features =3D MIXER_SDM845_MASK, + .features =3D MIXER_MSM8998_MASK, .sblk =3D &sc7180_lm_sblk, .lm_pair =3D LM_2, .pingpong =3D PINGPONG_3, diff --git a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_8_0_sc8280xp.h b/dri= vers/gpu/drm/msm/disp/dpu1/catalog/dpu_8_0_sc8280xp.h index 85778071bc1347008dbe4522aeb9ca4fd21aa097..2cf30234e45da8a7776d61c49c2= 6abd75d070941 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_8_0_sc8280xp.h +++ b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_8_0_sc8280xp.h @@ -134,7 +134,7 @@ static const struct dpu_lm_cfg sc8280xp_lm[] =3D { { .name =3D "lm_0", .id =3D LM_0, .base =3D 0x44000, .len =3D 0x320, - .features =3D MIXER_SDM845_MASK, + .features =3D MIXER_MSM8998_MASK, .sblk =3D &sdm845_lm_sblk, .lm_pair =3D LM_1, .pingpong =3D PINGPONG_0, @@ -142,7 +142,7 @@ static const struct dpu_lm_cfg sc8280xp_lm[] =3D { }, { .name =3D "lm_1", .id =3D LM_1, .base =3D 0x45000, .len =3D 0x320, - .features =3D MIXER_SDM845_MASK, + .features =3D MIXER_MSM8998_MASK, .sblk =3D &sdm845_lm_sblk, .lm_pair =3D LM_0, .pingpong =3D PINGPONG_1, @@ -150,7 +150,7 @@ static const struct dpu_lm_cfg sc8280xp_lm[] =3D { }, { .name =3D "lm_2", .id =3D LM_2, .base =3D 0x46000, .len =3D 0x320, - .features =3D MIXER_SDM845_MASK, + .features =3D MIXER_MSM8998_MASK, .sblk =3D &sdm845_lm_sblk, .lm_pair =3D LM_3, .pingpong =3D PINGPONG_2, @@ -158,7 +158,7 @@ static const struct dpu_lm_cfg sc8280xp_lm[] =3D { }, { .name =3D "lm_3", .id =3D LM_3, .base =3D 0x47000, .len =3D 0x320, - .features =3D MIXER_SDM845_MASK, + .features =3D MIXER_MSM8998_MASK, .sblk =3D &sdm845_lm_sblk, .lm_pair =3D LM_2, .pingpong =3D PINGPONG_3, @@ -166,14 +166,14 @@ static const struct dpu_lm_cfg sc8280xp_lm[] =3D { }, { .name =3D "lm_4", .id =3D LM_4, .base =3D 0x48000, .len =3D 0x320, - .features =3D MIXER_SDM845_MASK, + .features =3D MIXER_MSM8998_MASK, .sblk =3D &sdm845_lm_sblk, .lm_pair =3D LM_5, .pingpong =3D PINGPONG_4, }, { .name =3D "lm_5", .id =3D LM_5, .base =3D 0x49000, .len =3D 0x320, - .features =3D MIXER_SDM845_MASK, + .features =3D MIXER_MSM8998_MASK, .sblk =3D &sdm845_lm_sblk, .lm_pair =3D LM_4, .pingpong =3D PINGPONG_5, diff --git a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_8_1_sm8450.h b/drive= rs/gpu/drm/msm/disp/dpu1/catalog/dpu_8_1_sm8450.h index f9676f804f9132296467bc751e11036696afa942..dcef56683224b5715c2608b5472= d2d5a0da62010 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_8_1_sm8450.h +++ b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_8_1_sm8450.h @@ -135,7 +135,7 @@ static const struct dpu_lm_cfg sm8450_lm[] =3D { { .name =3D "lm_0", .id =3D LM_0, .base =3D 0x44000, .len =3D 0x320, - .features =3D MIXER_SDM845_MASK, + .features =3D MIXER_MSM8998_MASK, .sblk =3D &sdm845_lm_sblk, .lm_pair =3D LM_1, .pingpong =3D PINGPONG_0, @@ -143,7 +143,7 @@ static const struct dpu_lm_cfg sm8450_lm[] =3D { }, { .name =3D "lm_1", .id =3D LM_1, .base =3D 0x45000, .len =3D 0x320, - .features =3D MIXER_SDM845_MASK, + .features =3D MIXER_MSM8998_MASK, .sblk =3D &sdm845_lm_sblk, .lm_pair =3D LM_0, .pingpong =3D PINGPONG_1, @@ -151,7 +151,7 @@ static const struct dpu_lm_cfg sm8450_lm[] =3D { }, { .name =3D "lm_2", .id =3D LM_2, .base =3D 0x46000, .len =3D 0x320, - .features =3D MIXER_SDM845_MASK, + .features =3D MIXER_MSM8998_MASK, .sblk =3D &sdm845_lm_sblk, .lm_pair =3D LM_3, .pingpong =3D PINGPONG_2, @@ -159,7 +159,7 @@ static const struct dpu_lm_cfg sm8450_lm[] =3D { }, { .name =3D "lm_3", .id =3D LM_3, .base =3D 0x47000, .len =3D 0x320, - .features =3D MIXER_SDM845_MASK, + .features =3D MIXER_MSM8998_MASK, .sblk =3D &sdm845_lm_sblk, .lm_pair =3D LM_2, .pingpong =3D PINGPONG_3, @@ -167,14 +167,14 @@ static const struct dpu_lm_cfg sm8450_lm[] =3D { }, { .name =3D "lm_4", .id =3D LM_4, .base =3D 0x48000, .len =3D 0x320, - .features =3D MIXER_SDM845_MASK, + .features =3D MIXER_MSM8998_MASK, .sblk =3D &sdm845_lm_sblk, .lm_pair =3D LM_5, .pingpong =3D PINGPONG_4, }, { .name =3D "lm_5", .id =3D LM_5, .base =3D 0x49000, .len =3D 0x320, - .features =3D MIXER_SDM845_MASK, + .features =3D MIXER_MSM8998_MASK, .sblk =3D &sdm845_lm_sblk, .lm_pair =3D LM_4, .pingpong =3D PINGPONG_5, diff --git a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_8_4_sa8775p.h b/driv= ers/gpu/drm/msm/disp/dpu1/catalog/dpu_8_4_sa8775p.h index 7462cfc4cf8de4a10326c83d3341dbee76e437e8..5f5987d5fc602df29c5eb289823= de5dd359df014 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_8_4_sa8775p.h +++ b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_8_4_sa8775p.h @@ -134,7 +134,7 @@ static const struct dpu_lm_cfg sa8775p_lm[] =3D { { .name =3D "lm_0", .id =3D LM_0, .base =3D 0x44000, .len =3D 0x400, - .features =3D MIXER_SDM845_MASK, + .features =3D MIXER_MSM8998_MASK, .sblk =3D &sdm845_lm_sblk, .lm_pair =3D LM_1, .pingpong =3D PINGPONG_0, @@ -142,7 +142,7 @@ static const struct dpu_lm_cfg sa8775p_lm[] =3D { }, { .name =3D "lm_1", .id =3D LM_1, .base =3D 0x45000, .len =3D 0x400, - .features =3D MIXER_SDM845_MASK, + .features =3D MIXER_MSM8998_MASK, .sblk =3D &sdm845_lm_sblk, .lm_pair =3D LM_0, .pingpong =3D PINGPONG_1, @@ -150,7 +150,7 @@ static const struct dpu_lm_cfg sa8775p_lm[] =3D { }, { .name =3D "lm_2", .id =3D LM_2, .base =3D 0x46000, .len =3D 0x400, - .features =3D MIXER_SDM845_MASK, + .features =3D MIXER_MSM8998_MASK, .sblk =3D &sdm845_lm_sblk, .lm_pair =3D LM_3, .pingpong =3D PINGPONG_2, @@ -158,7 +158,7 @@ static const struct dpu_lm_cfg sa8775p_lm[] =3D { }, { .name =3D "lm_3", .id =3D LM_3, .base =3D 0x47000, .len =3D 0x400, - .features =3D MIXER_SDM845_MASK, + .features =3D MIXER_MSM8998_MASK, .sblk =3D &sdm845_lm_sblk, .lm_pair =3D LM_2, .pingpong =3D PINGPONG_3, @@ -166,14 +166,14 @@ static const struct dpu_lm_cfg sa8775p_lm[] =3D { }, { .name =3D "lm_4", .id =3D LM_4, .base =3D 0x48000, .len =3D 0x400, - .features =3D MIXER_SDM845_MASK, + .features =3D MIXER_MSM8998_MASK, .sblk =3D &sdm845_lm_sblk, .lm_pair =3D LM_5, .pingpong =3D PINGPONG_4, }, { .name =3D "lm_5", .id =3D LM_5, .base =3D 0x49000, .len =3D 0x400, - .features =3D MIXER_SDM845_MASK, + .features =3D MIXER_MSM8998_MASK, .sblk =3D &sdm845_lm_sblk, .lm_pair =3D LM_4, .pingpong =3D PINGPONG_5, diff --git a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_9_0_sm8550.h b/drive= rs/gpu/drm/msm/disp/dpu1/catalog/dpu_9_0_sm8550.h index 695ae7581a88b36fa1f28aa3cd0c9166090e940c..6f310216fbccb985308f617db20= c1878e622340a 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_9_0_sm8550.h +++ b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_9_0_sm8550.h @@ -132,7 +132,7 @@ static const struct dpu_lm_cfg sm8550_lm[] =3D { { .name =3D "lm_0", .id =3D LM_0, .base =3D 0x44000, .len =3D 0x320, - .features =3D MIXER_SDM845_MASK, + .features =3D MIXER_MSM8998_MASK, .sblk =3D &sdm845_lm_sblk, .lm_pair =3D LM_1, .pingpong =3D PINGPONG_0, @@ -140,7 +140,7 @@ static const struct dpu_lm_cfg sm8550_lm[] =3D { }, { .name =3D "lm_1", .id =3D LM_1, .base =3D 0x45000, .len =3D 0x320, - .features =3D MIXER_SDM845_MASK, + .features =3D MIXER_MSM8998_MASK, .sblk =3D &sdm845_lm_sblk, .lm_pair =3D LM_0, .pingpong =3D PINGPONG_1, @@ -148,7 +148,7 @@ static const struct dpu_lm_cfg sm8550_lm[] =3D { }, { .name =3D "lm_2", .id =3D LM_2, .base =3D 0x46000, .len =3D 0x320, - .features =3D MIXER_SDM845_MASK, + .features =3D MIXER_MSM8998_MASK, .sblk =3D &sdm845_lm_sblk, .lm_pair =3D LM_3, .pingpong =3D PINGPONG_2, @@ -156,7 +156,7 @@ static const struct dpu_lm_cfg sm8550_lm[] =3D { }, { .name =3D "lm_3", .id =3D LM_3, .base =3D 0x47000, .len =3D 0x320, - .features =3D MIXER_SDM845_MASK, + .features =3D MIXER_MSM8998_MASK, .sblk =3D &sdm845_lm_sblk, .lm_pair =3D LM_2, .pingpong =3D PINGPONG_3, @@ -164,14 +164,14 @@ static const struct dpu_lm_cfg sm8550_lm[] =3D { }, { .name =3D "lm_4", .id =3D LM_4, .base =3D 0x48000, .len =3D 0x320, - .features =3D MIXER_SDM845_MASK, + .features =3D MIXER_MSM8998_MASK, .sblk =3D &sdm845_lm_sblk, .lm_pair =3D LM_5, .pingpong =3D PINGPONG_4, }, { .name =3D "lm_5", .id =3D LM_5, .base =3D 0x49000, .len =3D 0x320, - .features =3D MIXER_SDM845_MASK, + .features =3D MIXER_MSM8998_MASK, .sblk =3D &sdm845_lm_sblk, .lm_pair =3D LM_4, .pingpong =3D PINGPONG_5, diff --git a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_9_1_sar2130p.h b/dri= vers/gpu/drm/msm/disp/dpu1/catalog/dpu_9_1_sar2130p.h index 9a25113df5aec527baa514aaa61f2b47c2443d27..ba8a2c5dc5e2b3474b295c86afb= bbe8f8d416ccd 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_9_1_sar2130p.h +++ b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_9_1_sar2130p.h @@ -132,7 +132,7 @@ static const struct dpu_lm_cfg sar2130p_lm[] =3D { { .name =3D "lm_0", .id =3D LM_0, .base =3D 0x44000, .len =3D 0x320, - .features =3D MIXER_SDM845_MASK, + .features =3D MIXER_MSM8998_MASK, .sblk =3D &sdm845_lm_sblk, .lm_pair =3D LM_1, .pingpong =3D PINGPONG_0, @@ -140,7 +140,7 @@ static const struct dpu_lm_cfg sar2130p_lm[] =3D { }, { .name =3D "lm_1", .id =3D LM_1, .base =3D 0x45000, .len =3D 0x320, - .features =3D MIXER_SDM845_MASK, + .features =3D MIXER_MSM8998_MASK, .sblk =3D &sdm845_lm_sblk, .lm_pair =3D LM_0, .pingpong =3D PINGPONG_1, @@ -148,7 +148,7 @@ static const struct dpu_lm_cfg sar2130p_lm[] =3D { }, { .name =3D "lm_2", .id =3D LM_2, .base =3D 0x46000, .len =3D 0x320, - .features =3D MIXER_SDM845_MASK, + .features =3D MIXER_MSM8998_MASK, .sblk =3D &sdm845_lm_sblk, .lm_pair =3D LM_3, .pingpong =3D PINGPONG_2, @@ -156,7 +156,7 @@ static const struct dpu_lm_cfg sar2130p_lm[] =3D { }, { .name =3D "lm_3", .id =3D LM_3, .base =3D 0x47000, .len =3D 0x320, - .features =3D MIXER_SDM845_MASK, + .features =3D MIXER_MSM8998_MASK, .sblk =3D &sdm845_lm_sblk, .lm_pair =3D LM_2, .pingpong =3D PINGPONG_3, @@ -164,14 +164,14 @@ static const struct dpu_lm_cfg sar2130p_lm[] =3D { }, { .name =3D "lm_4", .id =3D LM_4, .base =3D 0x48000, .len =3D 0x320, - .features =3D MIXER_SDM845_MASK, + .features =3D MIXER_MSM8998_MASK, .sblk =3D &sdm845_lm_sblk, .lm_pair =3D LM_5, .pingpong =3D PINGPONG_4, }, { .name =3D "lm_5", .id =3D LM_5, .base =3D 0x49000, .len =3D 0x320, - .features =3D MIXER_SDM845_MASK, + .features =3D MIXER_MSM8998_MASK, .sblk =3D &sdm845_lm_sblk, .lm_pair =3D LM_4, .pingpong =3D PINGPONG_5, diff --git a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_9_2_x1e80100.h b/dri= vers/gpu/drm/msm/disp/dpu1/catalog/dpu_9_2_x1e80100.h index 54815c613f087454aa7b4befc84462265d8dfc23..77986a7bd62c1b6323482426e59= 6e5974ba40865 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_9_2_x1e80100.h +++ b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_9_2_x1e80100.h @@ -131,7 +131,7 @@ static const struct dpu_lm_cfg x1e80100_lm[] =3D { { .name =3D "lm_0", .id =3D LM_0, .base =3D 0x44000, .len =3D 0x320, - .features =3D MIXER_SDM845_MASK, + .features =3D MIXER_MSM8998_MASK, .sblk =3D &sdm845_lm_sblk, .lm_pair =3D LM_1, .pingpong =3D PINGPONG_0, @@ -139,7 +139,7 @@ static const struct dpu_lm_cfg x1e80100_lm[] =3D { }, { .name =3D "lm_1", .id =3D LM_1, .base =3D 0x45000, .len =3D 0x320, - .features =3D MIXER_SDM845_MASK, + .features =3D MIXER_MSM8998_MASK, .sblk =3D &sdm845_lm_sblk, .lm_pair =3D LM_0, .pingpong =3D PINGPONG_1, @@ -147,7 +147,7 @@ static const struct dpu_lm_cfg x1e80100_lm[] =3D { }, { .name =3D "lm_2", .id =3D LM_2, .base =3D 0x46000, .len =3D 0x320, - .features =3D MIXER_SDM845_MASK, + .features =3D MIXER_MSM8998_MASK, .sblk =3D &sdm845_lm_sblk, .lm_pair =3D LM_3, .pingpong =3D PINGPONG_2, @@ -155,7 +155,7 @@ static const struct dpu_lm_cfg x1e80100_lm[] =3D { }, { .name =3D "lm_3", .id =3D LM_3, .base =3D 0x47000, .len =3D 0x320, - .features =3D MIXER_SDM845_MASK, + .features =3D MIXER_MSM8998_MASK, .sblk =3D &sdm845_lm_sblk, .lm_pair =3D LM_2, .pingpong =3D PINGPONG_3, @@ -163,14 +163,14 @@ static const struct dpu_lm_cfg x1e80100_lm[] =3D { }, { .name =3D "lm_4", .id =3D LM_4, .base =3D 0x48000, .len =3D 0x320, - .features =3D MIXER_SDM845_MASK, + .features =3D MIXER_MSM8998_MASK, .sblk =3D &sdm845_lm_sblk, .lm_pair =3D LM_5, .pingpong =3D PINGPONG_4, }, { .name =3D "lm_5", .id =3D LM_5, .base =3D 0x49000, .len =3D 0x320, - .features =3D MIXER_SDM845_MASK, + .features =3D MIXER_MSM8998_MASK, .sblk =3D &sdm845_lm_sblk, .lm_pair =3D LM_4, .pingpong =3D PINGPONG_5, diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.c b/drivers/gpu/d= rm/msm/disp/dpu1/dpu_hw_catalog.c index d64ebc729bfb589bf90af89c094181f879d5b1ef..ad0460aa5b5ce5a373dab18c89e= 4159855da4d2b 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.c +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.c @@ -89,12 +89,6 @@ #define MIXER_MSM8998_MASK \ (BIT(DPU_MIXER_SOURCESPLIT)) =20 -#define MIXER_SDM845_MASK \ - (BIT(DPU_MIXER_SOURCESPLIT) | BIT(DPU_DIM_LAYER)) - -#define MIXER_QCM2290_MASK \ - (BIT(DPU_DIM_LAYER)) - #define WB_SDM845_MASK (BIT(DPU_WB_LINE_MODE) | \ BIT(DPU_WB_UBWC) | \ BIT(DPU_WB_YUV_CONFIG) | \ diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.h b/drivers/gpu/d= rm/msm/disp/dpu1/dpu_hw_catalog.h index 5e4608d10c6d4fee387c9a599a73b15661148430..cc17b20a7d4c15b0cd9c5dc8b9a= 4b78d4cb78315 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.h +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.h @@ -84,14 +84,12 @@ enum { * @DPU_MIXER_LAYER Layer mixer layer blend configuration, * @DPU_MIXER_SOURCESPLIT Layer mixer supports source-split configurat= ion * @DPU_MIXER_GC Gamma correction block - * @DPU_DIM_LAYER Layer mixer supports dim layer * @DPU_MIXER_MAX maximum value */ enum { DPU_MIXER_LAYER =3D 0x1, DPU_MIXER_SOURCESPLIT, DPU_MIXER_GC, - DPU_DIM_LAYER, DPU_MIXER_MAX }; =20 --=20 2.39.5 From nobody Sun Dec 14 06:40:54 2025 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 F2FF629ACCD for ; Thu, 22 May 2025 19:04:46 +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=1747940688; cv=none; b=otPhhX0iPuLBprOhtZVxJ+zBBFVdo+8EIzCkkSYCNGplE5ot2JqfhIciwh0+O5TsHFyukHk6qtEYVXGdKUPxxoOsYtrzQ8IsseQ8jLHhH32HHFZEzrF8zKasx3D5nb8ois5sGc90twz8MfIH+BOWu2SzubkXMgFQ/Ny9WOdkFgY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1747940688; c=relaxed/simple; bh=yRKzTtJb2RSb2WdTdbkxypNVMKN4ss/Tveiq43aS11U=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=YF6ixPpEJbQCAg6R9pNu7CpQ2p+jqydQh3PAbmpWMvuP9gmv3Sq+DKCOKPpVLSpvCwYEjh4944i+mAB64sZnLitjffiJdVLFvyHq022JMPFfCtE32viDR25TfvQjZP5S7HNyqu4BEJSye1/LN1PY/1mN5ZgYP7qooDxycSYiv3U= 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=MiKKTW3I; 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="MiKKTW3I" 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 54MG7JD3000730 for ; Thu, 22 May 2025 19:04: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= WnBdNcTCPdx4Bk94ssRTBZtOGliA7Otr1yP2AfXhQ3M=; b=MiKKTW3IFTqRIL6u hxIkzNporil8J179hq9Ci/2agjEk/nAtvE4a7qjk70V6/tl5EOsakeEVaAlan/39 4SGZ2A/SE/JTPmGdnl36JsRPJAwqj+IWv8NnrLuwhuB7Yl3NcCwiBd7PcK941I0H 1zjdIaCP8b1Y8VryPCP/pkbaSUkkukCfr2CH4lxGZklGzhX7+ygT7mIr5TLG835l 8F52H6qPcuqozw2yWKJOam+r7iS4/5lJfND1y8pGOmNsD55e6tG8vJ2bfPiyhAv/ 2YrpdWvnvcNy8u/Ic5kjewQZ3UpYoGvb8XgtYH1opQH07wPdyyaPG/N+0jYmodiL elRsHQ== Received: from mail-il1-f197.google.com (mail-il1-f197.google.com [209.85.166.197]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 46s95tntk8-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Thu, 22 May 2025 19:04:45 +0000 (GMT) Received: by mail-il1-f197.google.com with SMTP id e9e14a558f8ab-3dc8ab0ac67so26122265ab.2 for ; Thu, 22 May 2025 12:04:45 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1747940684; x=1748545484; 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=WnBdNcTCPdx4Bk94ssRTBZtOGliA7Otr1yP2AfXhQ3M=; b=X1J6aGHh1KYlyxO8bFXfCgaypn6AvnE+PH4/aKdB2oXIbfo1ZeqPwPWkaHxMdgE5Co ECQp5Aujgch0NOZ9alFRdbqZgla8luHzu6wYwHCuJD06UIKhdTRgtNSmv+i0JcIY6KzC 4RLNcBHL4g6acvL4DD+rRhiT0Z//3WCqgLNRgWYB0FLAoEDqaAEF622GjEMrs9UOfcwN 0fdOaPcxFA9rOqRqrwJSqmbX/i5Mdkdfult+EUFXbTafV001Zl2FMHDqNnammD9FnqM4 ojHMbkyCSdmjHuF+NvGinSbUE/mLl573nLxZbVGMjLtkwLyklxEpwp5e4mdtEGRY7pmx VhNg== X-Forwarded-Encrypted: i=1; AJvYcCUrigIcN66scG6FHlM7GL/fS7hZLLOaCdnWDPHCL8AjSTu1fRrbH4KdncH4dHKjo07yRCAu3QLSwiG/82c=@vger.kernel.org X-Gm-Message-State: AOJu0YzmWBWTQVp5WQz8Z0ZIYhPWGqzOWWorrzlHLUB8oA8e8Saf+sbS PuKJ1NPTiQozY39cir2E02eJu6gHPfSpcuTF0NH7nfFLxWD/J2Ju21RQXKi1MFFVuVkIbGDnlTV bWfn/4cA8Jcfx4mBOAAzfSEH7ARY8h1TW6NUhQsgeGt4is21blVQF8GjxkzuR01geHmE= X-Gm-Gg: ASbGncsY1n1at4D1SXP/dE1jQLqrgxFR3Ik3M6totc0YkyAwWICx9gudZLHZghe/EW2 b+u+B7qrKroOULES9nYEpgmJT1Rc8n6hARSR7WfYCl+1jj5cgE0kfgj17oZu7+fZ6Sml5iQ4cu0 7WjzBogynlc9yQ0RexMtMmdgV6K0j/VEJXSkRA6MmtMvlIbbiaAzuigLEVl3xh6kgfIEfDDI3w/ ZReqNt5F0LDg072h1WBSVH5nk0+EMMUAKWHs/JefG0CXYu3zNdaTECyVJYM/gohcNANmzxuAYsE 3c092raTXOLdYjy/1FurntDYmoDfmKEvnXhkNxeKn1hBY8l/K2J3pDpKcmxuycj/ZiZwyBFOFPX /hB3uAHMy64BbTMfloZQFDLUI X-Received: by 2002:a05:6e02:3784:b0:3d9:6485:39f0 with SMTP id e9e14a558f8ab-3db842bd205mr268753875ab.9.1747940683627; Thu, 22 May 2025 12:04:43 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHkNOBCsTM2V3lYc6A6i/1k4yUpA0T1WeMwzSyHqDgUuYOJz2Wup2wkpYx2f48lx4VW2T8jJw== X-Received: by 2002:a05:6e02:3784:b0:3d9:6485:39f0 with SMTP id e9e14a558f8ab-3db842bd205mr268753075ab.9.1747940682882; Thu, 22 May 2025 12:04: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 2adb3069b0e04-550e703c2f3sm3482506e87.214.2025.05.22.12.04.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 22 May 2025 12:04:40 -0700 (PDT) From: Dmitry Baryshkov Date: Thu, 22 May 2025 22:03:42 +0300 Subject: [PATCH v5 23/30] 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: <20250522-dpu-drop-features-v5-23-3b2085a07884@oss.qualcomm.com> References: <20250522-dpu-drop-features-v5-0-3b2085a07884@oss.qualcomm.com> In-Reply-To: <20250522-dpu-drop-features-v5-0-3b2085a07884@oss.qualcomm.com> To: Rob Clark , Abhinav Kumar , Sean Paul , Marijn Suijten , David Airlie , Simona Vetter , Vinod Koul , Konrad Dybcio Cc: Neil Armstrong , linux-arm-msm@vger.kernel.org, dri-devel@lists.freedesktop.org, freedreno@lists.freedesktop.org, linux-kernel@vger.kernel.org, Dmitry Baryshkov X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=14207; i=dmitry.baryshkov@oss.qualcomm.com; h=from:subject:message-id; bh=2pUPR12iDS3m0TMaHz0bJCFdiC/MPlCtiYT3r9GpT0U=; b=owEBbQGS/pANAwAKAYs8ij4CKSjVAcsmYgBoL3T/ByDcPnvvkbWYuVeCr4Q+6KVkRxsuw9dlf zVjdKvxzoCJATMEAAEKAB0WIQRMcISVXLJjVvC4lX+LPIo+Aiko1QUCaC90/wAKCRCLPIo+Aiko 1YESCACz4/17gptjaKpu036M7oW2RAmH+Wk3mLkJLjXRjMrmzSGqavyVje0l607Nr78nTdCpbLn UF95zwpueD5oH9x14YqGxnxrwlwmEPb3AGzBsHrSdatGjvevzyfQIHKfnUuKfDegAzbgU5MPhtt v8nj8uCYOzgA/Ly4SmUuRyeHvNZO1yG23878bIyw7xbZjRE6gJDlyxg4HWW5sOhLfXFUg8Buer7 v7Y3zv8/1JYbkGGTpsyHKaUqZx9QXstxvADApA63apAZPskKjnrLNmkvlcnSbv9ryQP2qJb+CSk RmdE8POB7A3ivl5kzD5xCaLzo5HiK9/BtXXnqYpidDfi/IXZ X-Developer-Key: i=dmitry.baryshkov@oss.qualcomm.com; a=openpgp; fpr=8F88381DD5C873E4AE487DA5199BF1243632046A X-Authority-Analysis: v=2.4 cv=QKBoRhLL c=1 sm=1 tr=0 ts=682f754d cx=c_pps a=5fI0PjkolUL5rJELGcJ+0g==:117 a=xqWC_Br6kY4A:10 a=IkcTkHD0fZMA:10 a=dt9VzEwgFbYA:10 a=KKAkSRfTAAAA:8 a=EUspDBNiAAAA:8 a=NuLJBD-5AyVUfQYi_k8A:9 a=QEXdDO2ut3YA:10 a=HaQ4K6lYObfyUnnIi04v:22 a=cvBusfyB2V15izCimMoJ:22 X-Proofpoint-ORIG-GUID: HQNi6SuEUJOsJfmrI-QXWWuC-QPQ4TKc X-Proofpoint-GUID: HQNi6SuEUJOsJfmrI-QXWWuC-QPQ4TKc X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUwNTIyMDE5MSBTYWx0ZWRfX212mUqZp1wgI uHb96n+VGhjx9VfG24F3QtD4jSrt5itYmT+r5m4HjI3gyN04z7fiFzp0xUXGFJtwUgs5EUEEtfn KFWwwAe49PkyoKVyz1VLlvSz8t6K4MscCt7XqpCLzqcn1jC/rMvtjV8AeYUm0Fe/+jgbj6EkzdS eoZnHv8qV7pPuDAxbJv5WEqmMGZz4+S7ssnOr7n3ALLuSJVr1Wsb7FtMXtYjw5uLyX98miWGcSj xVrJqMgyr1tS0VDG1erh1e095Pocvqps1BUbu3nlJck6Iyrr8OoYEYXdlDXp5Q6vjKQ/J2te2lK hLNpmEavlNNttxDF6UR4OiNfQS6Ly+zQkzx/XJpTYohOvO/5KH5w8s87XhrZMZuGOMBBvzzvmOp D/gzJ4kPNkj82FN2CFBculuTwRztMRpxYA8E/DUn32IVNqf3NfBBU5ZBLHCZR8tPilMJMHk6 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1099,Hydra:6.0.736,FMLib:17.12.80.40 definitions=2025-05-22_09,2025-05-22_01,2025-03-28_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 mlxscore=0 spamscore=0 clxscore=1015 phishscore=0 lowpriorityscore=0 adultscore=0 mlxlogscore=999 suspectscore=0 bulkscore=0 impostorscore=0 priorityscore=1501 malwarescore=0 classifier=spam authscore=0 authtc=n/a authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.19.0-2505160000 definitions=main-2505220191 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 Reviewed-by: Neil Armstrong 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_1_sar2130p.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 +- 12 files changed, 21 insertions(+), 43 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 9a8f6043370997cb12414c4132eb68cc73f7030a..013314b2e716a6d939393b77b0e= dc87170dba27b 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 @@ -286,32 +286,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 e81a2a02e0a6379382058fd89500cf2064a2193f..b4d41e2644349bdbdbdacbe1e9b= 3748f90df4f3b 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 @@ -263,22 +263,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 b0e94ccf7f83e9c3c41f1df363cb6a8c24f1503d..5d88f0261d8320a78f8d64c9bb6= 8b938f83160a0 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 2cf30234e45da8a7776d61c49c26abd75d070941..303d33dc7783ac91a496fa0a198= 60564ad0b6d5d 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 @@ -262,32 +262,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 dcef56683224b5715c2608b5472d2d5a0da62010..3c0728a4b37ea6af25ab64315cf= e63ba6f8d2774 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 @@ -276,22 +276,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 5f5987d5fc602df29c5eb289823de5dd359df014..b8a1646395916fde04b9750cf54= 8edca5729d9c2 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 @@ -275,32 +275,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 6f310216fbccb985308f617db20c1878e622340a..ef22a9adf43ddc9d15be5f1359e= a5f6690e9f27c 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 @@ -272,22 +272,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_1_sar2130p.h b/dri= vers/gpu/drm/msm/disp/dpu1/catalog/dpu_9_1_sar2130p.h index ba8a2c5dc5e2b3474b295c86afbbbe8f8d416ccd..2e7d4403835353927bc85a5acd3= e6c5967cac455 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_9_1_sar2130p.h +++ b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_9_1_sar2130p.h @@ -272,22 +272,20 @@ static const struct dpu_dsc_cfg sar2130p_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 77986a7bd62c1b6323482426e596e5974ba40865..ac95d46b3ecf2d95ec0d516a795= 67fe9c204b5f6 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 @@ -272,22 +272,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 cc17b20a7d4c15b0cd9c5dc8b9a4b78d4cb78315..01430ff90ab0988bdaa91b85458= dd649aab543b3 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.h +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.h @@ -176,13 +176,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 80ffd46cbfe69fc90afcdc1a144fc5de7bb6af42..d478a7bce7568ab000d73467bca= d91e29f049abc 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 7bcb1e057b143a5512aafbd640199c8f3b436527..c2a659512cb747e1dd5ed9e2853= 4286ff8d67f4f 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_rm.c +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_rm.c @@ -168,7 +168,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 Dec 14 06:40:54 2025 Received: from mx0a-0031df01.pphosted.com (mx0a-0031df01.pphosted.com [205.220.168.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id A15BA29ACD5 for ; Thu, 22 May 2025 19:04:48 +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=1747940690; cv=none; b=lh2vy/0MmWkH7Q6VhnINZHDRbWP1dKqH94xlXOh4uuM3eC/PRyb/U4cai0MufS8hWLu5UDAnCgaBK1FqITZe3F8Vf6LAgiw6t8U2ybA41pyTewe/MZysHapxx8x7GuKP3L7YDflusMjUhBL3yAQUCR2EyoI2aBEl8DAaRO1DzT0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1747940690; c=relaxed/simple; bh=qx/3iDx8aDBw5InHILUUHiX+VU9a2n8/qKew1Bth8fo=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=nzTVy7gpVHPthR/Ijq5yxHoTY2HDNOiNloWPpsFYXnb1AN8NXG92TMaFH+GH3ESlHfcLfNsCFp1Z4QVAzQsilOHcv/nY48z/a5+IcIfEVhGGLOe330yUUFZgiAtVNGEAExlWE3s3r/dfnc7V4BvuooFJnT8931w8aMfq2LsFoE0= 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=mpMwAvY8; 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="mpMwAvY8" 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 54MGGvH3006639 for ; Thu, 22 May 2025 19:04:47 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= /Cp8/lz9YYtxNtZJAqucfpXh+wcoh0tWxSqCU4G/8fo=; b=mpMwAvY8Kbtk9Siy 36gcy4h7XdYCkuK8qAUJnXVa2/IUrMO35cAoGacEebLntwL9Z6BF5JGyi+6Gmtvj gh2XwZjygVKDokL7/Iv4KOMlvMxZVn4d2UMavyPzotUuUjG98ejtgDjO5ig3iBXk 9zGPPx22jppwsjcbKoVmfRNAvunADZ6FLvLxTHPkt6AMVhbfpmMISL1ojmo6G8+8 Zn0kPlqlsF62EyGd9Tf2IGdY1IJnQel6ECVFu8cGuoTUmLIkveEI4hBxZkCLdn5J dn1bxqMlzzknLajU5I/BybAlrWTtBAg0q0C1tcMFBhrMY2JipBfKWbkfDo/wNkKA qvOj7A== 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 46rwf0qkuw-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Thu, 22 May 2025 19:04:46 +0000 (GMT) Received: by mail-qk1-f200.google.com with SMTP id af79cd13be357-7c5b9333642so1020486085a.3 for ; Thu, 22 May 2025 12:04:46 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1747940685; x=1748545485; 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=/Cp8/lz9YYtxNtZJAqucfpXh+wcoh0tWxSqCU4G/8fo=; b=imRy33t9q00Yck90LZnVXCN9lKT9GZajWj8uqFWAUa392vvExcM6YWRh0dmqbn5veF ng78vIDx8lYI4s1SpWfNwk6BoqpXaCUUAVY+dJEGy13e4iV+3PJ0y/OuQTHELPKIlyBD cZpZbqIS5DHB61sJpWI/VlzTuhbUDh8zobsLpfbUPxDK8/FZV+c8iI8byGOvsMGPxQQl wViZa0w4RHx6agy4u2WYR+HpqWwKXCz9qUQ2gdcJ0wi0fbIqK8rtR5DSlku2q6q+zAkd rZwRI603bkRUHIomqAgayrsueH/csJsCJ+ps6Obib3DwroktpImSvXyoWUmffCoux5t8 oTAg== X-Forwarded-Encrypted: i=1; AJvYcCU1KSDi/95K8ayv+fxhH7hhgsK4qqRUJ0yiYIn19X06fdELIhg3D3nvhXswe6BpHsJltlMdUPiHuz764iY=@vger.kernel.org X-Gm-Message-State: AOJu0Yzc2f0ORjdIDl0rO1wihxaXC6YKg91YlE8pmAKlZ8WsWHfGf3tI yeabA4/ywG1dkb1S60wTm8SGev3fJGI3RRbpX5IvUPL9FGDoaDXbENjcrak+sm9kfz1b/6e4hEv mPBYBvQ8e9185mtFGUNon4Lw54E0nmeHl4EuX1jitWBCUrfAxfWUaV6pthdwaAzgyrC4= X-Gm-Gg: ASbGnctSCGq+1ajycvpsOB4pHRCRe74kOHlJux2Q21MykAuOVu5rNsZfr+ORHrvSOar NmNfKPwz/EoKHAxHC7JQN9Dx9IooUPG+cejeLaPTByjM5rPDwnEGepMIQ5m+NBeE/1dJuiXC+Kb 05WqBnKC3l23zPYvxP3S0Yrek8iVsRhhqOd5/TT4tNCGgRQsnfyZ8VarvXZY12ktTac7cMawz8i 9VkgvE7C94oavorke8Bils6q7YWl6gWnNJBWMyp48vlwM2vtORWwZ83qeloqQLD+cc9vs/pDw03 7P8+cyR89IgqZk1Xf8ztCRCgT52HCI3kye2BfYemyEPM4l0b5ohwHA16ElBmhzfFPknrUjascqp xUM4bRZBvJKOSN6rDK9lyp7GX X-Received: by 2002:a05:620a:414c:b0:7ce:b4d4:395a with SMTP id af79cd13be357-7cee31e6baemr10233985a.18.1747940684842; Thu, 22 May 2025 12:04:44 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHiVdkCzYsxrVdumQrpvbGRjuzFrEGFDwfTitkYuUDK8W2nhJnkHgOjevAfE7fTTd+TfV8tsw== X-Received: by 2002:a05:620a:414c:b0:7ce:b4d4:395a with SMTP id af79cd13be357-7cee31e6baemr10230185a.18.1747940684427; Thu, 22 May 2025 12:04: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 2adb3069b0e04-550e703c2f3sm3482506e87.214.2025.05.22.12.04.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 22 May 2025 12:04:43 -0700 (PDT) From: Dmitry Baryshkov Date: Thu, 22 May 2025 22:03:43 +0300 Subject: [PATCH v5 24/30] 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: <20250522-dpu-drop-features-v5-24-3b2085a07884@oss.qualcomm.com> References: <20250522-dpu-drop-features-v5-0-3b2085a07884@oss.qualcomm.com> In-Reply-To: <20250522-dpu-drop-features-v5-0-3b2085a07884@oss.qualcomm.com> To: Rob Clark , Abhinav Kumar , Sean Paul , Marijn Suijten , David Airlie , Simona Vetter , Vinod Koul , Konrad Dybcio Cc: Neil Armstrong , linux-arm-msm@vger.kernel.org, dri-devel@lists.freedesktop.org, freedreno@lists.freedesktop.org, linux-kernel@vger.kernel.org, Dmitry Baryshkov X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=9063; i=dmitry.baryshkov@oss.qualcomm.com; h=from:subject:message-id; bh=i8JmTvononL4yoOyQq3OE4pr9KSmd4HWeSbiGbGi6Lc=; b=owEBbQGS/pANAwAKAYs8ij4CKSjVAcsmYgBoL3T/VN74XJeqizypfRlT4+bopo/Izij231x2D Sx44ZClovSJATMEAAEKAB0WIQRMcISVXLJjVvC4lX+LPIo+Aiko1QUCaC90/wAKCRCLPIo+Aiko 1YzvB/9wOzwod0+pSlghLwWxQCy4piJy5vlwBYaPjgnAQln0CiqMk9kjGN5PzZTqERS9MmPg+Bx sbpDwh1+g1HuLfGPG99Q2WoeFhnWqkXWVMtFCAMW3ivVPteeI+zWGa6ZQ9as10Exv/SEztpsD1v 0+Mq/xpubgGu2k5rIPVb10eUfypXyAc4CL3FAgD8WEy6urMvmIggnEoY+Jf9vJA7S63CdjwbsZH EVDQkbReYRO8WomY7XK2fLQXoG4JGl6//vJeOj3IhO0vrJz+Ik/EH0L8IELlq7rOQ6N+P1wZxJY 2eYsKVY0qOsdufkcBnapiJnvVoMk0wedJTp1G7QP7WH0zSHs X-Developer-Key: i=dmitry.baryshkov@oss.qualcomm.com; a=openpgp; fpr=8F88381DD5C873E4AE487DA5199BF1243632046A X-Proofpoint-GUID: nZ09bmOjbQtEr05aHJ05ZwQubzrWQaFZ X-Authority-Analysis: v=2.4 cv=J/Sq7BnS c=1 sm=1 tr=0 ts=682f754e cx=c_pps a=hnmNkyzTK/kJ09Xio7VxxA==:117 a=xqWC_Br6kY4A:10 a=IkcTkHD0fZMA:10 a=dt9VzEwgFbYA:10 a=KKAkSRfTAAAA:8 a=EUspDBNiAAAA:8 a=Vb8ASh8KX3Dd0k_o0G4A:9 a=QEXdDO2ut3YA:10 a=PEH46H7Ffwr30OY-TuGO:22 a=cvBusfyB2V15izCimMoJ:22 X-Proofpoint-ORIG-GUID: nZ09bmOjbQtEr05aHJ05ZwQubzrWQaFZ X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUwNTIyMDE5MiBTYWx0ZWRfX30RRDmBG+agX LoAHNlR/KlUevxI23VzXzrsrwCCA0sTvP1+wpCAO8zM2BPnQ8N374clDxk6PLaJMDajrRsGfZVe 0VV+d0uCsPciX0xxhG0rSyzSrWG0HB+16GCXETkwTF+pVt3gsyrYx5scf9PtM+qcFLvAwL0MTI4 FYMuW7j+v0KnUpPpOo5I30NxsHcxzrmAbgCXqjiywM3/aPmZIgIzVIugqHZHSgb+HFzrCGxN9k9 5X2eOYov5zFX2X/kl1K49S0vY5qclS58NRUGV/M0MKyoaZ2o3+s7dyPL6hCYjwr53J/DyvMoQO5 aLa5Fs0/fAg6/GTbJkFT4qbn3KGaJtZ16hzMAtHyWEWkk1FHSNoleArtl6o8amclaFF0do4fVNl PxVO84+3jaUNa8inb56B2kvWPGE7MaBYSGDuH87ur6T/5t3YFKIoCuU6KGaYtqye1FjgJ2e8 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1099,Hydra:6.0.736,FMLib:17.12.80.40 definitions=2025-05-22_09,2025-05-22_01,2025-03-28_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 mlxscore=0 clxscore=1015 mlxlogscore=999 suspectscore=0 spamscore=0 priorityscore=1501 bulkscore=0 phishscore=0 impostorscore=0 lowpriorityscore=0 malwarescore=0 adultscore=0 classifier=spam authscore=0 authtc=n/a authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.19.0-2505160000 definitions=main-2505220192 From: Dmitry Baryshkov Continue migration to the MDSS-revision based checks and replace DPU_DSC_OUTPUT_CTRL feature bit with the core_major_ver >=3D 5 check. Signed-off-by: Dmitry Baryshkov Reviewed-by: Neil Armstrong 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 8e37c40620b62aacdcb47c7a04bcfce944ab0b4c..5d3b864d28a86fb86fc4576210c= 9418604afd844 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 @@ -259,19 +259,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 a05d2ef8fc9d217898b8c12d4639563b28b4477b..a6e9dfc583f283d752545b3f700= c3d509e2a2965 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 @@ -259,27 +259,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 cb0b5687b5239418f50c539447f9cfa56e81fcc6..fe9c9301e3d9d2d3a0a34ab9aed= 0f307d08c34ca 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 @@ -193,11 +193,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 17fa0ef9ac03e4649a218cd837b296211ef4506c..9ceff398fd6f554085440f509b6= f8398b4fbf304 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 @@ -258,19 +258,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 06bcaf4d8b0db74c349112af6884f7f3139a7ff8..a46e9e3ff565ba5ef233af76f1c= 6cebb1d0c318a 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 9c4e8450b67760c880d9bd2528c6a954a0282e08..98190ee7ec7aca6835376b03037= 9a5a3d8b0859b 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 01430ff90ab0988bdaa91b85458dd649aab543b3..41906dadff5a8ef39b2e90f3e80= bb699a5cf59b7 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.h +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.h @@ -174,14 +174,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 c2a659512cb747e1dd5ed9e28534286ff8d67f4f..a2219c4f55a45db894ff18c1fd0= a810c1a3cf811 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_rm.c +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_rm.c @@ -171,7 +171,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 Dec 14 06:40:54 2025 Received: from mx0a-0031df01.pphosted.com (mx0a-0031df01.pphosted.com [205.220.168.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 1C1762C2AB7 for ; Thu, 22 May 2025 19:04:49 +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=1747940692; cv=none; b=X+VWy4CxaxDfYlO49ksK4+tXaK5gUt8gOXtD/Mre1SExwUCmBH/fnIYsjDdPXmj9jl1uyYHdka0x0H2uTSdDyczQxcUk9WKe06l/DKPDB2Dk9v6znNAjzr6BFlSzgHn9eqltqFy2e2f7MHGA7ylGgdqMjKiXFEjUixKUQ36+YWw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1747940692; c=relaxed/simple; bh=AvH0+m/lcq7fYeoRmjqLFbsVRzIu9NAfIv+c2dZOgqc=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=U0ZK/7IGytzf0Jb9EfGkrEI9z2usXZNi0BR5rYBuI6G0QLAm8IgmjlC89IlAX0Q3UR2g59UwN+6KqrYYKsawq2uU23gkhnEpJ6G9QiX64ZNpfG/VA4CRTf2gOphaJZQe/yEh8dl724O7jrm3F4CM/HQRcGjeTTpAJFlKZdfeuTI= 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=DmxMKV4w; 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="DmxMKV4w" 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 54MFY0A0020586 for ; Thu, 22 May 2025 19:04: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= MX/zaY86CMaaVpd1fEt3109ml2WBuAQGEdMYy1p3bSw=; b=DmxMKV4w0gJBvYCk 2t8CQ3nnqZv74G+VdBXYC4mvflzEbIDIRKDEXBq7hmhmfK6O0rQ0cZZ0AzOgLmgK MnvcR4oJkFj9k/Jh4nJaam2MpyTswJ7DSSa1aB0qP8tl4JZrbORgOGLQoMGnP7aL tbDcw0NYHHui0tJixuzXpxnCXlAORTaJq3sA/j76spFD9BpPR03b/zbXAn37JsMm 1u+EU9banBSHiYAThiTPCR7WlKi3xCjeOCq9Phdw9fTmWpbX8lXmTQMivi5hRt1w XRugsFbLXqEToilTGTtqSv5BhHAf+TJHXhuDzLklKcqjg+99Fp+yC7IcbGOX1ZBT 6ZC9qg== 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 46s9pb5v5j-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Thu, 22 May 2025 19:04:49 +0000 (GMT) Received: by mail-qk1-f200.google.com with SMTP id af79cd13be357-7c579d37eeeso1250460285a.0 for ; Thu, 22 May 2025 12:04:48 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1747940687; x=1748545487; 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=MX/zaY86CMaaVpd1fEt3109ml2WBuAQGEdMYy1p3bSw=; b=h2VM+aI3vpmh7nht0flL35sudSjtcXXxn3u5gIqbdaqB2TfXriYigKLbHRCmJYdtoI ZBJZGHNe9CF2BKg0Dm15zPG2MvkkxZKZIgxLLXokMrj79+7yt6vOqV+/tYtFJ7MFhsIe dlOnCJfa9u1YwxD+7+0uk3YUHcfX06hkiHNq+I/+Z9r1wvwgtzZ8w/r/ncKO+0J7fZCZ fZlRSjj1ZwUY013CsyJq8/iE8jhnmIpewjUg/LOacKnQ2PZCZBzwTtQQbTsMDHp8aa2+ 69VkvO+i11MA222XJni6kIsTRbT4fbK3OIuCu7bdVWDAkOjKK2uvxzoc5z6JzgFxqh1Q w40A== X-Forwarded-Encrypted: i=1; AJvYcCWrI48/QoQex9Frmj7Dx1HImb6OKQKO6bY4MOG1TQdU9OvE6stCGa/4Flxl//r3mpmGok5Py5tCdO+Juho=@vger.kernel.org X-Gm-Message-State: AOJu0Ywqvjsh1M7EGs1sOK0bij6D/0zCdHH33vqYCfUDohBTI7NztmV+ YBhPKsLRA3awf1LOE8ejeHvtvUgyrxxEa6ARV2IzzWHpCktgvvkX5zGaXAKS/PeLC1UtMliHIme Sa8I4BgXZs1LhT6EwBMBpren9m4y3BBn7gZChqy4ENYgUk4YeSNQtpJS+zBPnmhhoy7hfelc6he o= X-Gm-Gg: ASbGncsp9rZUItI5+EDGYUZZut77Tba48kMc0rIu3N+tRYWAyqXiHpmiUI9Pw3t5jVa 7alk3je9z1dvElVZBVa6BTogx+GpEKipt0W2oeLVMklAmU3OZtatSK0qsVHxIe9kH6cGRLcn4QQ +3TUjzB5Gx4fmOQMQD/XvCP1WqIhcp9S2DeIp5RPjdH8w3Fqy8fv2VI5exr6mi9NRWryDBcme65 xfOq84WXDaZqccyW21zWzgRMOIJ+yRWp2g2/+eDj6R6jTBCoUdiEhtPzznRFmo0O4izWvyr4blc sArd5IKcZo7XY6Lu/fLHZVpe6vQ5XeD0NR7nN5mIktHPZX1P6r47/mkZ0mROblH/zsThHt93cz1 MNw3lweKC6F+sGqkAm4QAPrc7 X-Received: by 2002:a05:620a:448f:b0:7c9:245f:bacd with SMTP id af79cd13be357-7cd47fef380mr3767414585a.58.1747940687405; Thu, 22 May 2025 12:04:47 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHItJtcU0CGElxAydltQU5INvhpDGIhI30oydYlUqmCwY6qeReKNDyInGwbRKTl2U+r2m63NQ== X-Received: by 2002:a05:620a:448f:b0:7c9:245f:bacd with SMTP id af79cd13be357-7cd47fef380mr3767406885a.58.1747940686672; Thu, 22 May 2025 12:04:46 -0700 (PDT) Received: from umbar.lan (2001-14ba-a0c3-3a00-264b-feff-fe8b-be8a.rev.dnainternet.fi. [2001:14ba:a0c3:3a00:264b:feff:fe8b:be8a]) by smtp.gmail.com with ESMTPSA id 2adb3069b0e04-550e703c2f3sm3482506e87.214.2025.05.22.12.04.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 22 May 2025 12:04:44 -0700 (PDT) From: Dmitry Baryshkov Date: Thu, 22 May 2025 22:03:44 +0300 Subject: [PATCH v5 25/30] 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: <20250522-dpu-drop-features-v5-25-3b2085a07884@oss.qualcomm.com> References: <20250522-dpu-drop-features-v5-0-3b2085a07884@oss.qualcomm.com> In-Reply-To: <20250522-dpu-drop-features-v5-0-3b2085a07884@oss.qualcomm.com> To: Rob Clark , Abhinav Kumar , Sean Paul , Marijn Suijten , David Airlie , Simona Vetter , Vinod Koul , Konrad Dybcio Cc: Neil Armstrong , linux-arm-msm@vger.kernel.org, dri-devel@lists.freedesktop.org, freedreno@lists.freedesktop.org, linux-kernel@vger.kernel.org, Dmitry Baryshkov X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=14624; i=dmitry.baryshkov@oss.qualcomm.com; h=from:subject:message-id; bh=AvH0+m/lcq7fYeoRmjqLFbsVRzIu9NAfIv+c2dZOgqc=; b=owEBbQGS/pANAwAKAYs8ij4CKSjVAcsmYgBoL3T/K87DFWOOs9sUYduaoPHtiFnKMQ+vT5y6Q nzAoQn6PrmJATMEAAEKAB0WIQRMcISVXLJjVvC4lX+LPIo+Aiko1QUCaC90/wAKCRCLPIo+Aiko 1fqtB/9KvXoY5LQ7Yhg5vpBdBujHtE1rnj9R9GsShoDpOa+5Jhe/Aohza/6mjFZxoRQ0IdDxhBe MqpMZimhdwtY9fEsGCyhj24gv1gAMzU8f3CAiFK6+5sXDKFSjOLwKNI/Z9kMEUd2ca3AgMFM3e2 hk8TDeqWQCSeX5KE0QIWhuaFgS93Syys+fVsxQx33xf31CfA1BAlNVrGwp3NjydFvEd29cDLwRb qaiNZBCtw1Ev3g/K/+niHrF4Bgdgbv3sJgVrP9lMK/3Gw5By9/7UTkOR/OmAiH2NyLtP06YT/3Y +5kkmxTdBCFwVclyAKCkGLzpTh3DKfBac4UmTNrmxVms0gpU X-Developer-Key: i=dmitry.baryshkov@oss.qualcomm.com; a=openpgp; fpr=8F88381DD5C873E4AE487DA5199BF1243632046A X-Authority-Analysis: v=2.4 cv=WJl/XmsR c=1 sm=1 tr=0 ts=682f7551 cx=c_pps a=hnmNkyzTK/kJ09Xio7VxxA==:117 a=xqWC_Br6kY4A:10 a=IkcTkHD0fZMA:10 a=dt9VzEwgFbYA:10 a=KKAkSRfTAAAA:8 a=EUspDBNiAAAA:8 a=qMlBm1ryi7ijQuv_G2cA:9 a=QEXdDO2ut3YA:10 a=PEH46H7Ffwr30OY-TuGO:22 a=cvBusfyB2V15izCimMoJ:22 X-Proofpoint-ORIG-GUID: n4aBrwxbelIHVjvbRKyVlYLln7rmhSJI X-Proofpoint-GUID: n4aBrwxbelIHVjvbRKyVlYLln7rmhSJI X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUwNTIyMDE5MiBTYWx0ZWRfXw9psA994F1Nj QP9VMsaPcWn3zUNG3PQHuMmiL/HvCjRV8lVt0t37K6qOcKqNGL7YUfWz/5xdV/R3eNH6Z1nsaNy ApTYy2q2muD+7q+NmxZIy9dKvlv+PAmDhAFRZ/G9lJNR3XZRJG7Muxn7ieDDCHjlodyuawFXvEw pDKZG9cRK/tPw1SM5f+0qqStY0H3nX5PumUkkwZd/RkOLkJXpHzo9a40QVszJGqaXikKnmoJlI5 BybkF1kFNFuAE7g00Di+IqsZ3wEVVgaVhF0eJEPds+6MkdXtUUQcBINM/6dC/LwsKDgbtOnRRyU yE8YTS5MSrG/jH8DsioWAcNn0UN2UmSvtuieGbw0rsQi4HuqP04ocWoqulGRFFGLX4Upt5GtkRW kaANDIVZaGFRE3eHH3tWMuAoe5jyo4SlQxq7IuH7vEFL5SyXaOHDTeaOIa4RDVCWGdjdBjs/ X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1099,Hydra:6.0.736,FMLib:17.12.80.40 definitions=2025-05-22_09,2025-05-22_01,2025-03-28_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 spamscore=0 lowpriorityscore=0 clxscore=1015 suspectscore=0 bulkscore=0 malwarescore=0 impostorscore=0 mlxscore=0 adultscore=0 phishscore=0 mlxlogscore=999 priorityscore=1501 classifier=spam authscore=0 authtc=n/a authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.19.0-2505160000 definitions=main-2505220192 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 Reviewed-by: Neil Armstrong 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_1_sar2130p.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 +- 19 files changed, 17 insertions(+), 23 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 013314b2e716a6d939393b77b0edc87170dba27b..56d3c38c87781edb438b277c773= 82848b679198f 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 @@ -318,7 +318,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 5d3b864d28a86fb86fc4576210c9418604afd844..ae1b2ed96e9f10a6e7a710fc8bb= 4e40dec665cf9 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 @@ -275,7 +275,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 a6e9dfc583f283d752545b3f700c3d509e2a2965..fc80406759cd52f0d633927c8ba= 876feaff48e07 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 @@ -281,7 +281,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 fe9c9301e3d9d2d3a0a34ab9aed0f307d08c34ca..a56c288ac10cd3dfe8d49a6e476= b9fff062f8003 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 @@ -241,7 +241,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 5c2c8c5f812347970c534769d72f9699e6e7049a..2950245e7b3f5e38f3f501a7314= bb97c66d05982 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 9ceff398fd6f554085440f509b6f8398b4fbf304..7b8b7a1c2d767eafca7e7440098= bb28e2e108902 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 @@ -312,7 +312,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 f6a0f1a39dcc3c9e82c07889d71905434274cdf9..c990ba3b5db02d65934179d5ad4= 2bd740f6944b2 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 a46e9e3ff565ba5ef233af76f1c6cebb1d0c318a..093d16bdc450af348da1775ff01= 7d982236b11b0 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 b4d41e2644349bdbdbdacbe1e9b3748f90df4f3b..85aae40c210f3aa1b29bf0b5ea8= 1ee1f551a6ef6 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 @@ -285,7 +285,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 5d88f0261d8320a78f8d64c9bb68b938f83160a0..8f978b9c345202d3ea1a7781e4e= f2763b46c6f6e 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 3c0728a4b37ea6af25ab64315cfe63ba6f8d2774..b09a6af4c474aa9301c0ef6bc0c= e71ba42cce3a2 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 @@ -298,7 +298,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 b8a1646395916fde04b9750cf548edca5729d9c2..0f7b4a224e4c971f482c3778c92= e8c170b44223f 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 @@ -305,7 +305,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 ef22a9adf43ddc9d15be5f1359ea5f6690e9f27c..465b6460f8754df18bbcf4baac2= f8a3ebdea3324 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 @@ -294,7 +294,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_1_sar2130p.h b/dri= vers/gpu/drm/msm/disp/dpu1/catalog/dpu_9_1_sar2130p.h index 2e7d4403835353927bc85a5acd3e6c5967cac455..6caa7d40f368802793c8690544c= 1c82b49a617cd 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_9_1_sar2130p.h +++ b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_9_1_sar2130p.h @@ -294,7 +294,7 @@ static const struct dpu_wb_cfg sar2130p_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 ac95d46b3ecf2d95ec0d516a79567fe9c204b5f6..7243eebb85f36f2a8ae848f2c95= d21b0bc3bebef 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 @@ -294,7 +294,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 ad0460aa5b5ce5a373dab18c89e4159855da4d2b..6d7be74bafe326a1998a69ed9b3= 495c5acf6350f 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.c +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.c @@ -98,9 +98,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 41906dadff5a8ef39b2e90f3e80bb699a5cf59b7..8c394e7d6496ca2d120c81c7776= b4b979368be23 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.h +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.h @@ -140,8 +140,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 */ @@ -155,7 +153,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 Dec 14 06:40:54 2025 Received: from mx0a-0031df01.pphosted.com (mx0a-0031df01.pphosted.com [205.220.168.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 96BC028C86B for ; Thu, 22 May 2025 19:04:52 +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=1747940694; cv=none; b=Ezp9+yJ09+DIQoULf1jArDCfG5wd77xQLlF5UfJOzKnQT3TBq2qbsPm4a5wWjDjEtTvcKHLdQGqQlaIjyYYU5SAcABR8aO3MXqIdLBv04F8chdhTzlynWSeXe0FhvvoqMzSkm99keMmSRnhnXWjKfE+CFlQC/E1rXEHPxTorCzw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1747940694; c=relaxed/simple; bh=O9ji8OBh4vlhTZ6pq5b+6U/pO0rDo3oBnZXFBMBlu5I=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=S6hshd7yVyS9REBwpbrAb414DCeHvsfiCOCl8Ox+F4qoITFwi35kb2BURCJYbUuHP3fXjvk8bHDa1mb62yDl6ld5CbHL07VXrGgWifiyBgNPKyVUdVsQPKCdUIvZXralFjQ6LU/qUSZl3fWLoRY0xqraW8rq4v18ATIRJy2UihI= 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=QyEoVaIh; 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="QyEoVaIh" 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 54MFvHlf021413 for ; Thu, 22 May 2025 19:04: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= nE5tprrwe42jTVhGYtQxPcrcgIHbX+PMNuGmqg0B1qY=; b=QyEoVaIhuvRvU3j/ Itei7IHdJGkKg3Scy62+ehhTh17RIMBgCvO4oTbG0eFOXjDuhj6JoyY99/OmCykX +Y8i81hInD86xFTea0DmLDpszMQWYOWqSPR5IGKAfochP2BF1mLoaDEFBhKEVQID hq7Nm0N1eTysKGM/B2ShrjwPPmawoPh/pdkTz03PTfvB3/FFRw9VE+oaWhwPKZ5Z YOCYkS+id/5v2MiNXyl3npSgRsD8nIcVtZPhTfKdxVz62VunqL5Jjr6YqPYw4uyD 2BYfCOkSVqLVdgNnTTxkC3GWneqTngdiVQ9Oul0FNSz6RtEiDpm3/Z34EB8psd4z viI0hQ== 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 46rwf07nyv-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Thu, 22 May 2025 19:04:49 +0000 (GMT) Received: by mail-qk1-f200.google.com with SMTP id af79cd13be357-7caee990715so2260256685a.3 for ; Thu, 22 May 2025 12:04:49 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1747940688; x=1748545488; 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=nE5tprrwe42jTVhGYtQxPcrcgIHbX+PMNuGmqg0B1qY=; b=siUjewF0FlbHGX7xPaJN1bX1RLFKbcYVMNtcepPLIlODbn0mwcMAUM+b3iQTY2RsNL 0zoO0kkpwaWbbh3p0DUS4D9BCyDl5PQUAnTUbEvLipOTbswxQqcRnshdvC3IP6JEk59e MEWQw7ZQMEygrXk/BMgSbcq1OGQti1uqUOMQvoeJDn57gpbkztOv7zl+4s0HDIliMqLQ pdsLgiaT+jlgBr0V1uaPt1Pvvce9eT4wQdMzytv3VfIADEyoLY9Mreb9yzFhAm3Ofidv 7jyI6UNdhGeZuedKbsKnArzU7K1JkSufp5VYCxwCwO/K8hxq1arvhQ6MeHEF5+OdTL1O 2l6w== X-Forwarded-Encrypted: i=1; AJvYcCVZCO3XQSK2txjVTjc5euYRt5CNX63onE/upD27/rxC1XiBF9UhrzgyYsxcNOj2zI3odbE+iTlrV6IdwVM=@vger.kernel.org X-Gm-Message-State: AOJu0YxikKk1jEJl7FFgnxhEj5cxnMAa67Cpa56p61iny8xLQt0nUvPw mVfp362gAkjPKlFQ10vm1WlNrTpX2ojC06fQcs7BzeJfn6I/86YBCMY+qS3WBWuvYLOK12jo4Ul 6G+8n5jEc+JKVxeuoRzoeuxxUArnvc9g4zl7d3IAeS79k9K/GQnHeBoN/YG3Cnm+kAF0= X-Gm-Gg: ASbGncujlg/Pd/Jv6hdu3RDWWPhJkPgAJqlCpH9xPVcj9hcnV51C2sf/OZ6fnAYCCA+ JaL6AnIX1cYHphhhCNjfWS3SaULdW8fyXj9dTiqjEi3KojnIHFLh2AvJQK5WOgp/0c9nIMkd/bq Ufp1Eq3WCcMmA1mPyJAgFYkUTs/kyhd0c3pKtCJbpVhWh7o7hC9XrG6K8HaqDecTDaSW0CbmH40 nZc7fptZu4bcwvQbimL40Tc5ZHaaYc0soKk4SWu6H9B55QgYkbBquCM8UTbmpgcsDTlReTba6C3 G56OeL/0TNV/v+S9u2tPuLWktFzC0n49K5Rj3ersP9ClLCD1uNnh/AXf/shDPuu5QsB2ovqDi5u K2+AKtQsMo9OpkD5uHE2wajOC X-Received: by 2002:a05:620a:1921:b0:7c5:588a:5c1e with SMTP id af79cd13be357-7cee31bb78amr10258185a.30.1747940688508; Thu, 22 May 2025 12:04:48 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHkQf4iYOb+R7gZkuxnEEAFbAY9pkxcEXxvh6KgjMPAunK1Wl091Ux8xgk6avNXsw0IdSEwhw== X-Received: by 2002:a05:620a:1921:b0:7c5:588a:5c1e with SMTP id af79cd13be357-7cee31bb78amr10255385a.30.1747940688112; Thu, 22 May 2025 12:04: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 2adb3069b0e04-550e703c2f3sm3482506e87.214.2025.05.22.12.04.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 22 May 2025 12:04:47 -0700 (PDT) From: Dmitry Baryshkov Date: Thu, 22 May 2025 22:03:45 +0300 Subject: [PATCH v5 26/30] 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: <20250522-dpu-drop-features-v5-26-3b2085a07884@oss.qualcomm.com> References: <20250522-dpu-drop-features-v5-0-3b2085a07884@oss.qualcomm.com> In-Reply-To: <20250522-dpu-drop-features-v5-0-3b2085a07884@oss.qualcomm.com> To: Rob Clark , Abhinav Kumar , Sean Paul , Marijn Suijten , David Airlie , Simona Vetter , Vinod Koul , Konrad Dybcio Cc: Neil Armstrong , linux-arm-msm@vger.kernel.org, dri-devel@lists.freedesktop.org, freedreno@lists.freedesktop.org, linux-kernel@vger.kernel.org, Dmitry Baryshkov X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=4092; i=dmitry.baryshkov@oss.qualcomm.com; h=from:subject:message-id; bh=7M/iNn8Ew4gxIUAAXQyq3p4514IfgJwZSifVWuJ64Es=; b=owEBbQGS/pANAwAKAYs8ij4CKSjVAcsmYgBoL3T/ltEETAjjBBBfUagRxTpTHI0tUcNcahXfZ MqaHz2NJgaJATMEAAEKAB0WIQRMcISVXLJjVvC4lX+LPIo+Aiko1QUCaC90/wAKCRCLPIo+Aiko 1TZgB/9iGw+xNjh+CkkKPHpQuXxKnjnNTGVmcvXJoW5SnupSoYZuyMKdnY2UwfQnu+LcX2hRLMh O0f5woQIGva/LbgbGJHOr4hTw1NX/t9QZwgKJ641Pvtas99rJJXjp0GuQEmIHKhiA3b2SiGrwHx ib150tZBk8rSS//Dt767F6RLDBwJrvzQDpa4/7urHXIew1asEKMThkaxGQLfmsMskHEDQjC85BU SrZ4kX61Cn+FJP1G7BAZowppSLTqrRDfqTnuthLBy0hSmW6ZjgdAWFicYmuIHe35LFC7so8Teut ZW74cv6xlxMMQbyAKec64kZkotTDWgcTzXRSa1WYIe3WbUP8 X-Developer-Key: i=dmitry.baryshkov@oss.qualcomm.com; a=openpgp; fpr=8F88381DD5C873E4AE487DA5199BF1243632046A X-Proofpoint-GUID: FaU4ZBJqTJAmfJRXG0D4zm0UmBcHpAGa X-Proofpoint-ORIG-GUID: FaU4ZBJqTJAmfJRXG0D4zm0UmBcHpAGa X-Authority-Analysis: v=2.4 cv=ZP3XmW7b c=1 sm=1 tr=0 ts=682f7551 cx=c_pps a=hnmNkyzTK/kJ09Xio7VxxA==:117 a=xqWC_Br6kY4A:10 a=IkcTkHD0fZMA:10 a=dt9VzEwgFbYA:10 a=KKAkSRfTAAAA:8 a=EUspDBNiAAAA:8 a=J_vUdAVH12ZdhNMp4K8A:9 a=QEXdDO2ut3YA:10 a=PEH46H7Ffwr30OY-TuGO:22 a=cvBusfyB2V15izCimMoJ:22 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUwNTIyMDE5MiBTYWx0ZWRfX3ByCHS46LyJ1 JyPjMkrngc/84g1XxVdHUIgwlTgXXbJKv/cT4K+S/bJKVCVU8VAXSGiZbr6KHZvWaBefsETpv4W 9v14d1lPeBIejATbj4t3zYJpIJEoFZxhZItyPyZm5nnKXiuPtGrPTxlj0jByLgx84JlqHbcELwL FzgBHwQUu+VS7hP43hTRntCpLuOYukvQWVuazIf8KseLTEYa+tIz7CPO3Ej+oFzOnC5cv/dGmvG SCvSMN6e8mNZdJLoS2BFOOfBmWgYvUMpFr/ABhJohyXolRvWS/EjTYVLikC7JLtdCrb7JGGD/Jo epAsnwCHJvVhYs/KE0+QsdawMyVJpBb0WLliykzJ31nLpW/8IChEyo115duq0PjV+oxmkEclr2/ 0uI9EX3GLtKY5r6YGOEP4A3pHUHjvDpA0P4vfgnPo21kybxyqSBjrKUhNQHZ6Rk01ny7fgJ0 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1099,Hydra:6.0.736,FMLib:17.12.80.40 definitions=2025-05-22_09,2025-05-22_01,2025-03-28_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 priorityscore=1501 adultscore=0 mlxlogscore=999 suspectscore=0 bulkscore=0 impostorscore=0 phishscore=0 spamscore=0 mlxscore=0 lowpriorityscore=0 clxscore=1015 malwarescore=0 classifier=spam authscore=0 authtc=n/a authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.19.0-2505160000 definitions=main-2505220192 From: Dmitry Baryshkov Continue migration to the MDSS-revision based checks and replace DPU_SSPP_QOS_8LVL feature bit with the core_major_ver >=3D 4 check. Signed-off-by: Dmitry Baryshkov Reviewed-by: Neil Armstrong Signed-off-by: Dmitry Baryshkov --- drivers/gpu/drm/msm/disp/dpu1/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 6d7be74bafe326a1998a69ed9b3495c5acf6350f..a276a1beaf95d183f6119452e55= 16fa8ee60cef6 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_NO_SDMA \ - (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_NO_SDMA | 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_NO_SDMA \ - (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 8c394e7d6496ca2d120c81c7776b4b979368be23..c582ef1ffe022f2e92b1b80cbab= 97ff41a2acfe9 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 Dec 14 06:40:54 2025 Received: from mx0a-0031df01.pphosted.com (mx0a-0031df01.pphosted.com [205.220.168.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 3AA1228C875 for ; Thu, 22 May 2025 19:04:53 +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=1747940694; cv=none; b=lnL85dW07YVwkA9T691eSgj+8pzfvzBRCW0PVDry+qMlgAYZxE+gLthm5NqG0HA5fgOMFmLDNtm40uGH9K4vOCMn0ztZHniJ2isldPQjyd9yDYFIlSNelQkP2Cuyibqa2toCbnu6FxBo8fy4qNL1OMiOabKb2LxgSTYOgQMbNHs= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1747940694; c=relaxed/simple; bh=mG5V+769NARywzQDqSO98sMatrgNsrI0dLaZUKofTIc=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=EaLGGGvtOliPf806XrKSQ7fWlqE9VPwea2jYhHZL9NW0TF1AYkzLAFa7Mrutt7mvIQEn24PQuel5IQtmX9NgLJCKvdtj4hpvVyzYMbS76sPHDrQRIepTA7CLsq1K5zwaNZDUsFhCed/MQ0AnVllubZzSW11niy2hYV2PwKtM/vA= 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=o2O6AG4B; 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="o2O6AG4B" 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 54MHDbxX027524 for ; Thu, 22 May 2025 19:04: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= c0eWB31rocmlfRu/RyQnz8gUXEh7OH1MltE8TFCrHLU=; b=o2O6AG4BqR36OSah Os5j/CKCuMjniY/YOCXrzXhTb9pWpQUm6kHw1ib4a+mT/5oeAIOcaqm9BV9M09xC W0eJmNNFFSZG+PhcbUumFQCuY089KwXlQScmzw1P7kr3qFit25MaKSFGIy1cT5b6 FRjDIiiDLpzNBFHDIop7Y1yy6QZ60KD8cwUbsLdIPVLGS0tFvdiaOwUVeuSyxTuK sp1GRjtT4owvk0b5+hb9gYU4oAAGQZGEqHSWQREM2l0lBGKkpbhmKMOCLQyW+IS0 o5zgRlCjhLIklqtPTVWpT5Og2NYqz8jzNoTFn/TdUJ5rW9Pj+IAtDDVXfjlqWvbn aE76AQ== 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 46s8c264gy-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Thu, 22 May 2025 19:04:52 +0000 (GMT) Received: by mail-qk1-f200.google.com with SMTP id af79cd13be357-7c5c82c6d72so1469776185a.2 for ; Thu, 22 May 2025 12:04:52 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1747940691; x=1748545491; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=c0eWB31rocmlfRu/RyQnz8gUXEh7OH1MltE8TFCrHLU=; b=vbH4Q8EsybRWABiG3t9LKqSLuCGOY3A2GwAVi8BLyegSlE/XXTBnJieNq6TXZrDCZf YZJHCu9V8g1VSR0rYiBbm3MfY8SI2yUwUAPdvBNykcp7DY9xr+1SIXKzPd1RdF/pxYgi bNCAANxvPzgGeIKfGS58NcOB6LtehwhaL2oLDnIv6g2esaDtDESyeHmRWiJvx2eFdwI2 Nl+JJ7CHjW6GtrcmQbW/5b17FLb52j4PpuMrt1cRCCtiHzwdQjQw6ecdX2CfO6lGj92H wMQMJIFbeyKpx9ZNxvf5IH5Lx045cF8MjzMEz6lDwWQzu69QGx5F+pcyATJsIWeLDmVB d0vQ== X-Forwarded-Encrypted: i=1; AJvYcCX6FTAkbmFzWBoEAPZUAn3cf5FkWlVH1APM6eI+DwkoP4wZncL4dxhsnitqSbonceZnRRSMgHKVCMoyBic=@vger.kernel.org X-Gm-Message-State: AOJu0Yw6tAiFefoRZv/CN/a7tuNPUQcsQyZvK4IXwxHvpZHTk+UM/EWY /MyyY75SfgItphHwzQIW33tn/rKN4s02Q3qgVjKh5PEORQ4BF1W3e8SlfOsGbX3nKZJ8uW0dh+j oqq0t/GoV/LDpvAXJKccadnA0n48sEsHk4loVLPHCuILAQ3mwJQHe8tgbs5Sv/Kx9nbk= X-Gm-Gg: ASbGncu6nJrC8BiDlqnreCgUwjGMWRMghmtlwn9LnKvkier5tuSsqiNa0jd06rMuX0k ZG4vMhGfUuli7qVugBcVd4s9EV6YePQKmxG6HEKi/1p4BSU7O5v8184scdVQxq2m+euQuGgQNeq PonflCdIK9lsq+gweb9hp/Yz3TYW400zY8i+3Hp+IgmnyMDjPFL6pynvEHzXp5dbrdlgoFU91Sy 5+7onTJHe18UV4Hf5RzdeSGcO+GFRnizTZM7bIygyv0EgrJlBQYKvVE+WdZiGDcZyRNSJY6tt/S t3gb7ACkNU6U8nr9eHqp7sx+EK6+8miTD+EPyYiHMGmyOQZJhjpIeBjqs3R3u7/+ry32BXMJMCK 95+X46mjBaARyEerM0IWV5gkk X-Received: by 2002:a05:620a:244d:b0:7ce:bdae:8a6 with SMTP id af79cd13be357-7cee31e2c20mr8933985a.7.1747940690944; Thu, 22 May 2025 12:04:50 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFWeyT8YuS206JhKQP1qx3xAjKuJP2j0TQhVWUYqJTT2hjs7OvTMzPQ9H3knJ10UZblpdlMPA== X-Received: by 2002:a05:620a:244d:b0:7ce:bdae:8a6 with SMTP id af79cd13be357-7cee31e2c20mr8930485a.7.1747940690601; Thu, 22 May 2025 12:04: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 2adb3069b0e04-550e703c2f3sm3482506e87.214.2025.05.22.12.04.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 22 May 2025 12:04:48 -0700 (PDT) From: Dmitry Baryshkov Date: Thu, 22 May 2025 22:03:46 +0300 Subject: [PATCH v5 27/30] 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: <20250522-dpu-drop-features-v5-27-3b2085a07884@oss.qualcomm.com> References: <20250522-dpu-drop-features-v5-0-3b2085a07884@oss.qualcomm.com> In-Reply-To: <20250522-dpu-drop-features-v5-0-3b2085a07884@oss.qualcomm.com> To: Rob Clark , Abhinav Kumar , Sean Paul , Marijn Suijten , David Airlie , Simona Vetter , Vinod Koul , Konrad Dybcio Cc: Neil Armstrong , linux-arm-msm@vger.kernel.org, dri-devel@lists.freedesktop.org, freedreno@lists.freedesktop.org, linux-kernel@vger.kernel.org, Dmitry Baryshkov X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=1151; i=dmitry.baryshkov@oss.qualcomm.com; h=from:subject:message-id; bh=/9X7zCyPLMB9JgfInfLiu//0xvw9FvJ2BmQNEpS7pFs=; b=owEBbQGS/pANAwAKAYs8ij4CKSjVAcsmYgBoL3T/AMM2dpp5tL4YM4Flz6AU5HNexuGwt28tU dtIqZZI6YaJATMEAAEKAB0WIQRMcISVXLJjVvC4lX+LPIo+Aiko1QUCaC90/wAKCRCLPIo+Aiko 1Y8IB/49tAdM/XYV37ASC3Z3O1NA6waaBgF47TaEVpZcrlm3Z1HhAkvOMKlsx46o0ipm6Kvh9ms L33cBcEyAuP0UT7NOGdDaXOLI5KoOdliuw/DFVwDqEeWcynPbmrc4KdL08GvzisqwMNM00i47PQ O8UtxIttLYX/SUdFzOLmTFBYsb1wIzIYYVT5na7RkcB/aIxYiH+AjIYx907zHuL40NRKRma7X+X RlBGn52T+7fP11hDCaSrHg5n7O+/8jTHJA5pddr0Q1tdkcdSpX8dDXQjpQI3O3joZchVP8beuNs l1b+HQ1BB7dZrefz8PjvzLk2Lfc8tY+ZSgx2ZrVGz3YnbqTf X-Developer-Key: i=dmitry.baryshkov@oss.qualcomm.com; a=openpgp; fpr=8F88381DD5C873E4AE487DA5199BF1243632046A X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUwNTIyMDE5MiBTYWx0ZWRfXxNTVa0N09MqR BOTx5lZtq3Ep9H/n4xwQFilMGoPGELVK/yTZhwA4mJon+C8U4XS27/m8Pj5X5eTQnnJH83Nepob U1QHeOuw2umLWQKoou2tv/8eUuVtAKamtI1LprYRAIK1XTheBL8+1Bsb4yi2Ow0Vj5c0cm1iFhQ JK14SowAoKkn0xDpJZSmGrpz0+cXU0zLG5MGZznVD1NxjCcjPIeArFhf9EY/3TSH2rB/g2codT1 guNgzObfCYp40r+1g6kMQFNIzsZuwGKCXNVE8yod44xCe13qj91QR7MH1RhS3F1SeKIsUydKrfK BLKLbfCwdGIJqQcAHTzomM24zz38hBxys1ecTyA6nQnd8bsqVFZUvCYtbXbZ7d2LGIFegbn8kLf DlgX4JmRdr0Bj4Y13EFC280Bm8Pf4JkGOBPwGyeqh8qwzsstST0l7Cl2L7jfhZKRe9AEg+kS X-Authority-Analysis: v=2.4 cv=RIuzH5i+ c=1 sm=1 tr=0 ts=682f7554 cx=c_pps a=hnmNkyzTK/kJ09Xio7VxxA==:117 a=xqWC_Br6kY4A:10 a=IkcTkHD0fZMA:10 a=dt9VzEwgFbYA:10 a=KKAkSRfTAAAA:8 a=EUspDBNiAAAA:8 a=8brcGD95nZB0FecW0AkA:9 a=QEXdDO2ut3YA:10 a=PEH46H7Ffwr30OY-TuGO:22 a=cvBusfyB2V15izCimMoJ:22 X-Proofpoint-ORIG-GUID: AmuoDWadC_OlFxKFeLT7r23UmYxJC6T5 X-Proofpoint-GUID: AmuoDWadC_OlFxKFeLT7r23UmYxJC6T5 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1099,Hydra:6.0.736,FMLib:17.12.80.40 definitions=2025-05-22_09,2025-05-22_01,2025-03-28_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 clxscore=1015 phishscore=0 suspectscore=0 malwarescore=0 bulkscore=0 mlxlogscore=804 spamscore=0 lowpriorityscore=0 mlxscore=0 priorityscore=1501 adultscore=0 impostorscore=0 classifier=spam authscore=0 authtc=n/a authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.19.0-2505160000 definitions=main-2505220192 From: Dmitry Baryshkov Drop unused MDP TOP features from the current codebase. Signed-off-by: Dmitry Baryshkov Reviewed-by: Neil Armstrong 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 c582ef1ffe022f2e92b1b80cbab97ff41a2acfe9..9658561c4cb653ca86094d67f7b= 5dc92d36d38cd 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 Dec 14 06:40:54 2025 Received: from mx0a-0031df01.pphosted.com (mx0a-0031df01.pphosted.com [205.220.168.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id C6D962C375E for ; Thu, 22 May 2025 19:04:54 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=205.220.168.131 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1747940696; cv=none; b=G36MGkg+8CalL5UObTaCk0VQZcjRSKTk3FbbY5GMopM7QL4cf+iO1ij6oit5kFhIjrP1mJc4mqviwUChloTmV8i5MA+eDWDw+O9moJ7HnKxj8V+igQ/cJsoZ3RUIO07Ha96F54Be3cbbsokKl0j414eY2EtsccW3jr1wtEknXjs= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1747940696; c=relaxed/simple; bh=ibKOgjGQZ11AcZvbFsvu0iYGPczKty2vE7hmEiwseJA=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=DggNM4OntpCW3xXsaSiqSdTKKP0KrOD/alygbc7t1oPDzQgqKCV+fk2L19aDP+jGwoUdX7SRppj0EWOtRkxFkc2Ub9GCbZSkIIzi5c4amP9RjVtSUcFvkZCH8e4PiUychqkkdLKW54/KREzgQv3e/V5nSa9eq4ZCMd4sacAnQOQ= 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=VGHAVrBG; 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="VGHAVrBG" 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 54MGIVlO020937 for ; Thu, 22 May 2025 19:04:54 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= W4/Qfodz8bj1FCYHz7m5/3J+a/eyf1l9HdLUh5gFHY8=; b=VGHAVrBGPOx+zKvz JaI2Y2wZGDchlKGwG98wgJ5W6cnC9wK7Nj8X7KRznsghjrsCGhQlg1lusGlCF17H uF8ND3USEHTcDiVOGDtmvTmmOvQcuwRWHKqP2pELiKqoPhXwAeazB7kMvmMHMlvU +AejUkrCKAbVcg7YcZUtBjr80tX0Za4HUArVC/r6DIuvbeEQsNoLBQN5B3tA/ng3 FcfhEt3WIoZ3RU0gWQGBFwRAHeXkJ30xzdmdJVaCzQn4IF8UzTPnB/iQa9liUm2g 6YAKHInh83pYtCv5aG6NejpOrGnyco5tDAqOgCw6pLK1bH6QFQ0/1RFHBwCKTnf3 Hf0Lng== 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 46rwf07p0a-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Thu, 22 May 2025 19:04:53 +0000 (GMT) Received: by mail-qk1-f200.google.com with SMTP id af79cd13be357-7c5c9abdbd3so849527885a.1 for ; Thu, 22 May 2025 12:04:53 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1747940692; x=1748545492; 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=W4/Qfodz8bj1FCYHz7m5/3J+a/eyf1l9HdLUh5gFHY8=; b=MWuPiYKgf9g47dJzfuKk6kLS52Zq3drPmLESe18OE6k/muP35a8RgK77cGhdyaKEhL YbNXkyu+bDM1jo01ElkGMe1kW0bTn8hdWQupLiWlxBAMsLdupEjvqPY4BUHWl0Bw3cVQ 1QRpgcA1rk0pNVP1nqeo/MUzUjr3xGFByKKPobB48/DkjGHy17dXLdjCIB/Ai6rUQwZX R6c6e57Ef/2AnSBs4dRRZlApUkiZql5TwjYklWLyTqe6S0hU55CrZdQ2YDOVKFCLDsc3 bspT9iAqNam5DZz+u0uUmeUIC5LgXFBA7RgMDf2DLkhOw6m5/evySpakFE+LqH1XhcFp 9yXg== X-Forwarded-Encrypted: i=1; AJvYcCVx0exhoD5mGjXwQYk+4v24K0E/l6q/1ip+MX/p02ZoFnXJR4UgbQLrLrNeyLerNybGVCYxEKOxklT4igY=@vger.kernel.org X-Gm-Message-State: AOJu0YxAPPUavyr5sHW2Moqe36WlkYBayTQ5kOo18sOC1kEui2EwqBy0 Gf4C+D3ZtWGEMH4GEAiPDu1YhEHZEdaVCkFfxopKTUs+vW7lLYgQFlCmqB7jL5gBHvt66YogrIV 8ulyl3pNA/RgtECCXTtXn24Dj4oze7ZbdbJ79WEah3L4eEqz/FecPp3L3r4XODE+UVqE= X-Gm-Gg: ASbGncsm9YqktpwhwVHRAwbhIz7juhqQn9rl4QgY3tWmqRm/TdbOYXQ+2B3B5/r9X1y 6kBiAeei0W06CVdL0f3fE7SlpraRJVCt/+PNW+KNq2F+Td7UIBIwYf5zxE6OwFUga8np1ewb0ks vatWKV0BBEwQHs+OVWj19Gl0p84gJ+ZbJCBVJ/KpAL6Ln1hBTsB/n9mGXfiEBacSegf7xy+QzCX zpVgcvmpuin9l60o5BNHl8ckP+rRB7idExmyhJjPmbD/f2NNJgdEeusB4Jw/+480z+6xm2NVw3G A6osuqvw1YeKn6p6uafJGhHu2mFjOFxEXlOo6KujTppL4IuYWCrNi8Y9Afc0CccfF7/jys4rFBF b8iH03KKZHUehKKtAsJQZmNbo X-Received: by 2002:a05:620a:57c8:b0:7ce:b495:f16d with SMTP id af79cd13be357-7cee3280efemr4749885a.58.1747940692349; Thu, 22 May 2025 12:04:52 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEqRioajkuCidRLbLqoNubjYsIdX2Y5J5RM0oBH+NxvXfHz3YVH64rHn5nDHQTEB2YD4x6+tw== X-Received: by 2002:a05:620a:57c8:b0:7ce:b495:f16d with SMTP id af79cd13be357-7cee3280efemr4744885a.58.1747940691977; Thu, 22 May 2025 12:04:51 -0700 (PDT) Received: from umbar.lan (2001-14ba-a0c3-3a00-264b-feff-fe8b-be8a.rev.dnainternet.fi. [2001:14ba:a0c3:3a00:264b:feff:fe8b:be8a]) by smtp.gmail.com with ESMTPSA id 2adb3069b0e04-550e703c2f3sm3482506e87.214.2025.05.22.12.04.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 22 May 2025 12:04:51 -0700 (PDT) From: Dmitry Baryshkov Date: Thu, 22 May 2025 22:03:47 +0300 Subject: [PATCH v5 28/30] 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: <20250522-dpu-drop-features-v5-28-3b2085a07884@oss.qualcomm.com> References: <20250522-dpu-drop-features-v5-0-3b2085a07884@oss.qualcomm.com> In-Reply-To: <20250522-dpu-drop-features-v5-0-3b2085a07884@oss.qualcomm.com> To: Rob Clark , Abhinav Kumar , Sean Paul , Marijn Suijten , David Airlie , Simona Vetter , Vinod Koul , Konrad Dybcio Cc: Neil Armstrong , linux-arm-msm@vger.kernel.org, dri-devel@lists.freedesktop.org, freedreno@lists.freedesktop.org, linux-kernel@vger.kernel.org, Dmitry Baryshkov X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=1152; i=dmitry.baryshkov@oss.qualcomm.com; h=from:subject:message-id; bh=EaiNnpBPJ95aothOcinDztqBiGxffsBsh/dQfmS8ZxY=; b=owGbwMvMwMXYbdNlx6SpcZXxtFoSQ4Z+KcON32+01D/bbm9bdCUvsX5HYu2lR9zTJT7FR+54P r8lfW5GJ6MxCwMjF4OsmCKLT0HL1JhNyWEfdkythxnEygQyhYGLUwAm8p2dg6EpRDa560Z4haNQ 9AkNi/X600/3malH8m5tK9eQ+LUkYUPn5le9xzwa5y84emjnXk0Ojct68g3WacJOjBsllc8VzPv z98nxQy1Pi/zFo3yCzjQfz5+x1LVc+PeqPF+u3d/svs2/s1qp+pd7fcDJqvrjhgH9DF47w+yF9D pzX/dJb7uq+z7RkGXZ7JUSm3Itp7v9cdtz9tHU4CnzI5T2p/6az7TPKLarIdGGpVnU53bywb39E lt/lk1si7vq4XHxT7Cf8ZHs1j9tS2YzcIo6lbBlasxLtWMt/NkipWfwaRKrjP9xiZPPPMQOtTZU /K/TUksJU1j5QtC3YatcKGPuo6j0eKWgq8VLvLX2WBoCAA== X-Developer-Key: i=dmitry.baryshkov@oss.qualcomm.com; a=openpgp; fpr=8F88381DD5C873E4AE487DA5199BF1243632046A X-Proofpoint-GUID: tz0OswzXuLvXH83FoekdfkICeeT5rjij X-Proofpoint-ORIG-GUID: tz0OswzXuLvXH83FoekdfkICeeT5rjij X-Authority-Analysis: v=2.4 cv=ZP3XmW7b c=1 sm=1 tr=0 ts=682f7555 cx=c_pps a=hnmNkyzTK/kJ09Xio7VxxA==:117 a=xqWC_Br6kY4A:10 a=IkcTkHD0fZMA:10 a=dt9VzEwgFbYA:10 a=KKAkSRfTAAAA:8 a=EUspDBNiAAAA:8 a=UzLktXvLB0hFtr4V4nYA:9 a=QEXdDO2ut3YA:10 a=PEH46H7Ffwr30OY-TuGO:22 a=cvBusfyB2V15izCimMoJ:22 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUwNTIyMDE5MiBTYWx0ZWRfXz+yI+E4WAyso UMFJikn3LV2B6GnJEAZ4H2sUfFP6gkYWTSfHO1hG/eByKWvvZcthvDrVg+2mwMpaFZFLJZOgc7g Q0JAK4BJM6Kv724XHOhrW51lx13ZHYwOr+rwSUV82ijDXKlT+ViTZL1wYxamG1xkmEZIjJv/DYq el5d/nax/nXNh2/kW5Q/rjQdxppqEbxIUJMMjXvrZCXrEe7ga6oOt8L8lwTNPc6e+1GWckjKcGn 2kR9mv6inKuGJ+hybJXX9af2WxGmO84/bol+B4rOzuFZbrhY22kGz6uKYWFOQcWxzNzavVDtAjs cFxwd60NoB3a2WN5Yfjly8gVIMsm1Mm0ZLXrQ9ZqU2vVYhr5WVgu6A9T8vgjcC3ORwsCxomXTpV RtbRvyF4gln7W0s1oQAhns+K8sf3/UhWwln73KwknvQ6mHOkL04eUm+TfBOcv6YEn2oUfalX X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1099,Hydra:6.0.736,FMLib:17.12.80.40 definitions=2025-05-22_09,2025-05-22_01,2025-03-28_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 priorityscore=1501 adultscore=0 mlxlogscore=889 suspectscore=0 bulkscore=0 impostorscore=0 phishscore=0 spamscore=0 mlxscore=0 lowpriorityscore=0 clxscore=1015 malwarescore=0 classifier=spam authscore=0 authtc=n/a authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.19.0-2505160000 definitions=main-2505220192 From: Dmitry Baryshkov All existing PINGPONG feature bits are completely unused. Drop them from the current codebase. Signed-off-by: Dmitry Baryshkov Reviewed-by: Neil Armstrong Signed-off-by: Dmitry Baryshkov --- drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.h | 12 ------------ 1 file changed, 12 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 9658561c4cb653ca86094d67f7b5dc92d36d38cd..c1488a2c160b0e2ab08243a6e2b= d099329ae759b 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.h +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.h @@ -87,18 +87,6 @@ enum { DPU_DSPP_MAX }; =20 -/** - * PINGPONG sub-blocks - * @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_SPLIT =3D 0x1, - 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 Dec 14 06:40:54 2025 Received: from mx0a-0031df01.pphosted.com (mx0a-0031df01.pphosted.com [205.220.168.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id C49DF2C3778 for ; Thu, 22 May 2025 19:04:55 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=205.220.168.131 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1747940697; cv=none; b=H+HIiF82pHe068eS+82Yf4mrWqNnk4+CblCHT76fHSRqnyff6P1S4xKRW/RTKidl9GFunvg7DPytKSDCucMjTNfWXSS9PNkUprObUyuOI341M4iHd1c2dV0MzwNYOowykBiEaETH4L0OLUJ5MC0RfDmOwNBDBXqbPl71XWSStH0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1747940697; c=relaxed/simple; bh=NNCVFmfEoIQ/1ZOAg0obsQPIEq+KdQZQAG/48UpyygA=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=LVxlVCsf6qmyqRyn93gsEm4FLOzRkjt1v7FvqwgcYducY4qoMr4yYDGyyq6Ot+p3IZ/zuzD9O7JoBS3nuIzheKQLd5ivugz7c5qb5YAEAZstIFcUXmpODvXAblatH0VOEckxqe0bI8c7n47H+BhxDaQMH2Le9swbnN9hvC89D6Y= 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=XnZgKkb1; 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="XnZgKkb1" 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 54MI4tZA014544 for ; Thu, 22 May 2025 19:04:55 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= jnOg1M2bZC9YlYkqITQA3w9t/g70zzttTgLTdcMRUEQ=; b=XnZgKkb1y5kCdNSE DDCpHhfHzDETU7Fc+uWpW1f2BnDyapKJhLGf4bAqOi3nxv36LfFth/LyXViovxpI Vay9jtGoq5Wmuwbyzeiw3Fb96oJafy4H33mXEKn0C3A0TJGxR3j2U7HEUkXO6gPs XfO5RhlvEyeTfw2iz9phucwQ5KcR+M4I4rn9WEsg+1Sqirrqx1aNofM9Y0VuZCAn 7p3dHDUzr2SOeESpyUsGljkO/ydL1qc0g77ITCovFp5XsRQATDnyYg7gVFDSpgfT YRfy700/cMXK4WjSBfrCCNAKlwyebbnuDU5KsDc5Ga10sFOECJFgaIzoN5wPXJpY sVw4IQ== 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 46s8c264h7-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Thu, 22 May 2025 19:04:55 +0000 (GMT) Received: by mail-qk1-f199.google.com with SMTP id af79cd13be357-7c5f3b94827so1330367885a.0 for ; Thu, 22 May 2025 12:04:54 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1747940694; x=1748545494; 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=jnOg1M2bZC9YlYkqITQA3w9t/g70zzttTgLTdcMRUEQ=; b=FBDs8xq29ITPE2GhiiNGbIFvK2qXPYUtxCIuJAzDVcEziVi4UJJL3jikICHbfRY6DV tUT3L6drKVqoSIqGsR70pvbab/y2aFPe1S4wTCHep5EciJod6+kya73vmY7i0wE+ZnYZ ckA23ZCtar6ESn3wgIY0MJFeo9FWs+dwnL8ZU7uKi1bIKwQt/X0CidEIEcq0wV1SC8FK h0mlFtDjSiBw93uiH5lB78b1l8RtrsCB2WOv2cxmTo0FXoXsMBY+HdEmPhqNKE2hsAKG wCdKib2/nbHtGknK6SwW8oGmSy2oHs6I5xJi6M2zdydZMqkLonLlEK8+uSQXatFIkA0F Qljg== X-Forwarded-Encrypted: i=1; AJvYcCWtF5PB2WXNREKUc0HloKhzfCZyKGptIgka4S3HWMb7qFaQnGR0KWEB8jE2avs7OvqEyu9aKQbaW0CIw8s=@vger.kernel.org X-Gm-Message-State: AOJu0YwYUbmGUQsgE0TqWpBPsYOXNsoJhjw7Vvm8TndWPASJATckqWbF hKXmpPdHRfwua2zRiSyTnzPC0F3Q1G6vFNY7QZq74k4TG8VFqFgnu6VmhqtxniYf7DZg7Xg0VAI 1F9CS3rOrCftLKyjKdnZykJEb31hd9XWmA2yWjZzREkWdOSCDy3GOd2i/j5ZHhsZHBs4= X-Gm-Gg: ASbGnctrNtCISZQAJhCTQhhObRCK9g4O9EQChP6erUhcoAiZo3LJCTHzSMBZ4SgaF67 ClfMq2dygH/nUBI/LeYN3d0gxJV+O15WwZxhPdksM6KClN4/ooDFcsI4gM/66hl3VZUToxAq1Tc 2fUKhvUCStskWYdIFgCvAkQ1+GhNEChAIITpGM4YJvVIRsrzbzQ/hC3+a1glfwrO/ZylfKC3UNM t3rPFgZPQGM7FbdKFDmAQcx2RLyENZZ5Ilx62p6xfdemMuiiimdwdfKiNG/4gXxSmHH1gA6JXOn K1AITKx2ibyOZt8LUcr9hBHzd+n+yNsWlLQHh4s7mbeRn+Nk5XNeJx5bV1ewFLzFHsbJZlxmkzi dIrTLmDlEeiOQ5uU4LE10pWUL X-Received: by 2002:a05:620a:400f:b0:7c7:694e:1ba0 with SMTP id af79cd13be357-7cd4677d294mr4167212085a.44.1747940693796; Thu, 22 May 2025 12:04:53 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHjcLc2sPE5Sg0jgDhOzm+gjAvrwhMlfl9yw4J/cxGCECts0yRwpyzhheSdHFWbTSgZfN+8qw== X-Received: by 2002:a05:620a:400f:b0:7c7:694e:1ba0 with SMTP id af79cd13be357-7cd4677d294mr4167207085a.44.1747940693346; Thu, 22 May 2025 12:04:53 -0700 (PDT) Received: from umbar.lan (2001-14ba-a0c3-3a00-264b-feff-fe8b-be8a.rev.dnainternet.fi. [2001:14ba:a0c3:3a00:264b:feff:fe8b:be8a]) by smtp.gmail.com with ESMTPSA id 2adb3069b0e04-550e703c2f3sm3482506e87.214.2025.05.22.12.04.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 22 May 2025 12:04:52 -0700 (PDT) From: Dmitry Baryshkov Date: Thu, 22 May 2025 22:03:48 +0300 Subject: [PATCH v5 29/30] 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: <20250522-dpu-drop-features-v5-29-3b2085a07884@oss.qualcomm.com> References: <20250522-dpu-drop-features-v5-0-3b2085a07884@oss.qualcomm.com> In-Reply-To: <20250522-dpu-drop-features-v5-0-3b2085a07884@oss.qualcomm.com> To: Rob Clark , Abhinav Kumar , Sean Paul , Marijn Suijten , David Airlie , Simona Vetter , Vinod Koul , Konrad Dybcio Cc: Neil Armstrong , linux-arm-msm@vger.kernel.org, dri-devel@lists.freedesktop.org, freedreno@lists.freedesktop.org, linux-kernel@vger.kernel.org, Dmitry Baryshkov X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=1176; i=dmitry.baryshkov@oss.qualcomm.com; h=from:subject:message-id; bh=pxAdYTmaogRQHBMvHaDa09r4i4VRhS75YE1TSgSsEq0=; b=owEBbQGS/pANAwAKAYs8ij4CKSjVAcsmYgBoL3UAMR8c8v1LH0Q5G+F+m4l8MrzYG4LWw1Z+u LhhMQ4xUX6JATMEAAEKAB0WIQRMcISVXLJjVvC4lX+LPIo+Aiko1QUCaC91AAAKCRCLPIo+Aiko 1eScB/43JoU+oCxhxPw8J8RbiyMcraZ8IT3l2HsG6AYvn7TMPCqdkAlbM47zI0Hir17zhVefYZz yKxNPG4vh9+fnzoLUr5h+TFrwVUIAz31mzA4TE0+t9libr48MWMAmWbDC8YXTeu2guOOg14LeJs 2eRmxS3Qs0Txcd77G55RudXbmZhbgd9enJ+tRiT0+Osjoj5xBMYPK4IGa2B96qtX4ZW821QuRmb VuOLOywiyra8uqmdVYtQSXV64wDBndYCC7ttalKBGTvUO5vQYB2GgQlw/pftMqFHMw5ZEZNjcXK gfI++5ls+vfXoZ5U7Nhq9NwmxAKqzrMnCIWsTLRZb2GQal91 X-Developer-Key: i=dmitry.baryshkov@oss.qualcomm.com; a=openpgp; fpr=8F88381DD5C873E4AE487DA5199BF1243632046A X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUwNTIyMDE5MiBTYWx0ZWRfX/TEOC0tIwUZj P8U8Y4HZ7Fduo3urJhm2AEBNvIgNA3oqZsN40mtxT5Tea5jaOFD9rFj2zsdGcVUF1nZe/tclSoc uLfAk6GHGop5ZID/5z3zUSkV9Spjzg0GT8o9jy9Oxg3zs+HY2RtwmUehZMxWDJ9j+68eYhVAeOH 3cO6/mFS3LR5MDEScctV0SrpmD2a8v+7J3VTpF+yBxaMRHhSHaGM4jjrOXfMP2kXxeT5eF5gntH dR0QWxuB+IZ7ZSLCkKKsrmbm9MFH8D5a7j+wX9AxBtE7JuLGy+1dki7AigscrFelvuhA0uE27ID ENQ2l6aPCRHhAgBdcc71Omz0riuIJxjKeMO4Z4pw0dPo/uCT+Bx/GPz0yQb0jLuY1PR6RQzJbYT CssSAfBAnBjmg1Lmir/ScXYYoNysgrnw3ozQf+U7znxipLHy5qQ2ne8oWIv0/RhWULODTd43 X-Authority-Analysis: v=2.4 cv=RIuzH5i+ c=1 sm=1 tr=0 ts=682f7557 cx=c_pps a=HLyN3IcIa5EE8TELMZ618Q==:117 a=xqWC_Br6kY4A:10 a=IkcTkHD0fZMA:10 a=dt9VzEwgFbYA:10 a=KKAkSRfTAAAA:8 a=EUspDBNiAAAA:8 a=87smWpNc5u_ETeg062IA:9 a=QEXdDO2ut3YA:10 a=bTQJ7kPSJx9SKPbeHEYW:22 a=cvBusfyB2V15izCimMoJ:22 X-Proofpoint-ORIG-GUID: dupNGVquEBLn7jqxqAdnaUVbI_-SpkLd X-Proofpoint-GUID: dupNGVquEBLn7jqxqAdnaUVbI_-SpkLd X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1099,Hydra:6.0.736,FMLib:17.12.80.40 definitions=2025-05-22_09,2025-05-22_01,2025-03-28_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 clxscore=1015 phishscore=0 suspectscore=0 malwarescore=0 bulkscore=0 mlxlogscore=982 spamscore=0 lowpriorityscore=0 mlxscore=0 priorityscore=1501 adultscore=0 impostorscore=0 classifier=spam authscore=0 authtc=n/a authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.19.0-2505160000 definitions=main-2505220192 From: Dmitry Baryshkov Drop unused LM features from the current codebase. Signed-off-by: Dmitry Baryshkov Reviewed-by: Neil Armstrong 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 c1488a2c160b0e2ab08243a6e2bd099329ae759b..d51f6c5cdf62f3c00829167172e= f6fd61f069986 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 Dec 14 06:40:54 2025 Received: from mx0a-0031df01.pphosted.com (mx0a-0031df01.pphosted.com [205.220.168.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 7839F287510 for ; Thu, 22 May 2025 19:05:19 +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=1747940722; cv=none; b=njRD2RlX9/ES00t6rqOL6Qha7axkSMUmP18AIjn6vr2eI+LgikWOCbRzbWbk6r/ShRWMnUW3TvpQIDZ3GS2spFDgxYUrhVRS+Vw+bwHPvlYkts9BgvNWBZfffB4OL8h78OqQqgW8uOn7LOTr+xdWTDZ+bq8nH1HU2jMc8kg1FhE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1747940722; c=relaxed/simple; bh=VTilDoUH90d6+gvbkhG3P29AUEnCmnb+w2E7Bbts9JU=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=bj9bJQXl1+A47YP9EQgP8JjRUWvUgZ6ytS+KdApffwE8oJs3bFNUtNXBASPRFenVQ2goP5M+WcoWHjxtMW4NL4erODOfF8Y/QXaEmAa42OqAti5BUbvi2dd3X/PBsIFj9XuZNqsq3v7holc26e1WxF+0Gem3ep/W4sm7LV8W+GM= 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=ZTh/9q2B; 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="ZTh/9q2B" 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 54MFjk0N006644 for ; Thu, 22 May 2025 19:05:18 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= oTc0/EezgBT/5+RGEQvOyBaGeTe7VtWsnCarMd7VsYQ=; b=ZTh/9q2BERi30Nly 5AbtgfT83h2nU1Szr1qgNZDnJ58M0i0OVuNmRb355+p/DUKzw7AARlFhEP99s1fc 07Hrf3YyozUpiQOwNpjsboRYQutD5GvIkOr3NxUzoBUF9bd9nuyqiY6JYc9pSLDi ewluzBTZfjHW8j6JCGrbp91EjeCkgEk5JwN1dKrRmt44pULy6Pw8kIsGb/PhsIFc DOPP4217AvdY1HSIK2NJNjh/+dUHe63NgttaIb62vqOFMYCebZvpcer+RhFNkw6+ s9ZGuMa1SarsMNRg3q0ANIS3LIu6KyhAfuGnwYPHYe/TctjRNw7aiY1TNa6MQ0sF oD5V5w== Received: from mail-ua1-f69.google.com (mail-ua1-f69.google.com [209.85.222.69]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 46rwf0qkxd-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Thu, 22 May 2025 19:05:18 +0000 (GMT) Received: by mail-ua1-f69.google.com with SMTP id a1e0cc1a2514c-875ba574183so114659241.1 for ; Thu, 22 May 2025 12:05:18 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1747940717; x=1748545517; 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=oTc0/EezgBT/5+RGEQvOyBaGeTe7VtWsnCarMd7VsYQ=; b=J3mVU5esveNHrfaBaQCS+sDNPkMY2sshOVuYV52sVeQzKP7PevSgozfvvZW+KM755f PqPmzsV+2kJLTNpnf1DyQqhVXe/x1Y4Oe5YXdSTr1wa6dZtsgSjV4dBO5o2yMQxW5AEC QAuHA8f6PTm3vMuFJ+3THVNvMPL/QGXvK6eIjgzAJxjsfAXB98e+H+PkIwy5tFKr3Iin 1se9dFsvK+/bs2h519Ows8x+N2/O8tk/JGDWpmcHQ1aPOSbNoXz267u1NVChFQQYu1BT gMcxbLvCbw0PTRhdeheHfpZJkU5odiGtR3H6K+FKSX1rUDBtc9UeXvCd94pnPfqxti/F aRYA== X-Forwarded-Encrypted: i=1; AJvYcCUHJh81hR45YPyeRZI+mEeCRWhyvQVLGGCrMgjeQ2sXRrLDgKG9bjabFLE0INpTLLbDvfGtNsDiX+tjxRw=@vger.kernel.org X-Gm-Message-State: AOJu0YzhTIuI9GBHuNcGFUzEW61bg4RxU8pJ5XjEFF5T8DJKPUSaY58R qPPEKYCKZCAFicHxWu3icovx1VKPOLTWBtaamKn8Dt6l+g1r6FrN7bh7UdXRUQf+zTTyT6uMhg/ 49lOu7QZ8ZhFlSP06OBYrRaZtSfJ++z6PHNGOHanwBHQZJZq+b6tQGy+mqlu6XbGCuSQreqW1az 0= X-Gm-Gg: ASbGncvIUI++oxH48Ir/AOZbwxIhDroijDJ1ibfi77rI7MQwEeRwFgOeWD5T5wOAcvF 4F0IyB9SmihoaCjV6MNrLp7rNtjZZtMZFVpl5BZB1AZG2TK7H5QDevQP0JmGRPpfRSNs7JQaJXK sDNAbdzpS3+t3VRCvW8YHOqWaw1F3SWtqxUjXrZ/4G2fM6EBo8LVXC/Lft0/QjCI0SW1W+v/Lk+ AYE3ZqJafa+7XyH/mxXRBm7e0Oe93QdnJaxRiI3DndBt/PT/fEpisg+sEOwkDXZ+6IoAVuac07q HpOCFA7LyUvwc3KGzcVAVVma97AY7Cebz4rK26vyffxGtcRXMhmF4JzNHSgk33ZopoMLWf6Rxlz 69qy62FG+AZeQR1mr2Eo2tZ6R X-Received: by 2002:a05:620a:28c3:b0:7c0:b490:2c26 with SMTP id af79cd13be357-7cee2270b5cmr92573085a.12.1747940706141; Thu, 22 May 2025 12:05:06 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGmO3myhGKXc3zyjZQd0qrKtRwdZU82OVvg8eLp1QTs05m9q0Sbyzla5HFoYw5w0Dx2dnzxcg== X-Received: by 2002:a05:620a:6089:b0:7c9:574d:a344 with SMTP id af79cd13be357-7cee22ef854mr118810885a.25.1747940694804; Thu, 22 May 2025 12:04: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 2adb3069b0e04-550e703c2f3sm3482506e87.214.2025.05.22.12.04.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 22 May 2025 12:04:53 -0700 (PDT) From: Dmitry Baryshkov Date: Thu, 22 May 2025 22:03:49 +0300 Subject: [PATCH v5 30/30] 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: <20250522-dpu-drop-features-v5-30-3b2085a07884@oss.qualcomm.com> References: <20250522-dpu-drop-features-v5-0-3b2085a07884@oss.qualcomm.com> In-Reply-To: <20250522-dpu-drop-features-v5-0-3b2085a07884@oss.qualcomm.com> To: Rob Clark , Abhinav Kumar , Sean Paul , Marijn Suijten , David Airlie , Simona Vetter , Vinod Koul , Konrad Dybcio Cc: Neil Armstrong , linux-arm-msm@vger.kernel.org, dri-devel@lists.freedesktop.org, freedreno@lists.freedesktop.org, linux-kernel@vger.kernel.org, Dmitry Baryshkov X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=9308; i=dmitry.baryshkov@oss.qualcomm.com; h=from:subject:message-id; bh=dgx5X1yBWFmdPYdJIyIJkCBg1wG8k1o1xqWmN09qE7Y=; b=owEBbQGS/pANAwAKAYs8ij4CKSjVAcsmYgBoL3UASwCzosHgATZQUnLox3XCPuv+4AVOC29Tj MumKA94GnWJATMEAAEKAB0WIQRMcISVXLJjVvC4lX+LPIo+Aiko1QUCaC91AAAKCRCLPIo+Aiko 1cbUCACJvWLcGeFkg+EAr5zx6HgmYzUF2dvnrwysp2WFEjMLCMkVCj2dk0Ovje2soVWWQTHj50s Vz095jwZ7VFHI5yivyNwPsoSxm8U5fE4DFFXphvSdQzIiNoBrKlI5pjnmstVHxc1hOngUehz4Hg 7AmvbIeS4TvSrMT4TDJvbLWDZa5LHioiM1xzm/lehHP7txJ88Ewl+bNQdowA5ZZpZvRh0rYTDz5 jotguW5IHzzCn0TIM902nOUqcD2ddSrqieyju3YSkuBfmZMyaZV//htlbzjln8udBRt30pAig4r n+BOu8P0GhDneFo8WlBgD0KzmginBzQOSi2l2k2nfhYLD927 X-Developer-Key: i=dmitry.baryshkov@oss.qualcomm.com; a=openpgp; fpr=8F88381DD5C873E4AE487DA5199BF1243632046A X-Proofpoint-GUID: 9rYNaZ5uL1ys1Mt-pxvh8sHJoQRVUIwB X-Authority-Analysis: v=2.4 cv=J/Sq7BnS c=1 sm=1 tr=0 ts=682f756e cx=c_pps a=UbhLPJ621ZpgOD2l3yZY1w==:117 a=xqWC_Br6kY4A:10 a=IkcTkHD0fZMA:10 a=dt9VzEwgFbYA:10 a=KKAkSRfTAAAA:8 a=EUspDBNiAAAA:8 a=-ycWNAup90JVQjvHN6MA:9 a=QEXdDO2ut3YA:10 a=TOPH6uDL9cOC6tEoww4z:22 a=cvBusfyB2V15izCimMoJ:22 X-Proofpoint-ORIG-GUID: 9rYNaZ5uL1ys1Mt-pxvh8sHJoQRVUIwB X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUwNTIyMDE5MiBTYWx0ZWRfX3uEUtewjg4vI +tXT6LaSzmipPmoD81U2yDnYGJ7Fk3M8QTpdbsITy2P89JWIt/qYEEF2LBG8uYjILzuWxjqM2FZ eY9eRmz54R9o2z1XuNCbFzvH31yFXlEUF8rBqCEvsbuMA6fo6mGUyfTlek8+AaDB3rOVY9lp2j7 JCFgZ3BARQ78sckOel2tSycImYlP+Q2n3o5R3r07GrTtYftuw5pYdgLDvpXtnyl2h+BXqYmV3+O ax2H02JricOUARoKA6MlB2MA++29UmavD+uVAKl+a1OvKPTYLi/ZKSubFHB2tWN6J0gGiOpfg4k UOkgdN9LgGKm2LDVn0+1foetMNRbB7ULhLjVzbGeUjDNxxtGKQj6ZiAMffA11yWIOE8UkiwHApf 6v01Giy6o78PAa8FhxW2UFjttdyaTADkmM3AwceELTwlvH8lV4Jk/k93+IBNidLkHRXePhqJ X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1099,Hydra:6.0.736,FMLib:17.12.80.40 definitions=2025-05-22_09,2025-05-22_01,2025-03-28_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 mlxscore=0 clxscore=1015 mlxlogscore=999 suspectscore=0 spamscore=0 priorityscore=1501 bulkscore=0 phishscore=0 impostorscore=0 lowpriorityscore=0 malwarescore=0 adultscore=0 classifier=spam authscore=0 authtc=n/a authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.19.0-2505160000 definitions=main-2505220192 From: Dmitry Baryshkov As features bits are now unused by some of the hardware block configuration structures, 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 Reviewed-by: Neil Armstrong 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, 13 insertions(+), 20 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 2950245e7b3f5e38f3f501a7314bb97c66d05982..fbf50f279e6628cb0f92b0188e1= fbdf156a899e2 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 d51f6c5cdf62f3c00829167172ef6fd61f069986..47d82b83ac5378cb0001b3ea660= 5dc0f98aec5ef 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.h +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.h @@ -154,14 +154,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 @@ -376,7 +374,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 { @@ -392,6 +389,7 @@ struct dpu_mdp_cfg { */ struct dpu_ctl_cfg { DPU_HW_BLK_INFO; + unsigned long features; unsigned int intr_start; }; =20 @@ -407,6 +405,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; @@ -424,6 +423,7 @@ struct dpu_sspp_cfg { */ struct dpu_lm_cfg { DPU_HW_BLK_INFO; + unsigned long features; const struct dpu_lm_sub_blks *sblk; u32 pingpong; u32 dspp; @@ -434,7 +434,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 */ @@ -447,7 +446,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 @@ -464,8 +462,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 { @@ -483,6 +479,7 @@ struct dpu_merge_3d_cfg { */ struct dpu_dsc_cfg { DPU_HW_BLK_INFO; + unsigned long features; const struct dpu_dsc_sub_blks *sblk; }; =20 @@ -490,7 +487,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 @@ -521,6 +517,7 @@ struct dpu_intf_cfg { */ struct dpu_wb_cfg { DPU_HW_BLK_INFO; + unsigned long features; u8 vbif_idx; u32 maxlinewidth; u32 xin_id; @@ -589,6 +586,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; @@ -606,7 +604,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 b9c433567262a954b7f02233f6670ee6a8476846..b3395e9c34a19363019ec0ccfb0= c87943553b4c9 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