drm: Add _DRM_DRIVER map flag.

This flag indicates that the driver is responsible for the map.

diff --git a/bsd-core/drm_drv.c b/bsd-core/drm_drv.c
index 2e97610715d2b6306dead2333b4ecb144444f6af..96dc4d353b82ff56f7bf5779f9a96b495383c5fa 100644 (file)
--- a/bsd-core/drm_drv.c
+++ b/bsd-core/drm_drv.c
@@ -484,10 +484,10 @@ static int drm_lastclose(drm_device_t *dev)
        }
 
        TAILQ_FOREACH_SAFE(map, &dev->maplist, link, mapsave) {
-               drm_rmmap(dev, map);
+               if (!(map->flags & _DRM_DRIVER))
+                       drm_rmmap(dev, map);
        }
 
-
        drm_dma_takedown(dev);
        if ( dev->lock.hw_lock ) {
                dev->lock.hw_lock = NULL; /* SHM removed */

diff --git a/linux-core/drm_drv.c b/linux-core/drm_drv.c
index 9d03434f285ffa80da678f9cb827dcedc5b38802..869748f8e94348055896384db221b50520094fad 100644 (file)
--- a/linux-core/drm_drv.c
+++ b/linux-core/drm_drv.c
@@ -246,8 +246,10 @@ int drm_lastclose(struct drm_device * dev)
        }
 
        list_for_each_entry_safe(r_list, list_t, &dev->maplist, head) {
-               drm_rmmap_locked(dev, r_list->map);
-               r_list = NULL;
+               if (!(r_list->map->flags & _DRM_DRIVER)) {
+                       drm_rmmap_locked(dev, r_list->map);
+                       r_list = NULL;
+               }
        }
 
        if (drm_core_check_feature(dev, DRIVER_DMA_QUEUE) && dev->queuelist) {

diff --git a/shared-core/drm.h b/shared-core/drm.h
index 636c121784b985310c759c315a3a7bb918cae064..ec07b8959c28b962d359f587c5ee7ca43486519b 100644 (file)
--- a/shared-core/drm.h
+++ b/shared-core/drm.h
@@ -249,7 +249,8 @@ enum drm_map_flags {
        _DRM_KERNEL = 0x08,          /**< kernel requires access */
        _DRM_WRITE_COMBINING = 0x10, /**< use write-combining if available */
        _DRM_CONTAINS_LOCK = 0x20,   /**< SHM page that contains lock */
-       _DRM_REMOVABLE = 0x40        /**< Removable mapping */
+       _DRM_REMOVABLE = 0x40,       /**< Removable mapping */
+       _DRM_DRIVER = 0x80           /**< Managed by driver */
 };
 
 struct drm_ctx_priv_map {

diff --git a/shared-core/i915_dma.c b/shared-core/i915_dma.c
index f14b9b07509d0ad2ce72f8969c306ffa2318500e..67424408a4f114000e01cab57d93b113d2a093c7 100644 (file)
--- a/shared-core/i915_dma.c
+++ b/shared-core/i915_dma.c
@@ -1320,14 +1320,15 @@ int i915_driver_load(struct drm_device *dev, unsigned long flags)
        base = drm_get_resource_start(dev, mmio_bar);
        size = drm_get_resource_len(dev, mmio_bar);
 
-       ret = drm_addmap(dev, base, size, _DRM_REGISTERS, _DRM_KERNEL,
-                        &dev_priv->mmio_map);
+       ret = drm_addmap(dev, base, size, _DRM_REGISTERS,
+               _DRM_KERNEL | _DRM_DRIVER, &dev_priv->mmio_map);
 
 #ifdef __linux__
 #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,25)
        intel_init_chipset_flush_compat(dev);
 #endif
 #endif
+
        return ret;
 }