Commit 09ab20c4 authored by Lucas De Marchi's avatar Lucas De Marchi
Browse files

drm/xe/device: Use poll_timeout_us() to wait for lmem 



Now that there's a generic poll_timeout_us(), use it to wait for
LMEM_INIT in GU_CNTL.

Reviewed-by: default avatarMaarten Lankhorst <dev@lankhorst.se>
Link: https://lore.kernel.org/r/20250922-xe-iopoll-v4-1-06438311a63f@intel.com


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

drivers/gpu/drm/xe/xe_device.c

+34 −31
Original line number Diff line number Diff line
@@ -8,6 +8,7 @@ 
#include <linux/aperture.h>

#include <linux/delay.h>

#include <linux/fault-inject.h>

#include <linux/iopoll.h>

#include <linux/units.h>



#include <drm/drm_atomic_helper.h>
@@ -630,16 +631,22 @@ static int xe_set_dma_info(struct xe_device *xe) 
	return err;

}



static bool verify_lmem_ready(struct xe_device *xe)

static int lmem_initializing(struct xe_device *xe)

{

	u32 val = xe_mmio_read32(xe_root_tile_mmio(xe), GU_CNTL) & LMEM_INIT;

	if (xe_mmio_read32(xe_root_tile_mmio(xe), GU_CNTL) & LMEM_INIT)

		return 0;



	if (signal_pending(current))

		return -EINTR;



	return !!val;

	return 1;

}



static int wait_for_lmem_ready(struct xe_device *xe)

{

	unsigned long timeout, start;

	const unsigned long TIMEOUT_SEC = 60;

	unsigned long prev_jiffies;

	int initializing;



	if (!IS_DGFX(xe))

		return 0;
@@ -647,17 +654,11 @@ static int wait_for_lmem_ready(struct xe_device *xe) 
	if (IS_SRIOV_VF(xe))

		return 0;



	if (verify_lmem_ready(xe))

	if (!lmem_initializing(xe))

		return 0;



	drm_dbg(&xe->drm, "Waiting for lmem initialization\n");



	start = jiffies;

	timeout = start + secs_to_jiffies(60); /* 60 sec! */



	do {

		if (signal_pending(current))

			return -EINTR;

	prev_jiffies = jiffies;



	/*

	 * The boot firmware initializes local memory and
@@ -669,17 +670,19 @@ static int wait_for_lmem_ready(struct xe_device *xe) 
	 * it can lead to the system being unusable.

	 * use a timeout and defer the probe to prevent this.

	 */

		if (time_after(jiffies, timeout)) {

	poll_timeout_us(initializing = lmem_initializing(xe),

			initializing <= 0,

			20 * USEC_PER_MSEC, TIMEOUT_SEC * USEC_PER_SEC, true);

	if (initializing < 0)

		return initializing;



	if (initializing) {

		drm_dbg(&xe->drm, "lmem not initialized by firmware\n");

		return -EPROBE_DEFER;

	}



		msleep(20);



	} while (!verify_lmem_ready(xe));



	drm_dbg(&xe->drm, "lmem ready after %ums",

		jiffies_to_msecs(jiffies - start));

		jiffies_to_msecs(jiffies - prev_jiffies));



	return 0;

}