Commit 04485cc3 authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'drm-xe-fixes-2025-02-13' of https://gitlab.freedesktop.org/drm/xe/kernel into drm-fixes 



- Remove bo->clients out of bos_lock area (Tejas)
- Carve out wopcm portion from the stolen memory (Nirmoy)

Signed-off-by: default avatarDave Airlie <airlied@redhat.com>

From: Rodrigo Vivi <rodrigo.vivi@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/Z64rCicgpBe_t5GY@intel.com
parents d70c6ae5 e9774998

drivers/gpu/drm/xe/xe_drm_client.c

+1 −1
Original line number Diff line number Diff line
@@ -135,8 +135,8 @@ void xe_drm_client_add_bo(struct xe_drm_client *client, 
	XE_WARN_ON(bo->client);

	XE_WARN_ON(!list_empty(&bo->client_link));



	spin_lock(&client->bos_lock);

	bo->client = xe_drm_client_get(client);

	spin_lock(&client->bos_lock);

	list_add_tail(&bo->client_link, &client->bos_list);

	spin_unlock(&client->bos_lock);

}

drivers/gpu/drm/xe/xe_ttm_stolen_mgr.c

+30 −24
Original line number Diff line number Diff line
@@ -57,12 +57,35 @@ bool xe_ttm_stolen_cpu_access_needs_ggtt(struct xe_device *xe) 
	return GRAPHICS_VERx100(xe) < 1270 && !IS_DGFX(xe);

}



static u32 get_wopcm_size(struct xe_device *xe)

{

	u32 wopcm_size;

	u64 val;



	val = xe_mmio_read64_2x32(xe_root_tile_mmio(xe), STOLEN_RESERVED);

	val = REG_FIELD_GET64(WOPCM_SIZE_MASK, val);



	switch (val) {

	case 0x5 ... 0x6:

		val--;

		fallthrough;

	case 0x0 ... 0x3:

		wopcm_size = (1U << val) * SZ_1M;

		break;

	default:

		WARN(1, "Missing case wopcm_size=%llx\n", val);

		wopcm_size = 0;

	}



	return wopcm_size;

}



static s64 detect_bar2_dgfx(struct xe_device *xe, struct xe_ttm_stolen_mgr *mgr)

{

	struct xe_tile *tile = xe_device_get_root_tile(xe);

	struct xe_mmio *mmio = xe_root_tile_mmio(xe);

	struct pci_dev *pdev = to_pci_dev(xe->drm.dev);

	u64 stolen_size;

	u64 stolen_size, wopcm_size;

	u64 tile_offset;

	u64 tile_size;
@@ -74,7 +97,13 @@ static s64 detect_bar2_dgfx(struct xe_device *xe, struct xe_ttm_stolen_mgr *mgr) 
	if (drm_WARN_ON(&xe->drm, tile_size < mgr->stolen_base))

		return 0;



	/* Carve out the top of DSM as it contains the reserved WOPCM region */

	wopcm_size = get_wopcm_size(xe);

	if (drm_WARN_ON(&xe->drm, !wopcm_size))

		return 0;



	stolen_size = tile_size - mgr->stolen_base;

	stolen_size -= wopcm_size;



	/* Verify usage fits in the actual resource available */

	if (mgr->stolen_base + stolen_size <= pci_resource_len(pdev, LMEM_BAR))
@@ -89,29 +118,6 @@ static s64 detect_bar2_dgfx(struct xe_device *xe, struct xe_ttm_stolen_mgr *mgr) 
	return ALIGN_DOWN(stolen_size, SZ_1M);

}



static u32 get_wopcm_size(struct xe_device *xe)

{

	u32 wopcm_size;

	u64 val;



	val = xe_mmio_read64_2x32(xe_root_tile_mmio(xe), STOLEN_RESERVED);

	val = REG_FIELD_GET64(WOPCM_SIZE_MASK, val);



	switch (val) {

	case 0x5 ... 0x6:

		val--;

		fallthrough;

	case 0x0 ... 0x3:

		wopcm_size = (1U << val) * SZ_1M;

		break;

	default:

		WARN(1, "Missing case wopcm_size=%llx\n", val);

		wopcm_size = 0;

	}



	return wopcm_size;

}



static u32 detect_bar2_integrated(struct xe_device *xe, struct xe_ttm_stolen_mgr *mgr)

{

	struct pci_dev *pdev = to_pci_dev(xe->drm.dev);