From: "Ville Syrjälä" <ville.syrjala@linux.intel.com>
To: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
Cc: Jessica Zhang <quic_jesszhan@quicinc.com>,
Rob Clark <robdclark@gmail.com>,
quic_abhinavk@quicinc.com, Sean Paul <sean@poorly.run>,
Marijn Suijten <marijn.suijten@somainline.org>,
David Airlie <airlied@gmail.com>, Daniel Vetter <daniel@ffwll.ch>,
Maarten Lankhorst <maarten.lankhorst@linux.intel.com>,
Maxime Ripard <mripard@kernel.org>,
Thomas Zimmermann <tzimmermann@suse.de>,
quic_ebharadw@quicinc.com, linux-arm-msm@vger.kernel.org,
dri-devel@lists.freedesktop.org, freedreno@lists.freedesktop.org,
linux-kernel@vger.kernel.org, Rob Clark <robdclark@chromium.org>
Subject: Re: [PATCH 07/21] drm/msm/dpu: Check CRTC encoders are valid clones
Date: Wed, 4 Sep 2024 22:23:01 +0300 [thread overview]
Message-ID: <ZtizlTxH-7EBhiSd@intel.com> (raw)
In-Reply-To: <CAA8EJpqM0QBxLFCx22UuVmYAE258im_Up2-3fu6qez1GrOhOQg@mail.gmail.com>
On Wed, Sep 04, 2024 at 09:41:23PM +0300, Dmitry Baryshkov wrote:
> On Wed, 4 Sept 2024 at 01:18, Jessica Zhang <quic_jesszhan@quicinc.com> wrote:
> >
> >
> >
> > On 8/30/2024 10:00 AM, Dmitry Baryshkov wrote:
> > > On Thu, Aug 29, 2024 at 01:48:28PM GMT, Jessica Zhang wrote:
> > >> Check that each encoder in the CRTC state's encoder_mask is marked as a
> > >> possible clone for all other encoders in the encoder_mask and that only
> > >> one CRTC is in clone mode at a time
> > >>
> > >> Signed-off-by: Jessica Zhang <quic_jesszhan@quicinc.com>
> > >> ---
> > >> drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c | 36 +++++++++++++++++++++++++++++++-
> > >> 1 file changed, 35 insertions(+), 1 deletion(-)
> > >>
> > >> diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c
> > >> index 5ec1b5a38922..bebae365c036 100644
> > >> --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c
> > >> +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c
> > >> @@ -1,6 +1,6 @@
> > >> // SPDX-License-Identifier: GPL-2.0-only
> > >> /*
> > >> - * Copyright (c) 2022-2023 Qualcomm Innovation Center, Inc. All rights reserved.
> > >> + * Copyright (c) 2022-2024 Qualcomm Innovation Center, Inc. All rights reserved.
> > >> * Copyright (c) 2014-2021 The Linux Foundation. All rights reserved.
> > >> * Copyright (C) 2013 Red Hat
> > >> * Author: Rob Clark <robdclark@gmail.com>
> > >> @@ -1204,6 +1204,36 @@ static struct msm_display_topology dpu_crtc_get_topology(
> > >> return topology;
> > >> }
> > >>
> > >> +static bool dpu_crtc_has_valid_clones(struct drm_crtc *crtc,
> > >> + struct drm_crtc_state *crtc_state)
> > >> +{
> > >> + struct drm_encoder *drm_enc;
> > >> + struct drm_crtc *temp_crtc;
> > >> + int num_cwb_sessions = 0;
> > >> +
> > >> + drm_for_each_crtc(temp_crtc, crtc->dev)
> > >> + if (drm_crtc_in_clone_mode(temp_crtc->state))
> > >
> > > No, get the state from drm_atomic_state. temp_crtc->state might be
> > > irrelevant.
> >
> > Hi Dmitry,
> >
> > Ack.
> >
> > >
> > >> + num_cwb_sessions++;
> > >
> > > Even simpler:
> > > if (temp_crtc != crtc && drm_crtc_in_clone_mode(...))
> > > return false;
> >
> > Ack.
> >
> > >
> > >> +
> > >> + /*
> > >> + * Only support a single concurrent writeback session running
> > >> + * at a time
> > >
> > > If it is not a hardware limitation, please add:
> > > FIXME: support more than one session
> >
> > This is a hardware limitation.
> >
> > >
> > >> + */
> > >> + if (num_cwb_sessions > 1)
> > >> + return false;
> > >> +
> > >> + drm_for_each_encoder_mask(drm_enc, crtc->dev, crtc_state->encoder_mask) {
> > >> + if ((crtc_state->encoder_mask & drm_enc->possible_clones) !=
> > >> + crtc_state->encoder_mask) {
> > >
> > > Align to opening bracket, please. Granted that other drivers don't
> > > perform this check, is it really necessary? Doesn't
> > > validate_encoder_possible_clones() ensure the same, but during the
> > > encoder registration?
> >
> > The difference here is that validate_encoder_possible_clones() is only
> > called when the drm device is initially registered.
> >
> > The check here is to make sure that the encoders userspace is proposing
> > to be cloned are actually possible clones of each other. This might not
> > be necessary for drivers where all encoders are all possible clones of
> > each other. But for MSM (and CWB), real-time display encoders can only
> > be clones of writeback (and vice versa).
>
> I had the feeling that encoder_mask should already take care of that,
> but it seems I was wrong.
> Please extract this piece as a generic helper. I think it should be
> called from the generic atomic_check() codepath.
Yeah, if we are semi-assured that drivers aren't screwing up those
bitmasks anymore we could shove the cloning checks into
drm_atomic_helper_check_modeset(). It already checks possible_crtcs.
We could then throw out the equavalent code from i915 as well...
Are there decent IGTs to make sure the kernel properly rejects
illegal cloning configurations?
--
Ville Syrjälä
Intel
next prev parent reply other threads:[~2024-09-04 19:23 UTC|newest]
Thread overview: 59+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-08-29 20:48 [PATCH 00/21] drm/msm/dpu: Add Concurrent Writeback Support for DPU 10.x+ Jessica Zhang
2024-08-29 20:48 ` [PATCH 01/21] drm: add clone mode check for CRTC Jessica Zhang
2024-08-29 20:48 ` [PATCH 02/21] drm: print clone mode status in atomic state Jessica Zhang
2024-08-30 16:38 ` Dmitry Baryshkov
2024-08-30 19:42 ` Jessica Zhang
2024-08-29 20:48 ` [PATCH 03/21] drm/msm/dpu: get rid of struct dpu_rm_requirements Jessica Zhang
2024-08-29 20:48 ` [PATCH 04/21] drm/msm/dpu: switch RM to use crtc_id rather than enc_id for allocation Jessica Zhang
2024-08-29 20:48 ` [PATCH 05/21] drm/msm/dpu: move resource allocation to CRTC Jessica Zhang
2024-08-30 16:42 ` Dmitry Baryshkov
2024-08-30 17:01 ` Dmitry Baryshkov
2024-08-29 20:48 ` [PATCH 06/21] drm/msm/dpu: fill CRTC resources in dpu_crtc.c Jessica Zhang
2024-08-29 20:48 ` [PATCH 07/21] drm/msm/dpu: Check CRTC encoders are valid clones Jessica Zhang
2024-08-30 17:00 ` Dmitry Baryshkov
2024-09-03 22:18 ` Jessica Zhang
2024-09-04 18:41 ` Dmitry Baryshkov
2024-09-04 19:23 ` Ville Syrjälä [this message]
2024-08-29 20:48 ` [PATCH 08/21] drm/msm/dpu: add CWB entry to catalog for SM8650 Jessica Zhang
2024-08-30 17:13 ` Dmitry Baryshkov
2024-09-03 22:20 ` Jessica Zhang
2024-08-29 20:48 ` [PATCH 09/21] drm/msm/dpu: add devcoredumps for cwb registers Jessica Zhang
2024-08-30 17:02 ` Dmitry Baryshkov
2024-08-29 20:48 ` [PATCH 10/21] drm/msm/dpu: add CWB support to dpu_hw_wb Jessica Zhang
2024-08-30 17:41 ` Dmitry Baryshkov
2024-09-03 22:22 ` Jessica Zhang
2024-08-29 20:48 ` [PATCH 11/21] drm/msm/dpu: Add RM support for allocating CWB Jessica Zhang
2024-08-30 17:18 ` Dmitry Baryshkov
2024-08-30 19:28 ` Jessica Zhang
2024-08-30 22:16 ` Dmitry Baryshkov
2024-09-04 1:04 ` Jessica Zhang
2024-09-05 13:30 ` Dmitry Baryshkov
2024-09-06 16:53 ` Jessica Zhang
2024-09-06 17:58 ` Dmitry Baryshkov
2024-08-29 20:48 ` [PATCH 12/21] drm/msm/dpu: Add CWB to msm_display_topology Jessica Zhang
2024-08-30 17:21 ` Dmitry Baryshkov
2024-08-29 20:48 ` [PATCH 13/21] drm/msm/dpu: Require modeset if clone mode status changes Jessica Zhang
2024-08-30 17:22 ` Dmitry Baryshkov
2024-09-02 13:36 ` Daniel Vetter
2024-09-02 19:20 ` Dmitry Baryshkov
2024-08-29 20:48 ` [PATCH 14/21] drm/msm/dpu: Reserve resources for CWB Jessica Zhang
2024-08-30 17:25 ` Dmitry Baryshkov
2024-08-30 20:28 ` Jessica Zhang
2024-08-30 22:27 ` Dmitry Baryshkov
2024-09-04 22:15 ` Jessica Zhang
2024-08-29 20:48 ` [PATCH 15/21] drm/msm/dpu: Configure CWB in writeback encoder Jessica Zhang
2024-08-30 17:47 ` Dmitry Baryshkov
2024-08-30 20:28 ` Jessica Zhang
2024-08-30 22:57 ` Dmitry Baryshkov
2024-08-29 20:48 ` [PATCH 16/21] drm/msm/dpu: Program hw_ctl to support CWB Jessica Zhang
2024-08-30 17:29 ` Dmitry Baryshkov
2024-08-29 20:48 ` [PATCH 17/21] drm/msm/dpu: Adjust writeback phys encoder setup for CWB Jessica Zhang
2024-08-30 17:30 ` Dmitry Baryshkov
2024-08-29 20:48 ` [PATCH 18/21] drm/msm/dpu: Start frame done timer after encoder kickoff Jessica Zhang
2024-08-30 17:31 ` Dmitry Baryshkov
2024-08-29 20:48 ` [PATCH 19/21] drm/msm/dpu: Skip trigger flush and start for CWB Jessica Zhang
2024-08-30 17:33 ` Dmitry Baryshkov
2024-08-29 20:48 ` [PATCH 20/21] drm/msm/dpu: Reorder encoder kickoff " Jessica Zhang
2024-08-30 17:35 ` Dmitry Baryshkov
2024-08-29 20:48 ` [PATCH 21/21] drm/msm/dpu: Set possible clones for all encoders Jessica Zhang
2024-08-30 17:39 ` 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=ZtizlTxH-7EBhiSd@intel.com \
--to=ville.syrjala@linux.intel.com \
--cc=airlied@gmail.com \
--cc=daniel@ffwll.ch \
--cc=dmitry.baryshkov@linaro.org \
--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=maarten.lankhorst@linux.intel.com \
--cc=marijn.suijten@somainline.org \
--cc=mripard@kernel.org \
--cc=quic_abhinavk@quicinc.com \
--cc=quic_ebharadw@quicinc.com \
--cc=quic_jesszhan@quicinc.com \
--cc=robdclark@chromium.org \
--cc=robdclark@gmail.com \
--cc=sean@poorly.run \
--cc=tzimmermann@suse.de \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.