Skip to content

Commit

Permalink
drm/i915/guc: Use consistent name for scratch register count
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
mwajdecz authored and ickle committed Nov 24, 2017
1 parent 3452fa3 commit 53fa54a
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 4 deletions.
4 changes: 2 additions & 2 deletions drivers/gpu/drm/i915/intel_guc_fw.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
3 changes: 2 additions & 1 deletion drivers/gpu/drm/i915/intel_guc_reg.h
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion drivers/gpu/drm/i915/intel_uc_fw.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down

0 comments on commit 53fa54a

Please sign in to comment.