From nobody Thu Apr 2 22:28:53 2026 Received: from mail-wr1-f50.google.com (mail-wr1-f50.google.com [209.85.221.50]) (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 831F4338592 for ; Thu, 12 Mar 2026 08:28:35 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.221.50 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773304117; cv=none; b=YVqJzqkUVefYYVitOVKKj45EzjNeoEfrkeFt87z95q0FihtxTCfgwLgomd2xBOvC3+gATEicht4fc49wj9P8CAlBMHTAzGIYQOIbYEPL90A7n5ndCyo6zBIzgB7v7xIEz/76vCqR7oghu6+lmfnOiN1XsAeg2V3MbDSvAPb8+og= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773304117; c=relaxed/simple; bh=RE3qeIJFMCJw+TbGo280DpJf2sHQjKNb5z8KylWcMU4=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=NS5lVLfPOBbcLBc2xN+ljXRUbKw+820goQrBn/mWnbLDOcBU1P2FKhh05Dk0VR7a+G/BhXPU2/yv9jSSF7dvG8nHdGVFq5qTWXcTnx6gHMyvb+6AWUXG7eV21yaT7l1ssE4msiupC7oRO+OCWO/vQKkGG8qfSPc8tyPpbh+fJt4= 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=leNOSzPI; arc=none smtp.client-ip=209.85.221.50 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="leNOSzPI" Received: by mail-wr1-f50.google.com with SMTP id ffacd0b85a97d-439d8dc4ae4so811139f8f.2 for ; Thu, 12 Mar 2026 01:28:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1773304114; x=1773908914; 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=wPddzVJSVtkRrcRhnsRvT/Hf7HSSWz/56c2ZASviYjw=; b=leNOSzPIf0H9ZQFjqpm/++yDDjfz4Xvi0lp5KiO0cXXg2+kPoW74UT3oAPkPVtIeS2 MY6lIepqA5TAG/uq5IUWsPA2v4tjpeg6zw5pUqt9A/E4xN0f6XxWcii7G/Z27H9Um+aH l7lJ7Owc+++dFdKN3p1z5FjIUxLou/MZUWCVQ/XnbP2Mofw4PPuMlg2NFFmu3z+a8Urz y7MS4/5xCyXKnf7+HWABmqqtbKhGcl4udFKQO3lAmiRFfML3QGqXh3vMChHtP2L3JP3N aCiwG70i9aGamNpLtOd2hOgvB7v7EYTwnIJfzjliwbX333Yi27DiMGBic6sVIqfaADPS tHaA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1773304114; x=1773908914; 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=wPddzVJSVtkRrcRhnsRvT/Hf7HSSWz/56c2ZASviYjw=; b=GeN8CZR+547iO2yQyh6DzR2OIvQ+85M4k9ihl/EUc4oi6NIGqggf4tpBUJkFKKibV4 +kOLKLo+6mxaX2xea6875lDAYzBajKfNYBDR7QR/gur1BEL8p0Y819hDOXZxCJePAv+L 8htdy1yJvnBAzXDPh+MF1uTCPWGAAO8Rhahh5DanaiD44td2Aoafd1uXqJRKnMU7ahlB /7lO8dq/mKTqZEurPKv3IQ7s7JuzK6pYXK9fMA2KnO81seQEyHA8fYA+QE8N+QpRCcOt e6dwkn0RTMsXPXXbShbj/mV1ToCvYMmqNv5pdNN1vjzY0YIqBeIDCEnE0qdxQPDFyY+M E3IA== X-Forwarded-Encrypted: i=1; AJvYcCWaRHAXsgXd8kWhTeJ1b5LpDkykZk88LniaxwDde4/JSpt7Vt19SfwFFtQH5Xbbm3gKa8MieHbZzT5SFaY=@vger.kernel.org X-Gm-Message-State: AOJu0YySrK1tffPbgma0MUt2JTCn9jE4umVYlFr/OpqLuZVIYlE/z+UQ eN3GoNDL9cX7bL7IMkfPs410y71qlM69v57/wn3Hhwff0+4L+fXhVDZc0UZ/AvWumog= X-Gm-Gg: ATEYQzzXcrZjS+GcrIzA9oXQ6tF/xL8NoD0sFRPVhd20QfeFQznZwdDB+cKqFwWbrFi g/DHxN6RN80WfJoF6YHJEPtjnMwhqFMXH/Ww8eXIrdzUCA2djIHniX6ULvxBy0RQeyWbASIEnZ3 e2bMuPeVOfvZBo0LiWfiNmcj2OUtlxGY/42uYS0vpxiP7afbFcAeIdoonR3EAtmpVPeLfRwPgfc IbSzP6rmWif7FOQwrCYKGc2ag6VE5e1KNvTb54bSg6ChsAlsiv09pp/btWVftByz4q90ahJK8nX 8YvcsRBonyyhj2Wv7nxJhIs8YcimPrcoZFxAAuDhrxi/fjyAa5VipZogCUN+Y2lWpjvqRsA4mJ+ VZuzI7kLzqkxgW3+15sOXGVIsiGxeYdrNgU9y12dO+UGh/mpin7TCH6oLp9qTw0A5lJC4UReMmx uB54E= X-Received: by 2002:a5d:5f82:0:b0:439:b5f9:eeba with SMTP id ffacd0b85a97d-439f81f2288mr10505269f8f.3.1773304113877; Thu, 12 Mar 2026 01:28:33 -0700 (PDT) Received: from [127.0.1.1] ([2a04:6f00:1::ee:b:1015]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-439fe219c41sm6273780f8f.29.2026.03.12.01.28.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 12 Mar 2026 01:28:33 -0700 (PDT) From: Jun Nie Date: Thu, 12 Mar 2026 16:28:10 +0800 Subject: [PATCH v19 1/4] drm/msm/dpu: Extract plane splitting into a dedicated function 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: <20260312-msm-next-quad-pipe-split-v19-1-4ffa2b06c996@linaro.org> References: <20260312-msm-next-quad-pipe-split-v19-0-4ffa2b06c996@linaro.org> In-Reply-To: <20260312-msm-next-quad-pipe-split-v19-0-4ffa2b06c996@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 , Dmitry Baryshkov X-Mailer: b4 0.13.0 X-Developer-Signature: v=1; a=ed25519-sha256; t=1773304094; l=4057; i=jun.nie@linaro.org; s=20240403; h=from:subject:message-id; bh=RE3qeIJFMCJw+TbGo280DpJf2sHQjKNb5z8KylWcMU4=; b=M8/3vPKx/BLiXkMrb7SgSN2c/ye0Xo7pQ+VC1zKC3aDaybDQ5LizP8tMXUHdtiJ9hhKam2YbG BukVpt3O9A8Da7+yG3rBWBNQ+tM2Pd80pmWYCIOmnafEQ+B+vmf6LU3 X-Developer-Key: i=jun.nie@linaro.org; a=ed25519; pk=MNiBt/faLPvo+iJoP1hodyY2x6ozVXL8QMptmsKg3cc= dpu_plane_atomic_check_nosspp() currently handles both plane validation and plane splitting. For better simplicity and to facilitate future refactoring, move the splitting logic into its own dedicated function. Reviewed-by: Dmitry Baryshkov Signed-off-by: Jun Nie --- drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c | 48 +++++++++++++++++++++------= ---- 1 file changed, 33 insertions(+), 15 deletions(-) diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c b/drivers/gpu/drm/ms= m/disp/dpu1/dpu_plane.c index 9b7a8b46bfa91..4ed14f203c315 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c @@ -821,13 +821,8 @@ static int dpu_plane_atomic_check_nosspp(struct drm_pl= ane *plane, { int i, ret =3D 0, min_scale, max_scale; struct dpu_plane *pdpu =3D to_dpu_plane(plane); - struct dpu_kms *kms =3D _dpu_plane_get_kms(&pdpu->base); - u64 max_mdp_clk_rate =3D kms->perf.max_core_clk_rate; struct dpu_plane_state *pstate =3D to_dpu_plane_state(new_plane_state); - struct dpu_sw_pipe_cfg *pipe_cfg; - struct dpu_sw_pipe_cfg *r_pipe_cfg; struct drm_rect fb_rect =3D { 0 }; - uint32_t max_linewidth; =20 min_scale =3D FRAC_16_16(1, MAX_UPSCALE_RATIO); max_scale =3D MAX_DOWNSCALE_RATIO << 16; @@ -850,14 +845,6 @@ static int dpu_plane_atomic_check_nosspp(struct drm_pl= ane *plane, return -EINVAL; } =20 - /* move the assignment here, to ease handling to another pairs later */ - pipe_cfg =3D &pstate->pipe_cfg[0]; - r_pipe_cfg =3D &pstate->pipe_cfg[1]; - /* state->src is 16.16, src_rect is not */ - drm_rect_fp_to_int(&pipe_cfg->src_rect, &new_plane_state->src); - - pipe_cfg->dst_rect =3D new_plane_state->dst; - fb_rect.x2 =3D new_plane_state->fb->width; fb_rect.y2 =3D new_plane_state->fb->height; =20 @@ -879,6 +866,31 @@ static int dpu_plane_atomic_check_nosspp(struct drm_pl= ane *plane, if (pstate->layout.plane_pitch[i] > DPU_SSPP_MAX_PITCH_SIZE) return -E2BIG; =20 + pstate->needs_qos_remap =3D drm_atomic_crtc_needs_modeset(crtc_state); + + return 0; +} + +static int dpu_plane_split(struct drm_plane *plane, + struct drm_plane_state *new_plane_state, + const struct drm_crtc_state *crtc_state) +{ + struct dpu_plane *pdpu =3D to_dpu_plane(plane); + struct dpu_kms *kms =3D _dpu_plane_get_kms(&pdpu->base); + u64 max_mdp_clk_rate =3D kms->perf.max_core_clk_rate; + struct dpu_plane_state *pstate =3D to_dpu_plane_state(new_plane_state); + struct dpu_sw_pipe_cfg *pipe_cfg; + struct dpu_sw_pipe_cfg *r_pipe_cfg; + uint32_t max_linewidth; + + /* move the assignment here, to ease handling to another pairs later */ + pipe_cfg =3D &pstate->pipe_cfg[0]; + r_pipe_cfg =3D &pstate->pipe_cfg[1]; + /* state->src is 16.16, src_rect is not */ + drm_rect_fp_to_int(&pipe_cfg->src_rect, &new_plane_state->src); + + pipe_cfg->dst_rect =3D new_plane_state->dst; + max_linewidth =3D pdpu->catalog->caps->max_linewidth; =20 drm_rect_rotate(&pipe_cfg->src_rect, @@ -910,8 +922,6 @@ static int dpu_plane_atomic_check_nosspp(struct drm_pla= ne *plane, new_plane_state->fb->width, new_plane_state->fb->height, new_plane_state->rotation); =20 - pstate->needs_qos_remap =3D drm_atomic_crtc_needs_modeset(crtc_state); - return 0; } =20 @@ -1132,6 +1142,10 @@ static int dpu_plane_atomic_check(struct drm_plane *= plane, if (!new_plane_state->visible) return 0; =20 + ret =3D dpu_plane_split(plane, new_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(new_plane_state->fb), @@ -1180,6 +1194,10 @@ static int dpu_plane_virtual_atomic_check(struct drm= _plane *plane, return 0; } =20 + ret =3D dpu_plane_split(plane, plane_state, crtc_state); + if (ret) + return ret; + /* * Force resource reallocation if the format of FB or src/dst have * changed. We might need to allocate different SSPP or SSPPs for this --=20 2.43.0 From nobody Thu Apr 2 22:28:53 2026 Received: from mail-wr1-f51.google.com (mail-wr1-f51.google.com [209.85.221.51]) (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 6BAB332C937 for ; Thu, 12 Mar 2026 08:28:42 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.221.51 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773304124; cv=none; b=OT7Xx+pYGxvMYUn5di14R1aJSjdr3A74g/TZgN3jSBg+ALUENaeaAJJWOsB4JRgoG6T5WcMXDkYG8Jy5vp1LAw2xHp3M/jCUm5omWnMip8maXj+MfThJqlhsGSnN70/sj4YhnfwWjhtmHKzdU6IEj7R+zoViYz6Y46sVVKb0t74= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773304124; c=relaxed/simple; bh=llcAoN5oMCj08hUSIdLT6NP8xPSgK+elXOWbE1sjvd8=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=IJhRl2GDBxVPDNzO8k0yiSIvvBdm1hrCAqGzxhNR2SVgxhUE4u+RcTGgJWhbJYo5a08e0wwP6OHedNKAOgb2tiNf9DUZe0hTO7ZJwgAGRP6Tc9tACX9L1ES4ZvjQrXotw+umjuCpU0fsEc+zg846s9CKtFTRfin2wH6EcEN728w= 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=eBRzh6JK; arc=none smtp.client-ip=209.85.221.51 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="eBRzh6JK" Received: by mail-wr1-f51.google.com with SMTP id ffacd0b85a97d-439bc14dcf4so1381221f8f.1 for ; Thu, 12 Mar 2026 01:28:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1773304121; x=1773908921; 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=H21vp6hR1X4O6tjqIgvx5S4K1FkSDkFIhmuzuM7d1Yg=; b=eBRzh6JK6nI+zZDejlC6IkPIb3RG63FSU08ppO1BTG6usvzzvTCio4WTl++o9m3bgI Vpv9npIEeVN9bVUDLEuJZjH4DenRya1jE/NlMJuhM6byVikoBYzCH1fNw9M96D+6GWw8 WwcFgm2W7Ru6Q/JRbnwC6iTFdZekXJMdOxcCsMJFkBgJrPtEXYixA73ehqZ00tSYUmuV KGvYBwcFDu1hquQ6lwqLL6LNkHvVIgxgwGVq5mvsBiDYSMwBnGi1vySQjgHU2GCa6nXj oKeY1X01aqdh08FQWVazn7nXpAqonACpKFDcdCUbZy0JB9VwODDtNMVYKx9QYZ5jfvRR ZVtw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1773304121; x=1773908921; 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=H21vp6hR1X4O6tjqIgvx5S4K1FkSDkFIhmuzuM7d1Yg=; b=SpJZqXmLKvs/bzb2Eu4QrXaMM+APnW7h260U6haMLTCnCVfZ+5YF+e6Rryi9SlRQYL 6N8+iec+S/4PRNXrQfrXAzN0xtpHL4quKSSHJ33sKOSU5XIHX6EqSj6GHx3YfBfA9QR1 1jcdMNdA/XcRVIZ1BoS24OzpFdps2tKyN0lAy/ikSjCIxlNsV5padlGhokATUE3ys0Of 8ffPuH6VZ7WLjn/WmaMCqmE1wbsmXaoEp9XBk1NJAebDUfsx99xjaWm2ofNOkmvihtwU arktoy3hVoOTTxglx7UibXt9a0FavXZ95nJ9Qe0pRzZcrsKQAHlLAKw3VW1tUCJdpZA3 4KRA== X-Forwarded-Encrypted: i=1; AJvYcCWImEOnfHewijRCqTBXrrYzSPpM14hPT/+Vs/Mlu9sc6ns117wazRHHDcGFSfmHrROMRhWK4/aC1U2B2N8=@vger.kernel.org X-Gm-Message-State: AOJu0YyAwpjM5aTp2gqCX7ebB9XHtnu/J45mh43+4qpgfIE8Et/Ah+JG 2C6uj9T9/o6E88OxJCtQvk5iEvIHhogmtk79d5h6c3cQJsww9wglZ+rPCUHAXOzeKeE= X-Gm-Gg: ATEYQzxLp2UTdpurTrjD5nfBDXnP8SnzI1Eie4RSqLPvfVioNHpd8pp9Tz+uHpeGOU/ kFYzu5hPj2sQesVV5R8NGVbAwBrJr2939X/Y1raMn7KPU2UesGXrszmB47PgA3bF3+VcXZkJRFa BSqZ3eG139BLgmlAvyJQFM0lf129pEiGu/CifYuv/KscIo4KYv/6L/byiXme0ivCeDbhTJI/STU kx5dyjqRKCQ+4jXX+k+bCbeom9rSvfaML9cijIQlKom+sMe4VjYf+mXv8hHS1p+IZS3WLsOeF9d 6NVSdY5MR/a7jE9kw3xXrQuyjirY2Qh5koHc58qlJQMCVPw0eojlieaD2TvtsW9VEBIeSRxC8Jv iApOtvrwo7HbRmmSzlwH94CeHoNsDZSZqNQDhb3hmz+U30PCtwljcRVylD2Xu9JHOqLC/LTzQSG ewZT0= X-Received: by 2002:a05:6000:2c07:b0:439:c24b:ec15 with SMTP id ffacd0b85a97d-439fdf8aa4fmr4431739f8f.5.1773304120641; Thu, 12 Mar 2026 01:28:40 -0700 (PDT) Received: from [127.0.1.1] ([2a04:6f00:1::ee:b:1015]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-439fe219c41sm6273780f8f.29.2026.03.12.01.28.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 12 Mar 2026 01:28:40 -0700 (PDT) From: Jun Nie Date: Thu, 12 Mar 2026 16:28:11 +0800 Subject: [PATCH v19 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: <20260312-msm-next-quad-pipe-split-v19-2-4ffa2b06c996@linaro.org> References: <20260312-msm-next-quad-pipe-split-v19-0-4ffa2b06c996@linaro.org> In-Reply-To: <20260312-msm-next-quad-pipe-split-v19-0-4ffa2b06c996@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=1773304094; l=10582; i=jun.nie@linaro.org; s=20240403; h=from:subject:message-id; bh=llcAoN5oMCj08hUSIdLT6NP8xPSgK+elXOWbE1sjvd8=; b=ObM16Q5nSNb6OskbUYeeMtfFvDsy/YRjzDsHTsWSpTqbAcocUYuxFSX+LmAVArbQeMPZXms/F 7C/Fus0C+7AAVDlPA2W4pFo5hC7O8rWJl4Q8VL2dM6blSK+y52r53FK X-Developer-Key: i=jun.nie@linaro.org; a=ed25519; pk=MNiBt/faLPvo+iJoP1hodyY2x6ozVXL8QMptmsKg3cc= Currently, mapping plane to SSPP occurs during the plane check phase for non-virtual plane case. The SSPP allocation and plane mapping occurs during CRTC check phase for virtual plane case. Defer these SSPP operations until CRTC check stage to unify the 2 cases, and ease later revisement for quad-pipe change. Signed-off-by: Jun Nie Reviewed-by: Dmitry Baryshkov --- drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c | 25 ++++-- drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c | 136 ++++++++++++++------------= ---- 2 files changed, 80 insertions(+), 81 deletions(-) diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c b/drivers/gpu/drm/msm= /disp/dpu1/dpu_crtc.c index 6bf7c46379aed..e97456d4fbb8c 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c @@ -1325,7 +1325,7 @@ static bool dpu_crtc_needs_dirtyfb(struct drm_crtc_st= ate *cstate) return false; } =20 -static int dpu_crtc_reassign_planes(struct drm_crtc *crtc, struct drm_crtc= _state *crtc_state) +static int dpu_crtc_assign_planes(struct drm_crtc *crtc, struct drm_crtc_s= tate *crtc_state) { int total_planes =3D crtc->dev->mode_config.num_total_plane; struct drm_atomic_state *state =3D crtc_state->state; @@ -1338,8 +1338,6 @@ static int dpu_crtc_reassign_planes(struct drm_crtc *= crtc, struct drm_crtc_state if (IS_ERR(global_state)) return PTR_ERR(global_state); =20 - dpu_rm_release_all_sspp(global_state, crtc); - if (!crtc_state->enable) return 0; =20 @@ -1366,6 +1364,19 @@ static int dpu_crtc_reassign_planes(struct drm_crtc = *crtc, struct drm_crtc_state return ret; } =20 +static int dpu_crtc_reassign_planes(struct drm_crtc *crtc, struct drm_crtc= _state *crtc_state) +{ + struct dpu_global_state *global_state; + + global_state =3D dpu_kms_get_global_state(crtc_state->state); + if (IS_ERR(global_state)) + return PTR_ERR(global_state); + + dpu_rm_release_all_sspp(global_state, crtc); + + return dpu_crtc_assign_planes(crtc, crtc_state); +} + #define MAX_CHANNELS_PER_CRTC PIPES_PER_PLANE #define MAX_HDISPLAY_SPLIT 1080 =20 @@ -1534,9 +1545,11 @@ static int dpu_crtc_atomic_check(struct drm_crtc *cr= tc, return rc; } =20 - if (dpu_use_virtual_planes && - (crtc_state->planes_changed || crtc_state->zpos_changed)) { - rc =3D dpu_crtc_reassign_planes(crtc, crtc_state); + if (crtc_state->planes_changed || crtc_state->zpos_changed) { + if (dpu_use_virtual_planes) + rc =3D dpu_crtc_reassign_planes(crtc, crtc_state); + else + rc =3D dpu_crtc_assign_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 4ed14f203c315..70992a4401d69 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c @@ -1112,65 +1112,13 @@ static int dpu_plane_try_multirect_shared(struct dp= u_plane_state *pstate, =20 static int dpu_plane_atomic_check(struct drm_plane *plane, struct drm_atomic_state *state) -{ - 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; - - if (new_plane_state->crtc) - crtc_state =3D drm_atomic_get_new_crtc_state(state, - new_plane_state->crtc); - - 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; - - if (!new_plane_state->visible) - return 0; - - ret =3D dpu_plane_split(plane, new_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(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); -} - -static int dpu_plane_virtual_atomic_check(struct drm_plane *plane, - struct drm_atomic_state *state) { struct drm_plane_state *plane_state =3D drm_atomic_get_plane_state(state, plane); struct drm_plane_state *old_plane_state =3D drm_atomic_get_old_plane_state(state, plane); - struct dpu_plane_state *pstate =3D to_dpu_plane_state(plane_state); + int ret =3D 0; struct drm_crtc_state *crtc_state =3D NULL; - int ret, i; =20 if (IS_ERR(plane_state)) return PTR_ERR(plane_state); @@ -1183,20 +1131,8 @@ static int dpu_plane_virtual_atomic_check(struct drm= _plane *plane, if (ret) return ret; =20 - if (!plane_state->visible) { - /* - * resources are freed by dpu_crtc_assign_plane_resources(), - * but clean them here. - */ - for (i =3D 0; i < PIPES_PER_PLANE; i++) - pstate->pipe[i].sspp =3D NULL; - + if (!plane_state->visible) return 0; - } - - ret =3D dpu_plane_split(plane, plane_state, crtc_state); - if (ret) - return ret; =20 /* * Force resource reallocation if the format of FB or src/dst have @@ -1211,7 +1147,6 @@ static int dpu_plane_virtual_atomic_check(struct drm_= plane *plane, msm_framebuffer_format(old_plane_state->fb) !=3D msm_framebuffer_format(plane_state->fb)) crtc_state->planes_changed =3D true; - return 0; } =20 @@ -1258,9 +1193,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; @@ -1270,10 +1205,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] ? @@ -1285,6 +1216,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) || @@ -1315,14 +1250,55 @@ 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 *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; + + 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]; @@ -1331,8 +1307,18 @@ 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); + else + ret =3D dpu_plane_virtual_assign_resources(crtc, global_state, state, plane_state, + crtc_state, prev_adjacent_plane_state); if (ret) return ret; @@ -1769,7 +1755,7 @@ static const struct drm_plane_helper_funcs dpu_plane_= helper_funcs =3D { static const struct drm_plane_helper_funcs dpu_plane_virtual_helper_funcs = =3D { .prepare_fb =3D dpu_plane_prepare_fb, .cleanup_fb =3D dpu_plane_cleanup_fb, - .atomic_check =3D dpu_plane_virtual_atomic_check, + .atomic_check =3D dpu_plane_atomic_check, .atomic_update =3D dpu_plane_atomic_update, }; =20 --=20 2.43.0 From nobody Thu Apr 2 22:28:53 2026 Received: from mail-wr1-f43.google.com (mail-wr1-f43.google.com [209.85.221.43]) (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 4ACFB2FFDDE for ; Thu, 12 Mar 2026 08:28:49 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.221.43 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773304130; cv=none; b=mCe8764V3aN1Jv8YUwCDr5ZiIcWgLtB1nvJ8HTHWvAy/4FvOYiZrVUGGfiRfBzaa5pKCvh3K3q6FK0X4ej7j5SnXU3TG4ow0speWSHl+hKxddsJPtzQHABuNg1Pf8X+mm7U+joiBZgEUVY6Lx7flWQ4DsYOqwlPAOZhDpUcB9OE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773304130; c=relaxed/simple; bh=mLiQ8kq+Hoe6yZbmNWCYHtVl5NbNfCazswthJQplHr8=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=EcHZwRZrehIRxuM5/takAiab5KdUauGfcme88Ca7DQkrL7P+HUszbP5GFCLLMeZbOe/eFoquDaUfKmCruSrG9FkdVLb0INc98zLjIZSZs+McXUzQB2dLPA67LE5/mfZ1uufqojOzeBnbs3s3NEtPNvHg8B6XI75ApBd0YB0AxKg= 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=VHNszzxe; arc=none smtp.client-ip=209.85.221.43 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="VHNszzxe" Received: by mail-wr1-f43.google.com with SMTP id ffacd0b85a97d-439c944bb62so536586f8f.3 for ; Thu, 12 Mar 2026 01:28:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1773304128; x=1773908928; 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=gSlDLHNlq6yl671wwnnD9Z5eWz9U89VKuVstCERaaBI=; b=VHNszzxeY/kQ1IOlq99kU4kV/h6dWZYvRUCDPUb5P1nLg2/4WF3xH9ik+9IjMxoEag cjc08eVzVmoDAx6lSChDB4a9L20XnmnqQVEt1USmAwd823heZgJOdk0saGEZ8VAQSdBV Bz7dFxFEUKx8sHJfSuddoBveoS1QAIEY0eFwxlQtQcJkgIICBgjCBbYUNf8jDcPZgvma ihL1GZJIATBr5BdO66seTlUWyKL1b9dnbuDUZYnNK2tNNZPY3achvtVXY/rcRY3gtJu8 z+UtQHm9ObZcQk+Qf1jh2kLvPacdMMoejjI/gtxVtByQMZpjvb0XDB6NbMTHyaJ4k5LU CRbA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1773304128; x=1773908928; 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=gSlDLHNlq6yl671wwnnD9Z5eWz9U89VKuVstCERaaBI=; b=UI9btq5PMV/E1ikHX8HY8bIRQ2YcveIaq2CDHb9E8eJ7FzmOtl7RGMUmVG1Qx1yCao wqry+X3Uj1ECNgR57BCAjWZKLt5l8Oaqe9Y4Vtdn7ESP/PfytrKJxFmF5CZzlN5enzN5 7bVqwGPYde9ymqNxnsYzRJxXgcKMsyOABWlvwZerS17F7lqTPGPlvEP6p3gEAqkSzjHs nthQkPpvKXed8io2WuH0Wl/nupaKJKTy+w/HYZzVrhribUNAKo8d2+gqCuxhzS9+paY5 nOYx+O9srdEbuDUzqRrXif0a7SH3FjQt1RnfUojZyhK+dayNjUBZ7/iXsPKaize6dgqt f5Ng== X-Forwarded-Encrypted: i=1; AJvYcCUSiq6rW9mgUea2ePaqreJbhG/o7Pfbm1MQ3duLSFW4uzU+5BFy3r9dCTdfqqNwFzHNAlIdkmi72NRPDaY=@vger.kernel.org X-Gm-Message-State: AOJu0YxWO9ViZut1wdibn6ImO5py6XFFZqQmUlhTzevsRdcntaReDUBQ p/3R9fIwQ7vS84pOKLvEt88EbWRRoHH1tuE9FnhfkY0khwQ7WIMRjXl31pH7KdAkHYA= X-Gm-Gg: ATEYQzwBxfw9g7MFQRoY2ZDCBwGv8E5rneRCu1sFC+4hqSJbgODqw5J5RprJBOQd0sL UNT+B6hsrV80YIJzSAo96Num3X1ISCF2xcZzJ3iuQ1cj+bTh9LHUHLIne35BxJeqXfCKjap6gVr gsYVaSrDmKAI17Y9CRpmzdlaoDWXO3G2rHTR05bDb5HuY4aAXtKH1J8EWphRZMMy06RnCpMnd0M 4LPGaXvpaiCBp4dkn7U92zw70vTRD86MGJP+i5KUpdrxNpim7oCjEUEFoO1XJmcJCLmMc12mLSh jWWYGCpEu1WixUksLYO16ZvRH9n0iJhJLwq3zdbgrD50JsQKdmaLbebBsch3T3YdHhElvgmsVOJ 1YDYWzWmS9cfzcANweQPpqexv87P0BEWXXTQrnU/0UMmSz2DQvYCyNZrDjbrfx1PRBDDSY2QNCL YwNac= X-Received: by 2002:a05:6000:1845:b0:439:bddb:cc77 with SMTP id ffacd0b85a97d-439f8206d14mr10016371f8f.37.1773304127586; Thu, 12 Mar 2026 01:28:47 -0700 (PDT) Received: from [127.0.1.1] ([2a04:6f00:1::ee:b:1015]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-439fe219c41sm6273780f8f.29.2026.03.12.01.28.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 12 Mar 2026 01:28:47 -0700 (PDT) From: Jun Nie Date: Thu, 12 Mar 2026 16:28:12 +0800 Subject: [PATCH v19 3/4] drm/msm/dpu: support plane splitting in quad-pipe case 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: <20260312-msm-next-quad-pipe-split-v19-3-4ffa2b06c996@linaro.org> References: <20260312-msm-next-quad-pipe-split-v19-0-4ffa2b06c996@linaro.org> In-Reply-To: <20260312-msm-next-quad-pipe-split-v19-0-4ffa2b06c996@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 , Dmitry Baryshkov X-Mailer: b4 0.13.0 X-Developer-Signature: v=1; a=ed25519-sha256; t=1773304094; l=9858; i=jun.nie@linaro.org; s=20240403; h=from:subject:message-id; bh=mLiQ8kq+Hoe6yZbmNWCYHtVl5NbNfCazswthJQplHr8=; b=nlNdoeoKyEe5V55uxhNPCqhFMeJERNVARzQlQpo4M6Jgn4L5oaCo6VwfPLjpw3tDo50O1rmuh StSTJ5qIrSIDS9J0uOcGAEIR8Bq0oignOMG8oMd3fJtRYKExLivcZi0 X-Developer-Key: i=jun.nie@linaro.org; a=ed25519; pk=MNiBt/faLPvo+iJoP1hodyY2x6ozVXL8QMptmsKg3cc= The content of every half of screen is sent out via one interface in dual-DSI case. The content for every interface is blended by a LM pair in quad-pipe case, thus a LM pair should not blend any content that cross the half of screen in this case. Clip plane into pipes per left and right half screen ROI if topology is quad pipe case. The clipped rectangle on every half of screen is futher handled by two pipes if its width exceeds a limit for a single pipe. For non-virtual-plane case, there is always one stage config to serve a LM or LM pair. So the clipping does not occur when interating stages in this case. The plane is mapped to 2 pipes only when width or clock rate exceeds hardware constrain within stage check. Signed-off-by: Jun Nie Reviewed-by: Dmitry Baryshkov Reviewed-by: Jessica Zhang Patchwork: https://patchwork.freedesktop.org/patch/675416/ Link: https://lore.kernel.org/r/20250918-v6-16-rc2-quad-pipe-upstream-4-v16= -9-ff6232e3472f@linaro.org Signed-off-by: Dmitry Baryshkov --- drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c | 11 +++ drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.h | 2 + drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c | 146 +++++++++++++++++++++-----= ---- 3 files changed, 117 insertions(+), 42 deletions(-) diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c b/drivers/gpu/drm/msm= /disp/dpu1/dpu_crtc.c index e97456d4fbb8c..321fe13ee4eb0 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c @@ -1670,6 +1670,17 @@ int dpu_crtc_vblank(struct drm_crtc *crtc, bool en) return 0; } =20 +/** + * dpu_crtc_get_num_lm - Get mixer number in this CRTC pipeline + * @state: Pointer to drm crtc state object + */ +unsigned int dpu_crtc_get_num_lm(const struct drm_crtc_state *state) +{ + struct dpu_crtc_state *cstate =3D to_dpu_crtc_state(state); + + return cstate->num_mixers; +} + #ifdef CONFIG_DEBUG_FS static int _dpu_debugfs_status_show(struct seq_file *s, void *data) { diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.h b/drivers/gpu/drm/msm= /disp/dpu1/dpu_crtc.h index 94392b9b92454..6eaba5696e8e6 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.h +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.h @@ -267,4 +267,6 @@ static inline enum dpu_crtc_client_type dpu_crtc_get_cl= ient_type( =20 void dpu_crtc_frame_event_cb(struct drm_crtc *crtc, u32 event); =20 +unsigned int dpu_crtc_get_num_lm(const struct drm_crtc_state *state); + #endif /* _DPU_CRTC_H_ */ diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c b/drivers/gpu/drm/ms= m/disp/dpu1/dpu_plane.c index 70992a4401d69..5d83ff689de7c 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c @@ -881,47 +881,111 @@ static int dpu_plane_split(struct drm_plane *plane, struct dpu_plane_state *pstate =3D to_dpu_plane_state(new_plane_state); struct dpu_sw_pipe_cfg *pipe_cfg; struct dpu_sw_pipe_cfg *r_pipe_cfg; + const struct drm_display_mode *mode =3D &crtc_state->adjusted_mode; uint32_t max_linewidth; + u32 num_lm; + int stage_id, num_stages; =20 - /* move the assignment here, to ease handling to another pairs later */ - pipe_cfg =3D &pstate->pipe_cfg[0]; - r_pipe_cfg =3D &pstate->pipe_cfg[1]; - /* state->src is 16.16, src_rect is not */ - drm_rect_fp_to_int(&pipe_cfg->src_rect, &new_plane_state->src); + max_linewidth =3D pdpu->catalog->caps->max_linewidth; =20 - pipe_cfg->dst_rect =3D new_plane_state->dst; + /* In non-virtual plane case, one mixer pair is always needed. */ + num_lm =3D dpu_crtc_get_num_lm(crtc_state); + if (dpu_use_virtual_planes) + num_stages =3D (num_lm + 1) / 2; + else + num_stages =3D 1; =20 - max_linewidth =3D pdpu->catalog->caps->max_linewidth; + /* + * For wide plane that exceeds SSPP rectangle constrain, it needed to + * be split and mapped to 2 rectangles with 1 config for 2:2:1. + * For 2 interfaces cases, such as dual DSI, 2:2:2 topology is needed. + * If the width or clock exceeds hardware limitation in every half of + * screen, 4:4:2 topology is needed and virtual plane feature should + * be enabled to map plane to more than 1 SSPP. 2 stage configs are + * needed to serve 2 mixer pairs in this 4:4:2 case. So both left/right + * half of plane splitting, and splitting within the half of screen is + * needed in quad-pipe case. Check dest rectangle left/right clipping + * and iterate mixer configs for this plane first, then check wide + * rectangle splitting in every half next. + */ + for (stage_id =3D 0; stage_id < num_stages; stage_id++) { + struct drm_rect mixer_rect =3D { + .x1 =3D stage_id * mode->hdisplay / num_stages, + .y1 =3D 0, + .x2 =3D (stage_id + 1) * mode->hdisplay / num_stages, + .y2 =3D mode->vdisplay + }; + int cfg_idx =3D stage_id * PIPES_PER_STAGE; =20 - drm_rect_rotate(&pipe_cfg->src_rect, - new_plane_state->fb->width, new_plane_state->fb->height, - new_plane_state->rotation); + pipe_cfg =3D &pstate->pipe_cfg[cfg_idx]; + r_pipe_cfg =3D &pstate->pipe_cfg[cfg_idx + 1]; =20 - 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; + drm_rect_fp_to_int(&pipe_cfg->src_rect, &new_plane_state->src); + + drm_rect_rotate(&pipe_cfg->src_rect, + new_plane_state->fb->width, new_plane_state->fb->height, + new_plane_state->rotation); + + pipe_cfg->dst_rect =3D new_plane_state->dst; + + DPU_DEBUG_PLANE(pdpu, "checking src " DRM_RECT_FMT + " vs clip window " DRM_RECT_FMT "\n", + DRM_RECT_ARG(&pipe_cfg->src_rect), + DRM_RECT_ARG(&mixer_rect)); + + /* + * If this plane does not fall into mixer rect, check next + * mixer rect. + */ + if (!drm_rect_clip_scaled(&pipe_cfg->src_rect, + &pipe_cfg->dst_rect, + &mixer_rect)) { + memset(pipe_cfg, 0, 2 * sizeof(struct dpu_sw_pipe_cfg)); + + continue; } =20 - *r_pipe_cfg =3D *pipe_cfg; - pipe_cfg->src_rect.x2 =3D (pipe_cfg->src_rect.x1 + pipe_cfg->src_rect.x2= ) >> 1; - pipe_cfg->dst_rect.x2 =3D (pipe_cfg->dst_rect.x1 + pipe_cfg->dst_rect.x2= ) >> 1; - r_pipe_cfg->src_rect.x1 =3D pipe_cfg->src_rect.x2; - r_pipe_cfg->dst_rect.x1 =3D pipe_cfg->dst_rect.x2; - } else { - memset(r_pipe_cfg, 0, sizeof(*r_pipe_cfg)); - } + pipe_cfg->dst_rect.x1 -=3D mixer_rect.x1; + pipe_cfg->dst_rect.x2 -=3D mixer_rect.x1; + + DPU_DEBUG_PLANE(pdpu, "Got clip src:" DRM_RECT_FMT " dst: " DRM_RECT_FMT= "\n", + DRM_RECT_ARG(&pipe_cfg->src_rect), DRM_RECT_ARG(&pipe_cfg->dst_rect)); + + /* Split wide rect into 2 rect */ + if ((drm_rect_width(&pipe_cfg->src_rect) > max_linewidth) || + _dpu_plane_calc_clk(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; + } + + memcpy(r_pipe_cfg, pipe_cfg, sizeof(struct dpu_sw_pipe_cfg)); + pipe_cfg->src_rect.x2 =3D (pipe_cfg->src_rect.x1 + pipe_cfg->src_rect.x= 2) >> 1; + pipe_cfg->dst_rect.x2 =3D (pipe_cfg->dst_rect.x1 + pipe_cfg->dst_rect.x= 2) >> 1; + r_pipe_cfg->src_rect.x1 =3D pipe_cfg->src_rect.x2; + r_pipe_cfg->dst_rect.x1 =3D pipe_cfg->dst_rect.x2; + DPU_DEBUG_PLANE(pdpu, "Split wide plane into:" + DRM_RECT_FMT " and " DRM_RECT_FMT "\n", + DRM_RECT_ARG(&pipe_cfg->src_rect), + DRM_RECT_ARG(&r_pipe_cfg->src_rect)); + } else { + memset(r_pipe_cfg, 0, sizeof(struct dpu_sw_pipe_cfg)); + } =20 - drm_rect_rotate_inv(&pipe_cfg->src_rect, - new_plane_state->fb->width, new_plane_state->fb->height, - new_plane_state->rotation); - if (drm_rect_width(&r_pipe_cfg->src_rect) !=3D 0) - drm_rect_rotate_inv(&r_pipe_cfg->src_rect, - new_plane_state->fb->width, new_plane_state->fb->height, + drm_rect_rotate_inv(&pipe_cfg->src_rect, + new_plane_state->fb->width, + new_plane_state->fb->height, new_plane_state->rotation); =20 + if (drm_rect_width(&r_pipe_cfg->src_rect) !=3D 0) + drm_rect_rotate_inv(&r_pipe_cfg->src_rect, + new_plane_state->fb->width, + new_plane_state->fb->height, + new_plane_state->rotation); + } + return 0; } =20 @@ -995,20 +1059,18 @@ static int dpu_plane_atomic_check_sspp(struct drm_pl= ane *plane, drm_atomic_get_new_plane_state(state, plane); struct dpu_plane *pdpu =3D to_dpu_plane(plane); struct dpu_plane_state *pstate =3D to_dpu_plane_state(new_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]; - int ret =3D 0; =20 - ret =3D dpu_plane_atomic_check_pipe(pdpu, pipe, pipe_cfg, - &crtc_state->adjusted_mode, - new_plane_state); - if (ret) - return ret; + struct dpu_sw_pipe *pipe; + struct dpu_sw_pipe_cfg *pipe_cfg; + int ret =3D 0, i; =20 - if (drm_rect_width(&r_pipe_cfg->src_rect) !=3D 0) { - ret =3D dpu_plane_atomic_check_pipe(pdpu, r_pipe, r_pipe_cfg, + for (i =3D 0; i < PIPES_PER_PLANE; i++) { + pipe =3D &pstate->pipe[i]; + pipe_cfg =3D &pstate->pipe_cfg[i]; + if (!drm_rect_width(&pipe_cfg->src_rect)) + continue; + DPU_DEBUG_PLANE(pdpu, "pipe %d is in use, validate it\n", i); + ret =3D dpu_plane_atomic_check_pipe(pdpu, pipe, pipe_cfg, &crtc_state->adjusted_mode, new_plane_state); if (ret) --=20 2.43.0 From nobody Thu Apr 2 22:28:53 2026 Received: from mail-wr1-f43.google.com (mail-wr1-f43.google.com [209.85.221.43]) (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 BBB393590A4 for ; Thu, 12 Mar 2026 08:28:57 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.221.43 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773304141; cv=none; b=GFptRiU9u7ejTfth4jxyYQ8upV44b4ThvV8ONWp0Mf0DB7PaHSjX3mf+LjEM00jl8aVXkCg35ZijldQnxDqSdgc2ChRtEu8vcs0BKQRFLPDdl5rZhLPAjIWXlXYUTAKcCPe+91oTuaRVmKyMflhaSG523mSmlFC7VNy62vBmEFU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773304141; c=relaxed/simple; bh=8kR0396REqvuKmB6TZSaRU+BiyiylwPGlc9RpGAx908=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=TE9qCspI9dOdjVz5EdTGrO6c698pa8MFpAXPt6ZI9rGodY6LZpR2tQDeaxSKPTWoJ+V6le4+D1okN1qX2JYjpEOJ6inuVFf5O526tUdISYeO/lWp9DoGZbrL2uAXtSwOledEAaMYnatGUDmmqb19Ei6BvSfqiRu+SMaNwFnkSQQ= 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=nEi2KuTG; arc=none smtp.client-ip=209.85.221.43 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="nEi2KuTG" Received: by mail-wr1-f43.google.com with SMTP id ffacd0b85a97d-439baf33150so636803f8f.0 for ; Thu, 12 Mar 2026 01:28:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1773304136; x=1773908936; 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=M5ADNottAFBcJzLB/cFFb7rI2cvgCn9K6lmb9P0fLQI=; b=nEi2KuTGsrExXQU9mt82glzlKhllfSlsRNOWCr2LwZWKw+mn4iMSqpsalD1q/4J0Dd y4ZoOsLyl9zfQFyw4t9FDGjJBRgdzw/LI0n21jDWwePmF4GEitbQzkq4mb3T+CzU34z5 q2J65skIReJl7pMlWYoW++piYnrwQOWuW/L9jhEiHBngfW/tpLrtl3R2xNAcdu0pGADt srMlXO5Nut0/08JXPzkPegHpwVbtd84f1La3xqyows2nlDZE5Dqb7FLqJOX7uerGhdkR 3mFSkX1oL/PXlKcuVzimJZH6LT60dY8RHmlMCiz4A6PaTjWMuk5pQ+Uhn9txhzjTVSLc Oytw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1773304136; x=1773908936; 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=M5ADNottAFBcJzLB/cFFb7rI2cvgCn9K6lmb9P0fLQI=; b=VjUxmzNSjzSklufDUKGSmN2QP94HiO/xhkfVOmHtFQFV/0lmzuy5ySk7S97ezvx7C3 ay548D1re0WTEvhUxp40qFIYVe+T+dg2P+zi+Ci1RclHuo4kngcE5XjG3lv+InW6bBLz +ky6fhcvCliWyw4YD3BDZATEFDhY9Jxi2F2avlXhKwwDHGQiZmt/QRVwajE1jkRbSxHI MXPBfVNE7aBsGZ1suipuOyzV/jGP+gRuk3/QHa9SPhhSNiDHHynJ6KTZXCy4jBIduQAv Syfr/mJB7pPQ/BP0hClDSmtqmgWqxq45iBF1lYd1pL/BQjOcs/P+OMcqPQwXG/ebNCfc ioNQ== X-Forwarded-Encrypted: i=1; AJvYcCVZwAgc/YLTbojTUpRfghJRQcYS5LUizDlrlWyuP5xmbkxQW6EcOc45c3Ybu6TkzcL7aY1p1A72OIH/qvA=@vger.kernel.org X-Gm-Message-State: AOJu0YyOJaqVF5M+cWZYpo9+NdxF5KJpFiiF6gL8OUGPgn3K4Ue0gZQo OV2Wtd1Kq1zx5G7UmKmuwYFEv8QK6XgXdVDrFSvoi0pnSwL1Kj+bVAG5Gj7eV2JzpEM= X-Gm-Gg: ATEYQzz6BpsNsNByp2lN8pTBN+nTn0hL4q+2KA4fdKs5Ga/h7/qTZMioPqko8dGCD3O eBqZfzDs0pJPwgcgZRHN9Gr4H6Lo9y2qE5eJMkX8lk29lnbW9moBjscL/7GgAnXy6lYfsg4cRQ6 WXd6fQ39jvy4yNVnH5/5P1qvmStZYivnEhK4cBoeW0p5iCyqOvX3YywddBxjbGCyGui6n+YwWiV er7mt/3DVojhq2oyOuiZAOisbZrOgyYJjPqSIe9O0+umzQFAX/VR7sSGFIbzpaaDSPh7NUKxFSU hIFljfJEWm8oAJR1iutqmRuUWypsTyZ4eGW6hY7zkhhKSDWc25HwguzGTXABrr45zsy2IQ3t1RK qUqHs+8gicR1WUf+6e2fdTT2hprtWNLFAENpUJnTfm+SosSpElPLWzrCkOVRvS+/RGNhNYW7thq FBfkU= X-Received: by 2002:a05:6000:2601:b0:439:a95b:3c47 with SMTP id ffacd0b85a97d-439fdf42636mr4944392f8f.10.1773304135984; Thu, 12 Mar 2026 01:28:55 -0700 (PDT) Received: from [127.0.1.1] ([2a04:6f00:1::ee:b:1015]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-439fe219c41sm6273780f8f.29.2026.03.12.01.28.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 12 Mar 2026 01:28:55 -0700 (PDT) From: Jun Nie Date: Thu, 12 Mar 2026 16:28:13 +0800 Subject: [PATCH v19 4/4] drm/msm/dpu: Enable quad-pipe for DSC and dual-DSI case 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: <20260312-msm-next-quad-pipe-split-v19-4-4ffa2b06c996@linaro.org> References: <20260312-msm-next-quad-pipe-split-v19-0-4ffa2b06c996@linaro.org> In-Reply-To: <20260312-msm-next-quad-pipe-split-v19-0-4ffa2b06c996@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 , Dmitry Baryshkov X-Mailer: b4 0.13.0 X-Developer-Signature: v=1; a=ed25519-sha256; t=1773304094; l=9265; i=jun.nie@linaro.org; s=20240403; h=from:subject:message-id; bh=8kR0396REqvuKmB6TZSaRU+BiyiylwPGlc9RpGAx908=; b=JPVyIcsru+JqA0Z952ZO59S3cKSGjIO87TRF/DfsIcgflUQjzuDFGf+if0EfJa58VpPhrZUQl QUmsUwqZK5vBxbM/PiIQXijAIDLGFBzb7hFenrigxx6UUr/3Vmzuz+H X-Developer-Key: i=jun.nie@linaro.org; a=ed25519; pk=MNiBt/faLPvo+iJoP1hodyY2x6ozVXL8QMptmsKg3cc= To support high-resolution cases that exceed the width constrain or scenarios that surpass the maximum MDP clock rate, additional pipes are necessary to enable parallel data processing within the width constraints and MDP clock rate. Expand pipe array size to 4. Request 4 mixers and 4 DSCs for high-resolution cases where dual interfaces are enabled for virtual plane case. More use cases can be incorporated later if quad-pipe capabilities are required. Signed-off-by: Jun Nie Reviewed-by: Dmitry Baryshkov Reviewed-by: Jessica Zhang Patchwork: https://patchwork.freedesktop.org/patch/675418/ Link: https://lore.kernel.org/r/20250918-v6-16-rc2-quad-pipe-upstream-4-v16= -10-ff6232e3472f@linaro.org Signed-off-by: Dmitry Baryshkov --- drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c | 48 ++++++++++++++++----= ---- drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.h | 6 +-- drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c | 29 +++++--------- drivers/gpu/drm/msm/disp/dpu1/dpu_encoder_phys.h | 2 +- drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.h | 2 +- drivers/gpu/drm/msm/disp/dpu1/dpu_hw_mdss.h | 2 +- 6 files changed, 47 insertions(+), 42 deletions(-) diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c b/drivers/gpu/drm/msm= /disp/dpu1/dpu_crtc.c index 321fe13ee4eb0..de6fbc5e33a60 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c @@ -200,7 +200,7 @@ static int dpu_crtc_get_lm_crc(struct drm_crtc *crtc, struct dpu_crtc_state *crtc_state) { struct dpu_crtc_mixer *m; - u32 crcs[CRTC_DUAL_MIXERS]; + u32 crcs[CRTC_QUAD_MIXERS]; =20 int rc =3D 0; int i; @@ -1388,6 +1388,9 @@ static struct msm_display_topology dpu_crtc_get_topol= ogy( struct drm_display_mode *mode =3D &crtc_state->adjusted_mode; struct msm_display_topology topology =3D {0}; struct drm_encoder *drm_enc; + struct msm_drm_private *priv =3D crtc->dev->dev_private; + struct dpu_kms *kms =3D to_dpu_kms(priv->kms); + u32 num_rt_intf; =20 drm_for_each_encoder_mask(drm_enc, crtc->dev, crtc_state->encoder_mask) dpu_encoder_update_topology(drm_enc, &topology, crtc_state->state, @@ -1400,31 +1403,44 @@ static struct msm_display_topology dpu_crtc_get_top= ology( * * Dual display * 2 LM, 2 INTF ( Split display using 2 interfaces) + * 4 LM, 2 INTF ( Split display using 2 interfaces and stream merge + to support high resolution interfaces if virtual + plane is enabled) + * If DSC is enabled, use 2:2:2 for 2 LMs case, and 4:4:2 for 4 LMs + * case. * * Single display * 1 LM, 1 INTF * 2 LM, 1 INTF (stream merge to support high resolution interfaces) * - * If DSC is enabled, use 2 LMs for 2:2:1 topology + * If DSC is enabled, use 2 LMs for 2:2:1 topology for single display + * to support legacy devices that use this topology. * * Add dspps to the reservation requirements if ctm or gamma_lut are requ= ested - * - * Only hardcode num_lm to 2 for cases where num_intf =3D=3D 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. */ =20 - if (topology.num_intf =3D=3D 2 && !topology.cwb_enabled) - topology.num_lm =3D 2; - else if (topology.num_dsc =3D=3D 2) - topology.num_lm =3D 2; - else if (dpu_kms->catalog->caps->has_3d_merge) - topology.num_lm =3D (mode->hdisplay > MAX_HDISPLAY_SPLIT) ? 2 : 1; + num_rt_intf =3D topology.num_intf; + if (topology.cwb_enabled) + num_rt_intf--; + + if ((mode->hdisplay > (MAX_HDISPLAY_SPLIT * num_rt_intf)) || + ((u64)mode->hdisplay * mode->vtotal * drm_mode_vrefresh(mode) > + kms->perf.max_core_clk_rate)) + topology.num_lm =3D num_rt_intf * 2; else - topology.num_lm =3D 1; + topology.num_lm =3D num_rt_intf; + + if (!dpu_use_virtual_planes) + topology.num_lm =3D min(2, topology.num_lm); + + if (!dpu_kms->catalog->caps->has_3d_merge) + topology.num_lm =3D min(num_rt_intf, topology.num_lm); + + if (topology.num_dsc) { + if (num_rt_intf =3D=3D 1) + topology.num_lm =3D 2; + topology.num_dsc =3D topology.num_lm; + } =20 if (crtc_state->ctm || crtc_state->gamma_lut) topology.num_dspp =3D topology.num_lm; diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.h b/drivers/gpu/drm/msm= /disp/dpu1/dpu_crtc.h index 6eaba5696e8e6..455073c7025b0 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.h +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.h @@ -210,7 +210,7 @@ struct dpu_crtc_state { =20 bool bw_control; bool bw_split_vote; - struct drm_rect lm_bounds[CRTC_DUAL_MIXERS]; + struct drm_rect lm_bounds[CRTC_QUAD_MIXERS]; =20 uint64_t input_fence_timeout_ns; =20 @@ -218,10 +218,10 @@ struct dpu_crtc_state { =20 /* HW Resources reserved for the crtc */ u32 num_mixers; - struct dpu_crtc_mixer mixers[CRTC_DUAL_MIXERS]; + struct dpu_crtc_mixer mixers[CRTC_QUAD_MIXERS]; =20 u32 num_ctls; - struct dpu_hw_ctl *hw_ctls[CRTC_DUAL_MIXERS]; + struct dpu_hw_ctl *hw_ctls[CRTC_QUAD_MIXERS]; =20 enum dpu_crtc_crc_source crc_source; int crc_frame_skip_count; diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c b/drivers/gpu/drm/= msm/disp/dpu1/dpu_encoder.c index eba1d52211f68..058a7c8727f7c 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c @@ -55,7 +55,7 @@ #define MAX_PHYS_ENCODERS_PER_VIRTUAL \ (MAX_H_TILES_PER_DISPLAY * NUM_PHYS_ENCODER_TYPES) =20 -#define MAX_CHANNELS_PER_ENC 2 +#define MAX_CHANNELS_PER_ENC 4 #define MAX_CWB_PER_ENC 2 =20 #define IDLE_SHORT_TIMEOUT 1 @@ -661,7 +661,6 @@ void dpu_encoder_update_topology(struct drm_encoder *dr= m_enc, struct dpu_encoder_virt *dpu_enc =3D to_dpu_encoder_virt(drm_enc); struct msm_drm_private *priv =3D dpu_enc->base.dev->dev_private; struct msm_display_info *disp_info =3D &dpu_enc->disp_info; - struct dpu_kms *dpu_kms =3D to_dpu_kms(priv->kms); struct drm_connector *connector; struct drm_connector_state *conn_state; struct drm_framebuffer *fb; @@ -675,22 +674,12 @@ void dpu_encoder_update_topology(struct drm_encoder *= drm_enc, =20 dsc =3D dpu_encoder_get_dsc_config(drm_enc); =20 - /* We only support 2 DSC mode (with 2 LM and 1 INTF) */ - if (dsc) { - /* - * Use 2 DSC encoders, 2 layer mixers and 1 or 2 interfaces - * when Display Stream Compression (DSC) is enabled, - * and when enough DSC blocks are available. - * This is power-optimal and can drive up to (including) 4k - * screens. - */ - WARN(topology->num_intf > 2, - "DSC topology cannot support more than 2 interfaces\n"); - if (topology->num_intf >=3D 2 || dpu_kms->catalog->dsc_count >=3D 2) - topology->num_dsc =3D 2; - else - topology->num_dsc =3D 1; - } + /* + * Set DSC number as 1 to mark the enabled status, will be adjusted + * in dpu_crtc_get_topology() + */ + if (dsc) + topology->num_dsc =3D 1; =20 connector =3D drm_atomic_get_new_connector_for_encoder(state, drm_enc); if (!connector) @@ -2180,8 +2169,8 @@ static void dpu_encoder_helper_reset_mixers(struct dp= u_encoder_phys *phys_enc) { int i, num_lm; struct dpu_global_state *global_state; - struct dpu_hw_blk *hw_lm[2]; - struct dpu_hw_mixer *hw_mixer[2]; + struct dpu_hw_blk *hw_lm[MAX_CHANNELS_PER_ENC]; + struct dpu_hw_mixer *hw_mixer[MAX_CHANNELS_PER_ENC]; struct dpu_hw_ctl *ctl =3D phys_enc->hw_ctl; =20 /* reset all mixers for this encoder */ diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder_phys.h b/drivers/gpu= /drm/msm/disp/dpu1/dpu_encoder_phys.h index 61b22d9494546..09395d7910ac8 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder_phys.h +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder_phys.h @@ -302,7 +302,7 @@ static inline enum dpu_3d_blend_mode dpu_encoder_helper= _get_3d_blend_mode( =20 /* Use merge_3d unless DSC MERGE topology is used */ if (phys_enc->split_role =3D=3D ENC_ROLE_SOLO && - dpu_cstate->num_mixers =3D=3D CRTC_DUAL_MIXERS && + (dpu_cstate->num_mixers !=3D 1) && !dpu_encoder_use_dsc_merge(phys_enc->parent)) return BLEND_3D_H_ROW_INT; =20 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 70d5ed4732f2e..b93442f75c2eb 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.h +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.h @@ -24,7 +24,7 @@ #define DPU_MAX_IMG_WIDTH 0x3fff #define DPU_MAX_IMG_HEIGHT 0x3fff =20 -#define CRTC_DUAL_MIXERS 2 +#define CRTC_QUAD_MIXERS 4 =20 #define MAX_XIN_COUNT 16 =20 diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_mdss.h b/drivers/gpu/drm/= msm/disp/dpu1/dpu_hw_mdss.h index 046b683d4c66d..31451241f0839 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_mdss.h +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_mdss.h @@ -34,7 +34,7 @@ #define DPU_MAX_PLANES 4 #endif =20 -#define STAGES_PER_PLANE 1 +#define STAGES_PER_PLANE 2 #define PIPES_PER_STAGE 2 #define PIPES_PER_PLANE (PIPES_PER_STAGE * STAGES_PER_PLANE) #ifndef DPU_MAX_DE_CURVES --=20 2.43.0