[xsrc/trunk]: xsrc/external/mit/xprop/include merge xf86-video-nouveau 1.0.17...

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

details:   https://anonhg.NetBSD.org/xsrc/rev/5ed8e204861a
branches:  trunk
changeset: 10685:5ed8e204861a
user:      mrg <mrg%NetBSD.org@localhost>
date:      Tue Apr 27 01:22:55 2021 +0000

description:
merge xf86-video-nouveau 1.0.17 and xprop 1.2.5.

diffstat:

 external/mit/xf86-video-nouveau/dist/src/drmmode_display.c |  13 ++++++++++++-
 external/mit/xf86-video-nouveau/dist/src/nv_driver.c       |   8 ++++++--
 external/mit/xprop/include/config.h                        |   8 ++++----
 3 files changed, 22 insertions(+), 7 deletions(-)

diffs (111 lines):

diff -r d8b2872dbaa1 -r 5ed8e204861a external/mit/xf86-video-nouveau/dist/src/drmmode_display.c
--- a/external/mit/xf86-video-nouveau/dist/src/drmmode_display.c        Tue Apr 27 01:21:09 2021 +0000
+++ b/external/mit/xf86-video-nouveau/dist/src/drmmode_display.c        Tue Apr 27 01:22:55 2021 +0000
@@ -162,6 +162,8 @@
        .prev = &drmmode_events,
 };
 
+static bool warned = false;
+
 static void
 drmmode_event_handler(int fd, unsigned int frame, unsigned int tv_sec,
                      unsigned int tv_usec, void *event_data)
@@ -169,7 +171,10 @@
        const uint64_t ust = (uint64_t)tv_sec * 1000000 + tv_usec;
        struct drmmode_event *e = event_data;
 
+       int counter = 0;
+
        xorg_list_for_each_entry(e, &drmmode_events, head) {
+               counter++;
                if (e == event_data) {
                        xorg_list_del(&e->head);
                        e->func((void *)(e + 1), e->name, ust, frame);
@@ -177,6 +182,12 @@
                        break;
                }
        }
+
+       if (counter > 100 && !warned) {
+               xf86DrvMsg(0, X_WARNING,
+                          "Event handler iterated %d times\n", counter);
+               warned = true;
+       }
 }
 
 void
@@ -1548,7 +1559,7 @@
        }
 
        ppix = screen->GetScreenPixmap(screen);
-       if (pNv->AccelMethod >= NONE)
+       if (pNv->AccelMethod > NONE)
                nouveau_bo_ref(pNv->scanout, &drmmode_pixmap(ppix)->bo);
        screen->ModifyPixmapHeader(ppix, width, height, -1, -1, pitch,
                                   (pNv->AccelMethod > NONE || pNv->ShadowPtr) ?
diff -r d8b2872dbaa1 -r 5ed8e204861a external/mit/xf86-video-nouveau/dist/src/nv_driver.c
--- a/external/mit/xf86-video-nouveau/dist/src/nv_driver.c      Tue Apr 27 01:21:09 2021 +0000
+++ b/external/mit/xf86-video-nouveau/dist/src/nv_driver.c      Tue Apr 27 01:22:55 2021 +0000
@@ -1084,7 +1084,8 @@
                                pNv->Options, OPTION_WFB, FALSE);
 #endif
 
-               pNv->tiled_scanout = TRUE;
+               if (pNv->Architecture >= NV_ARCH_10)
+                       pNv->tiled_scanout = TRUE;
        }
 
        pNv->ce_enabled =
@@ -1377,6 +1378,9 @@
                        pNv->wfb_enabled = FALSE;
 #endif
                        pNv->tiled_scanout = FALSE;
+                       pScrn->capabilities &= ~(RR_Capability_SourceOutput |
+                                                RR_Capability_SourceOffload |
+                                                RR_Capability_SinkOutput);
                        pScrn->displayWidth = nv_pitch_align(pNv,
                                                             pScrn->virtualX,
                                                             pScrn->depth);
@@ -1497,7 +1501,7 @@
 
        xf86SetBlackWhitePixels(pScreen);
 
-       if (nouveau_present_init(pScreen))
+       if (pNv->AccelMethod == EXA && nouveau_present_init(pScreen))
                xf86DrvMsg(pScrn->scrnIndex, X_INFO,
                           "Hardware support for Present enabled\n");
        else
diff -r d8b2872dbaa1 -r 5ed8e204861a external/mit/xprop/include/config.h
--- a/external/mit/xprop/include/config.h       Tue Apr 27 01:21:09 2021 +0000
+++ b/external/mit/xprop/include/config.h       Tue Apr 27 01:22:55 2021 +0000
@@ -47,7 +47,7 @@
 #define PACKAGE_NAME "xprop"
 
 /* Define to the full name and version of this package. */
-#define PACKAGE_STRING "xprop 1.2.3"
+#define PACKAGE_STRING "xprop 1.2.5"
 
 /* Define to the one symbol short name of this package. */
 #define PACKAGE_TARNAME "xprop"
@@ -56,7 +56,7 @@
 #define PACKAGE_URL ""
 
 /* Define to the version of this package. */
-#define PACKAGE_VERSION "1.2.3"
+#define PACKAGE_VERSION "1.2.5"
 
 /* Major version of this package */
 #define PACKAGE_VERSION_MAJOR 1
@@ -65,10 +65,10 @@
 #define PACKAGE_VERSION_MINOR 2
 
 /* Patch version of this package */
-#define PACKAGE_VERSION_PATCHLEVEL 3
+#define PACKAGE_VERSION_PATCHLEVEL 5
 
 /* Define to 1 if you have the ANSI C header files. */
 #define STDC_HEADERS 1
 
 /* Version number of package */
-#define VERSION "1.2.3"
+#define VERSION "1.2.5"