On Mon, Jun 07, 2021 at 11:03:52AM -0700, Matthew Brost wrote:
From: Michal Wajdeczko michal.wajdeczko@intel.com
CTB pool is now maintained internally by the GuC as part of its "private data". No need to allocate separate buffer and pass it to GuC as yet another ADS.
Signed-off-by: Matthew Brost matthew.brost@intel.com #v4 Signed-off-by: Michal Wajdeczko michal.wajdeczko@intel.com Cc: Janusz Krzysztofik janusz.krzysztofik@linux.intel.com
Reviewed-by: Matthew Brost matthew.brost@intel.com
drivers/gpu/drm/i915/gt/uc/intel_guc_ads.c | 12 ------------ drivers/gpu/drm/i915/gt/uc/intel_guc_fwif.h | 12 +----------- 2 files changed, 1 insertion(+), 23 deletions(-)
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 4fcbe4b921f9..6e26fe04ce92 100644 --- a/drivers/gpu/drm/i915/gt/uc/intel_guc_ads.c +++ b/drivers/gpu/drm/i915/gt/uc/intel_guc_ads.c @@ -26,8 +26,6 @@
+---------------------------------------+| guc_clients_info |+---------------------------------------+
| guc_ct_pool_entry[size] |
+---------------------------------------+| padding |+---------------------------------------+ <== 4K aligned| private data |@@ -40,7 +38,6 @@ struct __guc_ads_blob { struct guc_policies policies; struct guc_gt_system_info system_info; struct guc_clients_info clients_info;
- struct guc_ct_pool_entry ct_pool[GUC_CT_POOL_SIZE];
} __packed;
static u32 guc_ads_private_data_size(struct intel_guc *guc) @@ -68,11 +65,6 @@ static void guc_policies_init(struct guc_policies *policies) policies->is_valid = 1; }
-static void guc_ct_pool_entries_init(struct guc_ct_pool_entry *pool, u32 num) -{
- memset(pool, 0, num * sizeof(*pool));
-}
static void guc_mapping_table_init(struct intel_gt *gt, struct guc_gt_system_info *system_info) { @@ -161,11 +153,7 @@ static void __guc_ads_init(struct intel_guc *guc) base = intel_guc_ggtt_offset(guc, guc->ads_vma);
/* Clients info */
guc_ct_pool_entries_init(blob->ct_pool, ARRAY_SIZE(blob->ct_pool));
blob->clients_info.clients_num = 1;
blob->clients_info.ct_pool_addr = base + ptr_offset(blob, ct_pool);
blob->clients_info.ct_pool_count = ARRAY_SIZE(blob->ct_pool);
/* ADS */ blob->ads.scheduler_policies = base + ptr_offset(blob, policies);
diff --git a/drivers/gpu/drm/i915/gt/uc/intel_guc_fwif.h b/drivers/gpu/drm/i915/gt/uc/intel_guc_fwif.h index 251c3836bd2c..2266444d074f 100644 --- a/drivers/gpu/drm/i915/gt/uc/intel_guc_fwif.h +++ b/drivers/gpu/drm/i915/gt/uc/intel_guc_fwif.h @@ -295,19 +295,9 @@ struct guc_gt_system_info { } __packed;
/* Clients info */ -struct guc_ct_pool_entry {
- struct guc_ct_buffer_desc desc;
- u32 reserved[7];
-} __packed;
-#define GUC_CT_POOL_SIZE 2
struct guc_clients_info { u32 clients_num;
- u32 reserved0[13];
- u32 ct_pool_addr;
- u32 ct_pool_count;
- u32 reserved[4];
- u32 reserved[19];
} __packed;
/* GuC Additional Data Struct */
2.28.0