drm/vmwgfx: stop using TTM_MEMTYPE_FLAG_MAPPABLE (cd1d58ed) · Commits · 戴 / test

drivers/gpu/drm/vmwgfx/vmwgfx_ttm_buffer.c

+2 −7

Original line number	Diff line number	Diff line
		@@ -742,15 +742,13 @@ static int vmw_init_mem_type(struct ttm_bo_device *bdev, uint32_t type,
		switch (type) {
		case TTM_PL_SYSTEM:
		/* System memory */

		man->flags = TTM_MEMTYPE_FLAG_MAPPABLE;
		man->available_caching = TTM_PL_FLAG_CACHED;
		man->default_caching = TTM_PL_FLAG_CACHED;
		break;
		case TTM_PL_VRAM:
		/* "On-card" video ram */
		man->func = &vmw_thp_func;
		man->flags = TTM_MEMTYPE_FLAG_FIXED \| TTM_MEMTYPE_FLAG_MAPPABLE;
		man->flags = TTM_MEMTYPE_FLAG_FIXED;
		man->available_caching = TTM_PL_FLAG_CACHED;
		man->default_caching = TTM_PL_FLAG_CACHED;
		break;
		@@ -762,7 +760,6 @@ static int vmw_init_mem_type(struct ttm_bo_device *bdev, uint32_t type,
		* slots as well as the bo size.
		*/
		man->func = &vmw_gmrid_manager_func;
		man->flags = TTM_MEMTYPE_FLAG_MAPPABLE;
		man->available_caching = TTM_PL_FLAG_CACHED;
		man->default_caching = TTM_PL_FLAG_CACHED;
		break;
		@@ -789,7 +786,6 @@ static int vmw_verify_access(struct ttm_buffer_object bo, struct file filp)

		static int vmw_ttm_io_mem_reserve(struct ttm_bo_device bdev, struct ttm_mem_reg mem)
		{
		struct ttm_mem_type_manager *man = &bdev->man[mem->mem_type];
		struct vmw_private *dev_priv = container_of(bdev, struct vmw_private, bdev);

		mem->bus.addr = NULL;
		@@ -797,8 +793,7 @@ static int vmw_ttm_io_mem_reserve(struct ttm_bo_device *bdev, struct ttm_mem_reg
		mem->bus.offset = 0;
		mem->bus.size = mem->num_pages << PAGE_SHIFT;
		mem->bus.base = 0;
		if (!(man->flags & TTM_MEMTYPE_FLAG_MAPPABLE))
		return -EINVAL;

		switch (mem->mem_type) {
		case TTM_PL_SYSTEM:
		case VMW_PL_GMR:

Admin message