xf86-video-nv: 2 commits - src/nv_driver.c src/nv_hw.c

[Aaron Plattner]

 src/nv_driver.c |    2 ++
 src/nv_hw.c     |    1 +
 2 files changed, 3 insertions(+)

New commits:
diff-tree 90c53c5322e50bce06996e3c857e6bf7531235d4 (from 9763b9dcef144f649ccbcfd302601769bc940ffb)
Author: Aaron Plattner <aplattner at nvidia.com>
Date:   Thu Mar 15 17:07:25 2007 -0700

    Fix GXxor corruption on nv4x.
    
    SUSE bug #246421.

diff --git a/src/nv_hw.c b/src/nv_hw.c
index 6232cd6..d7a0c19 100644
--- a/src/nv_hw.c
+++ b/src/nv_hw.c
@@ -1190,6 +1190,7 @@ void NVLoadStateExt (
               pNv->PGRAPH[0x008C/4] = 0x60de8051;
               pNv->PGRAPH[0x0090/4] = 0x00008000;
               pNv->PGRAPH[0x0610/4] = 0x00be3c5f;
+              pNv->PGRAPH[0x0bc4/4] |= 0x00008000;
 
               j = pNv->REGS[0x1540/4] & 0xff;
               if(j) {
diff-tree 9763b9dcef144f649ccbcfd302601769bc940ffb (from 9d65abab153cdf3ab2b7e3e2843d573b22ea6769)
Author: Aaron Plattner <aplattner at nvidia.com>
Date:   Thu Mar 15 14:39:07 2007 -0700

    Hide the cursor in CloseScreen.
    
    Otherwise, if we're restoring a graphical framebuffer mode the cursor will still
    be visible.

diff --git a/src/nv_driver.c b/src/nv_driver.c
index 64d45c5..97bc8ff 100644
--- a/src/nv_driver.c
+++ b/src/nv_driver.c
@@ -1791,6 +1791,8 @@ NVRestore(ScrnInfoPtr pScrn)
     NVPtr pNv = NVPTR(pScrn);
     NVRegPtr nvReg = &pNv->SavedReg;
 
+    if(pNv->HWCursor)
+        NVShowHideCursor(pNv, 0);
     NVLockUnlock(pNv, 0);
 
     if(pNv->twoHeads) {