[xorg-x11-drv-nouveau/f18] fixup one fix to avoid crashes in some cases

[Dave Airlie]

commit 9d7122c5d38dfb45e1d0688d944c76335404b4ec
Author: Dave Airlie <airlied at redhat.com>
Date:   Wed Feb 6 16:23:51 2013 +1000

    fixup one fix to avoid crashes in some cases

 upstream-fixes.patch      |    7 ++++---
 xorg-x11-drv-nouveau.spec |    5 ++++-
 2 files changed, 8 insertions(+), 4 deletions(-)
---
diff --git a/upstream-fixes.patch b/upstream-fixes.patch
index 31b5a26..0c176b4 100644
--- a/upstream-fixes.patch
+++ b/upstream-fixes.patch
@@ -75,7 +75,7 @@ index 429e9cc..71c9ff9 100644
  	assert(ret == 0);
  
 diff --git a/src/nouveau_dri2.c b/src/nouveau_dri2.c
-index 036bcff..888e0b3 100644
+index 036bcff..e462a86 100644
 --- a/src/nouveau_dri2.c
 +++ b/src/nouveau_dri2.c
 @@ -134,6 +134,7 @@ nouveau_dri2_copy_region2(ScreenPtr pScreen, DrawablePtr pDraw, RegionPtr pRegio
@@ -86,7 +86,7 @@ index 036bcff..888e0b3 100644
  	RegionPtr pCopyClip;
  	GCPtr pGC;
  	DrawablePtr src_draw, dst_draw;
-@@ -178,6 +179,22 @@ nouveau_dri2_copy_region2(ScreenPtr pScreen, DrawablePtr pDraw, RegionPtr pRegio
+@@ -178,6 +179,23 @@ nouveau_dri2_copy_region2(ScreenPtr pScreen, DrawablePtr pDraw, RegionPtr pRegio
  	}
  	pGC->funcs->ChangeClip(pGC, CT_REGION, pCopyClip, 0);
  	ValidateGC(dst_draw, pGC);
@@ -100,7 +100,8 @@ index 036bcff..888e0b3 100644
 +		if (extents->x1 == 0 && extents->y1 == 0 &&
 +		    extents->x2 == pDraw->width &&
 +		    extents->y2 == pDraw->height) {
-+			struct nouveau_bo *bo = nouveau_pixmap_bo((PixmapPtr)dst_draw);
++			PixmapPtr fpix = get_drawable_pixmap(dst_draw);
++			struct nouveau_bo *bo = nouveau_pixmap_bo(fpix);
 +			if (bo)
 +				nouveau_bo_wait(bo, NOUVEAU_BO_RD, pNv->client);
 +		}
diff --git a/xorg-x11-drv-nouveau.spec b/xorg-x11-drv-nouveau.spec
index 86dfd7f..47aeb6d 100644
--- a/xorg-x11-drv-nouveau.spec
+++ b/xorg-x11-drv-nouveau.spec
@@ -8,7 +8,7 @@ Name:      xorg-x11-drv-nouveau
 # need to set an epoch to get version number in sync with upstream
 Epoch:     1
 Version:   1.0.6
-Release:   3%{?dist}
+Release:   4%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X Hardware Support
@@ -75,6 +75,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man4/nouveau.4*
 
 %changelog
+* Wed Feb 06 2013 Dave Airlie <airlied at redhat.com> 1.0.6-4
+- fixup one fix to avoid crashes in some cases
+
 * Wed Feb 06 2013 Dave Airlie <airlied at redhat.com> 1.0.6-3
 - update to latest upstream - fixes USB offload