From nobody Tue Nov 26 18:36:47 2024 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 4F39018AEA; Thu, 17 Oct 2024 01:21:34 +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=1729128097; cv=none; b=QRESpd+W2gtFOwihrK2c9xGcvarG6FyxVcukqvyIMuO6gPYU5v/seWx6I/GNGqED2PZaXINkkiB8hwKEN5ekru0WbHBXrW8QJbOSIwAhACaK2FS9Ymw8/ogX0M/FCs/ob9IxnQRxRviP+xCcGown3/i4SCNpvcjMgch3a2PTSNg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1729128097; c=relaxed/simple; bh=9Rk7xw2N2sg3bvy2VqJKcXUhopzuAX8I09Kv9Ru6L14=; h=From:Date:Subject:MIME-Version:Content-Type:Message-ID:References: In-Reply-To:To:CC; b=WpPBmFhiGx95elf2ERqgRRiaFzftMjtVaJ/ufdpGzwjzQKlj10yXk6DT6U2g3lh3+lFlOvqOm0sbWkUbC2c8JqWelRvyvsGRoipB7G3LeWXS+j36H+QVsT3VUeYA9fi1AuoBLAiMB0zC2+YBdpJFiNZEhrEDbkz98Qr/ZIER32M= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=quicinc.com; spf=pass smtp.mailfrom=quicinc.com; dkim=pass (2048-bit key) header.d=quicinc.com header.i=@quicinc.com header.b=LXVhSwOf; arc=none smtp.client-ip=205.220.180.131 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=quicinc.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=quicinc.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=quicinc.com header.i=@quicinc.com header.b="LXVhSwOf" 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 49GGA7Is016942; Thu, 17 Oct 2024 01:21:19 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=quicinc.com; h= cc:content-transfer-encoding:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to; s=qcppdkim1; bh= dSLYOKeK2D050jVbWBjBAU12s5cTt5Q7YUsl0NzD0CY=; b=LXVhSwOf+HLASbzS Xuig02dEWCINyo/Sjz4oTVkefqMMDSuQxoNDR6AfW1SdJFXihBMCWGMlR+B4sEC9 qPc+QL6G5veQhshhIeRovff7Mc5XrjubajjbA/lnzHYCamwojXSgBCCJEu1RiWoR hJ9c+egj4Z9LC9XfyryKHcuatjAC6UqvSJtOT+T2XSRBN9zftg9o2urN1zcn0xmt AbOgEsrFL9/yuKcaqYKEJTUcP6KFKA/r8EP6P37d6ZmYAlc4g5Yyany+lQpeyzrN c/zlJr7A487DG4ve7gJloJnuHzdU0ktSlizMkaa67xMxJhycVkmmNt52iRJ23bCH 02Miug== Received: from nasanppmta04.qualcomm.com (i-global254.qualcomm.com [199.106.103.254]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 429mh56f2v-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Thu, 17 Oct 2024 01:21:19 +0000 (GMT) Received: from nasanex01b.na.qualcomm.com (nasanex01b.na.qualcomm.com [10.46.141.250]) by NASANPPMTA04.qualcomm.com (8.18.1.2/8.18.1.2) with ESMTPS id 49H1LIBW006362 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Thu, 17 Oct 2024 01:21:18 GMT Received: from jesszhan-linux.qualcomm.com (10.80.80.8) by nasanex01b.na.qualcomm.com (10.46.141.250) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1544.9; Wed, 16 Oct 2024 18:21:17 -0700 From: Jessica Zhang Date: Wed, 16 Oct 2024 18:21:13 -0700 Subject: [PATCH v3 07/23] drm/msm/dpu: Add CWB entry to catalog for SM8650 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: <20241016-concurrent-wb-v3-7-a33cf9b93835@quicinc.com> References: <20241016-concurrent-wb-v3-0-a33cf9b93835@quicinc.com> In-Reply-To: <20241016-concurrent-wb-v3-0-a33cf9b93835@quicinc.com> To: Rob Clark , Dmitry Baryshkov , , Sean Paul , Marijn Suijten , "David Airlie" , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , Simona Vetter , Simona Vetter CC: , , , , , Rob Clark , =?utf-8?q?Ville_Syrj=C3=A4l=C3=A4?= , "Jessica Zhang" X-Mailer: b4 0.15-dev-2a633 X-Developer-Signature: v=1; a=ed25519-sha256; t=1729128075; l=2728; i=quic_jesszhan@quicinc.com; s=20230329; h=from:subject:message-id; bh=9TggonaZnQBVGjsAorWrdM06bU69eZqz6oXH/eaygJI=; b=OmOU0C6d3JK/EWcTVBUa+CBO/uEAFe8v19icB/Xs/MUeHTu+kIK/j14XMFMuDw7iiwnhrclcY oIfC7hSfXIPCVKxrr3fEZMYEue8spzvDNcGtr+99fwiWypIYyNYYLip X-Developer-Key: i=quic_jesszhan@quicinc.com; a=ed25519; pk=gAUCgHZ6wTJOzQa3U0GfeCDH7iZLlqIEPo4rrjfDpWE= X-ClientProxiedBy: nasanex01b.na.qualcomm.com (10.46.141.250) To nasanex01b.na.qualcomm.com (10.46.141.250) X-QCInternal: smtphost X-Proofpoint-Virus-Version: vendor=nai engine=6200 definitions=5800 signatures=585085 X-Proofpoint-GUID: Xb6WFRWpHQJCvI0x3bb7I3ZUhnnkZYbf X-Proofpoint-ORIG-GUID: Xb6WFRWpHQJCvI0x3bb7I3ZUhnnkZYbf X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1039,Hydra:6.0.680,FMLib:17.12.60.29 definitions=2024-09-06_09,2024-09-06_01,2024-09-02_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 impostorscore=0 clxscore=1015 spamscore=0 priorityscore=1501 adultscore=0 mlxlogscore=999 lowpriorityscore=0 mlxscore=0 phishscore=0 malwarescore=0 suspectscore=0 bulkscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.19.0-2409260000 definitions=main-2410170008 From: Esha Bharadwaj Add a new block for concurrent writeback mux to the SM8650 HW catalog Signed-off-by: Esha Bharadwaj Reviewed-by: Dmitry Baryshkov Signed-off-by: Jessica Zhang --- .../gpu/drm/msm/disp/dpu1/catalog/dpu_10_0_sm8650.h | 21 +++++++++++++++++= ++++ drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.h | 13 +++++++++++++ 2 files changed, 34 insertions(+) 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 eb5dfff2ec4f48d793f9d83aafed592d0947f04b..33f5faf4833f7534a1403ccec56= 0fffe8ea0bb1f 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 @@ -350,6 +350,25 @@ static const struct dpu_wb_cfg sm8650_wb[] =3D { }, }; =20 +static const struct dpu_cwb_cfg sm8650_cwb[] =3D { + { + .name =3D "cwb_0", .id =3D CWB_0, + .base =3D 0x66200, .len =3D 0x8, + }, + { + .name =3D "cwb_1", .id =3D CWB_1, + .base =3D 0x66600, .len =3D 0x8, + }, + { + .name =3D "cwb_2", .id =3D CWB_2, + .base =3D 0x7E200, .len =3D 0x8, + }, + { + .name =3D "cwb_3", .id =3D CWB_3, + .base =3D 0x7E600, .len =3D 0x8, + }, +}; + static const struct dpu_intf_cfg sm8650_intf[] =3D { { .name =3D "intf_0", .id =3D INTF_0, @@ -447,6 +466,8 @@ const struct dpu_mdss_cfg dpu_sm8650_cfg =3D { .merge_3d =3D sm8650_merge_3d, .wb_count =3D ARRAY_SIZE(sm8650_wb), .wb =3D sm8650_wb, + .cwb_count =3D ARRAY_SIZE(sm8650_cwb), + .cwb =3D sm8650_cwb, .intf_count =3D ARRAY_SIZE(sm8650_intf), .intf =3D sm8650_intf, .vbif_count =3D ARRAY_SIZE(sm8650_vbif), 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 37e18e820a20a4c4ab9a97da78df19a2ff7cfa00..b42d8b3640e2bfcf9d64cd8de41= 6f87dcf82009b 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.h +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.h @@ -621,6 +621,16 @@ struct dpu_wb_cfg { enum dpu_clk_ctrl_type clk_ctrl; }; =20 +/* + * struct dpu_cwb_cfg : MDP CWB mux instance info + * @id: enum identifying this block + * @base: register base offset to mdss + * @features bit mask identifying sub-blocks/features + */ +struct dpu_cwb_cfg { + DPU_HW_BLK_INFO; +}; + /** * struct dpu_vbif_dynamic_ot_cfg - dynamic OT setting * @pps pixel per seconds @@ -823,6 +833,9 @@ struct dpu_mdss_cfg { u32 dspp_count; const struct dpu_dspp_cfg *dspp; =20 + u32 cwb_count; + const struct dpu_cwb_cfg *cwb; + /* Add additional block data structures here */ =20 const struct dpu_perf_cfg *perf; --=20 2.34.1