Commit 3f2f20da authored by Andi Shyti's avatar Andi Shyti
Browse files

drm/i915/guc: Use the new gt_to_guc() wrapper 



Get the guc reference from the gt using the gt_to_guc() helper.

Signed-off-by: default avatarAndi Shyti <andi.shyti@linux.intel.com>
Reviewed-by: default avatarNirmoy Das <nirmoy.das@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20231229102734.674362-3-andi.shyti@linux.intel.com
parent 01b2b8cc

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

+2 −2
Original line number Diff line number Diff line
@@ -298,7 +298,7 @@ static int gsc_fw_load_prepare(struct intel_gsc_uc *gsc) 
	memcpy_toio(gsc->local_vaddr, src, gsc->fw.size);

	memset_io(gsc->local_vaddr + gsc->fw.size, 0, gsc->local->size - gsc->fw.size);



	intel_guc_write_barrier(&gt->uc.guc);

	intel_guc_write_barrier(gt_to_guc(gt));



	i915_gem_object_unpin_map(gsc->fw.obj);
@@ -351,7 +351,7 @@ static int gsc_fw_query_compatibility_version(struct intel_gsc_uc *gsc) 
	void *vaddr;

	int err;



	err = intel_guc_allocate_and_map_vma(&gt->uc.guc, GSC_VER_PKT_SZ * 2,

	err = intel_guc_allocate_and_map_vma(gt_to_guc(gt), GSC_VER_PKT_SZ * 2,

					     &vma, &vaddr);

	if (err) {

		gt_err(gt, "failed to allocate vma for GSC version query\n");

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

+2 −1
Original line number Diff line number Diff line
@@ -358,7 +358,8 @@ static int proxy_channel_alloc(struct intel_gsc_uc *gsc) 
	void *vaddr;

	int err;



	err = intel_guc_allocate_and_map_vma(&gt->uc.guc, GSC_PROXY_CHANNEL_SIZE,

	err = intel_guc_allocate_and_map_vma(gt_to_guc(gt),

					     GSC_PROXY_CHANNEL_SIZE,

					     &vma, &vaddr);

	if (err)

		return err;

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

+1 −1
Original line number Diff line number Diff line
@@ -961,7 +961,7 @@ u32 intel_guc_engine_usage_offset(struct intel_guc *guc) 


struct iosys_map intel_guc_engine_usage_record_map(struct intel_engine_cs *engine)

{

	struct intel_guc *guc = &engine->gt->uc.guc;

	struct intel_guc *guc = gt_to_guc(engine->gt);

	u8 guc_class = engine_class_to_guc_class(engine->class);

	size_t offset = offsetof(struct __guc_ads_blob,

				 engine_usage.engines[guc_class][ilog2(engine->logical_mask)]);

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

+3 −3
Original line number Diff line number Diff line
@@ -1441,7 +1441,7 @@ int intel_guc_capture_print_engine_node(struct drm_i915_error_state_buf *ebuf, 
	if (!cap || !ee->engine)

		return -ENODEV;



	guc = &ee->engine->gt->uc.guc;

	guc = gt_to_guc(ee->engine->gt);



	i915_error_printf(ebuf, "global --- GuC Error Capture on %s command stream:\n",

			  ee->engine->name);
@@ -1543,7 +1543,7 @@ bool intel_guc_capture_is_matching_engine(struct intel_gt *gt, 
	if (!gt || !ce || !engine)

		return false;



	guc = &gt->uc.guc;

	guc = gt_to_guc(gt);

	if (!guc->capture)

		return false;
@@ -1573,7 +1573,7 @@ void intel_guc_capture_get_matching_node(struct intel_gt *gt, 
	if (!gt || !ee || !ce)

		return;



	guc = &gt->uc.guc;

	guc = gt_to_guc(gt);

	if (!guc->capture)

		return;

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

+1 −1
Original line number Diff line number Diff line
@@ -111,7 +111,7 @@ static bool has_table(struct drm_i915_private *i915) 
static int guc_hwconfig_init(struct intel_gt *gt)

{

	struct intel_hwconfig *hwconfig = &gt->info.hwconfig;

	struct intel_guc *guc = &gt->uc.guc;

	struct intel_guc *guc = gt_to_guc(gt);

	int ret;



	if (!has_table(gt->i915))