drm/i915/guc: Use consistent name for scratch register count

We should be consistent on naming of similar definitions.

Signed-off-by: Michal Wajdeczko <michal.wajdeczko@intel.com>
Cc: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Cc: Sagar Arun Kamble <sagar.a.kamble@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20171124170239.29360-1-michal.wajdeczko@intel.com
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>

diff --git a/drivers/gpu/drm/i915/intel_guc_fw.c b/drivers/gpu/drm/i915/intel_guc_fw.c
index 69ba0159957571412c52eba1f58b1fc900a5ceb2..bbab4e1106f332b8575fadde99d8c86db9cddbae 100644 (file)
--- a/drivers/gpu/drm/i915/intel_guc_fw.c
+++ b/drivers/gpu/drm/i915/intel_guc_fw.c
@@ -130,14 +130,14 @@ static int guc_xfer_rsa(struct intel_guc *guc, struct i915_vma *vma)
        struct drm_i915_private *dev_priv = guc_to_i915(guc);
        struct intel_uc_fw *guc_fw = &guc->fw;
        struct sg_table *sg = vma->pages;
-       u32 rsa[UOS_RSA_SCRATCH_MAX_COUNT];
+       u32 rsa[UOS_RSA_SCRATCH_COUNT];
        int i;
 
        if (sg_pcopy_to_buffer(sg->sgl, sg->nents, rsa, sizeof(rsa),
                               guc_fw->rsa_offset) != sizeof(rsa))
                return -EINVAL;
 
-       for (i = 0; i < UOS_RSA_SCRATCH_MAX_COUNT; i++)
+       for (i = 0; i < UOS_RSA_SCRATCH_COUNT; i++)
                I915_WRITE(UOS_RSA_SCRATCH(i), rsa[i]);
 
        return 0;

diff --git a/drivers/gpu/drm/i915/intel_guc_reg.h b/drivers/gpu/drm/i915/intel_guc_reg.h
index 0a8ff03d026f6718349df95b330e3b0d7a1436ea..19a9247c56646745fd934524bd6fb90b5c844a6c 100644 (file)
--- a/drivers/gpu/drm/i915/intel_guc_reg.h
+++ b/drivers/gpu/drm/i915/intel_guc_reg.h
@@ -52,7 +52,8 @@
 #define SOFT_SCRATCH_COUNT             16
 
 #define UOS_RSA_SCRATCH(i)             _MMIO(0xc200 + (i) * 4)
-#define   UOS_RSA_SCRATCH_MAX_COUNT      64
+#define UOS_RSA_SCRATCH_COUNT          64
+
 #define DMA_ADDR_0_LOW                 _MMIO(0xc300)
 #define DMA_ADDR_0_HIGH                        _MMIO(0xc304)
 #define DMA_ADDR_1_LOW                 _MMIO(0xc308)

diff --git a/drivers/gpu/drm/i915/intel_uc_fw.c b/drivers/gpu/drm/i915/intel_uc_fw.c
index 4bc82d3005ff38683615dd3ea111206731faf760..b376dd3b28cc8f03c195d728f33b9071f49f4bf5 100644 (file)
--- a/drivers/gpu/drm/i915/intel_uc_fw.c
+++ b/drivers/gpu/drm/i915/intel_uc_fw.c
@@ -105,7 +105,7 @@ void intel_uc_fw_fetch(struct drm_i915_private *dev_priv,
        }
 
        /* now RSA */
-       if (css->key_size_dw != UOS_RSA_SCRATCH_MAX_COUNT) {
+       if (css->key_size_dw != UOS_RSA_SCRATCH_COUNT) {
                DRM_WARN("%s: Mismatched firmware RSA key size (%u)\n",
                         intel_uc_fw_type_repr(uc_fw->type), css->key_size_dw);
                err = -ENOEXEC;