On Fri, 18 Sep 2015, ville.syrjala@xxxxxxxxxxxxxxx wrote: > From: Ville Syrjälä <ville.syrjala@xxxxxxxxxxxxxxx> > > Signed-off-by: Ville Syrjälä <ville.syrjala@xxxxxxxxxxxxxxx> Reviewed-by: Jani Nikula <jani.nikula@xxxxxxxxx> > --- > drivers/gpu/drm/i915/i915_guc_reg.h | 2 +- > drivers/gpu/drm/i915/intel_guc_loader.c | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/drivers/gpu/drm/i915/i915_guc_reg.h b/drivers/gpu/drm/i915/i915_guc_reg.h > index 8c8e574..848a563 100644 > --- a/drivers/gpu/drm/i915/i915_guc_reg.h > +++ b/drivers/gpu/drm/i915/i915_guc_reg.h > @@ -40,7 +40,7 @@ > > #define SOFT_SCRATCH(n) (0xc180 + ((n) * 4)) > > -#define UOS_RSA_SCRATCH_0 0xc200 > +#define UOS_RSA_SCRATCH(i) (0xc200 + (i) * 4) > #define DMA_ADDR_0_LOW 0xc300 > #define DMA_ADDR_0_HIGH 0xc304 > #define DMA_ADDR_1_LOW 0xc308 > diff --git a/drivers/gpu/drm/i915/intel_guc_loader.c b/drivers/gpu/drm/i915/intel_guc_loader.c > index e0601cc..7432832 100644 > --- a/drivers/gpu/drm/i915/intel_guc_loader.c > +++ b/drivers/gpu/drm/i915/intel_guc_loader.c > @@ -257,7 +257,7 @@ static int guc_ucode_xfer_dma(struct drm_i915_private *dev_priv) > /* Copy RSA signature from the fw image to HW for verification */ > sg_pcopy_to_buffer(sg->sgl, sg->nents, rsa, UOS_RSA_SIG_SIZE, offset); > for (i = 0; i < UOS_RSA_SIG_SIZE / sizeof(u32); i++) > - I915_WRITE(UOS_RSA_SCRATCH_0 + i * sizeof(u32), rsa[i]); > + I915_WRITE(UOS_RSA_SCRATCH(i), rsa[i]); > > /* Set the source address for the new blob */ > offset = i915_gem_obj_ggtt_offset(fw_obj); > -- > 2.4.6 > > _______________________________________________ > Intel-gfx mailing list > Intel-gfx@xxxxxxxxxxxxxxxxxxxxx > http://lists.freedesktop.org/mailman/listinfo/intel-gfx -- Jani Nikula, Intel Open Source Technology Center _______________________________________________ Intel-gfx mailing list Intel-gfx@xxxxxxxxxxxxxxxxxxxxx http://lists.freedesktop.org/mailman/listinfo/intel-gfx
