[xorg-x11-drv-nv] nv: fix patches to build against new API

Dave Airlie airlied at fedoraproject.org
Wed Jul 18 20:09:09 UTC 2012


commit ddd6f2732705f147fd79f163d8b1b0715d01cdf3
Author: Dave Airlie <airlied at redhat.com>
Date:   Wed Jul 18 16:15:29 2012 -0400

    nv: fix patches to build against new API

 nv-reserve-fbarea.patch |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)
---
diff --git a/nv-reserve-fbarea.patch b/nv-reserve-fbarea.patch
index b86b83c..df1d298 100644
--- a/nv-reserve-fbarea.patch
+++ b/nv-reserve-fbarea.patch
@@ -28,13 +28,13 @@ index 4bcc391..6252dd2 100644
 +
 +
 +    if (!xf86InitFBManager(pScreen, &AvailFBArea)) {
-+	xf86DrvMsg(scrnIndex, X_ERROR,
++	xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
 +		   "Memory manager initialized to (%d,%d) (%d,%d)  failed\n",
 +		   AvailFBArea.x1, AvailFBArea.y1, AvailFBArea.x2, AvailFBArea.y2);
 +	return FALSE;
 +    }
 +
-+    xf86DrvMsg(scrnIndex, X_INFO,
++    xf86DrvMsg(pScrn->scrnIndex, X_INFO,
 +	       "Memory manager initialized to (%d,%d) (%d,%d)\n",
 +	       AvailFBArea.x1, AvailFBArea.y1, AvailFBArea.x2, AvailFBArea.y2);
 +    
@@ -43,12 +43,12 @@ index 4bcc391..6252dd2 100644
 +					    NV_ALIGN(pScrn->virtualY, 64) -
 +					    pScrn->virtualY + 2,
 +					    0, NULL, NULL, NULL))) {
-+	xf86DrvMsg(scrnIndex, X_INFO,
++	xf86DrvMsg(pScrn->scrnIndex, X_INFO,
 +		   "Reserved area from (%d,%d) to (%d,%d)\n",
 +		   fbarea->box.x1, fbarea->box.y1,
 +		   fbarea->box.x2, fbarea->box.y2);
 +    } else {
-+	xf86DrvMsg(scrnIndex, X_ERROR, "Unable to reserve area\n");
++	xf86DrvMsg(pScrn->scrnIndex, X_ERROR, "Unable to reserve area\n");
 +    }
      
      if (!pNv->NoAccel)


More information about the scm-commits mailing list