From: François Tigeot <ftigeot@wolfpond.org>
Date: Sun, 8 Mar 2015 08:35:53 +0000 (+0100)
Subject: drm_gem.c: Start using some drm_mm functions
X-Git-Tag: v4.2.0rc~649
X-Git-Url: https://gitweb.dragonflybsd.org/~tuxillo/dragonfly.git/commitdiff_plain/40c22ea1b6dd5b15fd15ac933246c6bac4b2b711

drm_gem.c: Start using some drm_mm functions
---

diff --git a/sys/dev/drm/drm_gem.c b/sys/dev/drm/drm_gem.c
index ed2275b4c9..4d1c53303c 100644
--- a/sys/dev/drm/drm_gem.c
+++ b/sys/dev/drm/drm_gem.c
@@ -139,6 +139,8 @@ drm_gem_init(struct drm_device *dev)
 	}
 
 	mm->idxunr = new_unrhdr(0, DRM_GEM_MAX_IDX, NULL);
+	drm_mm_init(&mm->offset_manager, DRM_FILE_PAGE_OFFSET_START,
+		    DRM_FILE_PAGE_OFFSET_SIZE);
 	return 0;
 }
 
@@ -147,6 +149,7 @@ drm_gem_destroy(struct drm_device *dev)
 {
 	struct drm_gem_mm *mm = dev->mm_private;
 
+	drm_mm_takedown(&mm->offset_manager);
 	drm_ht_remove(&mm->offset_hash);
 	delete_unrhdr(mm->idxunr);
 	kfree(mm);
diff --git a/sys/dev/drm/include/drm/drmP.h b/sys/dev/drm/include/drm/drmP.h
index b7b541066b..15ed524f4f 100644
--- a/sys/dev/drm/include/drm/drmP.h
+++ b/sys/dev/drm/include/drm/drmP.h
@@ -641,6 +641,7 @@ struct drm_ati_pcigart_info {
  * GEM specific mm private for tracking GEM objects
  */
 struct drm_gem_mm {
+	struct drm_mm offset_manager;	/**< Offset mgmt for buffer objects */
 	struct drm_open_hash offset_hash; /**< User token hash table for maps */
 	struct unrhdr *idxunr;
 };