Tue May 15 10:48:01 2018 UTC ()
xf86-video-intel: regen patch


(wiz)
diff -r1.2 -r1.3 pkgsrc/x11/xf86-video-intel/patches/patch-src_uxa_intel__driver.c
cvs diff -r1.2 -r1.3 pkgsrc/x11/xf86-video-intel/patches/Attic/patch-src_uxa_intel__driver.c (expand / switch to unified diff)

--- pkgsrc/x11/xf86-video-intel/patches/Attic/patch-src_uxa_intel__driver.c 2016/12/07 21:59:54 1.2
+++ pkgsrc/x11/xf86-video-intel/patches/Attic/patch-src_uxa_intel__driver.c 2018/05/15 10:48:01 1.3
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1$NetBSD: patch-src_uxa_intel__driver.c,v 1.2 2016/12/07 21:59:54 wiz Exp $ 1$NetBSD: patch-src_uxa_intel__driver.c,v 1.3 2018/05/15 10:48:01 wiz Exp $
2 2
3Upstream patches for xorg-server-1.19. 3Upstream patches for xorg-server-1.19.
4 4
5--- src/uxa/intel_driver.c.orig 2014-12-09 20:43:22.000000000 +0000 5--- src/uxa/intel_driver.c.orig 2014-12-09 20:43:22.000000000 +0000
6+++ src/uxa/intel_driver.c 6+++ src/uxa/intel_driver.c
7@@ -642,7 +642,11 @@ redisplay_dirty(ScreenPtr screen, Pixmap 7@@ -642,7 +642,11 @@ redisplay_dirty(ScreenPtr screen, Pixmap
8 return; 8 return;
9  9
10 PixmapRegionInit(&pixregion, dirty->slave_dst->master_pixmap); 10 PixmapRegionInit(&pixregion, dirty->slave_dst->master_pixmap);
11+#ifdef HAS_DIRTYTRACKING_ROTATION 11+#ifdef HAS_DIRTYTRACKING_ROTATION
12+ PixmapSyncDirtyHelper(dirty); 12+ PixmapSyncDirtyHelper(dirty);
13+#else 13+#else
14 PixmapSyncDirtyHelper(dirty, &pixregion); 14 PixmapSyncDirtyHelper(dirty, &pixregion);
@@ -31,40 +31,40 @@ Upstream patches for xorg-server-1.19. @@ -31,40 +31,40 @@ Upstream patches for xorg-server-1.19.
31 } 31 }
32 #endif 32 #endif
33  33
34+#if !HAVE_NOTIFY_FD 34+#if !HAVE_NOTIFY_FD
35 static void 35 static void
36 I830BlockHandler(BLOCKHANDLER_ARGS_DECL) 36 I830BlockHandler(BLOCKHANDLER_ARGS_DECL)
37 { 37 {
38@@ -694,9 +700,22 @@ I830BlockHandler(BLOCKHANDLER_ARGS_DECL) 38@@ -694,9 +700,22 @@ I830BlockHandler(BLOCKHANDLER_ARGS_DECL)
39 intel_uxa_block_handler(intel); 39 intel_uxa_block_handler(intel);
40 intel_video_block_handler(intel); 40 intel_video_block_handler(intel);
41 #ifdef INTEL_PIXMAP_SHARING 41 #ifdef INTEL_PIXMAP_SHARING
42- intel_dirty_update(screen); 42- intel_dirty_update(screen);
43+ intel_dirty_update(intel); 43+ intel_dirty_update(intel);
44 #endif 44+#endif
45 } 45+}
46+#else 46+#else
47+static void 47+static void
48+I830BlockHandler(void *data, void *timeout) 48+I830BlockHandler(void *data, void *timeout)
49+{ 49+{
50+ intel_screen_private *intel = data; 50+ intel_screen_private *intel = data;
51+ 51+
52+ intel_uxa_block_handler(intel); 52+ intel_uxa_block_handler(intel);
53+ intel_video_block_handler(intel); 53+ intel_video_block_handler(intel);
54+#ifdef INTEL_PIXMAP_SHARING 54+#ifdef INTEL_PIXMAP_SHARING
55+ intel_dirty_update(intel); 55+ intel_dirty_update(intel);
56+#endif 56 #endif
57+} 57 }
58+#endif 58+#endif
59  59
60 static Bool 60 static Bool
61 intel_init_initial_framebuffer(ScrnInfoPtr scrn) 61 intel_init_initial_framebuffer(ScrnInfoPtr scrn)
62@@ -939,8 +958,14 @@ I830ScreenInit(SCREEN_INIT_ARGS_DECL) 62@@ -939,8 +958,14 @@ I830ScreenInit(SCREEN_INIT_ARGS_DECL)
63 "Hardware cursor initialization failed\n"); 63 "Hardware cursor initialization failed\n");
64 } 64 }
65  65
66+#if !HAVE_NOTIFY_FD 66+#if !HAVE_NOTIFY_FD
67 intel->BlockHandler = screen->BlockHandler; 67 intel->BlockHandler = screen->BlockHandler;
68 screen->BlockHandler = I830BlockHandler; 68 screen->BlockHandler = I830BlockHandler;
69+#else 69+#else
70+ RegisterBlockAndWakeupHandlers(I830BlockHandler, 70+ RegisterBlockAndWakeupHandlers(I830BlockHandler,