Skip to contentSkip to conversation

Split display/graphics versions and add ADL-P

PATCH In review Matt Roper 5 participants 26 messages Jun 4, 2021 – Jun 8, 2021

Subsystems (2)
lore
Share & tools
lore

Matt Roper

author
#0 lore raw

cover Split display/graphics versions and add ADL-P

Since ADL-P has version 12 graphics and version 13 display, we need to split IGT's 'gen' value into separate graphics and display versions, just as we've done in the kernel. Once we've done that we can add the basic ADL-P support.

Cc Anusha Srivatsa <[email protected]>

Clint Taylor (1):
lib/i915/adl-p: Basic ADL-P enabling

Imre Deak (1):
lib/i915: Add ADL-P plane offset restriction for CCS framebuffers

José Roberto de Souza (1):
lib/i915: Add ADL-P stride restrictions for non-linear buffers

Lionel Landwerlin (1):
lib/i915/perf: Add ADL-P metrics

Matt Roper (2):
lib/i915: Split 'gen' into graphics version and display version lib/i915: Add intel_display_ver() and use it in display tests/libs

 lib/i915/perf-configs/guids.xml            |    26 +
 lib/i915/perf-configs/mdapi-xml-convert.py |     1 +
 lib/i915/perf-configs/oa-adlp.xml          | 10624 +++++++++++++++++++
 lib/i915/perf-configs/update-guids.py      |     2 +-
 lib/i915/perf.c                            |     7 +-
 lib/i915/perf.h                            |     2 +-
 lib/i915/perf_data_reader.c                |     6 +-
 lib/igt_device_scan.c                      |     2 +-
 lib/igt_draw.c                             |    12 +-
 lib/igt_fb.c                               |    66 +-
 lib/igt_gt.c                               |    10 +-
 lib/intel_chipset.h                        |    10 +-
 lib/intel_device_info.c                    |   153 +-
 lib/meson.build                            |     2 +-
 tests/i915/gem_exec_store.c                |     4 +-
 tests/i915/i915_pciid.c                    |     4 +-
 tests/kms_atomic_transition.c              |     2 +-
 tests/kms_big_fb.c                         |    10 +-
 tests/kms_ccs.c                            |     2 +-
 tests/kms_draw_crc.c                       |     2 +-
 tests/kms_flip_scaled_crc.c                |     2 +-
 tests/kms_flip_tiling.c                    |     2 +-
 tests/kms_frontbuffer_tracking.c           |     4 +-
 tests/kms_getfb.c                          |     2 +-
 tests/kms_hdmi_inject.c                    |     2 +-
 tests/kms_panel_fitting.c                  |     2 +-
 tests/kms_plane.c                          |     2 +-
 tests/kms_plane_lowres.c                   |     4 +-
 tests/kms_plane_scaling.c                  |     8 +-
 tests/kms_rotation_crc.c                   |     8 +-
 tests/kms_universal_plane.c                |     2 +-
 tools/i915-perf/i915_perf_configs.c        |     2 +-
 tools/i915-perf/i915_perf_reader.c         |     5 +-
 tools/i915-perf/i915_perf_recorder.c       |     6 +-
 34 files changed, 10880 insertions(+), 118 deletions(-)
 create mode 100644 lib/i915/perf-configs/oa-adlp.xml
Signature · 6 lines
2.25.4

_______________________________________________
igt-dev mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/igt-dev
author
#1 lore raw

PATCH 1/6 lib/i915: Split 'gen' into graphics version and display version

Going forward, platforms may have separate architecture versions for graphics and display and should no longer utilize a single 'gen' version.

While doing this, let's change the versions to raw version values rather than BIT(v) as we were doing in the past. It looks like some of the existing uses of devinfo->gen were already misinterpreting this field and failing to pass the value through ffs(), so this change may also fix some bugs.

---
 lib/i915/perf.c                      |   4 +-
 lib/i915/perf.h                      |   2 +-
 lib/i915/perf_data_reader.c          |   6 +-
 lib/igt_device_scan.c                |   2 +-
 lib/igt_gt.c                         |  10 +-
 lib/intel_chipset.h                  |   7 +-
 lib/intel_device_info.c              | 131 ++++++++++++++++++---------
 tests/i915/gem_exec_store.c          |   4 +-
 tests/i915/i915_pciid.c              |   4 +-
 tools/i915-perf/i915_perf_configs.c  |   2 +-
 tools/i915-perf/i915_perf_reader.c   |   5 +-
 tools/i915-perf/i915_perf_recorder.c |   6 +-
 12 files changed, 114 insertions(+), 69 deletions(-)
lib/i915/perf.c +2 -2
index 5644a346..9d5ab7a5 100644
@@ -169,7 +169,7 @@ intel_perf_for_devinfo(uint32_t device_id,
 	 * 2x6 does not have 2 samplers).
 	 */
 	perf->devinfo.devid = device_id;
-	perf->devinfo.gen = devinfo->gen;
+	perf->devinfo.graphics_ver = devinfo->graphics_ver;
 	perf->devinfo.revision = revision;
 	perf->devinfo.timestamp_frequency = timestamp_frequency;
 	perf->devinfo.gt_min_freq = gt_min_freq;
@@ -183,7 +183,7 @@ intel_perf_for_devinfo(uint32_t device_id,
 	/* On Gen11+ the equations from the xml files expect an 8bits
 	 * mask per subslice, versus only 3bits on prior Gens.
 	 */
-	bits_per_subslice = devinfo->gen >= 11 ? 8 : 3;
+	bits_per_subslice = devinfo->graphics_ver >= 11 ? 8 : 3;
 	for (uint32_t s = 0; s < topology->max_slices; s++) {
 		if (!slice_available(topology, s))
 			continue;
lib/i915/perf.h +1 -1
index 6a39be92..d2429c47 100644
@@ -50,7 +50,7 @@ struct intel_perf_devinfo {
 	 * Their values are build up from the topology fields.
 	 */
 	uint32_t devid;
-	uint32_t gen;
+	uint32_t graphics_ver;
 	uint32_t revision;
 	uint64_t timestamp_frequency;
 	uint64_t gt_min_freq;
lib/i915/perf_data_reader.c +3 -3
index 79cb50f4..e69189ac 100644
@@ -45,11 +45,11 @@ oa_report_ctx_is_valid(const struct intel_perf_devinfo *devinfo,
 {
 	const uint32_t *report = (const uint32_t *) _report;
 
-	if (devinfo->gen < 8) {
+	if (devinfo->graphics_ver < 8) {
 		return false; /* TODO */
-	} else if (devinfo->gen == 8) {
+	} else if (devinfo->graphics_ver == 8) {
 		return report[0] & (1ul << 25);
-	} else if (devinfo->gen > 8) {
+	} else if (devinfo->graphics_ver > 8) {
 		return report[0] & (1ul << 16);
 	}
 
lib/igt_device_scan.c +1 -1
index 2b7d9a3a..3c23fe0e 100644
@@ -208,7 +208,7 @@ static char *devname_intel(uint16_t vendor, uint16_t device)
 		if (devname) {
 			devname[0] = toupper(devname[0]);
 			igt_assert(asprintf(&s, "Intel %s (Gen%u)", devname,
-					    ffs(info->gen)) != -1);
+					    info->graphics_ver) != -1);
 			free(devname);
 		}
 	}
lib/igt_gt.c +5 -5
index f601d726..b1415178 100644
@@ -552,18 +552,18 @@ bool gem_class_can_store_dword(int fd, int class)
 {
 	uint16_t devid = intel_get_drm_devid(fd);
 	const struct intel_device_info *info = intel_get_device_info(devid);
-	const int gen = ffs(info->gen);
+	const int ver = info->graphics_ver;
 
-	if (info->gen == 0) /* unknown, assume it just works */
+	if (ver == 0) /* unknown, assume it just works */
 		return true;
 
-	if (gen <= 2) /* requires physical addresses */
+	if (ver <= 2) /* requires physical addresses */
 		return false;
 
-	if (gen == 3 && (info->is_grantsdale || info->is_alviso))
+	if (ver == 3 && (info->is_grantsdale || info->is_alviso))
 		return false; /* only supports physical addresses */
 
-	if (gen == 6 && class == I915_ENGINE_CLASS_VIDEO)
+	if (ver == 6 && class == I915_ENGINE_CLASS_VIDEO)
 		return false; /* broken, unbelievably broken */
 
 	if (info->is_broadwater)
lib/intel_chipset.h +4 -3
index f766021e..8e81ffa9 100644
@@ -37,7 +37,8 @@ struct pci_device *intel_get_pci_device(void);
 uint32_t intel_get_drm_devid(int fd);
 
 struct intel_device_info {
-	unsigned gen;
+	unsigned graphics_ver;
+	unsigned display_ver;
 	unsigned gt; /* 0 if unknown */
 	bool is_mobile : 1;
 	bool is_whitney : 1;
@@ -179,8 +180,8 @@ void intel_check_pch(void);
 #define IS_DG1(devid)		(intel_get_device_info(devid)->is_dg1)
 #define IS_ALDERLAKE_S(devid)	(intel_get_device_info(devid)->is_alderlake_s)
 
-#define IS_GEN(devid, x)	(intel_get_device_info(devid)->gen & (1u << ((x)-1)))
-#define AT_LEAST_GEN(devid, x)	(intel_get_device_info(devid)->gen & -(1u << ((x)-1)))
+#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)
 
 #define IS_GEN2(devid)		IS_GEN(devid, 2)
 #define IS_GEN3(devid)		IS_GEN(devid, 3)
lib/intel_device_info.c +87 -44

356 lines not on this page · raw message

tests/i915/gem_exec_store.c +2 -2
index 99ffc9ab..2df0b27f 100644
@@ -310,7 +310,7 @@ static int print_welcome(int fd)
 	int err;
 
 	igt_info("Running on %s (pci-id %04x, gen %d)\n",
-		 info->codename, devid, ffs(info->gen));
+		 info->codename, devid, info->graphics_ver);
 	igt_info("Can use MI_STORE_DWORD(virtual)? %s\n",
 		 gem_can_store_dword(fd, 0) ? "yes" : "no");
 
@@ -320,7 +320,7 @@ static int print_welcome(int fd)
 	igt_info("GPU operation? %s [errno=%d]\n",
 		 err == 0 ? "yes" : "no", err);
 
-	return ffs(info->gen);
+	return info->graphics_ver;
 }
 
 #define test_each_engine(T, i915, e)  \
tests/i915/i915_pciid.c +2 -2
index fe4db405..7de44ff2 100644
@@ -49,13 +49,13 @@ static bool has_known_intel_chipset(int fd)
 		return false;
 	}
 
-	if (!info->gen) {
+	if (!info->graphics_ver) {
 		igt_warn("Unknown PCI-ID: %04x\n", devid);
 		return false;
 	}
 
 	igt_info("PCI-ID: %#04x, gen %d, %s\n",
-		 devid, ffs(info->gen), info->codename);
+		 devid, info->graphics_ver, info->codename);
 	return true;
 }
 
tools/i915-perf/i915_perf_configs.c +1 -1
index 2a0283c9..bce3bd0f 100644
@@ -228,7 +228,7 @@ main(int argc, char *argv[])
 		return EXIT_FAILURE;
 	}
 
