From c029ed2510f32318d4bd6a195e81712d1b4ea29b Mon Sep 17 00:00:00 2001 From: Stephane Marchesin Date: Wed, 19 Nov 2008 23:17:27 +0100 Subject: [PATCH 1/2] Unbreak drm build. --- shared-core/drm.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/shared-core/drm.h b/shared-core/drm.h index 05fc91d8..472cd89a 100644 --- a/shared-core/drm.h +++ b/shared-core/drm.h @@ -236,7 +236,8 @@ enum drm_map_type { _DRM_AGP = 3, /**< AGP/GART */ _DRM_SCATTER_GATHER = 4, /**< Scatter/gather memory for PCI DMA */ _DRM_CONSISTENT = 5, /**< Consistent memory for PCI DMA */ - _DRM_GEM = 6 + _DRM_TTM = 6, + _DRM_GEM = 7 }; /** From 2e2fd6c63204cbea3b29a4872be77ac69677c841 Mon Sep 17 00:00:00 2001 From: Jesse Barnes Date: Thu, 20 Nov 2008 11:00:29 -0800 Subject: [PATCH 2/2] DRM: make drm_map_type match upstream kernel Since the TTM type isn't upstream yet, we need to make sure libdrm uses what the kernel uses, which is _DRM_GEM = 6. --- shared-core/drm.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/shared-core/drm.h b/shared-core/drm.h index 472cd89a..507f0478 100644 --- a/shared-core/drm.h +++ b/shared-core/drm.h @@ -236,8 +236,8 @@ enum drm_map_type { _DRM_AGP = 3, /**< AGP/GART */ _DRM_SCATTER_GATHER = 4, /**< Scatter/gather memory for PCI DMA */ _DRM_CONSISTENT = 5, /**< Consistent memory for PCI DMA */ - _DRM_TTM = 6, - _DRM_GEM = 7 + _DRM_GEM = 6, + _DRM_TTM = 7, }; /**