From nobody Tue Oct 7 21:36:28 2025 Received: from mail-pg1-f176.google.com (mail-pg1-f176.google.com [209.85.215.176]) (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 E1B8728642D for ; Mon, 7 Jul 2025 06:18:54 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.215.176 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1751869136; cv=none; b=D/2vbBrvW+RxwDyfCHU8+Xy3cpLpDAGbl4mk+uWIh3o9Q7b6jiT3IYP6SaeUjovIQEvuEGJJ12/YFUO0rbiv3/onYQOpovVMIJCEHND0Jbfe7KcrLYPKAUpDG4NP4DxiO/2vXCc9rf/sRwatPoUsKyTdEQo74WiYuWL9ggIDNag= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1751869136; c=relaxed/simple; bh=w6OvEIF3tSd/dBIIL4Coh3mB83jJ5FGZMgy+w60QLRM=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=hblW2TkuU7I9E/16VglbNCH3QJvRHUXGefyRakDyfSFTRaGeeF7MYB83BuyG+hc9WMWJwfZqC84Ml7G/CZgjbqmu75akoLZBnQV/9oM0L+PfGgp0DN+QXwmdekmAweS5Nj7vrxa3uURc7KeBz8JHgXWiy8H6o+AkO6vA1irmxrI= 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=Bsk8A1/9; arc=none smtp.client-ip=209.85.215.176 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="Bsk8A1/9" Received: by mail-pg1-f176.google.com with SMTP id 41be03b00d2f7-b34a78bb6e7so1846849a12.3 for ; Sun, 06 Jul 2025 23:18:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1751869134; x=1752473934; 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=N8kgit1BpE3d05xGdiuLr97hSDDiFgnmQxTTWKgwMvI=; b=Bsk8A1/9Gum0hv8Zy/cdEt70X/qh8h8Y0WD+ChxLpz53aVEloxyEiC7JqUcHGsaY1Q zQQ5jmP805J41kZQASudCToMyCkSydbNcsSA0qeYTL45ANvDCdkvTcSyvJlWPZWP2RQt jaL5qSBlTYHQM1z70PpYwfDck7DWsPZZQh/e2W/4w5Pr0Rpp8hoeNIbSoS36zSARyYzV mcEHDPzP/BbP+ST9QisXwm0mwL+pSg+7xSBlHXrXy+ifaCGvXcdDU6n/o7mhsfv23bBT 2HVzNucDyI11+X2Gq0YhMy94cFRQ1qjM3YMIowlW4fH3rGTSXXtbhcYAZlGHGsMpeCtb MWlg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1751869134; x=1752473934; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=N8kgit1BpE3d05xGdiuLr97hSDDiFgnmQxTTWKgwMvI=; b=tA3em0fuhD6UyG+PEpIkETNE0tRqOayl9OARPLgkXGXhkiSZv+H6HpSjJEeUkM22xz P+4jsq9DyYdwY0kimDqWyTsaN51Oj1j5hWpAsZ+zGAEasT4hNv/aZg/GdF/fUMeHe79w Xa8jqDu4K5APnUvtlu5eEobGCAhVpTbYQy5DJqc9OL2hvlw0ycUjx3BmrnPxoWxnh7JP mrzP3SwLhvR8BQWRCWwMqu8S/fFd+Qud/r+cZ4gjpMbK9e+40wr9KMvpXJMUeJDeYaG7 fszPPbfwiFshXPhuoDgwvRBejHGLy+nIqsDkjQ3OiU1huHAjz6cbYCie1dy/SrSRHYEj WwFA== X-Forwarded-Encrypted: i=1; AJvYcCVMDFvbuQr0tuNvdnWdDiR7yVv3BGyDsmTX/Sq/jVIS8bucwRpo/6Pyve4y9w1uOcXgXgtUaQrH4Kr51iM=@vger.kernel.org X-Gm-Message-State: AOJu0Ywd9YvKIBgzzWObNSs3eALy7naJCt7WpmI+TwB+WxrF5Yor+3sB jxSsQZUAK8iz7pXPfTEaOezxWmE7D41kLKw78kuAnmir4FAG7FSxfC35AmlbpP/vjrE= X-Gm-Gg: ASbGncv8fZYWzZj6L82w4LRdJ1HqHbv18hllb+xJYZT8ZvyAmtCZl+I5jgI6jV+Xx6x ZXjhA0wJ5iF311blbl/Sow3ZrzmNcBabwKuzTmTdOPOCBE9OhelBErv/FU+vI/STG6Bk55tBxWI OFKxqzbpq2IhklrDc5/3k2qUQ+5OdVu9F0GQZyVn1ovvJ58MOPiH/hmfCtqrYQoaBfzRZnQ1/yk 7jp6Kmn7lv39QDQjuSAxSOBoqkdsTEZE30YguEj+4Quy0W9loI6vr807UtYDzrqZef7fcLVVR1I 7Q8trjpFtImsat8364Hnm4jAbw882b4L0bjHXwr7Dy3ZAAcPfQ6OB4DjX1s= X-Google-Smtp-Source: AGHT+IGpQFGQTZ1sKiIn84Jo7HPHJex3oh+gpvZPOS+zdC7io1z+I327IdcvwKZG5ah8a76qX+0NzQ== X-Received: by 2002:a05:6a20:7291:b0:1f5:6c7b:8920 with SMTP id adf61e73a8af0-225b754f67dmr16619222637.9.1751869134234; Sun, 06 Jul 2025 23:18:54 -0700 (PDT) Received: from [127.0.1.1] ([103.163.156.9]) by smtp.gmail.com with ESMTPSA id 41be03b00d2f7-b38ee450ccbsm8037327a12.3.2025.07.06.23.18.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 06 Jul 2025 23:18:53 -0700 (PDT) From: Jun Nie Date: Mon, 07 Jul 2025 14:18:02 +0800 Subject: [PATCH v12 07/12] drm/msm/dpu: split PIPES_PER_STAGE definition per plane and mixer 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: <20250707-v6-16-rc2-quad-pipe-upstream-v12-7-67e3721e7d83@linaro.org> References: <20250707-v6-16-rc2-quad-pipe-upstream-v12-0-67e3721e7d83@linaro.org> In-Reply-To: <20250707-v6-16-rc2-quad-pipe-upstream-v12-0-67e3721e7d83@linaro.org> To: Rob Clark , Abhinav Kumar , Dmitry Baryshkov , Sean Paul , Marijn Suijten , David Airlie , Simona Vetter , Jessica Zhang 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.14.2 X-Developer-Signature: v=1; a=ed25519-sha256; t=1751869084; l=6393; i=jun.nie@linaro.org; s=20240403; h=from:subject:message-id; bh=w6OvEIF3tSd/dBIIL4Coh3mB83jJ5FGZMgy+w60QLRM=; b=hcsJ+07a+QZqprMCWmQZ7kTOYhpuGJAul7bL8pPtmT7l+lsoHYFDyz9CelOrgwUJazstwouzJ 9eaH43jnM/7BgaESrTVGS8WbqytgGsM+U1rOOC3BawpI87nS2QhsUM4 X-Developer-Key: i=jun.nie@linaro.org; a=ed25519; pk=MNiBt/faLPvo+iJoP1hodyY2x6ozVXL8QMptmsKg3cc= The stage contains configuration for a mixer pair. Currently the plane supports just one stage and 2 pipes. Quad-pipe support will require handling 2 stages and 4 pipes at the same time. In preparation for that add a separate define, PIPES_PER_PLANE, to denote number of pipes that can be used by the plane. Signed-off-by: Jun Nie Reviewed-by: Dmitry Baryshkov --- drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c | 7 +++---- drivers/gpu/drm/msm/disp/dpu1/dpu_hw_mdss.h | 1 + drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c | 18 +++++++++--------- drivers/gpu/drm/msm/disp/dpu1/dpu_plane.h | 4 ++-- 4 files changed, 15 insertions(+), 15 deletions(-) diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c b/drivers/gpu/drm/msm= /disp/dpu1/dpu_crtc.c index 121bd0d304b308bcd7226784eda14d7c7f5a46f4..30fbd7565b82c6b6b13dc3ec0f4= c91328a8e94c9 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c @@ -472,8 +472,7 @@ static void _dpu_crtc_blend_setup_mixer(struct drm_crtc= *crtc, if (pstate->stage =3D=3D DPU_STAGE_BASE && format->alpha_enable) bg_alpha_enable =3D true; =20 - - for (i =3D 0; i < PIPES_PER_STAGE; i++) { + for (i =3D 0; i < PIPES_PER_PLANE; i++) { if (!pstate->pipe[i].sspp) continue; set_bit(pstate->pipe[i].sspp->idx, active_fetch); @@ -1305,7 +1304,7 @@ static int dpu_crtc_reassign_planes(struct drm_crtc *= crtc, struct drm_crtc_state return ret; } =20 -#define MAX_CHANNELS_PER_CRTC 2 +#define MAX_CHANNELS_PER_CRTC PIPES_PER_PLANE #define MAX_HDISPLAY_SPLIT 1080 =20 static struct msm_display_topology dpu_crtc_get_topology( @@ -1663,7 +1662,7 @@ static int _dpu_debugfs_status_show(struct seq_file *= s, void *data) state->crtc_x, state->crtc_y, state->crtc_w, state->crtc_h); =20 - for (i =3D 0; i < PIPES_PER_STAGE; i++) { + for (i =3D 0; i < PIPES_PER_PLANE; i++) { if (!pstate->pipe[i].sspp) continue; seq_printf(s, "\tsspp[%d]:%s\n", 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 175639c8bfbb9bbd02ed35f1780bcbd869f08c36..9f75b497aa0c939296207d58dde= 32028d0a76a6d 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_mdss.h +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_mdss.h @@ -34,6 +34,7 @@ #define DPU_MAX_PLANES 4 #endif =20 +#define PIPES_PER_PLANE 2 #define PIPES_PER_STAGE 2 #ifndef DPU_MAX_DE_CURVES #define DPU_MAX_DE_CURVES 3 diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c b/drivers/gpu/drm/ms= m/disp/dpu1/dpu_plane.c index 6263d74e5cfa7acd5b4e2156b73b6fa26f5ddd77..149e7066480b07f9f6d422748d8= 9ffd6f9416f33 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c @@ -634,7 +634,7 @@ static void _dpu_plane_color_fill(struct dpu_plane *pdp= u, return; =20 /* update sspp */ - for (i =3D 0; i < PIPES_PER_STAGE; i++) { + for (i =3D 0; i < PIPES_PER_PLANE; i++) { if (!pstate->pipe[i].sspp) continue; _dpu_plane_color_fill_pipe(pstate, &pstate->pipe[i], @@ -1153,7 +1153,7 @@ static int dpu_plane_virtual_atomic_check(struct drm_= plane *plane, * resources are freed by dpu_crtc_assign_plane_resources(), * but clean them here. */ - for (i =3D 0; i < PIPES_PER_STAGE; i++) + for (i =3D 0; i < PIPES_PER_PLANE; i++) pstate->pipe[i].sspp =3D NULL; =20 return 0; @@ -1207,7 +1207,7 @@ static int dpu_plane_virtual_assign_resources(struct = drm_crtc *crtc, pipe_cfg =3D &pstate->pipe_cfg[0]; r_pipe_cfg =3D &pstate->pipe_cfg[1]; =20 - for (i =3D 0; i < PIPES_PER_STAGE; i++) + for (i =3D 0; i < PIPES_PER_PLANE; i++) pstate->pipe[i].sspp =3D NULL; =20 if (!plane_state->fb) @@ -1340,7 +1340,7 @@ void dpu_plane_flush(struct drm_plane *plane) /* force 100% alpha */ _dpu_plane_color_fill(pdpu, pdpu->color_fill, 0xFF); else { - for (i =3D 0; i < PIPES_PER_STAGE; i++) + for (i =3D 0; i < PIPES_PER_PLANE; i++) dpu_plane_flush_csc(pdpu, &pstate->pipe[i]); } =20 @@ -1463,7 +1463,7 @@ static void dpu_plane_sspp_atomic_update(struct drm_p= lane *plane, &fmt->pixel_format, MSM_FORMAT_IS_UBWC(fmt)); =20 /* move the assignment here, to ease handling to another pairs later */ - for (i =3D 0; i < PIPES_PER_STAGE; i++) { + for (i =3D 0; i < PIPES_PER_PLANE; i++) { if (!pstate->pipe[i].sspp) continue; dpu_plane_sspp_update_pipe(plane, &pstate->pipe[i], @@ -1477,7 +1477,7 @@ static void dpu_plane_sspp_atomic_update(struct drm_p= lane *plane, =20 pstate->plane_fetch_bw =3D 0; pstate->plane_clk =3D 0; - for (i =3D 0; i < PIPES_PER_STAGE; i++) { + for (i =3D 0; i < PIPES_PER_PLANE; i++) { if (!pstate->pipe[i].sspp) continue; pstate->plane_fetch_bw +=3D _dpu_plane_calc_bw(pdpu->catalog, fmt, @@ -1496,7 +1496,7 @@ static void _dpu_plane_atomic_disable(struct drm_plan= e *plane) struct dpu_sw_pipe *pipe; int i; =20 - for (i =3D 0; i < PIPES_PER_STAGE; i +=3D 1) { + for (i =3D 0; i < PIPES_PER_PLANE; i +=3D 1) { pipe =3D &pstate->pipe[i]; if (!pipe->sspp) continue; @@ -1618,7 +1618,7 @@ static void dpu_plane_atomic_print_state(struct drm_p= rinter *p, =20 drm_printf(p, "\tstage=3D%d\n", pstate->stage); =20 - for (i =3D 0; i < PIPES_PER_STAGE; i++) { + for (i =3D 0; i < PIPES_PER_PLANE; i++) { pipe =3D &pstate->pipe[i]; if (!pipe->sspp) continue; @@ -1675,7 +1675,7 @@ void dpu_plane_danger_signal_ctrl(struct drm_plane *p= lane, bool enable) return; =20 pm_runtime_get_sync(&dpu_kms->pdev->dev); - for (i =3D 0; i < PIPES_PER_STAGE; i++) { + for (i =3D 0; i < PIPES_PER_PLANE; i++) { if (!pstate->pipe[i].sspp) continue; _dpu_plane_set_qos_ctrl(plane, &pstate->pipe[i], enable); diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_plane.h b/drivers/gpu/drm/ms= m/disp/dpu1/dpu_plane.h index 007f044499b99ac9c2e4b58e98e6add013a986de..1ef5a041b8acae270826f20ea95= 53cbfa35a9f82 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_plane.h +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_plane.h @@ -31,8 +31,8 @@ */ struct dpu_plane_state { struct drm_plane_state base; - struct dpu_sw_pipe pipe[PIPES_PER_STAGE]; - struct dpu_sw_pipe_cfg pipe_cfg[PIPES_PER_STAGE]; + struct dpu_sw_pipe pipe[PIPES_PER_PLANE]; + struct dpu_sw_pipe_cfg pipe_cfg[PIPES_PER_PLANE]; enum dpu_stage stage; bool needs_qos_remap; bool pending; --=20 2.34.1