Attachment #239869 for bug #269291

View | Details | Raw Unified | Return to bug 269291
Collapse All | Expand All

Lines 1-7 Link Here

(-)b/x11-drivers/xf86-video-intel/Makefile (-1 / +1 lines)
1	PORTNAME= xf86-video-intel	1	PORTNAME= xf86-video-intel
2	DISTVERSION= 2.99.917-916	2	DISTVERSION= 2.99.917-916
3	DISTVERSIONSUFFIX= -g${GL_COMMIT:C/(.{12}).*/\1/}	3	DISTVERSIONSUFFIX= -g${GL_COMMIT:C/(.{12}).*/\1/}
4	PORTREVISION= 2	4	PORTREVISION= 3
5	PORTEPOCH= 1	5	PORTEPOCH= 1
6	CATEGORIES= x11-drivers	6	CATEGORIES= x11-drivers
7		7




Chase https://gitlab.freedesktop.org/mesa/mesa/-/commit/adaa3583f507
Chase https://gitlab.freedesktop.org/mesa/mesa/-/commit/cdde031ac2c8

--- src/sna/sna_dri2.c.orig	2021-01-15 20:59:05 UTC
+++ src/sna/sna_dri2.c
@@ -3707,8 +3707,10 @@ static const char *dri_driver_name(struct sna *sna)
 			return has_i830_dri() ? "i830" : "i915";
 		else if (sna->kgem.gen < 040)
 			return "i915";
-		else
+		else if (sna->kgem.gen < 0100)
+			return "crocus";
 		else
-			return "i965";
+			return "iris";
 	}
 
 	return s;
--- src/uxa/intel_dri.c.orig	2021-01-15 20:59:05 UTC
+++ src/uxa/intel_dri.c
@@ -1540,8 +1540,10 @@ static const char *dri_driver_name(intel_screen_privat
 			return has_i830_dri() ? "i830" : "i915";
 		else if (INTEL_INFO(intel)->gen < 040)
 			return "i915";
-		else
+		else if (INTEL_INFO(intel)->gen < 0100)
+			return "crocus";
 		else
-			return "i965";
+			return "iris";
 	}
 

Return to bug 269291

Lines 1-29 Link Here

(-)b/x11-drivers/xf86-video-intel/files/patch-prefer-iris (-8 / +9 lines)
1	Chase https://gitlab.freedesktop.org/mesa/mesa/-/commit/adaa3583f507	1	Chase https://gitlab.freedesktop.org/mesa/mesa/-/commit/adaa3583f507
		2	Chase https://gitlab.freedesktop.org/mesa/mesa/-/commit/cdde031ac2c8
2		3
3	--- src/sna/sna_dri2.c.orig 2020-11-16 15:23:28 UTC	4	--- src/sna/sna_dri2.c.orig 2021-01-15 20:59:05 UTC
4	+++ src/sna/sna_dri2.c	5	+++ src/sna/sna_dri2.c
5	@@ -3707,8 +3707,10 @@ static const char dri_driver_name(struct sna sna)	6	@@ -3707,8 +3707,10 @@ static const char dri_driver_name(struct sna sna)
6	return has_i830_dri() ? "i830" : "i915";	7	return has_i830_dri() ? "i830" : "i915";
7	else if (sna->kgem.gen < 040)	8	else if (sna->kgem.gen < 040)
8	return "i915";	9	return "i915";
9	- else
10	+ else if (sna->kgem.gen < 0100)	10	+ else if (sna->kgem.gen < 0100)
11	return "i965";	11	+ return "crocus";
12	+ else	12	else
		13	- return "i965";
13	+ return "iris";	14	+ return "iris";
14	}	15	}
15		16
16	return s;	17	return s;
17	--- src/uxa/intel_dri.c.orig 2020-11-16 15:23:28 UTC	18	--- src/uxa/intel_dri.c.orig 2021-01-15 20:59:05 UTC
18	+++ src/uxa/intel_dri.c	19	+++ src/uxa/intel_dri.c
19	@@ -1540,8 +1540,10 @@ static const char *dri_driver_name(intel_screen_privat	20	@@ -1540,8 +1540,10 @@ static const char *dri_driver_name(intel_screen_privat
20	return has_i830_dri() ? "i830" : "i915";	21	return has_i830_dri() ? "i830" : "i915";
21	else if (INTEL_INFO(intel)->gen < 040)	22	else if (INTEL_INFO(intel)->gen < 040)
22	return "i915";	23	return "i915";
23	- else
24	+ else if (INTEL_INFO(intel)->gen < 0100)	24	+ else if (INTEL_INFO(intel)->gen < 0100)
25	return "i965";	25	+ return "crocus";
26	+ else	26	else
		27	- return "i965";
27	+ return "iris";	28	+ return "iris";
28	}	29	}
29		30