Commit 7e8820fe authored by Ben Skeggs's avatar Ben Skeggs
Browse files

drm/nouveau/device: cleaner abstraction for device resource functions 



Signed-off-by: default avatarBen Skeggs <bskeggs@redhat.com>
parent 2b700825

drivers/gpu/drm/nouveau/include/nvkm/core/device.h

+2 −6
Original line number Diff line number Diff line
@@ -148,6 +148,8 @@ struct nvkm_device_func { 
	int (*preinit)(struct nvkm_device *);

	int (*init)(struct nvkm_device *);

	void (*fini)(struct nvkm_device *, bool suspend);

	resource_size_t (*resource_addr)(struct nvkm_device *, unsigned bar);

	resource_size_t (*resource_size)(struct nvkm_device *, unsigned bar);

};



struct nvkm_device_quirk {
@@ -242,12 +244,6 @@ nv_device_base(struct nvkm_device *device) 
					  &device->platformdev->dev;

}



resource_size_t

nv_device_resource_start(struct nvkm_device *device, unsigned int bar);



resource_size_t

nv_device_resource_len(struct nvkm_device *device, unsigned int bar);



struct platform_device;



enum nv_bus_type {

drivers/gpu/drm/nouveau/nouveau_bo.c

+4 −3
Original line number Diff line number Diff line
@@ -1351,6 +1351,7 @@ nouveau_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 nouveau_drm *drm = nouveau_bdev(bdev);

	struct nvkm_device *device = nvxx_device(&drm->device);

	struct nvkm_mem *node = mem->mm_node;

	int ret;
@@ -1379,7 +1380,7 @@ nouveau_ttm_io_mem_reserve(struct ttm_bo_device *bdev, struct ttm_mem_reg *mem) 
		/* fallthrough, tiled memory */

	case TTM_PL_VRAM:

		mem->bus.offset = mem->start << PAGE_SHIFT;

		mem->bus.base = nv_device_resource_start(nvxx_device(&drm->device), 1);

		mem->bus.base = device->func->resource_addr(device, 1);

		mem->bus.is_iomem = true;

		if (drm->device.info.family >= NV_DEVICE_INFO_V0_TESLA) {

			struct nvkm_bar *bar = nvxx_bar(&drm->device);
@@ -1419,8 +1420,8 @@ nouveau_ttm_fault_reserve_notify(struct ttm_buffer_object *bo) 
{

	struct nouveau_drm *drm = nouveau_bdev(bo->bdev);

	struct nouveau_bo *nvbo = nouveau_bo(bo);

	struct nvif_device *device = &drm->device;

	u32 mappable = nv_device_resource_len(nvxx_device(device), 1) >> PAGE_SHIFT;

	struct nvkm_device *device = nvxx_device(&drm->device);

	u32 mappable = device->func->resource_size(device, 1) >> PAGE_SHIFT;

	int i, ret;



	/* as long as the bo isn't in vram, and isn't tiled, we've got

drivers/gpu/drm/nouveau/nouveau_chan.c

+2 −1
Original line number Diff line number Diff line
@@ -150,7 +150,8 @@ nouveau_channel_prep(struct nouveau_drm *drm, struct nvif_device *device, 
			 */

			args.target = NV_DMA_V0_TARGET_PCI;

			args.access = NV_DMA_V0_ACCESS_RDWR;

			args.start = nv_device_resource_start(nvxx_device(device), 1);

			args.start = nvxx_device(device)->func->

				resource_addr(nvxx_device(device), 1);

			args.limit = args.start + device->info.ram_user - 1;

		} else {

			args.target = NV_DMA_V0_TARGET_VRAM;

drivers/gpu/drm/nouveau/nouveau_display.c

+2 −1
Original line number Diff line number Diff line
@@ -445,6 +445,7 @@ int 
nouveau_display_create(struct drm_device *dev)

{

	struct nouveau_drm *drm = nouveau_drm(dev);

	struct nvkm_device *device = nvxx_device(&drm->device);

	struct nouveau_display *disp;

	int ret;
@@ -457,7 +458,7 @@ nouveau_display_create(struct drm_device *dev) 
	drm_mode_create_dvi_i_properties(dev);



	dev->mode_config.funcs = &nouveau_mode_config_funcs;

	dev->mode_config.fb_base = nv_device_resource_start(nvxx_device(&drm->device), 1);

	dev->mode_config.fb_base = device->func->resource_addr(device, 1);



	dev->mode_config.min_width = 0;

	dev->mode_config.min_height = 0;

drivers/gpu/drm/nouveau/nouveau_ttm.c

+3 −2
Original line number Diff line number Diff line
@@ -335,6 +335,7 @@ nouveau_ttm_global_release(struct nouveau_drm *drm) 
int

nouveau_ttm_init(struct nouveau_drm *drm)

{

	struct nvkm_device *device = nvxx_device(&drm->device);

	struct drm_device *dev = drm->dev;

	u32 bits;

	int ret;
@@ -381,8 +382,8 @@ nouveau_ttm_init(struct nouveau_drm *drm) 
		return ret;

	}



	drm->ttm.mtrr = arch_phys_wc_add(nv_device_resource_start(nvxx_device(&drm->device), 1),

					 nv_device_resource_len(nvxx_device(&drm->device), 1));

	drm->ttm.mtrr = arch_phys_wc_add(device->func->resource_addr(device, 1),

					 device->func->resource_size(device, 1));



	/* GART init */

	if (drm->agp.stat != ENABLED) {