Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 05f51722 authored by Daniel Vetter's avatar Daniel Vetter Committed by Dave Airlie
Browse files

drm/bufs: remove handling of _DRM_GEM mappings 



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>
Reviewed-by: default avatarDavid Herrmann <dh.herrmann@gmail.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
parent b3f2333d

drivers/gpu/drm/drm_bufs.c

+0 −6
Original line number Diff line number Diff line
@@ -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);

drivers/gpu/drm/drm_vm.c

+0 −3
Original line number Diff line number Diff line
@@ -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);

		}

include/uapi/drm/drm.h

+0 −1
Original line number Diff line number Diff line
@@ -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) */

};



/**