Commit 6fa86e7a authored by Ilia Levi's avatar Ilia Levi Committed by Michal Wajdeczko
Browse files

drm/xe: Introduce xe_device_uses_memirq() 



Simplify some memirq usage scenarios and asserts in memirq infrastructure.

Signed-off-by: default avatarIlia Levi <ilia.levi@intel.com>
Reviewed-by: default avatarMichal Wajdeczko <michal.wajdeczko@intel.com>
Signed-off-by: default avatarMichal Wajdeczko <michal.wajdeczko@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20240918053942.1331811-3-illevi@habana.ai
parent b46afdac

drivers/gpu/drm/xe/xe_device.c

+3 −5
Original line number Diff line number Diff line
@@ -676,12 +676,10 @@ int xe_device_probe(struct xe_device *xe) 
		err = xe_ggtt_init_early(tile->mem.ggtt);

		if (err)

			return err;

		if (IS_SRIOV_VF(xe)) {

		err = xe_memirq_init(&tile->sriov.vf.memirq);

		if (err)

			return err;

	}

	}



	for_each_gt(gt, xe, id) {

		err = xe_gt_init_hwconfig(gt);

drivers/gpu/drm/xe/xe_device.h

+6 −0
Original line number Diff line number Diff line
@@ -10,6 +10,7 @@ 


#include "xe_device_types.h"

#include "xe_gt_types.h"

#include "xe_sriov.h"



static inline struct xe_device *to_xe_device(const struct drm_device *dev)

{
@@ -159,6 +160,11 @@ static inline bool xe_device_has_memirq(struct xe_device *xe) 
	return GRAPHICS_VERx100(xe) >= 1250;

}



static inline bool xe_device_uses_memirq(struct xe_device *xe)

{

	return xe_device_has_memirq(xe) && IS_SRIOV_VF(xe);

}



u32 xe_device_ccs_bytes(struct xe_device *xe, u64 size);



void xe_device_snapshot_print(struct xe_device *xe, struct drm_printer *p);

drivers/gpu/drm/xe/xe_irq.c

+1 −1
Original line number Diff line number Diff line
@@ -135,7 +135,7 @@ void xe_irq_enable_hwe(struct xe_gt *gt) 
	u32 gsc_mask = 0;

	u32 heci_mask = 0;



	if (IS_SRIOV_VF(xe) && xe_device_has_memirq(xe))

	if (xe_device_uses_memirq(xe))

		return;



	if (xe_device_uc_enabled(xe)) {

drivers/gpu/drm/xe/xe_lrc.c

+1 −1
Original line number Diff line number Diff line
@@ -602,7 +602,7 @@ static void set_memory_based_intr(u32 *regs, struct xe_hw_engine *hwe) 
	struct xe_memirq *memirq = &gt_to_tile(hwe->gt)->sriov.vf.memirq;

	struct xe_device *xe = gt_to_xe(hwe->gt);



	if (!IS_SRIOV_VF(xe) || !xe_device_has_memirq(xe))

	if (!xe_device_uses_memirq(xe))

		return;



	regs[CTX_LRM_INT_MASK_ENABLE] = MI_LOAD_REGISTER_MEM |

drivers/gpu/drm/xe/xe_memirq.c

+7 −15
Original line number Diff line number Diff line
@@ -200,9 +200,7 @@ int xe_memirq_init(struct xe_memirq *memirq) 
	struct xe_device *xe = memirq_to_xe(memirq);

	int err;



	memirq_assert(memirq, IS_SRIOV_VF(xe));



	if (!xe_device_has_memirq(xe))

	if (!xe_device_uses_memirq(xe))

		return 0;



	err = memirq_alloc_pages(memirq);
@@ -226,8 +224,7 @@ int xe_memirq_init(struct xe_memirq *memirq) 
 */

u32 xe_memirq_source_ptr(struct xe_memirq *memirq)

{

	memirq_assert(memirq, IS_SRIOV_VF(memirq_to_xe(memirq)));

	memirq_assert(memirq, xe_device_has_memirq(memirq_to_xe(memirq)));

	memirq_assert(memirq, xe_device_uses_memirq(memirq_to_xe(memirq)));

	memirq_assert(memirq, memirq->bo);



	return xe_bo_ggtt_addr(memirq->bo) + XE_MEMIRQ_SOURCE_OFFSET;
@@ -244,8 +241,7 @@ u32 xe_memirq_source_ptr(struct xe_memirq *memirq) 
 */

u32 xe_memirq_status_ptr(struct xe_memirq *memirq)

{

	memirq_assert(memirq, IS_SRIOV_VF(memirq_to_xe(memirq)));

	memirq_assert(memirq, xe_device_has_memirq(memirq_to_xe(memirq)));

	memirq_assert(memirq, xe_device_uses_memirq(memirq_to_xe(memirq)));

	memirq_assert(memirq, memirq->bo);



	return xe_bo_ggtt_addr(memirq->bo) + XE_MEMIRQ_STATUS_OFFSET;
@@ -262,8 +258,7 @@ u32 xe_memirq_status_ptr(struct xe_memirq *memirq) 
 */

u32 xe_memirq_enable_ptr(struct xe_memirq *memirq)

{

	memirq_assert(memirq, IS_SRIOV_VF(memirq_to_xe(memirq)));

	memirq_assert(memirq, xe_device_has_memirq(memirq_to_xe(memirq)));

	memirq_assert(memirq, xe_device_uses_memirq(memirq_to_xe(memirq)));

	memirq_assert(memirq, memirq->bo);



	return xe_bo_ggtt_addr(memirq->bo) + XE_MEMIRQ_ENABLE_OFFSET;
@@ -289,8 +284,7 @@ int xe_memirq_init_guc(struct xe_memirq *memirq, struct xe_guc *guc) 
	u32 source, status;

	int err;



	memirq_assert(memirq, IS_SRIOV_VF(memirq_to_xe(memirq)));

	memirq_assert(memirq, xe_device_has_memirq(memirq_to_xe(memirq)));

	memirq_assert(memirq, xe_device_uses_memirq(memirq_to_xe(memirq)));

	memirq_assert(memirq, memirq->bo);



	source = xe_memirq_source_ptr(memirq) + offset;
@@ -325,8 +319,7 @@ int xe_memirq_init_guc(struct xe_memirq *memirq, struct xe_guc *guc) 
 */

void xe_memirq_reset(struct xe_memirq *memirq)

{

	memirq_assert(memirq, IS_SRIOV_VF(memirq_to_xe(memirq)));

	memirq_assert(memirq, xe_device_has_memirq(memirq_to_xe(memirq)));

	memirq_assert(memirq, xe_device_uses_memirq(memirq_to_xe(memirq)));



	if (memirq->bo)

		memirq_set_enable(memirq, false);
@@ -343,8 +336,7 @@ void xe_memirq_reset(struct xe_memirq *memirq) 
 */

void xe_memirq_postinstall(struct xe_memirq *memirq)

{

	memirq_assert(memirq, IS_SRIOV_VF(memirq_to_xe(memirq)));

	memirq_assert(memirq, xe_device_has_memirq(memirq_to_xe(memirq)));

	memirq_assert(memirq, xe_device_uses_memirq(memirq_to_xe(memirq)));



	if (memirq->bo)

		memirq_set_enable(memirq, true);