From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-ed1-f51.google.com ([209.85.208.51]:32883 "EHLO mail-ed1-f51.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727128AbeJBPat (ORCPT ); Tue, 2 Oct 2018 11:30:49 -0400 Received: by mail-ed1-f51.google.com with SMTP id g26-v6so1361272edp.0 for ; Tue, 02 Oct 2018 01:48:39 -0700 (PDT) Date: Tue, 2 Oct 2018 10:48:36 +0200 From: Daniel Vetter To: Ville Syrjala Cc: dri-devel@lists.freedesktop.org, intel-gfx@lists.freedesktop.org, Dennis , stable@vger.kernel.org Subject: Re: [PATCH 1/3] drm/i915: Restore vblank interrupts earlier Message-ID: <20181002084836.GM11082@phenom.ffwll.local> References: <20181001142909.5567-1-ville.syrjala@linux.intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <20181001142909.5567-1-ville.syrjala@linux.intel.com> Sender: stable-owner@vger.kernel.org List-ID: On Mon, Oct 01, 2018 at 05:29:07PM +0300, Ville Syrjala wrote: > From: Ville Syrj�l� > > Plane sanitation needs vblank interrupts (on account of CxSR disable). > So let's restore vblank interrupts earlier. > > v2: Make it actually build > > Cc: stable@vger.kernel.org > Cc: Dennis > Tested-by: Dennis > Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=105637 > Fixes: b1e01595a66d ("drm/i915: Redo plane sanitation during readout") > Signed-off-by: Ville Syrj�l� > --- > drivers/gpu/drm/i915/intel_display.c | 19 +++++++++---------- > 1 file changed, 9 insertions(+), 10 deletions(-) > > diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c > index 4c5c2b39e65c..e018b37bed39 100644 > --- a/drivers/gpu/drm/i915/intel_display.c > +++ b/drivers/gpu/drm/i915/intel_display.c > @@ -15551,13 +15551,9 @@ static void intel_sanitize_crtc(struct intel_crtc *crtc, > I915_READ(reg) & ~PIPECONF_FRAME_START_DELAY_MASK); > } > > - /* restore vblank interrupts to correct state */ > - drm_crtc_vblank_reset(&crtc->base); > if (crtc->active) { > struct intel_plane *plane; > > - drm_crtc_vblank_on(&crtc->base); > - > /* Disable everything but the primary plane */ > for_each_intel_plane_on_crtc(dev, crtc, plane) { > const struct intel_plane_state *plane_state = > @@ -15899,7 +15895,6 @@ intel_modeset_setup_hw_state(struct drm_device *dev, > struct drm_modeset_acquire_ctx *ctx) > { > struct drm_i915_private *dev_priv = to_i915(dev); > - enum pipe pipe; > struct intel_crtc *crtc; > struct intel_encoder *encoder; > int i; > @@ -15912,15 +15907,19 @@ intel_modeset_setup_hw_state(struct drm_device *dev, > /* HW state is read out, now we need to sanitize this mess. */ > get_encoder_power_domains(dev_priv); > > - intel_sanitize_plane_mapping(dev_priv); If you add a comment here why we need to do this, this has my Reviewed-by: Daniel Vetter > + for_each_intel_crtc(&dev_priv->drm, crtc) { > + drm_crtc_vblank_reset(&crtc->base); > > - for_each_intel_encoder(dev, encoder) { > - intel_sanitize_encoder(encoder); > + if (crtc->active) > + drm_crtc_vblank_on(&crtc->base); > } > > - for_each_pipe(dev_priv, pipe) { > - crtc = intel_get_crtc_for_pipe(dev_priv, pipe); > + intel_sanitize_plane_mapping(dev_priv); > > + for_each_intel_encoder(dev, encoder) > + intel_sanitize_encoder(encoder); > + > + for_each_intel_crtc(&dev_priv->drm, crtc) { > intel_sanitize_crtc(crtc, ctx); > intel_dump_pipe_config(crtc, crtc->config, > "[setup_hw_state]"); > -- > 2.16.4 > > _______________________________________________ > dri-devel mailing list > dri-devel@lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/dri-devel -- Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch From mboxrd@z Thu Jan 1 00:00:00 1970 From: Daniel Vetter Subject: Re: [PATCH 1/3] drm/i915: Restore vblank interrupts earlier Date: Tue, 2 Oct 2018 10:48:36 +0200 Message-ID: <20181002084836.GM11082@phenom.ffwll.local> References: <20181001142909.5567-1-ville.syrjala@linux.intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Transfer-Encoding: 8bit Return-path: Content-Disposition: inline In-Reply-To: <20181001142909.5567-1-ville.syrjala@linux.intel.com> Sender: stable-owner@vger.kernel.org To: Ville Syrjala Cc: dri-devel@lists.freedesktop.org, intel-gfx@lists.freedesktop.org, Dennis , stable@vger.kernel.org List-Id: dri-devel@lists.freedesktop.org On Mon, Oct 01, 2018 at 05:29:07PM +0300, Ville Syrjala wrote: > From: Ville Syrjälä > > Plane sanitation needs vblank interrupts (on account of CxSR disable). > So let's restore vblank interrupts earlier. > > v2: Make it actually build > > Cc: stable@vger.kernel.org > Cc: Dennis > Tested-by: Dennis > Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=105637 > Fixes: b1e01595a66d ("drm/i915: Redo plane sanitation during readout") > Signed-off-by: Ville Syrjälä > --- > drivers/gpu/drm/i915/intel_display.c | 19 +++++++++---------- > 1 file changed, 9 insertions(+), 10 deletions(-) > > diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c > index 4c5c2b39e65c..e018b37bed39 100644 > --- a/drivers/gpu/drm/i915/intel_display.c > +++ b/drivers/gpu/drm/i915/intel_display.c > @@ -15551,13 +15551,9 @@ static void intel_sanitize_crtc(struct intel_crtc *crtc, > I915_READ(reg) & ~PIPECONF_FRAME_START_DELAY_MASK); > } > > - /* restore vblank interrupts to correct state */ > - drm_crtc_vblank_reset(&crtc->base); > if (crtc->active) { > struct intel_plane *plane; > > - drm_crtc_vblank_on(&crtc->base); > - > /* Disable everything but the primary plane */ > for_each_intel_plane_on_crtc(dev, crtc, plane) { > const struct intel_plane_state *plane_state = > @@ -15899,7 +15895,6 @@ intel_modeset_setup_hw_state(struct drm_device *dev, > struct drm_modeset_acquire_ctx *ctx) > { > struct drm_i915_private *dev_priv = to_i915(dev); > - enum pipe pipe; > struct intel_crtc *crtc; > struct intel_encoder *encoder; > int i; > @@ -15912,15 +15907,19 @@ intel_modeset_setup_hw_state(struct drm_device *dev, > /* HW state is read out, now we need to sanitize this mess. */ > get_encoder_power_domains(dev_priv); > > - intel_sanitize_plane_mapping(dev_priv); If you add a comment here why we need to do this, this has my Reviewed-by: Daniel Vetter > + for_each_intel_crtc(&dev_priv->drm, crtc) { > + drm_crtc_vblank_reset(&crtc->base); > > - for_each_intel_encoder(dev, encoder) { > - intel_sanitize_encoder(encoder); > + if (crtc->active) > + drm_crtc_vblank_on(&crtc->base); > } > > - for_each_pipe(dev_priv, pipe) { > - crtc = intel_get_crtc_for_pipe(dev_priv, pipe); > + intel_sanitize_plane_mapping(dev_priv); > > + for_each_intel_encoder(dev, encoder) > + intel_sanitize_encoder(encoder); > + > + for_each_intel_crtc(&dev_priv->drm, crtc) { > intel_sanitize_crtc(crtc, ctx); > intel_dump_pipe_config(crtc, crtc->config, > "[setup_hw_state]"); > -- > 2.16.4 > > _______________________________________________ > dri-devel mailing list > dri-devel@lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/dri-devel -- Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch