Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 53fa54a6 authored by Michal Wajdeczko's avatar Michal Wajdeczko Committed by Chris Wilson
Browse files

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



We should be consistent on naming of similar definitions.

Signed-off-by: default avatarMichal 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: default avatarChris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
parent 3452fa30

drivers/gpu/drm/i915/intel_guc_fw.c

+2 −2
Original line number Diff line number Diff line
@@ -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;

drivers/gpu/drm/i915/intel_guc_reg.h

+2 −1
Original line number Diff line number Diff line
@@ -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)

drivers/gpu/drm/i915/intel_uc_fw.c

+1 −1
Original line number Diff line number Diff line
@@ -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;