Re: [PATCH 12/19] drm/bufs: remove handling of _DRM_GEM mappings

Hi Daniel

On Sun, Nov 3, 2013 at 2:31 PM, Daniel Vetter daniel.vetter@ffwll.ch wrote:

Gone with the new gem vma offset manager from David.

We can also ditch the uapi header definition from the enum since userspace never used this. It ended up in there purely for historical reasons (for reusing the old drm mmap code essentially), not because userspace ever needed it.

Cc: David Herrmann dh.herrmann@gmail.com Signed-off-by: Daniel Vetter daniel.vetter@ffwll.ch

Thanks for removing it. I haven't found any code using _DRM_GEM when changing the vma-manager either, so:

Reviewed-by: David Herrmann dh.herrmann@gmail.com

Thanks David

---

drivers/gpu/drm/drm_bufs.c | 6 ------ drivers/gpu/drm/drm_vm.c | 3 --- include/uapi/drm/drm.h | 1 - 3 files changed, 10 deletions(-)

diff --git a/drivers/gpu/drm/drm_bufs.c b/drivers/gpu/drm/drm_bufs.c index 471e051d295e..766a5474fdbd 100644 --- a/drivers/gpu/drm/drm_bufs.c +++ b/drivers/gpu/drm/drm_bufs.c @@ -303,9 +303,6 @@ static int drm_addmap_core(struct drm_device * dev, resource_size_t offset,

            break;
    }

•   case _DRM_GEM:
  

•           DRM_ERROR("tried to addmap GEM object\n");
  

•           break;
    case _DRM_SCATTER_GATHER:
            if (!dev->sg) {
                    kfree(map);
  

@@ -483,9 +480,6 @@ int drm_rmmap_locked(struct drm_device *dev, struct drm_local_map *map) dmah.size = map->size; __drm_pci_free(dev, &dmah); break;

•   case _DRM_GEM:
  

•           DRM_ERROR("tried to rmmap GEM object\n");
  

•           break;
    }
    kfree(map);
  
  

diff --git a/drivers/gpu/drm/drm_vm.c b/drivers/gpu/drm/drm_vm.c index b5c5af7328df..efd424da7be6 100644 --- a/drivers/gpu/drm/drm_vm.c +++ b/drivers/gpu/drm/drm_vm.c @@ -266,9 +266,6 @@ static void drm_vm_shm_close(struct vm_area_struct *vma) dmah.size = map->size; __drm_pci_free(dev, &dmah); break;

•                   case _DRM_GEM:
  

•                           DRM_ERROR("tried to rmmap GEM object\n");
  

•                           break;
                    }
                    kfree(map);
            }
  

diff --git a/include/uapi/drm/drm.h b/include/uapi/drm/drm.h index 9b24d65fed72..3c9a833992e8 100644 --- a/include/uapi/drm/drm.h +++ b/include/uapi/drm/drm.h @@ -181,7 +181,6 @@ 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,             /**< GEM object (obsolete) */
  

};

/**

1.8.4.rc3