[Intel-xe] [PATCH] drm/xe: Promote guc_to_gt/xe helpers to .h

Wed Mar 29 20:25:36 UTC 2023


On 24.03.2023 19:40, Rodrigo Vivi wrote:
> On Mon, Mar 13, 2023 at 09:01:17AM +0100, Michal Wajdeczko wrote:
>> Duplicating these helpers in almost every .c file was a bad idea.
>> Define them as inlines in .h file to allow proper reuse.
>>
>> Signed-off-by: Michal Wajdeczko <michal.wajdeczko at intel.com>
>> ---
>>  drivers/gpu/drm/xe/xe_gt_pagefault.c        |  6 ------
>>  drivers/gpu/drm/xe/xe_gt_tlb_invalidation.c |  6 ------
>>  drivers/gpu/drm/xe/xe_guc.c                 | 12 ------------
>>  drivers/gpu/drm/xe/xe_guc.h                 | 11 +++++++++++
>>  drivers/gpu/drm/xe/xe_guc_debugfs.c         | 12 ------------
>>  drivers/gpu/drm/xe/xe_guc_hwconfig.c        | 12 ------------
>>  drivers/gpu/drm/xe/xe_guc_submit.c          | 12 ------------
>>  7 files changed, 11 insertions(+), 60 deletions(-)
>>
>> diff --git a/drivers/gpu/drm/xe/xe_gt_pagefault.c b/drivers/gpu/drm/xe/xe_gt_pagefault.c
>> index 1677640e1075..2ae54fecf4ab 100644
>> --- a/drivers/gpu/drm/xe/xe_gt_pagefault.c
>> +++ b/drivers/gpu/drm/xe/xe_gt_pagefault.c
>> @@ -58,12 +58,6 @@ struct acc {
>>  	u8 engine_instance;
>>  };
>>  
>> -static struct xe_gt *
>> -guc_to_gt(struct xe_guc *guc)
>> -{
>> -	return container_of(guc, struct xe_gt, uc.guc);
>> -}
>> -
>>  static bool access_is_atomic(enum access_type access_type)
>>  {
>>  	return access_type == ACCESS_TYPE_ATOMIC;
>> diff --git a/drivers/gpu/drm/xe/xe_gt_tlb_invalidation.c b/drivers/gpu/drm/xe/xe_gt_tlb_invalidation.c
>> index f279e21300aa..259382d54871 100644
>> --- a/drivers/gpu/drm/xe/xe_gt_tlb_invalidation.c
>> +++ b/drivers/gpu/drm/xe/xe_gt_tlb_invalidation.c
>> @@ -12,12 +12,6 @@
>>  
>>  #define TLB_TIMEOUT	(HZ / 4)
>>  
>> -static struct xe_gt *
>> -guc_to_gt(struct xe_guc *guc)
>> -{
>> -	return container_of(guc, struct xe_gt, uc.guc);
>> -}
>> -
>>  static void xe_gt_tlb_fence_timeout(struct work_struct *work)
>>  {
>>  	struct xe_gt *gt = container_of(work, struct xe_gt,
>> diff --git a/drivers/gpu/drm/xe/xe_guc.c b/drivers/gpu/drm/xe/xe_guc.c
>> index 58b9841616e4..8fb2920d96da 100644
>> --- a/drivers/gpu/drm/xe/xe_guc.c
>> +++ b/drivers/gpu/drm/xe/xe_guc.c
>> @@ -22,18 +22,6 @@
>>  #include "xe_uc_fw.h"
>>  #include "xe_wopcm.h"
>>  
>> -static struct xe_gt *
>> -guc_to_gt(struct xe_guc *guc)
>> -{
>> -	return container_of(guc, struct xe_gt, uc.guc);
>> -}
>> -
>> -static struct xe_device *
>> -guc_to_xe(struct xe_guc *guc)
>> -{
>> -	return gt_to_xe(guc_to_gt(guc));
>> -}
>> -
>>  /* GuC addresses above GUC_GGTT_TOP also don't map through the GTT */
>>  #define GUC_GGTT_TOP    0xFEE00000
>>  static u32 guc_bo_ggtt_addr(struct xe_guc *guc,
>> diff --git a/drivers/gpu/drm/xe/xe_guc.h b/drivers/gpu/drm/xe/xe_guc.h
>> index 74a74051f354..96f6e3f46ed7 100644
>> --- a/drivers/gpu/drm/xe/xe_guc.h
>> +++ b/drivers/gpu/drm/xe/xe_guc.h
>> @@ -6,6 +6,7 @@
>>  #ifndef _XE_GUC_H_
>>  #define _XE_GUC_H_
>>  
>> +#include "xe_gt.h"
> 
> sometimes the duplication is better then forcing more dependencies then needed.

IMHO duplication is always bad, and unnecessary dependencies are usually
as result of another bad decision/placement of needed functionality

> 
> I'm really not saying that this is the case here... If we are sure that the
> xe_gt.h was already affecting all the cases that include xe_guc.h then we
> should go with your patch...

it looks so:

$ cgrep include.*xe_guc\\.h -C 15 | grep include..xe_gt*u*c*\\.h
./xe_huc.c-11-#include "xe_gt.h"
./xe_huc.c:12:#include "xe_guc.h"
./xe_guc_ads.c-13-#include "xe_gt.h"
./xe_guc_ads.c:14:#include "xe_guc.h"
./xe_irq.c-17-#include "xe_gt.h"
./xe_irq.c:18:#include "xe_guc.h"
./xe_guc_submit.c-20-#include "xe_gt.h"
./xe_guc_submit.c:21:#include "xe_guc.h"
./xe_uc.c-9-#include "xe_gt.h"
./xe_uc.c:10:#include "xe_guc.h"
./xe_gt_pagefault.c-15-#include "xe_gt.h"
./xe_gt_pagefault.c:17:#include "xe_guc.h"
./xe_guc_debugfs.c-12-#include "xe_gt.h"
./xe_guc_debugfs.c:13:#include "xe_guc.h"
./xe_guc_hwconfig.c-12-#include "xe_gt.h"
./xe_guc_hwconfig.c:13:#include "xe_guc.h"
./xe_guc_ct.c-18-#include "xe_gt.h"
./xe_guc_ct.c:21:#include "xe_guc.h"
./xe_guc.c:6:#include "xe_guc.h"
./xe_guc.c-12-#include "xe_gt.h"
./xe_gt_tlb_invalidation.c-8-#include "xe_gt.h"
./xe_gt_tlb_invalidation.c:9:#include "xe_guc.h"


btw, there is already rev2 [1]

[1] https://patchwork.freedesktop.org/series/115083/


> 
>>  #include "xe_guc_types.h"
>>  #include "xe_hw_engine_types.h"
>>  #include "xe_macros.h"
>> @@ -56,4 +57,14 @@ static inline u16 xe_engine_class_to_guc_class(enum xe_engine_class class)
>>  	}
>>  }
>>  
>> +static inline struct xe_gt *guc_to_gt(struct xe_guc *guc)
>> +{
>> +	return container_of(guc, struct xe_gt, uc.guc);
>> +}
>> +
>> +static inline struct xe_device *guc_to_xe(struct xe_guc *guc)
>> +{
>> +	return gt_to_xe(guc_to_gt(guc));
>> +}
>> +
>>  #endif
>> diff --git a/drivers/gpu/drm/xe/xe_guc_debugfs.c b/drivers/gpu/drm/xe/xe_guc_debugfs.c
>> index 6b72db4d5bb2..dbb3001db928 100644
>> --- a/drivers/gpu/drm/xe/xe_guc_debugfs.c
>> +++ b/drivers/gpu/drm/xe/xe_guc_debugfs.c
>> @@ -15,18 +15,6 @@
>>  #include "xe_guc_log.h"
>>  #include "xe_macros.h"
>>  
>> -static struct xe_gt *
>> -guc_to_gt(struct xe_guc *guc)
>> -{
>> -	return container_of(guc, struct xe_gt, uc.guc);
>> -}
>> -
>> -static struct xe_device *
>> -guc_to_xe(struct xe_guc *guc)
>> -{
>> -	return gt_to_xe(guc_to_gt(guc));
>> -}
>> -
>>  static struct xe_guc *node_to_guc(struct drm_info_node *node)
>>  {
>>  	return node->info_ent->data;
>> diff --git a/drivers/gpu/drm/xe/xe_guc_hwconfig.c b/drivers/gpu/drm/xe/xe_guc_hwconfig.c
>> index a6982f323ed1..a89d26565fdd 100644
>> --- a/drivers/gpu/drm/xe/xe_guc_hwconfig.c
>> +++ b/drivers/gpu/drm/xe/xe_guc_hwconfig.c
>> @@ -13,18 +13,6 @@
>>  #include "xe_guc.h"
>>  #include "xe_map.h"
>>  
>> -static struct xe_gt *
>> -guc_to_gt(struct xe_guc *guc)
>> -{
>> -	return container_of(guc, struct xe_gt, uc.guc);
>> -}
>> -
>> -static struct xe_device *
>> -guc_to_xe(struct xe_guc *guc)
>> -{
>> -	return gt_to_xe(guc_to_gt(guc));
>> -}
>> -
>>  static int send_get_hwconfig(struct xe_guc *guc, u32 ggtt_addr, u32 size)
>>  {
>>  	u32 action[] = {
>> diff --git a/drivers/gpu/drm/xe/xe_guc_submit.c b/drivers/gpu/drm/xe/xe_guc_submit.c
>> index e857013070b9..6b3159e75be9 100644
>> --- a/drivers/gpu/drm/xe/xe_guc_submit.c
>> +++ b/drivers/gpu/drm/xe/xe_guc_submit.c
>> @@ -32,18 +32,6 @@
>>  #include "xe_trace.h"
>>  #include "xe_vm.h"
>>  
>> -static struct xe_gt *
>> -guc_to_gt(struct xe_guc *guc)
>> -{
>> -	return container_of(guc, struct xe_gt, uc.guc);
>> -}
>> -
>> -static struct xe_device *
>> -guc_to_xe(struct xe_guc *guc)
>> -{
>> -	return gt_to_xe(guc_to_gt(guc));
>> -}
>> -
>>  static struct xe_guc *
>>  engine_to_guc(struct xe_engine *e)
>>  {
>> -- 
>> 2.25.1
>>