Module Name: xsrc
Committed By: mrg
Date: Sun Mar 5 01:57:26 UTC 2017
Modified Files:
xsrc/external/mit/xf86-video-nv/dist/src: nv_driver.c
xsrc/external/mit/xf86-video-vmware/include: config.h
Log Message:
merge xf86-video-nv 2.1.21 and xf86-video-vmware 13.2.1.
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 xsrc/external/mit/xf86-video-nv/dist/src/nv_driver.c
cvs rdiff -u -r1.12 -r1.13 \
xsrc/external/mit/xf86-video-vmware/include/config.h
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-nv/dist/src/nv_driver.c
diff -u xsrc/external/mit/xf86-video-nv/dist/src/nv_driver.c:1.8 xsrc/external/mit/xf86-video-nv/dist/src/nv_driver.c:1.9
--- xsrc/external/mit/xf86-video-nv/dist/src/nv_driver.c:1.8 Tue Aug 16 01:27:47 2016
+++ xsrc/external/mit/xf86-video-nv/dist/src/nv_driver.c Sun Mar 5 01:57:26 2017
@@ -2076,7 +2076,7 @@ NVPreInit(ScrnInfoPtr pScrn, int flags)
/* Load shadowfb if needed */
if (pNv->ShadowFB) {
- if (!xf86LoadSubModule(pScrn, "shadowfb")) {
+ if (!xf86LoadSubModule(pScrn, "shadow")) {
xf86FreeInt10(pNv->pInt);
NVFreeRec(pScrn);
return FALSE;
@@ -2384,6 +2384,44 @@ NVDPMSSet(ScrnInfoPtr pScrn, int PowerMa
hwp->writeCrtc(hwp, 0x1A, crtc1A);
}
+static Bool
+NVCreateScreenResources(ScreenPtr pScreen)
+{
+ ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen);
+ NVPtr pNv = NVPTR(pScrn);
+ PixmapPtr pPixmap;
+ Bool ret;
+
+ pScreen->CreateScreenResources = pNv->CreateScreenResources;
+ ret = pScreen->CreateScreenResources(pScreen);
+ pScreen->CreateScreenResources = NVCreateScreenResources;
+
+ if (!ret)
+ return FALSE;
+
+ pPixmap = pScreen->GetScreenPixmap(pScreen);
+
+ if (!shadowAdd(pScreen, pPixmap, NVShadowUpdate,
+ NULL, 0, NULL)) {
+ return FALSE;
+ }
+ return TRUE;
+}
+
+static Bool
+NVShadowInit(ScreenPtr pScreen)
+{
+ ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen);
+ NVPtr pNv = NVPTR(pScrn);
+
+ if (!shadowSetup(pScreen))
+ return FALSE;
+ pNv->CreateScreenResources = pScreen->CreateScreenResources;
+ pScreen->CreateScreenResources = NVCreateScreenResources;
+
+ return TRUE;
+}
+
/* Mandatory */
@@ -2607,8 +2645,8 @@ NVScreenInit(SCREEN_INIT_ARGS_DECL)
"Driver rotation enabled, RandR disabled\n");
}
}
-
- ShadowFBInit(pScreen, refreshArea);
+ pNv->refreshArea = refreshArea;
+ NVShadowInit(pScreen);
}
if(pNv->FlatPanel)
Index: xsrc/external/mit/xf86-video-vmware/include/config.h
diff -u xsrc/external/mit/xf86-video-vmware/include/config.h:1.12 xsrc/external/mit/xf86-video-vmware/include/config.h:1.13
--- xsrc/external/mit/xf86-video-vmware/include/config.h:1.12 Sat Oct 8 10:24:07 2016
+++ xsrc/external/mit/xf86-video-vmware/include/config.h Sun Mar 5 01:57:26 2017
@@ -74,7 +74,7 @@
#define PACKAGE_NAME "xf86-video-vmware"
/* Define to the full name and version of this package. */
-#define PACKAGE_STRING "xf86-video-vmware 13.1.0"
+#define PACKAGE_STRING "xf86-video-vmware 13.2.1"
/* Define to the one symbol short name of this package. */
#define PACKAGE_TARNAME "xf86-video-vmware"
@@ -83,22 +83,22 @@
#undef PACKAGE_URL
/* Define to the version of this package. */
-#define PACKAGE_VERSION "13.1.0"
+#define PACKAGE_VERSION "13.2.1"
/* Major version of this package */
#define PACKAGE_VERSION_MAJOR 13
/* Minor version of this package */
-#define PACKAGE_VERSION_MINOR 1
+#define PACKAGE_VERSION_MINOR 2
/* Patch version of this package */
-#define PACKAGE_VERSION_PATCHLEVEL 0
+#define PACKAGE_VERSION_PATCHLEVEL 1
/* Define to 1 if you have the ANSI C header files. */
#define STDC_HEADERS 1
/* Version number of package */
-#define VERSION "13.1.0"
+#define VERSION "13.2.1"
/* Number of bits in a file offset, on hosts where this is settable. */
#undef _FILE_OFFSET_BITS
