Attachment 26165 Details for Bug 21908 – Patch for SIGSEGV when no kernel-side DRM is present

[patch] Patch for SIGSEGV when no kernel-side DRM is present

xf86-video-nouveau-git-13042009-no-kernel-drm.diff (text/plain), 1.67 KB, created by Ilia Sotnikov on 2009-05-24 03:58:52 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Ilia Sotnikov

Created: 2009-05-24 03:58:52 UTC

Size: 1.67 KB

patch

obsolete

>diff --git a/src/nv_driver.c b/src/nv_driver.c
>index 92232dd..adc0b77 100644
>--- a/src/nv_driver.c
>+++ b/src/nv_driver.c
>@@ -1554,7 +1554,7 @@ NVMapMemSW(ScrnInfoPtr pScrn)
> {
> 	NVPtr pNv = NVPTR(pScrn);
> 	unsigned VRAMReserved, Cursor0Offset, Cursor1Offset, CLUTOffset[2];
>-	static struct nouveau_device dev;
>+	static struct nouveau_device_priv dev;
> 	void *map;
> 	int ret, i;
> 
>@@ -1582,21 +1582,24 @@ NVMapMemSW(ScrnInfoPtr pScrn)
> 	CLUTOffset[0] = Cursor1Offset + (64 * 64 * 4);
> 	CLUTOffset[1] = CLUTOffset[0] + (4 * 1024);
> 
>-	ret = nouveau_bo_fake(&dev, 0, NOUVEAU_BO_VRAM | NOUVEAU_BO_PIN,
>+	ret = nouveau_bo_fake((struct nouveau_device *) &dev, 0,
>+			      NOUVEAU_BO_VRAM | NOUVEAU_BO_PIN,
> 			      pNv->VRAMSize - (1<<20), pNv->VRAMMap,
> 			      &pNv->FB);
> 	if (ret)
> 		return FALSE;
> 	pNv->GART = NULL;
> 
>-	ret = nouveau_bo_fake(&dev, Cursor0Offset,
>+	ret = nouveau_bo_fake((struct nouveau_device *) &dev,
>+			      Cursor0Offset,
> 			      NOUVEAU_BO_VRAM | NOUVEAU_BO_PIN,
> 			      64 * 64 * 4, pNv->VRAMMap + Cursor0Offset,
> 			      &pNv->Cursor);
> 	if (ret)
> 		return FALSE;
> 
>-	ret = nouveau_bo_fake(&dev, Cursor1Offset,
>+	ret = nouveau_bo_fake((struct nouveau_device *) &dev,
>+			      Cursor1Offset,
> 			      NOUVEAU_BO_VRAM | NOUVEAU_BO_PIN,
> 			      64 * 64 * 4, pNv->VRAMMap + Cursor1Offset,
> 			      &pNv->Cursor2);
>@@ -1607,7 +1610,8 @@ NVMapMemSW(ScrnInfoPtr pScrn)
> 		for(i = 0; i < 2; i++) {
> 			nouveauCrtcPtr crtc = pNv->crtc[i];
> 
>-			ret = nouveau_bo_fake(&dev, CLUTOffset[i],
>+			ret = nouveau_bo_fake((struct nouveau_device *) &dev,
>+					      CLUTOffset[i],
> 					      NOUVEAU_BO_VRAM |
> 					      NOUVEAU_BO_PIN, 0x1000,
> 					      pNv->VRAMMap + CLUTOffset[i],

Actions: View | Splinter Review

Attachments on bug 21908: 26165

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.