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

Commit 0c321c79 authored by Jerome Glisse's avatar Jerome Glisse Committed by Dave Airlie
Browse files

drm/ttm: remove io_ field from TTM V6 



All TTM driver have been converted to new io_mem_reserve/free
interface which allow driver to choose and return proper io
base, offset to core TTM for ioremapping if necessary. This
patch remove what is now deadcode.

V2 adapt to match with change in first patch of the patchset
V3 update after io_mem_reserve/io_mem_free callback balancing
V4 adjust to minor cleanup
V5 remove the needs ioremap flag
V6 keep the ioremapping facility in TTM

[airlied- squashed driver removals in here also]

Signed-off-by: default avatarJerome Glisse <jglisse@redhat.com>
Reviewed-by: default avatarThomas Hellstrom <thellstrom@vmware.com>
Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
parent 96bf8b87

drivers/gpu/drm/nouveau/nouveau_bo.c

+0 −11
Original line number Diff line number Diff line
@@ -390,13 +390,6 @@ nouveau_bo_init_mem_type(struct ttm_bo_device *bdev, uint32_t type, 
		man->available_caching = TTM_PL_FLAG_UNCACHED |

					 TTM_PL_FLAG_WC;

		man->default_caching = TTM_PL_FLAG_WC;



		man->io_addr = NULL;

		man->io_offset = drm_get_resource_start(dev, 1);

		man->io_size = drm_get_resource_len(dev, 1);

		if (man->io_size > nouveau_mem_fb_amount(dev))

			man->io_size = nouveau_mem_fb_amount(dev);



		man->gpu_offset = dev_priv->vm_vram_base;

		break;

	case TTM_PL_TT:
@@ -417,10 +410,6 @@ nouveau_bo_init_mem_type(struct ttm_bo_device *bdev, uint32_t type, 
				 dev_priv->gart_info.type);

			return -EINVAL;

		}



		man->io_offset  = dev_priv->gart_info.aper_base;

		man->io_size    = dev_priv->gart_info.aper_size;

		man->io_addr   = NULL;

		man->gpu_offset = dev_priv->vm_gart_base;

		break;

	default:

drivers/gpu/drm/radeon/radeon_ttm.c

+1 −12
Original line number Diff line number Diff line
@@ -161,21 +161,13 @@ static int radeon_init_mem_type(struct ttm_bo_device *bdev, uint32_t type, 
					  (unsigned)type);

				return -EINVAL;

			}

			man->io_offset = rdev->mc.agp_base;

			man->io_size = rdev->mc.gtt_size;

			man->io_addr = NULL;

			if (!rdev->ddev->agp->cant_use_aperture)

				man->flags = TTM_MEMTYPE_FLAG_MAPPABLE;

			man->available_caching = TTM_PL_FLAG_UNCACHED |

						 TTM_PL_FLAG_WC;

			man->default_caching = TTM_PL_FLAG_WC;

		} else

#endif

		{

			man->io_offset = 0;

			man->io_size = 0;

			man->io_addr = NULL;

		}

#endif

		break;

	case TTM_PL_VRAM:

		/* "On-card" video ram */
@@ -184,9 +176,6 @@ static int radeon_init_mem_type(struct ttm_bo_device *bdev, uint32_t type, 
			     TTM_MEMTYPE_FLAG_MAPPABLE;

		man->available_caching = TTM_PL_FLAG_UNCACHED | TTM_PL_FLAG_WC;

		man->default_caching = TTM_PL_FLAG_WC;

		man->io_addr = NULL;

		man->io_offset = rdev->mc.aper_base;

		man->io_size = rdev->mc.aper_size;

		break;

	default:

		DRM_ERROR("Unsupported memory type %u\n", (unsigned)type);

drivers/gpu/drm/ttm/ttm_bo.c

+0 −22
Original line number Diff line number Diff line
@@ -79,8 +79,6 @@ static void ttm_mem_type_debug(struct ttm_bo_device *bdev, int mem_type) 
	printk(KERN_ERR TTM_PFX "    use_type: %d\n", man->use_type);

	printk(KERN_ERR TTM_PFX "    flags: 0x%08X\n", man->flags);

	printk(KERN_ERR TTM_PFX "    gpu_offset: 0x%08lX\n", man->gpu_offset);

	printk(KERN_ERR TTM_PFX "    io_offset: 0x%08lX\n", man->io_offset);

	printk(KERN_ERR TTM_PFX "    io_size: %ld\n", man->io_size);

	printk(KERN_ERR TTM_PFX "    size: %llu\n", man->size);

	printk(KERN_ERR TTM_PFX "    available_caching: 0x%08X\n",

		man->available_caching);
@@ -1563,26 +1561,6 @@ bool ttm_mem_reg_is_pci(struct ttm_bo_device *bdev, struct ttm_mem_reg *mem) 
	return true;

}



