From nobody Mon Feb 9 09:22:57 2026 Received: from mail-pl1-f182.google.com (mail-pl1-f182.google.com [209.85.214.182]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id E1B9B47279C for ; Wed, 21 Jan 2026 08:02:13 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.182 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1768982535; cv=none; b=A7oSbVlro8RLxh0OJ8ajDWKvcBrYNFAXaU3nGkJ4tCydxkOOdHpZoLbpcy9rwXG10nu3VRgUIuh0fNxCKdi5d/TfjqwJ6mnqRBWtxL9/DlN1d2JCLlGHXQAEYvMLxiN0xE7WDvp2nVdktIQHPyIRJ8Ws+TL9+GTEvZaBXPRHC/A= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1768982535; c=relaxed/simple; bh=znEAFclRJeKN3r3dai1PBNwwtP0DNzX4Fuq5vltavGs=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=uOcmABoX9WJCUAabVNAya8HuZ55zwwW6MM+I2DYu8dLjv9nFwsgiVj3f7mhErQI3Q/1Ys5GTDhO82Q26xjtQsySgXk//0zvKTah6SnUMGkjki8BdkwXpdRvx9sR3k5+63kzhoxUt0s2NWp65PA1B3fn3vm2mPXJBRtINkwyr8EU= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org; spf=pass smtp.mailfrom=linaro.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b=T4W4Hvv0; arc=none smtp.client-ip=209.85.214.182 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linaro.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="T4W4Hvv0" Received: by mail-pl1-f182.google.com with SMTP id d9443c01a7336-2a0c09bb78cso4701175ad.0 for ; Wed, 21 Jan 2026 00:02:13 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1768982533; x=1769587333; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=kdmamm1Mw3J6iuJZD1u6/ZinuaX8sHh3/XSQfKccNq4=; b=T4W4Hvv06craGVnKAqTv7fwAUfkdLK/8R6k33hgt3+HLaCDN9U9RtPijAFF95LuUqJ 2+XK5fo19rgqfEwIwd1ICmmFnNLF3XPNRqxznryzpcmD0QM5Obo0CbSBrExREIpEwNlL cN5tP9hCiNe5H/AwNJk9yKZe3pLGlBbq8Fk/1MIVUyS5/GcD22SfNNWWS6BptX60Mms+ Q9MrfdUCF0VHAPgTVnl/8vJr1EQBTsH0rnCASCotUBosE8ANEAHh/72yRAHrVLilQRKl YxIUMjgVfYMAZiZl+9wJqEpJSygdMXeRVaTeEpLsXosWZzeTJ811GDmw/zjwwJeXF24Q KrgQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1768982533; x=1769587333; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=kdmamm1Mw3J6iuJZD1u6/ZinuaX8sHh3/XSQfKccNq4=; b=bdeph1Dely3idwCX3tKQrnH4EeY4GoVGyariW5FdN3QDizs8ClgQMb/7j8W6styZtU bxmwlH4Lqd5yF9gl4S1FsD0YuJNBamo37ByYDQCm2cigIPh6MDi0DjHkRBkZ8yW54pFX AOYUEe7Pxspu5QLhRpuL3ADkLl7IEE6sTyVomouXzKX3cPR1bFEi9qhJUGcJzbf2z8YW V9gTW7G4C9uphb74jUuNhFyoGR2viRDNetZ8WMVt4E0w60f+Q6B3RmHqTWN4rLuuiLlr AC2EmyhyLCUrpwNp23LI3xQOZsU4fsjaSr7pLeF97QULUU8bMinfQAI0KqYPcgoJ6spd ufOQ== X-Forwarded-Encrypted: i=1; AJvYcCUg1RFVp+dTba43t6BOEVOpQP1J90sv8u9sHZEHTJJTbu30KLBKtxcsDjUgrD7q0ZGYHUon/v/RFuCi9/Y=@vger.kernel.org X-Gm-Message-State: AOJu0YyF8MF0wsVFI6LBw8G9ZyjCWdXPdhIn+LDpLC2HM8sBtMU5MdcN c/VEDvSHScabyvTw1/2mQBfoxHR/3s/xxE568zu7UX9rACnaO6V9BDfbUgAkdrdFpFI= X-Gm-Gg: AZuq6aIkrcY3x8NoQZ39GZGPW43H+S0U60cZL2LDEKLr0cP+6lZMBZS9BjjDIgFKXPf vEwdFSG1BrKA0OAUjMJIVu0NkmT4m6v1AZ+yDfWw/pAk7KK3wrOtKhtsNSFq0qXlOqT9xB/Eibr /Kz9BwViNdofCUkHH+QGJA5Ay5kIR2LIfNYNCPE0LuHL6zRpRH4TWXnYzwEJyQzP+JwhlE95YaE 9vaVbD005Z4TBZGYFWyMWejXyk08/xEhOutt7oLp2BdWjA1ztU+HhhfLUJ0sSFWBKtMs1pyiOXY Col+JDvI3hWs8nHRNq41QMx855dKzrbc/aoBtgLsrur4ifjjVwgBBWWc+f6KReGE72IKsRVfiDi EaXZUvecAV3YbhF2yrJOXJ9R0Vl8Q7FUFG/O+G5jVZmubP9Ya9/BvrAf9B5iv X-Received: by 2002:a17:902:ea09:b0:29f:2734:837d with SMTP id d9443c01a7336-2a700a51209mr183205965ad.28.1768982532816; Wed, 21 Jan 2026 00:02:12 -0800 (PST) Received: from [127.0.1.1] ([2a12:a305:4::4039]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2a7190d14cfsm146851545ad.38.2026.01.21.00.02.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 21 Jan 2026 00:02:12 -0800 (PST) From: Jun Nie Date: Wed, 21 Jan 2026 16:01:51 +0800 Subject: [PATCH v17 2/4] drm/msm/dpu: Defer SSPP allocation until CRTC check 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: <20260121-msm-next-quad-pipe-split-v17-2-6eb6d8675ca2@linaro.org> References: <20260121-msm-next-quad-pipe-split-v17-0-6eb6d8675ca2@linaro.org> In-Reply-To: <20260121-msm-next-quad-pipe-split-v17-0-6eb6d8675ca2@linaro.org> To: Abhinav Kumar , Dmitry Baryshkov , Sean Paul , Marijn Suijten , David Airlie , Simona Vetter , Rob Clark , Neil Armstrong Cc: linux-arm-msm@vger.kernel.org, dri-devel@lists.freedesktop.org, freedreno@lists.freedesktop.org, linux-kernel@vger.kernel.org, Jun Nie X-Mailer: b4 0.13.0 X-Developer-Signature: v=1; a=ed25519-sha256; t=1768982516; l=7971; i=jun.nie@linaro.org; s=20240403; h=from:subject:message-id; bh=znEAFclRJeKN3r3dai1PBNwwtP0DNzX4Fuq5vltavGs=; b=tcPd/napQSxPPJ5WWGUlFaphNEXjLvFq5w7lE25kc5GxovGdQajJx/rJh594UFM2VsYG/pf/j 1w1Bw0ZbFYvAYR9Z5dAzEnW3xFRW5HfcnKTM1WVBOlEme/bcghTR+Fq X-Developer-Key: i=jun.nie@linaro.org; a=ed25519; pk=MNiBt/faLPvo+iJoP1hodyY2x6ozVXL8QMptmsKg3cc= Currently, plane splitting and SSPP allocation occur during the plane check phase. Defer these operations until dpu_assign_plane_resources() is called from the CRTC side to ensure the topology information from the CRTC check is available. Signed-off-by: Jun Nie --- drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c | 3 +- drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c | 112 +++++++++++++++++++-------= ---- 2 files changed, 71 insertions(+), 44 deletions(-) diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c b/drivers/gpu/drm/msm= /disp/dpu1/dpu_crtc.c index 2d06c950e8143..debdbbe6160dd 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c @@ -1484,8 +1484,7 @@ static int dpu_crtc_atomic_check(struct drm_crtc *crt= c, return rc; } =20 - if (dpu_use_virtual_planes && - (crtc_state->planes_changed || crtc_state->zpos_changed)) { + if (crtc_state->planes_changed || crtc_state->zpos_changed) { rc =3D dpu_crtc_reassign_planes(crtc, crtc_state); if (rc < 0) return rc; diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c b/drivers/gpu/drm/ms= m/disp/dpu1/dpu_plane.c index 66f240ce29d07..3c629f4df461d 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c @@ -1119,49 +1119,25 @@ static int dpu_plane_atomic_check(struct drm_plane = *plane, struct drm_plane_state *new_plane_state =3D drm_atomic_get_new_plane_stat= e(state, plane); int ret =3D 0; - struct dpu_plane *pdpu =3D to_dpu_plane(plane); - struct dpu_plane_state *pstate =3D to_dpu_plane_state(new_plane_state); - struct dpu_kms *dpu_kms =3D _dpu_plane_get_kms(plane); - struct dpu_sw_pipe *pipe =3D &pstate->pipe[0]; - struct dpu_sw_pipe *r_pipe =3D &pstate->pipe[1]; - struct dpu_sw_pipe_cfg *pipe_cfg =3D &pstate->pipe_cfg[0]; - struct dpu_sw_pipe_cfg *r_pipe_cfg =3D &pstate->pipe_cfg[1]; - const struct drm_crtc_state *crtc_state =3D NULL; - uint32_t max_linewidth =3D dpu_kms->catalog->caps->max_linewidth; + struct drm_crtc_state *crtc_state =3D NULL; =20 if (new_plane_state->crtc) crtc_state =3D drm_atomic_get_new_crtc_state(state, new_plane_state->crtc); =20 - pipe->sspp =3D dpu_rm_get_sspp(&dpu_kms->rm, pdpu->pipe); - - if (!pipe->sspp) - return -EINVAL; - ret =3D dpu_plane_atomic_check_nosspp(plane, new_plane_state, crtc_state); if (ret) return ret; =20 - ret =3D dpu_plane_split(plane, new_plane_state, crtc_state); - if (ret) - return ret; - if (!new_plane_state->visible) return 0; =20 - if (!dpu_plane_try_multirect_parallel(pipe, pipe_cfg, r_pipe, r_pipe_cfg, - pipe->sspp, - msm_framebuffer_format(new_plane_state->fb), - max_linewidth)) { - DPU_DEBUG_PLANE(pdpu, "invalid " DRM_RECT_FMT " /" DRM_RECT_FMT - " max_line:%u, can't use split source\n", - DRM_RECT_ARG(&pipe_cfg->src_rect), - DRM_RECT_ARG(&r_pipe_cfg->src_rect), - max_linewidth); - return -E2BIG; - } - - return dpu_plane_atomic_check_sspp(plane, state, crtc_state); + /* + * To trigger the callback of dpu_assign_plane_resources() to + * finish the deferred sspp check + */ + crtc_state->planes_changed =3D true; + return 0; } =20 static int dpu_plane_virtual_atomic_check(struct drm_plane *plane, @@ -1186,10 +1162,6 @@ static int dpu_plane_virtual_atomic_check(struct drm= _plane *plane, if (ret) return ret; =20 - ret =3D dpu_plane_split(plane, plane_state, crtc_state); - if (ret) - return ret; - if (!plane_state->visible) { /* * resources are freed by dpu_crtc_assign_plane_resources(), @@ -1261,9 +1233,9 @@ static int dpu_plane_virtual_assign_resources(struct = drm_crtc *crtc, struct dpu_global_state *global_state, struct drm_atomic_state *state, struct drm_plane_state *plane_state, + const struct drm_crtc_state *crtc_state, struct drm_plane_state **prev_adjacent_plane_state) { - const struct drm_crtc_state *crtc_state =3D NULL; struct drm_plane *plane =3D plane_state->plane; struct dpu_kms *dpu_kms =3D _dpu_plane_get_kms(plane); struct dpu_rm_sspp_requirements reqs; @@ -1273,10 +1245,6 @@ static int dpu_plane_virtual_assign_resources(struct= drm_crtc *crtc, const struct msm_format *fmt; int i, ret; =20 - if (plane_state->crtc) - crtc_state =3D drm_atomic_get_new_crtc_state(state, - plane_state->crtc); - pstate =3D to_dpu_plane_state(plane_state); for (i =3D 0; i < STAGES_PER_PLANE; i++) prev_adjacent_pstate[i] =3D prev_adjacent_plane_state[i] ? @@ -1288,6 +1256,10 @@ static int dpu_plane_virtual_assign_resources(struct= drm_crtc *crtc, if (!plane_state->fb) return -EINVAL; =20 + ret =3D dpu_plane_split(plane, plane_state, crtc_state); + if (ret) + return ret; + fmt =3D msm_framebuffer_format(plane_state->fb); reqs.yuv =3D MSM_FORMAT_IS_YUV(fmt); reqs.scale =3D (plane_state->src_w >> 16 !=3D plane_state->crtc_w) || @@ -1318,14 +1290,59 @@ static int dpu_plane_virtual_assign_resources(struc= t drm_crtc *crtc, return dpu_plane_atomic_check_sspp(plane, state, crtc_state); } =20 +static int dpu_plane_assign_resources(struct drm_crtc *crtc, + struct dpu_global_state *global_state, + struct drm_atomic_state *state, + struct drm_plane_state *plane_state, + const struct drm_crtc_state *crtc_state, + struct drm_plane_state **prev_adjacent_plane_state) +{ + struct drm_plane *plane =3D plane_state->plane; + struct dpu_kms *dpu_kms =3D _dpu_plane_get_kms(plane); + struct dpu_plane_state *pstate =3D to_dpu_plane_state(plane_state); + struct dpu_sw_pipe *pipe =3D &pstate->pipe[0]; + struct dpu_sw_pipe *r_pipe =3D &pstate->pipe[1]; + struct dpu_sw_pipe_cfg *pipe_cfg =3D &pstate->pipe_cfg[0]; + struct dpu_sw_pipe_cfg *r_pipe_cfg =3D &pstate->pipe_cfg[1]; + struct dpu_plane *pdpu =3D to_dpu_plane(plane); + int ret; + + if (!plane_state->visible) + return 0; + + pipe->sspp =3D dpu_rm_get_sspp(&dpu_kms->rm, pdpu->pipe); + if (!pipe->sspp) + return -EINVAL; + + ret =3D dpu_plane_split(plane, plane_state, crtc_state); + if (ret) + return ret; + + if (!dpu_plane_try_multirect_parallel(pipe, pipe_cfg, r_pipe, r_pipe_cfg, + pipe->sspp, + msm_framebuffer_format(plane_state->fb), + dpu_kms->catalog->caps->max_linewidth)) { + DPU_DEBUG_PLANE(pdpu, "invalid " DRM_RECT_FMT " /" DRM_RECT_FMT + " max_line:%u, can't use split source\n", + DRM_RECT_ARG(&pipe_cfg->src_rect), + DRM_RECT_ARG(&r_pipe_cfg->src_rect), + dpu_kms->catalog->caps->max_linewidth); + return -E2BIG; + } + + return dpu_plane_atomic_check_sspp(plane, state, crtc_state); +} + int dpu_assign_plane_resources(struct dpu_global_state *global_state, struct drm_atomic_state *state, struct drm_crtc *crtc, struct drm_plane_state **states, unsigned int num_planes) { - unsigned int i; struct drm_plane_state *prev_adjacent_plane_state[STAGES_PER_PLANE] =3D {= NULL }; + const struct drm_crtc_state *crtc_state =3D NULL; + unsigned int i; + int ret; =20 for (i =3D 0; i < num_planes; i++) { struct drm_plane_state *plane_state =3D states[i]; @@ -1334,8 +1351,19 @@ int dpu_assign_plane_resources(struct dpu_global_sta= te *global_state, !plane_state->visible) continue; =20 - int ret =3D dpu_plane_virtual_assign_resources(crtc, global_state, + if (plane_state->crtc) + crtc_state =3D drm_atomic_get_new_crtc_state(state, + plane_state->crtc); + + if (!dpu_use_virtual_planes) + ret =3D dpu_plane_assign_resources(crtc, global_state, + state, plane_state, + crtc_state, + prev_adjacent_plane_state); + else + ret =3D dpu_plane_virtual_assign_resources(crtc, global_state, state, plane_state, + crtc_state, prev_adjacent_plane_state); if (ret) return ret; --=20 2.43.0