drm: remove object hash

diff --git a/linux-core/drmP.h b/linux-core/drmP.h
index 4938881..59d44ac 100644 (file)
--- a/linux-core/drmP.h
+++ b/linux-core/drmP.h
@@ -166,7 +166,6 @@ typedef unsigned long uintptr_t;
 #define DRM_MAX_CTXBITMAP (PAGE_SIZE * 8)
 #define DRM_MAP_HASH_OFFSET 0x10000000
 #define DRM_MAP_HASH_ORDER 12
-#define DRM_OBJECT_HASH_ORDER 12
 #define DRM_FILE_PAGE_OFFSET_START ((0xFFFFFFFFUL >> PAGE_SHIFT) + 1)
 #define DRM_FILE_PAGE_OFFSET_SIZE ((0xFFFFFFFFUL >> PAGE_SHIFT) * 16)
 /*
@@ -888,7 +887,6 @@ struct drm_device {
        int map_count;                  /**< Number of mappable regions */
        struct drm_open_hash map_hash;       /**< User token hash table for maps */
        struct drm_memrange offset_manager;  /**< User token manager */
-       struct drm_open_hash object_hash;    /**< User token hash table for objects */
        struct address_space *dev_mapping;  /**< For unmap_mapping_range() */
        struct page *ttm_dummy_page;
 

diff --git a/linux-core/drm_drv.c b/linux-core/drm_drv.c
index 2c3e29f..c3cc620 100644 (file)
--- a/linux-core/drm_drv.c
+++ b/linux-core/drm_drv.c
@@ -399,7 +399,6 @@ static void drm_cleanup(struct drm_device * dev)
        drm_ctxbitmap_cleanup(dev);
        drm_ht_remove(&dev->map_hash);
        drm_memrange_takedown(&dev->offset_manager);
-       drm_ht_remove(&dev->object_hash);
 
        drm_put_minor(dev, &dev->primary);
        if (drm_core_check_feature(dev, DRIVER_MODESET))

diff --git a/linux-core/drm_stub.c b/linux-core/drm_stub.c
index c62b901..97533d7 100644 (file)
--- a/linux-core/drm_stub.c
+++ b/linux-core/drm_stub.c
@@ -207,12 +207,6 @@ static int drm_fill_in_dev(struct drm_device * dev, struct pci_dev *pdev,
                return -ENOMEM;
        }
 
-       if (drm_ht_create(&dev->object_hash, DRM_OBJECT_HASH_ORDER)) {
-               drm_ht_remove(&dev->map_hash);
-               drm_memrange_takedown(&dev->offset_manager);
-               return -ENOMEM;
-       }
-
        /* the DRM has 6 counters */
        dev->counters = 6;
        dev->types[0] = _DRM_STAT_LOCK;