Index: external/mit/xf86-video-intel/dist/src/intel_module.c
===================================================================
RCS file: /cvsroot/xsrc/external/mit/xf86-video-intel/dist/src/intel_module.c,v
retrieving revision 1.1.1.4
diff -p -u -r1.1.1.4 intel_module.c
--- external/mit/xf86-video-intel/dist/src/intel_module.c	20 Mar 2019 06:34:02 -0000	1.1.1.4
+++ external/mit/xf86-video-intel/dist/src/intel_module.c	6 Nov 2019 07:41:37 -0000
@@ -567,7 +567,7 @@ _xf86findDriver(const char *ident, XF86C
 	return NULL;
 }
 
-static enum accel_method { NOACCEL, SNA, UXA } get_accel_method(void)
+static enum accel_method { NOACCEL, SNA, UXA } get_accel_method(struct intel_device_info *match_data)
 {
 	enum accel_method accel_method = DEFAULT_ACCEL_METHOD;
 	XF86ConfDevicePtr dev;
@@ -575,8 +575,11 @@ static enum accel_method { NOACCEL, SNA,
 	if (hosted())
 		return SNA;
 
+	if ((unsigned)match_data->gen < 0110)
+		accel_method = UXA;
+
 	if (xf86configptr == NULL) /* X -configure */
-		return SNA;
+		return accel_method;
 
 	dev = _xf86findDriver("intel", xf86configptr->conf_device_lst);
 	if (dev && dev->dev_option_lst) {
@@ -641,7 +644,7 @@ intel_scrn_create(DriverPtr		driver,
 #endif
 
 #if KMS
-	switch (get_accel_method()) {
+	switch (get_accel_method((struct intel_device_info *)match_data)) {
 #if USE_SNA
 	case NOACCEL:
 	case SNA: