From: "Ville Syrjälä" <ville.syrjala@linux.intel.com>
To: Jani Nikula <jani.nikula@intel.com>
Cc: intel-gfx@lists.freedesktop.org, shuang.he@linux.intel.com
Subject: Re: [PATCH 2/2] drm/i915: restore RSTDBYCTL only on non-KMS paths
Date: Tue, 11 Nov 2014 17:06:02 +0200 [thread overview]
Message-ID: <20141111150602.GH10649@intel.com> (raw)
In-Reply-To: <1415717284-10758-2-git-send-email-jani.nikula@intel.com>
On Tue, Nov 11, 2014 at 04:48:04PM +0200, Jani Nikula wrote:
> Since RSTDBYCTL is only saved on non-KMS path in within i915_save_state,
> move the restore in i915_restore_state for symmetry.
Makes sense. And IIRC this is an ilk-only register anyway, so frobbing it
on snb+ is dubious at best.
Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
>
> Signed-off-by: Jani Nikula <jani.nikula@intel.com>
>
> ---
>
> UNTESTED!!!
> ---
> drivers/gpu/drm/i915/i915_suspend.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/i915_suspend.c b/drivers/gpu/drm/i915/i915_suspend.c
> index bd8adf2ca7d8..26b6bf9261ca 100644
> --- a/drivers/gpu/drm/i915/i915_suspend.c
> +++ b/drivers/gpu/drm/i915/i915_suspend.c
> @@ -271,8 +271,6 @@ static void i915_restore_display(struct drm_device *dev)
> I915_WRITE(PCH_PP_OFF_DELAYS, dev_priv->regfile.savePP_OFF_DELAYS);
> I915_WRITE(PCH_PP_DIVISOR, dev_priv->regfile.savePP_DIVISOR);
> I915_WRITE(PCH_PP_CONTROL, dev_priv->regfile.savePP_CONTROL);
> - I915_WRITE(RSTDBYCTL,
> - dev_priv->regfile.saveMCHBAR_RENDER_STANDBY);
> } else if (IS_VALLEYVIEW(dev)) {
> I915_WRITE(VLV_BLC_HIST_CTL(PIPE_A),
> dev_priv->regfile.saveBLC_HIST_CTL);
> @@ -367,6 +365,8 @@ int i915_restore_state(struct drm_device *dev)
> I915_WRITE(_FDI_RXA_IMR, dev_priv->regfile.saveFDI_RXA_IMR);
> I915_WRITE(_FDI_RXB_IMR, dev_priv->regfile.saveFDI_RXB_IMR);
> I915_WRITE(PCH_PORT_HOTPLUG, dev_priv->regfile.savePCH_PORT_HOTPLUG);
> + I915_WRITE(RSTDBYCTL,
> + dev_priv->regfile.saveMCHBAR_RENDER_STANDBY);
> } else {
> I915_WRITE(IER, dev_priv->regfile.saveIER);
> I915_WRITE(IMR, dev_priv->regfile.saveIMR);
> --
> 2.1.1
>
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/intel-gfx
--
Ville Syrjälä
Intel OTC
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
next prev parent reply other threads:[~2014-11-11 15:06 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-11-11 14:48 [PATCH 1/2] drm/i915/vlv: don't save panel power sequencer registers on suspend Jani Nikula
2014-11-11 14:48 ` [PATCH 2/2] drm/i915: restore RSTDBYCTL only on non-KMS paths Jani Nikula
2014-11-11 15:06 ` Ville Syrjälä [this message]
2014-11-12 5:28 ` [PATCH 2/2] drm/i915: restore RSTDBYCTL only on non-KMS shuang.he
2014-11-11 15:09 ` [PATCH 1/2] drm/i915/vlv: don't save panel power sequencer registers on suspend Ville Syrjälä
2014-11-12 7:52 ` Jani Nikula
2014-11-12 9:40 ` Daniel Vetter
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=20141111150602.GH10649@intel.com \
--to=ville.syrjala@linux.intel.com \
--cc=intel-gfx@lists.freedesktop.org \
--cc=jani.nikula@intel.com \
--cc=shuang.he@linux.intel.com \
/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.