[Intel-xe] [PATCH igt 0/4] Add LNL support to xe tests

[Intel-xe] [PATCH igt 0/4] Add LNL support to xe tests

[Lucas De Marchi]

Add Lunar Lake support so xe driver can be tested. This brings the new
xe_pciids.h from kernel since now the PCI IDs is not going to be added
on the i915 side.

Janga Rahul Kumar (1):
  tests/xe_debugfs: skip page table level check for Xe2

Lucas De Marchi (2):
  lib: Add xe_pciids.h
  lib/intel_chipset: Add Lunar Lake support

Zbigniew Kempczyński (1):
  lib/intel_device_info: Add blitter cmd info for Lunar Lake

 docs/reference/igt-gpu-tools/meson.build |   1 +
 lib/intel_chipset.h                      |   5 +
 lib/intel_device_info.c                  |  14 ++
 lib/xe_pciids.h                          | 215 +++++++++++++++++++++++
 tests/xe/xe_debugfs.c                    |  23 +--
 5 files changed, 248 insertions(+), 10 deletions(-)
 create mode 100644 lib/xe_pciids.h

-- 
2.40.1

[Intel-xe] [PATCH igt 1/4] lib: Add xe_pciids.h

[Lucas De Marchi]

With the introduction of Lunar Lake, igt won't be able to just re-use
i915_pciids.h for both drivers anymore since the support for LNL is only
coming with the xe module. Copy xe_pciids.h from the drm-xe-next branch
(up to commit b9c9020fc816 ("drm/xe/pvc: Use fast copy engines as
migrate engine on PVC") and start including it where needed. This brings
all the LNL PCI IDs.

Signed-off-by: Lucas De Marchi <lucas.demarchi@intel.com>
---
 docs/reference/igt-gpu-tools/meson.build |   1 +
 lib/intel_device_info.c                  |   1 +
 lib/xe_pciids.h                          | 215 +++++++++++++++++++++++
 3 files changed, 217 insertions(+)
 create mode 100644 lib/xe_pciids.h

diff --git a/docs/reference/igt-gpu-tools/meson.build b/docs/reference/igt-gpu-tools/meson.build
index 6b832ad27..513385b4b 100644
--- a/docs/reference/igt-gpu-tools/meson.build
+++ b/docs/reference/igt-gpu-tools/meson.build
@@ -21,6 +21,7 @@ ignore_headers = [
 	'media_fill_gen9.h',
 	'gen9_render.h',
 	'version.h',
+	'xe_pciids.h',
 ]
 
 test_groups = [
diff --git a/lib/intel_device_info.c b/lib/intel_device_info.c
index 2c9a45b68..5d53d2906 100644
--- a/lib/intel_device_info.c
+++ b/lib/intel_device_info.c
@@ -1,6 +1,7 @@
 #include "intel_chipset.h"
 #include "i915_pciids.h"
 #include "i915_pciids_local.h"
+#include "xe_pciids.h"
 
 #include <strings.h> /* ffs() */
 
diff --git a/lib/xe_pciids.h b/lib/xe_pciids.h
new file mode 100644
index 000000000..29f07a00a
--- /dev/null
+++ b/lib/xe_pciids.h
@@ -0,0 +1,215 @@
+/* SPDX-License-Identifier: MIT */
+/*
+ * Copyright © 2022 Intel Corporation
+ */
+
+#ifndef _XE_PCIIDS_H_
+#define _XE_PCIIDS_H_
+
+/*
+ * Lists below can be turned into initializers for a struct pci_device_id
+ * by defining INTEL_VGA_DEVICE:
+ *
+ * #define INTEL_VGA_DEVICE(id, info) { \
+ *	0x8086, id,			\
+ *	~0, ~0,				\
+ *	0x030000, 0xff0000,		\
+ *	(unsigned long) info }
+ *
+ * And then calling like:
+ *
+ * XE_TGL_12_GT1_IDS(INTEL_VGA_DEVICE, ## __VA_ARGS__)
+ *
+ * To turn them into something else, just provide a different macro passed as
+ * first argument.
+ */
+
+/* TGL */
+#define XE_TGL_GT1_IDS(MACRO__, ...)		\
+	MACRO__(0x9A60, ## __VA_ARGS__),	\
+	MACRO__(0x9A68, ## __VA_ARGS__),	\
+	MACRO__(0x9A70, ## __VA_ARGS__)
+
+#define XE_TGL_GT2_IDS(MACRO__, ...)		\
+	MACRO__(0x9A40, ## __VA_ARGS__),	\
+	MACRO__(0x9A49, ## __VA_ARGS__),	\
+	MACRO__(0x9A59, ## __VA_ARGS__),	\
+	MACRO__(0x9A78, ## __VA_ARGS__),	\
+	MACRO__(0x9AC0, ## __VA_ARGS__),	\
+	MACRO__(0x9AC9, ## __VA_ARGS__),	\
+	MACRO__(0x9AD9, ## __VA_ARGS__),	\
+	MACRO__(0x9AF8, ## __VA_ARGS__)
+
+#define XE_TGL_IDS(MACRO__, ...)		\
+	XE_TGL_GT1_IDS(MACRO__, ## __VA_ARGS__),\
+	XE_TGL_GT2_IDS(MACRO__, ## __VA_ARGS__)
+
+/* RKL */
+#define XE_RKL_IDS(MACRO__, ...)		\
+	MACRO__(0x4C80, ## __VA_ARGS__),	\
+	MACRO__(0x4C8A, ## __VA_ARGS__),	\
+	MACRO__(0x4C8B, ## __VA_ARGS__),	\
+	MACRO__(0x4C8C, ## __VA_ARGS__),	\
+	MACRO__(0x4C90, ## __VA_ARGS__),	\
+	MACRO__(0x4C9A, ## __VA_ARGS__)
+
+/* DG1 */
+#define XE_DG1_IDS(MACRO__, ...)		\
+	MACRO__(0x4905, ## __VA_ARGS__),	\
+	MACRO__(0x4906, ## __VA_ARGS__),	\
+	MACRO__(0x4907, ## __VA_ARGS__),	\
+	MACRO__(0x4908, ## __VA_ARGS__),	\
+	MACRO__(0x4909, ## __VA_ARGS__)
+
+/* ADL-S */
+#define XE_ADLS_IDS(MACRO__, ...)		\
+	MACRO__(0x4680, ## __VA_ARGS__),	\
+	MACRO__(0x4682, ## __VA_ARGS__),	\
+	MACRO__(0x4688, ## __VA_ARGS__),	\
+	MACRO__(0x468A, ## __VA_ARGS__),	\
+	MACRO__(0x4690, ## __VA_ARGS__),	\
+	MACRO__(0x4692, ## __VA_ARGS__),	\
+	MACRO__(0x4693, ## __VA_ARGS__)
+
+/* ADL-P */
+#define XE_ADLP_IDS(MACRO__, ...)		\
+	MACRO__(0x46A0, ## __VA_ARGS__),	\
+	MACRO__(0x46A1, ## __VA_ARGS__),	\
+	MACRO__(0x46A2, ## __VA_ARGS__),	\
+	MACRO__(0x46A3, ## __VA_ARGS__),	\
+	MACRO__(0x46A6, ## __VA_ARGS__),	\
+	MACRO__(0x46A8, ## __VA_ARGS__),	\
+	MACRO__(0x46AA, ## __VA_ARGS__),	\
+	MACRO__(0x462A, ## __VA_ARGS__),	\
+	MACRO__(0x4626, ## __VA_ARGS__),	\
+	MACRO__(0x4628, ## __VA_ARGS__),	\
+	MACRO__(0x46B0, ## __VA_ARGS__),	\
+	MACRO__(0x46B1, ## __VA_ARGS__),	\
+	MACRO__(0x46B2, ## __VA_ARGS__),	\
+	MACRO__(0x46B3, ## __VA_ARGS__),	\
+	MACRO__(0x46C0, ## __VA_ARGS__),	\
+	MACRO__(0x46C1, ## __VA_ARGS__),	\
+	MACRO__(0x46C2, ## __VA_ARGS__),	\
+	MACRO__(0x46C3, ## __VA_ARGS__)
+
+/* ADL-N */
+#define XE_ADLN_IDS(MACRO__, ...)		\
+	MACRO__(0x46D0, ## __VA_ARGS__),	\
+	MACRO__(0x46D1, ## __VA_ARGS__),	\
+	MACRO__(0x46D2, ## __VA_ARGS__)
+
+/* RPL-S */
+#define XE_RPLS_IDS(MACRO__, ...)		\
+	MACRO__(0xA780, ## __VA_ARGS__),	\
+	MACRO__(0xA781, ## __VA_ARGS__),	\
+	MACRO__(0xA782, ## __VA_ARGS__),	\
+	MACRO__(0xA783, ## __VA_ARGS__),	\
+	MACRO__(0xA788, ## __VA_ARGS__),	\
+	MACRO__(0xA789, ## __VA_ARGS__),	\
+	MACRO__(0xA78A, ## __VA_ARGS__),	\
+	MACRO__(0xA78B, ## __VA_ARGS__)
+
+/* RPL-U */
+#define XE_RPLU_IDS(MACRO__, ...)		\
+	MACRO__(0xA721, ## __VA_ARGS__),	\
+	MACRO__(0xA7A1, ## __VA_ARGS__),	\
+	MACRO__(0xA7A9, ## __VA_ARGS__)
+
+/* RPL-P */
+#define XE_RPLP_IDS(MACRO__, ...)		\
+	MACRO__(0xA720, ## __VA_ARGS__),	\
+	MACRO__(0xA7A0, ## __VA_ARGS__),	\
+	MACRO__(0xA7A8, ## __VA_ARGS__)
+
+/* DG2 */
+#define XE_DG2_G10_IDS(MACRO__, ...)		\
+	MACRO__(0x5690, ## __VA_ARGS__),	\
+	MACRO__(0x5691, ## __VA_ARGS__),	\
+	MACRO__(0x5692, ## __VA_ARGS__),	\
+	MACRO__(0x56A0, ## __VA_ARGS__),	\
+	MACRO__(0x56A1, ## __VA_ARGS__),	\
+	MACRO__(0x56A2, ## __VA_ARGS__)
+
+#define XE_DG2_G11_IDS(MACRO__, ...)		\
+	MACRO__(0x5693, ## __VA_ARGS__),	\
+	MACRO__(0x5694, ## __VA_ARGS__),	\
+	MACRO__(0x5695, ## __VA_ARGS__),	\
+	MACRO__(0x5698, ## __VA_ARGS__),	\
+	MACRO__(0x56A5, ## __VA_ARGS__),	\
+	MACRO__(0x56A6, ## __VA_ARGS__),	\
+	MACRO__(0x56B0, ## __VA_ARGS__),	\
+	MACRO__(0x56B1, ## __VA_ARGS__)
+
+#define XE_DG2_G12_IDS(MACRO__, ...)		\
+	MACRO__(0x5696, ## __VA_ARGS__),	\
+	MACRO__(0x5697, ## __VA_ARGS__),	\
+	MACRO__(0x56A3, ## __VA_ARGS__),	\
+	MACRO__(0x56A4, ## __VA_ARGS__),	\
+	MACRO__(0x56B2, ## __VA_ARGS__),	\
+	MACRO__(0x56B3, ## __VA_ARGS__)
+
+#define XE_DG2_IDS(MACRO__, ...)		\
+	XE_DG2_G10_IDS(MACRO__, ## __VA_ARGS__),\
+	XE_DG2_G11_IDS(MACRO__, ## __VA_ARGS__),\
+	XE_DG2_G12_IDS(MACRO__, ## __VA_ARGS__)
+
+#define XE_ATS_M150_IDS(MACRO__, ...)		\
+	MACRO__(0x56C0, ## __VA_ARGS__)
+
+#define XE_ATS_M75_IDS(MACRO__, ...)		\
+	MACRO__(0x56C1, ## __VA_ARGS__)
+
+#define XE_ATS_M_IDS(MACRO__, ...)		\
+	XE_ATS_M150_IDS(MACRO__, ## __VA_ARGS__),\
+	XE_ATS_M75_IDS(MACRO__, ## __VA_ARGS__)
+
+/* PVC */
+#define XE_PVC_XT_IDS(MACRO__, ...)		\
+	MACRO__(0x0BD5, ## __VA_ARGS__),	\
+	MACRO__(0x0BD6, ## __VA_ARGS__),	\
+	MACRO__(0x0BD7, ## __VA_ARGS__),	\
+	MACRO__(0x0BD8, ## __VA_ARGS__),	\
+	MACRO__(0x0BD9, ## __VA_ARGS__),	\
+	MACRO__(0x0BDA, ## __VA_ARGS__),	\
+	MACRO__(0x0BDB, ## __VA_ARGS__),	\
+	MACRO__(0x0BE0, ## __VA_ARGS__),	\
+	MACRO__(0x0BE1, ## __VA_ARGS__),	\
+	MACRO__(0x0BE5, ## __VA_ARGS__)
+
+#define XE_PVC_IDS(MACRO__, ...)		\
+	XE_PVC_XT_IDS(MACRO__, ## __VA_ARGS__)
+
+/* MTL */
+#define XE_MTL_M_IDS(MACRO__, ...)		\
+	MACRO__(0x7D40, ## __VA_ARGS__),	\
+	MACRO__(0x7D43, ## __VA_ARGS__),	\
+	MACRO__(0x7DC0, ## __VA_ARGS__)
+
+#define XE_MTL_P_IDS(MACRO__, ...)		\
+	MACRO__(0x7D45, ## __VA_ARGS__),	\
+	MACRO__(0x7D47, ## __VA_ARGS__),	\
+	MACRO__(0x7D50, ## __VA_ARGS__),	\
+	MACRO__(0x7D55, ## __VA_ARGS__),	\
+	MACRO__(0x7DC5, ## __VA_ARGS__),	\
+	MACRO__(0x7DD0, ## __VA_ARGS__),	\
+	MACRO__(0x7DD5, ## __VA_ARGS__)
+
+#define XE_MTL_S_IDS(MACRO__, ...)		\
+	MACRO__(0x7D60, ## __VA_ARGS__),	\
+	MACRO__(0x7DE0, ## __VA_ARGS__)
+
+#define XE_ARL_IDS(MACRO__, ...)		\
+	MACRO__(0x7D67, ## __VA_ARGS__)
+
+#define XE_MTL_IDS(MACRO__, ...)		\
+	XE_MTL_M_IDS(MACRO__, ## __VA_ARGS__),	\
+	XE_MTL_P_IDS(MACRO__, ## __VA_ARGS__),	\
+	XE_MTL_S_IDS(MACRO__, ## __VA_ARGS__),	\
+	XE_ARL_IDS(MACRO__, ## __VA_ARGS__)
+
+#define XE_LNL_IDS(MACRO__, ...) \
+	MACRO__(0x6420, ## __VA_ARGS__), \
+	MACRO__(0x64A0, ## __VA_ARGS__), \
+	MACRO__(0x64B0, ## __VA_ARGS__)
+
+#endif
-- 
2.40.1

Re: [Intel-xe] [PATCH igt 1/4] lib: Add xe_pciids.h

[Balasubramani Vivekanandan]

On 29.08.2023 07:11, Lucas De Marchi wrote:
> With the introduction of Lunar Lake, igt won't be able to just re-use
> i915_pciids.h for both drivers anymore since the support for LNL is only
> coming with the xe module. Copy xe_pciids.h from the drm-xe-next branch
> (up to commit b9c9020fc816 ("drm/xe/pvc: Use fast copy engines as
> migrate engine on PVC") and start including it where needed. This brings
> all the LNL PCI IDs.

I couldn't find the commit hash b9c9020fc816. Is it lost due to rebase?
In that case, does it make sense to use the commit hash or just keep the
commit subject?

Regards,
Bala

> 
> Signed-off-by: Lucas De Marchi <lucas.demarchi@intel.com>
> ---
>  docs/reference/igt-gpu-tools/meson.build |   1 +
>  lib/intel_device_info.c                  |   1 +
>  lib/xe_pciids.h                          | 215 +++++++++++++++++++++++
>  3 files changed, 217 insertions(+)
>  create mode 100644 lib/xe_pciids.h
> 
> diff --git a/docs/reference/igt-gpu-tools/meson.build b/docs/reference/igt-gpu-tools/meson.build
> index 6b832ad27..513385b4b 100644
> --- a/docs/reference/igt-gpu-tools/meson.build
> +++ b/docs/reference/igt-gpu-tools/meson.build
> @@ -21,6 +21,7 @@ ignore_headers = [
>  	'media_fill_gen9.h',
>  	'gen9_render.h',
>  	'version.h',
> +	'xe_pciids.h',
>  ]
>  
>  test_groups = [
> diff --git a/lib/intel_device_info.c b/lib/intel_device_info.c
> index 2c9a45b68..5d53d2906 100644
> --- a/lib/intel_device_info.c
> +++ b/lib/intel_device_info.c
> @@ -1,6 +1,7 @@
>  #include "intel_chipset.h"
>  #include "i915_pciids.h"
>  #include "i915_pciids_local.h"
> +#include "xe_pciids.h"
>  
>  #include <strings.h> /* ffs() */
>  
> diff --git a/lib/xe_pciids.h b/lib/xe_pciids.h
> new file mode 100644
> index 000000000..29f07a00a
> --- /dev/null
> +++ b/lib/xe_pciids.h
> @@ -0,0 +1,215 @@
> +/* SPDX-License-Identifier: MIT */
> +/*
> + * Copyright © 2022 Intel Corporation
> + */
> +
> +#ifndef _XE_PCIIDS_H_
> +#define _XE_PCIIDS_H_
> +
> +/*
> + * Lists below can be turned into initializers for a struct pci_device_id
> + * by defining INTEL_VGA_DEVICE:
> + *
> + * #define INTEL_VGA_DEVICE(id, info) { \
> + *	0x8086, id,			\
> + *	~0, ~0,				\
> + *	0x030000, 0xff0000,		\
> + *	(unsigned long) info }
> + *
> + * And then calling like:
> + *
> + * XE_TGL_12_GT1_IDS(INTEL_VGA_DEVICE, ## __VA_ARGS__)
> + *
> + * To turn them into something else, just provide a different macro passed as
> + * first argument.
> + */
> +
> +/* TGL */
> +#define XE_TGL_GT1_IDS(MACRO__, ...)		\
> +	MACRO__(0x9A60, ## __VA_ARGS__),	\
> +	MACRO__(0x9A68, ## __VA_ARGS__),	\
> +	MACRO__(0x9A70, ## __VA_ARGS__)
> +
> +#define XE_TGL_GT2_IDS(MACRO__, ...)		\
> +	MACRO__(0x9A40, ## __VA_ARGS__),	\
> +	MACRO__(0x9A49, ## __VA_ARGS__),	\
> +	MACRO__(0x9A59, ## __VA_ARGS__),	\
> +	MACRO__(0x9A78, ## __VA_ARGS__),	\
> +	MACRO__(0x9AC0, ## __VA_ARGS__),	\
> +	MACRO__(0x9AC9, ## __VA_ARGS__),	\
> +	MACRO__(0x9AD9, ## __VA_ARGS__),	\
> +	MACRO__(0x9AF8, ## __VA_ARGS__)
> +
> +#define XE_TGL_IDS(MACRO__, ...)		\
> +	XE_TGL_GT1_IDS(MACRO__, ## __VA_ARGS__),\
> +	XE_TGL_GT2_IDS(MACRO__, ## __VA_ARGS__)
> +
> +/* RKL */
> +#define XE_RKL_IDS(MACRO__, ...)		\
> +	MACRO__(0x4C80, ## __VA_ARGS__),	\
> +	MACRO__(0x4C8A, ## __VA_ARGS__),	\
> +	MACRO__(0x4C8B, ## __VA_ARGS__),	\
> +	MACRO__(0x4C8C, ## __VA_ARGS__),	\
> +	MACRO__(0x4C90, ## __VA_ARGS__),	\
> +	MACRO__(0x4C9A, ## __VA_ARGS__)
> +
> +/* DG1 */
> +#define XE_DG1_IDS(MACRO__, ...)		\
> +	MACRO__(0x4905, ## __VA_ARGS__),	\
> +	MACRO__(0x4906, ## __VA_ARGS__),	\
> +	MACRO__(0x4907, ## __VA_ARGS__),	\
> +	MACRO__(0x4908, ## __VA_ARGS__),	\
> +	MACRO__(0x4909, ## __VA_ARGS__)
> +
> +/* ADL-S */
> +#define XE_ADLS_IDS(MACRO__, ...)		\
> +	MACRO__(0x4680, ## __VA_ARGS__),	\
> +	MACRO__(0x4682, ## __VA_ARGS__),	\
> +	MACRO__(0x4688, ## __VA_ARGS__),	\
> +	MACRO__(0x468A, ## __VA_ARGS__),	\
> +	MACRO__(0x4690, ## __VA_ARGS__),	\
> +	MACRO__(0x4692, ## __VA_ARGS__),	\
> +	MACRO__(0x4693, ## __VA_ARGS__)
> +
> +/* ADL-P */
> +#define XE_ADLP_IDS(MACRO__, ...)		\
> +	MACRO__(0x46A0, ## __VA_ARGS__),	\
> +	MACRO__(0x46A1, ## __VA_ARGS__),	\
> +	MACRO__(0x46A2, ## __VA_ARGS__),	\
> +	MACRO__(0x46A3, ## __VA_ARGS__),	\
> +	MACRO__(0x46A6, ## __VA_ARGS__),	\
> +	MACRO__(0x46A8, ## __VA_ARGS__),	\
> +	MACRO__(0x46AA, ## __VA_ARGS__),	\
> +	MACRO__(0x462A, ## __VA_ARGS__),	\
> +	MACRO__(0x4626, ## __VA_ARGS__),	\
> +	MACRO__(0x4628, ## __VA_ARGS__),	\
> +	MACRO__(0x46B0, ## __VA_ARGS__),	\
> +	MACRO__(0x46B1, ## __VA_ARGS__),	\
> +	MACRO__(0x46B2, ## __VA_ARGS__),	\
> +	MACRO__(0x46B3, ## __VA_ARGS__),	\
> +	MACRO__(0x46C0, ## __VA_ARGS__),	\
> +	MACRO__(0x46C1, ## __VA_ARGS__),	\
> +	MACRO__(0x46C2, ## __VA_ARGS__),	\
> +	MACRO__(0x46C3, ## __VA_ARGS__)
> +
> +/* ADL-N */
> +#define XE_ADLN_IDS(MACRO__, ...)		\
> +	MACRO__(0x46D0, ## __VA_ARGS__),	\
> +	MACRO__(0x46D1, ## __VA_ARGS__),	\
> +	MACRO__(0x46D2, ## __VA_ARGS__)
> +
> +/* RPL-S */
> +#define XE_RPLS_IDS(MACRO__, ...)		\
> +	MACRO__(0xA780, ## __VA_ARGS__),	\
> +	MACRO__(0xA781, ## __VA_ARGS__),	\
> +	MACRO__(0xA782, ## __VA_ARGS__),	\
> +	MACRO__(0xA783, ## __VA_ARGS__),	\
> +	MACRO__(0xA788, ## __VA_ARGS__),	\
> +	MACRO__(0xA789, ## __VA_ARGS__),	\
> +	MACRO__(0xA78A, ## __VA_ARGS__),	\
> +	MACRO__(0xA78B, ## __VA_ARGS__)
> +
> +/* RPL-U */
> +#define XE_RPLU_IDS(MACRO__, ...)		\
> +	MACRO__(0xA721, ## __VA_ARGS__),	\
> +	MACRO__(0xA7A1, ## __VA_ARGS__),	\
> +	MACRO__(0xA7A9, ## __VA_ARGS__)
> +
> +/* RPL-P */
> +#define XE_RPLP_IDS(MACRO__, ...)		\
> +	MACRO__(0xA720, ## __VA_ARGS__),	\
> +	MACRO__(0xA7A0, ## __VA_ARGS__),	\
> +	MACRO__(0xA7A8, ## __VA_ARGS__)
> +
> +/* DG2 */
> +#define XE_DG2_G10_IDS(MACRO__, ...)		\
> +	MACRO__(0x5690, ## __VA_ARGS__),	\
> +	MACRO__(0x5691, ## __VA_ARGS__),	\
> +	MACRO__(0x5692, ## __VA_ARGS__),	\
> +	MACRO__(0x56A0, ## __VA_ARGS__),	\
> +	MACRO__(0x56A1, ## __VA_ARGS__),	\
> +	MACRO__(0x56A2, ## __VA_ARGS__)
> +
> +#define XE_DG2_G11_IDS(MACRO__, ...)		\
> +	MACRO__(0x5693, ## __VA_ARGS__),	\
> +	MACRO__(0x5694, ## __VA_ARGS__),	\
> +	MACRO__(0x5695, ## __VA_ARGS__),	\
> +	MACRO__(0x5698, ## __VA_ARGS__),	\
> +	MACRO__(0x56A5, ## __VA_ARGS__),	\
> +	MACRO__(0x56A6, ## __VA_ARGS__),	\
> +	MACRO__(0x56B0, ## __VA_ARGS__),	\
> +	MACRO__(0x56B1, ## __VA_ARGS__)
> +
> +#define XE_DG2_G12_IDS(MACRO__, ...)		\
> +	MACRO__(0x5696, ## __VA_ARGS__),	\
> +	MACRO__(0x5697, ## __VA_ARGS__),	\
> +	MACRO__(0x56A3, ## __VA_ARGS__),	\
> +	MACRO__(0x56A4, ## __VA_ARGS__),	\
> +	MACRO__(0x56B2, ## __VA_ARGS__),	\
> +	MACRO__(0x56B3, ## __VA_ARGS__)
> +
> +#define XE_DG2_IDS(MACRO__, ...)		\
> +	XE_DG2_G10_IDS(MACRO__, ## __VA_ARGS__),\
> +	XE_DG2_G11_IDS(MACRO__, ## __VA_ARGS__),\
> +	XE_DG2_G12_IDS(MACRO__, ## __VA_ARGS__)
> +
> +#define XE_ATS_M150_IDS(MACRO__, ...)		\
> +	MACRO__(0x56C0, ## __VA_ARGS__)
> +
> +#define XE_ATS_M75_IDS(MACRO__, ...)		\
> +	MACRO__(0x56C1, ## __VA_ARGS__)
> +
> +#define XE_ATS_M_IDS(MACRO__, ...)		\
> +	XE_ATS_M150_IDS(MACRO__, ## __VA_ARGS__),\
> +	XE_ATS_M75_IDS(MACRO__, ## __VA_ARGS__)
> +
> +/* PVC */
> +#define XE_PVC_XT_IDS(MACRO__, ...)		\
> +	MACRO__(0x0BD5, ## __VA_ARGS__),	\
> +	MACRO__(0x0BD6, ## __VA_ARGS__),	\
> +	MACRO__(0x0BD7, ## __VA_ARGS__),	\
> +	MACRO__(0x0BD8, ## __VA_ARGS__),	\
> +	MACRO__(0x0BD9, ## __VA_ARGS__),	\
> +	MACRO__(0x0BDA, ## __VA_ARGS__),	\
> +	MACRO__(0x0BDB, ## __VA_ARGS__),	\
> +	MACRO__(0x0BE0, ## __VA_ARGS__),	\
> +	MACRO__(0x0BE1, ## __VA_ARGS__),	\
> +	MACRO__(0x0BE5, ## __VA_ARGS__)
> +
> +#define XE_PVC_IDS(MACRO__, ...)		\
> +	XE_PVC_XT_IDS(MACRO__, ## __VA_ARGS__)
> +
> +/* MTL */
> +#define XE_MTL_M_IDS(MACRO__, ...)		\
> +	MACRO__(0x7D40, ## __VA_ARGS__),	\
> +	MACRO__(0x7D43, ## __VA_ARGS__),	\
> +	MACRO__(0x7DC0, ## __VA_ARGS__)
> +
> +#define XE_MTL_P_IDS(MACRO__, ...)		\
> +	MACRO__(0x7D45, ## __VA_ARGS__),	\
> +	MACRO__(0x7D47, ## __VA_ARGS__),	\
> +	MACRO__(0x7D50, ## __VA_ARGS__),	\
> +	MACRO__(0x7D55, ## __VA_ARGS__),	\
> +	MACRO__(0x7DC5, ## __VA_ARGS__),	\
> +	MACRO__(0x7DD0, ## __VA_ARGS__),	\
> +	MACRO__(0x7DD5, ## __VA_ARGS__)
> +
> +#define XE_MTL_S_IDS(MACRO__, ...)		\
> +	MACRO__(0x7D60, ## __VA_ARGS__),	\
> +	MACRO__(0x7DE0, ## __VA_ARGS__)
> +
> +#define XE_ARL_IDS(MACRO__, ...)		\
> +	MACRO__(0x7D67, ## __VA_ARGS__)
> +
> +#define XE_MTL_IDS(MACRO__, ...)		\
> +	XE_MTL_M_IDS(MACRO__, ## __VA_ARGS__),	\
> +	XE_MTL_P_IDS(MACRO__, ## __VA_ARGS__),	\
> +	XE_MTL_S_IDS(MACRO__, ## __VA_ARGS__),	\
> +	XE_ARL_IDS(MACRO__, ## __VA_ARGS__)
> +
> +#define XE_LNL_IDS(MACRO__, ...) \
> +	MACRO__(0x6420, ## __VA_ARGS__), \
> +	MACRO__(0x64A0, ## __VA_ARGS__), \
> +	MACRO__(0x64B0, ## __VA_ARGS__)
> +
> +#endif
> -- 
> 2.40.1
> 

Re: [Intel-xe] [PATCH igt 1/4] lib: Add xe_pciids.h

[Balasubramani Vivekanandan]

On 31.08.2023 11:58, Balasubramani Vivekanandan wrote:
> On 29.08.2023 07:11, Lucas De Marchi wrote:
> > With the introduction of Lunar Lake, igt won't be able to just re-use
> > i915_pciids.h for both drivers anymore since the support for LNL is only
> > coming with the xe module. Copy xe_pciids.h from the drm-xe-next branch
> > (up to commit b9c9020fc816 ("drm/xe/pvc: Use fast copy engines as
> > migrate engine on PVC") and start including it where needed. This brings
> > all the LNL PCI IDs.
> 
> I couldn't find the commit hash b9c9020fc816. Is it lost due to rebase?
> In that case, does it make sense to use the commit hash or just keep the
> commit subject?
> 
> Regards,
> Bala

Apart from that.

Reviewed-by: Balasubramani Vivekanandan <balasubramani.vivekanandan@intel.com>

Regards,
Bala

> 
> > 
> > Signed-off-by: Lucas De Marchi <lucas.demarchi@intel.com>
> > ---
> >  docs/reference/igt-gpu-tools/meson.build |   1 +
> >  lib/intel_device_info.c                  |   1 +
> >  lib/xe_pciids.h                          | 215 +++++++++++++++++++++++
> >  3 files changed, 217 insertions(+)
> >  create mode 100644 lib/xe_pciids.h
> > 
> > diff --git a/docs/reference/igt-gpu-tools/meson.build b/docs/reference/igt-gpu-tools/meson.build
> > index 6b832ad27..513385b4b 100644
> > --- a/docs/reference/igt-gpu-tools/meson.build
> > +++ b/docs/reference/igt-gpu-tools/meson.build
> > @@ -21,6 +21,7 @@ ignore_headers = [
> >  	'media_fill_gen9.h',
> >  	'gen9_render.h',
> >  	'version.h',
> > +	'xe_pciids.h',
> >  ]
> >  
> >  test_groups = [
> > diff --git a/lib/intel_device_info.c b/lib/intel_device_info.c
> > index 2c9a45b68..5d53d2906 100644
> > --- a/lib/intel_device_info.c
> > +++ b/lib/intel_device_info.c
> > @@ -1,6 +1,7 @@
> >  #include "intel_chipset.h"
> >  #include "i915_pciids.h"
> >  #include "i915_pciids_local.h"
> > +#include "xe_pciids.h"
> >  
> >  #include <strings.h> /* ffs() */
> >  
> > diff --git a/lib/xe_pciids.h b/lib/xe_pciids.h
> > new file mode 100644
> > index 000000000..29f07a00a
> > --- /dev/null
> > +++ b/lib/xe_pciids.h
> > @@ -0,0 +1,215 @@
> > +/* SPDX-License-Identifier: MIT */
> > +/*
> > + * Copyright © 2022 Intel Corporation
> > + */
> > +
> > +#ifndef _XE_PCIIDS_H_
> > +#define _XE_PCIIDS_H_
> > +
> > +/*
> > + * Lists below can be turned into initializers for a struct pci_device_id
> > + * by defining INTEL_VGA_DEVICE:
> > + *
> > + * #define INTEL_VGA_DEVICE(id, info) { \
> > + *	0x8086, id,			\
> > + *	~0, ~0,				\
> > + *	0x030000, 0xff0000,		\
> > + *	(unsigned long) info }
> > + *
> > + * And then calling like:
> > + *
> > + * XE_TGL_12_GT1_IDS(INTEL_VGA_DEVICE, ## __VA_ARGS__)
> > + *
> > + * To turn them into something else, just provide a different macro passed as
> > + * first argument.
> > + */
> > +
> > +/* TGL */
> > +#define XE_TGL_GT1_IDS(MACRO__, ...)		\
> > +	MACRO__(0x9A60, ## __VA_ARGS__),	\
> > +	MACRO__(0x9A68, ## __VA_ARGS__),	\
> > +	MACRO__(0x9A70, ## __VA_ARGS__)
> > +
> > +#define XE_TGL_GT2_IDS(MACRO__, ...)		\
> > +	MACRO__(0x9A40, ## __VA_ARGS__),	\
> > +	MACRO__(0x9A49, ## __VA_ARGS__),	\
> > +	MACRO__(0x9A59, ## __VA_ARGS__),	\
> > +	MACRO__(0x9A78, ## __VA_ARGS__),	\
> > +	MACRO__(0x9AC0, ## __VA_ARGS__),	\
> > +	MACRO__(0x9AC9, ## __VA_ARGS__),	\
> > +	MACRO__(0x9AD9, ## __VA_ARGS__),	\
> > +	MACRO__(0x9AF8, ## __VA_ARGS__)
> > +
> > +#define XE_TGL_IDS(MACRO__, ...)		\
> > +	XE_TGL_GT1_IDS(MACRO__, ## __VA_ARGS__),\
> > +	XE_TGL_GT2_IDS(MACRO__, ## __VA_ARGS__)
> > +
> > +/* RKL */
> > +#define XE_RKL_IDS(MACRO__, ...)		\
> > +	MACRO__(0x4C80, ## __VA_ARGS__),	\
> > +	MACRO__(0x4C8A, ## __VA_ARGS__),	\
> > +	MACRO__(0x4C8B, ## __VA_ARGS__),	\
> > +	MACRO__(0x4C8C, ## __VA_ARGS__),	\
> > +	MACRO__(0x4C90, ## __VA_ARGS__),	\
> > +	MACRO__(0x4C9A, ## __VA_ARGS__)
> > +
> > +/* DG1 */
> > +#define XE_DG1_IDS(MACRO__, ...)		\
> > +	MACRO__(0x4905, ## __VA_ARGS__),	\
> > +	MACRO__(0x4906, ## __VA_ARGS__),	\
> > +	MACRO__(0x4907, ## __VA_ARGS__),	\
> > +	MACRO__(0x4908, ## __VA_ARGS__),	\
> > +	MACRO__(0x4909, ## __VA_ARGS__)
> > +
> > +/* ADL-S */
> > +#define XE_ADLS_IDS(MACRO__, ...)		\
> > +	MACRO__(0x4680, ## __VA_ARGS__),	\
> > +	MACRO__(0x4682, ## __VA_ARGS__),	\
> > +	MACRO__(0x4688, ## __VA_ARGS__),	\
> > +	MACRO__(0x468A, ## __VA_ARGS__),	\
> > +	MACRO__(0x4690, ## __VA_ARGS__),	\
> > +	MACRO__(0x4692, ## __VA_ARGS__),	\
> > +	MACRO__(0x4693, ## __VA_ARGS__)
> > +
> > +/* ADL-P */
> > +#define XE_ADLP_IDS(MACRO__, ...)		\
> > +	MACRO__(0x46A0, ## __VA_ARGS__),	\
> > +	MACRO__(0x46A1, ## __VA_ARGS__),	\
> > +	MACRO__(0x46A2, ## __VA_ARGS__),	\
> > +	MACRO__(0x46A3, ## __VA_ARGS__),	\
> > +	MACRO__(0x46A6, ## __VA_ARGS__),	\
> > +	MACRO__(0x46A8, ## __VA_ARGS__),	\
> > +	MACRO__(0x46AA, ## __VA_ARGS__),	\
> > +	MACRO__(0x462A, ## __VA_ARGS__),	\
> > +	MACRO__(0x4626, ## __VA_ARGS__),	\
> > +	MACRO__(0x4628, ## __VA_ARGS__),	\
> > +	MACRO__(0x46B0, ## __VA_ARGS__),	\
> > +	MACRO__(0x46B1, ## __VA_ARGS__),	\
> > +	MACRO__(0x46B2, ## __VA_ARGS__),	\
> > +	MACRO__(0x46B3, ## __VA_ARGS__),	\
> > +	MACRO__(0x46C0, ## __VA_ARGS__),	\
> > +	MACRO__(0x46C1, ## __VA_ARGS__),	\
> > +	MACRO__(0x46C2, ## __VA_ARGS__),	\
> > +	MACRO__(0x46C3, ## __VA_ARGS__)
> > +
> > +/* ADL-N */
> > +#define XE_ADLN_IDS(MACRO__, ...)		\
> > +	MACRO__(0x46D0, ## __VA_ARGS__),	\
> > +	MACRO__(0x46D1, ## __VA_ARGS__),	\
> > +	MACRO__(0x46D2, ## __VA_ARGS__)
> > +
> > +/* RPL-S */
> > +#define XE_RPLS_IDS(MACRO__, ...)		\
> > +	MACRO__(0xA780, ## __VA_ARGS__),	\
> > +	MACRO__(0xA781, ## __VA_ARGS__),	\
> > +	MACRO__(0xA782, ## __VA_ARGS__),	\
> > +	MACRO__(0xA783, ## __VA_ARGS__),	\
> > +	MACRO__(0xA788, ## __VA_ARGS__),	\
> > +	MACRO__(0xA789, ## __VA_ARGS__),	\
> > +	MACRO__(0xA78A, ## __VA_ARGS__),	\
> > +	MACRO__(0xA78B, ## __VA_ARGS__)
> > +
> > +/* RPL-U */
> > +#define XE_RPLU_IDS(MACRO__, ...)		\
> > +	MACRO__(0xA721, ## __VA_ARGS__),	\
> > +	MACRO__(0xA7A1, ## __VA_ARGS__),	\
> > +	MACRO__(0xA7A9, ## __VA_ARGS__)
> > +
> > +/* RPL-P */
> > +#define XE_RPLP_IDS(MACRO__, ...)		\
> > +	MACRO__(0xA720, ## __VA_ARGS__),	\
> > +	MACRO__(0xA7A0, ## __VA_ARGS__),	\
> > +	MACRO__(0xA7A8, ## __VA_ARGS__)
> > +
> > +/* DG2 */
> > +#define XE_DG2_G10_IDS(MACRO__, ...)		\
> > +	MACRO__(0x5690, ## __VA_ARGS__),	\
> > +	MACRO__(0x5691, ## __VA_ARGS__),	\
> > +	MACRO__(0x5692, ## __VA_ARGS__),	\
> > +	MACRO__(0x56A0, ## __VA_ARGS__),	\
> > +	MACRO__(0x56A1, ## __VA_ARGS__),	\
> > +	MACRO__(0x56A2, ## __VA_ARGS__)
> > +
> > +#define XE_DG2_G11_IDS(MACRO__, ...)		\
> > +	MACRO__(0x5693, ## __VA_ARGS__),	\
> > +	MACRO__(0x5694, ## __VA_ARGS__),	\
> > +	MACRO__(0x5695, ## __VA_ARGS__),	\
> > +	MACRO__(0x5698, ## __VA_ARGS__),	\
> > +	MACRO__(0x56A5, ## __VA_ARGS__),	\
> > +	MACRO__(0x56A6, ## __VA_ARGS__),	\
> > +	MACRO__(0x56B0, ## __VA_ARGS__),	\
> > +	MACRO__(0x56B1, ## __VA_ARGS__)
> > +
> > +#define XE_DG2_G12_IDS(MACRO__, ...)		\
> > +	MACRO__(0x5696, ## __VA_ARGS__),	\
> > +	MACRO__(0x5697, ## __VA_ARGS__),	\
> > +	MACRO__(0x56A3, ## __VA_ARGS__),	\
> > +	MACRO__(0x56A4, ## __VA_ARGS__),	\
> > +	MACRO__(0x56B2, ## __VA_ARGS__),	\
> > +	MACRO__(0x56B3, ## __VA_ARGS__)
> > +
> > +#define XE_DG2_IDS(MACRO__, ...)		\
> > +	XE_DG2_G10_IDS(MACRO__, ## __VA_ARGS__),\
> > +	XE_DG2_G11_IDS(MACRO__, ## __VA_ARGS__),\
> > +	XE_DG2_G12_IDS(MACRO__, ## __VA_ARGS__)
> > +
> > +#define XE_ATS_M150_IDS(MACRO__, ...)		\
> > +	MACRO__(0x56C0, ## __VA_ARGS__)
> > +
> > +#define XE_ATS_M75_IDS(MACRO__, ...)		\
> > +	MACRO__(0x56C1, ## __VA_ARGS__)
> > +
> > +#define XE_ATS_M_IDS(MACRO__, ...)		\
> > +	XE_ATS_M150_IDS(MACRO__, ## __VA_ARGS__),\
> > +	XE_ATS_M75_IDS(MACRO__, ## __VA_ARGS__)
> > +
> > +/* PVC */
> > +#define XE_PVC_XT_IDS(MACRO__, ...)		\
> > +	MACRO__(0x0BD5, ## __VA_ARGS__),	\
> > +	MACRO__(0x0BD6, ## __VA_ARGS__),	\
> > +	MACRO__(0x0BD7, ## __VA_ARGS__),	\
> > +	MACRO__(0x0BD8, ## __VA_ARGS__),	\
> > +	MACRO__(0x0BD9, ## __VA_ARGS__),	\
> > +	MACRO__(0x0BDA, ## __VA_ARGS__),	\
> > +	MACRO__(0x0BDB, ## __VA_ARGS__),	\
> > +	MACRO__(0x0BE0, ## __VA_ARGS__),	\
> > +	MACRO__(0x0BE1, ## __VA_ARGS__),	\
> > +	MACRO__(0x0BE5, ## __VA_ARGS__)
> > +
> > +#define XE_PVC_IDS(MACRO__, ...)		\
> > +	XE_PVC_XT_IDS(MACRO__, ## __VA_ARGS__)
> > +
> > +/* MTL */
> > +#define XE_MTL_M_IDS(MACRO__, ...)		\
> > +	MACRO__(0x7D40, ## __VA_ARGS__),	\
> > +	MACRO__(0x7D43, ## __VA_ARGS__),	\
> > +	MACRO__(0x7DC0, ## __VA_ARGS__)
> > +
> > +#define XE_MTL_P_IDS(MACRO__, ...)		\
> > +	MACRO__(0x7D45, ## __VA_ARGS__),	\
> > +	MACRO__(0x7D47, ## __VA_ARGS__),	\
> > +	MACRO__(0x7D50, ## __VA_ARGS__),	\
> > +	MACRO__(0x7D55, ## __VA_ARGS__),	\
> > +	MACRO__(0x7DC5, ## __VA_ARGS__),	\
> > +	MACRO__(0x7DD0, ## __VA_ARGS__),	\
> > +	MACRO__(0x7DD5, ## __VA_ARGS__)
> > +
> > +#define XE_MTL_S_IDS(MACRO__, ...)		\
> > +	MACRO__(0x7D60, ## __VA_ARGS__),	\
> > +	MACRO__(0x7DE0, ## __VA_ARGS__)
> > +
> > +#define XE_ARL_IDS(MACRO__, ...)		\
> > +	MACRO__(0x7D67, ## __VA_ARGS__)
> > +
> > +#define XE_MTL_IDS(MACRO__, ...)		\
> > +	XE_MTL_M_IDS(MACRO__, ## __VA_ARGS__),	\
> > +	XE_MTL_P_IDS(MACRO__, ## __VA_ARGS__),	\
> > +	XE_MTL_S_IDS(MACRO__, ## __VA_ARGS__),	\
> > +	XE_ARL_IDS(MACRO__, ## __VA_ARGS__)
> > +
> > +#define XE_LNL_IDS(MACRO__, ...) \
> > +	MACRO__(0x6420, ## __VA_ARGS__), \
> > +	MACRO__(0x64A0, ## __VA_ARGS__), \
> > +	MACRO__(0x64B0, ## __VA_ARGS__)
> > +
> > +#endif
> > -- 
> > 2.40.1
> > 

Re: [Intel-xe] [PATCH igt 1/4] lib: Add xe_pciids.h

[Lucas De Marchi]

+Rodrigo

On Thu, Aug 31, 2023 at 11:58:23AM +0530, Balasubramani Vivekanandan wrote:
>On 29.08.2023 07:11, Lucas De Marchi wrote:
>> With the introduction of Lunar Lake, igt won't be able to just re-use
>> i915_pciids.h for both drivers anymore since the support for LNL is only
>> coming with the xe module. Copy xe_pciids.h from the drm-xe-next branch
>> (up to commit b9c9020fc816 ("drm/xe/pvc: Use fast copy engines as
>> migrate engine on PVC") and start including it where needed. This brings
>> all the LNL PCI IDs.
>
>I couldn't find the commit hash b9c9020fc816. Is it lost due to rebase?
>In that case, does it make sense to use the commit hash or just keep the
>commit subject?

Rodrigo, did you tag the branch before force pushing? If so, can you
push a tag like the archive/* ones? This would allow people to see the
commit referenced, even if later we force push the branch.


Lucas De Marchi

Re: [Intel-xe] [PATCH igt 1/4] lib: Add xe_pciids.h

[Vivi, Rodrigo]

On Fri, 2023-09-01 at 02:21 -0700, Lucas De Marchi wrote:
> +Rodrigo
> 
> On Thu, Aug 31, 2023 at 11:58:23AM +0530, Balasubramani Vivekanandan
> wrote:
> > On 29.08.2023 07:11, Lucas De Marchi wrote:
> > > With the introduction of Lunar Lake, igt won't be able to just
> > > re-use
> > > i915_pciids.h for both drivers anymore since the support for LNL
> > > is only
> > > coming with the xe module. Copy xe_pciids.h from the drm-xe-next
> > > branch
> > > (up to commit b9c9020fc816 ("drm/xe/pvc: Use fast copy engines as
> > > migrate engine on PVC") and start including it where needed. This
> > > brings
> > > all the LNL PCI IDs.
> > 
> > I couldn't find the commit hash b9c9020fc816. Is it lost due to
> > rebase?
> > In that case, does it make sense to use the commit hash or just
> > keep the
> > commit subject?
> 
> Rodrigo, did you tag the branch before force pushing? If so, can you
> push a tag like the archive/* ones? This would allow people to see
> the
> commit referenced, even if later we force push the branch.

ops, sorry for that. 
The tag is there now:

drm-xe-next-2023-08-29

btw, I noticed we are using 2 different styles, should we always add
'archive/' or should we drop that?

Is there any tag that is not an archive?

> 
> 
> Lucas De Marchi

[Intel-xe] [PATCH igt 2/4] lib/intel_chipset: Add Lunar Lake support

[Lucas De Marchi]

Add basic definition for the Lunar Lake platform. This uses the PCI ID
from the xe_pciids.h which has a macro in a slighlty different form.

Going forward we could also trim down a little bit the the info struct
like was done in the kernel, relying on gmdid and IP version checks.
This is left for later.

Cc: Swati Sharma <swati2.sharma@intel.com>
Signed-off-by: Lucas De Marchi <lucas.demarchi@intel.com>
---
 lib/intel_chipset.h     |  5 +++++
 lib/intel_device_info.c | 12 ++++++++++++
 2 files changed, 17 insertions(+)

diff --git a/lib/intel_chipset.h b/lib/intel_chipset.h
index 84cf1799e..52b15ccea 100644
--- a/lib/intel_chipset.h
+++ b/lib/intel_chipset.h
@@ -46,6 +46,7 @@ struct intel_device_info {
 	bool has_4tile : 1;
 	bool has_flatccs : 1;
 	bool has_oam : 1;
+	bool has_gmdid : 1;
 	bool is_mobile : 1;
 	bool is_whitney : 1;
 	bool is_almador : 1;
@@ -90,6 +91,7 @@ struct intel_device_info {
 	bool is_alderlake_n : 1;
 	bool is_meteorlake : 1;
 	bool is_pontevecchio : 1;
+	bool is_lunarlake : 1;
 	const struct intel_cmds_info *cmds_info;
 	const char *codename;
 };
@@ -203,6 +205,7 @@ void intel_check_pch(void);
 #define IS_ALDERLAKE_N(devid)	(intel_get_device_info(devid)->is_alderlake_n)
 #define IS_METEORLAKE(devid)	(intel_get_device_info(devid)->is_meteorlake)
 #define IS_PONTEVECCHIO(devid)	(intel_get_device_info(devid)->is_pontevecchio)
+#define IS_LUNARLAKE(devid)	(intel_get_device_info(devid)->is_lunarlake)
 
 #define IS_GEN(devid, x)	(intel_get_device_info(devid)->graphics_ver == x)
 #define AT_LEAST_GEN(devid, x)	(intel_get_device_info(devid)->graphics_ver >= x)
@@ -236,4 +239,6 @@ void intel_check_pch(void);
 
 #define HAS_OAM(devid)		(intel_get_device_info(devid)->has_oam)
 
+#define HAS_GMDID(devid)	(intel_get_device_info(devid)->has_gmdid)
+
 #endif /* _INTEL_CHIPSET_H */
diff --git a/lib/intel_device_info.c b/lib/intel_device_info.c
index 5d53d2906..86a8b3650 100644
--- a/lib/intel_device_info.c
+++ b/lib/intel_device_info.c
@@ -504,6 +504,16 @@ static const struct intel_device_info intel_pontevecchio_info = {
 	.cmds_info = &gen12_pvc_cmds_info,
 };
 
+static const struct intel_device_info intel_lunarlake_info = {
+	.graphics_ver = 20,
+	.graphics_rel = 4,
+	.display_ver = 20,
+	.has_4tile = true,
+	.has_gmdid = true,
+	.is_lunarlake = true,
+	.codename = "lunarlake"
+};
+
 static const struct pci_id_match intel_device_match[] = {
 	INTEL_I810_IDS(&intel_i810_info),
 	INTEL_I815_IDS(&intel_i815_info),
@@ -607,6 +617,8 @@ static const struct pci_id_match intel_device_match[] = {
 
 	INTEL_PVC_IDS(&intel_pontevecchio_info),
 
+	XE_LNL_IDS(INTEL_VGA_DEVICE, &intel_lunarlake_info),
+
 	INTEL_VGA_DEVICE(PCI_MATCH_ANY, &intel_generic_info),
 };
 
-- 
2.40.1

Re: [Intel-xe] [PATCH igt 2/4] lib/intel_chipset: Add Lunar Lake support

[Balasubramani Vivekanandan]

On 29.08.2023 07:11, Lucas De Marchi wrote:
> Add basic definition for the Lunar Lake platform. This uses the PCI ID
> from the xe_pciids.h which has a macro in a slighlty different form.
> 
> Going forward we could also trim down a little bit the the info struct
> like was done in the kernel, relying on gmdid and IP version checks.
> This is left for later.
> 
> Cc: Swati Sharma <swati2.sharma@intel.com>
> Signed-off-by: Lucas De Marchi <lucas.demarchi@intel.com>
> ---
>  lib/intel_chipset.h     |  5 +++++
>  lib/intel_device_info.c | 12 ++++++++++++
>  2 files changed, 17 insertions(+)
> 
> diff --git a/lib/intel_chipset.h b/lib/intel_chipset.h
> index 84cf1799e..52b15ccea 100644
> --- a/lib/intel_chipset.h
> +++ b/lib/intel_chipset.h
> @@ -46,6 +46,7 @@ struct intel_device_info {
>  	bool has_4tile : 1;
>  	bool has_flatccs : 1;
>  	bool has_oam : 1;
> +	bool has_gmdid : 1;
>  	bool is_mobile : 1;
>  	bool is_whitney : 1;
>  	bool is_almador : 1;
> @@ -90,6 +91,7 @@ struct intel_device_info {
>  	bool is_alderlake_n : 1;
>  	bool is_meteorlake : 1;
>  	bool is_pontevecchio : 1;
> +	bool is_lunarlake : 1;
>  	const struct intel_cmds_info *cmds_info;
>  	const char *codename;
>  };
> @@ -203,6 +205,7 @@ void intel_check_pch(void);
>  #define IS_ALDERLAKE_N(devid)	(intel_get_device_info(devid)->is_alderlake_n)
>  #define IS_METEORLAKE(devid)	(intel_get_device_info(devid)->is_meteorlake)
>  #define IS_PONTEVECCHIO(devid)	(intel_get_device_info(devid)->is_pontevecchio)
> +#define IS_LUNARLAKE(devid)	(intel_get_device_info(devid)->is_lunarlake)
>  
>  #define IS_GEN(devid, x)	(intel_get_device_info(devid)->graphics_ver == x)
>  #define AT_LEAST_GEN(devid, x)	(intel_get_device_info(devid)->graphics_ver >= x)
> @@ -236,4 +239,6 @@ void intel_check_pch(void);
>  
>  #define HAS_OAM(devid)		(intel_get_device_info(devid)->has_oam)
>  
> +#define HAS_GMDID(devid)	(intel_get_device_info(devid)->has_gmdid)
> +
>  #endif /* _INTEL_CHIPSET_H */
> diff --git a/lib/intel_device_info.c b/lib/intel_device_info.c
> index 5d53d2906..86a8b3650 100644
> --- a/lib/intel_device_info.c
> +++ b/lib/intel_device_info.c
> @@ -504,6 +504,16 @@ static const struct intel_device_info intel_pontevecchio_info = {
>  	.cmds_info = &gen12_pvc_cmds_info,
>  };
>  
> +static const struct intel_device_info intel_lunarlake_info = {
> +	.graphics_ver = 20,
> +	.graphics_rel = 4,
> +	.display_ver = 20,
> +	.has_4tile = true,
> +	.has_gmdid = true,

has_gmdid should be set true even for Meteorlake. If not in this patch,
in a follow up.

Regards,
Bala

> +	.is_lunarlake = true,
> +	.codename = "lunarlake"
> +};
> +
>  static const struct pci_id_match intel_device_match[] = {
>  	INTEL_I810_IDS(&intel_i810_info),
>  	INTEL_I815_IDS(&intel_i815_info),
> @@ -607,6 +617,8 @@ static const struct pci_id_match intel_device_match[] = {
>  
>  	INTEL_PVC_IDS(&intel_pontevecchio_info),
>  
> +	XE_LNL_IDS(INTEL_VGA_DEVICE, &intel_lunarlake_info),
> +
>  	INTEL_VGA_DEVICE(PCI_MATCH_ANY, &intel_generic_info),
>  };
>  
> -- 
> 2.40.1
> 

Re: [Intel-xe] [PATCH igt 2/4] lib/intel_chipset: Add Lunar Lake support

[Balasubramani Vivekanandan]

On 31.08.2023 12:18, Balasubramani Vivekanandan wrote:
> On 29.08.2023 07:11, Lucas De Marchi wrote:
> > Add basic definition for the Lunar Lake platform. This uses the PCI ID
> > from the xe_pciids.h which has a macro in a slighlty different form.
> > 
> > Going forward we could also trim down a little bit the the info struct
> > like was done in the kernel, relying on gmdid and IP version checks.
> > This is left for later.
> > 
> > Cc: Swati Sharma <swati2.sharma@intel.com>
> > Signed-off-by: Lucas De Marchi <lucas.demarchi@intel.com>
> > ---
> >  lib/intel_chipset.h     |  5 +++++
> >  lib/intel_device_info.c | 12 ++++++++++++
> >  2 files changed, 17 insertions(+)
> > 
> > diff --git a/lib/intel_chipset.h b/lib/intel_chipset.h
> > index 84cf1799e..52b15ccea 100644
> > --- a/lib/intel_chipset.h
> > +++ b/lib/intel_chipset.h
> > @@ -46,6 +46,7 @@ struct intel_device_info {
> >  	bool has_4tile : 1;
> >  	bool has_flatccs : 1;
> >  	bool has_oam : 1;
> > +	bool has_gmdid : 1;
> >  	bool is_mobile : 1;
> >  	bool is_whitney : 1;
> >  	bool is_almador : 1;
> > @@ -90,6 +91,7 @@ struct intel_device_info {
> >  	bool is_alderlake_n : 1;
> >  	bool is_meteorlake : 1;
> >  	bool is_pontevecchio : 1;
> > +	bool is_lunarlake : 1;
> >  	const struct intel_cmds_info *cmds_info;
> >  	const char *codename;
> >  };
> > @@ -203,6 +205,7 @@ void intel_check_pch(void);
> >  #define IS_ALDERLAKE_N(devid)	(intel_get_device_info(devid)->is_alderlake_n)
> >  #define IS_METEORLAKE(devid)	(intel_get_device_info(devid)->is_meteorlake)
> >  #define IS_PONTEVECCHIO(devid)	(intel_get_device_info(devid)->is_pontevecchio)
> > +#define IS_LUNARLAKE(devid)	(intel_get_device_info(devid)->is_lunarlake)
> >  
> >  #define IS_GEN(devid, x)	(intel_get_device_info(devid)->graphics_ver == x)
> >  #define AT_LEAST_GEN(devid, x)	(intel_get_device_info(devid)->graphics_ver >= x)
> > @@ -236,4 +239,6 @@ void intel_check_pch(void);
> >  
> >  #define HAS_OAM(devid)		(intel_get_device_info(devid)->has_oam)
> >  
> > +#define HAS_GMDID(devid)	(intel_get_device_info(devid)->has_gmdid)
> > +
> >  #endif /* _INTEL_CHIPSET_H */
> > diff --git a/lib/intel_device_info.c b/lib/intel_device_info.c
> > index 5d53d2906..86a8b3650 100644
> > --- a/lib/intel_device_info.c
> > +++ b/lib/intel_device_info.c
> > @@ -504,6 +504,16 @@ static const struct intel_device_info intel_pontevecchio_info = {
> >  	.cmds_info = &gen12_pvc_cmds_info,
> >  };
> >  
> > +static const struct intel_device_info intel_lunarlake_info = {
> > +	.graphics_ver = 20,
> > +	.graphics_rel = 4,
> > +	.display_ver = 20,
> > +	.has_4tile = true,
> > +	.has_gmdid = true,
> 
> has_gmdid should be set true even for Meteorlake. If not in this patch,
> in a follow up.
> 
> Regards,
> Bala

Other than this comment,

Reviewed-by: Balasubramani Vivekanandan <balasubramani.vivekanandan@intel.com>

Regards,
Bala

> 
> > +	.is_lunarlake = true,
> > +	.codename = "lunarlake"
> > +};
> > +
> >  static const struct pci_id_match intel_device_match[] = {
> >  	INTEL_I810_IDS(&intel_i810_info),
> >  	INTEL_I815_IDS(&intel_i815_info),
> > @@ -607,6 +617,8 @@ static const struct pci_id_match intel_device_match[] = {
> >  
> >  	INTEL_PVC_IDS(&intel_pontevecchio_info),
> >  
> > +	XE_LNL_IDS(INTEL_VGA_DEVICE, &intel_lunarlake_info),
> > +
> >  	INTEL_VGA_DEVICE(PCI_MATCH_ANY, &intel_generic_info),
> >  };
> >  
> > -- 
> > 2.40.1
> > 

Re: [Intel-xe] [PATCH igt 2/4] lib/intel_chipset: Add Lunar Lake support

[Matt Roper]

On Thu, Aug 31, 2023 at 12:18:22PM +0530, Balasubramani Vivekanandan wrote:
> On 29.08.2023 07:11, Lucas De Marchi wrote:
> > Add basic definition for the Lunar Lake platform. This uses the PCI ID
> > from the xe_pciids.h which has a macro in a slighlty different form.
> > 
> > Going forward we could also trim down a little bit the the info struct
> > like was done in the kernel, relying on gmdid and IP version checks.
> > This is left for later.
> > 
> > Cc: Swati Sharma <swati2.sharma@intel.com>
> > Signed-off-by: Lucas De Marchi <lucas.demarchi@intel.com>
> > ---
> >  lib/intel_chipset.h     |  5 +++++
> >  lib/intel_device_info.c | 12 ++++++++++++
> >  2 files changed, 17 insertions(+)
> > 
> > diff --git a/lib/intel_chipset.h b/lib/intel_chipset.h
> > index 84cf1799e..52b15ccea 100644
> > --- a/lib/intel_chipset.h
> > +++ b/lib/intel_chipset.h
> > @@ -46,6 +46,7 @@ struct intel_device_info {
> >  	bool has_4tile : 1;
> >  	bool has_flatccs : 1;
> >  	bool has_oam : 1;
> > +	bool has_gmdid : 1;
> >  	bool is_mobile : 1;
> >  	bool is_whitney : 1;
> >  	bool is_almador : 1;
> > @@ -90,6 +91,7 @@ struct intel_device_info {
> >  	bool is_alderlake_n : 1;
> >  	bool is_meteorlake : 1;
> >  	bool is_pontevecchio : 1;
> > +	bool is_lunarlake : 1;
> >  	const struct intel_cmds_info *cmds_info;
> >  	const char *codename;
> >  };
> > @@ -203,6 +205,7 @@ void intel_check_pch(void);
> >  #define IS_ALDERLAKE_N(devid)	(intel_get_device_info(devid)->is_alderlake_n)
> >  #define IS_METEORLAKE(devid)	(intel_get_device_info(devid)->is_meteorlake)
> >  #define IS_PONTEVECCHIO(devid)	(intel_get_device_info(devid)->is_pontevecchio)
> > +#define IS_LUNARLAKE(devid)	(intel_get_device_info(devid)->is_lunarlake)
> >  
> >  #define IS_GEN(devid, x)	(intel_get_device_info(devid)->graphics_ver == x)
> >  #define AT_LEAST_GEN(devid, x)	(intel_get_device_info(devid)->graphics_ver >= x)
> > @@ -236,4 +239,6 @@ void intel_check_pch(void);
> >  
> >  #define HAS_OAM(devid)		(intel_get_device_info(devid)->has_oam)
> >  
> > +#define HAS_GMDID(devid)	(intel_get_device_info(devid)->has_gmdid)
> > +
> >  #endif /* _INTEL_CHIPSET_H */
> > diff --git a/lib/intel_device_info.c b/lib/intel_device_info.c
> > index 5d53d2906..86a8b3650 100644
> > --- a/lib/intel_device_info.c
> > +++ b/lib/intel_device_info.c
> > @@ -504,6 +504,16 @@ static const struct intel_device_info intel_pontevecchio_info = {
> >  	.cmds_info = &gen12_pvc_cmds_info,
> >  };
> >  
> > +static const struct intel_device_info intel_lunarlake_info = {
> > +	.graphics_ver = 20,
> > +	.graphics_rel = 4,
> > +	.display_ver = 20,
> > +	.has_4tile = true,
> > +	.has_gmdid = true,
> 
> has_gmdid should be set true even for Meteorlake. If not in this patch,
> in a follow up.

Yeah, we probably shouldn't even be introducing has_gmdid / HAS_GMDID in
this patch since it isn't used anywhere yet (and since userspace doesn't
have any interface to query the GMD_ID values from yet).  That support
should probably come in a separate series, and be paired with XeKMD
changes that allow userspace to access those values.


Matt

> 
> Regards,
> Bala
> 
> > +	.is_lunarlake = true,
> > +	.codename = "lunarlake"
> > +};
> > +
> >  static const struct pci_id_match intel_device_match[] = {
> >  	INTEL_I810_IDS(&intel_i810_info),
> >  	INTEL_I815_IDS(&intel_i815_info),
> > @@ -607,6 +617,8 @@ static const struct pci_id_match intel_device_match[] = {
> >  
> >  	INTEL_PVC_IDS(&intel_pontevecchio_info),
> >  
> > +	XE_LNL_IDS(INTEL_VGA_DEVICE, &intel_lunarlake_info),
> > +
> >  	INTEL_VGA_DEVICE(PCI_MATCH_ANY, &intel_generic_info),
> >  };
> >  
> > -- 
> > 2.40.1
> > 

-- 
Matt Roper
Graphics Software Engineer
Linux GPU Platform Enablement
Intel Corporation

[Intel-xe] [PATCH igt 3/4] lib/intel_device_info: Add blitter cmd info for Lunar Lake

[Lucas De Marchi]

From: Zbigniew Kempczyński <zbigniew.kempczynski@intel.com>

Add separate cmd info for LunarLake. This re-uses the commands for PVC
since all the commands being used in IGT match the ones for PVC.

Cc: Swati Sharma <swati2.sharma@intel.com>
Signed-off-by: Zbigniew Kempczyński <zbigniew.kempczynski@intel.com>
Signed-off-by: Lucas De Marchi <lucas.demarchi@intel.com>
---
 lib/intel_device_info.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/lib/intel_device_info.c b/lib/intel_device_info.c
index 86a8b3650..d1c268482 100644
--- a/lib/intel_device_info.c
+++ b/lib/intel_device_info.c
@@ -511,7 +511,8 @@ static const struct intel_device_info intel_lunarlake_info = {
 	.has_4tile = true,
 	.has_gmdid = true,
 	.is_lunarlake = true,
-	.codename = "lunarlake"
+	.codename = "lunarlake",
+	.cmds_info = &gen12_pvc_cmds_info,
 };
 
 static const struct pci_id_match intel_device_match[] = {
-- 
2.40.1

Re: [Intel-xe] [igt-dev] [PATCH igt 3/4] lib/intel_device_info: Add blitter cmd info for Lunar Lake

[Srivatsa, Anusha]

Reviewed-by: Anusha Srivatsa <anusha.srivatsa@intel.com>


> -----Original Message-----
> From: igt-dev <igt-dev-bounces@lists.freedesktop.org> On Behalf Of Lucas De
> Marchi
> Sent: Tuesday, August 29, 2023 7:11 AM
> To: igt-dev@lists.freedesktop.org
> Cc: De Marchi, Lucas <lucas.demarchi@intel.com>; intel-
> xe@lists.freedesktop.org
> Subject: [igt-dev] [PATCH igt 3/4] lib/intel_device_info: Add blitter cmd info for
> Lunar Lake
>
> From: Zbigniew Kempczyński <zbigniew.kempczynski@intel.com>
>
> Add separate cmd info for LunarLake. This re-uses the commands for PVC since all
> the commands being used in IGT match the ones for PVC.
>
> Cc: Swati Sharma <swati2.sharma@intel.com>
> Signed-off-by: Zbigniew Kempczyński <zbigniew.kempczynski@intel.com>
> Signed-off-by: Lucas De Marchi <lucas.demarchi@intel.com>
> ---
>  lib/intel_device_info.c | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/lib/intel_device_info.c b/lib/intel_device_info.c index
> 86a8b3650..d1c268482 100644
> --- a/lib/intel_device_info.c
> +++ b/lib/intel_device_info.c
> @@ -511,7 +511,8 @@ static const struct intel_device_info intel_lunarlake_info
> = {
>       .has_4tile = true,
>       .has_gmdid = true,
>       .is_lunarlake = true,
> -     .codename = "lunarlake"
> +     .codename = "lunarlake",
> +     .cmds_info = &gen12_pvc_cmds_info,
>  };
>
>  static const struct pci_id_match intel_device_match[] = {
> --
> 2.40.1

[Intel-xe] [PATCH igt 4/4] tests/xe_debugfs: skip page table level check for Xe2

[Lucas De Marchi]

From: Janga Rahul Kumar <janga.rahul.kumar@intel.com>

Starting with Xe2, a 5-level page table is always used, regardless of
the actual virtual address range supported by the platform. Do not
depend on VA range to configure max page table level.

Cc: Mauro Carvalho Chehab <mchehab@kernel.org>
Signed-off-by: Janga Rahul Kumar <janga.rahul.kumar@intel.com>
Signed-off-by: Lucas De Marchi <lucas.demarchi@intel.com>
---
 tests/xe/xe_debugfs.c | 23 +++++++++++++----------
 1 file changed, 13 insertions(+), 10 deletions(-)

diff --git a/tests/xe/xe_debugfs.c b/tests/xe/xe_debugfs.c
index e51d03661..72c069bfc 100644
--- a/tests/xe/xe_debugfs.c
+++ b/tests/xe/xe_debugfs.c
@@ -74,6 +74,7 @@ static int validate_entries(int fd, const char *add_path, const char * const str
 static void
 test_base(int fd, struct drm_xe_query_config *config)
 {
+	uint16_t devid = intel_get_drm_devid(fd);
 	static const char * const expected_files[] = {
 		"gt0",
 		"gt1",
@@ -86,7 +87,6 @@ test_base(int fd, struct drm_xe_query_config *config)
 		"clients",
 		"name"
 	};
-
 	char reference[4096];
 	int val = 0;
 
@@ -104,16 +104,19 @@ test_base(int fd, struct drm_xe_query_config *config)
 
 	igt_assert(igt_debugfs_search(fd, "info", reference));
 
-	switch (config->info[XE_QUERY_CONFIG_VA_BITS]) {
-	case 48:
-		val = 3;
-		break;
-	case 57:
-		val = 4;
-		break;
+	if (!AT_LEAST_GEN(devid, 20)) {
+		switch (config->info[XE_QUERY_CONFIG_VA_BITS]) {
+		case 48:
+			val = 3;
+			break;
+		case 57:
+			val = 4;
+			break;
+		}
+
+		sprintf(reference, "vm_max_level %d", val);
+		igt_assert(igt_debugfs_search(fd, "info", reference));
 	}
-	sprintf(reference, "vm_max_level %d", val);
-	igt_assert(igt_debugfs_search(fd, "info", reference));
 
 	igt_assert(igt_debugfs_exists(fd, "gt0", O_RDONLY));
 	if (config->info[XE_QUERY_CONFIG_GT_COUNT] > 1)
-- 
2.40.1

Re: [Intel-xe] [igt-dev] [PATCH igt 4/4] tests/xe_debugfs: skip page table level check for Xe2

[Srivatsa, Anusha]

> -----Original Message-----
> From: igt-dev <igt-dev-bounces@lists.freedesktop.org> On Behalf Of Lucas De
> Marchi
> Sent: Tuesday, August 29, 2023 7:11 AM
> To: igt-dev@lists.freedesktop.org
> Cc: De Marchi, Lucas <lucas.demarchi@intel.com>; intel-
> xe@lists.freedesktop.org
> Subject: [igt-dev] [PATCH igt 4/4] tests/xe_debugfs: skip page table level check
> for Xe2
>
> From: Janga Rahul Kumar <janga.rahul.kumar@intel.com>
>
> Starting with Xe2, a 5-level page table is always used, regardless of the actual
> virtual address range supported by the platform. Do not depend on VA range to
> configure max page table level.
>
> Cc: Mauro Carvalho Chehab <mchehab@kernel.org>
> Signed-off-by: Janga Rahul Kumar <janga.rahul.kumar@intel.com>
> Signed-off-by: Lucas De Marchi <lucas.demarchi@intel.com>

Reviewed-by: Anusha Srivatsa <anusha.srivatsa@intel.com>

> ---
>  tests/xe/xe_debugfs.c | 23 +++++++++++++----------
>  1 file changed, 13 insertions(+), 10 deletions(-)
>
> diff --git a/tests/xe/xe_debugfs.c b/tests/xe/xe_debugfs.c index
> e51d03661..72c069bfc 100644
> --- a/tests/xe/xe_debugfs.c
> +++ b/tests/xe/xe_debugfs.c
> @@ -74,6 +74,7 @@ static int validate_entries(int fd, const char *add_path,
> const char * const str  static void  test_base(int fd, struct drm_xe_query_config
> *config)  {
> +     uint16_t devid = intel_get_drm_devid(fd);
>       static const char * const expected_files[] = {
>               "gt0",
>               "gt1",
> @@ -86,7 +87,6 @@ test_base(int fd, struct drm_xe_query_config *config)
>               "clients",
>               "name"
>       };
> -
>       char reference[4096];
>       int val = 0;
>
> @@ -104,16 +104,19 @@ test_base(int fd, struct drm_xe_query_config *config)
>
>       igt_assert(igt_debugfs_search(fd, "info", reference));
>
> -     switch (config->info[XE_QUERY_CONFIG_VA_BITS]) {
> -     case 48:
> -             val = 3;
> -             break;
> -     case 57:
> -             val = 4;
> -             break;
> +     if (!AT_LEAST_GEN(devid, 20)) {
> +             switch (config->info[XE_QUERY_CONFIG_VA_BITS]) {
> +             case 48:
> +                     val = 3;
> +                     break;
> +             case 57:
> +                     val = 4;
> +                     break;
> +             }
> +
> +             sprintf(reference, "vm_max_level %d", val);
> +             igt_assert(igt_debugfs_search(fd, "info", reference));
>       }
> -     sprintf(reference, "vm_max_level %d", val);
> -     igt_assert(igt_debugfs_search(fd, "info", reference));
>
>       igt_assert(igt_debugfs_exists(fd, "gt0", O_RDONLY));
>       if (config->info[XE_QUERY_CONFIG_GT_COUNT] > 1)
> --
> 2.40.1

[Intel-xe] ✗ CI.Patch_applied: failure for Add LNL support to xe tests

[Patchwork]

== Series Details ==

Series: Add LNL support to xe tests
URL   : https://patchwork.freedesktop.org/series/123015/
State : failure

== Summary ==

=== Applying kernel patches on branch 'drm-xe-next' with base: ===
Base commit: d8c08057a drm/xe: Add patch version on guc firmware init
=== git am output follows ===
error: docs/reference/igt-gpu-tools/meson.build: does not exist in index
error: lib/intel_device_info.c: does not exist in index
hint: Use 'git am --show-current-patch' to see the failed patch
Applying: lib: Add xe_pciids.h
Patch failed at 0001 lib: Add xe_pciids.h
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

Re: [Intel-xe] [PATCH igt 0/4] Add LNL support to xe tests

[Rodrigo Vivi]

On Tue, Aug 29, 2023 at 07:11:03AM -0700, Lucas De Marchi wrote:
> Add Lunar Lake support so xe driver can be tested. This brings the new
> xe_pciids.h from kernel since now the PCI IDs is not going to be added
> on the i915 side.


Reviewed-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
 for the series

> 
> Janga Rahul Kumar (1):
>   tests/xe_debugfs: skip page table level check for Xe2
> 
> Lucas De Marchi (2):
>   lib: Add xe_pciids.h
>   lib/intel_chipset: Add Lunar Lake support
> 
> Zbigniew Kempczyński (1):
>   lib/intel_device_info: Add blitter cmd info for Lunar Lake
> 
>  docs/reference/igt-gpu-tools/meson.build |   1 +
>  lib/intel_chipset.h                      |   5 +
>  lib/intel_device_info.c                  |  14 ++
>  lib/xe_pciids.h                          | 215 +++++++++++++++++++++++
>  tests/xe/xe_debugfs.c                    |  23 +--
>  5 files changed, 248 insertions(+), 10 deletions(-)
>  create mode 100644 lib/xe_pciids.h
> 
> -- 
> 2.40.1
>