From: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
To: Rob Clark <robdclark@gmail.com>,
Abhinav Kumar <quic_abhinavk@quicinc.com>,
Dmitry Baryshkov <dmitry.baryshkov@linaro.org>,
Sean Paul <sean@poorly.run>,
Marijn Suijten <marijn.suijten@somainline.org>,
David Airlie <airlied@gmail.com>,
Daniel Vetter <daniel@ffwll.ch>
Cc: linux-arm-msm@vger.kernel.org, dri-devel@lists.freedesktop.org,
freedreno@lists.freedesktop.org, linux-kernel@vger.kernel.org
Subject: [PATCH v5 05/12] drm/msm/dpu: move pstate->pipe initialization to dpu_plane_atomic_check
Date: Thu, 27 Jun 2024 00:45:59 +0300 [thread overview]
Message-ID: <20240627-dpu-virtual-wide-v5-5-5efb90cbb8be@linaro.org> (raw)
In-Reply-To: <20240627-dpu-virtual-wide-v5-0-5efb90cbb8be@linaro.org>
In preparation for virtualized planes support, move pstate->pipe
initialization from dpu_plane_reset() to dpu_plane_atomic_check(). In
case of virtual planes the plane's pipe will not be known up to the
point of atomic_check() callback.
Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
---
drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c | 25 +++++++++++--------------
1 file changed, 11 insertions(+), 14 deletions(-)
diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c
index 4abaf2bb8a08..325af392e6a2 100644
--- a/drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c
+++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c
@@ -805,13 +805,22 @@ static int dpu_plane_atomic_check(struct drm_plane *plane,
uint32_t max_linewidth;
unsigned int rotation;
uint32_t supported_rotations;
- const struct dpu_sspp_cfg *pipe_hw_caps = pstate->pipe.sspp->cap;
- const struct dpu_sspp_sub_blks *sblk = pstate->pipe.sspp->cap->sblk;
+ 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;
+
min_scale = FRAC_16_16(1, sblk->maxupscale);
ret = drm_atomic_helper_check_plane_state(new_plane_state, crtc_state,
min_scale,
@@ -828,7 +837,6 @@ static int dpu_plane_atomic_check(struct drm_plane *plane,
pipe->multirect_mode = DPU_SSPP_MULTIRECT_NONE;
r_pipe->multirect_index = DPU_SSPP_RECT_SOLO;
r_pipe->multirect_mode = DPU_SSPP_MULTIRECT_NONE;
- r_pipe->sspp = NULL;
pstate->stage = DPU_STAGE_0 + pstate->base.normalized_zpos;
if (pstate->stage >= pdpu->catalog->caps->max_mixer_blendstages) {
@@ -1292,7 +1300,6 @@ static void dpu_plane_reset(struct drm_plane *plane)
{
struct dpu_plane *pdpu;
struct dpu_plane_state *pstate;
- struct dpu_kms *dpu_kms = _dpu_plane_get_kms(plane);
if (!plane) {
DPU_ERROR("invalid plane\n");
@@ -1314,16 +1321,6 @@ static void dpu_plane_reset(struct drm_plane *plane)
return;
}
- /*
- * Set the SSPP here until we have proper virtualized DPU planes.
- * This is the place where the state is allocated, so fill it fully.
- */
- pstate->pipe.sspp = dpu_rm_get_sspp(&dpu_kms->rm, pdpu->pipe);
- pstate->pipe.multirect_index = DPU_SSPP_RECT_SOLO;
- pstate->pipe.multirect_mode = DPU_SSPP_MULTIRECT_NONE;
-
- pstate->r_pipe.sspp = NULL;
-
__drm_atomic_helper_plane_reset(plane, &pstate->base);
}
--
2.39.2
next prev parent reply other threads:[~2024-06-26 21:46 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-06-26 21:45 [PATCH v5 00/12] drm/msm/dpu: support virtual wide planes Dmitry Baryshkov
2024-06-26 21:45 ` [PATCH v5 01/12] drm/msm/dpu: limit QCM2290 to RGB formats only Dmitry Baryshkov
2024-07-31 19:31 ` Abhinav Kumar
2024-06-26 21:45 ` [PATCH v5 02/12] drm/msm/dpu: relax YUV requirements Dmitry Baryshkov
2024-07-31 19:35 ` Abhinav Kumar
2024-08-01 0:34 ` Dmitry Baryshkov
2024-08-05 19:43 ` Abhinav Kumar
2024-06-26 21:45 ` [PATCH v5 03/12] drm/msm/dpu: take plane rotation into account for wide planes Dmitry Baryshkov
2024-06-26 21:45 ` [PATCH v5 04/12] drm/msm/dpu: use drm_rect_fp_to_int() Dmitry Baryshkov
2024-06-26 21:45 ` Dmitry Baryshkov [this message]
2024-08-27 20:45 ` [PATCH v5 05/12] drm/msm/dpu: move pstate->pipe initialization to dpu_plane_atomic_check Abhinav Kumar
2024-06-26 21:46 ` [PATCH v5 06/12] drm/msm/dpu: drop virt_formats from SSPP subblock configuration Dmitry Baryshkov
2024-06-26 21:46 ` [PATCH v5 07/12] drm/msm/dpu: move scaling limitations out of the hw_catalog Dmitry Baryshkov
2024-08-27 20:56 ` Abhinav Kumar
2024-06-26 21:46 ` [PATCH v5 08/12] drm/msm/dpu: split dpu_plane_atomic_check() Dmitry Baryshkov
2024-08-28 18:27 ` Abhinav Kumar
2024-08-28 18:59 ` Dmitry Baryshkov
2024-08-28 19:29 ` Abhinav Kumar
2024-08-28 20:54 ` Dmitry Baryshkov
2024-06-26 21:46 ` [PATCH v5 09/12] drm/msm/dpu: move rot90 checking to dpu_plane_atomic_check_pipe() Dmitry Baryshkov
2024-08-28 19:05 ` Abhinav Kumar
2024-08-28 20:55 ` Dmitry Baryshkov
2024-06-26 21:46 ` [PATCH v5 10/12] drm/msm/dpu: add support for virtual planes Dmitry Baryshkov
2024-08-28 20:54 ` Abhinav Kumar
2024-06-26 21:46 ` [PATCH v5 11/12] drm/msm/dpu: allow using two SSPP blocks for a single plane Dmitry Baryshkov
2024-06-26 21:46 ` [PATCH v5 12/12] drm/msm/dpu: include SSPP allocation state into the dumped state Dmitry Baryshkov
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240627-dpu-virtual-wide-v5-5-5efb90cbb8be@linaro.org \
--to=dmitry.baryshkov@linaro.org \
--cc=airlied@gmail.com \
--cc=daniel@ffwll.ch \
--cc=dri-devel@lists.freedesktop.org \
--cc=freedreno@lists.freedesktop.org \
--cc=linux-arm-msm@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=marijn.suijten@somainline.org \
--cc=quic_abhinavk@quicinc.com \
--cc=robdclark@gmail.com \
--cc=sean@poorly.run \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®