Commit caf4ee1a authored by Lucas De Marchi's avatar Lucas De Marchi
Browse files

drm/xe: Drop HAS_HECI_* 



Just do the same as for other has_* flags, without a macro.

Reviewed-by: default avatarRodrigo Vivi <rodrigo.vivi@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20241114152148.572447-4-lucas.demarchi@intel.com


Signed-off-by: default avatarLucas De Marchi <lucas.demarchi@intel.com>
parent 04325493

drivers/gpu/drm/xe/xe_device_types.h

+0 −2
Original line number Diff line number Diff line
@@ -42,8 +42,6 @@ struct xe_pat_ops; 
#define GRAPHICS_VERx100(xe) ((xe)->info.graphics_verx100)

#define MEDIA_VERx100(xe) ((xe)->info.media_verx100)

#define IS_DGFX(xe) ((xe)->info.is_dgfx)

#define HAS_HECI_GSCFI(xe) ((xe)->info.has_heci_gscfi)

#define HAS_HECI_CSCFI(xe) ((xe)->info.has_heci_cscfi)



#define XE_VRAM_FLAGS_NEED64K		BIT(0)

drivers/gpu/drm/xe/xe_heci_gsc.c

+4 −4
Original line number Diff line number Diff line
@@ -92,7 +92,7 @@ void xe_heci_gsc_fini(struct xe_device *xe) 
{

	struct xe_heci_gsc *heci_gsc = &xe->heci_gsc;



	if (!HAS_HECI_GSCFI(xe) && !HAS_HECI_CSCFI(xe))

	if (!xe->info.has_heci_gscfi && !xe->info.has_heci_cscfi)

		return;



	if (heci_gsc->adev) {
@@ -177,7 +177,7 @@ void xe_heci_gsc_init(struct xe_device *xe) 
	const struct heci_gsc_def *def;

	int ret;



	if (!HAS_HECI_GSCFI(xe) && !HAS_HECI_CSCFI(xe))

	if (!xe->info.has_heci_gscfi && !xe->info.has_heci_cscfi)

		return;



	heci_gsc->irq = -1;
@@ -222,7 +222,7 @@ void xe_heci_gsc_irq_handler(struct xe_device *xe, u32 iir) 
	if ((iir & GSC_IRQ_INTF(1)) == 0)

		return;



	if (!HAS_HECI_GSCFI(xe)) {

	if (!xe->info.has_heci_gscfi) {

		drm_warn_once(&xe->drm, "GSC irq: not supported");

		return;

	}
@@ -242,7 +242,7 @@ void xe_heci_csc_irq_handler(struct xe_device *xe, u32 iir) 
	if ((iir & CSC_IRQ_INTF(1)) == 0)

		return;



	if (!HAS_HECI_CSCFI(xe)) {

	if (!xe->info.has_heci_cscfi) {

		drm_warn_once(&xe->drm, "CSC irq: not supported");

		return;

	}

drivers/gpu/drm/xe/xe_irq.c

+4 −4
Original line number Diff line number Diff line
@@ -192,7 +192,7 @@ void xe_irq_enable_hwe(struct xe_gt *gt) 
		if (xe_hw_engine_mask_per_class(gt, XE_ENGINE_CLASS_OTHER)) {

			gsc_mask = irqs | GSC_ER_COMPLETE;

			heci_mask = GSC_IRQ_INTF(1);

		} else if (HAS_HECI_GSCFI(xe)) {

		} else if (xe->info.has_heci_gscfi) {

			gsc_mask = GSC_IRQ_INTF(1);

		}
@@ -325,7 +325,7 @@ static void gt_irq_handler(struct xe_tile *tile, 


			if (class == XE_ENGINE_CLASS_OTHER) {

				/* HECI GSCFI interrupts come from outside of GT */

				if (HAS_HECI_GSCFI(xe) && instance == OTHER_GSC_INSTANCE)

				if (xe->info.has_heci_gscfi && instance == OTHER_GSC_INSTANCE)

					xe_heci_gsc_irq_handler(xe, intr_vec);

				else

					gt_other_irq_handler(engine_gt, instance, intr_vec);
@@ -459,7 +459,7 @@ static irqreturn_t dg1_irq_handler(int irq, void *arg) 
		 * the primary tile.

		 */

		if (id == 0) {

			if (HAS_HECI_CSCFI(xe))

			if (xe->info.has_heci_cscfi)

				xe_heci_csc_irq_handler(xe, master_ctl);

			xe_display_irq_handler(xe, master_ctl);

			gu_misc_iir = gu_misc_irq_ack(xe, master_ctl);
@@ -508,7 +508,7 @@ static void gt_irq_reset(struct xe_tile *tile) 


	if ((tile->media_gt &&

	     xe_hw_engine_mask_per_class(tile->media_gt, XE_ENGINE_CLASS_OTHER)) ||

	    HAS_HECI_GSCFI(tile_to_xe(tile))) {

	    tile_to_xe(tile)->info.has_heci_gscfi) {

		xe_mmio_write32(mmio, GUNIT_GSC_INTR_ENABLE, 0);

		xe_mmio_write32(mmio, GUNIT_GSC_INTR_MASK, ~0);

		xe_mmio_write32(mmio, HECI2_RSVD_INTR_MASK, ~0);