From mboxrd@z Thu Jan 1 00:00:00 1970 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 7FE102594B4; Fri, 10 Jan 2025 00:31:04 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=205.220.180.131 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1736469066; cv=none; b=J5R6Sb4FWCyAmxrKIh1AhJw6SMAMZBhQ4ITyDsG4Fj1/1600dt7MsYncxuJJajnZN+qvZxEM0G9Z6rdCqehqbmWRLHTmYNlLg/b8quCBPBDljyeuhcjps1bc42RMJNn+ELTq818J2hzqvWdftvqfXVVgWx/Zfpln815klRiT1Ew= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1736469066; c=relaxed/simple; bh=z52YQX8gQYTCfGGy91pGy57O7BvSZcfP9+GFdUPZDWA=; h=Message-ID:Date:MIME-Version:Subject:To:CC:References:From: In-Reply-To:Content-Type; b=cVQLLm7dXNIx9+pKGVxBh5Ybb2GHBu7ktLWtQWach12xDcymfOvYXBMAvNGPRA8ziXUcbq1q1SuTvF/1lnYMf7INbb8VvMurKWbVwLsloMsccgpCI86DYHpMuUPgu0s+EWvAcN55CzhdP4U3/D2/xyfeAWQZStwVkVWkMNU4HO0= 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=MzAdWqn/; 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="MzAdWqn/" 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 509FsImC008045; Fri, 10 Jan 2025 00:30:48 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= VbH1HHcelxywTv8xyO7ItmqOafGq6JB2aI8BO18/1mc=; b=MzAdWqn/u6gwYiAM LMIGRHtJaocyrZT7WYIjPGCb+ailaCkRiAkICFADrzdj/dnh2DBIUi1dTPGP0vEe vSG1lOTNgSsFsnAwb7vY2yue2N2nlx9OP5Ifw8icu1L7xnw79/UQsFoUpiU/DIc5 4LnaCnS4EMupYQONn4Y0y1toIXovJxoiLREfHL/KZxRz15kqLwlOt1nDaNYPsARQ amP1/5MeF9FZm2d+i76bfFakqu196t7eyOoIrq6Ng6LZ0laZDD5P65pekqE4blEH qKdvrlDp8RXFSo0IUaK+6hmG0wOZPTVWxSIMYMEp9NRF1AHsoilnCWKr6GUzxlpU M6UBGA== Received: from nasanppmta05.qualcomm.com (i-global254.qualcomm.com [199.106.103.254]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 442hgg12rw-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 10 Jan 2025 00:30:47 +0000 (GMT) Received: from nasanex01b.na.qualcomm.com (nasanex01b.na.qualcomm.com [10.46.141.250]) by NASANPPMTA05.qualcomm.com (8.18.1.2/8.18.1.2) with ESMTPS id 50A0Ukbi031157 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 10 Jan 2025 00:30:46 GMT Received: from [10.134.70.212] (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; Thu, 9 Jan 2025 16:30:44 -0800 Message-ID: <0b741278-7c81-406b-bd28-e0cb9252e459@quicinc.com> Date: Thu, 9 Jan 2025 16:30:42 -0800 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH v4 15/25] drm/msm/dpu: Add CWB to msm_display_topology Content-Language: en-US To: Dmitry Baryshkov CC: Rob Clark , , Sean Paul , Marijn Suijten , "David Airlie" , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , Simona Vetter , Simona Vetter , , , , , , Rob Clark , =?UTF-8?B?VmlsbGUgU3lyasOkbMOk?= References: <20241216-concurrent-wb-v4-0-fe220297a7f0@quicinc.com> <20241216-concurrent-wb-v4-15-fe220297a7f0@quicinc.com> <4069bd6a-c37f-4dbe-bbd6-5b333ee54ad8@quicinc.com> From: Jessica Zhang In-Reply-To: Content-Type: text/plain; charset="UTF-8"; format=flowed Content-Transfer-Encoding: 7bit X-ClientProxiedBy: nasanex01a.na.qualcomm.com (10.52.223.231) 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: VN38wp86vmSi6s-LECG8AG9TAFZqh-bQ X-Proofpoint-ORIG-GUID: VN38wp86vmSi6s-LECG8AG9TAFZqh-bQ 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 lowpriorityscore=0 clxscore=1015 mlxscore=0 priorityscore=1501 suspectscore=0 malwarescore=0 spamscore=0 phishscore=0 mlxlogscore=999 adultscore=0 bulkscore=0 impostorscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.19.0-2411120000 definitions=main-2501100001 On 1/9/2025 4:00 PM, Dmitry Baryshkov wrote: > On Thu, Jan 09, 2025 at 02:34:44PM -0800, Jessica Zhang wrote: >> >> >> On 1/3/2025 10:16 AM, Dmitry Baryshkov wrote: >>> On Fri, Jan 03, 2025 at 10:03:35AM -0800, Jessica Zhang wrote: >>>> >>>> >>>> On 12/19/2024 9:03 PM, Dmitry Baryshkov wrote: >>>>> On Mon, Dec 16, 2024 at 04:43:26PM -0800, Jessica Zhang wrote: >>>>>> Add the cwb_enabled flag to msm_display topology and adjust the toplogy >>>>>> to account for concurrent writeback >>>>> >>>>> Why? >>>> >>>> Hi Dmitry, >>>> >>>> This flag is necessary to specify that CWB mux(es) need to be assigned for >>>> the given reqeusted topology. >>> >>> Why is necessary? Please rephrase your statement (we need foo bar, so do >>> baz). >> >> Ack, what do you think of rephrasing the commit msg to this: >> >> ``` >> Add support for adjusting topology based on if concurrent writeback is >> enabled. >> >> Currently, the topology is calculated based on the assumption that the user >> cannot request real-time and writeback simultaneously. For example, the >> number of LMs and CTLs are currently based off the number of phys encoders >> under the assumption there will be at least 1 LM/CTL per phys encoder. >> >> This will not hold true for concurrent writeback as 2 phys encoders (1 >> real-time and 1 writeback) can be driven by 1 LM/CTL when concurrent >> writeback is enabled. >> >> To account for this, add a cwb_enabled flag and only adjust the number of >> CTL/LMs needed by a given topology based on the number of phys encoders only >> if CWB is not enabled. >> >> ``` >> >>> >>>> >>>>> >>>>>> >>>>>> Signed-off-by: Jessica Zhang >>>>>> --- >>>>>> drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c | 11 ++++++++++- >>>>>> drivers/gpu/drm/msm/disp/dpu1/dpu_rm.c | 10 ++++++++-- >>>>>> drivers/gpu/drm/msm/disp/dpu1/dpu_rm.h | 2 ++ >>>>>> 3 files changed, 20 insertions(+), 3 deletions(-) >>>>>> >>>>>> diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c >>>>>> index b4bfded3d53025853cee112ca598533ece290318..b063c8fe4c0594772d84401fa56c9c21afc0ad18 100644 >>>>>> --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c >>>>>> +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c >>>>>> @@ -1198,6 +1198,8 @@ static struct msm_display_topology dpu_crtc_get_topology( >>>>>> dpu_encoder_update_topology(drm_enc, &topology, crtc_state->state, >>>>>> &crtc_state->adjusted_mode); >>>>>> + topology.cwb_enabled = drm_crtc_in_clone_mode(crtc_state); >>>>>> + >>>>>> /* >>>>>> * Datapath topology selection >>>>>> * >>>>>> @@ -1209,9 +1211,16 @@ static struct msm_display_topology dpu_crtc_get_topology( >>>>>> * 2 LM, 1 INTF (stream merge to support high resolution interfaces) >>>>>> * >>>>>> * Add dspps to the reservation requirements if ctm is requested >>>>>> + * >>>>>> + * Only hardcode num_lm to 2 for cases where num_intf == 2 and CWB is not >>>>>> + * enabled. This is because in cases where CWB is enabled, num_intf will >>>>>> + * count both the WB and real-time phys encoders. >>>>>> + * >>>>>> + * For non-DSC CWB usecases, have the num_lm be decided by the >>>>>> + * (mode->hdisplay > MAX_HDISPLAY_SPLIT) check. >>>>>> */ >>>>>> - if (topology.num_intf == 2) >>>>>> + if (topology.num_intf == 2 && !topology.cwb_enabled) >>>>>> topology.num_lm = 2; >>>>>> else if (topology.num_dsc == 2) >>>>>> topology.num_lm = 2; >>>>>> diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_rm.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_rm.c >>>>>> index b763ef19f4c60ae8a35df6a6ffb19e8411bc63f8..85adaf256b2c705d2d7df378b6ffc0e578f52bc3 100644 >>>>>> --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_rm.c >>>>>> +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_rm.c >>>>>> @@ -382,8 +382,14 @@ static int _dpu_rm_reserve_ctls( >>>>>> int i = 0, j, num_ctls; >>>>>> bool needs_split_display; >>>>>> - /* each hw_intf needs its own hw_ctrl to program its control path */ >>>>>> - num_ctls = top->num_intf; >>>>>> + /* >>>>>> + * For non-CWB mode, each hw_intf needs its own hw_ctl to program its >>>>>> + * control path. Hardcode num_ctls to 1 if CWB is enabled >>>>>> + */ >>>>> >>>>> Why? >>>> >>>> This is because num_intf is based on the number of phys_encs. Since in the >>>> CWB case, the WB and real-time encoders will be driven by the same CTL. I >>>> can add this to the comment doc. >>> >>> Why are they driven by the same CTL? Is it also the case for platforms >>> before DPU 5.x? >> >> This is because the WB and real-time path for a given topology would be >> driven by the same data path so the same CTL should enable the real-time and >> WB active bits. >> >> This is the same for pre-DPU 5.x. > > But pre-5.x platforms didn't have ACTIVE_CTL, so they should be using > separte CTL for each of the physical encoders. For pre-DPU 5.x, enabling CWB would mean configuring the registers under both the WB and MODE_SEL_* cases here [1] [1] https://elixir.bootlin.com/linux/v6.12.6/source/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_ctl.c#L588 > >> >>> >>>> >>>> Thanks, >>>> >>>> Jessica Zhang >>>> >>>>> >>>>>> + if (top->cwb_enabled) >>>>>> + num_ctls = 1; >>>>>> + else >>>>>> + num_ctls = top->num_intf; >>>>>> needs_split_display = _dpu_rm_needs_split_display(top); >>>>>> diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_rm.h b/drivers/gpu/drm/msm/disp/dpu1/dpu_rm.h >>>>>> index b061dfdab52e04ab7d777e912a30173273cb3db7..12db21a2403ec6930894c36a58e898c5d94c2568 100644 >>>>>> --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_rm.h >>>>>> +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_rm.h >>>>>> @@ -46,6 +46,7 @@ struct dpu_rm { >>>>>> * @num_dspp: number of dspp blocks used >>>>>> * @num_dsc: number of Display Stream Compression (DSC) blocks used >>>>>> * @needs_cdm: indicates whether cdm block is needed for this display topology >>>>>> + * @cwb_enabled: indicates whether CWB is enabled for this display topology >>>>>> */ >>>>>> struct msm_display_topology { >>>>>> u32 num_lm; >>>>>> @@ -53,6 +54,7 @@ struct msm_display_topology { >>>>>> u32 num_dspp; >>>>>> u32 num_dsc; >>>>>> bool needs_cdm; >>>>>> + bool cwb_enabled; >>>>>> }; >>>>>> int dpu_rm_init(struct drm_device *dev, >>>>>> >>>>>> -- >>>>>> 2.34.1 >>>>>> >>>>> >>>>> -- >>>>> With best wishes >>>>> Dmitry >>>> >>> >>> -- >>> With best wishes >>> Dmitry >> > > -- > With best wishes > Dmitry