int ttm_bo_pci_offset(struct ttm_bo_device *bdev,

		      struct ttm_mem_reg *mem,

		      unsigned long *bus_base,

		      unsigned long *bus_offset, unsigned long *bus_size)

{

	struct ttm_mem_type_manager *man = &bdev->man[mem->mem_type];



	*bus_size = 0;

	if (!(man->flags & TTM_MEMTYPE_FLAG_MAPPABLE))

		return -EINVAL;



	if (ttm_mem_reg_is_pci(bdev, mem)) {

		*bus_offset = mem->mm_node->start << PAGE_SHIFT;

		*bus_size = mem->num_pages << PAGE_SHIFT;

		*bus_base = man->io_offset + (uintptr_t)man->io_addr;

	}



	return 0;

}



void ttm_bo_unmap_virtual(struct ttm_buffer_object *bo)

{

	struct ttm_bo_device *bdev = bo->bdev;

drivers/gpu/drm/ttm/ttm_bo_util.c

+4 −15
Original line number Diff line number Diff line
@@ -83,25 +83,14 @@ EXPORT_SYMBOL(ttm_bo_move_ttm); 


int ttm_mem_io_reserve(struct ttm_bo_device *bdev, struct ttm_mem_reg *mem)

{

	struct ttm_mem_type_manager *man = &bdev->man[mem->mem_type];

	int ret;



	if (bdev->driver->io_mem_reserve) {

	if (!mem->bus.io_reserved) {

		mem->bus.io_reserved = true;

		ret = bdev->driver->io_mem_reserve(bdev, mem);

		if (unlikely(ret != 0))

			return ret;

	}

	} else {

		ret = ttm_bo_pci_offset(bdev, mem, &mem->bus.base, &mem->bus.offset, &mem->bus.size);

		if (unlikely(ret != 0))

			return ret;

		mem->bus.addr = NULL;

		if (!(man->flags & TTM_MEMTYPE_FLAG_NEEDS_IOREMAP))

			mem->bus.addr = (void *)(((u8 *)man->io_addr) + mem->bus.offset);

		mem->bus.is_iomem = (mem->bus.size > 0) ? 1 : 0;

	}

	return 0;

}
@@ -149,7 +138,7 @@ void ttm_mem_reg_iounmap(struct ttm_bo_device *bdev, struct ttm_mem_reg *mem, 


	man = &bdev->man[mem->mem_type];



	if (virtual && (man->flags & TTM_MEMTYPE_FLAG_NEEDS_IOREMAP || mem->bus.addr == NULL))

	if (virtual && mem->bus.addr == NULL)

		iounmap(virtual);

	ttm_mem_io_free(bdev, mem);

}

drivers/gpu/drm/vmwgfx/vmwgfx_buffer.c

+0 −6
Original line number Diff line number Diff line
@@ -137,9 +137,6 @@ int vmw_invalidate_caches(struct ttm_bo_device *bdev, uint32_t flags) 
int vmw_init_mem_type(struct ttm_bo_device *bdev, uint32_t type,

		      struct ttm_mem_type_manager *man)

{

	struct vmw_private *dev_priv =

	    container_of(bdev, struct vmw_private, bdev);



	switch (type) {

	case TTM_PL_SYSTEM:

		/* System memory */
@@ -151,10 +148,7 @@ int vmw_init_mem_type(struct ttm_bo_device *bdev, uint32_t type, 
	case TTM_PL_VRAM:

		/* "On-card" video ram */

		man->gpu_offset = 0;

		man->io_offset = dev_priv->vram_start;

		man->io_size = dev_priv->vram_size;

		man->flags = TTM_MEMTYPE_FLAG_FIXED | TTM_MEMTYPE_FLAG_MAPPABLE;

		man->io_addr = NULL;

		man->available_caching = TTM_PL_MASK_CACHING;

		man->default_caching = TTM_PL_FLAG_WC;

		break;