From: Rodrigo Vivi <rodrigo.vivi@intel.com>
To: Jani Nikula <jani.nikula@intel.com>
Cc: intel-gfx@lists.freedesktop.org
Subject: Re: [Intel-gfx] [PATCH 6/9] drm/i915/suspend: replace I915_READ()/WRITE() with intel_de_read()/write()
Date: Thu, 12 Nov 2020 15:27:39 -0500 [thread overview]
Message-ID: <20201112202739.GG1198919@intel.com> (raw)
In-Reply-To: <277dcc0c299158c6959a6c047a07a284e09c2311.1605181350.git.jani.nikula@intel.com>
On Thu, Nov 12, 2020 at 01:44:39PM +0200, Jani Nikula wrote:
> Another straggler with I915_READ() and I915_WRITE() uses gone.
>
> Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Reviewed-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
> ---
> drivers/gpu/drm/i915/i915_suspend.c | 33 +++++++++++++++--------------
> 1 file changed, 17 insertions(+), 16 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/i915_suspend.c b/drivers/gpu/drm/i915/i915_suspend.c
> index db2111fc809e..63212df33c9e 100644
> --- a/drivers/gpu/drm/i915/i915_suspend.c
> +++ b/drivers/gpu/drm/i915/i915_suspend.c
> @@ -24,6 +24,7 @@
> * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
> */
>
> +#include "display/intel_de.h"
> #include "display/intel_fbc.h"
> #include "display/intel_gmbus.h"
> #include "display/intel_vga.h"
> @@ -39,21 +40,21 @@ static void intel_save_swf(struct drm_i915_private *dev_priv)
> /* Scratch space */
> if (IS_GEN(dev_priv, 2) && IS_MOBILE(dev_priv)) {
> for (i = 0; i < 7; i++) {
> - dev_priv->regfile.saveSWF0[i] = I915_READ(SWF0(i));
> - dev_priv->regfile.saveSWF1[i] = I915_READ(SWF1(i));
> + dev_priv->regfile.saveSWF0[i] = intel_de_read(dev_priv, SWF0(i));
> + dev_priv->regfile.saveSWF1[i] = intel_de_read(dev_priv, SWF1(i));
> }
> for (i = 0; i < 3; i++)
> - dev_priv->regfile.saveSWF3[i] = I915_READ(SWF3(i));
> + dev_priv->regfile.saveSWF3[i] = intel_de_read(dev_priv, SWF3(i));
> } else if (IS_GEN(dev_priv, 2)) {
> for (i = 0; i < 7; i++)
> - dev_priv->regfile.saveSWF1[i] = I915_READ(SWF1(i));
> + dev_priv->regfile.saveSWF1[i] = intel_de_read(dev_priv, SWF1(i));
> } else if (HAS_GMCH(dev_priv)) {
> for (i = 0; i < 16; i++) {
> - dev_priv->regfile.saveSWF0[i] = I915_READ(SWF0(i));
> - dev_priv->regfile.saveSWF1[i] = I915_READ(SWF1(i));
> + dev_priv->regfile.saveSWF0[i] = intel_de_read(dev_priv, SWF0(i));
> + dev_priv->regfile.saveSWF1[i] = intel_de_read(dev_priv, SWF1(i));
> }
> for (i = 0; i < 3; i++)
> - dev_priv->regfile.saveSWF3[i] = I915_READ(SWF3(i));
> + dev_priv->regfile.saveSWF3[i] = intel_de_read(dev_priv, SWF3(i));
> }
> }
>
> @@ -64,21 +65,21 @@ static void intel_restore_swf(struct drm_i915_private *dev_priv)
> /* Scratch space */
> if (IS_GEN(dev_priv, 2) && IS_MOBILE(dev_priv)) {
> for (i = 0; i < 7; i++) {
> - I915_WRITE(SWF0(i), dev_priv->regfile.saveSWF0[i]);
> - I915_WRITE(SWF1(i), dev_priv->regfile.saveSWF1[i]);
> + intel_de_write(dev_priv, SWF0(i), dev_priv->regfile.saveSWF0[i]);
> + intel_de_write(dev_priv, SWF1(i), dev_priv->regfile.saveSWF1[i]);
> }
> for (i = 0; i < 3; i++)
> - I915_WRITE(SWF3(i), dev_priv->regfile.saveSWF3[i]);
> + intel_de_write(dev_priv, SWF3(i), dev_priv->regfile.saveSWF3[i]);
> } else if (IS_GEN(dev_priv, 2)) {
> for (i = 0; i < 7; i++)
> - I915_WRITE(SWF1(i), dev_priv->regfile.saveSWF1[i]);
> + intel_de_write(dev_priv, SWF1(i), dev_priv->regfile.saveSWF1[i]);
> } else if (HAS_GMCH(dev_priv)) {
> for (i = 0; i < 16; i++) {
> - I915_WRITE(SWF0(i), dev_priv->regfile.saveSWF0[i]);
> - I915_WRITE(SWF1(i), dev_priv->regfile.saveSWF1[i]);
> + intel_de_write(dev_priv, SWF0(i), dev_priv->regfile.saveSWF0[i]);
> + intel_de_write(dev_priv, SWF1(i), dev_priv->regfile.saveSWF1[i]);
> }
> for (i = 0; i < 3; i++)
> - I915_WRITE(SWF3(i), dev_priv->regfile.saveSWF3[i]);
> + intel_de_write(dev_priv, SWF3(i), dev_priv->regfile.saveSWF3[i]);
> }
> }
>
> @@ -88,7 +89,7 @@ void i915_save_display(struct drm_i915_private *dev_priv)
>
> /* Display arbitration control */
> if (INTEL_GEN(dev_priv) <= 4)
> - dev_priv->regfile.saveDSPARB = I915_READ(DSPARB);
> + dev_priv->regfile.saveDSPARB = intel_de_read(dev_priv, DSPARB);
>
> if (IS_GEN(dev_priv, 4))
> pci_read_config_word(pdev, GCDGMBUS,
> @@ -109,7 +110,7 @@ void i915_restore_display(struct drm_i915_private *dev_priv)
>
> /* Display arbitration */
> if (INTEL_GEN(dev_priv) <= 4)
> - I915_WRITE(DSPARB, dev_priv->regfile.saveDSPARB);
> + intel_de_write(dev_priv, DSPARB, dev_priv->regfile.saveDSPARB);
>
> /* only restore FBC info on the platform that supports FBC*/
> intel_fbc_global_disable(dev_priv);
> --
> 2.20.1
>
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/intel-gfx
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
next prev parent reply other threads:[~2020-11-12 20:26 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-11-12 11:44 [Intel-gfx] [PATCH 0/9] drm/i915: nuke remaining legacy reg helpers (I915_READ/WRITE etc.) Jani Nikula
2020-11-12 11:44 ` [Intel-gfx] [PATCH 1/9] drm/i915: remove last users of I915_READ_FW() Jani Nikula
2020-11-12 20:17 ` Rodrigo Vivi
2020-11-12 20:24 ` Chris Wilson
2020-11-12 11:44 ` [Intel-gfx] [PATCH 2/9] drm/i915: remove last traces of I915_READ_FW() and I915_WRITE_FW() Jani Nikula
2020-11-12 20:19 ` Rodrigo Vivi
2020-11-12 20:26 ` Chris Wilson
2020-11-12 11:44 ` [Intel-gfx] [PATCH 3/9] drm/i915/cdclk: prefer intel_de_write() over I915_WRITE() Jani Nikula
2020-11-12 20:20 ` Rodrigo Vivi
2020-11-12 11:44 ` [Intel-gfx] [PATCH 4/9] drm/i915/debugfs: replace I915_READ()+I915_WRITE() with intel_uncore_rmw() Jani Nikula
2020-11-12 20:21 ` Rodrigo Vivi
2020-11-12 20:28 ` Chris Wilson
2020-11-12 11:44 ` [Intel-gfx] [PATCH 5/9] drm/i915/debugfs: replace I915_READ() with intel_uncore_read() Jani Nikula
2020-11-12 20:23 ` Rodrigo Vivi
2020-11-12 11:44 ` [Intel-gfx] [PATCH 6/9] drm/i915/suspend: replace I915_READ()/WRITE() with intel_de_read()/write() Jani Nikula
2020-11-12 20:27 ` Rodrigo Vivi [this message]
2020-11-12 11:44 ` [Intel-gfx] [PATCH 7/9] drm/i915/pm: replace I915_READ()/WRITE() with intel_uncore_read()/write() Jani Nikula
2020-11-12 21:00 ` Rodrigo Vivi
2020-11-13 7:47 ` Jani Nikula
2020-11-14 20:34 ` Rodrigo Vivi
2020-11-12 11:44 ` [Intel-gfx] [PATCH 8/9] drm/i915/irq: " Jani Nikula
2020-11-12 11:44 ` [Intel-gfx] [PATCH 9/9] drm/i915: remove last traces of I915_READ(), I915_WRITE() and POSTING_READ() Jani Nikula
2020-11-12 21:02 ` Rodrigo Vivi
2020-11-12 12:35 ` [Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for drm/i915: nuke remaining legacy reg helpers (I915_READ/WRITE etc.) Patchwork
2020-11-12 13:06 ` [Intel-gfx] ✓ Fi.CI.BAT: success " Patchwork
2020-11-12 14:51 ` [Intel-gfx] ✗ Fi.CI.IGT: failure " Patchwork
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=20201112202739.GG1198919@intel.com \
--to=rodrigo.vivi@intel.com \
--cc=intel-gfx@lists.freedesktop.org \
--cc=jani.nikula@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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox