Initial PTL support
cover Initial PTL support
Initial set of patches to enable testing Pantherlake
Akshata Jahagirdar (1):
PTL: lib/intel_device_info: Enable flatccs for PTL
Heikkila, Juha-pekka (4):
XE3: tests/kms_addfb_basic: fix x-tiled tests for case when there is
no x-tile
XE3: tests/intel/kms_draw_crc: fix x-tiled tests for case when there
is no x-tile
XE3: tests/kms_cursor_legacy: flip_vs_cursor_busy_crc was requiring
any driver but used intel x-tile
XE3: tests/intel/kms_frontbuffer_tracking: fix x-tiled tests for case
when there is no x-tile
Matt Atwood (1):
PTL: lib/intel_chipset: add pantherlake definition and support
Matthew Auld (2):
XE3: lib/intel_pat: extend for xe3
XE3: tests/intel/xe_pat: extend for xe3
Vinod Govindapillai (1):
XE3: tests/intel/kms_frontbuffer_tracking: platform based handling of
x-tile cases
lib/intel_chipset.h | 2 ++ lib/intel_device_info.c | 13 +++++++++++++ lib/intel_pat.c | 3 ++- tests/intel/kms_draw_crc.c | 6 ++++-- tests/intel/kms_frontbuffer_tracking.c | 18 ++++++++++++++---- tests/intel/xe_pat.c | 4 ++-- tests/kms_addfb_basic.c | 22 ++++++++++++---------- tests/kms_cursor_legacy.c | 2 +- 8 files changed, 50 insertions(+), 20 deletions(-)
Signature · 1 line
2.25.1
PATCH 1/1 lib: Sync pci ids with kernel
Syncronize pciids from kernel
--- lib/i915_pciids.h | 73 +++++++++++++++++++++++++++++++---------------- lib/xe_pciids.h | 30 ++++++++++++++----- 2 files changed, 71 insertions(+), 32 deletions(-)
lib/i915_pciids.h +48 -25
@@ -25,27 +25,20 @@#ifndef _I915_PCIIDS_H#define _I915_PCIIDS_H -/* -* A pci_device_id struct { -* __u32 vendor, device; -* __u32 subvendor, subdevice; -* __u32 class, class_mask; -* kernel_ulong_t driver_data; -* }; -* Don't use C99 here because "class" is reserved and we want to -* give userspace flexibility. -*/ -#define INTEL_VGA_DEVICE (id, info) { \ - 0x8086, id, \ - ~0, ~0, \ - 0x030000, 0xff0000, \ - (unsigned long) info } - -#define INTEL_QUANTA_VGA_DEVICE (info) { \ - 0x8086, 0x16a, \ - 0x152d, 0x8990, \ - 0x030000, 0xff0000, \ - (unsigned long) info } +#ifdef __KERNEL__ +#define INTEL_VGA_DEVICE (_id, _info) { \ + PCI_DEVICE(PCI_VENDOR_ID_INTEL, (_id)), \ + .class = PCI_BASE_CLASS_DISPLAY << 16, .class_mask = 0xff << 16, \ + .driver_data = (kernel_ulong_t)(_info), \ +} + +#define INTEL_QUANTA_VGA_DEVICE (_info) { \ + .vendor = PCI_VENDOR_ID_INTEL, .device = 0x16a, \ + .subvendor = 0x152d, .subdevice = 0x8990, \ + .class = PCI_BASE_CLASS_DISPLAY << 16, .class_mask = 0xff << 16, \ + .driver_data = (kernel_ulong_t)(_info), \ +} +#endif #define INTEL_I810_IDS (MACRO__ , ...) \ MACRO__(0x7121, ## __VA_ARGS__),/* I810 */ \
@@ -771,16 +764,46 @@ INTEL_ATS_M150_IDS(MACRO__, ## __VA_ARGS__), \ INTEL_ATS_M75_IDS(MACRO__, ## __VA_ARGS__) +/* ARL */ +#define INTEL_ARL_IDS (MACRO__ , ...) \ + MACRO__(0x7D41, ## __VA_ARGS__), \ + MACRO__(0x7D51, ## __VA_ARGS__), \ + MACRO__(0x7D67, ## __VA_ARGS__), \ + MACRO__(0x7DD1, ## __VA_ARGS__), \ + MACRO__(0xB640, ## __VA_ARGS__) +/* MTL */ #define INTEL_MTL_IDS (MACRO__ , ...) \ MACRO__(0x7D40, ## __VA_ARGS__), \ - MACRO__(0x7D41, ## __VA_ARGS__), \ MACRO__(0x7D45, ## __VA_ARGS__), \ - MACRO__(0x7D51, ## __VA_ARGS__), \ MACRO__(0x7D55, ## __VA_ARGS__), \ MACRO__(0x7D60, ## __VA_ARGS__), \ - MACRO__(0x7D67, ## __VA_ARGS__), \ - MACRO__(0x7DD1, ## __VA_ARGS__), \ MACRO__(0x7DD5, ## __VA_ARGS__) +/* LNL */ +#define INTEL_LNL_IDS (MACRO__ , ...) \ + MACRO__(0x6420, ## __VA_ARGS__), \ + MACRO__(0x64A0, ## __VA_ARGS__), \ + MACRO__(0x64B0, ## __VA_ARGS__) + +/* BMG */ +#define INTEL_BMG_IDS (MACRO__ , ...) \ + MACRO__(0xE202, ## __VA_ARGS__), \ + MACRO__(0xE20B, ## __VA_ARGS__), \ + MACRO__(0xE20C, ## __VA_ARGS__), \ + MACRO__(0xE20D, ## __VA_ARGS__), \ + MACRO__(0xE212, ## __VA_ARGS__) + +/* PTL */ +#define INTEL_PTL_IDS (MACRO__ , ...) \ + MACRO__(0xB080, ## __VA_ARGS__), \ + MACRO__(0xB081, ## __VA_ARGS__), \ + MACRO__(0xB082, ## __VA_ARGS__), \ + MACRO__(0xB090, ## __VA_ARGS__), \ + MACRO__(0xB091, ## __VA_ARGS__), \ + MACRO__(0xB092, ## __VA_ARGS__), \ + MACRO__(0xB0A0, ## __VA_ARGS__), \ + MACRO__(0xB0A1, ## __VA_ARGS__), \ + MACRO__(0xB0A2, ## __VA_ARGS__) +#endif /* _I915_PCIIDS_H */
lib/xe_pciids.h +23 -7
@@ -97,7 +97,9 @@#define XE_ADLN_IDS (MACRO__ , ...) \ MACRO__(0x46D0, ## __VA_ARGS__), \ MACRO__(0x46D1, ## __VA_ARGS__), \ - MACRO__(0x46D2, ## __VA_ARGS__) + MACRO__(0x46D2, ## __VA_ARGS__), \ + MACRO__(0x46D3, ## __VA_ARGS__), \ + MACRO__(0x46D4, ## __VA_ARGS__)/* RPL-S */ #define XE_RPLS_IDS (MACRO__ , ...) \
@@ -120,7 +122,6 @@/* RPL-P */ #define XE_RPLP_IDS (MACRO__ , ...) \ - XE_RPLU_IDS(MACRO__, ## __VA_ARGS__), \ MACRO__(0xA720, ## __VA_ARGS__), \ MACRO__(0xA7A0, ## __VA_ARGS__), \ MACRO__(0xA7A8, ## __VA_ARGS__), \
@@ -175,16 +176,20 @@ XE_ATS_M150_IDS(MACRO__, ## __VA_ARGS__),\ XE_ATS_M75_IDS(MACRO__, ## __VA_ARGS__) -/* MTL / ARL */ +/* ARL */ +#define XE_ARL_IDS (MACRO__ , ...) \ + MACRO__(0x7D41, ## __VA_ARGS__), \ + MACRO__(0x7D51, ## __VA_ARGS__), \ + MACRO__(0x7D67, ## __VA_ARGS__), \ + MACRO__(0x7DD1, ## __VA_ARGS__), \ + MACRO__(0xB640, ## __VA_ARGS__) + +/* MTL */ #define XE_MTL_IDS (MACRO__ , ...) \ MACRO__(0x7D40, ## __VA_ARGS__), \ - MACRO__(0x7D41, ## __VA_ARGS__), \ MACRO__(0x7D45, ## __VA_ARGS__), \ - MACRO__(0x7D51, ## __VA_ARGS__), \ MACRO__(0x7D55, ## __VA_ARGS__), \ MACRO__(0x7D60, ## __VA_ARGS__), \ - MACRO__(0x7D67, ## __VA_ARGS__), \ - MACRO__(0x7DD1, ## __VA_ARGS__), \ MACRO__(0x7DD5, ## __VA_ARGS__)/* PVC */
@@ -215,4 +220,15 @@ MACRO__(0xE20D, ## __VA_ARGS__), \ MACRO__(0xE212, ## __VA_ARGS__) +#define XE_PTL_IDS (MACRO__ , ...) \ + MACRO__(0xB080, ## __VA_ARGS__), \ + MACRO__(0xB081, ## __VA_ARGS__), \ + MACRO__(0xB082, ## __VA_ARGS__), \ + MACRO__(0xB090, ## __VA_ARGS__), \ + MACRO__(0xB091, ## __VA_ARGS__), \ + MACRO__(0xB092, ## __VA_ARGS__), \ + MACRO__(0xB0A0, ## __VA_ARGS__), \ + MACRO__(0xB0A1, ## __VA_ARGS__), \ + MACRO__(0xB0A2, ## __VA_ARGS__) +#endif
Signature · 1 line
2.25.1
RE: [PATCH] lib: Sync pci ids with kernel
Please ignore this patch as it was included by mistake.
-Clint
-----Original Message-----
From: igt-dev <[email protected]> On Behalf Of Clint Taylor
Sent: Wednesday, November 13, 2024 3:03 PM
To: [email protected]
Subject: [PATCH] lib: Sync pci ids with kernel
Syncronize pciids from kernel
--- lib/i915_pciids.h | 73 +++++++++++++++++++++++++++++++---------------- lib/xe_pciids.h | 30 ++++++++++++++----- 2 files changed, 71 insertions(+), 32 deletions(-)
lib/i915_pciids.h +11 -21
@@ -25,27 +25,20 @@#ifndef _I915_PCIIDS_H#define _I915_PCIIDS_H -/* -* A pci_device_id struct { -* __u32 vendor, device; -* __u32 subvendor, subdevice; -* __u32 class, class_mask; -* kernel_ulong_t driver_data; -* }; -* Don't use C99 here because "class" is reserved and we want to -* give userspace flexibility. -*/ -#define INTEL_VGA_DEVICE (id, info) { \ - 0x8086, id, \ - ~0, ~0, \ - 0x030000, 0xff0000, \ - (unsigned long) info } - -#define INTEL_QUANTA_VGA_DEVICE (info) { \ - 0x8086, 0x16a, \ - 0x152d, 0x8990, \ - 0x030000, 0xff0000, \ - (unsigned long) info } +#ifdef __KERNEL__ +#define INTEL_VGA_DEVICE (_id, _info) { \ + PCI_DEVICE(PCI_VENDOR_ID_INTEL, (_id)), \ + .class = PCI_BASE_CLASS_DISPLAY << 16, .class_mask = 0xff << 16, \ + .driver_data = (kernel_ulong_t)(_info), \ } + +#define INTEL_QUANTA_VGA_DEVICE (_info) { \ + .vendor = PCI_VENDOR_ID_INTEL, .device = 0x16a, \ + .subvendor = 0x152d, .subdevice = 0x8990, \ + .class = PCI_BASE_CLASS_DISPLAY << 16, .class_mask = 0xff << 16, \ + .driver_data = (kernel_ulong_t)(_info), \ } #endif #define INTEL_I810_IDS(MACRO__, ...) \ MACRO__(0x7121, ## __VA_ARGS__), /* I810 */ \ @@ -771,16 +764,46 @@
INTEL_ATS_M150_IDS(MACRO__, ## __VA_ARGS__), \
INTEL_ATS_M75_IDS(MACRO__, ## __VA_ARGS__)
+/* ARL */
+#define INTEL_ARL_IDS(MACRO__, ...) \
+ MACRO__(0x7D41, ## __VA_ARGS__), \
+ MACRO__(0x7D51, ## __VA_ARGS__), \
+ MACRO__(0x7D67, ## __VA_ARGS__), \
+ MACRO__(0x7DD1, ## __VA_ARGS__), \
+ MACRO__(0xB640, ## __VA_ARGS__)
+
/* MTL */
#define INTEL_MTL_IDS(MACRO__, ...) \
MACRO__(0x7D40, ## __VA_ARGS__), \
- MACRO__(0x7D41, ## __VA_ARGS__), \
MACRO__(0x7D45, ## __VA_ARGS__), \
- MACRO__(0x7D51, ## __VA_ARGS__), \
MACRO__(0x7D55, ## __VA_ARGS__), \
MACRO__(0x7D60, ## __VA_ARGS__), \
- MACRO__(0x7D67, ## __VA_ARGS__), \
- MACRO__(0x7DD1, ## __VA_ARGS__), \
MACRO__(0x7DD5, ## __VA_ARGS__)
+/* LNL */
+#define INTEL_LNL_IDS(MACRO__, ...) \
+ MACRO__(0x6420, ## __VA_ARGS__), \
+ MACRO__(0x64A0, ## __VA_ARGS__), \
+ MACRO__(0x64B0, ## __VA_ARGS__)
+
+/* BMG */
+#define INTEL_BMG_IDS(MACRO__, ...) \
+ MACRO__(0xE202, ## __VA_ARGS__), \
+ MACRO__(0xE20B, ## __VA_ARGS__), \
+ MACRO__(0xE20C, ## __VA_ARGS__), \
+ MACRO__(0xE20D, ## __VA_ARGS__), \
+ MACRO__(0xE212, ## __VA_ARGS__)
+
+/* PTL */
+#define INTEL_PTL_IDS(MACRO__, ...) \
+ MACRO__(0xB080, ## __VA_ARGS__), \
+ MACRO__(0xB081, ## __VA_ARGS__), \
+ MACRO__(0xB082, ## __VA_ARGS__), \
+ MACRO__(0xB090, ## __VA_ARGS__), \
+ MACRO__(0xB091, ## __VA_ARGS__), \
+ MACRO__(0xB092, ## __VA_ARGS__), \
+ MACRO__(0xB0A0, ## __VA_ARGS__), \
+ MACRO__(0xB0A1, ## __VA_ARGS__), \
+ MACRO__(0xB0A2, ## __VA_ARGS__)
+
#endif /* _I915_PCIIDS_H */
lib/xe_pciids.h +23 -7
@@ -97,7 +97,9 @@#define XE_ADLN_IDS (MACRO__ , ...) \ MACRO__(0x46D0, ## __VA_ARGS__), \ MACRO__(0x46D1, ## __VA_ARGS__), \ - MACRO__(0x46D2, ## __VA_ARGS__) + MACRO__(0x46D2, ## __VA_ARGS__), \ + MACRO__(0x46D3, ## __VA_ARGS__), \ + MACRO__(0x46D4, ## __VA_ARGS__)/* RPL-S */ #define XE_RPLS_IDS (MACRO__ , ...) \
@@ -120,7 +122,6 @@/* RPL-P */ #define XE_RPLP_IDS (MACRO__ , ...) \ - XE_RPLU_IDS(MACRO__, ## __VA_ARGS__), \ MACRO__(0xA720, ## __VA_ARGS__), \ MACRO__(0xA7A0, ## __VA_ARGS__), \ MACRO__(0xA7A8, ## __VA_ARGS__), \
@@ -175,16 +176,20 @@ XE_ATS_M150_IDS(MACRO__, ## __VA_ARGS__),\ XE_ATS_M75_IDS(MACRO__, ## __VA_ARGS__) -/* MTL / ARL */ +/* ARL */ +#define XE_ARL_IDS (MACRO__ , ...) \ + MACRO__(0x7D41, ## __VA_ARGS__), \ + MACRO__(0x7D51, ## __VA_ARGS__), \ + MACRO__(0x7D67, ## __VA_ARGS__), \ + MACRO__(0x7DD1, ## __VA_ARGS__), \ + MACRO__(0xB640, ## __VA_ARGS__) + +/* MTL */ #define XE_MTL_IDS (MACRO__ , ...) \ MACRO__(0x7D40, ## __VA_ARGS__), \ - MACRO__(0x7D41, ## __VA_ARGS__), \ MACRO__(0x7D45, ## __VA_ARGS__), \ - MACRO__(0x7D51, ## __VA_ARGS__), \ MACRO__(0x7D55, ## __VA_ARGS__), \ MACRO__(0x7D60, ## __VA_ARGS__), \ - MACRO__(0x7D67, ## __VA_ARGS__), \ - MACRO__(0x7DD1, ## __VA_ARGS__), \ MACRO__(0x7DD5, ## __VA_ARGS__)/* PVC */
@@ -215,4 +220,15 @@ MACRO__(0xE20D, ## __VA_ARGS__), \ MACRO__(0xE212, ## __VA_ARGS__) +#define XE_PTL_IDS (MACRO__ , ...) \ + MACRO__(0xB080, ## __VA_ARGS__), \ + MACRO__(0xB081, ## __VA_ARGS__), \ + MACRO__(0xB082, ## __VA_ARGS__), \ + MACRO__(0xB090, ## __VA_ARGS__), \ + MACRO__(0xB091, ## __VA_ARGS__), \ + MACRO__(0xB092, ## __VA_ARGS__), \ + MACRO__(0xB0A0, ## __VA_ARGS__), \ + MACRO__(0xB0A1, ## __VA_ARGS__), \ + MACRO__(0xB0A2, ## __VA_ARGS__) +#endif
--
2.25.1
PATCH 1/9 PTL: lib/intel_chipset: add pantherlake definition and support
In reply to Clint TaylorFrom: Matt Atwood <[email protected]>
Add support for the pantherlake platform for xe.
--- lib/intel_chipset.h | 2 ++ lib/intel_device_info.c | 12 ++++++++++++ 2 files changed, 14 insertions(+)
lib/intel_chipset.h +2 -0
@@ -92,6 +92,8 @@ struct intel_device_info { bool is_pontevecchio : 1; bool is_lunarlake : 1; bool is_battlemage : 1; + bool is_pantherlake : 1; +const struct intel_cmds_info *cmds_info;const char *codename; };
lib/intel_device_info.c +12 -0
@@ -526,6 +526,16 @@ static const struct intel_device_info intel_battlemage_info = { .cmds_info = &xe2_cmds_info, }; +static const struct intel_device_info intel_pantherlake_info = { + .graphics_ver =30 , + .graphics_rel =0 , + .display_ver =30 , + .has_4tile = true, + .is_pantherlake = true, + .codename ="pantherlake" , + .cmds_info = &gen12_pvc_cmds_info, +}; +#define INTEL_PCI_ID_INIT (_id, _info) { \ .vendor_id = 0x8086, .device_id = (_id), \ .subvendor_id = PCI_MATCH_ANY, .subdevice_id = PCI_MATCH_ANY, \
@@ -642,6 +652,8 @@ static const struct pci_id_match intel_device_match[] = {INTEL_BMG_IDS (INTEL_PCI_ID_INIT , &intel_battlemage_info), +INTEL_PTL_IDS (INTEL_PCI_ID_INIT , &intel_pantherlake_info), + INTEL_PCI_ID_INIT(PCI_MATCH_ANY, &intel_generic_info), };
Signature · 1 line
2.25.1
PATCH 2/9 PTL: lib/intel_device_info: Enable flatccs for PTL
In reply to Clint TaylorFrom: Akshata Jahagirdar <[email protected]>
Turn FlatCCS on for PTL.
Update blt command properties for PTL to be same as LNL.
--- lib/intel_device_info.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
lib/intel_device_info.c +2 -1
@@ -531,9 +531,10 @@ static const struct intel_device_info intel_pantherlake_info = { .graphics_rel = 0, .display_ver = 30, .has_4tile = true, + .has_flatccs = true, .is_pantherlake = true, .codename = "pantherlake", - .cmds_info = &gen12_pvc_cmds_info, + .cmds_info = &xe2_cmds_info, };#define INTEL_PCI_ID_INIT (_id, _info) { \
Signature · 1 line
2.25.1
PATCH 3/9 XE3: lib/intel_pat: extend for xe3
In reply to Clint TaylorFrom: Matthew Auld <[email protected]>
Xe3 should use the same pat_index modes as Xe2. Also matches the kernel side.
--- lib/intel_pat.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
lib/intel_pat.c +2 -1
@@ -19,7 +19,8 @@ static void intel_get_pat_idx(int fd, struct intel_pat_cache *pat) {uint16_t dev_id =intel_get_drm_devid (fd); -if (intel_get_device_info (dev_id)->graphics_ver ==20 ) { +if (intel_get_device_info (dev_id)->graphics_ver ==30 || +intel_get_device_info (dev_id)->graphics_ver ==20 ) { pat->uc =3 ; pat->wt =15 ;/* Compressed + WB-transient */ pat->wb =2 ;
Signature · 1 line
2.25.1
PATCH 4/9 XE3: tests/intel/xe_pat: extend for xe3
In reply to Clint TaylorFrom: Matthew Auld <[email protected]>
Same pat_index modes should apply as for xe2. Matches the kernel.
--- tests/intel/xe_pat.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
tests/intel/xe_pat.c +2 -2
@@ -110,7 +110,7 @@ static void pat_index_all(int fd)for (pat_index =0 ; pat_index <=intel_get_max_pat_index (fd); pat_index++) { -if (intel_get_device_info (dev_id)->graphics_ver ==20 && +if (intel_get_device_info (dev_id)->graphics_ver >=20 && pat_index >=16 && pat_index <=19 ) {/* hw reserved */ igt_assert_eq(__xe_vm_bind(fd, vm, 0, bo, 0, 0x40000, size, DRM_XE_VM_BIND_OP_MAP, 0, NULL, 0, 0,
@@ -854,7 +854,7 @@ static uint8_t get_pat_idx_wt(int fd, bool *compressed)uint16_t dev_id =intel_get_drm_devid (fd);if (compressed) - *compressed =intel_get_device_info (dev_id)->graphics_ver ==20 ; + *compressed =intel_get_device_info (dev_id)->graphics_ver >=20 ;return intel_get_pat_idx_wt (fd); }
Signature · 1 line
2.25.1
PATCH 5/9 XE3: tests/kms_addfb_basic: fix x-tiled tests for case when there is no x-tile
In reply to Clint TaylorFrom: "Heikkila, Juha-pekka" <[email protected]>
On Xe3 display no more support x-tile and will disable such framebuffers
--- tests/kms_addfb_basic.c | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-)
tests/kms_addfb_basic.c +12 -10
@@ -217,6 +217,12 @@ static int legacy_addfb(int fd, struct drm_mode_fb_cmd *arg)return err; } +static int addfb_expected_ret (igt_display_t *disp,struct drm_mode_fb_cmd2 *f) +{ +return igt_display_has_format_mod (disp, f->pixel_format, + f->modifier[0 ]) ?0 :-1 ; +} +static void invalid_tests (int fd) {struct drm_mode_fb_cmd2 f = {};
@@ -735,8 +741,10 @@ static void addfb25_tests(int fd)igt_describe ("Check if addfb2 call works for x-tiling" ); igt_subtest("addfb25-x-tiled-legacy") { f.modifier[0 ] =I915_FORMAT_MOD_X_TILED ; -do_ioctl (fd,DRM_IOCTL_MODE_ADDFB2 , &f); -do_ioctl (fd,DRM_IOCTL_MODE_RMFB , &f.fb_id); +igt_assert_eq (drmIoctl (fd,DRM_IOCTL_MODE_ADDFB2 , &f), +addfb_expected_ret (&display, &f)); +if (!addfb_expected_ret (&display, &f)) +do_ioctl (fd,DRM_IOCTL_MODE_RMFB , &f.fb_id); f.fb_id =0 ; }
@@ -756,12 +764,6 @@ static void addfb25_tests(int fd)gem_close (fd, gem_bo); } -static int addfb_expected_ret (igt_display_t *disp,struct drm_mode_fb_cmd2 *f) -{ -return igt_display_has_format_mod (disp, f->pixel_format, - f->modifier[0 ]) ?0 :-1 ; -} -static void addfb25_ytile (int fd) {struct drm_mode_fb_cmd2 f = {};
@@ -1012,8 +1014,6 @@ igt_mainmaster_tests (fd); -addfb25_tests (fd); -tiling_tests (fd); igt_subtest_group {
@@ -1025,6 +1025,8 @@ igt_mainigt_fixture igt_require_intel (fd ); +addfb25_tests (fd); +addfb25_ytile (fd);addfb25_4tile (fd);
Signature · 1 line
2.25.1
PATCH 6/9 XE3: tests/intel/kms_draw_crc: fix x-tiled tests for case when there is no x-tile
In reply to Clint TaylorFrom: "Heikkila, Juha-pekka" <[email protected]>
On Xe3 display no more support x-tile and will disable such framebuffers
--- tests/intel/kms_draw_crc.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
tests/intel/kms_draw_crc.c +4 -2
@@ -243,8 +243,10 @@ static void fill_fb_subtest(void)get_fill_crc (DRM_FORMAT_MOD_LINEAR , &crc);igt_assert_crc_equal (&crc, &base_crc); -get_fill_crc (I915_FORMAT_MOD_X_TILED , &crc); -igt_assert_crc_equal (&crc, &base_crc); +if (intel_display_ver (intel_get_drm_devid (drm_fd)) <=20 ) { +get_fill_crc (I915_FORMAT_MOD_X_TILED , &crc); +igt_assert_crc_equal (&crc, &base_crc); + }if (intel_display_ver (intel_get_drm_devid (drm_fd)) >=9 ) { get_fill_crc(has_4tile ?
Signature · 1 line
2.25.1
PATCH 7/9 XE3: tests/kms_cursor_legacy: flip_vs_cursor_busy_crc was requiring any driver but used intel x-tile
In reply to Clint TaylorFrom: "Heikkila, Juha-pekka" <[email protected]>
switch flip_vs_cursor_busy_crc to use linear framebuffer instead of x-tile
--- tests/kms_cursor_legacy.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
tests/kms_cursor_legacy.c +1 -1
@@ -1679,7 +1679,7 @@ static void flip_vs_cursor_busy_crc(igt_display_t *display, bool atomic)set_fb_on_crtc (display, pipe, output, &fb_info[0 ]); plane_primary =igt_output_get_plane_type (output,DRM_PLANE_TYPE_PRIMARY );igt_create_color_pattern_fb (display->drm_fd, fb_info[0 ].width, fb_info[0 ].height, -DRM_FORMAT_XRGB8888 ,I915_FORMAT_MOD_X_TILED ,.1 ,.1 ,.1 , &fb_info[1 ]); +DRM_FORMAT_XRGB8888 ,DRM_FORMAT_MOD_LINEAR ,.1 ,.1 ,.1 , &fb_info[1 ]);igt_create_color_fb (display->drm_fd,64 ,64 ,DRM_FORMAT_ARGB8888 ,DRM_FORMAT_MOD_LINEAR ,1. ,1. ,1. , &cursor_fb);
Signature · 1 line
2.25.1
PATCH 8/9 XE3: tests/intel/kms_frontbuffer_tracking: fix x-tiled tests for case when there is no x-tile
In reply to Clint TaylorFrom: "Heikkila, Juha-pekka" <[email protected]>
On Xe3 display no more support x-tile and will disable such framebuffers
--- tests/intel/kms_frontbuffer_tracking.c | 25 +++++++++++++++++++++---- 1 file changed, 21 insertions(+), 4 deletions(-)
tests/intel/kms_frontbuffer_tracking.c +21 -4
@@ -2421,7 +2421,12 @@ static void setup_modeset(void) offscreen_fb.fb =NULL ; offscreen_fb.w =1024 ; offscreen_fb.h =1024 ; -create_fbs (FORMAT_DEFAULT , opt.tiling); + +/* Xe3 remove x-tile from display + */ +if (drm.display_ver <=20 ) +create_fbs (FORMAT_DEFAULT , opt.tiling); +else +create_fbs (FORMAT_DEFAULT ,TILING_4 ); }static void teardown_modeset (void )
@@ -2542,7 +2547,6 @@ static void setup_drrs(void)static void setup_environment (void ) { -setup_drm ();setup_modeset ();setup_fbc ();
@@ -3386,6 +3390,7 @@ static bool tiling_is_valid(int feature_flags, enum tiling_type tiling)case TILING_LINEAR :return intel_gen (drm.devid) >=9 ;case TILING_X : +return (intel_get_device_info (drm.devid)->display_ver >20 ) ? false : true;case TILING_Y :return true;case TILING_4 :
@@ -4468,9 +4473,10 @@ igt_main_args("", long_options, help_str, opt_handler, NULL)igt_output_t *output; igt_fixture { -setup_environment (); +setup_drm (); drm.devid =intel_get_drm_devid (drm.fd); drm.display_ver =intel_display_ver (drm.devid); +setup_environment (); }for (t.feature =0 ; t.feature <FEATURE_COUNT ; t.feature++) {
@@ -4774,6 +4780,11 @@ igt_main_args("", long_options, help_str, opt_handler, NULL)if (t.tiling ==TILING_4 )igt_require (intel_get_device_info (drm.devid)->has_4tile); +/* Xe3 remove x-tile from display + */ +if (t.tiling ==TILING_X ) { +igt_require (drm.display_ver <=20 ); + } +if (tiling_is_valid (t.feature, t.tiling))draw_subtest (&t);else
@@ -4805,7 +4816,13 @@ igt_main_args("", long_options, help_str, opt_handler, NULL) t.format =FORMAT_DEFAULT ; t.flip =FLIP_PAGEFLIP ; t.method =IGT_DRAW_BLT ; - t.tiling = opt.tiling; + +/* Xe3 remove x-tile from display + */ +if (drm.display_ver <=20 ) + t.tiling = opt.tiling; +else + t.tiling =TILING_4 ; + igt_subtest("basic") {if (!is_xe_device (drm.fd))igt_require_gem (drm.fd);
Signature · 1 line
2.25.1
PATCH 9/9 XE3: tests/intel/kms_frontbuffer_tracking: platform based handling of x-tile cases
In reply to Clint TaylorFrom: Vinod Govindapillai <[email protected]>
x-tile is not supported from xe3 onwards. Handle this conclusively in all the kms_frontbuffer_tracking subtest options.
--- tests/intel/kms_frontbuffer_tracking.c | 31 ++++++++++---------------- 1 file changed, 12 insertions(+), 19 deletions(-)
tests/intel/kms_frontbuffer_tracking.c +12 -19
@@ -1271,7 +1271,7 @@ struct test_mode {TILING_Y ,TILING_4 ,TILING_COUNT , -TILING_DEFAULT =TILING_X , +TILING_AUTOSELECT , } tiling;enum igt_draw_method method;
@@ -1394,7 +1394,7 @@ struct { .only_pipes = PIPE_COUNT, .shared_fb_x_offset = 248, .shared_fb_y_offset = 500, - .tiling = TILING_DEFAULT, + .tiling = TILING_AUTOSELECT, };struct modeset_params {
@@ -2421,12 +2421,7 @@ static void setup_modeset(void) offscreen_fb.fb =NULL ; offscreen_fb.w =1024 ; offscreen_fb.h =1024 ; - -/* Xe3 remove x-tile from display + */ -if (drm.display_ver <=20 ) -create_fbs (FORMAT_DEFAULT , opt.tiling); -else -create_fbs (FORMAT_DEFAULT ,TILING_4 ); +create_fbs (FORMAT_DEFAULT , opt.tiling); }static void teardown_modeset (void )
@@ -4476,6 +4471,14 @@ igt_main_args("", long_options, help_str, opt_handler, NULL)setup_drm (); drm.devid =intel_get_drm_devid (drm.fd); drm.display_ver =intel_display_ver (drm.devid); + +/* TILING_X is not supported from Xe3 onwards. If the tiling +* is not set explicitly using the commandline parameter, +* handle the default tiling based on the platform. +*/ +if (opt.tiling ==TILING_AUTOSELECT ) + opt.tiling = drm.display_ver >=30 ?TILING_4 :TILING_X ; +setup_environment (); }
@@ -4780,11 +4783,6 @@ igt_main_args("", long_options, help_str, opt_handler, NULL)if (t.tiling ==TILING_4 )igt_require (intel_get_device_info (drm.devid)->has_4tile); -/* Xe3 remove x-tile from display + */ -if (t.tiling ==TILING_X ) { -igt_require (drm.display_ver <=20 ); - } -if (tiling_is_valid (t.feature, t.tiling))draw_subtest (&t);else
@@ -4816,12 +4814,7 @@ igt_main_args("", long_options, help_str, opt_handler, NULL) t.format =FORMAT_DEFAULT ; t.flip =FLIP_PAGEFLIP ; t.method =IGT_DRAW_BLT ; - -/* Xe3 remove x-tile from display + */ -if (drm.display_ver <=20 ) - t.tiling = opt.tiling; -else - t.tiling =TILING_4 ; + t.tiling = opt.tiling; igt_subtest("basic") {if (!is_xe_device (drm.fd))
Signature · 1 line
2.25.1
Patchwork
CI✗ Fi.CI.BUILD: failure for Initial PTL support (rev2)
In reply to Clint Taylor== Series Details ==
== Series Details ==
Series: Initial PTL support (rev2)
URL : https://patchwork.freedesktop.org/series/141325/
State : failure
== Summary ==
Applying: lib: Sync pci ids with kernel
Patch failed at 0001 lib: Sync pci ids with kernel
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".