[arch-commits] Commit in xf86-video-vmware/trunk (2 files)

[andyrtr at archlinux.org]

    Date: Tuesday, October 13, 2009 @ 17:55:33
  Author: andyrtr
Revision: 55670

upgpkg: xf86-video-vmware 10.16.8-1
    new version 10.16.8; built against Xorg-server 1.7

Modified:
  xf86-video-vmware/trunk/PKGBUILD
Deleted:
  xf86-video-vmware/trunk/hibernate-fix-black-screen.patch

----------------------------------+
 PKGBUILD                         |   15 ++-----
 hibernate-fix-black-screen.patch |   76 -------------------------------------
 2 files changed, 6 insertions(+), 85 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2009-10-13 21:51:43 UTC (rev 55669)
+++ PKGBUILD	2009-10-13 21:55:33 UTC (rev 55670)
@@ -1,28 +1,25 @@
 # $Id$
-# Maintainer: Alexander Baldeck <alexander at archlinux.org>
-# Contributor: Jan de Groot <jgc at archlinux.org>
+# Maintainer: Jan de Groot <jgc at archlinux.org>
+
 pkgname=xf86-video-vmware
-pkgver=10.16.6
+pkgver=10.16.8
 pkgrel=1
 pkgdesc="X.org vmware video driver"
 arch=(i686 x86_64)
 url="http://xorg.freedesktop.org/"
 license=('custom')
 depends=('glibc')
-makedepends=('pkgconfig' 'xorg-server>=1.6.1' 'randrproto' 'renderproto' 'xextproto' 'xineramaproto' 'videoproto')
-conflicts=('xorg-server<1.6.1')
+makedepends=('pkgconfig' 'xorg-server>=1.7.0' 'randrproto' 'renderproto' 'xextproto' 'xineramaproto' 'videoproto')
+conflicts=('xorg-server<1.7.0')
 groups=('xorg-video-drivers')
 options=('!libtool')
 source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2
-	hibernate-fix-black-screen.patch
 	LICENSE)
-md5sums=('f376ebb4709ff29731e410586e6457f3'
-         'c1f5154db2b46205e4fdb99c50154c6f'
+md5sums=('25287a202c986b33bd79fbe379c96a16'
          'f846374287a2bae21570ae8de883fb4d')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-  patch -Np1 -i "${srcdir}/hibernate-fix-black-screen.patch" || return 1
   ./configure --prefix=/usr || return 1
   make || return 1
   make DESTDIR="${pkgdir}" install || return 1

Deleted: hibernate-fix-black-screen.patch
===================================================================
--- hibernate-fix-black-screen.patch	2009-10-13 21:51:43 UTC (rev 55669)
+++ hibernate-fix-black-screen.patch	2009-10-13 21:55:33 UTC (rev 55670)
@@ -1,76 +0,0 @@
-From d10841493c4707f23f928d7580bc5bddb51d22a6 Mon Sep 17 00:00:00 2001
-From: Bob Long <blong at vmware.com>
-Date: Fri, 22 May 2009 22:48:55 +0000
-Subject: Fix black screen after resume from hibernate.
-
-The root cause for the black screen and system lock up is
-caused by not recovering the SVGA ID register after hibernation.
-Incorrect ID register value will invalidate the FIFO memory start
-register, and driver will not retrieve correct FIFO memory start
-address and the busy read of svga FIFO sync register will lock up
-the whole system.
-
-Currently SVGA Xorg driver does not have a kernel module to handle
-the power management event, but Xorg will call driver provided
-LeaveVT before shutting down system and call EnterVT after resuming
-system from hibernation, so these two callback functions are good
-entry points to save and restore the ID register value. This patch
-saves the ID register value in LeaveVT and restores the value to
-SVGA ID register in EnterVT.
----
-diff --git a/src/vmware.c b/src/vmware.c
-index ef2dedb..069cf2c 100644
---- a/src/vmware.c
-+++ b/src/vmware.c
-@@ -652,6 +652,7 @@ VMWAREPreInit(ScrnInfoPtr pScrn, int flags)
-                    "No supported VMware SVGA found (read ID 0x%08x).\n", id);
-         return FALSE;
-     }
-+    pVMWARE->suspensionSavedRegId = id;
- 
- #if !XSERVER_LIBPCIACCESS
-     pVMWARE->PciTag = pciTag(pVMWARE->PciInfo->bus, pVMWARE->PciInfo->device,
-@@ -1820,7 +1821,13 @@ VMWAREEnterVT(int scrnIndex, int flags)
-     ScrnInfoPtr pScrn = xf86Screens[scrnIndex];
-     VMWAREPtr pVMWARE = VMWAREPTR(pScrn);
- 
--    if (!pVMWARE->SavedReg.svga_fifo_enabled) {
-+    /*
-+     * After system resumes from hiberation, EnterVT will be called and this
-+     * is a good place to restore the SVGA ID register.
-+     */
-+    vmwareWriteReg(pVMWARE, SVGA_REG_ID, pVMWARE->suspensionSavedRegId);
-+
-+    if (!pVMWARE->SavedReg.svga_fifo_enabled) {       
-         VMWAREInitFIFO(pScrn);
-     }
- 
-@@ -1831,6 +1838,14 @@ static void
- VMWARELeaveVT(int scrnIndex, int flags)
- {
-     ScrnInfoPtr pScrn = xf86Screens[scrnIndex];
-+    VMWAREPtr pVMWARE = VMWAREPTR(pScrn);
-+
-+    /*
-+     * Before shutting down system for hibneration, LeaveVT will be called,
-+     * we save the ID register value here and later restore it in EnterVT.
-+     */
-+    pVMWARE->suspensionSavedRegId = vmwareReadReg(pVMWARE, SVGA_REG_ID);
-+
-     VMWARERestore(pScrn);
- }
- 
-diff --git a/src/vmware.h b/src/vmware.h
-index 57872b2..b906ff2 100644
---- a/src/vmware.h
-+++ b/src/vmware.h
-@@ -102,6 +102,7 @@ typedef struct {
- 
-     VMWARERegRec SavedReg;
-     VMWARERegRec ModeReg;
-+    CARD32 suspensionSavedRegId;
- 
-     DisplayModePtr dynModes[NUM_DYN_MODES];
- 
---
-cgit v0.8.2