From: Kalyan Thota <kalyan_t@codeaurora.org> To: dri-devel@lists.freedesktop.org, linux-arm-msm@vger.kernel.org, freedreno@lists.freedesktop.org, devicetree@vger.kernel.org Cc: Kalyan Thota <kalyan_t@codeaurora.org>, linux-kernel@vger.kernel.org, robdclark@gmail.com, seanpaul@chromium.org, hoegsberg@chromium.org, dianders@chromium.org, mkrishn@codeaurora.org, travitej@codeaurora.org, nganji@codeaurora.org, swboyd@chromium.org, abhinavk@codeaurora.org, ddavenport@chromium.org Subject: [v1] drm/msm/dpu: Fix reservation failures in modeset Date: Wed, 5 Aug 2020 19:04:06 +0530 [thread overview] Message-ID: <1596634446-1413-1-git-send-email-kalyan_t@codeaurora.org> (raw) In TEST_ONLY commit, rm global_state will duplicate the object and request for new reservations, once they pass then the new state will be swapped with the old and will be available for the Atomic Commit. This patch fixes some of missing links in the resource reservation sequence mentioned above. 1) Creation of a duplicate state in test_only commit (Rob) 2) Allow resource release only during crtc_active false. For #2 In a modeset operation, swap state happens well before disable. Hence clearing reservations in disable will cause failures in modeset enable. Sequence: Swap state --> old, new modeset disables --> virt disable modeset enable --> virt modeset Allow reservations to be cleared only when crtc active is false as in that case there wont be any modeset enable after disable. Signed-off-by: Kalyan Thota <kalyan_t@codeaurora.org> --- drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c index 63976dc..b85a576 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c @@ -582,7 +582,7 @@ static int dpu_encoder_virt_atomic_check( dpu_kms = to_dpu_kms(priv->kms); mode = &crtc_state->mode; adj_mode = &crtc_state->adjusted_mode; - global_state = dpu_kms_get_existing_global_state(dpu_kms); + global_state = dpu_kms_get_global_state(crtc_state->state); trace_dpu_enc_atomic_check(DRMID(drm_enc)); /* @@ -1172,6 +1172,7 @@ static void dpu_encoder_virt_disable(struct drm_encoder *drm_enc) struct msm_drm_private *priv; struct dpu_kms *dpu_kms; struct dpu_global_state *global_state; + struct drm_crtc_state *crtc_state; int i = 0; if (!drm_enc) { @@ -1191,6 +1192,7 @@ static void dpu_encoder_virt_disable(struct drm_encoder *drm_enc) priv = drm_enc->dev->dev_private; dpu_kms = to_dpu_kms(priv->kms); global_state = dpu_kms_get_existing_global_state(dpu_kms); + crtc_state = drm_enc->crtc->state; trace_dpu_enc_disable(DRMID(drm_enc)); @@ -1220,7 +1222,8 @@ static void dpu_encoder_virt_disable(struct drm_encoder *drm_enc) DPU_DEBUG_ENC(dpu_enc, "encoder disabled\n"); - dpu_rm_release(global_state, drm_enc); + if (crtc_state->active_changed && !crtc_state->active) + dpu_rm_release(global_state, drm_enc); mutex_unlock(&dpu_enc->enc_lock); } -- 1.9.1
WARNING: multiple messages have this Message-ID (diff)
From: Kalyan Thota <kalyan_t@codeaurora.org> To: dri-devel@lists.freedesktop.org, linux-arm-msm@vger.kernel.org, freedreno@lists.freedesktop.org, devicetree@vger.kernel.org Cc: mkrishn@codeaurora.org, travitej@codeaurora.org, dianders@chromium.org, abhinavk@codeaurora.org, linux-kernel@vger.kernel.org, seanpaul@chromium.org, Kalyan Thota <kalyan_t@codeaurora.org>, ddavenport@chromium.org, hoegsberg@chromium.org, swboyd@chromium.org Subject: [v1] drm/msm/dpu: Fix reservation failures in modeset Date: Wed, 5 Aug 2020 19:04:06 +0530 [thread overview] Message-ID: <1596634446-1413-1-git-send-email-kalyan_t@codeaurora.org> (raw) In TEST_ONLY commit, rm global_state will duplicate the object and request for new reservations, once they pass then the new state will be swapped with the old and will be available for the Atomic Commit. This patch fixes some of missing links in the resource reservation sequence mentioned above. 1) Creation of a duplicate state in test_only commit (Rob) 2) Allow resource release only during crtc_active false. For #2 In a modeset operation, swap state happens well before disable. Hence clearing reservations in disable will cause failures in modeset enable. Sequence: Swap state --> old, new modeset disables --> virt disable modeset enable --> virt modeset Allow reservations to be cleared only when crtc active is false as in that case there wont be any modeset enable after disable. Signed-off-by: Kalyan Thota <kalyan_t@codeaurora.org> --- drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c index 63976dc..b85a576 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c @@ -582,7 +582,7 @@ static int dpu_encoder_virt_atomic_check( dpu_kms = to_dpu_kms(priv->kms); mode = &crtc_state->mode; adj_mode = &crtc_state->adjusted_mode; - global_state = dpu_kms_get_existing_global_state(dpu_kms); + global_state = dpu_kms_get_global_state(crtc_state->state); trace_dpu_enc_atomic_check(DRMID(drm_enc)); /* @@ -1172,6 +1172,7 @@ static void dpu_encoder_virt_disable(struct drm_encoder *drm_enc) struct msm_drm_private *priv; struct dpu_kms *dpu_kms; struct dpu_global_state *global_state; + struct drm_crtc_state *crtc_state; int i = 0; if (!drm_enc) { @@ -1191,6 +1192,7 @@ static void dpu_encoder_virt_disable(struct drm_encoder *drm_enc) priv = drm_enc->dev->dev_private; dpu_kms = to_dpu_kms(priv->kms); global_state = dpu_kms_get_existing_global_state(dpu_kms); + crtc_state = drm_enc->crtc->state; trace_dpu_enc_disable(DRMID(drm_enc)); @@ -1220,7 +1222,8 @@ static void dpu_encoder_virt_disable(struct drm_encoder *drm_enc) DPU_DEBUG_ENC(dpu_enc, "encoder disabled\n"); - dpu_rm_release(global_state, drm_enc); + if (crtc_state->active_changed && !crtc_state->active) + dpu_rm_release(global_state, drm_enc); mutex_unlock(&dpu_enc->enc_lock); } -- 1.9.1 _______________________________________________ dri-devel mailing list dri-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dri-devel
next reply other threads:[~2020-08-05 20:10 UTC|newest] Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top 2020-08-05 13:34 Kalyan Thota [this message] 2020-08-05 13:34 ` [v1] drm/msm/dpu: Fix reservation failures in modeset Kalyan Thota 2020-08-05 15:48 ` Rob Clark 2020-08-05 15:48 ` Rob Clark 2020-08-06 14:45 ` [Freedreno] " kalyan_t 2020-08-06 14:45 ` kalyan_t 2020-08-06 16:45 ` Rob Clark 2020-08-06 16:45 ` Rob Clark 2020-08-07 13:13 ` kalyan_t 2020-08-07 13:13 ` kalyan_t 2020-08-07 8:57 ` daniel 2020-08-07 8:57 ` daniel
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=1596634446-1413-1-git-send-email-kalyan_t@codeaurora.org \ --to=kalyan_t@codeaurora.org \ --cc=abhinavk@codeaurora.org \ --cc=ddavenport@chromium.org \ --cc=devicetree@vger.kernel.org \ --cc=dianders@chromium.org \ --cc=dri-devel@lists.freedesktop.org \ --cc=freedreno@lists.freedesktop.org \ --cc=hoegsberg@chromium.org \ --cc=linux-arm-msm@vger.kernel.org \ --cc=linux-kernel@vger.kernel.org \ --cc=mkrishn@codeaurora.org \ --cc=nganji@codeaurora.org \ --cc=robdclark@gmail.com \ --cc=seanpaul@chromium.org \ --cc=swboyd@chromium.org \ --cc=travitej@codeaurora.org \ /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: linkBe 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.