drm/i915: Parameterize R_PWR_CLK_STATE register definition

At the moment we only use R_PWR_CLK_STATE in the context of the RCS
engine, but upcoming support for compute engines will start using
instances relative to the CCS engine base offsets.  Let's parameterize
the register and move it to the engine reg header.

Cc: Jani Nikula <jani.nikula@intel.com>
Signed-off-by: Matt Roper <matthew.d.roper@intel.com>
Reviewed-by: Lucas De Marchi <lucas.demarchi@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20220127234334.4016964-4-matthew.d.roper@intel.com

diff --git a/drivers/gpu/drm/i915/gem/selftests/i915_gem_context.c b/drivers/gpu/drm/i915/gem/selftests/i915_gem_context.c
index 3f41fe5ec9d4feee0d779417a5b599adf3963550..7d327ffd0464891e74c14b3e3527a66556107734 100644 (file)
--- a/drivers/gpu/drm/i915/gem/selftests/i915_gem_context.c
+++ b/drivers/gpu/drm/i915/gem/selftests/i915_gem_context.c
@@ -8,6 +8,7 @@
 
 #include "gem/i915_gem_pm.h"
 #include "gt/intel_engine_pm.h"
+#include "gt/intel_engine_regs.h"
 #include "gt/intel_gt.h"
 #include "gt/intel_gt_requests.h"
 #include "gt/intel_reset.h"
