Commit 3d78923b authored by Michal Wajdeczko's avatar Michal Wajdeczko Committed by Rodrigo Vivi
Browse files

drm/xe/guc: Promote guc_to_gt/xe helpers to .h 



Duplicating these helpers in almost every .c file is a bad idea.
Define them as inlines in .h file to allow proper reuse.

Signed-off-by: default avatarMichal Wajdeczko <michal.wajdeczko@intel.com>
Cc: Rodrigo Vivi <rodrigo.vivi@intel.com>
Cc: Jani Nikula <jani.nikula@intel.com>
Reviewed-by: default avatarMatthew Brost <matthew.brost@intel.com>
Signed-off-by: default avatarRodrigo Vivi <rodrigo.vivi@intel.com>
parent 216d62bb

drivers/gpu/drm/xe/xe_gt_pagefault.c

+0 −6
Original line number Diff line number Diff line
@@ -59,12 +59,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;

drivers/gpu/drm/xe/xe_gt_tlb_invalidation.c

+0 −6
Original line number Diff line number Diff line
@@ -13,12 +13,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,

drivers/gpu/drm/xe/xe_guc.c

+0 −12
Original line number Diff line number Diff line
@@ -27,18 +27,6 @@ 
#include "xe_wa.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,

drivers/gpu/drm/xe/xe_guc.h

+11 −0
Original line number Diff line number Diff line
@@ -6,6 +6,7 @@ 
#ifndef _XE_GUC_H_

#define _XE_GUC_H_



#include "xe_gt.h"

#include "xe_guc_types.h"

#include "xe_hw_engine_types.h"

#include "xe_macros.h"
@@ -58,4 +59,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

drivers/gpu/drm/xe/xe_guc_debugfs.c

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