From: Ander Conselvan De Oliveira <conselvan2@gmail.com> To: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>, intel-gfx@lists.freedesktop.org Cc: stable@vger.kernel.org Subject: Re: [Intel-gfx] [PATCH 03/12] drm/i915/skl: Update watermarks before the crtc is disabled. Date: Wed, 25 Nov 2015 11:33:13 +0200 [thread overview] Message-ID: <1448443993.2907.11.camel@gmail.com> (raw) In-Reply-To: <1447945645-32005-4-git-send-email-maarten.lankhorst@linux.intel.com> On Thu, 2015-11-19 at 16:07 +0100, Maarten Lankhorst wrote: > On skylake some of the registers are only writable when the correct > power wells are enabled. Because of this watermarks have to be updated > before the crtc turns off, or you get unclaimed register read and write > warnings. > > This patch needs to be modified slightly to apply to -fixes. > > Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=92181 > Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com> > Cc: stable@vger.kernel.org > Cc: Matt Roper <matthew.d.roper@intel.com> Reviewed-by: Ander Conselvan de Oliveira <conselvan2@gmail.com> > --- > drivers/gpu/drm/i915/intel_display.c | 5 ++++- > 1 file changed, 4 insertions(+), 1 deletion(-) > > diff --git a/drivers/gpu/drm/i915/intel_display.c > b/drivers/gpu/drm/i915/intel_display.c > index db4995406277..5345ffcce51e 100644 > --- a/drivers/gpu/drm/i915/intel_display.c > +++ b/drivers/gpu/drm/i915/intel_display.c > @@ -4753,7 +4753,7 @@ static void intel_post_plane_update(struct intel_crtc > *crtc) > > crtc->wm.cxsr_allowed = true; > > - if (pipe_config->wm_changed) > + if (pipe_config->wm_changed && pipe_config->base.active) > intel_update_watermarks(&crtc->base); > > if (atomic->update_fbc) > @@ -13362,6 +13362,9 @@ static int intel_atomic_commit(struct drm_device *dev, > dev_priv->display.crtc_disable(crtc); > intel_crtc->active = false; > intel_disable_shared_dpll(intel_crtc); > + > + if (!crtc->state->active) > + intel_update_watermarks(crtc); > } > } >
WARNING: multiple messages have this Message-ID (diff)
From: Ander Conselvan De Oliveira <conselvan2@gmail.com> To: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>, intel-gfx@lists.freedesktop.org Cc: stable@vger.kernel.org Subject: Re: [PATCH 03/12] drm/i915/skl: Update watermarks before the crtc is disabled. Date: Wed, 25 Nov 2015 11:33:13 +0200 [thread overview] Message-ID: <1448443993.2907.11.camel@gmail.com> (raw) In-Reply-To: <1447945645-32005-4-git-send-email-maarten.lankhorst@linux.intel.com> On Thu, 2015-11-19 at 16:07 +0100, Maarten Lankhorst wrote: > On skylake some of the registers are only writable when the correct > power wells are enabled. Because of this watermarks have to be updated > before the crtc turns off, or you get unclaimed register read and write > warnings. > > This patch needs to be modified slightly to apply to -fixes. > > Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=92181 > Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com> > Cc: stable@vger.kernel.org > Cc: Matt Roper <matthew.d.roper@intel.com> Reviewed-by: Ander Conselvan de Oliveira <conselvan2@gmail.com> > --- > drivers/gpu/drm/i915/intel_display.c | 5 ++++- > 1 file changed, 4 insertions(+), 1 deletion(-) > > diff --git a/drivers/gpu/drm/i915/intel_display.c > b/drivers/gpu/drm/i915/intel_display.c > index db4995406277..5345ffcce51e 100644 > --- a/drivers/gpu/drm/i915/intel_display.c > +++ b/drivers/gpu/drm/i915/intel_display.c > @@ -4753,7 +4753,7 @@ static void intel_post_plane_update(struct intel_crtc > *crtc) > > crtc->wm.cxsr_allowed = true; > > - if (pipe_config->wm_changed) > + if (pipe_config->wm_changed && pipe_config->base.active) > intel_update_watermarks(&crtc->base); > > if (atomic->update_fbc) > @@ -13362,6 +13362,9 @@ static int intel_atomic_commit(struct drm_device *dev, > dev_priv->display.crtc_disable(crtc); > intel_crtc->active = false; > intel_disable_shared_dpll(intel_crtc); > + > + if (!crtc->state->active) > + intel_update_watermarks(crtc); > } > } > _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/intel-gfx
next prev parent reply other threads:[~2015-11-25 9:33 UTC|newest] Thread overview: 39+ messages / expand[flat|nested] mbox.gz Atom feed top 2015-11-19 15:07 [PATCH 00/12] Remove intel_crtc->atomic and fix BAT! Maarten Lankhorst 2015-11-19 15:07 ` [PATCH 01/12] drm/i915: Move disable_cxsr to the crtc_state Maarten Lankhorst 2015-11-24 12:24 ` Ander Conselvan De Oliveira 2015-11-19 15:07 ` [PATCH 02/12] drm/i915: Calculate watermark related members in the crtc_state, v3 Maarten Lankhorst 2015-11-24 14:03 ` Ander Conselvan De Oliveira 2015-11-24 14:55 ` Maarten Lankhorst 2015-11-25 9:22 ` Ander Conselvan De Oliveira 2015-11-30 8:52 ` Maarten Lankhorst 2015-12-03 12:49 ` [PATCH v2 02/12] drm/i915: Calculate watermark related members in the crtc_state, v4 Maarten Lankhorst 2015-12-03 14:32 ` Daniel Vetter 2015-11-19 15:07 ` [PATCH 03/12] drm/i915/skl: Update watermarks before the crtc is disabled Maarten Lankhorst 2015-11-25 9:33 ` Ander Conselvan De Oliveira [this message] 2015-11-25 9:33 ` Ander Conselvan De Oliveira 2015-11-19 15:07 ` [PATCH 04/12] drm/i915: Remove double wait_for_vblank on broadwell Maarten Lankhorst 2015-11-25 9:44 ` Ander Conselvan De Oliveira 2015-12-08 14:14 ` Ville Syrjälä 2015-12-09 15:27 ` Maarten Lankhorst 2015-12-10 8:43 ` Daniel Vetter 2015-11-19 15:07 ` [PATCH 05/12] drm/i915: Kill off intel_crtc->atomic.wait_vblank, v2 Maarten Lankhorst 2015-11-25 12:21 ` Ander Conselvan De Oliveira 2015-11-25 12:38 ` Imre Deak 2015-11-25 13:37 ` Daniel Stone 2015-11-25 12:39 ` Ander Conselvan De Oliveira 2015-11-19 15:07 ` [PATCH 06/12] drm/i915: Remove intel_crtc->atomic.disable_ips Maarten Lankhorst 2015-11-25 12:51 ` Ander Conselvan De Oliveira 2015-11-19 15:07 ` [PATCH 07/12] drm/i915: Remove atomic.pre_disable_primary Maarten Lankhorst 2015-11-19 15:07 ` [PATCH 08/12] drm/i915: Remove update_sprite_watermarks Maarten Lankhorst 2015-11-19 15:07 ` [PATCH 09/12] drm/i915: Remove some post-commit members from intel_crtc->atomic, v2 Maarten Lankhorst 2015-11-25 13:11 ` Ander Conselvan De Oliveira 2015-11-19 15:07 ` [PATCH 10/12] drm/i915: Nuke fbc members from intel_crtc->atomic Maarten Lankhorst 2015-11-26 11:28 ` Ander Conselvan De Oliveira 2015-11-19 15:07 ` [PATCH 11/12] drm/i915: Keep track of the cdclk as if all crtc's were active Maarten Lankhorst 2015-11-26 13:31 ` Ander Conselvan De Oliveira 2015-11-26 13:32 ` Ander Conselvan De Oliveira 2015-12-21 13:17 ` Mika Kahola 2015-11-19 15:07 ` [PATCH 12/12] drm/i915: Calculate visibility in check_plane correctly regardless of dpms Maarten Lankhorst 2015-11-26 13:48 ` Ander Conselvan De Oliveira 2015-11-30 9:45 ` Maarten Lankhorst 2015-12-21 13:27 ` Mika Kahola
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=1448443993.2907.11.camel@gmail.com \ --to=conselvan2@gmail.com \ --cc=intel-gfx@lists.freedesktop.org \ --cc=maarten.lankhorst@linux.intel.com \ --cc=stable@vger.kernel.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.