Module Name: xsrc
Committed By: mrg
Date: Mon Feb 24 09:32:31 UTC 2020
Modified Files:
xsrc/external/mit/xf86-video-ati-kms/dist/src: radeon_glamor.c
Log Message:
for now, limit glamor to TAHITI and newer chipsets only.
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.7 -r1.2 \
xsrc/external/mit/xf86-video-ati-kms/dist/src/radeon_glamor.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: xsrc/external/mit/xf86-video-ati-kms/dist/src/radeon_glamor.c
diff -u xsrc/external/mit/xf86-video-ati-kms/dist/src/radeon_glamor.c:1.1.1.7 xsrc/external/mit/xf86-video-ati-kms/dist/src/radeon_glamor.c:1.2
--- xsrc/external/mit/xf86-video-ati-kms/dist/src/radeon_glamor.c:1.1.1.7 Sat Jun 1 07:24:16 2019
+++ xsrc/external/mit/xf86-video-ati-kms/dist/src/radeon_glamor.c Mon Feb 24 09:32:31 2020
@@ -81,6 +81,14 @@ radeon_glamor_pre_init(ScrnInfoPtr scrn)
s = xf86GetOptValString(info->Options, OPTION_ACCELMETHOD);
if (!s) {
+#ifdef __NetBSD__
+ /*
+ * glamor isn't working yet for GL. disable where not
+ * needed for anything at all.
+ */
+ if (info->ChipFamily < CHIP_FAMILY_TAHITI)
+ return FALSE;
+#else
if (xorgGetVersion() >= XORG_VERSION_NUMERIC(1,18,3,0,0)) {
if (info->ChipFamily < CHIP_FAMILY_R600)
return FALSE;
@@ -88,6 +96,7 @@ radeon_glamor_pre_init(ScrnInfoPtr scrn)
if (info->ChipFamily < CHIP_FAMILY_TAHITI)
return FALSE;
}
+#endif
}
if (s && strcasecmp(s, "glamor") != 0) {
