Commit 1c0b1175 authored by Lucas De Marchi's avatar Lucas De Marchi
Browse files

drm/i915/guc: Keep iosys_map of ads_blob around 



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@intel.com>
Cc: Thomas Hellström <thomas.hellstrom@linux.intel.com>
Cc: Daniel Vetter <daniel@ffwll.ch>
Cc: John Harrison <John.C.Harrison@Intel.com>
Cc: Matthew Brost <matthew.brost@intel.com>
Cc: Daniele Ceraolo Spurio <daniele.ceraolospurio@intel.com>
Signed-off-by: default avatarLucas De Marchi <lucas.demarchi@intel.com>
Reviewed-by: default avatarMatt Atwood <matthew.s.atwood@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20220216174147.3073235-5-lucas.demarchi@intel.com
parent 9659dd2b

drivers/gpu/drm/i915/gt/uc/intel_guc.h

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

	/**

drivers/gpu/drm/i915/gt/uc/intel_guc_ads.c

+6 −0
Original line number Diff line number Diff line
@@ -666,6 +666,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;
@@ -687,6 +692,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);

	kfree(guc->ads_regset);

}