From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 20310C2BC11 for ; Tue, 8 Sep 2020 19:44:39 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id D4BC4207DE for ; Tue, 8 Sep 2020 19:44:38 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=codeaurora.org header.i=@codeaurora.org header.b="V0EtTOmL"; dkim=pass (1024-bit key) header.d=amazonses.com header.i=@amazonses.com header.b="Muz/MSAL" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730760AbgIHTog (ORCPT ); Tue, 8 Sep 2020 15:44:36 -0400 Received: from a27-55.smtp-out.us-west-2.amazonses.com ([54.240.27.55]:42522 "EHLO a27-55.smtp-out.us-west-2.amazonses.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729791AbgIHTo0 (ORCPT ); Tue, 8 Sep 2020 15:44:26 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/simple; s=zsmsymrwgfyinv5wlfyidntwsjeeldzt; d=codeaurora.org; t=1599594265; h=MIME-Version:Content-Type:Content-Transfer-Encoding:Date:From:To:Cc:Subject:In-Reply-To:References:Message-ID; bh=8WW0GBw5JW+XfqzWOS9BQy4RMnqMxVS+U0EKG5ssuts=; b=V0EtTOmLUISmAvKqj8LnPw1JdslnsO9WEqu9bVZ6h/NSyLkUmTXlSudalbe0JnNd eJxBiHxYmbweJqvHSC8NxytAZEdhuDYpro5/gtItEMCKPeq0RzUrxSdNeGHWUQcSjce dEX/0C6jo87tlXJhQOsiO8lQH9H8jlBvoHHmHmns= DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/simple; s=hsbnp7p3ensaochzwyq5wwmceodymuwv; d=amazonses.com; t=1599594265; h=MIME-Version:Content-Type:Content-Transfer-Encoding:Date:From:To:Cc:Subject:In-Reply-To:References:Message-ID:Feedback-ID; bh=8WW0GBw5JW+XfqzWOS9BQy4RMnqMxVS+U0EKG5ssuts=; b=Muz/MSALldRwagEcsnImKPvqrJmjX2OXkRJwnBtNpPl0npszw4kMxuCK48hrkOR4 3YT5xbg7l0BfgVkcdEKFS7CajAsRDt8jJm3OLmkDm9yssriOppuNmYffa023KTsbmab aJowRO2g5DypQnRl98F4qK+6GG/i0PG8NMcNDcdQ= MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII; format=flowed Content-Transfer-Encoding: 7bit Date: Tue, 8 Sep 2020 19:44:25 +0000 From: abhinavk@codeaurora.org To: Rob Clark Cc: dri-devel@lists.freedesktop.org, linux-arm-msm@vger.kernel.org, freedreno@lists.freedesktop.org, Rob Clark , Sean Paul , David Airlie , Daniel Vetter , Drew Davenport , Kalyan Thota , Thomas Zimmermann , Hongbo Yao , linux-kernel@vger.kernel.org, linux-arm-msm-owner@vger.kernel.org Subject: Re: [PATCH 2/2] drm/msm/dpu: clean up some impossibilities In-Reply-To: <20200907170450.370122-2-robdclark@gmail.com> References: <20200907170450.370122-1-robdclark@gmail.com> <20200907170450.370122-2-robdclark@gmail.com> Message-ID: <010101746f3f7b59-bd6c1de2-1fae-4733-ba95-a4802b81b892-000000@us-west-2.amazonses.com> X-Sender: abhinavk@codeaurora.org User-Agent: Roundcube Webmail/1.3.9 X-SES-Outgoing: 2020.09.08-54.240.27.55 Feedback-ID: 1.us-west-2.CZuq2qbDmUIuT3qdvXlRHZZCpfZqZ4GtG9v3VKgRyF0=:AmazonSES Sender: linux-arm-msm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org On 2020-09-07 10:04, Rob Clark wrote: > From: Rob Clark > > Signed-off-by: Rob Clark > --- > drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c | 81 ++++-------------------- > 1 file changed, 12 insertions(+), 69 deletions(-) > > diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c > b/drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c > index 89c0245b5de5..ad49b0e17fcb 100644 > --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c > +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c > @@ -265,11 +265,6 @@ enum dpu_intf_mode dpu_crtc_get_intf_mode(struct > drm_crtc *crtc) > { > struct drm_encoder *encoder; > > - if (!crtc) { > - DPU_ERROR("invalid crtc\n"); > - return INTF_MODE_NONE; > - } > - > /* > * TODO: This function is called from dpu debugfs and as part of > atomic > * check. When called from debugfs, the crtc->mutex must be held to > @@ -500,12 +495,6 @@ static void dpu_crtc_atomic_begin(struct drm_crtc > *crtc, > struct dpu_crtc_state *cstate; > struct drm_encoder *encoder; > struct drm_device *dev; > - unsigned long flags; > - > - if (!crtc) { > - DPU_ERROR("invalid crtc\n"); > - return; > - } > > if (!crtc->state->enable) { > DPU_DEBUG("crtc%d -> enable %d, skip atomic_begin\n", > @@ -521,15 +510,6 @@ static void dpu_crtc_atomic_begin(struct drm_crtc > *crtc, > > _dpu_crtc_setup_lm_bounds(crtc, crtc->state); > > - if (dpu_crtc->event) { > - WARN_ON(dpu_crtc->event); > - } else { > - spin_lock_irqsave(&dev->event_lock, flags); > - dpu_crtc->event = crtc->state->event; > - crtc->state->event = NULL; > - spin_unlock_irqrestore(&dev->event_lock, flags); > - } > - > /* encoder will trigger pending mask now */ > drm_for_each_encoder_mask(encoder, crtc->dev, > crtc->state->encoder_mask) > dpu_encoder_trigger_kickoff_pending(encoder); > @@ -583,14 +563,11 @@ static void dpu_crtc_atomic_flush(struct drm_crtc > *crtc, > return; > } > > - if (dpu_crtc->event) { > - DPU_DEBUG("already received dpu_crtc->event\n"); > - } else { > - spin_lock_irqsave(&dev->event_lock, flags); > - dpu_crtc->event = crtc->state->event; > - crtc->state->event = NULL; > - spin_unlock_irqrestore(&dev->event_lock, flags); > - } > + WARN_ON(dpu_crtc->event); before the patch "move vblank events to complete_commit()", the dpu_crtc events were consumed in the _dpu_crtc_complete_flip(). So there was a chance that if the vblank event did not come in time before the next commit, dpu_crtc->event will not be consumed. But after the patch, _dpu_crtc_complete_flip() is being signaled in dpu_crtc_complete_commit() which will always happen, so is there any case where we will hit this warning at all or will this catch some other condition? > + spin_lock_irqsave(&dev->event_lock, flags); > + dpu_crtc->event = crtc->state->event; > + crtc->state->event = NULL; > + spin_unlock_irqrestore(&dev->event_lock, flags); > > /* > * If no mixers has been allocated in dpu_crtc_atomic_check(), > @@ -635,14 +612,7 @@ static void dpu_crtc_atomic_flush(struct drm_crtc > *crtc, > static void dpu_crtc_destroy_state(struct drm_crtc *crtc, > struct drm_crtc_state *state) > { > - struct dpu_crtc_state *cstate; > - > - if (!crtc || !state) { > - DPU_ERROR("invalid argument(s)\n"); > - return; > - } > - > - cstate = to_dpu_crtc_state(state); > + struct dpu_crtc_state *cstate = to_dpu_crtc_state(state); > > DPU_DEBUG("crtc%d\n", crtc->base.id); > > @@ -731,14 +701,8 @@ static void dpu_crtc_reset(struct drm_crtc *crtc) > */ > static struct drm_crtc_state *dpu_crtc_duplicate_state(struct drm_crtc > *crtc) > { > - struct dpu_crtc_state *cstate, *old_cstate; > - > - if (!crtc || !crtc->state) { > - DPU_ERROR("invalid argument(s)\n"); > - return NULL; > - } > + struct dpu_crtc_state *cstate, *old_cstate = > to_dpu_crtc_state(crtc->state); > > - old_cstate = to_dpu_crtc_state(crtc->state); > cstate = kmemdup(old_cstate, sizeof(*old_cstate), GFP_KERNEL); > if (!cstate) { > DPU_ERROR("failed to allocate state\n"); > @@ -754,19 +718,12 @@ static struct drm_crtc_state > *dpu_crtc_duplicate_state(struct drm_crtc *crtc) > static void dpu_crtc_disable(struct drm_crtc *crtc, > struct drm_crtc_state *old_crtc_state) > { > - struct dpu_crtc *dpu_crtc; > - struct dpu_crtc_state *cstate; > + struct dpu_crtc *dpu_crtc = to_dpu_crtc(crtc); > + struct dpu_crtc_state *cstate = to_dpu_crtc_state(crtc->state); > struct drm_encoder *encoder; > unsigned long flags; > bool release_bandwidth = false; > > - if (!crtc || !crtc->state) { > - DPU_ERROR("invalid crtc\n"); > - return; > - } > - dpu_crtc = to_dpu_crtc(crtc); > - cstate = to_dpu_crtc_state(crtc->state); > - > DRM_DEBUG_KMS("crtc%d\n", crtc->base.id); > > /* Disable/save vblank irq handling */ > @@ -825,19 +782,13 @@ static void dpu_crtc_disable(struct drm_crtc > *crtc, > static void dpu_crtc_enable(struct drm_crtc *crtc, > struct drm_crtc_state *old_crtc_state) > { > - struct dpu_crtc *dpu_crtc; > + struct dpu_crtc *dpu_crtc = to_dpu_crtc(crtc); > struct drm_encoder *encoder; > bool request_bandwidth = false; > > - if (!crtc) { > - DPU_ERROR("invalid crtc\n"); > - return; > - } > - > pm_runtime_get_sync(crtc->dev->dev); > > DRM_DEBUG_KMS("crtc%d\n", crtc->base.id); > - dpu_crtc = to_dpu_crtc(crtc); > > drm_for_each_encoder_mask(encoder, crtc->dev, > crtc->state->encoder_mask) { > /* in video mode, we hold an extra bandwidth reference > @@ -873,9 +824,9 @@ struct plane_state { > static int dpu_crtc_atomic_check(struct drm_crtc *crtc, > struct drm_crtc_state *state) > { > - struct dpu_crtc *dpu_crtc; > + struct dpu_crtc *dpu_crtc = to_dpu_crtc(crtc); > + struct dpu_crtc_state *cstate = to_dpu_crtc_state(state); > struct plane_state *pstates; > - struct dpu_crtc_state *cstate; > > const struct drm_plane_state *pstate; > struct drm_plane *plane; > @@ -889,16 +840,8 @@ static int dpu_crtc_atomic_check(struct drm_crtc > *crtc, > int left_zpos_cnt = 0, right_zpos_cnt = 0; > struct drm_rect crtc_rect = { 0 }; > > - if (!crtc) { > - DPU_ERROR("invalid crtc\n"); > - return -EINVAL; > - } > - > pstates = kzalloc(sizeof(*pstates) * DPU_STAGE_MAX * 4, GFP_KERNEL); > > - dpu_crtc = to_dpu_crtc(crtc); > - cstate = to_dpu_crtc_state(state); > - > if (!state->enable || !state->active) { > DPU_DEBUG("crtc%d -> enable %d, active %d, skip atomic_check\n", > crtc->base.id, state->enable, state->active);