[Intel-gfx] [PATCH v2 04/18] drm/i915/guc: Keep iosys_map of ads_blob around

[Matt Atwood]

On Tue, Feb 08, 2022 at 02:45:10AM -0800, Lucas De Marchi wrote:
> Convert intel_guc_ads_create() and initialization to use iosys_map
> rather than plain pointer and save it in the guc struct. This will help
> with additional updates to the ads_blob after the
> creation/initialization by abstracting the IO vs system memory.
> 
> Cc: Matt Roper <matthew.d.roper at intel.com>
> Cc: Thomas Hellström <thomas.hellstrom at linux.intel.com>
> Cc: Daniel Vetter <daniel at ffwll.ch>
> Cc: John Harrison <John.C.Harrison at Intel.com>
> Cc: Matthew Brost <matthew.brost at intel.com>
> Cc: Daniele Ceraolo Spurio <daniele.ceraolospurio at intel.com>
Reviewed-by: Matt Atwood <matthew.s.atwood at intel.com>
> Signed-off-by: Lucas De Marchi <lucas.demarchi at intel.com>
> ---
>  drivers/gpu/drm/i915/gt/uc/intel_guc.h     | 4 +++-
>  drivers/gpu/drm/i915/gt/uc/intel_guc_ads.c | 6 ++++++
>  2 files changed, 9 insertions(+), 1 deletion(-)
> 
> diff --git a/drivers/gpu/drm/i915/gt/uc/intel_guc.h b/drivers/gpu/drm/i915/gt/uc/intel_guc.h
> index 697d9d66acef..9b9ba79f7594 100644
> --- a/drivers/gpu/drm/i915/gt/uc/intel_guc.h
> +++ b/drivers/gpu/drm/i915/gt/uc/intel_guc.h
> @@ -6,8 +6,9 @@
>  #ifndef _INTEL_GUC_H_
>  #define _INTEL_GUC_H_
>  
> -#include <linux/xarray.h>
>  #include <linux/delay.h>
> +#include <linux/iosys-map.h>
> +#include <linux/xarray.h>
>  
>  #include "intel_uncore.h"
>  #include "intel_guc_fw.h"
> @@ -148,6 +149,7 @@ struct intel_guc {
>  	struct i915_vma *ads_vma;
>  	/** @ads_blob: contents of the GuC ADS */
>  	struct __guc_ads_blob *ads_blob;
> +	struct iosys_map ads_map;
>  	/** @ads_regset_size: size of the save/restore regsets in the ADS */
>  	u32 ads_regset_size;
>  	/** @ads_golden_ctxt_size: size of the golden contexts in the ADS */
> diff --git a/drivers/gpu/drm/i915/gt/uc/intel_guc_ads.c b/drivers/gpu/drm/i915/gt/uc/intel_guc_ads.c
> index e61150adcbe9..13671b186908 100644
> --- a/drivers/gpu/drm/i915/gt/uc/intel_guc_ads.c
> +++ b/drivers/gpu/drm/i915/gt/uc/intel_guc_ads.c
> @@ -624,6 +624,11 @@ int intel_guc_ads_create(struct intel_guc *guc)
>  	if (ret)
>  		return ret;
>  
> +	if (i915_gem_object_is_lmem(guc->ads_vma->obj))
> +		iosys_map_set_vaddr_iomem(&guc->ads_map, (void __iomem *)guc->ads_blob);
> +	else
> +		iosys_map_set_vaddr(&guc->ads_map, guc->ads_blob);
> +
>  	__guc_ads_init(guc);
>  
>  	return 0;
> @@ -645,6 +650,7 @@ void intel_guc_ads_destroy(struct intel_guc *guc)
>  {
>  	i915_vma_unpin_and_release(&guc->ads_vma, I915_VMA_RELEASE_MAP);
>  	guc->ads_blob = NULL;
> +	iosys_map_clear(&guc->ads_map);
>  }
>  
>  static void guc_ads_private_data_reset(struct intel_guc *guc)
> -- 
> 2.35.1
>