All of lore.kernel.org
 help / color / mirror / Atom feed
From: Jani Nikula <jani.nikula@intel.com>
To: intel-gfx@lists.freedesktop.org
Cc: jani.nikula@intel.com
Subject: [PATCH 02/10] drm/i915/debugfs: use intel uncore functions for forcewake register access
Date: Mon,  2 Dec 2019 18:00:50 +0200	[thread overview]
Message-ID: <2ab5b752aaf954678a4171d61be7277cf6693e0c.1575302334.git.jani.nikula@intel.com> (raw)
In-Reply-To: <cover.1575302334.git.jani.nikula@intel.com>

Move away from I915_READ_FW() and I915_WRITE_FW() and switch to using
intel_uncore_read_fw() and intel_uncore_write_fw(), respectively.

No functional changes.

Cc: Chris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
---
 drivers/gpu/drm/i915/i915_debugfs.c | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/drivers/gpu/drm/i915/i915_debugfs.c b/drivers/gpu/drm/i915/i915_debugfs.c
index cab632791f73..42709a57b475 100644
--- a/drivers/gpu/drm/i915/i915_debugfs.c
+++ b/drivers/gpu/drm/i915/i915_debugfs.c
@@ -1128,7 +1128,8 @@ static int gen6_drpc_info(struct seq_file *m)
 	u32 gt_core_status, rcctl1, rc6vids = 0;
 	u32 gen9_powergate_enable = 0, gen9_powergate_status = 0;
 
-	gt_core_status = I915_READ_FW(GEN6_GT_CORE_STATUS);
+	gt_core_status = intel_uncore_read_fw(&dev_priv->uncore,
+					      GEN6_GT_CORE_STATUS);
 	trace_i915_reg_rw(false, GEN6_GT_CORE_STATUS, gt_core_status, 4, true);
 
 	rcctl1 = I915_READ(GEN6_RC_CONTROL);
@@ -1674,10 +1675,13 @@ static int i915_rps_boost_info(struct seq_file *m, void *data)
 		u32 rpdown, rpdownei;
 
 		intel_uncore_forcewake_get(&dev_priv->uncore, FORCEWAKE_ALL);