@@ -894,7 +895,7 @@ static int rpcs_query_batch(struct drm_i915_gem_object *rpcs, struct i915_vma *v
                return PTR_ERR(cmd);
 
        *cmd++ = MI_STORE_REGISTER_MEM_GEN8;
-       *cmd++ = i915_mmio_reg_offset(GEN8_R_PWR_CLK_STATE);
+       *cmd++ = i915_mmio_reg_offset(GEN8_R_PWR_CLK_STATE(RENDER_RING_BASE));
        *cmd++ = lower_32_bits(vma->node.start);
        *cmd++ = upper_32_bits(vma->node.start);
        *cmd = MI_BATCH_BUFFER_END;

diff --git a/drivers/gpu/drm/i915/gt/intel_engine_regs.h b/drivers/gpu/drm/i915/gt/intel_engine_regs.h
index 60511f3107676334e45b454eaa12b257104a5181..daf4a241cf77aa5ea56387ff8b29138b710133fc 100644 (file)
--- a/drivers/gpu/drm/i915/gt/intel_engine_regs.h
+++ b/drivers/gpu/drm/i915/gt/intel_engine_regs.h
@@ -77,6 +77,21 @@
 #define RING_INSTPM(base)                      _MMIO((base) + 0xc0)
 #define RING_CMD_CCTL(base)                    _MMIO((base) + 0xc4)
 #define ACTHD(base)                            _MMIO((base) + 0xc8)
+#define GEN8_R_PWR_CLK_STATE(base)             _MMIO((base) + 0xc8)
+#define   GEN8_RPCS_ENABLE                     (1 << 31)
+#define   GEN8_RPCS_S_CNT_ENABLE               (1 << 18)
+#define   GEN8_RPCS_S_CNT_SHIFT                        15
+#define   GEN8_RPCS_S_CNT_MASK                 (0x7 << GEN8_RPCS_S_CNT_SHIFT)
+#define   GEN11_RPCS_S_CNT_SHIFT               12
+#define   GEN11_RPCS_S_CNT_MASK                        (0x3f << GEN11_RPCS_S_CNT_SHIFT)
+#define   GEN8_RPCS_SS_CNT_ENABLE              (1 << 11)
+#define   GEN8_RPCS_SS_CNT_SHIFT               8
+#define   GEN8_RPCS_SS_CNT_MASK                        (0x7 << GEN8_RPCS_SS_CNT_SHIFT)
+#define   GEN8_RPCS_EU_MAX_SHIFT               4
+#define   GEN8_RPCS_EU_MAX_MASK                        (0xf << GEN8_RPCS_EU_MAX_SHIFT)
+#define   GEN8_RPCS_EU_MIN_SHIFT               0
+#define   GEN8_RPCS_EU_MIN_MASK                        (0xf << GEN8_RPCS_EU_MIN_SHIFT)
+
 #define RING_RESET_CTL(base)                   _MMIO((base) + 0xd0)
 #define   RESET_CTL_CAT_ERROR                  REG_BIT(2)
 #define   RESET_CTL_READY_TO_RESET             REG_BIT(1)

diff --git a/drivers/gpu/drm/i915/gt/intel_sseu.c b/drivers/gpu/drm/i915/gt/intel_sseu.c
index bdf09051b8a05ddd2d250f9a24102f08b4db026a..f161087f30d0ad4a75785a031883de3b1701dc49 100644 (file)
--- a/drivers/gpu/drm/i915/gt/intel_sseu.c
+++ b/drivers/gpu/drm/i915/gt/intel_sseu.c
@@ -4,7 +4,7 @@
  */
 
 #include "i915_drv.h"
-#include "intel_lrc_reg.h"
+#include "intel_engine_regs.h"
 #include "intel_sseu.h"
 
 void intel_sseu_set_info(struct sseu_dev_info *sseu, u8 max_slices,

diff --git a/drivers/gpu/drm/i915/i915_perf.c b/drivers/gpu/drm/i915/i915_perf.c
index 5d56446da26fb122c3cbc5bbf3abf6812949cd95..457fcacc70b6620823be32265f8028bc71fb95b8 100644 (file)
--- a/drivers/gpu/drm/i915/i915_perf.c
+++ b/drivers/gpu/drm/i915/i915_perf.c
@@ -2420,7 +2420,7 @@ gen12_configure_all_contexts(struct i915_perf_stream *stream,
 {
        struct flex regs[] = {
                {
-                       GEN8_R_PWR_CLK_STATE,
+                       GEN8_R_PWR_CLK_STATE(RENDER_RING_BASE),
                        CTX_R_PWR_CLK_STATE,
                },
        };
@@ -2440,7 +2440,7 @@ lrc_configure_all_contexts(struct i915_perf_stream *stream,
 #define ctx_flexeuN(N) (ctx_flexeu0 + 2 * (N) + 1)
        struct flex regs[] = {
                {
-                       GEN8_R_PWR_CLK_STATE,
+                       GEN8_R_PWR_CLK_STATE(RENDER_RING_BASE),
                        CTX_R_PWR_CLK_STATE,
                },
                {

diff --git a/drivers/gpu/drm/i915/i915_reg.h b/drivers/gpu/drm/i915/i915_reg.h
index 8da008605dcc4cb1d9e3941bba0cb0408327c3d1..23b53b3b9dd390ca15faca3917d4508630fc5215 100644 (file)
--- a/drivers/gpu/drm/i915/i915_reg.h
+++ b/drivers/gpu/drm/i915/i915_reg.h
@@ -272,21 +272,6 @@
 #define GEN12_SFC_DONE(n)              _MMIO(0x1cc000 + (n) * 0x1000)
 #define GEN12_SFC_DONE_MAX             4
 
-#define GEN8_R_PWR_CLK_STATE           _MMIO(0x20C8)
-#define   GEN8_RPCS_ENABLE             (1 << 31)
-#define   GEN8_RPCS_S_CNT_ENABLE       (1 << 18)
-#define   GEN8_RPCS_S_CNT_SHIFT                15
-#define   GEN8_RPCS_S_CNT_MASK         (0x7 << GEN8_RPCS_S_CNT_SHIFT)
-#define   GEN11_RPCS_S_CNT_SHIFT       12
-#define   GEN11_RPCS_S_CNT_MASK                (0x3f << GEN11_RPCS_S_CNT_SHIFT)
-#define   GEN8_RPCS_SS_CNT_ENABLE      (1 << 11)
-#define   GEN8_RPCS_SS_CNT_SHIFT       8
-#define   GEN8_RPCS_SS_CNT_MASK                (0x7 << GEN8_RPCS_SS_CNT_SHIFT)
-#define   GEN8_RPCS_EU_MAX_SHIFT       4
-#define   GEN8_RPCS_EU_MAX_MASK                (0xf << GEN8_RPCS_EU_MAX_SHIFT)
-#define   GEN8_RPCS_EU_MIN_SHIFT       0
-#define   GEN8_RPCS_EU_MIN_MASK                (0xf << GEN8_RPCS_EU_MIN_SHIFT)
-
 #define WAIT_FOR_RC6_EXIT              _MMIO(0x20CC)
 /* HSW only */
 #define   HSW_SELECTIVE_READ_ADDRESSING_SHIFT          2