-	fprintf(stdout, "Device gen=%i gt=%i\n", devinfo->gen, devinfo->gt);
+	fprintf(stdout, "Device graphics_ver=%i gt=%i\n", devinfo->graphics_ver, devinfo->gt);
 
 	perf = intel_perf_for_fd(drm_fd);
 	if (!perf) {
tools/i915-perf/i915_perf_reader.c +3 -2
index 3e4a6530..e51f5a5d 100644
@@ -220,8 +220,9 @@ main(int argc, char *argv[])
 
 	devinfo = intel_get_device_info(reader.devinfo.devid);
 
-	fprintf(stdout, "Recorded on device=0x%x(%s) gen=%i\n",
-		reader.devinfo.devid, devinfo->codename, reader.devinfo.gen);
+	fprintf(stdout, "Recorded on device=0x%x(%s) graphics_ver=%i\n",
+		reader.devinfo.devid, devinfo->codename,
+		reader.devinfo.graphics_ver);
 	fprintf(stdout, "Metric used : %s (%s) uuid=%s\n",
 		reader.metric_set->symbol_name, reader.metric_set->name,
 		reader.metric_set->hw_config_guid);
tools/i915-perf/i915_perf_recorder.c +3 -3
index 3a8ee46a..00195290 100644
@@ -317,14 +317,14 @@ get_device_timestamp_frequency(const struct intel_device_info *devinfo, int drm_
 	if (perf_ioctl(drm_fd, DRM_IOCTL_I915_GETPARAM, &gp) == 0)
 		return timestamp_frequency;
 
-	if (devinfo->gen > 9) {
+	if (devinfo->graphics_ver > 9) {
 		fprintf(stderr, "Unable to query timestamp frequency from i915, please update kernel.\n");
 		return 0;
 	}
 
 	fprintf(stderr, "Warning: unable to query timestamp frequency from i915, guessing values...\n");
 
-	if (devinfo->gen <= 8)
+	if (devinfo->graphics_ver <= 8)
 		return 12500000;
 	if (devinfo->is_broxton)
 		return 19200000;
@@ -878,7 +878,7 @@ main(int argc, char *argv[])
 	}
 
 	fprintf(stdout, "Device name=%s gen=%i gt=%i id=0x%x\n",
-		ctx.devinfo->codename, ctx.devinfo->gen, ctx.devinfo->gt, ctx.devid);
+		ctx.devinfo->codename, ctx.devinfo->graphics_ver, ctx.devinfo->gt, ctx.devid);
 
 	ctx.topology = get_topology(ctx.drm_fd, &ctx.topology_size);
 	if (!ctx.topology) {
Signature · 6 lines
2.25.4

_______________________________________________
igt-dev mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/igt-dev
Reviewed-by on v1 1/6
#2 lore raw

Re: [igt-dev] [PATCH i-g-t 1/6] lib/i915: Split 'gen' into graphics version and display version

Quoted 10 lines · Matt Roper

Going forward, platforms may have separate architecture versions for graphics and display and should no longer utilize a single 'gen' version.

While doing this, let's change the versions to raw version values rather than BIT(v) as we were doing in the past. It looks like some of the existing uses of devinfo->gen were already misinterpreting this field and failing to pass the value through ffs(), so this change may also fix some bugs.

Quoted 597 lines
---
 lib/i915/perf.c                      |   4 +-
 lib/i915/perf.h                      |   2 +-
 lib/i915/perf_data_reader.c          |   6 +-
 lib/igt_device_scan.c                |   2 +-
 lib/igt_gt.c                         |  10 +-
 lib/intel_chipset.h                  |   7 +-
 lib/intel_device_info.c              | 131 ++++++++++++++++++---------
 tests/i915/gem_exec_store.c          |   4 +-
 tests/i915/i915_pciid.c              |   4 +-
 tools/i915-perf/i915_perf_configs.c  |   2 +-
 tools/i915-perf/i915_perf_reader.c   |   5 +-
 tools/i915-perf/i915_perf_recorder.c |   6 +-
 12 files changed, 114 insertions(+), 69 deletions(-)
lib/i915/perf.c +2 -2
index 5644a346..9d5ab7a5 100644
@@ -169,7 +169,7 @@ intel_perf_for_devinfo(uint32_t device_id,
 	 * 2x6 does not have 2 samplers).
 	 */
 	perf->devinfo.devid = device_id;
-	perf->devinfo.gen = devinfo->gen;
+	perf->devinfo.graphics_ver = devinfo->graphics_ver;
 	perf->devinfo.revision = revision;
 	perf->devinfo.timestamp_frequency = timestamp_frequency;
 	perf->devinfo.gt_min_freq = gt_min_freq;
@@ -183,7 +183,7 @@ intel_perf_for_devinfo(uint32_t device_id,
 	/* On Gen11+ the equations from the xml files expect an 8bits
 	 * mask per subslice, versus only 3bits on prior Gens.
 	 */
-	bits_per_subslice = devinfo->gen >= 11 ? 8 : 3;
+	bits_per_subslice = devinfo->graphics_ver >= 11 ? 8 : 3;
 	for (uint32_t s = 0; s < topology->max_slices; s++) {
 		if (!slice_available(topology, s))
 			continue;
lib/i915/perf.h +1 -1
index 6a39be92..d2429c47 100644
@@ -50,7 +50,7 @@ struct intel_perf_devinfo {
 	 * Their values are build up from the topology fields.
 	 */
 	uint32_t devid;
-	uint32_t gen;
+	uint32_t graphics_ver;
 	uint32_t revision;
 	uint64_t timestamp_frequency;
 	uint64_t gt_min_freq;
lib/i915/perf_data_reader.c +3 -3
index 79cb50f4..e69189ac 100644
@@ -45,11 +45,11 @@ oa_report_ctx_is_valid(const struct intel_perf_devinfo *devinfo,
 {
 	const uint32_t *report = (const uint32_t *) _report;
 
-	if (devinfo->gen < 8) {
+	if (devinfo->graphics_ver < 8) {
 		return false; /* TODO */
-	} else if (devinfo->gen == 8) {
+	} else if (devinfo->graphics_ver == 8) {
 		return report[0] & (1ul << 25);
-	} else if (devinfo->gen > 8) {
+	} else if (devinfo->graphics_ver > 8) {
 		return report[0] & (1ul << 16);
 	}
 
lib/igt_device_scan.c +1 -1
index 2b7d9a3a..3c23fe0e 100644
@@ -208,7 +208,7 @@ static char *devname_intel(uint16_t vendor, uint16_t device)
 		if (devname) {
 			devname[0] = toupper(devname[0]);
 			igt_assert(asprintf(&s, "Intel %s (Gen%u)", devname,
-					    ffs(info->gen)) != -1);
+					    info->graphics_ver) != -1);
 			free(devname);
 		}
 	}
lib/igt_gt.c +5 -5
index f601d726..b1415178 100644
@@ -552,18 +552,18 @@ bool gem_class_can_store_dword(int fd, int class)
 {
 	uint16_t devid = intel_get_drm_devid(fd);
 	const struct intel_device_info *info = intel_get_device_info(devid);
-	const int gen = ffs(info->gen);
+	const int ver = info->graphics_ver;
 
-	if (info->gen == 0) /* unknown, assume it just works */
+	if (ver == 0) /* unknown, assume it just works */
 		return true;
 
-	if (gen <= 2) /* requires physical addresses */
+	if (ver <= 2) /* requires physical addresses */
 		return false;
 
-	if (gen == 3 && (info->is_grantsdale || info->is_alviso))
+	if (ver == 3 && (info->is_grantsdale || info->is_alviso))
 		return false; /* only supports physical addresses */
 
-	if (gen == 6 && class == I915_ENGINE_CLASS_VIDEO)
+	if (ver == 6 && class == I915_ENGINE_CLASS_VIDEO)
 		return false; /* broken, unbelievably broken */
 
 	if (info->is_broadwater)
lib/intel_chipset.h +4 -3
index f766021e..8e81ffa9 100644
@@ -37,7 +37,8 @@ struct pci_device *intel_get_pci_device(void);
 uint32_t intel_get_drm_devid(int fd);
 
 struct intel_device_info {
-	unsigned gen;
+	unsigned graphics_ver;
+	unsigned display_ver;
 	unsigned gt; /* 0 if unknown */
 	bool is_mobile : 1;
 	bool is_whitney : 1;
@@ -179,8 +180,8 @@ void intel_check_pch(void);
 #define IS_DG1(devid)		(intel_get_device_info(devid)->is_dg1)
 #define IS_ALDERLAKE_S(devid)	(intel_get_device_info(devid)->is_alderlake_s)
 
-#define IS_GEN(devid, x)	(intel_get_device_info(devid)->gen & (1u << ((x)-1)))
-#define AT_LEAST_GEN(devid, x)	(intel_get_device_info(devid)->gen & -(1u << ((x)-1)))
+#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)
 
 #define IS_GEN2(devid)		IS_GEN(devid, 2)
 #define IS_GEN3(devid)		IS_GEN(devid, 3)
lib/intel_device_info.c +87 -44
index e07fdf6f..4ab236e4 100644
@@ -4,154 +4,180 @@
 #include <strings.h> /* ffs() */
 
 static const struct intel_device_info intel_generic_info = {
-	.gen = 0,
+	.graphics_ver = 0,
+	.display_ver = 0,
 };
 
 static const struct intel_device_info intel_i810_info = {
-	.gen = BIT(0),
+	.graphics_ver = 1,
+	.display_ver = 1,
 	.is_whitney = true,
 	.codename = "solano" /* 815 == "whitney" ? or vice versa? */
 };
 
 static const struct intel_device_info intel_i815_info = {
-	.gen = BIT(0),
+	.graphics_ver = 1,
+	.display_ver = 1,
 	.is_whitney = true,
 	.codename = "whitney"
 };
 
 static const struct intel_device_info intel_i830_info = {
-	.gen = BIT(1),
+	.graphics_ver = 2,
+	.display_ver = 2,
 	.is_almador = true,
 	.codename = "almador"
 };
 static const struct intel_device_info intel_i845_info = {
-	.gen = BIT(1),
+	.graphics_ver = 2,
+	.display_ver = 2,
 	.is_brookdale = true,
 	.codename = "brookdale"
 };
 static const struct intel_device_info intel_i855_info = {
-	.gen = BIT(1),
+	.graphics_ver = 2,
+	.display_ver = 2,
 	.is_mobile = true,
 	.is_montara = true,
 	.codename = "montara"
 };
 static const struct intel_device_info intel_i865_info = {
-	.gen = BIT(1),
+	.graphics_ver = 2,
+	.display_ver = 2,
 	.is_springdale = true,
 	.codename = "spingdale"
 };
 
 static const struct intel_device_info intel_i915_info = {
-	.gen = BIT(2),
+	.graphics_ver = 3,
+	.display_ver = 3,
 	.is_grantsdale = true,
 	.codename = "grantsdale"
 };
 static const struct intel_device_info intel_i915m_info = {
-	.gen = BIT(2),
+	.graphics_ver = 3,
+	.display_ver = 3,
 	.is_mobile = true,
 	.is_alviso = true,
 	.codename = "alviso"
 };
 static const struct intel_device_info intel_i945_info = {
-	.gen = BIT(2),
+	.graphics_ver = 3,
+	.display_ver = 3,
 	.is_lakeport = true,
 	.codename = "lakeport"
 };
 static const struct intel_device_info intel_i945m_info = {
-	.gen = BIT(2),
+	.graphics_ver = 3,
+	.display_ver = 3,
 	.is_mobile = true,
 	.is_calistoga = true,
 	.codename = "calistoga"
 };
 
 static const struct intel_device_info intel_g33_info = {
-	.gen = BIT(2),
+	.graphics_ver = 3,
+	.display_ver = 3,
 	.is_bearlake = true,
 	.codename = "bearlake"
 };
 
 static const struct intel_device_info intel_pineview_g_info = {
-	.gen = BIT(2),
+	.graphics_ver = 3,
+	.display_ver = 3,
 	.is_pineview = true,
 	.codename = "pineview"
 };
 
 static const struct intel_device_info intel_pineview_m_info = {
-	.gen = BIT(2),
+	.graphics_ver = 3,
+	.display_ver = 3,
 	.is_mobile = true,
 	.is_pineview = true,
 	.codename = "pineview"
 };
 
 static const struct intel_device_info intel_i965_info = {
-	.gen = BIT(3),
+	.graphics_ver = 4,
+	.display_ver = 4,
 	.is_broadwater = true,
 	.codename = "broadwater"
 };
 
 static const struct intel_device_info intel_i965m_info = {
-	.gen = BIT(3),
+	.graphics_ver = 4,
+	.display_ver = 4,
 	.is_mobile = true,
 	.is_crestline = true,
 	.codename = "crestline"
 };
 
 static const struct intel_device_info intel_g45_info = {
-	.gen = BIT(3),
+	.graphics_ver = 4,
+	.display_ver = 4,
 	.is_eaglelake = true,
 	.codename = "eaglelake"
 };
 static const struct intel_device_info intel_gm45_info = {
-	.gen = BIT(3),
+	.graphics_ver = 4,
+	.display_ver = 4,
 	.is_mobile = true,
 	.is_cantiga = true,
 	.codename = "cantiga"
 };
 
 static const struct intel_device_info intel_ironlake_info = {
-	.gen = BIT(4),
+	.graphics_ver = 5,
+	.display_ver = 5,
 	.is_ironlake = true,
 	.codename = "ironlake" /* clarkdale? */
 };
 static const struct intel_device_info intel_ironlake_m_info = {
-	.gen = BIT(4),
+	.graphics_ver = 5,
+	.display_ver = 5,
 	.is_mobile = true,
 	.is_arrandale = true,
 	.codename = "arrandale"
 };
 
 static const struct intel_device_info intel_sandybridge_info = {
-	.gen = BIT(5),
+	.graphics_ver = 6,
+	.display_ver = 6,
 	.is_sandybridge = true,
 	.codename = "sandybridge"
 };
 static const struct intel_device_info intel_sandybridge_m_info = {
-	.gen = BIT(5),
+	.graphics_ver = 6,
+	.display_ver = 6,
 	.is_mobile = true,
 	.is_sandybridge = true,
 	.codename = "sandybridge"
 };
 
 static const struct intel_device_info intel_ivybridge_info = {
-	.gen = BIT(6),
+	.graphics_ver = 7,
+	.display_ver = 7,
 	.is_ivybridge = true,
 	.codename = "ivybridge"
 };
 static const struct intel_device_info intel_ivybridge_m_info = {
-	.gen = BIT(6),
+	.graphics_ver = 7,
+	.display_ver = 7,
 	.is_mobile = true,
 	.is_ivybridge = true,
 	.codename = "ivybridge"
 };
 
 static const struct intel_device_info intel_valleyview_info = {
-	.gen = BIT(6),
+	.graphics_ver = 7,
+	.display_ver = 7,
 	.is_valleyview = true,
 	.codename = "valleyview"
 };
 
 #define HASWELL_FIELDS \
-	.gen = BIT(6), \
+	.graphics_ver = 7, \
+	.display_ver = 7, \
 	.is_haswell = true, \
 	.codename = "haswell"
 
@@ -171,7 +197,8 @@ static const struct intel_device_info intel_haswell_gt3_info = {
 };
 
 #define BROADWELL_FIELDS \
-	.gen = BIT(7), \
+	.graphics_ver = 8, \
+	.display_ver = 8, \
 	.is_broadwell = true, \
 	.codename = "broadwell"
 
@@ -195,13 +222,15 @@ static const struct intel_device_info intel_broadwell_unknown_info = {
 };
 
 static const struct intel_device_info intel_cherryview_info = {
-	.gen = BIT(7),
+	.graphics_ver = 8,
+	.display_ver = 8,
 	.is_cherryview = true,
 	.codename = "cherryview"
 };
 
 #define SKYLAKE_FIELDS \
-	.gen = BIT(8), \
+	.graphics_ver = 9, \
+	.display_ver = 9, \
 	.codename = "skylake", \
 	.is_skylake = true
 
@@ -226,13 +255,15 @@ static const struct intel_device_info intel_skylake_gt4_info = {
 };
 
 static const struct intel_device_info intel_broxton_info = {
-	.gen = BIT(8),
+	.graphics_ver = 9,
+	.display_ver = 9,
 	.is_broxton = true,
 	.codename = "broxton"
 };
 
 #define KABYLAKE_FIELDS \
-	.gen = BIT(8), \
+	.graphics_ver = 9, \
+	.display_ver = 9, \
 	.is_kabylake = true, \
 	.codename = "kabylake"
 
@@ -257,13 +288,15 @@ static const struct intel_device_info intel_kabylake_gt4_info = {
 };
 
 static const struct intel_device_info intel_geminilake_info = {
-	.gen = BIT(8),
+	.graphics_ver = 9,
+	.display_ver = 9,
 	.is_geminilake = true,
 	.codename = "geminilake"
 };
 
 #define COFFEELAKE_FIELDS \
-	.gen = BIT(8), \
+	.graphics_ver = 9, \
+	.display_ver = 9, \
 	.is_coffeelake = true, \
 	.codename = "coffeelake"
 
@@ -283,7 +316,8 @@ static const struct intel_device_info intel_coffeelake_gt3_info = {
 };
 
 #define COMETLAKE_FIELDS \
-	.gen = BIT(8), \
+	.graphics_ver = 9, \
+	.display_ver = 9, \
 	.is_cometlake = true, \
 	.codename = "cometlake"
 
@@ -298,57 +332,66 @@ static const struct intel_device_info intel_cometlake_gt2_info = {
 };
 
 static const struct intel_device_info intel_cannonlake_info = {
-	.gen = BIT(9),
+	.graphics_ver = 10,
+	.display_ver = 10,
 	.is_cannonlake = true,
 	.codename = "cannonlake"
 };
 
 static const struct intel_device_info intel_icelake_info = {
-	.gen = BIT(10),
+	.graphics_ver = 11,
+	.display_ver = 11,
 	.is_icelake = true,
 	.codename = "icelake"
 };
 
 static const struct intel_device_info intel_elkhartlake_info = {
-	.gen = BIT(10),
+	.graphics_ver = 11,
+	.display_ver = 11,
 	.is_elkhartlake = true,
 	.codename = "elkhartlake"
 };
 
 static const struct intel_device_info intel_jasperlake_info = {
-	.gen = BIT(10),
+	.graphics_ver = 11,
+	.display_ver = 11,
 	.is_jasperlake = true,
 	.codename = "jasperlake"
 };
 
 static const struct intel_device_info intel_tigerlake_gt1_info = {
-	.gen = BIT(11),
+	.graphics_ver = 12,
+	.display_ver = 12,
 	.is_tigerlake = true,
 	.codename = "tigerlake",
 	.gt = 1,
 };
 
 static const struct intel_device_info intel_tigerlake_gt2_info = {
-	.gen = BIT(11),
+	.graphics_ver = 12,
+	.display_ver = 12,
 	.is_tigerlake = true,
 	.codename = "tigerlake",
 	.gt = 2,
 };
 
 static const struct intel_device_info intel_rocketlake_info = {
-	.gen = BIT(11),
+	.graphics_ver = 12,
+	.display_ver = 12,
 	.is_rocketlake = true,
 	.codename = "rocketlake"
 };
 
 static const struct intel_device_info intel_dg1_info = {
-	.gen = BIT(11),
+	.graphics_ver = 12,
+	.display_ver = 12,
 	.is_dg1 = true,
 	.codename = "dg1"
 };
 
 static const struct intel_device_info intel_alderlake_s_info = {
-	.gen = BIT(11),
+	.graphics_ver = 12,
+	.display_ver = 12,
 	.is_alderlake_s = true,
 	.codename = "alderlake_s"
 };
@@ -490,5 +533,5 @@ out:
  */
 unsigned intel_gen(uint16_t devid)
 {
-	return ffs(intel_get_device_info(devid)->gen) ?: -1u;
+	return intel_get_device_info(devid)->graphics_ver ?: -1u;
 }
tests/i915/gem_exec_store.c +2 -2
index 99ffc9ab..2df0b27f 100644
@@ -310,7 +310,7 @@ static int print_welcome(int fd)
 	int err;
 
 	igt_info("Running on %s (pci-id %04x, gen %d)\n",
-		 info->codename, devid, ffs(info->gen));
+		 info->codename, devid, info->graphics_ver);
 	igt_info("Can use MI_STORE_DWORD(virtual)? %s\n",
 		 gem_can_store_dword(fd, 0) ? "yes" : "no");
 
@@ -320,7 +320,7 @@ static int print_welcome(int fd)
 	igt_info("GPU operation? %s [errno=%d]\n",
 		 err == 0 ? "yes" : "no", err);
 
-	return ffs(info->gen);
+	return info->graphics_ver;
 }
 
 #define test_each_engine(T, i915, e)  \
tests/i915/i915_pciid.c +2 -2
index fe4db405..7de44ff2 100644
@@ -49,13 +49,13 @@ static bool has_known_intel_chipset(int fd)
 		return false;
 	}
 
-	if (!info->gen) {
+	if (!info->graphics_ver) {
 		igt_warn("Unknown PCI-ID: %04x\n", devid);
 		return false;
 	}
 
 	igt_info("PCI-ID: %#04x, gen %d, %s\n",
-		 devid, ffs(info->gen), info->codename);
+		 devid, info->graphics_ver, info->codename);
 	return true;
 }
 
tools/i915-perf/i915_perf_configs.c +1 -1
index 2a0283c9..bce3bd0f 100644
@@ -228,7 +228,7 @@ main(int argc, char *argv[])
 		return EXIT_FAILURE;
 	}
 
-	fprintf(stdout, "Device gen=%i gt=%i\n", devinfo->gen, devinfo->gt);
+	fprintf(stdout, "Device graphics_ver=%i gt=%i\n", devinfo->graphics_ver, devinfo->gt);
 
 	perf = intel_perf_for_fd(drm_fd);
 	if (!perf) {
tools/i915-perf/i915_perf_reader.c +3 -2
index 3e4a6530..e51f5a5d 100644
@@ -220,8 +220,9 @@ main(int argc, char *argv[])
 
 	devinfo = intel_get_device_info(reader.devinfo.devid);
 
-	fprintf(stdout, "Recorded on device=0x%x(%s) gen=%i\n",
-		reader.devinfo.devid, devinfo->codename, reader.devinfo.gen);
+	fprintf(stdout, "Recorded on device=0x%x(%s) graphics_ver=%i\n",
+		reader.devinfo.devid, devinfo->codename,
+		reader.devinfo.graphics_ver);
 	fprintf(stdout, "Metric used : %s (%s) uuid=%s\n",
 		reader.metric_set->symbol_name, reader.metric_set->name,
 		reader.metric_set->hw_config_guid);
tools/i915-perf/i915_perf_recorder.c +2 -2
index 3a8ee46a..00195290 100644
@@ -317,14 +317,14 @@ get_device_timestamp_frequency(const struct intel_device_info *devinfo, int drm_
 	if (perf_ioctl(drm_fd, DRM_IOCTL_I915_GETPARAM, &gp) == 0)
 		return timestamp_frequency;
 
-	if (devinfo->gen > 9) {
+	if (devinfo->graphics_ver > 9) {
 		fprintf(stderr, "Unable to query timestamp frequency from i915, please update kernel.\n");
 		return 0;
 	}
 
 	fprintf(stderr, "Warning: unable to query timestamp frequency from i915, guessing values...\n");
 
-	if (devinfo->gen <= 8)
+	if (devinfo->graphics_ver <= 8)
 		return 12500000;
 	if (devinfo->is_broxton)
 		return 19200000;

tools/i915-perf/i915_perf_recorder.c main(int argc, char *argv[]) · line 884

Quoted 8 lines
tools/i915-perf/i915_perf_recorder.c +1 -1
@@ -878,7 +878,7 @@ main(int argc, char *argv[])
 	}
 
 	fprintf(stdout, "Device name=%s gen=%i gt=%i id=0x%x\n",
-		ctx.devinfo->codename, ctx.devinfo->gen, ctx.devinfo->gt, ctx.devid);
+		ctx.devinfo->codename, ctx.devinfo->graphics_ver, ctx.devinfo->gt, ctx.devid);
 
 	ctx.topology = get_topology(ctx.drm_fd, &ctx.topology_size);
 	if (!ctx.topology) {

_______________________________________________
igt-dev mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/igt-dev

#3 lore raw

Re: [igt-dev] [PATCH i-g-t 1/6] lib/i915: Split 'gen' into graphics version and display version

In reply to Matt Roper
Quoted 593 lines · Matt Roper

Going forward, platforms may have separate architecture versions for graphics and display and should no longer utilize a single 'gen' version.

While doing this, let's change the versions to raw version values rather than BIT(v) as we were doing in the past. It looks like some of the existing uses of devinfo->gen were already misinterpreting this field and failing to pass the value through ffs(), so this change may also fix some bugs.

---
 lib/i915/perf.c                      |   4 +-
 lib/i915/perf.h                      |   2 +-
 lib/i915/perf_data_reader.c          |   6 +-
 lib/igt_device_scan.c                |   2 +-
 lib/igt_gt.c                         |  10 +-
 lib/intel_chipset.h                  |   7 +-
 lib/intel_device_info.c              | 131 ++++++++++++++++++---------
 tests/i915/gem_exec_store.c          |   4 +-
 tests/i915/i915_pciid.c              |   4 +-
 tools/i915-perf/i915_perf_configs.c  |   2 +-
 tools/i915-perf/i915_perf_reader.c   |   5 +-
 tools/i915-perf/i915_perf_recorder.c |   6 +-
 12 files changed, 114 insertions(+), 69 deletions(-)
lib/i915/perf.c +2 -2
index 5644a346..9d5ab7a5 100644
@@ -169,7 +169,7 @@ intel_perf_for_devinfo(uint32_t device_id,
 	 * 2x6 does not have 2 samplers).
 	 */
 	perf->devinfo.devid = device_id;
-	perf->devinfo.gen = devinfo->gen;
+	perf->devinfo.graphics_ver = devinfo->graphics_ver;
 	perf->devinfo.revision = revision;
 	perf->devinfo.timestamp_frequency = timestamp_frequency;
 	perf->devinfo.gt_min_freq = gt_min_freq;
@@ -183,7 +183,7 @@ intel_perf_for_devinfo(uint32_t device_id,
 	/* On Gen11+ the equations from the xml files expect an 8bits
 	 * mask per subslice, versus only 3bits on prior Gens.
 	 */
-	bits_per_subslice = devinfo->gen >= 11 ? 8 : 3;
+	bits_per_subslice = devinfo->graphics_ver >= 11 ? 8 : 3;
 	for (uint32_t s = 0; s < topology->max_slices; s++) {
 		if (!slice_available(topology, s))
 			continue;
lib/i915/perf.h +1 -1
index 6a39be92..d2429c47 100644
@@ -50,7 +50,7 @@ struct intel_perf_devinfo {
 	 * Their values are build up from the topology fields.
 	 */
 	uint32_t devid;
-	uint32_t gen;
+	uint32_t graphics_ver;
 	uint32_t revision;
 	uint64_t timestamp_frequency;
 	uint64_t gt_min_freq;
lib/i915/perf_data_reader.c +3 -3
index 79cb50f4..e69189ac 100644
@@ -45,11 +45,11 @@ oa_report_ctx_is_valid(const struct intel_perf_devinfo *devinfo,
 {
 	const uint32_t *report = (const uint32_t *) _report;
 
-	if (devinfo->gen < 8) {
+	if (devinfo->graphics_ver < 8) {
 		return false; /* TODO */
-	} else if (devinfo->gen == 8) {
+	} else if (devinfo->graphics_ver == 8) {
 		return report[0] & (1ul << 25);
-	} else if (devinfo->gen > 8) {
+	} else if (devinfo->graphics_ver > 8) {
 		return report[0] & (1ul << 16);
 	}
 
lib/igt_device_scan.c +1 -1
index 2b7d9a3a..3c23fe0e 100644
@@ -208,7 +208,7 @@ static char *devname_intel(uint16_t vendor, uint16_t device)
 		if (devname) {
 			devname[0] = toupper(devname[0]);
 			igt_assert(asprintf(&s, "Intel %s (Gen%u)", devname,
-					    ffs(info->gen)) != -1);
+					    info->graphics_ver) != -1);
 			free(devname);
 		}
 	}
lib/igt_gt.c +5 -5
index f601d726..b1415178 100644
@@ -552,18 +552,18 @@ bool gem_class_can_store_dword(int fd, int class)
 {
 	uint16_t devid = intel_get_drm_devid(fd);
 	const struct intel_device_info *info = intel_get_device_info(devid);
-	const int gen = ffs(info->gen);
+	const int ver = info->graphics_ver;
 
-	if (info->gen == 0) /* unknown, assume it just works */
+	if (ver == 0) /* unknown, assume it just works */
 		return true;
 
-	if (gen <= 2) /* requires physical addresses */
+	if (ver <= 2) /* requires physical addresses */
 		return false;
 
-	if (gen == 3 && (info->is_grantsdale || info->is_alviso))
+	if (ver == 3 && (info->is_grantsdale || info->is_alviso))
 		return false; /* only supports physical addresses */
 
-	if (gen == 6 && class == I915_ENGINE_CLASS_VIDEO)
+	if (ver == 6 && class == I915_ENGINE_CLASS_VIDEO)
 		return false; /* broken, unbelievably broken */
 
 	if (info->is_broadwater)
lib/intel_chipset.h +4 -3
index f766021e..8e81ffa9 100644
@@ -37,7 +37,8 @@ struct pci_device *intel_get_pci_device(void);
 uint32_t intel_get_drm_devid(int fd);
 
 struct intel_device_info {
-	unsigned gen;
+	unsigned graphics_ver;
+	unsigned display_ver;
 	unsigned gt; /* 0 if unknown */
 	bool is_mobile : 1;
 	bool is_whitney : 1;
@@ -179,8 +180,8 @@ void intel_check_pch(void);
 #define IS_DG1(devid)		(intel_get_device_info(devid)->is_dg1)
 #define IS_ALDERLAKE_S(devid)	(intel_get_device_info(devid)->is_alderlake_s)
 
-#define IS_GEN(devid, x)	(intel_get_device_info(devid)->gen & (1u << ((x)-1)))
-#define AT_LEAST_GEN(devid, x)	(intel_get_device_info(devid)->gen & -(1u << ((x)-1)))
+#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)
 
 #define IS_GEN2(devid)		IS_GEN(devid, 2)
 #define IS_GEN3(devid)		IS_GEN(devid, 3)
lib/intel_device_info.c +87 -44
index e07fdf6f..4ab236e4 100644
@@ -4,154 +4,180 @@
 #include <strings.h> /* ffs() */
 
 static const struct intel_device_info intel_generic_info = {
-	.gen = 0,
+	.graphics_ver = 0,
+	.display_ver = 0,
 };
 
 static const struct intel_device_info intel_i810_info = {
-	.gen = BIT(0),
+	.graphics_ver = 1,
+	.display_ver = 1,
 	.is_whitney = true,
 	.codename = "solano" /* 815 == "whitney" ? or vice versa? */
 };
 
 static const struct intel_device_info intel_i815_info = {
-	.gen = BIT(0),
+	.graphics_ver = 1,
+	.display_ver = 1,
 	.is_whitney = true,
 	.codename = "whitney"
 };
 
 static const struct intel_device_info intel_i830_info = {
-	.gen = BIT(1),
+	.graphics_ver = 2,
+	.display_ver = 2,
 	.is_almador = true,
 	.codename = "almador"
 };
 static const struct intel_device_info intel_i845_info = {
-	.gen = BIT(1),
+	.graphics_ver = 2,
+	.display_ver = 2,
 	.is_brookdale = true,
 	.codename = "brookdale"
 };
 static const struct intel_device_info intel_i855_info = {
-	.gen = BIT(1),
+	.graphics_ver = 2,
+	.display_ver = 2,
 	.is_mobile = true,
 	.is_montara = true,
 	.codename = "montara"
 };
 static const struct intel_device_info intel_i865_info = {
-	.gen = BIT(1),
+	.graphics_ver = 2,
+	.display_ver = 2,
 	.is_springdale = true,
 	.codename = "spingdale"
 };
 
 static const struct intel_device_info intel_i915_info = {
-	.gen = BIT(2),
+	.graphics_ver = 3,
+	.display_ver = 3,
 	.is_grantsdale = true,
 	.codename = "grantsdale"
 };
 static const struct intel_device_info intel_i915m_info = {
-	.gen = BIT(2),
+	.graphics_ver = 3,
+	.display_ver = 3,
 	.is_mobile = true,
 	.is_alviso = true,
 	.codename = "alviso"
 };
 static const struct intel_device_info intel_i945_info = {
-	.gen = BIT(2),
+	.graphics_ver = 3,
+	.display_ver = 3,
 	.is_lakeport = true,
 	.codename = "lakeport"
 };
 static const struct intel_device_info intel_i945m_info = {
-	.gen = BIT(2),
+	.graphics_ver = 3,
+	.display_ver = 3,
 	.is_mobile = true,
 	.is_calistoga = true,
 	.codename = "calistoga"
 };
 
 static const struct intel_device_info intel_g33_info = {
-	.gen = BIT(2),
+	.graphics_ver = 3,
+	.display_ver = 3,
 	.is_bearlake = true,
 	.codename = "bearlake"
 };
 
 static const struct intel_device_info intel_pineview_g_info = {
-	.gen = BIT(2),
+	.graphics_ver = 3,
+	.display_ver = 3,
 	.is_pineview = true,
 	.codename = "pineview"
 };
 
 static const struct intel_device_info intel_pineview_m_info = {
-	.gen = BIT(2),
+	.graphics_ver = 3,
+	.display_ver = 3,
 	.is_mobile = true,
 	.is_pineview = true,
 	.codename = "pineview"
 };
 
 static const struct intel_device_info intel_i965_info = {
-	.gen = BIT(3),
+	.graphics_ver = 4,
+	.display_ver = 4,
 	.is_broadwater = true,
 	.codename = "broadwater"
 };
 
 static const struct intel_device_info intel_i965m_info = {
-	.gen = BIT(3),
+	.graphics_ver = 4,
+	.display_ver = 4,
 	.is_mobile = true,
 	.is_crestline = true,
 	.codename = "crestline"
 };
 
 static const struct intel_device_info intel_g45_info = {
-	.gen = BIT(3),
+	.graphics_ver = 4,
+	.display_ver = 4,
 	.is_eaglelake = true,
 	.codename = "eaglelake"
 };
 static const struct intel_device_info intel_gm45_info = {
-	.gen = BIT(3),
+	.graphics_ver = 4,
+	.display_ver = 4,
 	.is_mobile = true,
 	.is_cantiga = true,
 	.codename = "cantiga"
 };
 
 static const struct intel_device_info intel_ironlake_info = {
-	.gen = BIT(4),
+	.graphics_ver = 5,
+	.display_ver = 5,
 	.is_ironlake = true,
 	.codename = "ironlake" /* clarkdale? */
 };
 static const struct intel_device_info intel_ironlake_m_info = {
-	.gen = BIT(4),
+	.graphics_ver = 5,
+	.display_ver = 5,
 	.is_mobile = true,
 	.is_arrandale = true,
 	.codename = "arrandale"
 };
 
 static const struct intel_device_info intel_sandybridge_info = {
-	.gen = BIT(5),
+	.graphics_ver = 6,
+	.display_ver = 6,
 	.is_sandybridge = true,
 	.codename = "sandybridge"
 };
 static const struct intel_device_info intel_sandybridge_m_info = {
-	.gen = BIT(5),
+	.graphics_ver = 6,
+	.display_ver = 6,
 	.is_mobile = true,
 	.is_sandybridge = true,
 	.codename = "sandybridge"
 };
 
 static const struct intel_device_info intel_ivybridge_info = {
-	.gen = BIT(6),
+	.graphics_ver = 7,
+	.display_ver = 7,
 	.is_ivybridge = true,
 	.codename = "ivybridge"
 };
 static const struct intel_device_info intel_ivybridge_m_info = {
-	.gen = BIT(6),
+	.graphics_ver = 7,
+	.display_ver = 7,
 	.is_mobile = true,
 	.is_ivybridge = true,
 	.codename = "ivybridge"
 };
 
 static const struct intel_device_info intel_valleyview_info = {
-	.gen = BIT(6),
+	.graphics_ver = 7,
+	.display_ver = 7,
 	.is_valleyview = true,
 	.codename = "valleyview"
 };
 
 #define HASWELL_FIELDS \
-	.gen = BIT(6), \
+	.graphics_ver = 7, \
+	.display_ver = 7, \
 	.is_haswell = true, \
 	.codename = "haswell"
 
@@ -171,7 +197,8 @@ static const struct intel_device_info intel_haswell_gt3_info = {
 };
 
 #define BROADWELL_FIELDS \
-	.gen = BIT(7), \
+	.graphics_ver = 8, \
+	.display_ver = 8, \
 	.is_broadwell = true, \
 	.codename = "broadwell"
 
@@ -195,13 +222,15 @@ static const struct intel_device_info intel_broadwell_unknown_info = {
 };
 
 static const struct intel_device_info intel_cherryview_info = {
-	.gen = BIT(7),
+	.graphics_ver = 8,
+	.display_ver = 8,
 	.is_cherryview = true,
 	.codename = "cherryview"
 };
 
 #define SKYLAKE_FIELDS \
-	.gen = BIT(8), \
+	.graphics_ver = 9, \
+	.display_ver = 9, \
 	.codename = "skylake", \
 	.is_skylake = true
 
@@ -226,13 +255,15 @@ static const struct intel_device_info intel_skylake_gt4_info = {
 };
 
 static const struct intel_device_info intel_broxton_info = {
-	.gen = BIT(8),
+	.graphics_ver = 9,
+	.display_ver = 9,
 	.is_broxton = true,
 	.codename = "broxton"
 };
 
 #define KABYLAKE_FIELDS \
-	.gen = BIT(8), \
+	.graphics_ver = 9, \
+	.display_ver = 9, \
 	.is_kabylake = true, \
 	.codename = "kabylake"
 
@@ -257,13 +288,15 @@ static const struct intel_device_info intel_kabylake_gt4_info = {
 };
 
 static const struct intel_device_info intel_geminilake_info = {
-	.gen = BIT(8),
+	.graphics_ver = 9,
+	.display_ver = 9,
 	.is_geminilake = true,
 	.codename = "geminilake"
 };
 
 #define COFFEELAKE_FIELDS \
-	.gen = BIT(8), \
+	.graphics_ver = 9, \
+	.display_ver = 9, \
 	.is_coffeelake = true, \
 	.codename = "coffeelake"
 
@@ -283,7 +316,8 @@ static const struct intel_device_info intel_coffeelake_gt3_info = {
 };
 
 #define COMETLAKE_FIELDS \
-	.gen = BIT(8), \
+	.graphics_ver = 9, \
+	.display_ver = 9, \
 	.is_cometlake = true, \
 	.codename = "cometlake"
 
@@ -298,57 +332,66 @@ static const struct intel_device_info intel_cometlake_gt2_info = {
 };
 
 static const struct intel_device_info intel_cannonlake_info = {
-	.gen = BIT(9),
+	.graphics_ver = 10,
+	.display_ver = 10,
 	.is_cannonlake = true,
 	.codename = "cannonlake"
 };
 
 static const struct intel_device_info intel_icelake_info = {
-	.gen = BIT(10),
+	.graphics_ver = 11,
+	.display_ver = 11,
 	.is_icelake = true,
 	.codename = "icelake"
 };
 
 static const struct intel_device_info intel_elkhartlake_info = {
-	.gen = BIT(10),
+	.graphics_ver = 11,
+	.display_ver = 11,
 	.is_elkhartlake = true,
 	.codename = "elkhartlake"
 };
 
 static const struct intel_device_info intel_jasperlake_info = {
-	.gen = BIT(10),
+	.graphics_ver = 11,
+	.display_ver = 11,
 	.is_jasperlake = true,
 	.codename = "jasperlake"
 };
 
 static const struct intel_device_info intel_tigerlake_gt1_info = {
-	.gen = BIT(11),
+	.graphics_ver = 12,
+	.display_ver = 12,
 	.is_tigerlake = true,
 	.codename = "tigerlake",
 	.gt = 1,
 };
 
 static const struct intel_device_info intel_tigerlake_gt2_info = {
-	.gen = BIT(11),
+	.graphics_ver = 12,
+	.display_ver = 12,
 	.is_tigerlake = true,
 	.codename = "tigerlake",
 	.gt = 2,
 };
 
 static const struct intel_device_info intel_rocketlake_info = {
-	.gen = BIT(11),
+	.graphics_ver = 12,
+	.display_ver = 12,
 	.is_rocketlake = true,
 	.codename = "rocketlake"
 };
 
 static const struct intel_device_info intel_dg1_info = {
-	.gen = BIT(11),
+	.graphics_ver = 12,
+	.display_ver = 12,
 	.is_dg1 = true,
 	.codename = "dg1"
 };
 
 static const struct intel_device_info intel_alderlake_s_info = {
-	.gen = BIT(11),
+	.graphics_ver = 12,
+	.display_ver = 12,
 	.is_alderlake_s = true,
 	.codename = "alderlake_s"
 };
@@ -490,5 +533,5 @@ out:
  */
 unsigned intel_gen(uint16_t devid)
 {
-	return ffs(intel_get_device_info(devid)->gen) ?: -1u;
+	return intel_get_device_info(devid)->graphics_ver ?: -1u;
 }
tests/i915/gem_exec_store.c +2 -2
index 99ffc9ab..2df0b27f 100644
@@ -310,7 +310,7 @@ static int print_welcome(int fd)
 	int err;
 
 	igt_info("Running on %s (pci-id %04x, gen %d)\n",
-		 info->codename, devid, ffs(info->gen));
+		 info->codename, devid, info->graphics_ver);
 	igt_info("Can use MI_STORE_DWORD(virtual)? %s\n",
 		 gem_can_store_dword(fd, 0) ? "yes" : "no");
 
@@ -320,7 +320,7 @@ static int print_welcome(int fd)
 	igt_info("GPU operation? %s [errno=%d]\n",
 		 err == 0 ? "yes" : "no", err);
 
-	return ffs(info->gen);
+	return info->graphics_ver;
 }
 
 #define test_each_engine(T, i915, e)  \
tests/i915/i915_pciid.c +2 -2
index fe4db405..7de44ff2 100644
@@ -49,13 +49,13 @@ static bool has_known_intel_chipset(int fd)
 		return false;
 	}
 
-	if (!info->gen) {
+	if (!info->graphics_ver) {
 		igt_warn("Unknown PCI-ID: %04x\n", devid);
 		return false;
 	}
 
 	igt_info("PCI-ID: %#04x, gen %d, %s\n",
-		 devid, ffs(info->gen), info->codename);
+		 devid, info->graphics_ver, info->codename);
 	return true;
 }
 
tools/i915-perf/i915_perf_configs.c +1 -1
index 2a0283c9..bce3bd0f 100644
@@ -228,7 +228,7 @@ main(int argc, char *argv[])
 		return EXIT_FAILURE;
 	}
 
-	fprintf(stdout, "Device gen=%i gt=%i\n", devinfo->gen, devinfo->gt);
+	fprintf(stdout, "Device graphics_ver=%i gt=%i\n", devinfo->graphics_ver, devinfo->gt);
 
 	perf = intel_perf_for_fd(drm_fd);
 	if (!perf) {
tools/i915-perf/i915_perf_reader.c +3 -2
index 3e4a6530..e51f5a5d 100644
@@ -220,8 +220,9 @@ main(int argc, char *argv[])
 
 	devinfo = intel_get_device_info(reader.devinfo.devid);
 
-	fprintf(stdout, "Recorded on device=0x%x(%s) gen=%i\n",
-		reader.devinfo.devid, devinfo->codename, reader.devinfo.gen);
+	fprintf(stdout, "Recorded on device=0x%x(%s) graphics_ver=%i\n",
+		reader.devinfo.devid, devinfo->codename,
+		reader.devinfo.graphics_ver);
 	fprintf(stdout, "Metric used : %s (%s) uuid=%s\n",
 		reader.metric_set->symbol_name, reader.metric_set->name,
 		reader.metric_set->hw_config_guid);
tools/i915-perf/i915_perf_recorder.c +0 -0
index 3a8ee46a..00195290 100644
@@ -317,14 +317,14 @@ get_device_timestamp_frequency(const struct intel_device_info *devinfo, int drm_
 	if (perf_ioctl(drm_fd, DRM_IOCTL_I915_GETPARAM, &gp) == 0)
 		return timestamp_frequency;
 

tools/i915-perf/i915_perf_recorder.c get_device_timestamp_frequency(const struct intel_device_info *devinfo, int drm_ · line 327

Quoted 10 lines
tools/i915-perf/i915_perf_recorder.c +2 -2
-	if (devinfo->gen > 9) {
+	if (devinfo->graphics_ver > 9) {
 		fprintf(stderr, "Unable to query timestamp frequency from i915, please update kernel.\n");
 		return 0;
 	}
 
 	fprintf(stderr, "Warning: unable to query timestamp frequency from i915, guessing values...\n");
 
-	if (devinfo->gen <= 8)
+	if (devinfo->graphics_ver <= 8)

Nit but I guess would be better to have a prior patch changing those cases that was using devinfo->gen wrongly and change those to intel_gen(). So a future bisect will point to the prior patch for this places that had bugs.

tools/i915-perf/i915_perf_recorder.c main(int argc, char *argv[]) · line 884

Quoted 12 lines
tools/i915-perf/i915_perf_recorder.c +1 -1
 		return 12500000;
 	if (devinfo->is_broxton)
 		return 19200000;
@@ -878,7 +878,7 @@ main(int argc, char *argv[])
 	}
 
 	fprintf(stdout, "Device name=%s gen=%i gt=%i id=0x%x\n",
-		ctx.devinfo->codename, ctx.devinfo->gen, ctx.devinfo->gt, ctx.devid);
+		ctx.devinfo->codename, ctx.devinfo->graphics_ver, ctx.devinfo->gt, ctx.devid);
 
 	ctx.topology = get_topology(ctx.drm_fd, &ctx.topology_size);
 	if (!ctx.topology) {

_______________________________________________
igt-dev mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/igt-dev

author
#4 lore raw

PATCH 2/6 lib/i915: Add intel_display_ver() and use it in display tests/libs

In reply to Matt Roper

Display code should check the display version of the platform rather than the graphics version; on some platforms these versions won't be the same.

---
 lib/igt_draw.c                   | 12 ++++++------
 lib/igt_fb.c                     | 14 +++++++-------
 lib/intel_chipset.h              |  1 +
 lib/intel_device_info.c          | 14 ++++++++++++++
 tests/kms_atomic_transition.c    |  2 +-
 tests/kms_big_fb.c               | 10 +++++-----
 tests/kms_ccs.c                  |  2 +-
 tests/kms_draw_crc.c             |  2 +-
 tests/kms_flip_scaled_crc.c      |  2 +-
 tests/kms_flip_tiling.c          |  2 +-
 tests/kms_frontbuffer_tracking.c |  4 ++--
 tests/kms_getfb.c                |  2 +-
 tests/kms_hdmi_inject.c          |  2 +-
 tests/kms_panel_fitting.c        |  2 +-
 tests/kms_plane.c                |  2 +-
 tests/kms_plane_lowres.c         |  4 ++--
 tests/kms_plane_scaling.c        |  8 ++++----
 tests/kms_rotation_crc.c         |  8 ++++----
 tests/kms_universal_plane.c      |  2 +-
 19 files changed, 55 insertions(+), 40 deletions(-)
lib/igt_draw.c +6 -6
index a3144b50..295de022 100644
@@ -339,7 +339,7 @@ static void draw_rect_mmap_cpu(int fd, struct buf_data *buf, struct rect *rect,
 
 	/* We didn't implement suport for the older tiling methods yet. */
 	if (tiling != I915_TILING_NONE)
-		igt_require(intel_gen(intel_get_drm_devid(fd)) >= 5);
+		igt_require(intel_display_ver(intel_get_drm_devid(fd)) >= 5);
 
 	ptr = gem_mmap__cpu(fd, buf->handle, 0, PAGE_ALIGN(buf->size),
 			    PROT_READ | PROT_WRITE);
@@ -389,7 +389,7 @@ static void draw_rect_mmap_wc(int fd, struct buf_data *buf, struct rect *rect,
 
 	/* We didn't implement suport for the older tiling methods yet. */
 	if (tiling != I915_TILING_NONE)
-		igt_require(intel_gen(intel_get_drm_devid(fd)) >= 5);
+		igt_require(intel_display_ver(intel_get_drm_devid(fd)) >= 5);
 
 	ptr = gem_mmap__wc(fd, buf->handle, 0, PAGE_ALIGN(buf->size),
 			   PROT_READ | PROT_WRITE);
@@ -440,7 +440,7 @@ static void draw_rect_pwrite_tiled(int fd, struct buf_data *buf,
 	int pixels_written = 0;
 
 	/* We didn't implement suport for the older tiling methods yet. */
-	igt_require(intel_gen(intel_get_drm_devid(fd)) >= 5);
+	igt_require(intel_display_ver(intel_get_drm_devid(fd)) >= 5);
 
 	pixel_size = buf->bpp / 8;
 	tmp_size = sizeof(tmp) / pixel_size;
@@ -536,7 +536,7 @@ static void draw_rect_blt(int fd, struct cmd_data *cmd_data,
 	struct intel_buf *dst;
 	int blt_cmd_len, blt_cmd_tiling, blt_cmd_depth;
 	uint32_t devid = intel_get_drm_devid(fd);
-	int gen = intel_gen(devid);
+	int ver = intel_display_ver(devid);
 	int pitch;
 
 	dst = create_buf(fd, cmd_data->bops, buf, tiling);
@@ -557,9 +557,9 @@ static void draw_rect_blt(int fd, struct cmd_data *cmd_data,
 		igt_assert(false);
 	}
 
-	blt_cmd_len = (gen >= 8) ?  0x5 : 0x4;
+	blt_cmd_len = (ver >= 8) ?  0x5 : 0x4;
 	blt_cmd_tiling = (tiling) ? XY_COLOR_BLT_TILED : 0;
-	pitch = (gen >= 4 && tiling) ? buf->stride / 4 : buf->stride;
+	pitch = (ver >= 4 && tiling) ? buf->stride / 4 : buf->stride;
 
 	switch_blt_tiling(ibb, tiling, true);
 
lib/igt_fb.c +7 -7
index 3e6841fd..585ede38 100644
@@ -408,7 +408,7 @@ void igt_get_fb_tile_size(int fd, uint64_t modifier, int fb_bpp,
 		break;
 	case LOCAL_I915_FORMAT_MOD_X_TILED:
 		igt_require_intel(fd);
-		if (intel_gen(intel_get_drm_devid(fd)) == 2) {
+		if (intel_display_ver(intel_get_drm_devid(fd)) == 2) {
 			*width_ret = 128;
 			*height_ret = 16;
 		} else {
@@ -422,7 +422,7 @@ void igt_get_fb_tile_size(int fd, uint64_t modifier, int fb_bpp,
 	case LOCAL_I915_FORMAT_MOD_Y_TILED_GEN12_RC_CCS_CC:
 	case LOCAL_I915_FORMAT_MOD_Y_TILED_GEN12_MC_CCS:
 		igt_require_intel(fd);
-		if (intel_gen(intel_get_drm_devid(fd)) == 2) {
+		if (intel_display_ver(intel_get_drm_devid(fd)) == 2) {
 			*width_ret = 128;
 			*height_ret = 16;
 		} else if (IS_915(intel_get_drm_devid(fd))) {
@@ -693,7 +693,7 @@ static uint32_t calc_plane_stride(struct igt_fb *fb, int plane)
 
 	if (fb->modifier != LOCAL_DRM_FORMAT_MOD_NONE &&
 	    is_i915_device(fb->fd) &&
-	    intel_gen(intel_get_drm_devid(fb->fd)) <= 3) {
+	    intel_display_ver(intel_get_drm_devid(fb->fd)) <= 3) {
 		uint32_t stride;
 
 		/* Round the tiling up to the next power-of-two and the region
@@ -758,7 +758,7 @@ static uint64_t calc_plane_size(struct igt_fb *fb, int plane)
 {
 	if (fb->modifier != LOCAL_DRM_FORMAT_MOD_NONE &&
 	    is_i915_device(fb->fd) &&
-	    intel_gen(intel_get_drm_devid(fb->fd)) <= 3) {
+	    intel_display_ver(intel_get_drm_devid(fb->fd)) <= 3) {
 		uint64_t min_size = (uint64_t) fb->strides[plane] *
 			fb->plane_height[plane];
 		uint64_t size;
@@ -2118,12 +2118,12 @@ struct fb_blit_upload {
 
 static bool fast_blit_ok(const struct igt_fb *fb)
 {
-	int gen = intel_gen(intel_get_drm_devid(fb->fd));
+	int ver = intel_display_ver(intel_get_drm_devid(fb->fd));
 
-	if (gen < 9)
+	if (ver < 9)
 		return false;
 
-	if (gen < 12)
+	if (ver < 12)
 		return true;
 
 	return fb->modifier != I915_FORMAT_MOD_X_TILED;
lib/intel_chipset.h +1 -0
index 8e81ffa9..87b3bbc4 100644
@@ -84,6 +84,7 @@ struct intel_device_info {
 const struct intel_device_info *intel_get_device_info(uint16_t devid) __attribute__((pure));
 
 unsigned intel_gen(uint16_t devid) __attribute__((pure));
+unsigned intel_display_ver(uint16_t devid) __attribute__((pure));
 
 extern enum pch_type intel_pch;
 
lib/intel_device_info.c +14 -0
index 4ab236e4..0c09f5cd 100644
@@ -535,3 +535,17 @@ unsigned intel_gen(uint16_t devid)
 {
 	return intel_get_device_info(devid)->graphics_ver ?: -1u;
 }
+
+/**
+ * intel_display_ver:
+ * @devid: pci device id
+ *
+ * Computes the Intel GFX display version for the given device id.
+ *
+ * Returns:
+ * The display version on successful lookup, -1u on failure.
+ */
+unsigned intel_display_ver(uint16_t devid)
+{
+	return intel_get_device_info(devid)->display_ver ?: -1u;
+}
tests/kms_atomic_transition.c +1 -1
index d8085ef3..f4131071 100644
@@ -141,7 +141,7 @@ static bool skip_plane(data_t *data, igt_plane_t *plane)
 	if (plane->type == DRM_PLANE_TYPE_CURSOR)
 		return false;
 
-	if (intel_gen(intel_get_drm_devid(data->drm_fd)) < 11)
+	if (intel_display_ver(intel_get_drm_devid(data->drm_fd)) < 11)
 		return false;
 
 	/*
tests/kms_big_fb.c +5 -5
index b35727a0..81bf0542 100644
@@ -153,7 +153,7 @@ static bool size_ok(data_t *data, uint64_t size)
 	 * The kernel limits scanout to the
 	 * mappable portion of ggtt on gmch platforms.
 	 */
-	if ((intel_gen(data->devid) < 5 ||
+	if ((intel_display_ver(data->devid) < 5 ||
 	     IS_VALLEYVIEW(data->devid) ||
 	     IS_CHERRYVIEW(data->devid)) &&
 	    size > data->mappable_size / 2)
@@ -182,7 +182,7 @@ static void max_fb_size(data_t *data, int *width, int *height,
 	*height = data->max_fb_height;
 
 	/* max fence stride is only 8k bytes on gen3 */
-	if (intel_gen(data->devid) < 4 &&
+	if (intel_display_ver(data->devid) < 4 &&
 	    format == DRM_FORMAT_XRGB8888)
 		*width = min(*width, 8192 / 4);
 
@@ -553,7 +553,7 @@ test_addfb(data_t *data)
 	 * max fb size of 4k pixels, hence we can't test
 	 * with 32bpp and must use 16bpp instead.
 	 */
-	if (intel_gen(data->devid) == 3)
+	if (intel_display_ver(data->devid) == 3)
 		format = DRM_FORMAT_RGB565;
 	else
 		format = DRM_FORMAT_XRGB8888;
@@ -570,7 +570,7 @@ test_addfb(data_t *data)
 	bo = gem_create(data->drm_fd, size);
 	igt_require(bo);
 
-	if (intel_gen(data->devid) < 4)
+	if (intel_display_ver(data->devid) < 4)
 		gem_set_tiling(data->drm_fd, bo,
 			       igt_fb_mod_to_tiling(data->modifier), strides[0]);
 
@@ -660,7 +660,7 @@ igt_main
 		 * On gen2 we could use either, but let's go for the
 		 * blitter there as well.
 		 */
-		if (intel_gen(data.devid) >= 4)
+		if (intel_display_ver(data.devid) >= 4)
 			data.render_copy = igt_get_render_copyfunc(data.devid);
 
 		data.bops = buf_ops_create(data.drm_fd);
tests/kms_ccs.c +1 -1
index 01e3b979..a3eac1f8 100644
@@ -573,7 +573,7 @@ igt_main_args("cs:", NULL, help_str, opt_handler, &data)
 	igt_fixture {
 		data.drm_fd = drm_open_driver_master(DRIVER_INTEL);
 
-		igt_require(intel_gen(intel_get_drm_devid(data.drm_fd)) >= 9);
+		igt_require(intel_display_ver(intel_get_drm_devid(data.drm_fd)) >= 9);
 		kmstest_set_vt_graphics_mode();
 		igt_require_pipe_crc(data.drm_fd);
 
tests/kms_draw_crc.c +1 -1
index e1fdcef6..dcda2e04 100644
@@ -245,7 +245,7 @@ static void fill_fb_subtest(void)
 	get_fill_crc(LOCAL_I915_FORMAT_MOD_X_TILED, &crc);
 	igt_assert_crc_equal(&crc, &base_crc);
 
-	if (intel_gen(intel_get_drm_devid(drm_fd)) >= 9) {
+	if (intel_display_ver(intel_get_drm_devid(drm_fd)) >= 9) {
 		get_fill_crc(LOCAL_I915_FORMAT_MOD_Y_TILED, &crc);
 		igt_assert_crc_equal(&crc, &base_crc);
 	}
tests/kms_flip_scaled_crc.c +1 -1
index bb796caf..d81ad352 100644
@@ -261,7 +261,7 @@ igt_main
 
 	igt_fixture {
 		data.drm_fd = drm_open_driver_master(DRIVER_INTEL);
-		data.gen = intel_gen(intel_get_drm_devid(data.drm_fd));
+		data.gen = intel_display_ver(intel_get_drm_devid(data.drm_fd));
 		igt_require(data.gen >= 9);
 		igt_display_require(&data.display, data.drm_fd);
 		igt_require(data.display.is_atomic);
tests/kms_flip_tiling.c +1 -1
index 09e99580..573cc337 100644
@@ -155,7 +155,7 @@ igt_main
 {
 	igt_fixture {
 		data.drm_fd = drm_open_driver_master(DRIVER_INTEL);
-		data.gen = intel_gen(intel_get_drm_devid(data.drm_fd));
+		data.gen = intel_display_ver(intel_get_drm_devid(data.drm_fd));
 
 		data.testformat = DRM_FORMAT_XRGB8888;
 
tests/kms_frontbuffer_tracking.c +2 -2
index 906caa4c..97902c08 100644
@@ -2647,7 +2647,7 @@ static void scaledprimary_subtest(const struct test_mode *t)
 	struct igt_fb new_fb, *old_fb;
 	struct modeset_params *params = pick_params(t);
 	struct fb_region *reg = &params->primary;
-	int gen = intel_gen(intel_get_drm_devid(drm.fd));
+	int gen = intel_display_ver(intel_get_drm_devid(drm.fd));
 	int src_y_upscale = ALIGN(reg->h / 4, 4);
 
 	igt_require_f(gen >= 9,
@@ -2831,7 +2831,7 @@ static void farfromfence_subtest(const struct test_mode *t)
 	struct draw_pattern_info *pattern = &pattern1;
 	struct fb_region *target;
 	int max_height, assertions = 0;
-	int gen = intel_gen(intel_get_drm_devid(drm.fd));
+	int gen = intel_display_ver(intel_get_drm_devid(drm.fd));
 
 	igt_skip_on(t->method == IGT_DRAW_MMAP_GTT &&
 		    !gem_has_mappable_ggtt(drm.fd));
tests/kms_getfb.c +1 -1
index 917b57bb..14be74d6 100644
@@ -92,7 +92,7 @@ static void get_ccs_fb(int fd, struct drm_mode_fb_cmd2 *ret)
 	igt_require(has_addfb2_iface(fd));
 	igt_require_intel(fd);
 
-	if ((intel_gen(intel_get_drm_devid(fd))) >= 12) {
+	if ((intel_display_ver(intel_get_drm_devid(fd))) >= 12) {
 		add.modifier[0] = I915_FORMAT_MOD_Y_TILED_GEN12_RC_CCS;
 		add.modifier[1] = I915_FORMAT_MOD_Y_TILED_GEN12_RC_CCS;
 
tests/kms_hdmi_inject.c +1 -1
index 1769df08..b47b8a39 100644
@@ -87,7 +87,7 @@ hdmi_inject_4k(int drm_fd, drmModeConnector *connector)
 	devid = intel_get_drm_devid(drm_fd);
 
 	/* 4K requires at least HSW */
-	igt_require(IS_HASWELL(devid) || intel_gen(devid) >= 8);
+	igt_require(IS_HASWELL(devid) || intel_display_ver(devid) >= 8);
 
 	edid = igt_kms_get_4k_edid();
 	kmstest_force_edid(drm_fd, connector, edid);
tests/kms_panel_fitting.c +1 -1
index 1623f34e..3e42d148 100644
@@ -243,7 +243,7 @@ static void test_atomic_fastset(data_t *data)
 		if (stat("/sys/module/i915/parameters/fastboot", &sb) == 0)
 			igt_set_module_param_int(data->drm_fd, "fastboot", 1);
 
-		igt_require(intel_gen(intel_get_drm_devid(display->drm_fd)) >= 5);
+		igt_require(intel_display_ver(intel_get_drm_devid(display->drm_fd)) >= 5);
 	}
 
 	igt_require(display->is_atomic);
tests/kms_plane.c +1 -1
index d7cbe892..ba419bbd 100644
@@ -999,7 +999,7 @@ static bool skip_plane(data_t *data, igt_plane_t *plane)
 	if (plane->type == DRM_PLANE_TYPE_CURSOR)
 		return false;
 
-	if (intel_gen(intel_get_drm_devid(data->drm_fd)) < 11)
+	if (intel_display_ver(intel_get_drm_devid(data->drm_fd)) < 11)
 		return false;
 
 	/*
tests/kms_plane_lowres.c +2 -2
index a4def89f..7fd02180 100644
@@ -80,14 +80,14 @@ static igt_plane_t *first_sdr_plane(igt_output_t *output, uint32_t devid)
 {
         int index;
 
-        index = intel_gen(devid) <= 9 ? 0 : SDR_PLANE_BASE;
+        index = intel_display_ver(devid) <= 9 ? 0 : SDR_PLANE_BASE;
 
         return igt_output_get_plane(output, index);
 }
 
 static bool is_sdr_plane(const igt_plane_t *plane, uint32_t devid)
 {
-        if (intel_gen(devid) <= 9)
+        if (intel_display_ver(devid) <= 9)
                 return true;
 
         return plane->index >= SDR_PLANE_BASE;
tests/kms_plane_scaling.c +4 -4
index 7464b5bd..2aa46ac8 100644
@@ -52,9 +52,9 @@ static int get_num_scalers(data_t* d, enum pipe pipe)
 	if (!is_i915_device(d->drm_fd))
 		return 1;
 
-	igt_require(intel_gen(d->devid) >= 9);
+	igt_require(intel_display_ver(d->devid) >= 9);
 
-	if (intel_gen(d->devid) >= 10)
+	if (intel_display_ver(d->devid) >= 10)
 		return 2;
 	else if (pipe != PIPE_C)
 		return 2;
@@ -167,7 +167,7 @@ static bool can_rotate(data_t *d, unsigned format, uint64_t tiling,
 
 	switch (format) {
 	case DRM_FORMAT_RGB565:
-		if (intel_gen(d->devid) >= 11)
+		if (intel_display_ver(d->devid) >= 11)
 			break;
 		/* fall through */
 	case DRM_FORMAT_C8:
@@ -198,7 +198,7 @@ static bool can_scale(data_t *d, unsigned format)
 	case DRM_FORMAT_XBGR16161616F:
 	case DRM_FORMAT_ARGB16161616F:
 	case DRM_FORMAT_ABGR16161616F:
-		if (intel_gen(d->devid) >= 11)
+		if (intel_display_ver(d->devid) >= 11)
 			return true;
 		/* fall through */
 	case DRM_FORMAT_C8:
tests/kms_rotation_crc.c +4 -4
index bcbb9bdc..20556c82 100644
@@ -517,7 +517,7 @@ static void test_plane_rotation(data_t *data, int plane_type, bool test_bad_form
 			/* Only support partial covering primary plane on gen9+ */
 			if (is_amdgpu_device(data->gfx_fd) ||
 				(plane_type == DRM_PLANE_TYPE_PRIMARY &&
-			    intel_gen(intel_get_drm_devid(data->gfx_fd)) < 9)) {
+			    intel_display_ver(intel_get_drm_devid(data->gfx_fd)) < 9)) {
 				if (i != rectangle)
 					continue;
 				else
@@ -730,12 +730,12 @@ static void test_multi_plane_rotation(data_t *data, enum pipe pipe)
 						 */
 						if (p[0].format == DRM_FORMAT_RGB565 &&
 						     (planeconfigs[i].rotation & (IGT_ROTATION_90 | IGT_ROTATION_270))
-						     && intel_gen(data->devid) < 11)
+						     && intel_display_ver(data->devid) < 11)
 							continue;
 
 						if (p[1].format == DRM_FORMAT_RGB565 &&
 						     (planeconfigs[j].rotation & (IGT_ROTATION_90 | IGT_ROTATION_270))
-						     && intel_gen(data->devid) < 11)
+						     && intel_display_ver(data->devid) < 11)
 							continue;
 						/*
 						 * if using packed formats crc's will be
@@ -1024,7 +1024,7 @@ igt_main_args("", long_opts, help_str, opt_handler, &data)
 		data.gfx_fd = drm_open_driver_master(DRIVER_INTEL | DRIVER_AMDGPU);
 		if (is_i915_device(data.gfx_fd)) {
 			data.devid = intel_get_drm_devid(data.gfx_fd);
-			gen = intel_gen(data.devid);
+			gen = intel_display_ver(data.devid);
 		}
 
 		kmstest_set_vt_graphics_mode();
tests/kms_universal_plane.c +1 -1
index aae3fc52..26e5e8eb 100644
@@ -798,7 +798,7 @@ igt_main
 
 	igt_fixture {
 		data.drm_fd = drm_open_driver_master(DRIVER_INTEL);
-		data.gen = intel_gen(intel_get_drm_devid(data.drm_fd));
+		data.gen = intel_display_ver(intel_get_drm_devid(data.drm_fd));
 
 		kmstest_set_vt_graphics_mode();
 
Signature · 6 lines
2.25.4

_______________________________________________
igt-dev mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/igt-dev
Reviewed-by on v1 2/6
#5 lore raw

Re: [igt-dev] [PATCH i-g-t 2/6] lib/i915: Add intel_display_ver() and use it in display tests/libs

Quoted 68 lines · Matt Roper

Display code should check the display version of the platform rather than the graphics version; on some platforms these versions won't be the same.

---
 lib/igt_draw.c                   | 12 ++++++------
 lib/igt_fb.c                     | 14 +++++++-------
 lib/intel_chipset.h              |  1 +
 lib/intel_device_info.c          | 14 ++++++++++++++
 tests/kms_atomic_transition.c    |  2 +-
 tests/kms_big_fb.c               | 10 +++++-----
 tests/kms_ccs.c                  |  2 +-
 tests/kms_draw_crc.c             |  2 +-
 tests/kms_flip_scaled_crc.c      |  2 +-
 tests/kms_flip_tiling.c          |  2 +-
 tests/kms_frontbuffer_tracking.c |  4 ++--
 tests/kms_getfb.c                |  2 +-
 tests/kms_hdmi_inject.c          |  2 +-
 tests/kms_panel_fitting.c        |  2 +-
 tests/kms_plane.c                |  2 +-
 tests/kms_plane_lowres.c         |  4 ++--
 tests/kms_plane_scaling.c        |  8 ++++----
 tests/kms_rotation_crc.c         |  8 ++++----
 tests/kms_universal_plane.c      |  2 +-
 19 files changed, 55 insertions(+), 40 deletions(-)
lib/igt_draw.c +4 -4
index a3144b50..295de022 100644
@@ -339,7 +339,7 @@ static void draw_rect_mmap_cpu(int fd, struct buf_data *buf, struct rect *rect,
 
 	/* We didn't implement suport for the older tiling methods yet. */
 	if (tiling != I915_TILING_NONE)
-		igt_require(intel_gen(intel_get_drm_devid(fd)) >= 5);
+		igt_require(intel_display_ver(intel_get_drm_devid(fd)) >= 5);
 
 	ptr = gem_mmap__cpu(fd, buf->handle, 0, PAGE_ALIGN(buf->size),
 			    PROT_READ | PROT_WRITE);
@@ -389,7 +389,7 @@ static void draw_rect_mmap_wc(int fd, struct buf_data *buf, struct rect *rect,
 
 	/* We didn't implement suport for the older tiling methods yet. */
 	if (tiling != I915_TILING_NONE)
-		igt_require(intel_gen(intel_get_drm_devid(fd)) >= 5);
+		igt_require(intel_display_ver(intel_get_drm_devid(fd)) >= 5);
 
 	ptr = gem_mmap__wc(fd, buf->handle, 0, PAGE_ALIGN(buf->size),
 			   PROT_READ | PROT_WRITE);
@@ -440,7 +440,7 @@ static void draw_rect_pwrite_tiled(int fd, struct buf_data *buf,
 	int pixels_written = 0;
 
 	/* We didn't implement suport for the older tiling methods yet. */
-	igt_require(intel_gen(intel_get_drm_devid(fd)) >= 5);
+	igt_require(intel_display_ver(intel_get_drm_devid(fd)) >= 5);
 
 	pixel_size = buf->bpp / 8;
 	tmp_size = sizeof(tmp) / pixel_size;
@@ -536,7 +536,7 @@ static void draw_rect_blt(int fd, struct cmd_data *cmd_data,
 	struct intel_buf *dst;
 	int blt_cmd_len, blt_cmd_tiling, blt_cmd_depth;
 	uint32_t devid = intel_get_drm_devid(fd);
-	int gen = intel_gen(devid);
+	int ver = intel_display_ver(devid);
 	int pitch;
 
 	dst = create_buf(fd, cmd_data->bops, buf, tiling);

lib/igt_draw.c static void draw_rect_blt(int fd, struct cmd_data *cmd_data, · line 564

Quoted 10 lines
lib/igt_draw.c +2 -2
@@ -557,9 +557,9 @@ static void draw_rect_blt(int fd, struct cmd_data *cmd_data,
 		igt_assert(false);
 	}
 
-	blt_cmd_len = (gen >= 8) ?  0x5 : 0x4;
+	blt_cmd_len = (ver >= 8) ?  0x5 : 0x4;
 	blt_cmd_tiling = (tiling) ? XY_COLOR_BLT_TILED : 0;
-	pitch = (gen >= 4 && tiling) ? buf->stride / 4 : buf->stride;
+	pitch = (ver >= 4 && tiling) ? buf->stride / 4 : buf->stride;
 
 	switch_blt_tiling(ibb, tiling, true);

draw_rect_blt() don't look like it should check display version, it is using gen/ver to check handle differences in the blt instruction.

Quoted 376 lines
lib/igt_fb.c +7 -7
index 3e6841fd..585ede38 100644
@@ -408,7 +408,7 @@ void igt_get_fb_tile_size(int fd, uint64_t modifier, int fb_bpp,
 		break;
 	case LOCAL_I915_FORMAT_MOD_X_TILED:
 		igt_require_intel(fd);
-		if (intel_gen(intel_get_drm_devid(fd)) == 2) {
+		if (intel_display_ver(intel_get_drm_devid(fd)) == 2) {
 			*width_ret = 128;
 			*height_ret = 16;
 		} else {
@@ -422,7 +422,7 @@ void igt_get_fb_tile_size(int fd, uint64_t modifier, int fb_bpp,
 	case LOCAL_I915_FORMAT_MOD_Y_TILED_GEN12_RC_CCS_CC:
 	case LOCAL_I915_FORMAT_MOD_Y_TILED_GEN12_MC_CCS:
 		igt_require_intel(fd);
-		if (intel_gen(intel_get_drm_devid(fd)) == 2) {
+		if (intel_display_ver(intel_get_drm_devid(fd)) == 2) {
 			*width_ret = 128;
 			*height_ret = 16;
 		} else if (IS_915(intel_get_drm_devid(fd))) {
@@ -693,7 +693,7 @@ static uint32_t calc_plane_stride(struct igt_fb *fb, int plane)
 
 	if (fb->modifier != LOCAL_DRM_FORMAT_MOD_NONE &&
 	    is_i915_device(fb->fd) &&
-	    intel_gen(intel_get_drm_devid(fb->fd)) <= 3) {
+	    intel_display_ver(intel_get_drm_devid(fb->fd)) <= 3) {
 		uint32_t stride;
 
 		/* Round the tiling up to the next power-of-two and the region
@@ -758,7 +758,7 @@ static uint64_t calc_plane_size(struct igt_fb *fb, int plane)
 {
 	if (fb->modifier != LOCAL_DRM_FORMAT_MOD_NONE &&
 	    is_i915_device(fb->fd) &&
-	    intel_gen(intel_get_drm_devid(fb->fd)) <= 3) {
+	    intel_display_ver(intel_get_drm_devid(fb->fd)) <= 3) {
 		uint64_t min_size = (uint64_t) fb->strides[plane] *
 			fb->plane_height[plane];
 		uint64_t size;
@@ -2118,12 +2118,12 @@ struct fb_blit_upload {
 
 static bool fast_blit_ok(const struct igt_fb *fb)
 {
-	int gen = intel_gen(intel_get_drm_devid(fb->fd));
+	int ver = intel_display_ver(intel_get_drm_devid(fb->fd));
 
-	if (gen < 9)
+	if (ver < 9)
 		return false;
 
-	if (gen < 12)
+	if (ver < 12)
 		return true;
 
 	return fb->modifier != I915_FORMAT_MOD_X_TILED;
lib/intel_chipset.h +1 -0
index 8e81ffa9..87b3bbc4 100644
@@ -84,6 +84,7 @@ struct intel_device_info {
 const struct intel_device_info *intel_get_device_info(uint16_t devid) __attribute__((pure));
 
 unsigned intel_gen(uint16_t devid) __attribute__((pure));
+unsigned intel_display_ver(uint16_t devid) __attribute__((pure));
 
 extern enum pch_type intel_pch;
 
lib/intel_device_info.c +14 -0
index 4ab236e4..0c09f5cd 100644
@@ -535,3 +535,17 @@ unsigned intel_gen(uint16_t devid)
 {
 	return intel_get_device_info(devid)->graphics_ver ?: -1u;
 }
+
+/**
+ * intel_display_ver:
+ * @devid: pci device id
+ *
+ * Computes the Intel GFX display version for the given device id.
+ *
+ * Returns:
+ * The display version on successful lookup, -1u on failure.
+ */
+unsigned intel_display_ver(uint16_t devid)
+{
+	return intel_get_device_info(devid)->display_ver ?: -1u;
+}
tests/kms_atomic_transition.c +1 -1
index d8085ef3..f4131071 100644
@@ -141,7 +141,7 @@ static bool skip_plane(data_t *data, igt_plane_t *plane)
 	if (plane->type == DRM_PLANE_TYPE_CURSOR)
 		return false;
 
-	if (intel_gen(intel_get_drm_devid(data->drm_fd)) < 11)
+	if (intel_display_ver(intel_get_drm_devid(data->drm_fd)) < 11)
 		return false;
 
 	/*
tests/kms_big_fb.c +5 -5
index b35727a0..81bf0542 100644
@@ -153,7 +153,7 @@ static bool size_ok(data_t *data, uint64_t size)
 	 * The kernel limits scanout to the
 	 * mappable portion of ggtt on gmch platforms.
 	 */
-	if ((intel_gen(data->devid) < 5 ||
+	if ((intel_display_ver(data->devid) < 5 ||
 	     IS_VALLEYVIEW(data->devid) ||
 	     IS_CHERRYVIEW(data->devid)) &&
 	    size > data->mappable_size / 2)
@@ -182,7 +182,7 @@ static void max_fb_size(data_t *data, int *width, int *height,
 	*height = data->max_fb_height;
 
 	/* max fence stride is only 8k bytes on gen3 */
-	if (intel_gen(data->devid) < 4 &&
+	if (intel_display_ver(data->devid) < 4 &&
 	    format == DRM_FORMAT_XRGB8888)
 		*width = min(*width, 8192 / 4);
 
@@ -553,7 +553,7 @@ test_addfb(data_t *data)
 	 * max fb size of 4k pixels, hence we can't test
 	 * with 32bpp and must use 16bpp instead.
 	 */
-	if (intel_gen(data->devid) == 3)
+	if (intel_display_ver(data->devid) == 3)
 		format = DRM_FORMAT_RGB565;
 	else
 		format = DRM_FORMAT_XRGB8888;
@@ -570,7 +570,7 @@ test_addfb(data_t *data)
 	bo = gem_create(data->drm_fd, size);
 	igt_require(bo);
 
-	if (intel_gen(data->devid) < 4)
+	if (intel_display_ver(data->devid) < 4)
 		gem_set_tiling(data->drm_fd, bo,
 			       igt_fb_mod_to_tiling(data->modifier), strides[0]);
 
@@ -660,7 +660,7 @@ igt_main
 		 * On gen2 we could use either, but let's go for the
 		 * blitter there as well.
 		 */
-		if (intel_gen(data.devid) >= 4)
+		if (intel_display_ver(data.devid) >= 4)
 			data.render_copy = igt_get_render_copyfunc(data.devid);
 
 		data.bops = buf_ops_create(data.drm_fd);
tests/kms_ccs.c +1 -1
index 01e3b979..a3eac1f8 100644
@@ -573,7 +573,7 @@ igt_main_args("cs:", NULL, help_str, opt_handler, &data)
 	igt_fixture {
 		data.drm_fd = drm_open_driver_master(DRIVER_INTEL);
 
-		igt_require(intel_gen(intel_get_drm_devid(data.drm_fd)) >= 9);
+		igt_require(intel_display_ver(intel_get_drm_devid(data.drm_fd)) >= 9);
 		kmstest_set_vt_graphics_mode();
 		igt_require_pipe_crc(data.drm_fd);
 
tests/kms_draw_crc.c +1 -1
index e1fdcef6..dcda2e04 100644
@@ -245,7 +245,7 @@ static void fill_fb_subtest(void)
 	get_fill_crc(LOCAL_I915_FORMAT_MOD_X_TILED, &crc);
 	igt_assert_crc_equal(&crc, &base_crc);
 
-	if (intel_gen(intel_get_drm_devid(drm_fd)) >= 9) {
+	if (intel_display_ver(intel_get_drm_devid(drm_fd)) >= 9) {
 		get_fill_crc(LOCAL_I915_FORMAT_MOD_Y_TILED, &crc);
 		igt_assert_crc_equal(&crc, &base_crc);
 	}
tests/kms_flip_scaled_crc.c +1 -1
index bb796caf..d81ad352 100644
@@ -261,7 +261,7 @@ igt_main
 
 	igt_fixture {
 		data.drm_fd = drm_open_driver_master(DRIVER_INTEL);
-		data.gen = intel_gen(intel_get_drm_devid(data.drm_fd));
+		data.gen = intel_display_ver(intel_get_drm_devid(data.drm_fd));
 		igt_require(data.gen >= 9);
 		igt_display_require(&data.display, data.drm_fd);
 		igt_require(data.display.is_atomic);
tests/kms_flip_tiling.c +1 -1
index 09e99580..573cc337 100644
@@ -155,7 +155,7 @@ igt_main
 {
 	igt_fixture {
 		data.drm_fd = drm_open_driver_master(DRIVER_INTEL);
-		data.gen = intel_gen(intel_get_drm_devid(data.drm_fd));
+		data.gen = intel_display_ver(intel_get_drm_devid(data.drm_fd));
 
 		data.testformat = DRM_FORMAT_XRGB8888;
 
tests/kms_frontbuffer_tracking.c +2 -2
index 906caa4c..97902c08 100644
@@ -2647,7 +2647,7 @@ static void scaledprimary_subtest(const struct test_mode *t)
 	struct igt_fb new_fb, *old_fb;
 	struct modeset_params *params = pick_params(t);
 	struct fb_region *reg = &params->primary;
-	int gen = intel_gen(intel_get_drm_devid(drm.fd));
+	int gen = intel_display_ver(intel_get_drm_devid(drm.fd));
 	int src_y_upscale = ALIGN(reg->h / 4, 4);
 
 	igt_require_f(gen >= 9,
@@ -2831,7 +2831,7 @@ static void farfromfence_subtest(const struct test_mode *t)
 	struct draw_pattern_info *pattern = &pattern1;
 	struct fb_region *target;
 	int max_height, assertions = 0;
-	int gen = intel_gen(intel_get_drm_devid(drm.fd));
+	int gen = intel_display_ver(intel_get_drm_devid(drm.fd));
 
 	igt_skip_on(t->method == IGT_DRAW_MMAP_GTT &&
 		    !gem_has_mappable_ggtt(drm.fd));
tests/kms_getfb.c +1 -1
index 917b57bb..14be74d6 100644
@@ -92,7 +92,7 @@ static void get_ccs_fb(int fd, struct drm_mode_fb_cmd2 *ret)
 	igt_require(has_addfb2_iface(fd));
 	igt_require_intel(fd);
 
-	if ((intel_gen(intel_get_drm_devid(fd))) >= 12) {
+	if ((intel_display_ver(intel_get_drm_devid(fd))) >= 12) {
 		add.modifier[0] = I915_FORMAT_MOD_Y_TILED_GEN12_RC_CCS;
 		add.modifier[1] = I915_FORMAT_MOD_Y_TILED_GEN12_RC_CCS;
 
tests/kms_hdmi_inject.c +1 -1
index 1769df08..b47b8a39 100644
@@ -87,7 +87,7 @@ hdmi_inject_4k(int drm_fd, drmModeConnector *connector)
 	devid = intel_get_drm_devid(drm_fd);
 
 	/* 4K requires at least HSW */
-	igt_require(IS_HASWELL(devid) || intel_gen(devid) >= 8);
+	igt_require(IS_HASWELL(devid) || intel_display_ver(devid) >= 8);
 
 	edid = igt_kms_get_4k_edid();
 	kmstest_force_edid(drm_fd, connector, edid);
tests/kms_panel_fitting.c +1 -1
index 1623f34e..3e42d148 100644
@@ -243,7 +243,7 @@ static void test_atomic_fastset(data_t *data)
 		if (stat("/sys/module/i915/parameters/fastboot", &sb) == 0)
 			igt_set_module_param_int(data->drm_fd, "fastboot", 1);
 
-		igt_require(intel_gen(intel_get_drm_devid(display->drm_fd)) >= 5);
+		igt_require(intel_display_ver(intel_get_drm_devid(display->drm_fd)) >= 5);
 	}
 
 	igt_require(display->is_atomic);
tests/kms_plane.c +1 -1
index d7cbe892..ba419bbd 100644
@@ -999,7 +999,7 @@ static bool skip_plane(data_t *data, igt_plane_t *plane)
 	if (plane->type == DRM_PLANE_TYPE_CURSOR)
 		return false;
 
-	if (intel_gen(intel_get_drm_devid(data->drm_fd)) < 11)
+	if (intel_display_ver(intel_get_drm_devid(data->drm_fd)) < 11)
 		return false;
 
 	/*
tests/kms_plane_lowres.c +2 -2
index a4def89f..7fd02180 100644
@@ -80,14 +80,14 @@ static igt_plane_t *first_sdr_plane(igt_output_t *output, uint32_t devid)
 {
         int index;
 
-        index = intel_gen(devid) <= 9 ? 0 : SDR_PLANE_BASE;
+        index = intel_display_ver(devid) <= 9 ? 0 : SDR_PLANE_BASE;
 
         return igt_output_get_plane(output, index);
 }
 
 static bool is_sdr_plane(const igt_plane_t *plane, uint32_t devid)
 {
-        if (intel_gen(devid) <= 9)
+        if (intel_display_ver(devid) <= 9)
                 return true;
 
         return plane->index >= SDR_PLANE_BASE;
tests/kms_plane_scaling.c +4 -4
index 7464b5bd..2aa46ac8 100644
@@ -52,9 +52,9 @@ static int get_num_scalers(data_t* d, enum pipe pipe)
 	if (!is_i915_device(d->drm_fd))
 		return 1;
 
-	igt_require(intel_gen(d->devid) >= 9);
+	igt_require(intel_display_ver(d->devid) >= 9);
 
-	if (intel_gen(d->devid) >= 10)
+	if (intel_display_ver(d->devid) >= 10)
 		return 2;
 	else if (pipe != PIPE_C)
 		return 2;
@@ -167,7 +167,7 @@ static bool can_rotate(data_t *d, unsigned format, uint64_t tiling,
 
 	switch (format) {
 	case DRM_FORMAT_RGB565:
-		if (intel_gen(d->devid) >= 11)
+		if (intel_display_ver(d->devid) >= 11)
 			break;
 		/* fall through */
 	case DRM_FORMAT_C8:
@@ -198,7 +198,7 @@ static bool can_scale(data_t *d, unsigned format)
 	case DRM_FORMAT_XBGR16161616F:
 	case DRM_FORMAT_ARGB16161616F:
 	case DRM_FORMAT_ABGR16161616F:
-		if (intel_gen(d->devid) >= 11)
+		if (intel_display_ver(d->devid) >= 11)
 			return true;
 		/* fall through */
 	case DRM_FORMAT_C8:
tests/kms_rotation_crc.c +4 -4
index bcbb9bdc..20556c82 100644
@@ -517,7 +517,7 @@ static void test_plane_rotation(data_t *data, int plane_type, bool test_bad_form
 			/* Only support partial covering primary plane on gen9+ */
 			if (is_amdgpu_device(data->gfx_fd) ||
 				(plane_type == DRM_PLANE_TYPE_PRIMARY &&
-			    intel_gen(intel_get_drm_devid(data->gfx_fd)) < 9)) {
+			    intel_display_ver(intel_get_drm_devid(data->gfx_fd)) < 9)) {
 				if (i != rectangle)
 					continue;
 				else
@@ -730,12 +730,12 @@ static void test_multi_plane_rotation(data_t *data, enum pipe pipe)
 						 */
 						if (p[0].format == DRM_FORMAT_RGB565 &&
 						     (planeconfigs[i].rotation & (IGT_ROTATION_90 | IGT_ROTATION_270))
-						     && intel_gen(data->devid) < 11)
+						     && intel_display_ver(data->devid) < 11)
 							continue;
 
 						if (p[1].format == DRM_FORMAT_RGB565 &&
 						     (planeconfigs[j].rotation & (IGT_ROTATION_90 | IGT_ROTATION_270))
-						     && intel_gen(data->devid) < 11)
+						     && intel_display_ver(data->devid) < 11)
 							continue;
 						/*
 						 * if using packed formats crc's will be
@@ -1024,7 +1024,7 @@ igt_main_args("", long_opts, help_str, opt_handler, &data)
 		data.gfx_fd = drm_open_driver_master(DRIVER_INTEL | DRIVER_AMDGPU);
 		if (is_i915_device(data.gfx_fd)) {
 			data.devid = intel_get_drm_devid(data.gfx_fd);
-			gen = intel_gen(data.devid);
+			gen = intel_display_ver(data.devid);
 		}
 
 		kmstest_set_vt_graphics_mode();
tests/kms_universal_plane.c +0 -0
index aae3fc52..26e5e8eb 100644

tests/kms_universal_plane.c igt_main · line 801

Quoted 5 lines
tests/kms_universal_plane.c +1 -1
@@ -798,7 +798,7 @@ igt_main
 
 	igt_fixture {
 		data.drm_fd = drm_open_driver_master(DRIVER_INTEL);
-		data.gen = intel_gen(intel_get_drm_devid(data.drm_fd));
+		data.gen = intel_display_ver(intel_get_drm_devid(data.drm_fd));

would be better rename data.gen too.

With those two changes:

tests/kms_universal_plane.c igt_main · line 803

Quoted 3 lines
tests/kms_universal_plane.c +0 -0
 		kmstest_set_vt_graphics_mode();
 

_______________________________________________
igt-dev mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/igt-dev

author
#6 lore raw

PATCH 3/6 lib/i915/adl-p: Basic ADL-P enabling

In reply to Matt Roper

From: Clint Taylor <[email protected]>

Cc Caz Yokoyama <[email protected]>
Cc Mika Kahola <[email protected]>
Cc Swati Sharma <[email protected]>
Cc Juha-Pekka Heikkilä <[email protected]>
---
 lib/intel_chipset.h     | 2 ++
 lib/intel_device_info.c | 8 ++++++++
 2 files changed, 10 insertions(+)
lib/intel_chipset.h +2 -0
index 87b3bbc4..2b795527 100644
@@ -78,6 +78,7 @@ struct intel_device_info {
 	bool is_rocketlake : 1;
 	bool is_dg1 : 1;
 	bool is_alderlake_s : 1;
+	bool is_alderlake_p : 1;
 	const char *codename;
 };
 
@@ -180,6 +181,7 @@ void intel_check_pch(void);
 #define IS_ROCKETLAKE(devid)	(intel_get_device_info(devid)->is_rocketlake)
 #define IS_DG1(devid)		(intel_get_device_info(devid)->is_dg1)
 #define IS_ALDERLAKE_S(devid)	(intel_get_device_info(devid)->is_alderlake_s)
+#define IS_ALDERLAKE_P(devid)	(intel_get_device_info(devid)->is_alderlake_p)
 
 #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)
lib/intel_device_info.c +8 -0
index 0c09f5cd..07338957 100644
@@ -396,6 +396,13 @@ static const struct intel_device_info intel_alderlake_s_info = {
 	.codename = "alderlake_s"
 };
 
+static const struct intel_device_info intel_alderlake_p_info = {
+	.graphics_ver = 12,
+	.display_ver = 13,
+	.is_alderlake_p = true,
+	.codename = "alderlake_p"
+};
+
 static const struct pci_id_match intel_device_match[] = {
 	INTEL_I810_IDS(&intel_i810_info),
 	INTEL_I815_IDS(&intel_i815_info),
@@ -487,6 +494,7 @@ static const struct pci_id_match intel_device_match[] = {
 	INTEL_DG1_IDS(&intel_dg1_info),
 
 	INTEL_ADLS_IDS(&intel_alderlake_s_info),
+	INTEL_ADLP_IDS(&intel_alderlake_p_info),
 
 	INTEL_VGA_DEVICE(PCI_MATCH_ANY, &intel_generic_info),
 };
Signature · 6 lines
2.25.4

_______________________________________________
igt-dev mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/igt-dev
Reviewed-by on v1 3/6
#7 lore raw

Re: [igt-dev] [PATCH i-g-t 3/6] lib/i915/adl-p: Basic ADL-P enabling

Quoted 2 lines · Matt Roper

From: Clint Taylor <[email protected]>

Quoted 50 lines
Cc Caz Yokoyama <[email protected]>
Cc Mika Kahola <[email protected]>
Cc Swati Sharma <[email protected]>
Cc Juha-Pekka Heikkilä <[email protected]>
---
 lib/intel_chipset.h     | 2 ++
 lib/intel_device_info.c | 8 ++++++++
 2 files changed, 10 insertions(+)
lib/intel_chipset.h +2 -0
index 87b3bbc4..2b795527 100644
@@ -78,6 +78,7 @@ struct intel_device_info {
 	bool is_rocketlake : 1;
 	bool is_dg1 : 1;
 	bool is_alderlake_s : 1;
+	bool is_alderlake_p : 1;
 	const char *codename;
 };
 
@@ -180,6 +181,7 @@ void intel_check_pch(void);
 #define IS_ROCKETLAKE(devid)	(intel_get_device_info(devid)->is_rocketlake)
 #define IS_DG1(devid)		(intel_get_device_info(devid)->is_dg1)
 #define IS_ALDERLAKE_S(devid)	(intel_get_device_info(devid)->is_alderlake_s)
+#define IS_ALDERLAKE_P(devid)	(intel_get_device_info(devid)->is_alderlake_p)
 
 #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)
lib/intel_device_info.c +7 -0
index 0c09f5cd..07338957 100644
@@ -396,6 +396,13 @@ static const struct intel_device_info intel_alderlake_s_info = {
 	.codename = "alderlake_s"
 };
 
+static const struct intel_device_info intel_alderlake_p_info = {
+	.graphics_ver = 12,
+	.display_ver = 13,
+	.is_alderlake_p = true,
+	.codename = "alderlake_p"
+};
+
 static const struct pci_id_match intel_device_match[] = {
 	INTEL_I810_IDS(&intel_i810_info),
 	INTEL_I815_IDS(&intel_i815_info),

lib/intel_device_info.c static const struct pci_id_match intel_device_match[] = { · line 500

Quoted 7 lines
lib/intel_device_info.c +1 -0
@@ -487,6 +494,7 @@ static const struct pci_id_match intel_device_match[] = {
 	INTEL_DG1_IDS(&intel_dg1_info),
 
 	INTEL_ADLS_IDS(&intel_alderlake_s_info),
+	INTEL_ADLP_IDS(&intel_alderlake_p_info),
 
 	INTEL_VGA_DEVICE(PCI_MATCH_ANY, &intel_generic_info),
 };

_______________________________________________
igt-dev mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/igt-dev

author
#8 lore raw

PATCH 4/6 lib/i915/perf: Add ADL-P metrics

In reply to Matt Roper

From: Lionel Landwerlin <[email protected]>

Add ADL-P metrics for perf OA tests.

---
 lib/i915/perf-configs/guids.xml            |    26 +
 lib/i915/perf-configs/mdapi-xml-convert.py |     1 +
 lib/i915/perf-configs/oa-adlp.xml          | 10624 +++++++++++++++++++
 lib/i915/perf-configs/update-guids.py      |     2 +-
 lib/i915/perf.c                            |     3 +
 lib/meson.build                            |     2 +-
 6 files changed, 10656 insertions(+), 2 deletions(-)
 create mode 100644 lib/i915/perf-configs/oa-adlp.xml
lib/i915/perf-configs/guids.xml +26 -0
index 95c9d717..48ef8d92 100644
@@ -431,4 +431,30 @@
     <guid config_hash="b420d7b956fb1b097a7bb812b6c87dc0" mdapi_config_hash="d81f15a77d18a099782c18acaa3132f7" id="c3ea2a23-f1c7-4a19-9da2-b569226fb6de" chipset="adl" name="EuActivity7" />
     <guid config_hash="5face026dac6a0549f8a28cf226dfbc8" mdapi_config_hash="de7326838bcc8abf024bac9c771e22e4" id="a5e2f79b-cecb-4eff-8f29-cda8e2a58749" chipset="adl" name="EuActivity8" />
     <guid config_hash="1affe7abeb3739d2c845cc6fa9aacf88" mdapi_config_hash="d071f4933574945979595246be61d3f0" id="89173c19-fcfe-48da-ac26-fb64425f141b" chipset="adl" name="TestOa" />
+    <guid config_hash="21fbe2cd2b53541e3b761d579516ed12" mdapi_config_hash="66837182711f03f84fe87408ebd0a617" id="05cd2b49-0046-4da4-a0d0-41b4ab16efa3" chipset="adlp" name="RenderBasic" />
+    <guid config_hash="6bfccfd98beccb8b008e8ba30a7a553b" mdapi_config_hash="c2e0ad3ca3f17e7e1dc6c9c83c83619e" id="cf3175c9-618b-4d39-b805-4a4cc07f9709" chipset="adlp" name="ComputeBasic" />
+    <guid config_hash="29513a0b338299ead603390779f6c120" mdapi_config_hash="ee12197058eb520427dc1d425178eb56" id="09c9ff45-0930-4f92-a9e2-9deb921ae752" chipset="adlp" name="RenderPipeProfile" />
+    <guid config_hash="ebc502d01dac0cf9673eb0fef2506f91" mdapi_config_hash="80fef6b5d722083a1fb9e0122d0a51a5" id="4662cab4-fb87-485a-ab08-1107fe998f13" chipset="adlp" name="HDCAndSF" />
+    <guid config_hash="28d420151b16828e8ca210caeb56b9c8" mdapi_config_hash="fbc93cbb50b2798b87a72c2dd0dbf222" id="94719676-7538-4950-bfd4-ed0122e86183" chipset="adlp" name="RasterizerAndPixelBackend" />
+    <guid config_hash="031b10d628ca033ad143ff80933f9278" mdapi_config_hash="b3259d9497ba9d9f5b0be7937383bedb" id="dc2ab75b-e656-44d9-bcbf-093a0259b1c8" chipset="adlp" name="L3_1" />
+    <guid config_hash="340670c90887c04a160735540fd60a05" mdapi_config_hash="beb8afb29ed1a424e319591041423417" id="55bc8001-d9a3-478a-a398-a3715a52630a" chipset="adlp" name="L3_2" />
+    <guid config_hash="a5c8e121989ace5c9e12158a91da582c" mdapi_config_hash="70dbd52b6c70fe3f6c7b7d265ceef298" id="1eba4453-dfaf-400a-bbcf-8bcb8a3e6b29" chipset="adlp" name="L3_3" />
+    <guid config_hash="1ec73fc7528bf2e976133100aefaa4b6" mdapi_config_hash="0716cf82fa0ba9963b363c8641d6e875" id="8f1bebfb-d930-4ee7-ab96-bde6b0ac1812" chipset="adlp" name="L3_4" />
+    <guid config_hash="b5aea697ccc39a129b0c23635a96e001" mdapi_config_hash="969f8b8b34d6216d60c7190661a9b6a9" id="df96f204-e340-4514-a5c7-909f21729d83" chipset="adlp" name="L3_5" />
+    <guid config_hash="43a026d0af29f7a18a945e2d4b350573" mdapi_config_hash="510e8490a07a363379a4c058cb474eda" id="6e8725a7-9d49-4b05-b2c3-341cf9565d33" chipset="adlp" name="L3_6" />
+    <guid config_hash="c809f1aed72d8cf173fcead43781c297" mdapi_config_hash="f9c86d51b0a47f9fcd1e4e1c66653cbc" id="dfe5179f-98d6-46d9-87fd-fc970569874f" chipset="adlp" name="Sampler_1" />
+    <guid config_hash="8c50773e2c85d6408fcc2d514447144f" mdapi_config_hash="030c3f4d0a0cfd8134531b701e7b743b" id="8f56017f-8194-4a2b-94ef-a5a02f5312fe" chipset="adlp" name="Sampler_2" />
+    <guid config_hash="ee9b574cbcc326fa0884278048553a53" mdapi_config_hash="368d6fa333da9141a6247ac4d8448f23" id="62317d73-47a0-497a-984d-28d37ea3ddf0" chipset="adlp" name="TDL_1" />
+    <guid config_hash="f32fb585f3220f879ad39c4972282af2" mdapi_config_hash="44438bc611f14882a23a4bdd67c8e6ec" id="7f826267-d18c-47bd-ad8b-11e175c32c67" chipset="adlp" name="TDL_2" />
+    <guid config_hash="15196ca6dc6aa4241d9de9fc75121111" mdapi_config_hash="b357e4b704d2bb149aa2c5313bf7aff5" id="ddfd2ac0-7b57-48af-82b0-3cf3d811845b" chipset="adlp" name="TDL_3" />
+    <guid config_hash="d033ecd48056664daee05fcf4ee777ef" mdapi_config_hash="f18943412a44e4a69d244a3a78a41e65" id="b3af5334-ed28-4e24-b6de-6f621e150eb5" chipset="adlp" name="GpuBusyness" />
+    <guid config_hash="85e13c721ad46cd039e22a1ac180c98d" mdapi_config_hash="6818187e4856c8b2acc78d588ea87056" id="b65afe50-4e37-42f5-af5c-2d45c5d82c59" chipset="adlp" name="EuActivity1" />
+    <guid config_hash="a2f87cd5035b6b6211922d49641b66a7" mdapi_config_hash="f0bbc48e521ea0ad8a3a745dc3eecdec" id="91fadda5-5d16-4f31-a132-9c7c70afa3c4" chipset="adlp" name="EuActivity2" />
+    <guid config_hash="62d20415870552f44c9de714f245da09" mdapi_config_hash="b94a87d76d2b5fdb4a4aa30b02886e3d" id="86775c09-faa5-4c25-83a0-31d085cc4959" chipset="adlp" name="EuActivity3" />
+    <guid config_hash="3fb95f065719b601ec6878eda687adeb" mdapi_config_hash="59eefdbc87164025ecdac51eb4c604a5" id="73bfba4e-13ce-4c8a-8bec-9b807dd63a97" chipset="adlp" name="EuActivity4" />
+    <guid config_hash="3b75af09f7ac5c393bd7a6aad2fddc11" mdapi_config_hash="8ebe6beda3b86aaf5f3dbf10ca4d430c" id="2f72b499-da58-4506-9098-c2487c98b8d8" chipset="adlp" name="EuActivity5" />
+    <guid config_hash="a9d708fdb3ec73b208b1092a1feeffff" mdapi_config_hash="b473bc4bd92f94c51f39cae220f56ff7" id="ee4d5a29-352b-4819-be54-ef4641803949" chipset="adlp" name="EuActivity6" />
+    <guid config_hash="b420d7b956fb1b097a7bb812b6c87dc0" mdapi_config_hash="d81f15a77d18a099782c18acaa3132f7" id="100bbf2f-a29f-44a9-83e8-3e38c34fea0c" chipset="adlp" name="EuActivity7" />
+    <guid config_hash="5face026dac6a0549f8a28cf226dfbc8" mdapi_config_hash="de7326838bcc8abf024bac9c771e22e4" id="b09ea1d6-8b2a-4c9c-99ac-8f2e9bafe8af" chipset="adlp" name="EuActivity8" />
+    <guid config_hash="1affe7abeb3739d2c845cc6fa9aacf88" mdapi_config_hash="d071f4933574945979595246be61d3f0" id="7d987d1c-efe6-4b8f-9ba9-a036ab09f676" chipset="adlp" name="TestOa" />
 </guids>
lib/i915/perf-configs/mdapi-xml-convert.py +1 -0
index d26ff623..b634c96c 100755
@@ -123,6 +123,7 @@ chipsets = {
     'RKL': gen8_11_chipset_params,
     'DG1': gen8_11_chipset_params,
     'ADL': gen8_11_chipset_params,
+    'ADLP': gen8_11_chipset_params,
 }
 
 register_types = { 'OA', 'NOA', 'FLEX', 'PM' }
lib/i915/perf-configs/oa-adlp.xml new file +10624 -0

2,963 lines not on this page · raw message

lib/i915/perf-configs/update-guids.py +1 -1
index d38a7a95..b864374e 100755

Lines of this file are not shown. View the raw message.

lib/i915/perf.c +3 -0
index 9d5ab7a5..fd77e376 100644

Lines of this file are not shown. View the raw message.

lib/meson.build +1 -1
index 078a357b..e78f126d 100644

Lines of this file are not shown. View the raw message.

The rest of this diff is not shown. View the raw message.

Signature · 6 lines
2.25.4

_______________________________________________
igt-dev mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/igt-dev

Part of the diff is not shown here. View the raw message.

author
#9 lore raw

PATCH 5/6 lib/i915: Add ADL-P stride restrictions for non-linear buffers

In reply to Matt Roper

From: José Roberto de Souza <[email protected]>

ADL-P tiled framebuffer strides must be power-of-two aligned and has a minimum of 8 tiles. For non-CCS framebuffers the driver supports FBs not meeting this requirement by remapping the framebuffer and padding the stride as required, but for CCS FBs userspace must ensure the alignment. Adding remap support for CCS FBs to the driver is to be done as a follow-up.

Cc Juha-Pekka Heikkilä <[email protected]>
Cc Anusha Srivatsa <[email protected]>
Cc Clinton Taylor <[email protected]>
Cc Stanislav Lisovskiy <[email protected]>
Cc Imre Deak <[email protected]>
---
 lib/igt_fb.c | 26 +++++++++++++++++++++-----
 1 file changed, 21 insertions(+), 5 deletions(-)
lib/igt_fb.c +21 -5
index 585ede38..ce2aa6ce 100644
@@ -729,8 +729,16 @@ static uint32_t calc_plane_stride(struct igt_fb *fb, int plane)
 		/* clear color always fixed to 64 bytes */
 		return 64;
 	} else if (is_gen12_ccs_plane(fb, plane)) {
-		/* A main surface using a CCS AUX surface must be 4x4 tiles aligned. */
-		return ALIGN(min_stride, 64);
+		/*
+		 * A main surface using a CCS AUX surface must be 4x4 tiles
+		 * aligned.  On ADL_P the minimum main surface stride is 8
+		 * tiles (2 * 64 byte on CCS surface) and it has to be POT
+		 * aligned.
+		 */
+		if (IS_ALDERLAKE_P(intel_get_drm_devid(fb->fd)))
+			return roundup_power_of_two(max(min_stride, 128u));
+		else
+			return ALIGN(min_stride, 64);
 	} else if (!fb->modifier && is_nouveau_device(fb->fd)) {
 		int align;
 
@@ -743,14 +751,22 @@ static uint32_t calc_plane_stride(struct igt_fb *fb, int plane)
 		return ALIGN(min_stride, align);
 	} else {
 		unsigned int tile_width, tile_height;
+		uint32_t stride;
 
 		igt_get_fb_tile_size(fb->fd, fb->modifier, fb->plane_bpp[plane],
 				     &tile_width, &tile_height);
 
-		if (is_gen12_ccs_modifier(fb->modifier))
-			tile_width *= 4;
+		if (is_gen12_ccs_modifier(fb->modifier)) {
+			stride = ALIGN(min_stride, tile_width * 4);
 
-		return ALIGN(min_stride, tile_width);
+			/* TODO: add support to kernel to POT align CCS format strides */
+			if (IS_ALDERLAKE_P(intel_get_drm_devid(fb->fd)))
+				stride = roundup_power_of_two(max(stride, tile_width * 8));
+		} else {
+			stride = ALIGN(min_stride, tile_width);
+		}
+
+		return stride;
 	}
 }
 
Signature · 6 lines
2.25.4

_______________________________________________
igt-dev mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/igt-dev
#10 lore raw

Re: [igt-dev] [PATCH i-g-t 5/6] lib/i915: Add ADL-P stride restrictions for non-linear buffers

Hum we can drop this change, Imre landed changes to make framebuffers strides power of two for adl_p, so for userspace it should be transparent.

Quoted 59 lines · Matt Roper

From: José Roberto de Souza <[email protected]>

ADL-P tiled framebuffer strides must be power-of-two aligned and has a minimum of 8 tiles. For non-CCS framebuffers the driver supports FBs not meeting this requirement by remapping the framebuffer and padding the stride as required, but for CCS FBs userspace must ensure the alignment. Adding remap support for CCS FBs to the driver is to be done as a follow-up.

Cc Juha-Pekka Heikkilä <[email protected]>
Cc Anusha Srivatsa <[email protected]>
Cc Clinton Taylor <[email protected]>
Cc Stanislav Lisovskiy <[email protected]>
Cc Imre Deak <[email protected]>
---
 lib/igt_fb.c | 26 +++++++++++++++++++++-----
 1 file changed, 21 insertions(+), 5 deletions(-)
lib/igt_fb.c +14 -5
index 585ede38..ce2aa6ce 100644
@@ -729,8 +729,16 @@ static uint32_t calc_plane_stride(struct igt_fb *fb, int plane)
 		/* clear color always fixed to 64 bytes */
 		return 64;
 	} else if (is_gen12_ccs_plane(fb, plane)) {
-		/* A main surface using a CCS AUX surface must be 4x4 tiles aligned. */
-		return ALIGN(min_stride, 64);
+		/*
+		 * A main surface using a CCS AUX surface must be 4x4 tiles
+		 * aligned.  On ADL_P the minimum main surface stride is 8
+		 * tiles (2 * 64 byte on CCS surface) and it has to be POT
+		 * aligned.
+		 */
+		if (IS_ALDERLAKE_P(intel_get_drm_devid(fb->fd)))
+			return roundup_power_of_two(max(min_stride, 128u));
+		else
+			return ALIGN(min_stride, 64);
 	} else if (!fb->modifier && is_nouveau_device(fb->fd)) {
 		int align;
 
@@ -743,14 +751,22 @@ static uint32_t calc_plane_stride(struct igt_fb *fb, int plane)
 		return ALIGN(min_stride, align);
 	} else {
 		unsigned int tile_width, tile_height;
+		uint32_t stride;
 
 		igt_get_fb_tile_size(fb->fd, fb->modifier, fb->plane_bpp[plane],
 				     &tile_width, &tile_height);
 
-		if (is_gen12_ccs_modifier(fb->modifier))
-			tile_width *= 4;
+		if (is_gen12_ccs_modifier(fb->modifier)) {
+			stride = ALIGN(min_stride, tile_width * 4);
 
-		return ALIGN(min_stride, tile_width);
+			/* TODO: add support to kernel to POT align CCS format strides */

lib/igt_fb.c static uint32_t calc_plane_stride(struct igt_fb *fb, int plane) · line 772

Quoted 10 lines
lib/igt_fb.c +7 -0
+			if (IS_ALDERLAKE_P(intel_get_drm_devid(fb->fd)))
+				stride = roundup_power_of_two(max(stride, tile_width * 8));
+		} else {
+			stride = ALIGN(min_stride, tile_width);
+		}
+
+		return stride;
 	}
 }
 

_______________________________________________
igt-dev mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/igt-dev

#11 lore raw

Re: [igt-dev] [PATCH i-g-t 5/6] lib/i915: Add ADL-P stride restrictions for non-linear buffers

Quoted 3 lines · Jose

Hum we can drop this change, Imre landed changes to make framebuffers strides power of two for adl_p, so for userspace it should be transparent.

Yes, it should be transparent for CCS framebuffers too, however that's a TODO item. I suspect that kernel would need to recreate the CCS plane if the main surface stride changes (since the layout of each CCS page would change, so we can't just remap the CCS pages), hence left this part for a follow-up.

So this patch is needed.

Quoted 58 lines · Matt Roper
Quoted 57 lines

From: José Roberto de Souza <[email protected]>

ADL-P tiled framebuffer strides must be power-of-two aligned and has a minimum of 8 tiles. For non-CCS framebuffers the driver supports FBs not meeting this requirement by remapping the framebuffer and padding the stride as required, but for CCS FBs userspace must ensure the alignment. Adding remap support for CCS FBs to the driver is to be done as a follow-up.

Cc Juha-Pekka Heikkilä <[email protected]>
Cc Anusha Srivatsa <[email protected]>
Cc Clinton Taylor <[email protected]>
Cc Stanislav Lisovskiy <[email protected]>
Cc Imre Deak <[email protected]>
---
 lib/igt_fb.c | 26 +++++++++++++++++++++-----
 1 file changed, 21 insertions(+), 5 deletions(-)
lib/igt_fb.c +13 -4
index 585ede38..ce2aa6ce 100644
@@ -729,8 +729,16 @@ static uint32_t calc_plane_stride(struct igt_fb *fb, int plane)
 		/* clear color always fixed to 64 bytes */
 		return 64;
 	} else if (is_gen12_ccs_plane(fb, plane)) {
-		/* A main surface using a CCS AUX surface must be 4x4 tiles aligned. */
-		return ALIGN(min_stride, 64);
+		/*
+		 * A main surface using a CCS AUX surface must be 4x4 tiles
+		 * aligned.  On ADL_P the minimum main surface stride is 8
+		 * tiles (2 * 64 byte on CCS surface) and it has to be POT
+		 * aligned.
+		 */
+		if (IS_ALDERLAKE_P(intel_get_drm_devid(fb->fd)))
+			return roundup_power_of_two(max(min_stride, 128u));
+		else
+			return ALIGN(min_stride, 64);
 	} else if (!fb->modifier && is_nouveau_device(fb->fd)) {
 		int align;
 
@@ -743,14 +751,22 @@ static uint32_t calc_plane_stride(struct igt_fb *fb, int plane)
 		return ALIGN(min_stride, align);
 	} else {
 		unsigned int tile_width, tile_height;
+		uint32_t stride;
 
 		igt_get_fb_tile_size(fb->fd, fb->modifier, fb->plane_bpp[plane],
 				     &tile_width, &tile_height);
 
-		if (is_gen12_ccs_modifier(fb->modifier))
-			tile_width *= 4;
+		if (is_gen12_ccs_modifier(fb->modifier)) {
+			stride = ALIGN(min_stride, tile_width * 4);
 
Quoted 13 lines

lib/igt_fb.c static uint32_t calc_plane_stride(struct igt_fb *fb, int plane) · line 772

Quoted 12 lines
lib/igt_fb.c +8 -1
-		return ALIGN(min_stride, tile_width);
+			/* TODO: add support to kernel to POT align CCS format strides */
+			if (IS_ALDERLAKE_P(intel_get_drm_devid(fb->fd)))
+				stride = roundup_power_of_two(max(stride, tile_width * 8));
+		} else {
+			stride = ALIGN(min_stride, tile_width);
+		}
+
+		return stride;
 	}
 }
 

_______________________________________________
igt-dev mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/igt-dev

author
#12 lore raw

Re: [igt-dev] [PATCH i-g-t 5/6] lib/i915: Add ADL-P stride restrictions for non-linear buffers

Quoted 5 lines · Imre Deak
Quoted 3 lines · Jose

Hum we can drop this change, Imre landed changes to make framebuffers strides power of two for adl_p, so for userspace it should be transparent.

Quoted 7 lines

Yes, it should be transparent for CCS framebuffers too, however that's a TODO item. I suspect that kernel would need to recreate the CCS plane if the main surface stride changes (since the layout of each CCS page would change, so we can't just remap the CCS pages), hence left this part for a follow-up.

So this patch is needed.

Are there any changes required, or can we consider this r-b?

Thanks.

Matt

Quoted 72 lines
Quoted 72 lines · Matt Roper
Quoted 69 lines

From: José Roberto de Souza <[email protected]>

ADL-P tiled framebuffer strides must be power-of-two aligned and has a minimum of 8 tiles. For non-CCS framebuffers the driver supports FBs not meeting this requirement by remapping the framebuffer and padding the stride as required, but for CCS FBs userspace must ensure the alignment. Adding remap support for CCS FBs to the driver is to be done as a follow-up.

Cc Juha-Pekka Heikkilä <[email protected]>
Cc Anusha Srivatsa <[email protected]>
Cc Clinton Taylor <[email protected]>
Cc Stanislav Lisovskiy <[email protected]>
Cc Imre Deak <[email protected]>
---
 lib/igt_fb.c | 26 +++++++++++++++++++++-----
 1 file changed, 21 insertions(+), 5 deletions(-)
lib/igt_fb.c +21 -5
index 585ede38..ce2aa6ce 100644
@@ -729,8 +729,16 @@ static uint32_t calc_plane_stride(struct igt_fb *fb, int plane)
 		/* clear color always fixed to 64 bytes */
 		return 64;
 	} else if (is_gen12_ccs_plane(fb, plane)) {
-		/* A main surface using a CCS AUX surface must be 4x4 tiles aligned. */
-		return ALIGN(min_stride, 64);
+		/*
+		 * A main surface using a CCS AUX surface must be 4x4 tiles
+		 * aligned.  On ADL_P the minimum main surface stride is 8
+		 * tiles (2 * 64 byte on CCS surface) and it has to be POT
+		 * aligned.
+		 */
+		if (IS_ALDERLAKE_P(intel_get_drm_devid(fb->fd)))
+			return roundup_power_of_two(max(min_stride, 128u));
+		else
+			return ALIGN(min_stride, 64);
 	} else if (!fb->modifier && is_nouveau_device(fb->fd)) {
 		int align;
 
@@ -743,14 +751,22 @@ static uint32_t calc_plane_stride(struct igt_fb *fb, int plane)
 		return ALIGN(min_stride, align);
 	} else {
 		unsigned int tile_width, tile_height;
+		uint32_t stride;
 
 		igt_get_fb_tile_size(fb->fd, fb->modifier, fb->plane_bpp[plane],
 				     &tile_width, &tile_height);
 
-		if (is_gen12_ccs_modifier(fb->modifier))
-			tile_width *= 4;
+		if (is_gen12_ccs_modifier(fb->modifier)) {
+			stride = ALIGN(min_stride, tile_width * 4);
 
-		return ALIGN(min_stride, tile_width);
+			/* TODO: add support to kernel to POT align CCS format strides */
+			if (IS_ALDERLAKE_P(intel_get_drm_devid(fb->fd)))
+				stride = roundup_power_of_two(max(stride, tile_width * 8));
+		} else {
+			stride = ALIGN(min_stride, tile_width);
+		}
+
+		return stride;
 	}
 }
 
Signature · 9 lines
Matt Roper
Graphics Software Engineer
VTT-OSGC Platform Enablement
Intel Corporation
(916) 356-2795
_______________________________________________
igt-dev mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/igt-dev
Reviewed-by
#13 lore raw

Re: [igt-dev] [PATCH i-g-t 5/6] lib/i915: Add ADL-P stride restrictions for non-linear buffers

Quoted 12 lines · Matt Roper
Quoted 11 lines · Imre Deak
Quoted 3 lines · Jose

Hum we can drop this change, Imre landed changes to make framebuffers strides power of two for adl_p, so for userspace it should be transparent.

Yes, it should be transparent for CCS framebuffers too, however that's a TODO item. I suspect that kernel would need to recreate the CCS plane if the main surface stride changes (since the layout of each CCS page would change, so we can't just remap the CCS pages), hence left this part for a follow-up.

Quoted 3 lines
Quoted 1 line

So this patch is needed.

Are there any changes required, or can we consider this r-b?

No changes are needed:

Quoted 65 lines

Thanks.

Matt

Quoted 59 lines
Quoted 59 lines · Matt Roper
Quoted 57 lines

From: José Roberto de Souza <[email protected]>

ADL-P tiled framebuffer strides must be power-of-two aligned and has a minimum of 8 tiles. For non-CCS framebuffers the driver supports FBs not meeting this requirement by remapping the framebuffer and padding the stride as required, but for CCS FBs userspace must ensure the alignment. Adding remap support for CCS FBs to the driver is to be done as a follow-up.

Cc Juha-Pekka Heikkilä <[email protected]>
Cc Anusha Srivatsa <[email protected]>
Cc Clinton Taylor <[email protected]>
Cc Stanislav Lisovskiy <[email protected]>
Cc Imre Deak <[email protected]>
---
 lib/igt_fb.c | 26 +++++++++++++++++++++-----
 1 file changed, 21 insertions(+), 5 deletions(-)
lib/igt_fb.c +13 -4
index 585ede38..ce2aa6ce 100644
@@ -729,8 +729,16 @@ static uint32_t calc_plane_stride(struct igt_fb *fb, int plane)
 		/* clear color always fixed to 64 bytes */
 		return 64;
 	} else if (is_gen12_ccs_plane(fb, plane)) {
-		/* A main surface using a CCS AUX surface must be 4x4 tiles aligned. */
-		return ALIGN(min_stride, 64);
+		/*
+		 * A main surface using a CCS AUX surface must be 4x4 tiles
+		 * aligned.  On ADL_P the minimum main surface stride is 8
+		 * tiles (2 * 64 byte on CCS surface) and it has to be POT
+		 * aligned.
+		 */
+		if (IS_ALDERLAKE_P(intel_get_drm_devid(fb->fd)))
+			return roundup_power_of_two(max(min_stride, 128u));
+		else
+			return ALIGN(min_stride, 64);
 	} else if (!fb->modifier && is_nouveau_device(fb->fd)) {
 		int align;
 
@@ -743,14 +751,22 @@ static uint32_t calc_plane_stride(struct igt_fb *fb, int plane)
 		return ALIGN(min_stride, align);
 	} else {
 		unsigned int tile_width, tile_height;
+		uint32_t stride;
 
 		igt_get_fb_tile_size(fb->fd, fb->modifier, fb->plane_bpp[plane],
 				     &tile_width, &tile_height);
 
-		if (is_gen12_ccs_modifier(fb->modifier))
-			tile_width *= 4;
+		if (is_gen12_ccs_modifier(fb->modifier)) {
+			stride = ALIGN(min_stride, tile_width * 4);
 
Quoted 20 lines
Quoted 13 lines
Quoted 13 lines
Quoted 12 lines
lib/igt_fb.c +8 -1
-		return ALIGN(min_stride, tile_width);
+			/* TODO: add support to kernel to POT align CCS format strides */
+			if (IS_ALDERLAKE_P(intel_get_drm_devid(fb->fd)))
+				stride = roundup_power_of_two(max(stride, tile_width * 8));
+		} else {
+			stride = ALIGN(min_stride, tile_width);
+		}
+
+		return stride;
 	}
 }
 
Signature · 5 lines
Matt Roper
Graphics Software Engineer
VTT-OSGC Platform Enablement
Intel Corporation
(916) 356-2795

_______________________________________________
igt-dev mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/igt-dev

author
#14 lore raw

PATCH 6/6 lib/i915: Add ADL-P plane offset restriction for CCS framebuffers

In reply to Matt Roper

From: Imre Deak <[email protected]>

All DPT FB plane offsets must be 2MB-aligned. The kernel takes care of aligning the offset for non-CCS framebuffers. Make sure that the allocated CCS FB layout meets the alignment requirement.

---
 lib/igt_fb.c | 26 ++++++++++++++++++++++++--
 1 file changed, 24 insertions(+), 2 deletions(-)
lib/igt_fb.c +24 -2
index ce2aa6ce..ab52ea9f 100644
@@ -804,11 +804,23 @@ static uint64_t calc_plane_size(struct igt_fb *fb, int plane)
 		return (uint64_t) fb->strides[plane] *
 			ALIGN(fb->plane_height[plane], tile_height);
 	} else if (is_gen12_ccs_plane(fb, plane)) {
+		uint64_t size;
+
 		/* The AUX CCS surface must be page aligned */
-		return (uint64_t)fb->strides[plane] *
+		size = (uint64_t)fb->strides[plane] *
 			ALIGN(fb->plane_height[plane], 64);
+
+		/*
+		 * On ADL_P CCS color planes must be 2MB aligned, until remapping
+		 * support is added for CCS FBs.
+		 */
+		if (IS_ALDERLAKE_P(intel_get_drm_devid(fb->fd)))
+			size = ALIGN(size, 2 * 1024 * 1024);
+
+		return size;
 	} else {
 		unsigned int tile_width, tile_height;
+		uint64_t size;
 
 		igt_get_fb_tile_size(fb->fd, fb->modifier, fb->plane_bpp[plane],
 				     &tile_width, &tile_height);
@@ -817,8 +829,18 @@ static uint64_t calc_plane_size(struct igt_fb *fb, int plane)
 		if (is_gen12_ccs_modifier(fb->modifier))
 			tile_height *= 4;
 
-		return (uint64_t) fb->strides[plane] *
+		size = (uint64_t)fb->strides[plane] *
 			ALIGN(fb->plane_height[plane], tile_height);
+
+		/*
+		 * On ADL_P CCS color planes must be 2MB aligned, until remapping
+		 * support is added for CCS FBs.
+		 */
+		if (IS_ALDERLAKE_P(intel_get_drm_devid(fb->fd)) &&
+		    is_ccs_modifier(fb->modifier))
+			size = ALIGN(size, 2 * 1024 * 1024);
+
+		return size;
 	}
 }
 
Signature · 6 lines
2.25.4

_______________________________________________
igt-dev mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/igt-dev
Reviewed-by on v1 6/6
#15 lore raw

Re: [igt-dev] [PATCH i-g-t 6/6] lib/i915: Add ADL-P plane offset restriction for CCS framebuffers

Quoted 6 lines · Matt Roper

From: Imre Deak <[email protected]>

All DPT FB plane offsets must be 2MB-aligned. The kernel takes care of aligning the offset for non-CCS framebuffers. Make sure that the allocated CCS FB layout meets the alignment requirement.

Quoted 45 lines
---
 lib/igt_fb.c | 26 ++++++++++++++++++++++++--
 1 file changed, 24 insertions(+), 2 deletions(-)
lib/igt_fb.c +17 -2
index ce2aa6ce..ab52ea9f 100644
@@ -804,11 +804,23 @@ static uint64_t calc_plane_size(struct igt_fb *fb, int plane)
 		return (uint64_t) fb->strides[plane] *
 			ALIGN(fb->plane_height[plane], tile_height);
 	} else if (is_gen12_ccs_plane(fb, plane)) {
+		uint64_t size;
+
 		/* The AUX CCS surface must be page aligned */
-		return (uint64_t)fb->strides[plane] *
+		size = (uint64_t)fb->strides[plane] *
 			ALIGN(fb->plane_height[plane], 64);
+
+		/*
+		 * On ADL_P CCS color planes must be 2MB aligned, until remapping
+		 * support is added for CCS FBs.
+		 */
+		if (IS_ALDERLAKE_P(intel_get_drm_devid(fb->fd)))
+			size = ALIGN(size, 2 * 1024 * 1024);
+
+		return size;
 	} else {
 		unsigned int tile_width, tile_height;
+		uint64_t size;
 
 		igt_get_fb_tile_size(fb->fd, fb->modifier, fb->plane_bpp[plane],
 				     &tile_width, &tile_height);
@@ -817,8 +829,18 @@ static uint64_t calc_plane_size(struct igt_fb *fb, int plane)
 		if (is_gen12_ccs_modifier(fb->modifier))
 			tile_height *= 4;
 
-		return (uint64_t) fb->strides[plane] *
+		size = (uint64_t)fb->strides[plane] *
 			ALIGN(fb->plane_height[plane], tile_height);
+
+		/*
+		 * On ADL_P CCS color planes must be 2MB aligned, until remapping

lib/igt_fb.c static uint64_t calc_plane_size(struct igt_fb *fb, int plane) · line 846

Quoted 10 lines
lib/igt_fb.c +7 -0
+		 * support is added for CCS FBs.
+		 */
+		if (IS_ALDERLAKE_P(intel_get_drm_devid(fb->fd)) &&
+		    is_ccs_modifier(fb->modifier))
+			size = ALIGN(size, 2 * 1024 * 1024);
+
+		return size;
 	}
 }
 

_______________________________________________
igt-dev mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/igt-dev

#16 lore raw

[igt-dev] ✗ Fi.CI.BUILD: failure for Split display/graphics versions and add ADL-P

In reply to Matt Roper
== Series Details ==

== Series Details ==

Series: Split display/graphics versions and add ADL-P
URL : https://patchwork.freedesktop.org/series/91040/
State : failure

== Summary ==

IGT patchset build failed on latest successful build 1fbc1e7d602f96a7f4e2b95057eef994656b8e74 i915/gem_exec_schedule: Check for timeslicing

../lib/intel_device_info.c:499:2: note: in expansion of macro ‘INTEL_VGA_DEVICE’
INTEL_VGA_DEVICE(PCI_MATCH_ANY, &intel_generic_info),
^~~~~~~~~~~~~~~~
../lib/i915_pciids.h:41:2: note: (near initialization for ‘intel_device_match[301].device_id’)
0x030000, 0xff0000, \
^~~~~~~~
../lib/intel_device_info.c:499:2: note: in expansion of macro ‘INTEL_VGA_DEVICE’
INTEL_VGA_DEVICE(PCI_MATCH_ANY, &intel_generic_info),
^~~~~~~~~~~~~~~~
../lib/i915_pciids.h:41:12: warning: excess elements in scalar initializer

  0x030000, 0xff0000,   \
            ^~~~~~~~

../lib/intel_device_info.c:499:2: note: in expansion of macro ‘INTEL_VGA_DEVICE’
INTEL_VGA_DEVICE(PCI_MATCH_ANY, &intel_generic_info),
^~~~~~~~~~~~~~~~
../lib/i915_pciids.h:41:12: note: (near initialization for ‘intel_device_match[301].device_id’)

  0x030000, 0xff0000,   \
            ^~~~~~~~

../lib/intel_device_info.c:499:2: note: in expansion of macro ‘INTEL_VGA_DEVICE’
INTEL_VGA_DEVICE(PCI_MATCH_ANY, &intel_generic_info),
^~~~~~~~~~~~~~~~
../lib/i915_pciids.h:42:2: warning: excess elements in scalar initializer
(unsigned long) info }
^
../lib/intel_device_info.c:499:2: note: in expansion of macro ‘INTEL_VGA_DEVICE’
INTEL_VGA_DEVICE(PCI_MATCH_ANY, &intel_generic_info),
^~~~~~~~~~~~~~~~
../lib/i915_pciids.h:42:2: note: (near initialization for ‘intel_device_match[301].device_id’)
(unsigned long) info }
^
../lib/intel_device_info.c:499:2: note: in expansion of macro ‘INTEL_VGA_DEVICE’
INTEL_VGA_DEVICE(PCI_MATCH_ANY, &intel_generic_info),
^~~~~~~~~~~~~~~~
../lib/intel_device_info.c:406:57: error: missing braces around initializer [-Werror=missing-braces]

 static const struct pci_id_match intel_device_match[] = {
                                                         ^

../lib/intel_device_info.c:497:2:
INTEL_ADLP_IDS(&intel_alderlake_p_info),
{
../lib/intel_device_info.c:406:57: error: missing braces around initializer [-Werror=missing-braces]

 static const struct pci_id_match intel_device_match[] = {
                                                         ^

../lib/intel_device_info.c:497:2:
INTEL_ADLP_IDS(&intel_alderlake_p_info),
{
../lib/intel_device_info.c:500:1:
};
}
cc1: some warnings being treated as errors
ninja: build stopped: subcommand failed.

_______________________________________________
igt-dev mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/igt-dev

author
#17 lore raw

Re: [igt-dev] ✗ Fi.CI.BUILD: failure for Split display/graphics versions and add ADL-P

Quoted 10 lines · Patchwork

== Series Details ==

Series: Split display/graphics versions and add ADL-P
URL : https://patchwork.freedesktop.org/series/91040/
State : failure

== Summary ==

IGT patchset build failed on latest successful build 1fbc1e7d602f96a7f4e2b95057eef994656b8e74 i915/gem_exec_schedule: Check for timeslicing

Why is this series applying/building on top of this commit instead of the latest from the master branch? The master branch has three additional commits, one of which contains the device ID's necessary to build this series...

Matt

Quoted 53 lines

../lib/intel_device_info.c:499:2: note: in expansion of macro ‘INTEL_VGA_DEVICE’
INTEL_VGA_DEVICE(PCI_MATCH_ANY, &intel_generic_info),
^~~~~~~~~~~~~~~~
../lib/i915_pciids.h:41:2: note: (near initialization for ‘intel_device_match[301].device_id’)
0x030000, 0xff0000, \
^~~~~~~~
../lib/intel_device_info.c:499:2: note: in expansion of macro ‘INTEL_VGA_DEVICE’
INTEL_VGA_DEVICE(PCI_MATCH_ANY, &intel_generic_info),
^~~~~~~~~~~~~~~~
../lib/i915_pciids.h:41:12: warning: excess elements in scalar initializer

  0x030000, 0xff0000,   \
            ^~~~~~~~

../lib/intel_device_info.c:499:2: note: in expansion of macro ‘INTEL_VGA_DEVICE’
INTEL_VGA_DEVICE(PCI_MATCH_ANY, &intel_generic_info),
^~~~~~~~~~~~~~~~
../lib/i915_pciids.h:41:12: note: (near initialization for ‘intel_device_match[301].device_id’)

  0x030000, 0xff0000,   \
            ^~~~~~~~

../lib/intel_device_info.c:499:2: note: in expansion of macro ‘INTEL_VGA_DEVICE’
INTEL_VGA_DEVICE(PCI_MATCH_ANY, &intel_generic_info),
^~~~~~~~~~~~~~~~
../lib/i915_pciids.h:42:2: warning: excess elements in scalar initializer
(unsigned long) info }
^
../lib/intel_device_info.c:499:2: note: in expansion of macro ‘INTEL_VGA_DEVICE’
INTEL_VGA_DEVICE(PCI_MATCH_ANY, &intel_generic_info),
^~~~~~~~~~~~~~~~
../lib/i915_pciids.h:42:2: note: (near initialization for ‘intel_device_match[301].device_id’)
(unsigned long) info }
^
../lib/intel_device_info.c:499:2: note: in expansion of macro ‘INTEL_VGA_DEVICE’
INTEL_VGA_DEVICE(PCI_MATCH_ANY, &intel_generic_info),
^~~~~~~~~~~~~~~~
../lib/intel_device_info.c:406:57: error: missing braces around initializer [-Werror=missing-braces]

 static const struct pci_id_match intel_device_match[] = {
                                                         ^

../lib/intel_device_info.c:497:2:
INTEL_ADLP_IDS(&intel_alderlake_p_info),
{
../lib/intel_device_info.c:406:57: error: missing braces around initializer [-Werror=missing-braces]

 static const struct pci_id_match intel_device_match[] = {
                                                         ^

../lib/intel_device_info.c:497:2:
INTEL_ADLP_IDS(&intel_alderlake_p_info),
{
../lib/intel_device_info.c:500:1:
};
}
cc1: some warnings being treated as errors
ninja: build stopped: subcommand failed.

Signature · 9 lines
Matt Roper
Graphics Software Engineer
VTT-OSGC Platform Enablement
Intel Corporation
(916) 356-2795
_______________________________________________
igt-dev mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/igt-dev
#18 lore raw

Re: [igt-dev] ✗ Fi.CI.BUILD: failure for Split display/graphics versions and add ADL-P

Quoted 9 lines · Matt Roper
Quoted 8 lines · Patchwork

== Series Details ==

Series: Split display/graphics versions and add ADL-P
URL : https://patchwork.freedesktop.org/series/91040/
State : failure

== Summary ==

Quoted 7 lines
Quoted 2 lines

IGT patchset build failed on latest successful build 1fbc1e7d602f96a7f4e2b95057eef994656b8e74 i915/gem_exec_schedule: Check for timeslicing

Why is this series applying/building on top of this commit instead of the latest from the master branch? The master branch has three additional commits, one of which contains the device ID's necessary to build this series...

Shouldn't happen again. CI was mistakenly left using anongit.fdo as the IGT repository url and that had hiccups in its mirroring last week. Now changed to use gitlab.

Signature · 5 lines
Petri Latvala
_______________________________________________
igt-dev mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/igt-dev
#19 lore raw

[igt-dev] ✗ GitLab.Pipeline: warning for Split display/graphics versions and add ADL-P

In reply to Matt Roper
== Series Details ==

== Series Details ==

Series: Split display/graphics versions and add ADL-P
URL : https://patchwork.freedesktop.org/series/91040/
State : warning

== Summary ==

Pipeline status: FAILED.

see https://gitlab.freedesktop.org/gfx-ci/igt-ci-tags/-/pipelines/332789 for the overview.

build:tests-debian-meson has failed (https://gitlab.freedesktop.org/gfx-ci/igt-ci-tags/-/jobs/10487472):
../lib/intel_device_info.c:497:2:

    INTEL_ADLP_IDS(&intel_alderlake_p_info),
    {
  ../lib/intel_device_info.c:406:57: error: missing braces around initializer [-Werror=missing-braces]
   static const struct pci_id_match intel_device_match[] = {
                                                           ^
  ../lib/intel_device_info.c:497:2:
    INTEL_ADLP_IDS(&intel_alderlake_p_info),
    {

../lib/intel_device_info.c:500:1:
};
}
cc1: some warnings being treated as errors
ninja: build stopped: subcommand failed.
section_end:1622839898:step_script
section_start:1622839898:cleanup_file_variables
Cleaning up file based variables
section_end:1622839899:cleanup_file_variables
ERROR: Job failed: exit code 1

build:tests-debian-meson-arm64 has failed (https://gitlab.freedesktop.org/gfx-ci/igt-ci-tags/-/jobs/10487475):
../lib/intel_device_info.c:497:2:

    INTEL_ADLP_IDS(&intel_alderlake_p_info),
    {
  ../lib/intel_device_info.c:406:57: error: missing braces around initializer [-Werror=missing-braces]
   static const struct pci_id_match intel_device_match[] = {
                                                           ^
  ../lib/intel_device_info.c:497:2:
    INTEL_ADLP_IDS(&intel_alderlake_p_info),
    {

../lib/intel_device_info.c:500:1:
};
}
cc1: some warnings being treated as errors
ninja: build stopped: subcommand failed.
section_end:1622839902:step_script
section_start:1622839902:cleanup_file_variables
Cleaning up file based variables
section_end:1622839903:cleanup_file_variables
ERROR: Job failed: exit code 1

build:tests-debian-meson-armhf has failed (https://gitlab.freedesktop.org/gfx-ci/igt-ci-tags/-/jobs/10487474):
../lib/intel_device_info.c:497:2:

    INTEL_ADLP_IDS(&intel_alderlake_p_info),
    {
  ../lib/intel_device_info.c:406:57: error: missing braces around initializer [-Werror=missing-braces]
   static const struct pci_id_match intel_device_match[] = {
                                                           ^
  ../lib/intel_device_info.c:497:2:
    INTEL_ADLP_IDS(&intel_alderlake_p_info),
    {

../lib/intel_device_info.c:500:1:
};
}
cc1: some warnings being treated as errors
ninja: build stopped: subcommand failed.
section_end:1622839900:step_script
section_start:1622839900:cleanup_file_variables
Cleaning up file based variables
section_end:1622839900:cleanup_file_variables
ERROR: Job failed: exit code 1

build:tests-debian-meson-mips has failed (https://gitlab.freedesktop.org/gfx-ci/igt-ci-tags/-/jobs/10487476):
../lib/intel_device_info.c:497:2:

    INTEL_ADLP_IDS(&intel_alderlake_p_info),
    {
  ../lib/intel_device_info.c:406:57: error: missing braces around initializer [-Werror=missing-braces]
   static const struct pci_id_match intel_device_match[] = {
                                                           ^
  ../lib/intel_device_info.c:497:2:
    INTEL_ADLP_IDS(&intel_alderlake_p_info),
    {

../lib/intel_device_info.c:500:1:
};
}
cc1: some warnings being treated as errors
ninja: build stopped: subcommand failed.
section_end:1622839904:step_script
section_start:1622839904:cleanup_file_variables
Cleaning up file based variables
section_end:1622839905:cleanup_file_variables
ERROR: Job failed: exit code 1

build:tests-debian-minimal has failed (https://gitlab.freedesktop.org/gfx-ci/igt-ci-tags/-/jobs/10487473):
../lib/intel_device_info.c:497:2:

    INTEL_ADLP_IDS(&intel_alderlake_p_info),
    {
  ../lib/intel_device_info.c:406:57: error: missing braces around initializer [-Werror=missing-braces]
   static const struct pci_id_match intel_device_match[] = {
                                                           ^
  ../lib/intel_device_info.c:497:2:
    INTEL_ADLP_IDS(&intel_alderlake_p_info),
    {

../lib/intel_device_info.c:500:1:
};
}
cc1: some warnings being treated as errors
ninja: build stopped: subcommand failed.
section_end:1622839899:step_script
section_start:1622839899:cleanup_file_variables
Cleaning up file based variables
section_end:1622839900:cleanup_file_variables
ERROR: Job failed: exit code 1

build:tests-fedora has failed (https://gitlab.freedesktop.org/gfx-ci/igt-ci-tags/-/jobs/10487467):
......

    497 |  INTEL_ADLP_IDS(&intel_alderlake_p_info),
        |  {
  ../lib/intel_device_info.c:406:57: error: missing braces around initializer [-Werror=missing-braces]
    406 | static const struct pci_id_match intel_device_match[] = {
        |                                                         ^
  ......
    497 |  INTEL_ADLP_IDS(&intel_alderlake_p_info),
        |  {
  ......
    500 | };
        | }

cc1: some warnings being treated as errors
ninja: build stopped: subcommand failed.
section_end:1622839900:step_script
section_start:1622839900:cleanup_file_variables
Cleaning up file based variables
section_end:1622839902:cleanup_file_variables
ERROR: Job failed: exit code 1

build:tests-fedora-clang has failed (https://gitlab.freedesktop.org/gfx-ci/igt-ci-tags/-/jobs/10487471):

  #define PCI_MATCH_ANY  (~0U)
                         ^~~~~
  ../lib/i915_pciids.h:39:10: note: expanded from macro 'INTEL_VGA_DEVICE'
          0x8086, id,                             \
                  ^~
  ../lib/intel_device_info.c:497:2: error: suggest braces around initialization of subobject [-Werror,-Wmissing-braces]
          INTEL_ADLP_IDS(&intel_alderlake_p_info),
          ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
          {
  ../lib/intel_device_info.c:497:2: error: initializer element is not a compile-time constant
          INTEL_ADLP_IDS(&intel_alderlake_p_info),
          ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

1 warning and 3 errors generated.
ninja: build stopped: subcommand failed.
section_end:1622839908:step_script
section_start:1622839908:cleanup_file_variables
Cleaning up file based variables
section_end:1622839908:cleanup_file_variables
ERROR: Job failed: exit code 1

build:tests-fedora-no-libdrm-nouveau has failed (https://gitlab.freedesktop.org/gfx-ci/igt-ci-tags/-/jobs/10487470):
......

    497 |  INTEL_ADLP_IDS(&intel_alderlake_p_info),
        |  {
  ../lib/intel_device_info.c:406:57: error: missing braces around initializer [-Werror=missing-braces]
    406 | static const struct pci_id_match intel_device_match[] = {
        |                                                         ^
  ......
    497 |  INTEL_ADLP_IDS(&intel_alderlake_p_info),
        |  {
  ......
    500 | };
        | }

cc1: some warnings being treated as errors
ninja: build stopped: subcommand failed.
section_end:1622839899:step_script
section_start:1622839899:cleanup_file_variables
Cleaning up file based variables
section_end:1622839901:cleanup_file_variables
ERROR: Job failed: exit code 1

build:tests-fedora-no-libunwind has failed (https://gitlab.freedesktop.org/gfx-ci/igt-ci-tags/-/jobs/10487468):
......

    497 |  INTEL_ADLP_IDS(&intel_alderlake_p_info),
        |  {
  ../lib/intel_device_info.c:406:57: error: missing braces around initializer [-Werror=missing-braces]
    406 | static const struct pci_id_match intel_device_match[] = {
        |                                                         ^
  ......
    497 |  INTEL_ADLP_IDS(&intel_alderlake_p_info),
        |  {
  ......
    500 | };
        | }

cc1: some warnings being treated as errors
ninja: build stopped: subcommand failed.
section_end:1622839900:step_script
section_start:1622839900:cleanup_file_variables
Cleaning up file based variables
section_end:1622839901:cleanup_file_variables
ERROR: Job failed: exit code 1

build:tests-fedora-oldest-meson has failed (https://gitlab.freedesktop.org/gfx-ci/igt-ci-tags/-/jobs/10487469):
......

    497 |  INTEL_ADLP_IDS(&intel_alderlake_p_info),
        |  {
  ../lib/intel_device_info.c:406:57: error: missing braces around initializer [-Werror=missing-braces]
    406 | static const struct pci_id_match intel_device_match[] = {
        |                                                         ^
  ......
    497 |  INTEL_ADLP_IDS(&intel_alderlake_p_info),
        |  {
  ......
    500 | };
        | }

cc1: some warnings being treated as errors
ninja: build stopped: subcommand failed.
section_end:1622839902:step_script
section_start:1622839902:cleanup_file_variables
Cleaning up file based variables
section_end:1622839903:cleanup_file_variables
ERROR: Job failed: exit code 1

== Logs ==

For more details see: https://gitlab.freedesktop.org/gfx-ci/igt-ci-tags/-/pipelines/332789
_______________________________________________
igt-dev mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/igt-dev

#20 lore raw

[igt-dev] ✗ Fi.CI.BUILD: failure for Split display/graphics versions and add ADL-P (rev2)

In reply to Matt Roper
== Series Details ==

== Series Details ==

Series: Split display/graphics versions and add ADL-P (rev2)
URL : https://patchwork.freedesktop.org/series/91040/
State : failure

== Summary ==

IGT patchset build failed on latest successful build 1fbc1e7d602f96a7f4e2b95057eef994656b8e74 i915/gem_exec_schedule: Check for timeslicing

../lib/intel_device_info.c:499:2: note: in expansion of macro ‘INTEL_VGA_DEVICE’
INTEL_VGA_DEVICE(PCI_MATCH_ANY, &intel_generic_info),
^~~~~~~~~~~~~~~~
../lib/i915_pciids.h:41:2: note: (near initialization for ‘intel_device_match[301].device_id’)
0x030000, 0xff0000, \
^~~~~~~~
../lib/intel_device_info.c:499:2: note: in expansion of macro ‘INTEL_VGA_DEVICE’
INTEL_VGA_DEVICE(PCI_MATCH_ANY, &intel_generic_info),
^~~~~~~~~~~~~~~~
../lib/i915_pciids.h:41:12: warning: excess elements in scalar initializer

  0x030000, 0xff0000,   \
            ^~~~~~~~

../lib/intel_device_info.c:499:2: note: in expansion of macro ‘INTEL_VGA_DEVICE’
INTEL_VGA_DEVICE(PCI_MATCH_ANY, &intel_generic_info),
^~~~~~~~~~~~~~~~
../lib/i915_pciids.h:41:12: note: (near initialization for ‘intel_device_match[301].device_id’)

  0x030000, 0xff0000,   \
            ^~~~~~~~

../lib/intel_device_info.c:499:2: note: in expansion of macro ‘INTEL_VGA_DEVICE’
INTEL_VGA_DEVICE(PCI_MATCH_ANY, &intel_generic_info),
^~~~~~~~~~~~~~~~
../lib/i915_pciids.h:42:2: warning: excess elements in scalar initializer
(unsigned long) info }
^
../lib/intel_device_info.c:499:2: note: in expansion of macro ‘INTEL_VGA_DEVICE’
INTEL_VGA_DEVICE(PCI_MATCH_ANY, &intel_generic_info),
^~~~~~~~~~~~~~~~
../lib/i915_pciids.h:42:2: note: (near initialization for ‘intel_device_match[301].device_id’)
(unsigned long) info }
^
../lib/intel_device_info.c:499:2: note: in expansion of macro ‘INTEL_VGA_DEVICE’
INTEL_VGA_DEVICE(PCI_MATCH_ANY, &intel_generic_info),
^~~~~~~~~~~~~~~~
../lib/intel_device_info.c:406:57: error: missing braces around initializer [-Werror=missing-braces]

 static const struct pci_id_match intel_device_match[] = {
                                                         ^

../lib/intel_device_info.c:497:2:
INTEL_ADLP_IDS(&intel_alderlake_p_info),
{
../lib/intel_device_info.c:406:57: error: missing braces around initializer [-Werror=missing-braces]

 static const struct pci_id_match intel_device_match[] = {
                                                         ^

../lib/intel_device_info.c:497:2:
INTEL_ADLP_IDS(&intel_alderlake_p_info),
{
../lib/intel_device_info.c:500:1:
};
}
cc1: some warnings being treated as errors
ninja: build stopped: subcommand failed.

_______________________________________________
igt-dev mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/igt-dev

#21 lore raw

[igt-dev] ✗ GitLab.Pipeline: warning for Split display/graphics versions and add ADL-P (rev2)

In reply to Matt Roper
== Series Details ==

== Series Details ==

Series: Split display/graphics versions and add ADL-P (rev2)
URL : https://patchwork.freedesktop.org/series/91040/
State : warning

== Summary ==

Pipeline status: FAILED.

see https://gitlab.freedesktop.org/gfx-ci/igt-ci-tags/-/pipelines/332888 for the overview.

build:tests-debian-meson has failed (https://gitlab.freedesktop.org/gfx-ci/igt-ci-tags/-/jobs/10492651):
../lib/intel_device_info.c:497:2:

    INTEL_ADLP_IDS(&intel_alderlake_p_info),
    {
  ../lib/intel_device_info.c:406:57: error: missing braces around initializer [-Werror=missing-braces]
   static const struct pci_id_match intel_device_match[] = {
                                                           ^
  ../lib/intel_device_info.c:497:2:
    INTEL_ADLP_IDS(&intel_alderlake_p_info),
    {

../lib/intel_device_info.c:500:1:
};
}
cc1: some warnings being treated as errors
ninja: build stopped: subcommand failed.
section_end:1622870024:step_script
section_start:1622870024:cleanup_file_variables
Cleaning up file based variables
section_end:1622870025:cleanup_file_variables
ERROR: Job failed: exit code 1

build:tests-debian-meson-arm64 has failed (https://gitlab.freedesktop.org/gfx-ci/igt-ci-tags/-/jobs/10492654):
../lib/intel_device_info.c:497:2:

    INTEL_ADLP_IDS(&intel_alderlake_p_info),
    {
  ../lib/intel_device_info.c:406:57: error: missing braces around initializer [-Werror=missing-braces]
   static const struct pci_id_match intel_device_match[] = {
                                                           ^
  ../lib/intel_device_info.c:497:2:
    INTEL_ADLP_IDS(&intel_alderlake_p_info),
    {

../lib/intel_device_info.c:500:1:
};
}
cc1: some warnings being treated as errors
ninja: build stopped: subcommand failed.
section_end:1622870028:step_script
section_start:1622870028:cleanup_file_variables
Cleaning up file based variables
section_end:1622870029:cleanup_file_variables
ERROR: Job failed: exit code 1

build:tests-debian-meson-armhf has failed (https://gitlab.freedesktop.org/gfx-ci/igt-ci-tags/-/jobs/10492653):
../lib/intel_device_info.c:497:2:

    INTEL_ADLP_IDS(&intel_alderlake_p_info),
    {
  ../lib/intel_device_info.c:406:57: error: missing braces around initializer [-Werror=missing-braces]
   static const struct pci_id_match intel_device_match[] = {
                                                           ^
  ../lib/intel_device_info.c:497:2:
    INTEL_ADLP_IDS(&intel_alderlake_p_info),
    {

../lib/intel_device_info.c:500:1:
};
}
cc1: some warnings being treated as errors
ninja: build stopped: subcommand failed.
section_end:1622870025:step_script
section_start:1622870025:cleanup_file_variables
Cleaning up file based variables
section_end:1622870026:cleanup_file_variables
ERROR: Job failed: exit code 1

build:tests-debian-meson-mips has failed (https://gitlab.freedesktop.org/gfx-ci/igt-ci-tags/-/jobs/10492655):
../lib/intel_device_info.c:497:2:

    INTEL_ADLP_IDS(&intel_alderlake_p_info),
    {
  ../lib/intel_device_info.c:406:57: error: missing braces around initializer [-Werror=missing-braces]
   static const struct pci_id_match intel_device_match[] = {
                                                           ^
  ../lib/intel_device_info.c:497:2:
    INTEL_ADLP_IDS(&intel_alderlake_p_info),
    {

../lib/intel_device_info.c:500:1:
};
}
cc1: some warnings being treated as errors
ninja: build stopped: subcommand failed.
section_end:1622870029:step_script
section_start:1622870029:cleanup_file_variables
Cleaning up file based variables
section_end:1622870030:cleanup_file_variables
ERROR: Job failed: exit code 1

build:tests-debian-minimal has failed (https://gitlab.freedesktop.org/gfx-ci/igt-ci-tags/-/jobs/10492652):
../lib/intel_device_info.c:497:2:

    INTEL_ADLP_IDS(&intel_alderlake_p_info),
    {
  ../lib/intel_device_info.c:406:57: error: missing braces around initializer [-Werror=missing-braces]
   static const struct pci_id_match intel_device_match[] = {
                                                           ^
  ../lib/intel_device_info.c:497:2:
    INTEL_ADLP_IDS(&intel_alderlake_p_info),
    {

../lib/intel_device_info.c:500:1:
};
}
cc1: some warnings being treated as errors
ninja: build stopped: subcommand failed.
section_end:1622870028:step_script
section_start:1622870028:cleanup_file_variables
Cleaning up file based variables
section_end:1622870029:cleanup_file_variables
ERROR: Job failed: exit code 1

build:tests-fedora has failed (https://gitlab.freedesktop.org/gfx-ci/igt-ci-tags/-/jobs/10492646):
......

    497 |  INTEL_ADLP_IDS(&intel_alderlake_p_info),
        |  {
  ../lib/intel_device_info.c:406:57: error: missing braces around initializer [-Werror=missing-braces]
    406 | static const struct pci_id_match intel_device_match[] = {
        |                                                         ^
  ......
    497 |  INTEL_ADLP_IDS(&intel_alderlake_p_info),
        |  {
  ......
    500 | };
        | }

cc1: some warnings being treated as errors
ninja: build stopped: subcommand failed.
section_end:1622870026:step_script
section_start:1622870026:cleanup_file_variables
Cleaning up file based variables
section_end:1622870028:cleanup_file_variables
ERROR: Job failed: exit code 1

build:tests-fedora-clang has failed (https://gitlab.freedesktop.org/gfx-ci/igt-ci-tags/-/jobs/10492650):

  #define PCI_MATCH_ANY  (~0U)
                         ^~~~~
  ../lib/i915_pciids.h:39:10: note: expanded from macro 'INTEL_VGA_DEVICE'
          0x8086, id,                             \
                  ^~
  ../lib/intel_device_info.c:497:2: error: suggest braces around initialization of subobject [-Werror,-Wmissing-braces]
          INTEL_ADLP_IDS(&intel_alderlake_p_info),
          ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
          {
  ../lib/intel_device_info.c:497:2: error: initializer element is not a compile-time constant
          INTEL_ADLP_IDS(&intel_alderlake_p_info),
          ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

1 warning and 3 errors generated.
ninja: build stopped: subcommand failed.
section_end:1622870035:step_script
section_start:1622870035:cleanup_file_variables
Cleaning up file based variables
section_end:1622870036:cleanup_file_variables
ERROR: Job failed: exit code 1

build:tests-fedora-no-libdrm-nouveau has failed (https://gitlab.freedesktop.org/gfx-ci/igt-ci-tags/-/jobs/10492649):
......

    497 |  INTEL_ADLP_IDS(&intel_alderlake_p_info),
        |  {
  ../lib/intel_device_info.c:406:57: error: missing braces around initializer [-Werror=missing-braces]
    406 | static const struct pci_id_match intel_device_match[] = {
        |                                                         ^
  ......
    497 |  INTEL_ADLP_IDS(&intel_alderlake_p_info),
        |  {
  ......
    500 | };
        | }

cc1: some warnings being treated as errors
ninja: build stopped: subcommand failed.
section_end:1622870029:step_script
section_start:1622870029:cleanup_file_variables
Cleaning up file based variables
section_end:1622870030:cleanup_file_variables
ERROR: Job failed: exit code 1

build:tests-fedora-no-libunwind has failed (https://gitlab.freedesktop.org/gfx-ci/igt-ci-tags/-/jobs/10492647):
......

    497 |  INTEL_ADLP_IDS(&intel_alderlake_p_info),
        |  {
  ../lib/intel_device_info.c:406:57: error: missing braces around initializer [-Werror=missing-braces]
    406 | static const struct pci_id_match intel_device_match[] = {
        |                                                         ^
  ......
    497 |  INTEL_ADLP_IDS(&intel_alderlake_p_info),
        |  {
  ......
    500 | };
        | }

cc1: some warnings being treated as errors
ninja: build stopped: subcommand failed.
section_end:1622870029:step_script
section_start:1622870029:cleanup_file_variables
Cleaning up file based variables
section_end:1622870030:cleanup_file_variables
ERROR: Job failed: exit code 1

build:tests-fedora-oldest-meson has failed (https://gitlab.freedesktop.org/gfx-ci/igt-ci-tags/-/jobs/10492648):
......

    497 |  INTEL_ADLP_IDS(&intel_alderlake_p_info),
        |  {
  ../lib/intel_device_info.c:406:57: error: missing braces around initializer [-Werror=missing-braces]
    406 | static const struct pci_id_match intel_device_match[] = {
        |                                                         ^
  ......
    497 |  INTEL_ADLP_IDS(&intel_alderlake_p_info),
        |  {
  ......
    500 | };
        | }

cc1: some warnings being treated as errors
ninja: build stopped: subcommand failed.
section_end:1622870028:step_script
section_start:1622870028:cleanup_file_variables
Cleaning up file based variables
section_end:1622870029:cleanup_file_variables
ERROR: Job failed: exit code 1

== Logs ==

For more details see: https://gitlab.freedesktop.org/gfx-ci/igt-ci-tags/-/pipelines/332888
_______________________________________________
igt-dev mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/igt-dev

#22 lore raw

[igt-dev] ✗ Fi.CI.BUILD: failure for Split display/graphics versions and add ADL-P (rev3)

In reply to Matt Roper
== Series Details ==

== Series Details ==

Series: Split display/graphics versions and add ADL-P (rev3)
URL : https://patchwork.freedesktop.org/series/91040/
State : failure

== Summary ==

IGT patchset build failed on latest successful build 1fbc1e7d602f96a7f4e2b95057eef994656b8e74 i915/gem_exec_schedule: Check for timeslicing

../lib/intel_device_info.c:499:2: note: in expansion of macro ‘INTEL_VGA_DEVICE’
INTEL_VGA_DEVICE(PCI_MATCH_ANY, &intel_generic_info),
^~~~~~~~~~~~~~~~
../lib/i915_pciids.h:41:2: note: (near initialization for ‘intel_device_match[301].device_id’)
0x030000, 0xff0000, \
^~~~~~~~
../lib/intel_device_info.c:499:2: note: in expansion of macro ‘INTEL_VGA_DEVICE’
INTEL_VGA_DEVICE(PCI_MATCH_ANY, &intel_generic_info),
^~~~~~~~~~~~~~~~
../lib/i915_pciids.h:41:12: warning: excess elements in scalar initializer

  0x030000, 0xff0000,   \
            ^~~~~~~~

../lib/intel_device_info.c:499:2: note: in expansion of macro ‘INTEL_VGA_DEVICE’
INTEL_VGA_DEVICE(PCI_MATCH_ANY, &intel_generic_info),
^~~~~~~~~~~~~~~~
../lib/i915_pciids.h:41:12: note: (near initialization for ‘intel_device_match[301].device_id’)

  0x030000, 0xff0000,   \
            ^~~~~~~~

../lib/intel_device_info.c:499:2: note: in expansion of macro ‘INTEL_VGA_DEVICE’
INTEL_VGA_DEVICE(PCI_MATCH_ANY, &intel_generic_info),
^~~~~~~~~~~~~~~~
../lib/i915_pciids.h:42:2: warning: excess elements in scalar initializer
(unsigned long) info }
^
../lib/intel_device_info.c:499:2: note: in expansion of macro ‘INTEL_VGA_DEVICE’
INTEL_VGA_DEVICE(PCI_MATCH_ANY, &intel_generic_info),
^~~~~~~~~~~~~~~~
../lib/i915_pciids.h:42:2: note: (near initialization for ‘intel_device_match[301].device_id’)
(unsigned long) info }
^
../lib/intel_device_info.c:499:2: note: in expansion of macro ‘INTEL_VGA_DEVICE’
INTEL_VGA_DEVICE(PCI_MATCH_ANY, &intel_generic_info),
^~~~~~~~~~~~~~~~
../lib/intel_device_info.c:406:57: error: missing braces around initializer [-Werror=missing-braces]

 static const struct pci_id_match intel_device_match[] = {
                                                         ^

../lib/intel_device_info.c:497:2:
INTEL_ADLP_IDS(&intel_alderlake_p_info),
{
../lib/intel_device_info.c:406:57: error: missing braces around initializer [-Werror=missing-braces]

 static const struct pci_id_match intel_device_match[] = {
                                                         ^

../lib/intel_device_info.c:497:2:
INTEL_ADLP_IDS(&intel_alderlake_p_info),
{
../lib/intel_device_info.c:500:1:
};
}
cc1: some warnings being treated as errors
ninja: build stopped: subcommand failed.

_______________________________________________
igt-dev mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/igt-dev

#23 lore raw

[igt-dev] ✗ GitLab.Pipeline: warning for Split display/graphics versions and add ADL-P (rev3)

In reply to Matt Roper
== Series Details ==

== Series Details ==

Series: Split display/graphics versions and add ADL-P (rev3)
URL : https://patchwork.freedesktop.org/series/91040/
State : warning

== Summary ==

Pipeline status: FAILED.

see https://gitlab.freedesktop.org/gfx-ci/igt-ci-tags/-/pipelines/333029 for the overview.

build:tests-debian-meson has failed (https://gitlab.freedesktop.org/gfx-ci/igt-ci-tags/-/jobs/10495888):
../lib/intel_device_info.c:497:2:

    INTEL_ADLP_IDS(&intel_alderlake_p_info),
    {
  ../lib/intel_device_info.c:406:57: error: missing braces around initializer [-Werror=missing-braces]
   static const struct pci_id_match intel_device_match[] = {
                                                           ^
  ../lib/intel_device_info.c:497:2:
    INTEL_ADLP_IDS(&intel_alderlake_p_info),
    {

../lib/intel_device_info.c:500:1:
};
}
cc1: some warnings being treated as errors
ninja: build stopped: subcommand failed.
section_end:1622919258:step_script
section_start:1622919258:cleanup_file_variables
Cleaning up file based variables
section_end:1622919260:cleanup_file_variables
ERROR: Job failed: exit code 1

build:tests-debian-meson-arm64 has failed (https://gitlab.freedesktop.org/gfx-ci/igt-ci-tags/-/jobs/10495891):
../lib/intel_device_info.c:497:2:

    INTEL_ADLP_IDS(&intel_alderlake_p_info),
    {
  ../lib/intel_device_info.c:406:57: error: missing braces around initializer [-Werror=missing-braces]
   static const struct pci_id_match intel_device_match[] = {
                                                           ^
  ../lib/intel_device_info.c:497:2:
    INTEL_ADLP_IDS(&intel_alderlake_p_info),
    {

../lib/intel_device_info.c:500:1:
};
}
cc1: some warnings being treated as errors
ninja: build stopped: subcommand failed.
section_end:1622919283:step_script
section_start:1622919283:cleanup_file_variables
Cleaning up file based variables
section_end:1622919284:cleanup_file_variables
ERROR: Job failed: exit code 1

build:tests-debian-meson-armhf has failed (https://gitlab.freedesktop.org/gfx-ci/igt-ci-tags/-/jobs/10495890):
../lib/intel_device_info.c:497:2:

    INTEL_ADLP_IDS(&intel_alderlake_p_info),
    {
  ../lib/intel_device_info.c:406:57: error: missing braces around initializer [-Werror=missing-braces]
   static const struct pci_id_match intel_device_match[] = {
                                                           ^
  ../lib/intel_device_info.c:497:2:
    INTEL_ADLP_IDS(&intel_alderlake_p_info),
    {

../lib/intel_device_info.c:500:1:
};
}
cc1: some warnings being treated as errors
ninja: build stopped: subcommand failed.
section_end:1622919264:step_script
section_start:1622919264:cleanup_file_variables
Cleaning up file based variables
section_end:1622919265:cleanup_file_variables
ERROR: Job failed: exit code 1

build:tests-debian-meson-mips has failed (https://gitlab.freedesktop.org/gfx-ci/igt-ci-tags/-/jobs/10495892):
../lib/intel_device_info.c:497:2:

    INTEL_ADLP_IDS(&intel_alderlake_p_info),
    {
  ../lib/intel_device_info.c:406:57: error: missing braces around initializer [-Werror=missing-braces]
   static const struct pci_id_match intel_device_match[] = {
                                                           ^
  ../lib/intel_device_info.c:497:2:
    INTEL_ADLP_IDS(&intel_alderlake_p_info),
    {

../lib/intel_device_info.c:500:1:
};
}
cc1: some warnings being treated as errors
ninja: build stopped: subcommand failed.
section_end:1622919259:step_script
section_start:1622919259:cleanup_file_variables
Cleaning up file based variables
section_end:1622919261:cleanup_file_variables
ERROR: Job failed: exit code 1

build:tests-debian-minimal has failed (https://gitlab.freedesktop.org/gfx-ci/igt-ci-tags/-/jobs/10495889):
../lib/intel_device_info.c:497:2:

    INTEL_ADLP_IDS(&intel_alderlake_p_info),
    {
  ../lib/intel_device_info.c:406:57: error: missing braces around initializer [-Werror=missing-braces]
   static const struct pci_id_match intel_device_match[] = {
                                                           ^
  ../lib/intel_device_info.c:497:2:
    INTEL_ADLP_IDS(&intel_alderlake_p_info),
    {

../lib/intel_device_info.c:500:1:
};
}
cc1: some warnings being treated as errors
ninja: build stopped: subcommand failed.
section_end:1622919263:step_script
section_start:1622919263:cleanup_file_variables
Cleaning up file based variables
section_end:1622919266:cleanup_file_variables
ERROR: Job failed: exit code 1

build:tests-fedora has failed (https://gitlab.freedesktop.org/gfx-ci/igt-ci-tags/-/jobs/10495883):
......

    497 |  INTEL_ADLP_IDS(&intel_alderlake_p_info),
        |  {
  ../lib/intel_device_info.c:406:57: error: missing braces around initializer [-Werror=missing-braces]
    406 | static const struct pci_id_match intel_device_match[] = {
        |                                                         ^
  ......
    497 |  INTEL_ADLP_IDS(&intel_alderlake_p_info),
        |  {
  ......
    500 | };
        | }

cc1: some warnings being treated as errors
ninja: build stopped: subcommand failed.
section_end:1622919285:step_script
section_start:1622919285:cleanup_file_variables
Cleaning up file based variables
section_end:1622919286:cleanup_file_variables
ERROR: Job failed: exit code 1

build:tests-fedora-clang has failed (https://gitlab.freedesktop.org/gfx-ci/igt-ci-tags/-/jobs/10495887):

  #define PCI_MATCH_ANY  (~0U)
                         ^~~~~
  ../lib/i915_pciids.h:39:10: note: expanded from macro 'INTEL_VGA_DEVICE'
          0x8086, id,                             \
                  ^~
  ../lib/intel_device_info.c:497:2: error: suggest braces around initialization of subobject [-Werror,-Wmissing-braces]
          INTEL_ADLP_IDS(&intel_alderlake_p_info),
          ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
          {
  ../lib/intel_device_info.c:497:2: error: initializer element is not a compile-time constant
          INTEL_ADLP_IDS(&intel_alderlake_p_info),
          ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

1 warning and 3 errors generated.
ninja: build stopped: subcommand failed.
section_end:1622919275:step_script
section_start:1622919275:cleanup_file_variables
Cleaning up file based variables
section_end:1622919276:cleanup_file_variables
ERROR: Job failed: exit code 1

build:tests-fedora-no-libdrm-nouveau has failed (https://gitlab.freedesktop.org/gfx-ci/igt-ci-tags/-/jobs/10495886):
......

    497 |  INTEL_ADLP_IDS(&intel_alderlake_p_info),
        |  {
  ../lib/intel_device_info.c:406:57: error: missing braces around initializer [-Werror=missing-braces]
    406 | static const struct pci_id_match intel_device_match[] = {
        |                                                         ^
  ......
    497 |  INTEL_ADLP_IDS(&intel_alderlake_p_info),
        |  {
  ......
    500 | };
        | }

cc1: some warnings being treated as errors
ninja: build stopped: subcommand failed.
section_end:1622919279:step_script
section_start:1622919279:cleanup_file_variables
Cleaning up file based variables
section_end:1622919284:cleanup_file_variables
ERROR: Job failed: exit code 1

build:tests-fedora-no-libunwind has failed (https://gitlab.freedesktop.org/gfx-ci/igt-ci-tags/-/jobs/10495884):
......

    497 |  INTEL_ADLP_IDS(&intel_alderlake_p_info),
        |  {
  ../lib/intel_device_info.c:406:57: error: missing braces around initializer [-Werror=missing-braces]
    406 | static const struct pci_id_match intel_device_match[] = {
        |                                                         ^
  ......
    497 |  INTEL_ADLP_IDS(&intel_alderlake_p_info),
        |  {
  ......
    500 | };
        | }

cc1: some warnings being treated as errors
ninja: build stopped: subcommand failed.
section_end:1622919266:step_script
section_start:1622919266:cleanup_file_variables
Cleaning up file based variables
section_end:1622919267:cleanup_file_variables
ERROR: Job failed: exit code 1

build:tests-fedora-oldest-meson has failed (https://gitlab.freedesktop.org/gfx-ci/igt-ci-tags/-/jobs/10495885):
......

    497 |  INTEL_ADLP_IDS(&intel_alderlake_p_info),
        |  {
  ../lib/intel_device_info.c:406:57: error: missing braces around initializer [-Werror=missing-braces]
    406 | static const struct pci_id_match intel_device_match[] = {
        |                                                         ^
  ......
    497 |  INTEL_ADLP_IDS(&intel_alderlake_p_info),
        |  {
  ......
    500 | };
        | }

cc1: some warnings being treated as errors
ninja: build stopped: subcommand failed.
section_end:1622919268:step_script
section_start:1622919268:cleanup_file_variables
Cleaning up file based variables
section_end:1622919269:cleanup_file_variables
ERROR: Job failed: exit code 1

== Logs ==

For more details see: https://gitlab.freedesktop.org/gfx-ci/igt-ci-tags/-/pipelines/333029
_______________________________________________
igt-dev mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/igt-dev

#24 lore raw

[igt-dev] ✓ Fi.CI.BAT: success for Split display/graphics versions and add ADL-P (rev4)

In reply to Matt Roper
== Series Details ==

== Series Details ==

Series: Split display/graphics versions and add ADL-P (rev4)
URL : https://patchwork.freedesktop.org/series/91040/
State : success

== Summary ==

CI Bug Log - changes from CI_DRM_10187 -> IGTPW_5891
====================================================

Summary
-------

**SUCCESS**

No regressions found.

External URL: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5891/index.html

Known issues
------------

Here are the changes found in IGTPW_5891 that come from known issues:

### IGT changes ###

#### Issues hit ####

* igt@gem_huc_copy@huc-copy:
- fi-kbl-soraka: NOTRUN -> [SKIP][1] ([fdo#109271] / [i915#2190])
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5891/fi-kbl-soraka/igt@[email protected]

* igt@gem_tiled_blits@basic:
- fi-kbl-soraka: NOTRUN -> [SKIP][2] ([fdo#109271]) +3 similar issues
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5891/fi-kbl-soraka/igt@[email protected]

* igt@i915_selftest@live@execlists:
- fi-kbl-soraka: NOTRUN -> [INCOMPLETE][3] ([i915#2782] / [i915#3462] / [i915#794])
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5891/fi-kbl-soraka/igt@i915_selftest@[email protected]

* igt@i915_selftest@live@gt_pm:
- fi-kbl-soraka: NOTRUN -> [DMESG-FAIL][4] ([i915#1886] / [i915#2291])
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5891/fi-kbl-soraka/igt@i915_selftest@live@gt_pm.html

* igt@kms_chamelium@common-hpd-after-suspend:
- fi-kbl-soraka: NOTRUN -> [SKIP][5] ([fdo#109271] / [fdo#111827]) +8 similar issues
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5891/fi-kbl-soraka/igt@[email protected]

* igt@kms_chamelium@dp-crc-fast:
- fi-kbl-7500u: [PASS][6] -> [FAIL][7] ([i915#1372])
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10187/fi-kbl-7500u/igt@[email protected]
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5891/fi-kbl-7500u/igt@[email protected]

* igt@kms_pipe_crc_basic@compare-crc-sanitycheck-pipe-d:
- fi-kbl-soraka: NOTRUN -> [SKIP][8] ([fdo#109271] / [i915#533])
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5891/fi-kbl-soraka/igt@[email protected]

* igt@runner@aborted:
- fi-kbl-soraka: NOTRUN -> [FAIL][9] ([i915#1436] / [i915#2426] / [i915#3363])
[9]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5891/fi-kbl-soraka/igt@[email protected]

#### Possible fixes ####

* igt@gem_exec_suspend@basic-s0:
- fi-kbl-soraka: [INCOMPLETE][10] ([i915#155]) -> [PASS][11]
[10]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10187/fi-kbl-soraka/igt@[email protected]
[11]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5891/fi-kbl-soraka/igt@[email protected]

* igt@i915_selftest@live@gt_pm:
- fi-cml-s: [DMESG-FAIL][12] ([i915#2291]) -> [PASS][13]
[12]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10187/fi-cml-s/igt@i915_selftest@live@gt_pm.html
[13]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5891/fi-cml-s/igt@i915_selftest@live@gt_pm.html

#### Warnings ####

* igt@i915_selftest@live@execlists:
- fi-icl-u2: [DMESG-FAIL][14] ([i915#3462]) -> [INCOMPLETE][15] ([i915#2782] / [i915#3462])
[14]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10187/fi-icl-u2/igt@i915_selftest@[email protected]
[15]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5891/fi-icl-u2/igt@i915_selftest@[email protected]

* igt@runner@aborted:
- fi-cfl-8700k: [FAIL][16] ([i915#3363]) -> [FAIL][17] ([i915#2426] / [i915#3363])
[16]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10187/fi-cfl-8700k/igt@[email protected]
[17]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5891/fi-cfl-8700k/igt@[email protected]
- fi-icl-u2: [FAIL][18] ([i915#2426] / [i915#2782] / [i915#3363]) -> [FAIL][19] ([i915#2782] / [i915#3363])
[18]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10187/fi-icl-u2/igt@[email protected]
[19]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5891/fi-icl-u2/igt@[email protected]
- fi-bxt-dsi: [FAIL][20] ([i915#3363]) -> [FAIL][21] ([i915#2426] / [i915#3363])
[20]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10187/fi-bxt-dsi/igt@[email protected]
[21]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5891/fi-bxt-dsi/igt@[email protected]
- fi-skl-guc: [FAIL][22] ([i915#1436] / [i915#2426] / [i915#3363]) -> [FAIL][23] ([i915#1436] / [i915#3363])
[22]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10187/fi-skl-guc/igt@[email protected]
[23]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5891/fi-skl-guc/igt@[email protected]
- fi-skl-6700k2: [FAIL][24] ([i915#1436] / [i915#2426] / [i915#3363]) -> [FAIL][25] ([i915#1436] / [i915#3363])
[24]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10187/fi-skl-6700k2/igt@[email protected]
[25]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5891/fi-skl-6700k2/igt@[email protected]

{name}: This element is suppressed. This means it is ignored when computing
the status of the difference (SUCCESS, WARNING, or FAILURE).

[fdo#109271]: https://bugs.freedesktop.org/show_bug.cgi?id=109271
[fdo#111827]: https://bugs.freedesktop.org/show_bug.cgi?id=111827
[i915#1372]: https://gitlab.freedesktop.org/drm/intel/issues/1372
[i915#1436]: https://gitlab.freedesktop.org/drm/intel/issues/1436
[i915#155]: https://gitlab.freedesktop.org/drm/intel/issues/155
[i915#1886]: https://gitlab.freedesktop.org/drm/intel/issues/1886
[i915#2190]: https://gitlab.freedesktop.org/drm/intel/issues/2190
[i915#2291]: https://gitlab.freedesktop.org/drm/intel/issues/2291
[i915#2426]: https://gitlab.freedesktop.org/drm/intel/issues/2426
[i915#2782]: https://gitlab.freedesktop.org/drm/intel/issues/2782
[i915#3277]: https://gitlab.freedesktop.org/drm/intel/issues/3277
[i915#3283]: https://gitlab.freedesktop.org/drm/intel/issues/3283
[i915#3363]: https://gitlab.freedesktop.org/drm/intel/issues/3363
[i915#3462]: https://gitlab.freedesktop.org/drm/intel/issues/3462
[i915#533]: https://gitlab.freedesktop.org/drm/intel/issues/533
[i915#794]: https://gitlab.freedesktop.org/drm/intel/issues/794

Participating hosts (49 -> 41)
------------------------------

Missing (8): fi-ilk-m540 fi-hsw-4200u fi-bsw-cyan bat-adlp-4 fi-ctg-p8600 fi-dg1-1 fi-bdw-samus bat-jsl-1

Build changes
-------------

* CI: CI-20190529 -> None
* IGT: IGT_6099 -> IGTPW_5891

CI-20190529: 20190529
CI_DRM_10187: 30bc4ca43fe0e01c64e5311342993f73a91eda64 @ git://anongit.freedesktop.org/gfx-ci/linux
IGTPW_5891: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5891/index.html
IGT_6099: adb9ee4ed7206725cfe3589bf49f47f9dcf661f2 @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools

== Logs ==

For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5891/index.html

_______________________________________________
igt-dev mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/igt-dev

#25 lore raw

[igt-dev] ✗ Fi.CI.IGT: failure for Split display/graphics versions and add ADL-P (rev4)

In reply to Matt Roper
== Series Details ==

== Series Details ==

Series: Split display/graphics versions and add ADL-P (rev4)
URL : https://patchwork.freedesktop.org/series/91040/
State : failure

== Summary ==

CI Bug Log - changes from CI_DRM_10187_full -> IGTPW_5891_full
====================================================

Summary
-------

**FAILURE**

Serious unknown changes coming with IGTPW_5891_full absolutely need to be verified manually.

If you think the reported changes have nothing to do with the changes introduced in IGTPW_5891_full, please notify your bug team to allow them to document this new failure mode, which will reduce false positives in CI.

External URL: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5891/index.html

Possible new issues
-------------------

Here are the unknown changes that may have been introduced in IGTPW_5891_full:

### IGT changes ###

#### Possible regressions ####

* igt@gem_ctx_persistence@engines-hostile@vcs1:
- shard-tglb: [PASS][1] -> [FAIL][2]
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10187/shard-tglb2/igt@gem_ctx_persistence@[email protected]
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5891/shard-tglb5/igt@gem_ctx_persistence@[email protected]

Known issues
------------

Here are the changes found in IGTPW_5891_full that come from known issues:

### IGT changes ###

#### Issues hit ####

* igt@gem_create@create-massive:
- shard-kbl: NOTRUN -> [DMESG-WARN][3] ([i915#3002])
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5891/shard-kbl2/igt@[email protected]

* igt@gem_ctx_persistence@engines-hostile@vcs0:
- shard-iclb: [PASS][4] -> [FAIL][5] ([i915#2410])
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10187/shard-iclb3/igt@gem_ctx_persistence@[email protected]
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5891/shard-iclb7/igt@gem_ctx_persistence@[email protected]

* igt@gem_ctx_persistence@legacy-engines-hostile@bsd2:
- shard-iclb: NOTRUN -> [FAIL][6] ([i915#2410])
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5891/shard-iclb1/igt@gem_ctx_persistence@[email protected]

* igt@gem_ctx_persistence@legacy-engines-mixed-process:
- shard-snb: NOTRUN -> [SKIP][7] ([fdo#109271] / [i915#1099]) +2 similar issues
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5891/shard-snb6/igt@[email protected]

* igt@gem_ctx_persistence@smoketest:
- shard-tglb: [PASS][8] -> [FAIL][9] ([i915#2896])
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10187/shard-tglb7/igt@[email protected]
[9]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5891/shard-tglb1/igt@[email protected]

* igt@gem_exec_fair@basic-none@rcs0:
- shard-glk: [PASS][10] -> [FAIL][11] ([i915#2842]) +1 similar issue
[10]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10187/shard-glk5/igt@gem_exec_fair@[email protected]
[11]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5891/shard-glk3/igt@gem_exec_fair@[email protected]

* igt@gem_exec_fair@basic-pace-solo@rcs0:
- shard-iclb: NOTRUN -> [FAIL][12] ([i915#2842])
[12]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5891/shard-iclb4/igt@gem_exec_fair@[email protected]
- shard-glk: NOTRUN -> [FAIL][13] ([i915#2842])
[13]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5891/shard-glk8/igt@gem_exec_fair@[email protected]
- shard-tglb: NOTRUN -> [FAIL][14] ([i915#2842])
[14]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5891/shard-tglb3/igt@gem_exec_fair@[email protected]

* igt@gem_exec_fair@basic-pace@vcs0:
- shard-tglb: [PASS][15] -> [FAIL][16] ([i915#2842])
[15]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10187/shard-tglb7/igt@gem_exec_fair@[email protected]
[16]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5891/shard-tglb5/igt@gem_exec_fair@[email protected]

* igt@gem_media_vme:
- shard-tglb: NOTRUN -> [SKIP][17] ([i915#284])
[17]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5891/shard-tglb5/igt@gem_media_vme.html

* igt@gem_mmap_gtt@big-copy-xy:
- shard-glk: [PASS][18] -> [FAIL][19] ([i915#307])
[18]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10187/shard-glk8/igt@[email protected]
[19]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5891/shard-glk4/igt@[email protected]

* igt@gem_mmap_gtt@cpuset-big-copy-xy:
- shard-iclb: [PASS][20] -> [FAIL][21] ([i915#2428])
[20]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10187/shard-iclb6/igt@[email protected]
[21]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5891/shard-iclb6/igt@[email protected]

* igt@gem_pwrite@basic-exhaustion:
- shard-snb: NOTRUN -> [WARN][22] ([i915#2658])
[22]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5891/shard-snb2/igt@[email protected]

* igt@gem_userptr_blits@dmabuf-sync:
- shard-glk: NOTRUN -> [SKIP][23] ([fdo#109271] / [i915#3323])
[23]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5891/shard-glk2/igt@[email protected]

* igt@gem_userptr_blits@input-checking:
- shard-apl: NOTRUN -> [DMESG-WARN][24] ([i915#3002])
[24]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5891/shard-apl2/igt@[email protected]

* igt@gen7_exec_parse@basic-allowed:
- shard-tglb: NOTRUN -> [SKIP][25] ([fdo#109289]) +1 similar issue
[25]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5891/shard-tglb6/igt@[email protected]

* igt@gen7_exec_parse@batch-without-end:
- shard-iclb: NOTRUN -> [SKIP][26] ([fdo#109289]) +2 similar issues
[26]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5891/shard-iclb5/igt@[email protected]

* igt@gen9_exec_parse@bb-large:
- shard-tglb: NOTRUN -> [SKIP][27] ([i915#2527])
[27]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5891/shard-tglb2/igt@[email protected]
- shard-glk: NOTRUN -> [FAIL][28] ([i915#3296])
[28]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5891/shard-glk1/igt@[email protected]
- shard-kbl: NOTRUN -> [FAIL][29] ([i915#3296])
[29]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5891/shard-kbl1/igt@[email protected]
- shard-iclb: NOTRUN -> [SKIP][30] ([i915#2527])
[30]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5891/shard-iclb5/igt@[email protected]

* igt@i915_pm_rc6_residency@rc6-fence:
- shard-tglb: NOTRUN -> [WARN][31] ([i915#2681])
[31]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5891/shard-tglb6/igt@[email protected]

* igt@i915_pm_rpm@dpms-mode-unset-non-lpsp:
- shard-tglb: NOTRUN -> [SKIP][32] ([fdo#111644] / [i915#1397] / [i915#2411]) +2 similar issues
[32]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5891/shard-tglb8/igt@[email protected]

* igt@i915_pm_rpm@modeset-non-lpsp:
- shard-iclb: NOTRUN -> [SKIP][33] ([fdo#110892]) +2 similar issues
[33]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5891/shard-iclb4/igt@[email protected]

* igt@i915_pm_sseu@full-enable:
- shard-tglb: NOTRUN -> [SKIP][34] ([fdo#109288])
[34]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5891/shard-tglb8/igt@[email protected]
- shard-iclb: NOTRUN -> [SKIP][35] ([fdo#109288])
[35]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5891/shard-iclb2/igt@[email protected]

* igt@i915_query@query-topology-known-pci-ids:
- shard-tglb: NOTRUN -> [SKIP][36] ([fdo#109303])
[36]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5891/shard-tglb8/igt@[email protected]
- shard-iclb: NOTRUN -> [SKIP][37] ([fdo#109303])
[37]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5891/shard-iclb1/igt@[email protected]

* igt@i915_selftest@live@hangcheck:
- shard-snb: [PASS][38] -> [INCOMPLETE][39] ([i915#2782])
[38]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10187/shard-snb7/igt@i915_selftest@[email protected]
[39]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5891/shard-snb2/igt@i915_selftest@[email protected]

* igt@i915_suspend@debugfs-reader:
- shard-apl: NOTRUN -> [DMESG-WARN][40] ([i915#180])
[40]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5891/shard-apl1/igt@[email protected]

* igt@kms_big_fb@linear-8bpp-rotate-270:
- shard-tglb: NOTRUN -> [SKIP][41] ([fdo#111614]) +2 similar issues
[41]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5891/shard-tglb2/igt@[email protected]
- shard-iclb: NOTRUN -> [SKIP][42] ([fdo#110725] / [fdo#111614]) +1 similar issue
[42]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5891/shard-iclb6/igt@[email protected]

* igt@kms_big_fb@yf-tiled-64bpp-rotate-270:
- shard-tglb: NOTRUN -> [SKIP][43] ([fdo#111615]) +2 similar issues
[43]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5891/shard-tglb6/igt@[email protected]

* igt@kms_big_joiner@invalid-modeset:
- shard-iclb: NOTRUN -> [SKIP][44] ([i915#2705])
[44]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5891/shard-iclb7/igt@[email protected]
- shard-tglb: NOTRUN -> [SKIP][45] ([i915#2705])
[45]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5891/shard-tglb7/igt@[email protected]

* igt@kms_chamelium@hdmi-edid-change-during-suspend:
- shard-apl: NOTRUN -> [SKIP][46] ([fdo#109271] / [fdo#111827]) +14 similar issues
[46]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5891/shard-apl2/igt@[email protected]

* igt@kms_chamelium@vga-frame-dump:
- shard-tglb: NOTRUN -> [SKIP][47] ([fdo#109284] / [fdo#111827]) +10 similar issues
[47]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5891/shard-tglb1/igt@[email protected]

* igt@kms_chamelium@vga-hpd-without-ddc:
- shard-snb: NOTRUN -> [SKIP][48] ([fdo#109271] / [fdo#111827]) +16 similar issues
[48]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5891/shard-snb5/igt@[email protected]

* igt@kms_color@pipe-d-ctm-0-75:
- shard-iclb: NOTRUN -> [SKIP][49] ([fdo#109278] / [i915#1149]) +1 similar issue
[49]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5891/shard-iclb8/igt@[email protected]

* igt@kms_color_chamelium@pipe-a-ctm-0-5:
- shard-glk: NOTRUN -> [SKIP][50] ([fdo#109271] / [fdo#111827]) +12 similar issues
[50]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5891/shard-glk3/igt@[email protected]

* igt@kms_color_chamelium@pipe-b-ctm-0-25:
- shard-kbl: NOTRUN -> [SKIP][51] ([fdo#109271] / [fdo#111827]) +14 similar issues
[51]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5891/shard-kbl1/igt@[email protected]

* igt@kms_color_chamelium@pipe-b-gamma:
- shard-iclb: NOTRUN -> [SKIP][52] ([fdo#109284] / [fdo#111827]) +4 similar issues
[52]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5891/shard-iclb1/igt@[email protected]

* igt@kms_color_chamelium@pipe-d-ctm-green-to-red:
- shard-iclb: NOTRUN -> [SKIP][53] ([fdo#109278] / [fdo#109284] / [fdo#111827]) +1 similar issue
[53]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5891/shard-iclb6/igt@[email protected]

* igt@kms_content_protection@atomic:
- shard-apl: NOTRUN -> [TIMEOUT][54] ([i915#1319]) +1 similar issue
[54]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5891/shard-apl8/igt@[email protected]

* igt@kms_content_protection@dp-mst-type-1:
- shard-iclb: NOTRUN -> [SKIP][55] ([i915#3116])
[55]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5891/shard-iclb6/igt@[email protected]
- shard-tglb: NOTRUN -> [SKIP][56] ([i915#3116])
[56]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5891/shard-tglb7/igt@[email protected]

* igt@kms_content_protection@uevent:
- shard-kbl: NOTRUN -> [FAIL][57] ([i915#2105])
[57]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5891/shard-kbl2/igt@[email protected]
- shard-tglb: NOTRUN -> [SKIP][58] ([fdo#111828]) +1 similar issue
[58]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5891/shard-tglb2/igt@[email protected]
- shard-iclb: NOTRUN -> [SKIP][59] ([fdo#109300] / [fdo#111066])
[59]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5891/shard-iclb8/igt@[email protected]

* igt@kms_cursor_crc@pipe-a-cursor-128x128-sliding:
- shard-kbl: [PASS][60] -> [FAIL][61] ([i915#3444])
[60]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10187/shard-kbl2/igt@[email protected]
[61]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5891/shard-kbl1/igt@[email protected]

* igt@kms_cursor_crc@pipe-a-cursor-512x170-onscreen:
- shard-tglb: NOTRUN -> [SKIP][62] ([fdo#109279] / [i915#3359]) +1 similar issue
[62]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5891/shard-tglb7/igt@[email protected]

* igt@kms_cursor_crc@pipe-b-cursor-32x32-sliding:
- shard-tglb: NOTRUN -> [SKIP][63] ([i915#3319]) +5 similar issues
[63]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5891/shard-tglb3/igt@[email protected]

* igt@kms_cursor_crc@pipe-b-cursor-512x170-offscreen:
- shard-iclb: NOTRUN -> [SKIP][64] ([fdo#109278] / [fdo#109279])
[64]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5891/shard-iclb2/igt@[email protected]

* igt@kms_cursor_crc@pipe-b-cursor-max-size-rapid-movement:
- shard-tglb: NOTRUN -> [SKIP][65] ([i915#3359]) +4 similar issues
[65]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5891/shard-tglb5/igt@[email protected]

* igt@kms_cursor_crc@pipe-c-cursor-32x10-offscreen:
- shard-iclb: NOTRUN -> [SKIP][66] ([fdo#109278]) +18 similar issues
[66]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5891/shard-iclb6/igt@[email protected]

* igt@kms_cursor_edge_walk@pipe-d-64x64-left-edge:
- shard-kbl: NOTRUN -> [SKIP][67] ([fdo#109271]) +122 similar issues
[67]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5891/shard-kbl1/igt@[email protected]

* igt@kms_cursor_legacy@cursora-vs-flipb-legacy:
- shard-iclb: NOTRUN -> [SKIP][68] ([fdo#109274] / [fdo#109278])
[68]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5891/shard-iclb4/igt@[email protected]

* igt@kms_dp_tiled_display@basic-test-pattern-with-chamelium:
- shard-tglb: NOTRUN -> [SKIP][69] ([i915#3528])
[69]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5891/shard-tglb6/igt@[email protected]
- shard-iclb: NOTRUN -> [SKIP][70] ([i915#3528])
[70]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5891/shard-iclb8/igt@[email protected]

* igt@kms_fbcon_fbt@fbc-suspend:
- shard-apl: [PASS][71] -> [INCOMPLETE][72] ([i915#180])
[71]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10187/shard-apl7/igt@[email protected]
[72]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5891/shard-apl1/igt@[email protected]

* igt@kms_flip@2x-flip-vs-panning-interruptible:
- shard-iclb: NOTRUN -> [SKIP][73] ([fdo#109274]) +5 similar issues
[73]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5891/shard-iclb6/igt@[email protected]

* igt@kms_flip@flip-vs-suspend@c-dp1:
- shard-kbl: NOTRUN -> [DMESG-WARN][74] ([i915#180]) +1 similar issue
[74]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5891/shard-kbl1/igt@kms_flip@[email protected]

* igt@kms_flip_scaled_crc@flip-32bpp-ytileccs-to-64bpp-ytile:
- shard-snb: NOTRUN -> [SKIP][75] ([fdo#109271]) +344 similar issues
[75]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5891/shard-snb2/igt@[email protected]

* igt@kms_frontbuffer_tracking@fbc-2p-shrfb-fliptrack-mmap-gtt:
- shard-iclb: NOTRUN -> [SKIP][76] ([fdo#109280]) +18 similar issues
[76]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5891/shard-iclb8/igt@[email protected]

* igt@kms_frontbuffer_tracking@psr-2p-scndscrn-cur-indfb-move:
- shard-tglb: NOTRUN -> [SKIP][77] ([fdo#111825]) +30 similar issues
[77]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5891/shard-tglb1/igt@[email protected]

* igt@kms_frontbuffer_tracking@psr-rgb565-draw-mmap-cpu:
- shard-glk: NOTRUN -> [SKIP][78] ([fdo#109271]) +86 similar issues
[78]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5891/shard-glk7/igt@[email protected]

* igt@kms_hdr@bpc-switch-suspend:
- shard-kbl: NOTRUN -> [INCOMPLETE][79] ([i915#155] / [i915#2828])
[79]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5891/shard-kbl4/igt@[email protected]

* igt@kms_hdr@static-swap:
- shard-tglb: NOTRUN -> [SKIP][80] ([i915#1187])
[80]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5891/shard-tglb6/igt@[email protected]
- shard-iclb: NOTRUN -> [SKIP][81] ([i915#1187])
[81]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5891/shard-iclb1/igt@[email protected]

* igt@kms_pipe_b_c_ivb@disable-pipe-b-enable-pipe-c:
- shard-apl: NOTRUN -> [SKIP][82] ([fdo#109271]) +162 similar issues
[82]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5891/shard-apl7/igt@[email protected]

* igt@kms_pipe_crc_basic@read-crc-pipe-d-frame-sequence:
- shard-glk: NOTRUN -> [SKIP][83] ([fdo#109271] / [i915#533])
[83]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5891/shard-glk3/igt@[email protected]
- shard-apl: NOTRUN -> [SKIP][84] ([fdo#109271] / [i915#533]) +2 similar issues
[84]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5891/shard-apl1/igt@[email protected]

* igt@kms_pipe_crc_basic@suspend-read-crc-pipe-a:
- shard-kbl: [PASS][85] -> [DMESG-WARN][86] ([i915#180]) +3 similar issues
[85]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10187/shard-kbl2/igt@[email protected]
[86]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5891/shard-kbl1/igt@[email protected]

* igt@kms_plane_alpha_blend@pipe-b-alpha-7efc:
- shard-apl: NOTRUN -> [FAIL][87] ([fdo#108145] / [i915#265]) +1 similar issue
[87]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5891/shard-apl8/igt@[email protected]

* igt@kms_plane_alpha_blend@pipe-b-alpha-transparent-fb:
- shard-glk: NOTRUN -> [FAIL][88] ([i915#265])
[88]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5891/shard-glk6/igt@[email protected]

* igt@kms_plane_lowres@pipe-d-tiling-yf:
- shard-tglb: NOTRUN -> [SKIP][89] ([fdo#112054]) +1 similar issue
[89]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5891/shard-tglb6/igt@[email protected]

* igt@kms_psr2_sf@cursor-plane-update-sf:
- shard-tglb: NOTRUN -> [SKIP][90] ([i915#2920]) +2 similar issues
[90]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5891/shard-tglb7/igt@[email protected]
- shard-iclb: NOTRUN -> [SKIP][91] ([i915#658]) +1 similar issue
[91]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5891/shard-iclb7/igt@[email protected]

* igt@kms_psr2_sf@overlay-plane-update-sf-dmg-area-3:
- shard-glk: NOTRUN -> [SKIP][92] ([fdo#109271] / [i915#658]) +1 similar issue
[92]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5891/shard-glk2/igt@[email protected]

* igt@kms_psr2_sf@overlay-primary-update-sf-dmg-area-4:
- shard-apl: NOTRUN -> [SKIP][93] ([fdo#109271] / [i915#658]) +5 similar issues
[93]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5891/shard-apl8/igt@[email protected]
- shard-kbl: NOTRUN -> [SKIP][94] ([fdo#109271] / [i915#658]) +2 similar issues
[94]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5891/shard-kbl2/igt@[email protected]

* igt@kms_psr2_su@frontbuffer:
- shard-tglb: NOTRUN -> [SKIP][95] ([i915#1911])
[95]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5891/shard-tglb2/igt@[email protected]
- shard-iclb: NOTRUN -> [SKIP][96] ([fdo#109642] / [fdo#111068] / [i915#658])
[96]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5891/shard-iclb6/igt@[email protected]

* igt@kms_psr@psr2_basic:
- shard-tglb: NOTRUN -> [FAIL][97] ([i915#132] / [i915#3467]) +2 similar issues
[97]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5891/shard-tglb8/igt@kms_psr@psr2_basic.html

* igt@kms_psr@psr2_primary_page_flip:
- shard-iclb: NOTRUN -> [SKIP][98] ([fdo#109441]) +1 similar issue
[98]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5891/shard-iclb6/igt@kms_psr@psr2_primary_page_flip.html

* igt@kms_psr@psr2_sprite_mmap_cpu:
- shard-iclb: [PASS][99] -> [SKIP][100] ([fdo#109441])
[99]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10187/shard-iclb2/igt@kms_psr@psr2_sprite_mmap_cpu.html
[100]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5891/shard-iclb7/igt@kms_psr@psr2_sprite_mmap_cpu.html

* igt@kms_writeback@writeback-fb-id:
- shard-kbl: NOTRUN -> [SKIP][101] ([fdo#109271] / [i915#2437]) +1 similar issue
[101]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5891/shard-kbl4/igt@[email protected]

* igt@kms_writeback@writeback-invalid-parameters:
- shard-tglb: NOTRUN -> [SKIP][102] ([i915#2437])
[102]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5891/shard-tglb7/igt@[email protected]
- shard-apl: NOTRUN -> [SKIP][103] ([fdo#109271] / [i915#2437])
[103]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5891/shard-apl2/igt@[email protected]
- shard-iclb: NOTRUN -> [SKIP][104] ([i915#2437])
[104]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5891/shard-iclb7/igt@[email protected]

* igt@nouveau_crc@pipe-b-ctx-flip-detection:
- shard-tglb: NOTRUN -> [SKIP][105] ([i915#2530]) +1 similar issue
[105]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5891/shard-tglb3/igt@[email protected]
- shard-iclb: NOTRUN -> [SKIP][106] ([i915#2530])
[106]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5891/shard-iclb2/igt@[email protected]

* igt@nouveau_crc@pipe-d-source-outp-inactive:
- shard-iclb: NOTRUN -> [SKIP][107] ([fdo#109278] / [i915#2530])
[107]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5891/shard-iclb2/igt@[email protected]

* igt@perf@polling-parameterized:
- shard-glk: [PASS][108] -> [FAIL][109] ([i915#1542])
[108]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10187/shard-glk6/igt@[email protected]
[109]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5891/shard-glk6/igt@[email protected]

* igt@prime_nv_test@nv_write_i915_gtt_mmap_read:
- shard-tglb: NOTRUN -> [SKIP][110] ([fdo#109291]) +1 similar issue
[110]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5891/shard-tglb2/igt@prime_nv_test@nv_write_i915_gtt_mmap_read.html
- shard-iclb: NOTRUN -> [SKIP][111] ([fdo#109291]) +1 similar issue
[111]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5891/shard-iclb6/igt@prime_nv_test@nv_write_i915_gtt_mmap_read.html

* igt@prime_vgem@fence-read-hang:
- shard-tglb: NOTRUN -> [SKIP][112] ([fdo#109295])
[112]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5891/shard-tglb7/igt@[email protected]
- shard-iclb: NOTRUN -> [SKIP][113] ([fdo#109295])
[113]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5891/shard-iclb6/igt@[email protected]

* igt@sysfs_clients@fair-1:
- shard-apl: NOTRUN -> [SKIP][114] ([fdo#109271] / [i915#2994]) +4 similar issues
[114]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5891/shard-apl7/igt@[email protected]

* igt@sysfs_clients@fair-3:
- shard-kbl: NOTRUN -> [SKIP][115] ([fdo#109271] / [i915#2994]) +1 similar issue
[115]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5891/shard-kbl2/igt@[email protected]

* igt@sysfs_clients@recycle-many:
- shard-glk: NOTRUN -> [SKIP][116] ([fdo#109271] / [i915#2994]) +1 similar issue
[116]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5891/shard-glk3/igt@[email protected]

* igt@sysfs_clients@split-25:
- shard-tglb: NOTRUN -> [SKIP][117] ([i915#2994])
[117]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5891/shard-tglb6/igt@[email protected]
- shard-iclb: NOTRUN -> [SKIP][118] ([i915#2994])
[118]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5891/shard-iclb4/igt@[email protected]

#### Possible fixes ####

* igt@gem_exec_fair@basic-none-vip@rcs0:
- shard-glk: [FAIL][119] ([i915#2842]) -> [PASS][120]
[119]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10187/shard-glk7/igt@gem_exec_fair@[email protected]
[120]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5891/shard-glk5/igt@gem_exec_fair@[email protected]

* igt@gem_exec_fair@basic-none@vcs0:
- shard-kbl: [FAIL][121] ([i915#2842]) -> [PASS][122]
[121]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10187/shard-kbl1/igt@gem_exec_fair@[email protected]
[122]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5891/shard-kbl1/igt@gem_exec_fair@[email protected]

* igt@gem_exec_fair@basic-pace@rcs0:
- shard-tglb: [FAIL][123] ([i915#2842]) -> [PASS][124]
[123]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10187/shard-tglb7/igt@gem_exec_fair@[email protected]
[124]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5891/shard-tglb5/igt@gem_exec_fair@[email protected]

* igt@gem_huc_copy@huc-copy:
- shard-tglb: [SKIP][125] ([i915#2190]) -> [PASS][126]
[125]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10187/shard-tglb6/igt@[email protected]
[126]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5891/shard-tglb8/igt@[email protected]

* igt@gem_mmap_gtt@big-copy-odd:
- shard-glk: [FAIL][127] ([i915#307]) -> [PASS][128]
[127]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10187/shard-glk7/igt@[email protected]
[128]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5891/shard-glk1/igt@[email protected]

* igt@gem_mmap_gtt@cpuset-medium-copy:
- shard-iclb: [FAIL][129] ([i915#2428]) -> [PASS][130]
[129]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10187/shard-iclb7/igt@[email protected]
[130]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5891/shard-iclb3/igt@[email protected]

* igt@gen9_exec_parse@allowed-all:
- shard-glk: [DMESG-WARN][131] ([i915#1436] / [i915#716]) -> [PASS][132]
[131]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10187/shard-glk8/igt@[email protected]
[132]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5891/shard-glk3/igt@[email protected]

* igt@i915_suspend@debugfs-reader:
- shard-iclb: [INCOMPLETE][133] ([i915#1185]) -> [PASS][134]
[133]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10187/shard-iclb3/igt@[email protected]
[134]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5891/shard-iclb2/igt@[email protected]

* igt@kms_cursor_crc@pipe-a-cursor-256x256-random:
- shard-glk: [FAIL][135] ([i915#3444]) -> [PASS][136]
[135]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10187/shard-glk7/igt@[email protected]
[136]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5891/shard-glk3/igt@[email protected]
- shard-apl: [FAIL][137] ([i915#3444]) -> [PASS][138]
[137]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10187/shard-apl7/igt@[email protected]
[138]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5891/shard-apl7/igt@[email protected]

* igt@kms_fbcon_fbt@fbc-suspend:
- shard-kbl: [INCOMPLETE][139] ([i915#155] / [i915#180] / [i915#636]) -> [PASS][140]
[139]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10187/shard-kbl1/igt@[email protected]
[140]: https://intel-gfx-ci.01.org/tree/drm-

== Logs ==

For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5891/index.html

_______________________________________________
igt-dev mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/igt-dev