-		rpup = I915_READ_FW(GEN6_RP_CUR_UP) & GEN6_RP_EI_MASK;
-		rpupei = I915_READ_FW(GEN6_RP_CUR_UP_EI) & GEN6_RP_EI_MASK;
-		rpdown = I915_READ_FW(GEN6_RP_CUR_DOWN) & GEN6_RP_EI_MASK;
-		rpdownei = I915_READ_FW(GEN6_RP_CUR_DOWN_EI) & GEN6_RP_EI_MASK;
+		rpup = intel_uncore_read_fw(&dev_priv->uncore, GEN6_RP_CUR_UP) & GEN6_RP_EI_MASK;
+		rpupei = intel_uncore_read_fw(&dev_priv->uncore,
+					      GEN6_RP_CUR_UP_EI) & GEN6_RP_EI_MASK;
+		rpdown = intel_uncore_read_fw(&dev_priv->uncore,
+					      GEN6_RP_CUR_DOWN) & GEN6_RP_EI_MASK;
+		rpdownei = intel_uncore_read_fw(&dev_priv->uncore,
+						GEN6_RP_CUR_DOWN_EI) & GEN6_RP_EI_MASK;
 		intel_uncore_forcewake_put(&dev_priv->uncore, FORCEWAKE_ALL);
 
 		seq_printf(m, "\nRPS Autotuning (current \"%s\" window):\n",
-- 
2.20.1

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

WARNING: multiple messages have this Message-ID (diff)
From: Jani Nikula <jani.nikula@intel.com>
To: intel-gfx@lists.freedesktop.org
Cc: jani.nikula@intel.com
Subject: [Intel-gfx] [PATCH 02/10] drm/i915/debugfs: use intel uncore functions for forcewake register access
Date: Mon,  2 Dec 2019 18:00:50 +0200	[thread overview]
Message-ID: <2ab5b752aaf954678a4171d61be7277cf6693e0c.1575302334.git.jani.nikula@intel.com> (raw)
Message-ID: <20191202160050.-Ohe5V-FgMMd-rHzLPmu2qBwtIatAM41uMInWEsXl3c@z> (raw)
In-Reply-To: <cover.1575302334.git.jani.nikula@intel.com>

Move away from I915_READ_FW() and I915_WRITE_FW() and switch to using
intel_uncore_read_fw() and intel_uncore_write_fw(), respectively.

No functional changes.

Cc: Chris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
---
 drivers/gpu/drm/i915/i915_debugfs.c | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/drivers/gpu/drm/i915/i915_debugfs.c b/drivers/gpu/drm/i915/i915_debugfs.c
index cab632791f73..42709a57b475 100644
--- a/drivers/gpu/drm/i915/i915_debugfs.c
+++ b/drivers/gpu/drm/i915/i915_debugfs.c
@@ -1128,7 +1128,8 @@ static int gen6_drpc_info(struct seq_file *m)
 	u32 gt_core_status, rcctl1, rc6vids = 0;
 	u32 gen9_powergate_enable = 0, gen9_powergate_status = 0;
 
-	gt_core_status = I915_READ_FW(GEN6_GT_CORE_STATUS);
+	gt_core_status = intel_uncore_read_fw(&dev_priv->uncore,
+					      GEN6_GT_CORE_STATUS);
 	trace_i915_reg_rw(false, GEN6_GT_CORE_STATUS, gt_core_status, 4, true);
 
 	rcctl1 = I915_READ(GEN6_RC_CONTROL);
@@ -1674,10 +1675,13 @@ static int i915_rps_boost_info(struct seq_file *m, void *data)
 		u32 rpdown, rpdownei;
 
 		intel_uncore_forcewake_get(&dev_priv->uncore, FORCEWAKE_ALL);
-		rpup = I915_READ_FW(GEN6_RP_CUR_UP) & GEN6_RP_EI_MASK;
-		rpupei = I915_READ_FW(GEN6_RP_CUR_UP_EI) & GEN6_RP_EI_MASK;
-		rpdown = I915_READ_FW(GEN6_RP_CUR_DOWN) & GEN6_RP_EI_MASK;
-		rpdownei = I915_READ_FW(GEN6_RP_CUR_DOWN_EI) & GEN6_RP_EI_MASK;
+		rpup = intel_uncore_read_fw(&dev_priv->uncore, GEN6_RP_CUR_UP) & GEN6_RP_EI_MASK;
+		rpupei = intel_uncore_read_fw(&dev_priv->uncore,
+					      GEN6_RP_CUR_UP_EI) & GEN6_RP_EI_MASK;
+		rpdown = intel_uncore_read_fw(&dev_priv->uncore,
+					      GEN6_RP_CUR_DOWN) & GEN6_RP_EI_MASK;
+		rpdownei = intel_uncore_read_fw(&dev_priv->uncore,
+						GEN6_RP_CUR_DOWN_EI) & GEN6_RP_EI_MASK;
 		intel_uncore_forcewake_put(&dev_priv->uncore, FORCEWAKE_ALL);
 
 		seq_printf(m, "\nRPS Autotuning (current \"%s\" window):\n",
-- 
2.20.1

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

  parent reply	other threads:[~2019-12-02 16:01 UTC|newest]

Thread overview: 37+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-12-02 16:00 [PATCH 00/10] drm/i915: add display uncore helpers Jani Nikula
2019-12-02 16:00 ` [Intel-gfx] " Jani Nikula
2019-12-02 16:00 ` [PATCH 01/10] drm/i915/gvt: use intel uncore functions for forcewake register access Jani Nikula
2019-12-02 16:00   ` [Intel-gfx] " Jani Nikula
2019-12-02 16:06   ` Chris Wilson
2019-12-02 16:06     ` [Intel-gfx] " Chris Wilson
2020-01-17 14:36     ` Jani Nikula
2020-01-17 14:47       ` Chris Wilson
2020-01-17 14:50         ` Chris Wilson
2019-12-02 16:00 ` Jani Nikula [this message]
2019-12-02 16:00   ` [Intel-gfx] [PATCH 02/10] drm/i915/debugfs: " Jani Nikula
2019-12-02 16:14   ` Chris Wilson
2019-12-02 16:14     ` [Intel-gfx] " Chris Wilson
2019-12-02 16:00 ` [PATCH 03/10] drm/i915/dmc: " Jani Nikula
2019-12-02 16:00   ` [Intel-gfx] " Jani Nikula
2019-12-02 16:00 ` [PATCH 04/10] drm/i915: add display engine uncore helpers Jani Nikula
2019-12-02 16:00   ` [Intel-gfx] " Jani Nikula
2019-12-10 13:54   ` Joonas Lahtinen
2019-12-11  6:46     ` Jani Nikula
2019-12-02 16:00 ` [PATCH 05/10] drm/i915/display: use intel de functions for forcewake register access Jani Nikula
2019-12-02 16:00   ` [Intel-gfx] " Jani Nikula
2019-12-02 16:00 ` [PATCH 06/10] drm/i915/irq: " Jani Nikula
2019-12-02 16:00   ` [Intel-gfx] " Jani Nikula
2019-12-02 16:00 ` [PATCH 07/10] drm/i915/gmbus: " Jani Nikula
2019-12-02 16:00   ` [Intel-gfx] " Jani Nikula
2019-12-02 16:00 ` [PATCH 08/10] drm/i915/sprite: " Jani Nikula
2019-12-02 16:00   ` [Intel-gfx] " Jani Nikula
2019-12-02 16:00 ` [PATCH 09/10] drm/i915/pm: " Jani Nikula
2019-12-02 16:00   ` [Intel-gfx] " Jani Nikula
2019-12-02 16:00 ` [PATCH 10/10] drm/i915: remove I915_READ_FW() and I915_WRITE_FW() macros Jani Nikula
2019-12-02 16:00   ` [Intel-gfx] " Jani Nikula
2019-12-02 17:29 ` ✗ Fi.CI.CHECKPATCH: warning for drm/i915: add display uncore helpers Patchwork
2019-12-02 17:29   ` [Intel-gfx] " Patchwork
2019-12-02 18:00 ` ✓ Fi.CI.BAT: success " Patchwork
2019-12-02 18:00   ` [Intel-gfx] " Patchwork
2019-12-02 21:58 ` ✗ Fi.CI.IGT: failure " Patchwork
2019-12-02 21:58   ` [Intel-gfx] " 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=2ab5b752aaf954678a4171d61be7277cf6693e0c.1575302334.git.jani.nikula@intel.com \
    --to=jani.nikula@intel.com \
    --cc=intel-gfx@lists.freedesktop.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: 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.