[xsrc/netbsd-9]: xsrc/external/mit/xf86-video-intel/dist/src Pull up followin...

[martin <martin%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/xsrc/rev/884cfd173c65
branches:  netbsd-9
changeset: 10496:884cfd173c65
user:      martin <martin%NetBSD.org@localhost>
date:      Tue Jun 30 18:32:47 2020 +0000

description:
Pull up following revision(s) (requested by tsutsui in ticket #975):

        external/mit/xf86-video-intel/dist/src/intel_module.c: revision 1.2

Use UXA (not SNA) by default on Intel Gen3/4/5 chipsets (except 915).

This works around PR/54995 (screen corruption on N455)
and PR/55198 (X freezes/hangs on 965GM).  Ok'ed by mrg@.

Should be pulled up to netbsd-9.

diffstat:

 external/mit/xf86-video-intel/dist/src/intel_module.c |  15 ++++++++++++---
 1 files changed, 12 insertions(+), 3 deletions(-)

diffs (33 lines):

diff -r dbf3b687bf53 -r 884cfd173c65 external/mit/xf86-video-intel/dist/src/intel_module.c
--- a/external/mit/xf86-video-intel/dist/src/intel_module.c     Tue Feb 25 19:33:40 2020 +0000
+++ b/external/mit/xf86-video-intel/dist/src/intel_module.c     Tue Jun 30 18:32:47 2020 +0000
@@ -567,9 +567,8 @@
        return NULL;
 }
 
-static enum accel_method { NOACCEL, SNA, UXA } get_accel_method(void)
+static enum accel_method { NOACCEL, SNA, UXA } get_accel_method(enum accel_method accel_method)
 {
-       enum accel_method accel_method = DEFAULT_ACCEL_METHOD;
        XF86ConfDevicePtr dev;
 
        if (hosted())
@@ -641,7 +640,17 @@
 #endif
 
 #if KMS
-       switch (get_accel_method()) {
+       enum accel_method default_accel_method = DEFAULT_ACCEL_METHOD;
+       /*
+        * XXX
+        * Use UXA by default for Gen3/4/5 chipsets (except 915) to avoid
+        * screen corruption etc.  (PR/54995, PR/55198)
+        */
+       if ((unsigned)((struct intel_device_info *)match_data)->gen > 030 &&
+           (unsigned)((struct intel_device_info *)match_data)->gen < 060)
+               default_accel_method = UXA;
+
+       switch (get_accel_method(default_accel_method)) {
 #if USE_SNA
        case NOACCEL:
        case SNA: