From mboxrd@z Thu Jan 1 00:00:00 1970 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 097021AB521; Wed, 28 Aug 2024 19:29:10 +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=1724873352; cv=none; b=ZLrVzJcY3Snk+TQX6hBBDalFvv2rN7wWZgMUgrdtSf5AfRy2v77j9UKF1Ioz2RHTCgwJCi8a8Aj5JPhJLXtVTtOPTSMYoLc7/Pox3p31eMY7qIlw8BFSAW7DPArja2GjYY8zQpWKW8M4xIJybJAQsOIiIya9ypPrPiKnYewdsVA= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1724873352; c=relaxed/simple; bh=JNQpCHio/7PsfDOjKeTprEoZn/UEuxEkSTJIxzLDNi8=; h=Message-ID:Date:MIME-Version:Subject:To:CC:References:From: In-Reply-To:Content-Type; b=LCEP+3ikmGQfNNs+aLVxY39NW0wI3VEAw4GiOcFNk/xPMuSqyidmkiyPzW42itd2ImAqrPMJznbnnktmYr68eJV8vykQR3W+iA/VS30QEc3KWLZP9IlT64Kjjdo/JqWJi5lecBwqiaTH7TWL+2o5xOXMdigd6jWWpd9zpaMH1FU= 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=Gq+PYT2z; arc=none smtp.client-ip=205.220.168.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="Gq+PYT2z" Received: from pps.filterd (m0279862.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 47SJMKLm013831; Wed, 28 Aug 2024 19:29:04 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= Mwtgi+gnjWuKo9mkFeZBhSIqHl8rbt68meeE7YfuJkE=; b=Gq+PYT2zPuF+r2Rl spITY+Qoz1JxTp7wyV6eapHPgQWNCNktw143r8hlYK/Ykd8rsCqmvw4FN5WYofSI u9om3ZBhukx3GmIhfiu0G23BHHI9zcMLGGq6DoEdD6qIKanvX1tlrsdyTM3Dzju4 KLn7j92X8oFExzLUbHuD1+uy+r5i7hIr3F/iqGFq5rM4Z60Zd6X/f3K60tvBc869 cC4gYkC56hLs0ssHXY2TjxKLhptsnXSeBrzaStYP+/cDxaM7NOprI+mW355k6/Un dk7bD8J/+hMKvxO9VmQK7teeVAEicG7wUpbXvjDAlUUwszsWub0RikDKQsRuvzAh CFTwEQ== Received: from nalasppmta03.qualcomm.com (Global_NAT1.qualcomm.com [129.46.96.20]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 419pv12v7r-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 28 Aug 2024 19:29:03 +0000 (GMT) Received: from nalasex01a.na.qualcomm.com (nalasex01a.na.qualcomm.com [10.47.209.196]) by NALASPPMTA03.qualcomm.com (8.18.1.2/8.18.1.2) with ESMTPS id 47SJT2ve007196 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 28 Aug 2024 19:29:02 GMT Received: from [10.71.111.76] (10.80.80.8) by nalasex01a.na.qualcomm.com (10.47.209.196) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1544.9; Wed, 28 Aug 2024 12:29:02 -0700 Message-ID: Date: Wed, 28 Aug 2024 12:29:01 -0700 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 v5 08/12] drm/msm/dpu: split dpu_plane_atomic_check() To: Dmitry Baryshkov CC: Rob Clark , Sean Paul , Marijn Suijten , David Airlie , Daniel Vetter , , , , References: <20240627-dpu-virtual-wide-v5-0-5efb90cbb8be@linaro.org> <20240627-dpu-virtual-wide-v5-8-5efb90cbb8be@linaro.org> <1facdd7c-b15d-4d91-b96a-5b3b72dbad66@quicinc.com> Content-Language: en-US From: Abhinav Kumar In-Reply-To: Content-Type: text/plain; charset="UTF-8"; format=flowed Content-Transfer-Encoding: 7bit X-ClientProxiedBy: nasanex01b.na.qualcomm.com (10.46.141.250) To nalasex01a.na.qualcomm.com (10.47.209.196) X-QCInternal: smtphost X-Proofpoint-Virus-Version: vendor=nai engine=6200 definitions=5800 signatures=585085 X-Proofpoint-GUID: PxY5YuKM3cKwLzAM81XQn0RlN8vSJsmz X-Proofpoint-ORIG-GUID: PxY5YuKM3cKwLzAM81XQn0RlN8vSJsmz X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1039,Hydra:6.0.680,FMLib:17.12.28.16 definitions=2024-08-28_08,2024-08-28_01,2024-05-17_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 priorityscore=1501 suspectscore=0 clxscore=1015 lowpriorityscore=0 mlxscore=0 bulkscore=0 mlxlogscore=999 impostorscore=0 malwarescore=0 spamscore=0 phishscore=0 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.19.0-2407110000 definitions=main-2408280141 On 8/28/2024 11:59 AM, Dmitry Baryshkov wrote: > On Wed, 28 Aug 2024 at 21:27, Abhinav Kumar wrote: >> >> >> >> On 6/26/2024 2:46 PM, Dmitry Baryshkov wrote: >>> Split dpu_plane_atomic_check() function into two pieces: >>> >>> dpu_plane_atomic_check_nopipe() performing generic checks on the pstate, >>> without touching the associated pipe, >>> >>> and >>> >>> dpu_plane_atomic_check_pipes(), which takes into account used pipes. >>> >>> Signed-off-by: Dmitry Baryshkov >>> --- >>> drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c | 178 +++++++++++++++++++----------- >>> 1 file changed, 112 insertions(+), 66 deletions(-) >>> >>> diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c >>> index 115c1bd77bdd..9b9fe28052ad 100644 >>> --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c >>> +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c >>> @@ -788,49 +788,22 @@ static int dpu_plane_atomic_check_pipe(struct dpu_plane *pdpu, >>> #define MAX_UPSCALE_RATIO 20 >>> #define MAX_DOWNSCALE_RATIO 4 >>> >>> -static int dpu_plane_atomic_check(struct drm_plane *plane, >>> - struct drm_atomic_state *state) >>> +static int dpu_plane_atomic_check_nopipe(struct drm_plane *plane, >>> + struct drm_plane_state *new_plane_state, >>> + const struct drm_crtc_state *crtc_state) >>> { >>> - struct drm_plane_state *new_plane_state = drm_atomic_get_new_plane_state(state, >>> - plane); >>> int ret = 0, min_scale, max_scale; >>> struct dpu_plane *pdpu = to_dpu_plane(plane); >>> struct dpu_kms *kms = _dpu_plane_get_kms(&pdpu->base); >>> u64 max_mdp_clk_rate = kms->perf.max_core_clk_rate; >>> struct dpu_plane_state *pstate = to_dpu_plane_state(new_plane_state); >>> - struct dpu_sw_pipe *pipe = &pstate->pipe; >>> - struct dpu_sw_pipe *r_pipe = &pstate->r_pipe; >>> - const struct drm_crtc_state *crtc_state = NULL; >>> - const struct msm_format *fmt; >>> struct dpu_sw_pipe_cfg *pipe_cfg = &pstate->pipe_cfg; >>> struct dpu_sw_pipe_cfg *r_pipe_cfg = &pstate->r_pipe_cfg; >>> struct drm_rect fb_rect = { 0 }; >>> uint32_t max_linewidth; >>> - unsigned int rotation; >>> - uint32_t supported_rotations; >>> - const struct dpu_sspp_cfg *pipe_hw_caps; >>> - const struct dpu_sspp_sub_blks *sblk; >>> - >>> - if (new_plane_state->crtc) >>> - crtc_state = drm_atomic_get_new_crtc_state(state, >>> - new_plane_state->crtc); >>> - >>> - pipe->sspp = dpu_rm_get_sspp(&kms->rm, pdpu->pipe); >>> - r_pipe->sspp = NULL; >>> >>> - if (!pipe->sspp) >>> - return -EINVAL; >>> - >>> - pipe_hw_caps = pipe->sspp->cap; >>> - sblk = pipe->sspp->cap->sblk; >>> - >>> - if (sblk->scaler_blk.len) { >>> - min_scale = FRAC_16_16(1, MAX_UPSCALE_RATIO); >>> - max_scale = MAX_DOWNSCALE_RATIO << 16; >>> - } else { >>> - min_scale = DRM_PLANE_NO_SCALING; >>> - max_scale = DRM_PLANE_NO_SCALING; >>> - } >>> + min_scale = FRAC_16_16(1, MAX_UPSCALE_RATIO); >>> + max_scale = MAX_DOWNSCALE_RATIO << 16; >>> >>> ret = drm_atomic_helper_check_plane_state(new_plane_state, crtc_state, >>> min_scale, >>> @@ -843,11 +816,6 @@ static int dpu_plane_atomic_check(struct drm_plane *plane, >>> if (!new_plane_state->visible) >>> return 0; >>> >>> - pipe->multirect_index = DPU_SSPP_RECT_SOLO; >>> - pipe->multirect_mode = DPU_SSPP_MULTIRECT_NONE; >>> - r_pipe->multirect_index = DPU_SSPP_RECT_SOLO; >>> - r_pipe->multirect_mode = DPU_SSPP_MULTIRECT_NONE; >>> - >>> pstate->stage = DPU_STAGE_0 + pstate->base.normalized_zpos; >>> if (pstate->stage >= pdpu->catalog->caps->max_mixer_blendstages) { >>> DPU_ERROR("> %d plane stages assigned\n", >>> @@ -871,8 +839,6 @@ static int dpu_plane_atomic_check(struct drm_plane *plane, >>> return -E2BIG; >>> } >>> >>> - fmt = msm_framebuffer_format(new_plane_state->fb); >>> - >>> max_linewidth = pdpu->catalog->caps->max_linewidth; >>> >>> drm_rect_rotate(&pipe_cfg->src_rect, >>> @@ -881,6 +847,78 @@ static int dpu_plane_atomic_check(struct drm_plane *plane, >>> >>> if ((drm_rect_width(&pipe_cfg->src_rect) > max_linewidth) || >>> _dpu_plane_calc_clk(&crtc_state->adjusted_mode, pipe_cfg) > max_mdp_clk_rate) { >>> + if (drm_rect_width(&pipe_cfg->src_rect) > 2 * max_linewidth) { >>> + DPU_DEBUG_PLANE(pdpu, "invalid src " DRM_RECT_FMT " line:%u\n", >>> + DRM_RECT_ARG(&pipe_cfg->src_rect), max_linewidth); >>> + return -E2BIG; >>> + } >>> + >>> + *r_pipe_cfg = *pipe_cfg; >>> + pipe_cfg->src_rect.x2 = (pipe_cfg->src_rect.x1 + pipe_cfg->src_rect.x2) >> 1; >>> + pipe_cfg->dst_rect.x2 = (pipe_cfg->dst_rect.x1 + pipe_cfg->dst_rect.x2) >> 1; >>> + r_pipe_cfg->src_rect.x1 = pipe_cfg->src_rect.x2; >>> + r_pipe_cfg->dst_rect.x1 = pipe_cfg->dst_rect.x2; >>> + } else { >>> + memset(r_pipe_cfg, 0, sizeof(*r_pipe_cfg)); >>> + } >>> + >> >> This is the part I am not able to fully understand. Assignment of >> r_pipe_cfg is also pipe related so why should that move to >> dpu_plane_atomic_check_nopipe(). It should be part of >> dpu_plane_atomic_check_pipe(). > > Because it happens before possible pipe / rectangle allocation. These > values are further used to assign resources. > Are you referring to SSPP allocation which happens in dpu_plane_virtual_assign_resources() later on? I see your point, but thats why originally I wanted to ask whether this should be called dpu_plane_atomic_check_nosspp() and dpu_plane_atomic_check_sspp() because pipe is kind of assigned either here or already assigned. Its the SSPP which is not. >> >>> + drm_rect_rotate_inv(&pipe_cfg->src_rect, >>> + new_plane_state->fb->width, new_plane_state->fb->height, >>> + new_plane_state->rotation); >>> + if (r_pipe_cfg->src_rect.x1 != 0) >>> + drm_rect_rotate_inv(&r_pipe_cfg->src_rect, >>> + new_plane_state->fb->width, new_plane_state->fb->height, >>> + new_plane_state->rotation); >>> + >>> + pstate->needs_qos_remap = drm_atomic_crtc_needs_modeset(crtc_state); >>> + >>> + return 0; >>> +} >>> + >>> +static int dpu_plane_atomic_check_pipes(struct drm_plane *plane, >>> + struct drm_atomic_state *state, >>> + const struct drm_crtc_state *crtc_state) >>> +{ >>> + struct drm_plane_state *new_plane_state = >>> + drm_atomic_get_new_plane_state(state, plane); >>> + struct dpu_plane *pdpu = to_dpu_plane(plane); >>> + struct dpu_plane_state *pstate = to_dpu_plane_state(new_plane_state); >>> + struct dpu_sw_pipe *pipe = &pstate->pipe; >>> + struct dpu_sw_pipe *r_pipe = &pstate->r_pipe; >>> + const struct msm_format *fmt; >>> + struct dpu_sw_pipe_cfg *pipe_cfg = &pstate->pipe_cfg; >>> + struct dpu_sw_pipe_cfg *r_pipe_cfg = &pstate->r_pipe_cfg; >>> + uint32_t max_linewidth; >>> + unsigned int rotation; >>> + uint32_t supported_rotations; >>> + const struct dpu_sspp_cfg *pipe_hw_caps; >>> + const struct dpu_sspp_sub_blks *sblk; >>> + int ret = 0; >>> + >>> + pipe_hw_caps = pipe->sspp->cap; >>> + sblk = pipe->sspp->cap->sblk; >>> + >>> + /* >>> + * We already have verified scaling against platform limitations. >>> + * Now check if the SSPP supports scaling at all. >>> + */ >>> + if (!sblk->scaler_blk.len && >>> + ((drm_rect_width(&new_plane_state->src) >> 16 != >>> + drm_rect_width(&new_plane_state->dst)) || >>> + (drm_rect_height(&new_plane_state->src) >> 16 != >>> + drm_rect_height(&new_plane_state->dst)))) >>> + return -ERANGE; >>> + >> >> Should this part be retained under dpu_plane_atomic_check_nopipe()? >> >> This is also not pipe dependent. > > No, it uses sblk->scaler_blk, so it depends on the actual SSPP being > used for this pipe. > Ack. >> >>> + fmt = msm_framebuffer_format(new_plane_state->fb); >>> + >>> + max_linewidth = pdpu->catalog->caps->max_linewidth; >>> + >>> + ret = dpu_plane_atomic_check_pipe(pdpu, pipe, pipe_cfg, fmt, >>> + &crtc_state->adjusted_mode); >>> + if (ret) >>> + return ret; >>> + >>> + if (drm_rect_width(&r_pipe_cfg->src_rect) != 0) { >>> /* >>> * In parallel multirect case only the half of the usual width >>> * is supported for tiled formats. If we are here, we know that >>> @@ -894,12 +932,6 @@ static int dpu_plane_atomic_check(struct drm_plane *plane, >>> return -E2BIG; >>> } >>> >>> - if (drm_rect_width(&pipe_cfg->src_rect) > 2 * max_linewidth) { >>> - DPU_DEBUG_PLANE(pdpu, "invalid src " DRM_RECT_FMT " line:%u\n", >>> - DRM_RECT_ARG(&pipe_cfg->src_rect), max_linewidth); >>> - return -E2BIG; >>> - } >>> - >>> if (drm_rect_width(&pipe_cfg->src_rect) != drm_rect_width(&pipe_cfg->dst_rect) || >>> drm_rect_height(&pipe_cfg->src_rect) != drm_rect_height(&pipe_cfg->dst_rect) || >>> (!test_bit(DPU_SSPP_SMART_DMA_V1, &pipe->sspp->cap->features) && >>> @@ -921,26 +953,6 @@ static int dpu_plane_atomic_check(struct drm_plane *plane, >>> r_pipe->multirect_index = DPU_SSPP_RECT_1; >>> r_pipe->multirect_mode = DPU_SSPP_MULTIRECT_PARALLEL; >>> >>> - *r_pipe_cfg = *pipe_cfg; >>> - pipe_cfg->src_rect.x2 = (pipe_cfg->src_rect.x1 + pipe_cfg->src_rect.x2) >> 1; >>> - pipe_cfg->dst_rect.x2 = (pipe_cfg->dst_rect.x1 + pipe_cfg->dst_rect.x2) >> 1; >>> - r_pipe_cfg->src_rect.x1 = pipe_cfg->src_rect.x2; >>> - r_pipe_cfg->dst_rect.x1 = pipe_cfg->dst_rect.x2; >>> - } >>> - >>> - drm_rect_rotate_inv(&pipe_cfg->src_rect, >>> - new_plane_state->fb->width, new_plane_state->fb->height, >>> - new_plane_state->rotation); >>> - if (r_pipe->sspp) >>> - drm_rect_rotate_inv(&r_pipe_cfg->src_rect, >>> - new_plane_state->fb->width, new_plane_state->fb->height, >>> - new_plane_state->rotation); >>> - >>> - ret = dpu_plane_atomic_check_pipe(pdpu, pipe, pipe_cfg, fmt, &crtc_state->adjusted_mode); >>> - if (ret) >>> - return ret; >>> - >>> - if (r_pipe->sspp) { >>> ret = dpu_plane_atomic_check_pipe(pdpu, r_pipe, r_pipe_cfg, fmt, >>> &crtc_state->adjusted_mode); >>> if (ret) >>> @@ -963,11 +975,45 @@ static int dpu_plane_atomic_check(struct drm_plane *plane, >>> } >>> >>> pstate->rotation = rotation; >> >> The dpu_plane_check_inline_rotation() is also pipe independent. So even >> that goes to dpu_plane_atomic_check_nopipe()? > > It also depends on the sblk if I remember correctly. Also note that > the next patch moves it to check_pipe(). > Ack. I checked the next change. this part is fine. >> >>> - pstate->needs_qos_remap = drm_atomic_crtc_needs_modeset(crtc_state); >>> >>> return 0; >>> } >>> >> >> >> > >