[Nouveau] [PATCH] Fix mmap handle

Robert Noland rnoland at 2hip.net
Sun Mar 15 12:07:01 PDT 2009


From 340b563375e001e87a504973581ab48d399ff64b Mon Sep 17 00:00:00 2001
From: Robert Noland <rnoland at 2hip.net>
Date: Sun, 15 Mar 2009 13:52:58 -0500
Subject: [PATCH] libdrm_nouveau: The handle that is passed to mmap needs to be drm_handle_t

drm_handle_t is defined to be a u32 on linux and a u64 on everything
else.  This addresses an issue on FreeBSD amd64 where the map offsets
may be greater than 32bits.  When the handle is cast to 32bit, mmap
cannot match the requested map and causes X to crash.

This should be a NOOP on linux since drm_handle_t is always 32bit.

Signed-off-by: Robert Noland <rnoland at 2hip.net>
---
 libdrm/nouveau/nouveau_private.h |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/libdrm/nouveau/nouveau_private.h b/libdrm/nouveau/nouveau_private.h
index 9dc1b44..32a9052 100644
--- a/libdrm/nouveau/nouveau_private.h
+++ b/libdrm/nouveau/nouveau_private.h
@@ -173,7 +173,7 @@ struct nouveau_bo_priv {
 
 	/* Kernel object */
 	uint32_t global_handle;
-	unsigned handle;
+	drm_handle_t handle;
 	void *map;
 
 	/* Last known information from kernel on buffer status */
-- 
1.6.1.3


-- 
Robert Noland <rnoland at 2hip.net>
2 Hip Networks
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 196 bytes
Desc: This is a digitally signed message part
Url : http://lists.freedesktop.org/archives/nouveau/attachments/20090315/a972a063/attachment.pgp 


More information about the Nouveau mailing list