From nobody Mon Feb 9 01:20:53 2026 Received: from mx0b-0031df01.pphosted.com (mx0b-0031df01.pphosted.com [205.220.180.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id C246522B8D2 for ; Thu, 24 Apr 2025 09:30:53 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=205.220.180.131 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745487057; cv=none; b=hd9A6LSSvKPx7BID7WdIHB0ZL1lpGjIg91TmqMHS+5XaPgcRlhLaFybfkgNOSPodfNMwsKMFR+Mf16Ne7bm0nX+ibS2jCeU2YTtULEZ5qGlG0a5SqveNoSrM8eqoIeq5QxkLPmrb/qXmbLzHDMMD9I5Cl64YOsO2gWkwiXpu1M0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745487057; c=relaxed/simple; bh=NVMj8kSGvpnn0EZeuNLh+KZSravW0HZLSVloOshSsSY=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=W2B4LAxc7QRtBrxagTK6l5vs4e7Y/hL5AgH28ftKj75xRztNJ1S2lnqa4mlt0fv6rOb4oNCyEMf2v+JneCDWUUc8xEjUUB/9UWc4rgax4cefovawEMU5pmO7h/KWJZz+u1yJR6P7/HWQtCY83DxdmI26xEcoWUhsbcAK1THUFiQ= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=oss.qualcomm.com; spf=pass smtp.mailfrom=oss.qualcomm.com; dkim=pass (2048-bit key) header.d=qualcomm.com header.i=@qualcomm.com header.b=IgND3GTU; arc=none smtp.client-ip=205.220.180.131 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=oss.qualcomm.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=oss.qualcomm.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=qualcomm.com header.i=@qualcomm.com header.b="IgND3GTU" Received: from pps.filterd (m0279871.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 53O0F6Eo016968 for ; Thu, 24 Apr 2025 09:30:52 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=qualcomm.com; h= cc:content-transfer-encoding:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to; s=qcppdkim1; bh= Dp3LAunTuRflNZBtXu2Vp8CQDz2HsVbSuLW3Ww4uZZ4=; b=IgND3GTUaRrQqqAz ycWu30Ev9kr6IY0fi+pQpa7RawUR91HJS2pfsk8uv8GDdI2QPXf73iGykKt7iNvk QfgflJouK8n4g8dwSzNx10PksunFtTLQdgHHHwIoocpieE43eVjEc1g+0wnXnP7E ZHPLLgWTS3n3p6iGxmcmfdavn7znn58qIq0WdOttdssq5uNFGPMHXUoFLizVIwY2 ML/3d+y8nDIRkCmVnhV04jE77xeSlM+KczBMYPBygmxFlIAATxzYBl9uauZ/tQy/ 4FUU/nRhiuiEftp7Ew4D5zlVHDM9pMuQkOEHj7hk/XWv/A+usR2jZJkS0qCSsToG PPEzKA== Received: from mail-qk1-f197.google.com (mail-qk1-f197.google.com [209.85.222.197]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 466jh14y45-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Thu, 24 Apr 2025 09:30:52 +0000 (GMT) Received: by mail-qk1-f197.google.com with SMTP id af79cd13be357-7c3c8f8ab79so118544585a.2 for ; Thu, 24 Apr 2025 02:30:52 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1745487052; x=1746091852; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Dp3LAunTuRflNZBtXu2Vp8CQDz2HsVbSuLW3Ww4uZZ4=; b=uluGE4WTTkCH0UoQWxZbABjZfEKy5YY71mRggyi2R/OtgC71EI3RgYUaROhFU+SXi8 yexF+PVGR08RM0hj7aJWu88h3X2JryiExTi6mi+HlaEsnbl1CcqtZQY7p0+bEd0rA5Br 1uPj+5HIHVjm++r81nkotw3I47UGmKtcdf3XWJkWARZ7K3fI0Lo0yYYJ4MErlQdDy2/1 1M8EfqgBuhncRww3njSYWxeqQ6mylj2MnkvVUtpHxsFZqOEkxpNqkbtz3UbSp4TWtQjg Do38Z/j82BwDbpul/7fR+IoOnnYqPtUBvWDwUQoXj/hKf2B36eOTyVyjmIPUJ4RTRZyu ydyg== X-Forwarded-Encrypted: i=1; AJvYcCUVIY1iVHDzu2zh6ABGMK9cyiDOC34XJT6KES0hBfT5WqipCPe5us6qRkXEISxezFwrcQWyN0tg3wnzSoE=@vger.kernel.org X-Gm-Message-State: AOJu0YwCWYU1bk5Aft20rMgIfra9X8vGdhzNhr/x7DLD8OcToqCtsA/O 8XDag5tays1EJh4mZqTSmwOEpBHVA3XtSpoJxngL0njWXvGc5QuP2M+aGmQJTn6TDuxLkgBshlf kncDslg4tDOMksE79XkgOhGP6vslPe/oMbsha2EqCd8o8c0/QJQyTn3aVsj5Eatw= X-Gm-Gg: ASbGncu5iTZB8eVx2A9f0huhPGjD4R6V9rnRydCDUXz2BeM7ulr7ky03z6U0NsSL73R qrNfPHnbGy0h2j/MvlmPsc0PlwvHYLXlqoIwxG9rmGjPmsu8z6EZ3YI11iju+g7ikUnLK0v2qCP u5OFTGMEk/4boSpod7aafkqRaPKuSFfkhxNOMF4UHbYlE+nv/euneSUxZ3tcsgYhZG0SAAo4dd7 KUFvR2yoVa8DnSUo4Z+0IdJcrp9F00q52XsxG2GzP4OPtp+oQy7+10q9VncMIxX75J3bTsdKdhV rROrA1vb8Y3uG3N6J+j7hiQ+nERCSd8FjzK98b2lHtC/zJikCi4CAAvHQgywfsjJ8vgSSoTgOQJ 8u505tPZrU8CXVsULzbw8OGph X-Received: by 2002:a05:620a:4248:b0:7c5:95e6:ce1d with SMTP id af79cd13be357-7c956dd8d70mr263947985a.0.1745487051132; Thu, 24 Apr 2025 02:30:51 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGjgmVNS4loigIVuk7ZUocq2+9yjDMd43Own5q88QyQytVU8AMtg5wG7dEqf2pIqDqQTTqO0w== X-Received: by 2002:a05:620a:4248:b0:7c5:95e6:ce1d with SMTP id af79cd13be357-7c956dd8d70mr263944885a.0.1745487050645; Thu, 24 Apr 2025 02:30:50 -0700 (PDT) Received: from umbar.lan (2001-14ba-a0c3-3a00-264b-feff-fe8b-be8a.rev.dnainternet.fi. [2001:14ba:a0c3:3a00:264b:feff:fe8b:be8a]) by smtp.gmail.com with ESMTPSA id 38308e7fff4ca-317d1b9a304sm1820461fa.99.2025.04.24.02.30.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 24 Apr 2025 02:30:49 -0700 (PDT) From: Dmitry Baryshkov Date: Thu, 24 Apr 2025 12:30:19 +0300 Subject: [PATCH v3 15/33] drm/msm/dpu: get rid of DPU_INTF_INPUT_CTRL Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20250424-dpu-drop-features-v3-15-cdaca81d356f@oss.qualcomm.com> References: <20250424-dpu-drop-features-v3-0-cdaca81d356f@oss.qualcomm.com> In-Reply-To: <20250424-dpu-drop-features-v3-0-cdaca81d356f@oss.qualcomm.com> To: Rob Clark , Abhinav Kumar , Sean Paul , Marijn Suijten , David Airlie , Simona Vetter , Vinod Koul , Konrad Dybcio Cc: linux-arm-msm@vger.kernel.org, dri-devel@lists.freedesktop.org, freedreno@lists.freedesktop.org, linux-kernel@vger.kernel.org, Dmitry Baryshkov X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=32242; i=dmitry.baryshkov@oss.qualcomm.com; h=from:subject:message-id; bh=cfyxGw4+H2UfNBQPXEZK30ob8F55d5sE0iKGaWWPHvM=; b=owEBbQGS/pANAwAKAYs8ij4CKSjVAcsmYgBoCgStM/d1vdUsxln83e5CgT0KCA8vSzp1sFPGi SAOUn3vuC6JATMEAAEKAB0WIQRMcISVXLJjVvC4lX+LPIo+Aiko1QUCaAoErQAKCRCLPIo+Aiko 1TB3B/9R6BeWeNQ4CSkMy2/rlGhhyKtMbBnq2MemsnGXn3PIbTsEJW0WPkGFgWpb6cwLdcHvpf2 SKU6nHQxaIMq897ywP6/YXeMwt5IWV73kpPZ0hxy7gkg91t9zqYjf01klTE2NcgUvFdLCqZOhsj BDLthHIZRmQU6FGZRV4mTSnxcETrfQAjHlrzA4CI2T8mCFo/kRxcp0OjjVDVtzUvAXZnDjM6rJ4 1qFB/hf8VG4DWAq2nA8YxE3lsF2RUJbua8j86kOO9iVGqzX6OmnVAdS7PD7y2i/MNvHe218FhWe I3ebJynXE1FIfoCMWTLIK9F/+oToxYuHIy9WHiEGEbLQ7iFc X-Developer-Key: i=dmitry.baryshkov@oss.qualcomm.com; a=openpgp; fpr=8F88381DD5C873E4AE487DA5199BF1243632046A X-Proofpoint-GUID: WfBXVd8feB5rBNb1OVojvE8HQ3Q3rd57 X-Authority-Analysis: v=2.4 cv=OY6YDgTY c=1 sm=1 tr=0 ts=680a04cc cx=c_pps a=50t2pK5VMbmlHzFWWp8p/g==:117 a=xqWC_Br6kY4A:10 a=IkcTkHD0fZMA:10 a=XR8D0OoHHMoA:10 a=KKAkSRfTAAAA:8 a=_YFPJyc67s1Z8jbQfgUA:9 a=QEXdDO2ut3YA:10 a=IoWCM6iH3mJn3m4BftBB:22 a=cvBusfyB2V15izCimMoJ:22 X-Proofpoint-ORIG-GUID: WfBXVd8feB5rBNb1OVojvE8HQ3Q3rd57 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUwNDI0MDA2MyBTYWx0ZWRfX68LXRdzN594G ukudHiQALYc+GDm5FN/JrT96XL5+gj0IDCle3bwCZn2kCQFEkFsj1MWArgoIDn+Ebg3c1sy/BxZ 4Iqm/XpMgsbzAON6A5BZR8WGy4Ms5NLOZm6TlsLDmrGhuTb+rrKNr6BpE3RbX4P4IQWW95dhHPR pRDrM7boJYERlmFUvELuVmDoG11t49ONrIuy5A4DUGuwBo3YKeak994GxhVlkMMbq3OOvJQea6k wdGmNXuX4eIzQUGp3IUDFm8WddGCpmt1Hb7C4rITKkrkoUmhveAWAinUDaSNw/iI3eOS/ptJPMq GyjU1dzfO9jBTxfBRcP6yL5xMkKg2/9p6Y4dAX4WKA23U7iXdzFP+udlRp3HqpjeNWrrFAbBKsp Uu4Mf/Qd45c9tH3j3zl6O/sd/LKnJp1vt2OxMavKE2ygJiLQUEtMNM1dfaS05kAl9GnwUHw5 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1099,Hydra:6.0.680,FMLib:17.12.80.40 definitions=2025-04-24_04,2025-04-22_01,2025-02-21_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 impostorscore=0 lowpriorityscore=0 suspectscore=0 mlxscore=0 clxscore=1015 malwarescore=0 mlxlogscore=999 phishscore=0 priorityscore=1501 spamscore=0 adultscore=0 bulkscore=0 classifier=spam authscore=0 authtc=n/a authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.19.0-2504070000 definitions=main-2504240063 From: Dmitry Baryshkov Continue migration to the MDSS-revision based checks and replace DPU_INTF_INPUT_CTRL feature bit with the core_major_ver >=3D 5 check. Signed-off-by: Dmitry Baryshkov --- drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_10_0_sm8650.h | 4 ---- drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_5_0_sm8150.h | 4 ---- drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_5_1_sc8180x.h | 6 ------ drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_5_2_sm7150.h | 4 ---- drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_5_3_sm6150.h | 3 --- drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_5_4_sm6125.h | 2 -- drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_6_0_sm8250.h | 4 ---- drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_6_2_sc7180.h | 2 -- drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_6_3_sm6115.h | 1 - drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_6_4_sm6350.h | 2 -- drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_6_5_qcm2290.h | 1 - drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_6_9_sm6375.h | 1 - drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_7_0_sm8350.h | 4 ---- drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_7_2_sc7280.h | 3 --- drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_8_0_sc8280xp.h | 9 --------- drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_8_1_sm8450.h | 4 ---- drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_8_4_sa8775p.h | 8 -------- drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_9_0_sm8550.h | 4 ---- drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_9_2_x1e80100.h | 9 --------- drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.c | 3 --- drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.h | 11 ----------- drivers/gpu/drm/msm/disp/dpu1/dpu_hw_intf.c | 2 +- 22 files changed, 1 insertion(+), 90 deletions(-) diff --git a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_10_0_sm8650.h b/driv= ers/gpu/drm/msm/disp/dpu1/catalog/dpu_10_0_sm8650.h index 4ab361b7c977c2c97927543154d5dcd00091879c..70c519b923f57f2ccae094eedf0= 3c4f313062de8 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_10_0_sm8650.h +++ b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_10_0_sm8650.h @@ -367,7 +367,6 @@ static const struct dpu_intf_cfg sm8650_intf[] =3D { { .name =3D "intf_0", .id =3D INTF_0, .base =3D 0x34000, .len =3D 0x280, - .features =3D INTF_SC7180_MASK, .type =3D INTF_DP, .controller_id =3D MSM_DP_CONTROLLER_0, .prog_fetch_lines_worst_case =3D 24, @@ -376,7 +375,6 @@ static const struct dpu_intf_cfg sm8650_intf[] =3D { }, { .name =3D "intf_1", .id =3D INTF_1, .base =3D 0x35000, .len =3D 0x300, - .features =3D INTF_SC7180_MASK, .type =3D INTF_DSI, .controller_id =3D MSM_DSI_CONTROLLER_0, .prog_fetch_lines_worst_case =3D 24, @@ -386,7 +384,6 @@ static const struct dpu_intf_cfg sm8650_intf[] =3D { }, { .name =3D "intf_2", .id =3D INTF_2, .base =3D 0x36000, .len =3D 0x300, - .features =3D INTF_SC7180_MASK, .type =3D INTF_DSI, .controller_id =3D MSM_DSI_CONTROLLER_1, .prog_fetch_lines_worst_case =3D 24, @@ -396,7 +393,6 @@ static const struct dpu_intf_cfg sm8650_intf[] =3D { }, { .name =3D "intf_3", .id =3D INTF_3, .base =3D 0x37000, .len =3D 0x280, - .features =3D INTF_SC7180_MASK, .type =3D INTF_DP, .controller_id =3D MSM_DP_CONTROLLER_1, .prog_fetch_lines_worst_case =3D 24, diff --git a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_5_0_sm8150.h b/drive= rs/gpu/drm/msm/disp/dpu1/catalog/dpu_5_0_sm8150.h index 3bb0749f931d7417f8e90bfe3736ce77dafccb57..6438a5a14e4b89462873b5c8177= 13b4ff67d7ccc 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_5_0_sm8150.h +++ b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_5_0_sm8150.h @@ -304,7 +304,6 @@ static const struct dpu_intf_cfg sm8150_intf[] =3D { { .name =3D "intf_0", .id =3D INTF_0, .base =3D 0x6a000, .len =3D 0x280, - .features =3D INTF_SC7180_MASK, .type =3D INTF_DP, .controller_id =3D MSM_DP_CONTROLLER_0, .prog_fetch_lines_worst_case =3D 24, @@ -313,7 +312,6 @@ static const struct dpu_intf_cfg sm8150_intf[] =3D { }, { .name =3D "intf_1", .id =3D INTF_1, .base =3D 0x6a800, .len =3D 0x2bc, - .features =3D INTF_SC7180_MASK, .type =3D INTF_DSI, .controller_id =3D MSM_DSI_CONTROLLER_0, .prog_fetch_lines_worst_case =3D 24, @@ -323,7 +321,6 @@ static const struct dpu_intf_cfg sm8150_intf[] =3D { }, { .name =3D "intf_2", .id =3D INTF_2, .base =3D 0x6b000, .len =3D 0x2bc, - .features =3D INTF_SC7180_MASK, .type =3D INTF_DSI, .controller_id =3D MSM_DSI_CONTROLLER_1, .prog_fetch_lines_worst_case =3D 24, @@ -333,7 +330,6 @@ static const struct dpu_intf_cfg sm8150_intf[] =3D { }, { .name =3D "intf_3", .id =3D INTF_3, .base =3D 0x6b800, .len =3D 0x280, - .features =3D INTF_SC7180_MASK, .type =3D INTF_DP, .controller_id =3D MSM_DP_CONTROLLER_1, .prog_fetch_lines_worst_case =3D 24, diff --git a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_5_1_sc8180x.h b/driv= ers/gpu/drm/msm/disp/dpu1/catalog/dpu_5_1_sc8180x.h index 84114df5f072af16aeedd3aada8a106ca4369ddb..d08799471b85a882ecb151cb9b5= be2a098bfc003 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_5_1_sc8180x.h +++ b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_5_1_sc8180x.h @@ -311,7 +311,6 @@ static const struct dpu_intf_cfg sc8180x_intf[] =3D { { .name =3D "intf_0", .id =3D INTF_0, .base =3D 0x6a000, .len =3D 0x280, - .features =3D INTF_SC7180_MASK, .type =3D INTF_DP, .controller_id =3D MSM_DP_CONTROLLER_0, .prog_fetch_lines_worst_case =3D 24, @@ -320,7 +319,6 @@ static const struct dpu_intf_cfg sc8180x_intf[] =3D { }, { .name =3D "intf_1", .id =3D INTF_1, .base =3D 0x6a800, .len =3D 0x2bc, - .features =3D INTF_SC7180_MASK, .type =3D INTF_DSI, .controller_id =3D MSM_DSI_CONTROLLER_0, .prog_fetch_lines_worst_case =3D 24, @@ -330,7 +328,6 @@ static const struct dpu_intf_cfg sc8180x_intf[] =3D { }, { .name =3D "intf_2", .id =3D INTF_2, .base =3D 0x6b000, .len =3D 0x2bc, - .features =3D INTF_SC7180_MASK, .type =3D INTF_DSI, .controller_id =3D MSM_DSI_CONTROLLER_1, .prog_fetch_lines_worst_case =3D 24, @@ -342,7 +339,6 @@ static const struct dpu_intf_cfg sc8180x_intf[] =3D { { .name =3D "intf_3", .id =3D INTF_3, .base =3D 0x6b800, .len =3D 0x280, - .features =3D INTF_SC7180_MASK, .type =3D INTF_DP, .controller_id =3D 999, .prog_fetch_lines_worst_case =3D 24, @@ -351,7 +347,6 @@ static const struct dpu_intf_cfg sc8180x_intf[] =3D { }, { .name =3D "intf_4", .id =3D INTF_4, .base =3D 0x6c000, .len =3D 0x280, - .features =3D INTF_SC7180_MASK, .type =3D INTF_DP, .controller_id =3D MSM_DP_CONTROLLER_1, .prog_fetch_lines_worst_case =3D 24, @@ -360,7 +355,6 @@ static const struct dpu_intf_cfg sc8180x_intf[] =3D { }, { .name =3D "intf_5", .id =3D INTF_5, .base =3D 0x6c800, .len =3D 0x280, - .features =3D INTF_SC7180_MASK, .type =3D INTF_DP, .controller_id =3D MSM_DP_CONTROLLER_2, .prog_fetch_lines_worst_case =3D 24, diff --git a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_5_2_sm7150.h b/drive= rs/gpu/drm/msm/disp/dpu1/catalog/dpu_5_2_sm7150.h index 7a04eacb108bea33573cf75fb5537b80e8273039..acaa0b85ed1edd970dd17ae4d8d= 06a3dee6e8083 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_5_2_sm7150.h +++ b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_5_2_sm7150.h @@ -212,7 +212,6 @@ static const struct dpu_intf_cfg sm7150_intf[] =3D { { .name =3D "intf_0", .id =3D INTF_0, .base =3D 0x6a000, .len =3D 0x280, - .features =3D INTF_SC7180_MASK, .type =3D INTF_DP, .controller_id =3D MSM_DP_CONTROLLER_0, .prog_fetch_lines_worst_case =3D 24, @@ -221,7 +220,6 @@ static const struct dpu_intf_cfg sm7150_intf[] =3D { }, { .name =3D "intf_1", .id =3D INTF_1, .base =3D 0x6a800, .len =3D 0x2bc, - .features =3D INTF_SC7180_MASK, .type =3D INTF_DSI, .controller_id =3D MSM_DSI_CONTROLLER_0, .prog_fetch_lines_worst_case =3D 24, @@ -231,7 +229,6 @@ static const struct dpu_intf_cfg sm7150_intf[] =3D { }, { .name =3D "intf_2", .id =3D INTF_2, .base =3D 0x6b000, .len =3D 0x2bc, - .features =3D INTF_SC7180_MASK, .type =3D INTF_DSI, .controller_id =3D MSM_DSI_CONTROLLER_1, .prog_fetch_lines_worst_case =3D 24, @@ -241,7 +238,6 @@ static const struct dpu_intf_cfg sm7150_intf[] =3D { }, { .name =3D "intf_3", .id =3D INTF_3, .base =3D 0x6b800, .len =3D 0x280, - .features =3D INTF_SC7180_MASK, .type =3D INTF_DP, .controller_id =3D MSM_DP_CONTROLLER_1, .prog_fetch_lines_worst_case =3D 24, diff --git a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_5_3_sm6150.h b/drive= rs/gpu/drm/msm/disp/dpu1/catalog/dpu_5_3_sm6150.h index d44db988a6e2f443803a422846f817779d382b2a..a99c99ca37703cc3a7d4403d3f0= 26f234b693319 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_5_3_sm6150.h +++ b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_5_3_sm6150.h @@ -175,7 +175,6 @@ static const struct dpu_intf_cfg sm6150_intf[] =3D { { .name =3D "intf_0", .id =3D INTF_0, .base =3D 0x6a000, .len =3D 0x280, - .features =3D INTF_SC7180_MASK, .type =3D INTF_DP, .controller_id =3D MSM_DP_CONTROLLER_0, .prog_fetch_lines_worst_case =3D 24, @@ -184,7 +183,6 @@ static const struct dpu_intf_cfg sm6150_intf[] =3D { }, { .name =3D "intf_1", .id =3D INTF_1, .base =3D 0x6a800, .len =3D 0x2c0, - .features =3D INTF_SC7180_MASK, .type =3D INTF_DSI, .controller_id =3D MSM_DSI_CONTROLLER_0, .prog_fetch_lines_worst_case =3D 24, @@ -194,7 +192,6 @@ static const struct dpu_intf_cfg sm6150_intf[] =3D { }, { .name =3D "intf_3", .id =3D INTF_3, .base =3D 0x6b800, .len =3D 0x280, - .features =3D INTF_SC7180_MASK, .type =3D INTF_DP, .controller_id =3D MSM_DP_CONTROLLER_1, .prog_fetch_lines_worst_case =3D 24, diff --git a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_5_4_sm6125.h b/drive= rs/gpu/drm/msm/disp/dpu1/catalog/dpu_5_4_sm6125.h index ba631cdbbff0cec7453685bc1028791eadbbb2d4..0dce5292fdfe7988504d51d701d= 3908adf9b596a 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_5_4_sm6125.h +++ b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_5_4_sm6125.h @@ -152,7 +152,6 @@ static const struct dpu_intf_cfg sm6125_intf[] =3D { { .name =3D "intf_0", .id =3D INTF_0, .base =3D 0x6a000, .len =3D 0x280, - .features =3D INTF_SC7180_MASK, .type =3D INTF_DP, .controller_id =3D MSM_DP_CONTROLLER_0, .prog_fetch_lines_worst_case =3D 24, @@ -161,7 +160,6 @@ static const struct dpu_intf_cfg sm6125_intf[] =3D { }, { .name =3D "intf_1", .id =3D INTF_1, .base =3D 0x6a800, .len =3D 0x2c0, - .features =3D INTF_SC7180_MASK, .type =3D INTF_DSI, .controller_id =3D 0, .prog_fetch_lines_worst_case =3D 24, diff --git a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_6_0_sm8250.h b/drive= rs/gpu/drm/msm/disp/dpu1/catalog/dpu_6_0_sm8250.h index 5f7bee25a7a4f80d1f2fb86f126863b721c41281..6fce6d382c959b7ae47591f52dd= 06bcf241ff4e2 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_6_0_sm8250.h +++ b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_6_0_sm8250.h @@ -287,7 +287,6 @@ static const struct dpu_intf_cfg sm8250_intf[] =3D { { .name =3D "intf_0", .id =3D INTF_0, .base =3D 0x6a000, .len =3D 0x280, - .features =3D INTF_SC7180_MASK, .type =3D INTF_DP, .controller_id =3D MSM_DP_CONTROLLER_0, .prog_fetch_lines_worst_case =3D 24, @@ -296,7 +295,6 @@ static const struct dpu_intf_cfg sm8250_intf[] =3D { }, { .name =3D "intf_1", .id =3D INTF_1, .base =3D 0x6a800, .len =3D 0x2c0, - .features =3D INTF_SC7180_MASK, .type =3D INTF_DSI, .controller_id =3D MSM_DSI_CONTROLLER_0, .prog_fetch_lines_worst_case =3D 24, @@ -306,7 +304,6 @@ static const struct dpu_intf_cfg sm8250_intf[] =3D { }, { .name =3D "intf_2", .id =3D INTF_2, .base =3D 0x6b000, .len =3D 0x2c0, - .features =3D INTF_SC7180_MASK, .type =3D INTF_DSI, .controller_id =3D MSM_DSI_CONTROLLER_1, .prog_fetch_lines_worst_case =3D 24, @@ -316,7 +313,6 @@ static const struct dpu_intf_cfg sm8250_intf[] =3D { }, { .name =3D "intf_3", .id =3D INTF_3, .base =3D 0x6b800, .len =3D 0x280, - .features =3D INTF_SC7180_MASK, .type =3D INTF_DP, .controller_id =3D MSM_DP_CONTROLLER_1, .prog_fetch_lines_worst_case =3D 24, diff --git a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_6_2_sc7180.h b/drive= rs/gpu/drm/msm/disp/dpu1/catalog/dpu_6_2_sc7180.h index 0ede8223a3a85414f271de11b601b648ca865fbe..52b674fed71e57f82b778c13f67= 12a52a2a425a7 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_6_2_sc7180.h +++ b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_6_2_sc7180.h @@ -129,7 +129,6 @@ static const struct dpu_intf_cfg sc7180_intf[] =3D { { .name =3D "intf_0", .id =3D INTF_0, .base =3D 0x6a000, .len =3D 0x280, - .features =3D INTF_SC7180_MASK, .type =3D INTF_DP, .controller_id =3D MSM_DP_CONTROLLER_0, .prog_fetch_lines_worst_case =3D 24, @@ -138,7 +137,6 @@ static const struct dpu_intf_cfg sc7180_intf[] =3D { }, { .name =3D "intf_1", .id =3D INTF_1, .base =3D 0x6a800, .len =3D 0x2c0, - .features =3D INTF_SC7180_MASK, .type =3D INTF_DSI, .controller_id =3D MSM_DSI_CONTROLLER_0, .prog_fetch_lines_worst_case =3D 24, diff --git a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_6_3_sm6115.h b/drive= rs/gpu/drm/msm/disp/dpu1/catalog/dpu_6_3_sm6115.h index 01e398add3c45a8bc504da5ca268df0487462113..0178ce52e84f355919241435f58= c390234c16162 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_6_3_sm6115.h +++ b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_6_3_sm6115.h @@ -87,7 +87,6 @@ static const struct dpu_intf_cfg sm6115_intf[] =3D { { .name =3D "intf_1", .id =3D INTF_1, .base =3D 0x6a800, .len =3D 0x2c0, - .features =3D INTF_SC7180_MASK, .type =3D INTF_DSI, .controller_id =3D MSM_DSI_CONTROLLER_0, .prog_fetch_lines_worst_case =3D 24, diff --git a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_6_4_sm6350.h b/drive= rs/gpu/drm/msm/disp/dpu1/catalog/dpu_6_4_sm6350.h index da04822327975aa70cab679f5e53d53f65fb749c..89db83a73bbeb15b99ac4324b76= 85baf0d724039 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_6_4_sm6350.h +++ b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_6_4_sm6350.h @@ -160,7 +160,6 @@ static const struct dpu_intf_cfg sm6350_intf[] =3D { { .name =3D "intf_0", .id =3D INTF_0, .base =3D 0x6a000, .len =3D 0x280, - .features =3D INTF_SC7180_MASK, .type =3D INTF_DP, .controller_id =3D MSM_DP_CONTROLLER_0, .prog_fetch_lines_worst_case =3D 35, @@ -169,7 +168,6 @@ static const struct dpu_intf_cfg sm6350_intf[] =3D { }, { .name =3D "intf_1", .id =3D INTF_1, .base =3D 0x6a800, .len =3D 0x2c0, - .features =3D INTF_SC7180_MASK, .type =3D INTF_DSI, .controller_id =3D MSM_DSI_CONTROLLER_0, .prog_fetch_lines_worst_case =3D 35, diff --git a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_6_5_qcm2290.h b/driv= ers/gpu/drm/msm/disp/dpu1/catalog/dpu_6_5_qcm2290.h index 94dc8726199a3a48a64c7dff58bc62e6fd097c99..0b1740de2bff94f1818ab41c6bc= 713f16796c4a4 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_6_5_qcm2290.h +++ b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_6_5_qcm2290.h @@ -87,7 +87,6 @@ static const struct dpu_intf_cfg qcm2290_intf[] =3D { { .name =3D "intf_1", .id =3D INTF_1, .base =3D 0x6a800, .len =3D 0x2c0, - .features =3D INTF_SC7180_MASK, .type =3D INTF_DSI, .controller_id =3D MSM_DSI_CONTROLLER_0, .prog_fetch_lines_worst_case =3D 24, diff --git a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_6_9_sm6375.h b/drive= rs/gpu/drm/msm/disp/dpu1/catalog/dpu_6_9_sm6375.h index 2b2b9417e23950425a72f6dd44baf824b5a00061..19800f207bff3077c7ac57ad736= eea533674ae20 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_6_9_sm6375.h +++ b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_6_9_sm6375.h @@ -97,7 +97,6 @@ static const struct dpu_intf_cfg sm6375_intf[] =3D { { .name =3D "intf_1", .id =3D INTF_1, .base =3D 0x6a800, .len =3D 0x2c0, - .features =3D INTF_SC7180_MASK, .type =3D INTF_DSI, .controller_id =3D MSM_DSI_CONTROLLER_0, .prog_fetch_lines_worst_case =3D 24, diff --git a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_7_0_sm8350.h b/drive= rs/gpu/drm/msm/disp/dpu1/catalog/dpu_7_0_sm8350.h index 490ddf9880103fc853b5187256c4b960739820bc..94a9f33f008a13db09764882cb0= 42f71337b89d5 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_7_0_sm8350.h +++ b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_7_0_sm8350.h @@ -311,7 +311,6 @@ static const struct dpu_intf_cfg sm8350_intf[] =3D { { .name =3D "intf_0", .id =3D INTF_0, .base =3D 0x34000, .len =3D 0x280, - .features =3D INTF_SC7180_MASK, .type =3D INTF_DP, .controller_id =3D MSM_DP_CONTROLLER_0, .prog_fetch_lines_worst_case =3D 24, @@ -320,7 +319,6 @@ static const struct dpu_intf_cfg sm8350_intf[] =3D { }, { .name =3D "intf_1", .id =3D INTF_1, .base =3D 0x35000, .len =3D 0x2c4, - .features =3D INTF_SC7180_MASK, .type =3D INTF_DSI, .controller_id =3D MSM_DSI_CONTROLLER_0, .prog_fetch_lines_worst_case =3D 24, @@ -330,7 +328,6 @@ static const struct dpu_intf_cfg sm8350_intf[] =3D { }, { .name =3D "intf_2", .id =3D INTF_2, .base =3D 0x36000, .len =3D 0x2c4, - .features =3D INTF_SC7180_MASK, .type =3D INTF_DSI, .controller_id =3D MSM_DSI_CONTROLLER_1, .prog_fetch_lines_worst_case =3D 24, @@ -340,7 +337,6 @@ static const struct dpu_intf_cfg sm8350_intf[] =3D { }, { .name =3D "intf_3", .id =3D INTF_3, .base =3D 0x37000, .len =3D 0x280, - .features =3D INTF_SC7180_MASK, .type =3D INTF_DP, .controller_id =3D MSM_DP_CONTROLLER_1, .prog_fetch_lines_worst_case =3D 24, diff --git a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_7_2_sc7280.h b/drive= rs/gpu/drm/msm/disp/dpu1/catalog/dpu_7_2_sc7280.h index 2ee29c56224596b3786104090290b88cecf7b223..d1dd895acbf666ceab39f9c38ae= 11bda100b5953 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_7_2_sc7280.h +++ b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_7_2_sc7280.h @@ -178,7 +178,6 @@ static const struct dpu_intf_cfg sc7280_intf[] =3D { { .name =3D "intf_0", .id =3D INTF_0, .base =3D 0x34000, .len =3D 0x280, - .features =3D INTF_SC7180_MASK, .type =3D INTF_DP, .controller_id =3D MSM_DP_CONTROLLER_0, .prog_fetch_lines_worst_case =3D 24, @@ -187,7 +186,6 @@ static const struct dpu_intf_cfg sc7280_intf[] =3D { }, { .name =3D "intf_1", .id =3D INTF_1, .base =3D 0x35000, .len =3D 0x2c4, - .features =3D INTF_SC7180_MASK, .type =3D INTF_DSI, .controller_id =3D MSM_DSI_CONTROLLER_0, .prog_fetch_lines_worst_case =3D 24, @@ -197,7 +195,6 @@ static const struct dpu_intf_cfg sc7280_intf[] =3D { }, { .name =3D "intf_5", .id =3D INTF_5, .base =3D 0x39000, .len =3D 0x280, - .features =3D INTF_SC7180_MASK, .type =3D INTF_DP, .controller_id =3D MSM_DP_CONTROLLER_1, .prog_fetch_lines_worst_case =3D 24, diff --git a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_8_0_sc8280xp.h b/dri= vers/gpu/drm/msm/disp/dpu1/catalog/dpu_8_0_sc8280xp.h index dac38e0ade971876c2ed73b6d46cd4055cb77d2d..5b765620d6eff14327f8eff811e= e3b7b8fd404a5 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_8_0_sc8280xp.h +++ b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_8_0_sc8280xp.h @@ -307,7 +307,6 @@ static const struct dpu_intf_cfg sc8280xp_intf[] =3D { { .name =3D "intf_0", .id =3D INTF_0, .base =3D 0x34000, .len =3D 0x280, - .features =3D INTF_SC7180_MASK, .type =3D INTF_DP, .controller_id =3D MSM_DP_CONTROLLER_0, .prog_fetch_lines_worst_case =3D 24, @@ -316,7 +315,6 @@ static const struct dpu_intf_cfg sc8280xp_intf[] =3D { }, { .name =3D "intf_1", .id =3D INTF_1, .base =3D 0x35000, .len =3D 0x300, - .features =3D INTF_SC7180_MASK, .type =3D INTF_DSI, .controller_id =3D MSM_DSI_CONTROLLER_0, .prog_fetch_lines_worst_case =3D 24, @@ -326,7 +324,6 @@ static const struct dpu_intf_cfg sc8280xp_intf[] =3D { }, { .name =3D "intf_2", .id =3D INTF_2, .base =3D 0x36000, .len =3D 0x300, - .features =3D INTF_SC7180_MASK, .type =3D INTF_DSI, .controller_id =3D MSM_DSI_CONTROLLER_1, .prog_fetch_lines_worst_case =3D 24, @@ -336,7 +333,6 @@ static const struct dpu_intf_cfg sc8280xp_intf[] =3D { }, { .name =3D "intf_3", .id =3D INTF_3, .base =3D 0x37000, .len =3D 0x280, - .features =3D INTF_SC7180_MASK, .type =3D INTF_NONE, .controller_id =3D MSM_DP_CONTROLLER_0, .prog_fetch_lines_worst_case =3D 24, @@ -345,7 +341,6 @@ static const struct dpu_intf_cfg sc8280xp_intf[] =3D { }, { .name =3D "intf_4", .id =3D INTF_4, .base =3D 0x38000, .len =3D 0x280, - .features =3D INTF_SC7180_MASK, .type =3D INTF_DP, .controller_id =3D MSM_DP_CONTROLLER_1, .prog_fetch_lines_worst_case =3D 24, @@ -354,7 +349,6 @@ static const struct dpu_intf_cfg sc8280xp_intf[] =3D { }, { .name =3D "intf_5", .id =3D INTF_5, .base =3D 0x39000, .len =3D 0x280, - .features =3D INTF_SC7180_MASK, .type =3D INTF_DP, .controller_id =3D MSM_DP_CONTROLLER_3, .prog_fetch_lines_worst_case =3D 24, @@ -363,7 +357,6 @@ static const struct dpu_intf_cfg sc8280xp_intf[] =3D { }, { .name =3D "intf_6", .id =3D INTF_6, .base =3D 0x3a000, .len =3D 0x280, - .features =3D INTF_SC7180_MASK, .type =3D INTF_DP, .controller_id =3D MSM_DP_CONTROLLER_2, .prog_fetch_lines_worst_case =3D 24, @@ -372,7 +365,6 @@ static const struct dpu_intf_cfg sc8280xp_intf[] =3D { }, { .name =3D "intf_7", .id =3D INTF_7, .base =3D 0x3b000, .len =3D 0x280, - .features =3D INTF_SC7180_MASK, .type =3D INTF_NONE, .controller_id =3D MSM_DP_CONTROLLER_2, .prog_fetch_lines_worst_case =3D 24, @@ -381,7 +373,6 @@ static const struct dpu_intf_cfg sc8280xp_intf[] =3D { }, { .name =3D "intf_8", .id =3D INTF_8, .base =3D 0x3c000, .len =3D 0x280, - .features =3D INTF_SC7180_MASK, .type =3D INTF_NONE, .controller_id =3D MSM_DP_CONTROLLER_1, .prog_fetch_lines_worst_case =3D 24, diff --git a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_8_1_sm8450.h b/drive= rs/gpu/drm/msm/disp/dpu1/catalog/dpu_8_1_sm8450.h index db332286a0a92cfda434571a2a582c45460e5300..770c2236afebe8b6bb38f2eab4d= 201fbf4256342 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_8_1_sm8450.h +++ b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_8_1_sm8450.h @@ -327,7 +327,6 @@ static const struct dpu_intf_cfg sm8450_intf[] =3D { { .name =3D "intf_0", .id =3D INTF_0, .base =3D 0x34000, .len =3D 0x280, - .features =3D INTF_SC7180_MASK, .type =3D INTF_DP, .controller_id =3D MSM_DP_CONTROLLER_0, .prog_fetch_lines_worst_case =3D 24, @@ -336,7 +335,6 @@ static const struct dpu_intf_cfg sm8450_intf[] =3D { }, { .name =3D "intf_1", .id =3D INTF_1, .base =3D 0x35000, .len =3D 0x300, - .features =3D INTF_SC7180_MASK, .type =3D INTF_DSI, .controller_id =3D MSM_DSI_CONTROLLER_0, .prog_fetch_lines_worst_case =3D 24, @@ -346,7 +344,6 @@ static const struct dpu_intf_cfg sm8450_intf[] =3D { }, { .name =3D "intf_2", .id =3D INTF_2, .base =3D 0x36000, .len =3D 0x300, - .features =3D INTF_SC7180_MASK, .type =3D INTF_DSI, .controller_id =3D MSM_DSI_CONTROLLER_1, .prog_fetch_lines_worst_case =3D 24, @@ -356,7 +353,6 @@ static const struct dpu_intf_cfg sm8450_intf[] =3D { }, { .name =3D "intf_3", .id =3D INTF_3, .base =3D 0x37000, .len =3D 0x280, - .features =3D INTF_SC7180_MASK, .type =3D INTF_DP, .controller_id =3D MSM_DP_CONTROLLER_1, .prog_fetch_lines_worst_case =3D 24, diff --git a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_8_4_sa8775p.h b/driv= ers/gpu/drm/msm/disp/dpu1/catalog/dpu_8_4_sa8775p.h index 826cd366495139e0e4cf1862e923ef0ece0d7184..6f376b716690a8e144d2ad9c424= 232c7a535c45e 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_8_4_sa8775p.h +++ b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_8_4_sa8775p.h @@ -337,7 +337,6 @@ static const struct dpu_intf_cfg sa8775p_intf[] =3D { { .name =3D "intf_0", .id =3D INTF_0, .base =3D 0x34000, .len =3D 0x280, - .features =3D INTF_SC7180_MASK, .type =3D INTF_DP, .controller_id =3D MSM_DP_CONTROLLER_0, .prog_fetch_lines_worst_case =3D 24, @@ -346,7 +345,6 @@ static const struct dpu_intf_cfg sa8775p_intf[] =3D { }, { .name =3D "intf_1", .id =3D INTF_1, .base =3D 0x35000, .len =3D 0x300, - .features =3D INTF_SC7180_MASK, .type =3D INTF_DSI, .controller_id =3D MSM_DSI_CONTROLLER_0, .prog_fetch_lines_worst_case =3D 24, @@ -356,7 +354,6 @@ static const struct dpu_intf_cfg sa8775p_intf[] =3D { }, { .name =3D "intf_2", .id =3D INTF_2, .base =3D 0x36000, .len =3D 0x300, - .features =3D INTF_SC7180_MASK, .type =3D INTF_DSI, .controller_id =3D MSM_DSI_CONTROLLER_1, .prog_fetch_lines_worst_case =3D 24, @@ -366,7 +363,6 @@ static const struct dpu_intf_cfg sa8775p_intf[] =3D { }, { .name =3D "intf_3", .id =3D INTF_3, .base =3D 0x37000, .len =3D 0x280, - .features =3D INTF_SC7180_MASK, .type =3D INTF_NONE, .controller_id =3D MSM_DP_CONTROLLER_0, /* pair with intf_0 for DP MST */ .prog_fetch_lines_worst_case =3D 24, @@ -375,7 +371,6 @@ static const struct dpu_intf_cfg sa8775p_intf[] =3D { }, { .name =3D "intf_4", .id =3D INTF_4, .base =3D 0x38000, .len =3D 0x280, - .features =3D INTF_SC7180_MASK, .type =3D INTF_DP, .controller_id =3D MSM_DP_CONTROLLER_1, .prog_fetch_lines_worst_case =3D 24, @@ -384,7 +379,6 @@ static const struct dpu_intf_cfg sa8775p_intf[] =3D { }, { .name =3D "intf_6", .id =3D INTF_6, .base =3D 0x3A000, .len =3D 0x280, - .features =3D INTF_SC7180_MASK, .type =3D INTF_NONE, .controller_id =3D MSM_DP_CONTROLLER_0, /* pair with intf_0 for DP MST */ .prog_fetch_lines_worst_case =3D 24, @@ -393,7 +387,6 @@ static const struct dpu_intf_cfg sa8775p_intf[] =3D { }, { .name =3D "intf_7", .id =3D INTF_7, .base =3D 0x3b000, .len =3D 0x280, - .features =3D INTF_SC7180_MASK, .type =3D INTF_NONE, .controller_id =3D MSM_DP_CONTROLLER_0, /* pair with intf_0 for DP MST */ .prog_fetch_lines_worst_case =3D 24, @@ -402,7 +395,6 @@ static const struct dpu_intf_cfg sa8775p_intf[] =3D { }, { .name =3D "intf_8", .id =3D INTF_8, .base =3D 0x3c000, .len =3D 0x280, - .features =3D INTF_SC7180_MASK, .type =3D INTF_NONE, .controller_id =3D MSM_DP_CONTROLLER_1, /* pair with intf_4 for DP MST */ .prog_fetch_lines_worst_case =3D 24, diff --git a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_9_0_sm8550.h b/drive= rs/gpu/drm/msm/disp/dpu1/catalog/dpu_9_0_sm8550.h index f5f018381b4f0f59c2751b18528994ff79555d58..b03077865cd545219e814311bec= 4d8da4fd9974c 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_9_0_sm8550.h +++ b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_9_0_sm8550.h @@ -322,7 +322,6 @@ static const struct dpu_intf_cfg sm8550_intf[] =3D { { .name =3D "intf_0", .id =3D INTF_0, .base =3D 0x34000, .len =3D 0x280, - .features =3D INTF_SC7180_MASK, .type =3D INTF_DP, .controller_id =3D MSM_DP_CONTROLLER_0, .prog_fetch_lines_worst_case =3D 24, @@ -331,7 +330,6 @@ static const struct dpu_intf_cfg sm8550_intf[] =3D { }, { .name =3D "intf_1", .id =3D INTF_1, .base =3D 0x35000, .len =3D 0x300, - .features =3D INTF_SC7180_MASK, .type =3D INTF_DSI, .controller_id =3D MSM_DSI_CONTROLLER_0, .prog_fetch_lines_worst_case =3D 24, @@ -341,7 +339,6 @@ static const struct dpu_intf_cfg sm8550_intf[] =3D { }, { .name =3D "intf_2", .id =3D INTF_2, .base =3D 0x36000, .len =3D 0x300, - .features =3D INTF_SC7180_MASK, .type =3D INTF_DSI, .controller_id =3D MSM_DSI_CONTROLLER_1, .prog_fetch_lines_worst_case =3D 24, @@ -351,7 +348,6 @@ static const struct dpu_intf_cfg sm8550_intf[] =3D { }, { .name =3D "intf_3", .id =3D INTF_3, .base =3D 0x37000, .len =3D 0x280, - .features =3D INTF_SC7180_MASK, .type =3D INTF_DP, .controller_id =3D MSM_DP_CONTROLLER_1, .prog_fetch_lines_worst_case =3D 24, diff --git a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_9_2_x1e80100.h b/dri= vers/gpu/drm/msm/disp/dpu1/catalog/dpu_9_2_x1e80100.h index ecda48282f52e0fc33b68117650b9f2b76c90276..a587c6bba11c30d9090aa6c48d1= 1c7b65819a58e 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_9_2_x1e80100.h +++ b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_9_2_x1e80100.h @@ -323,7 +323,6 @@ static const struct dpu_intf_cfg x1e80100_intf[] =3D { { .name =3D "intf_0", .id =3D INTF_0, .base =3D 0x34000, .len =3D 0x280, - .features =3D INTF_SC7180_MASK, .type =3D INTF_DP, .controller_id =3D MSM_DP_CONTROLLER_0, .prog_fetch_lines_worst_case =3D 24, @@ -332,7 +331,6 @@ static const struct dpu_intf_cfg x1e80100_intf[] =3D { }, { .name =3D "intf_1", .id =3D INTF_1, .base =3D 0x35000, .len =3D 0x300, - .features =3D INTF_SC7180_MASK, .type =3D INTF_DSI, .controller_id =3D MSM_DSI_CONTROLLER_0, .prog_fetch_lines_worst_case =3D 24, @@ -342,7 +340,6 @@ static const struct dpu_intf_cfg x1e80100_intf[] =3D { }, { .name =3D "intf_2", .id =3D INTF_2, .base =3D 0x36000, .len =3D 0x300, - .features =3D INTF_SC7180_MASK, .type =3D INTF_DSI, .controller_id =3D MSM_DSI_CONTROLLER_1, .prog_fetch_lines_worst_case =3D 24, @@ -352,7 +349,6 @@ static const struct dpu_intf_cfg x1e80100_intf[] =3D { }, { .name =3D "intf_3", .id =3D INTF_3, .base =3D 0x37000, .len =3D 0x280, - .features =3D INTF_SC7180_MASK, .type =3D INTF_NONE, .controller_id =3D MSM_DP_CONTROLLER_0, /* pair with intf_0 for DP MST */ .prog_fetch_lines_worst_case =3D 24, @@ -361,7 +357,6 @@ static const struct dpu_intf_cfg x1e80100_intf[] =3D { }, { .name =3D "intf_4", .id =3D INTF_4, .base =3D 0x38000, .len =3D 0x280, - .features =3D INTF_SC7180_MASK, .type =3D INTF_DP, .controller_id =3D MSM_DP_CONTROLLER_1, .prog_fetch_lines_worst_case =3D 24, @@ -370,7 +365,6 @@ static const struct dpu_intf_cfg x1e80100_intf[] =3D { }, { .name =3D "intf_5", .id =3D INTF_5, .base =3D 0x39000, .len =3D 0x280, - .features =3D INTF_SC7180_MASK, .type =3D INTF_DP, .controller_id =3D MSM_DP_CONTROLLER_3, .prog_fetch_lines_worst_case =3D 24, @@ -379,7 +373,6 @@ static const struct dpu_intf_cfg x1e80100_intf[] =3D { }, { .name =3D "intf_6", .id =3D INTF_6, .base =3D 0x3A000, .len =3D 0x280, - .features =3D INTF_SC7180_MASK, .type =3D INTF_DP, .controller_id =3D MSM_DP_CONTROLLER_2, .prog_fetch_lines_worst_case =3D 24, @@ -388,7 +381,6 @@ static const struct dpu_intf_cfg x1e80100_intf[] =3D { }, { .name =3D "intf_7", .id =3D INTF_7, .base =3D 0x3b000, .len =3D 0x280, - .features =3D INTF_SC7180_MASK, .type =3D INTF_NONE, .controller_id =3D MSM_DP_CONTROLLER_2, /* pair with intf_6 for DP MST */ .prog_fetch_lines_worst_case =3D 24, @@ -397,7 +389,6 @@ static const struct dpu_intf_cfg x1e80100_intf[] =3D { }, { .name =3D "intf_8", .id =3D INTF_8, .base =3D 0x3c000, .len =3D 0x280, - .features =3D INTF_SC7180_MASK, .type =3D INTF_NONE, .controller_id =3D MSM_DP_CONTROLLER_1, /* pair with intf_4 for DP MST */ .prog_fetch_lines_worst_case =3D 24, diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.c b/drivers/gpu/d= rm/msm/disp/dpu1/dpu_hw_catalog.c index 8808be27593b303a2a199a740827c92ea5339b0d..5e0123557a44fda1d250130e09e= 4968535927088 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.c +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.c @@ -110,9 +110,6 @@ #define PINGPONG_SM8150_MASK \ (BIT(DPU_PINGPONG_DITHER) | BIT(DPU_PINGPONG_DSC)) =20 -#define INTF_SC7180_MASK \ - (BIT(DPU_INTF_INPUT_CTRL)) - #define WB_SDM845_MASK (BIT(DPU_WB_LINE_MODE) | \ BIT(DPU_WB_UBWC) | \ BIT(DPU_WB_YUV_CONFIG) | \ diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.h b/drivers/gpu/d= rm/msm/disp/dpu1/dpu_hw_catalog.h index 858fd73e0ac3a92fe402001d4796eb86945f61b0..33506e3bba9fc51f9e99446cb7d= f6aa51d81a3b1 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.h +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.h @@ -141,17 +141,6 @@ enum { DPU_CTL_MAX }; =20 -/** - * INTF sub-blocks - * @DPU_INTF_INPUT_CTRL Supports the setting of pp block from = which - * pixel data arrives to this INTF - * @DPU_INTF_MAX - */ -enum { - DPU_INTF_INPUT_CTRL =3D 0x1, - DPU_INTF_MAX -}; - /** * WB sub-blocks and features * @DPU_WB_LINE_MODE Writeback module supports line/linear mode diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_intf.c b/drivers/gpu/drm/= msm/disp/dpu1/dpu_hw_intf.c index 54c2e984ef0ce604e3eda49595d2816ea41bd7fd..a80ac82a96255da1d52e1f2fa7f= c39388fc3782b 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_intf.c +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_intf.c @@ -588,7 +588,7 @@ struct dpu_hw_intf *dpu_hw_intf_init(struct drm_device = *dev, c->ops.setup_misr =3D dpu_hw_intf_setup_misr; c->ops.collect_misr =3D dpu_hw_intf_collect_misr; =20 - if (cfg->features & BIT(DPU_INTF_INPUT_CTRL)) + if (mdss_rev->core_major_ver >=3D 5) c->ops.bind_pingpong_blk =3D dpu_hw_intf_bind_pingpong_blk; =20 /* INTF TE is only for DSI interfaces */ --=20 2.39.5