Commit 140f9309 authored by Michal Wajdeczko's avatar Michal Wajdeczko Committed by Tvrtko Ursulin
Browse files

drm/i915/guc: Update GuC messages in intel_guc_ads.c 



Use new macros to have common prefix that also include GT#.

Signed-off-by: default avatarMichal Wajdeczko <michal.wajdeczko@intel.com>
Cc: John Harrison <John.C.Harrison@Intel.com>
Reviewed-by: default avatarJohn Harrison <John.C.Harrison@Intel.com>
Signed-off-by: default avatarTvrtko Ursulin <tvrtko.ursulin@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20230128195907.1837-4-michal.wajdeczko@intel.com
parent ecb89c2c

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

+4 −4
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ 
#include "intel_guc_ads.h"

#include "intel_guc_capture.h"

#include "intel_guc_fwif.h"

#include "intel_guc_print.h"

#include "intel_uc.h"

#include "i915_drv.h"
@@ -427,7 +428,7 @@ static long guc_mmio_reg_state_create(struct intel_guc *guc) 


	guc->ads_regset = temp_set.storage;



	drm_dbg(&guc_to_gt(guc)->i915->drm, "Used %zu KB for temporary ADS regset\n",

	guc_dbg(guc, "Used %zu KB for temporary ADS regset\n",

		(temp_set.storage_max * sizeof(struct guc_mmio_reg)) >> 10);



	return total * sizeof(struct guc_mmio_reg);
@@ -621,7 +622,7 @@ static void guc_init_golden_context(struct intel_guc *guc) 


		engine = find_engine_state(gt, engine_class);

		if (!engine) {

			drm_err(&gt->i915->drm, "No engine state recorded for class %d!\n",

			guc_err(guc, "No engine state recorded for class %d!\n",

				engine_class);

			ads_blob_write(guc, ads.eng_state_size[guc_class], 0);

			ads_blob_write(guc, ads.golden_context_lrca[guc_class], 0);
@@ -646,7 +647,6 @@ static int 
guc_capture_prep_lists(struct intel_guc *guc)

{

	struct intel_gt *gt = guc_to_gt(guc);

	struct drm_i915_private *i915 = guc_to_gt(guc)->i915;

	u32 ads_ggtt, capture_offset, null_ggtt, total_size = 0;

	struct guc_gt_system_info local_info;

	struct iosys_map info_map;
@@ -751,7 +751,7 @@ guc_capture_prep_lists(struct intel_guc *guc) 
	}



	if (guc->ads_capture_size && guc->ads_capture_size != PAGE_ALIGN(total_size))

		drm_warn(&i915->drm, "GuC->ADS->Capture alloc size changed from %d to %d\n",

		guc_warn(guc, "ADS capture alloc size changed from %d to %d\n",

			 guc->ads_capture_size, PAGE_ALIGN(total_size));



	return PAGE_ALIGN(total_size);