Commit 8984e046 authored by Ben Skeggs's avatar Ben Skeggs
Browse files

drm/nvc0: initial vm implementation, use for bar1/bar3 management 



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

drivers/gpu/drm/nouveau/Makefile

+2 −1
Original line number Diff line number Diff line
@@ -28,7 +28,8 @@ nouveau-y := nouveau_drv.o nouveau_state.o nouveau_channel.o nouveau_mem.o \ 
             nv10_gpio.o nv50_gpio.o \

	     nv50_calc.o \

	     nv04_pm.o nv50_pm.o nva3_pm.o \

	     nv50_vram.o nv50_vm.o nvc0_vm.o

	     nv50_vram.o nvc0_vram.o \

	     nv50_vm.o nvc0_vm.o



nouveau-$(CONFIG_DRM_NOUVEAU_DEBUG) += nouveau_debugfs.o

nouveau-$(CONFIG_COMPAT) += nouveau_ioc32.o

drivers/gpu/drm/nouveau/nouveau_bo.c

+14 −4
Original line number Diff line number Diff line
@@ -120,6 +120,9 @@ nouveau_bo_new(struct drm_device *dev, struct nouveau_channel *chan, 
	align >>= PAGE_SHIFT;



	if (!nvbo->no_vm && dev_priv->chan_vm) {

		if (dev_priv->card_type == NV_C0)

			page_shift = 12;



		ret = nouveau_vm_get(dev_priv->chan_vm, size, page_shift,

				     NV_MEM_ACCESS_RW, &nvbo->vma);

		if (ret) {
@@ -413,7 +416,7 @@ nouveau_bo_init_mem_type(struct ttm_bo_device *bdev, uint32_t type, 
		man->default_caching = TTM_PL_FLAG_CACHED;

		break;

	case TTM_PL_VRAM:

		if (dev_priv->card_type == NV_50) {

		if (dev_priv->card_type >= NV_50) {

			man->func = &nouveau_vram_manager;

			man->io_reserve_fastpath = false;

			man->use_io_reserve_lru = true;
@@ -901,6 +904,7 @@ nouveau_ttm_io_mem_reserve(struct ttm_bo_device *bdev, struct ttm_mem_reg *mem) 
	case TTM_PL_VRAM:

	{

		struct nouveau_vram *vram = mem->mm_node;

		u8 page_shift;



		if (!dev_priv->bar1_vm) {

			mem->bus.offset = mem->start << PAGE_SHIFT;
@@ -909,8 +913,13 @@ nouveau_ttm_io_mem_reserve(struct ttm_bo_device *bdev, struct ttm_mem_reg *mem) 
			break;

		}



		if (dev_priv->card_type == NV_C0)

			page_shift = vram->page_shift;

		else

			page_shift = 12;



		ret = nouveau_vm_get(dev_priv->bar1_vm, mem->bus.size,

				     vram->page_shift, NV_MEM_ACCESS_RW,

				     page_shift, NV_MEM_ACCESS_RW,

				     &vram->bar_vma);

		if (ret)

			return ret;
@@ -922,6 +931,7 @@ nouveau_ttm_io_mem_reserve(struct ttm_bo_device *bdev, struct ttm_mem_reg *mem) 
		}



		mem->bus.offset = vram->bar_vma.offset;

		if (dev_priv->card_type == NV_50) /*XXX*/

			mem->bus.offset -= 0x0020000000ULL;

		mem->bus.base = pci_resource_start(dev->pdev, 1);

		mem->bus.is_iomem = true;

drivers/gpu/drm/nouveau/nouveau_drv.h

+3 −5
Original line number Diff line number Diff line
@@ -842,6 +842,9 @@ extern void nv10_mem_put_tile_region(struct drm_device *dev, 
				     struct nouveau_fence *fence);

extern const struct ttm_mem_type_manager_func nouveau_vram_manager;



/* nvc0_vram.c */

extern const struct ttm_mem_type_manager_func nvc0_vram_manager;



/* nouveau_notifier.c */

extern int  nouveau_notifier_init_channel(struct nouveau_channel *);

extern void nouveau_notifier_takedown_channel(struct nouveau_channel *);
@@ -1229,11 +1232,6 @@ extern int nvc0_instmem_init(struct drm_device *); 
extern void nvc0_instmem_takedown(struct drm_device *);

extern int  nvc0_instmem_suspend(struct drm_device *);

extern void nvc0_instmem_resume(struct drm_device *);

extern int  nvc0_instmem_get(struct nouveau_gpuobj *, u32 size, u32 align);

extern void nvc0_instmem_put(struct nouveau_gpuobj *);

extern int  nvc0_instmem_map(struct nouveau_gpuobj *);

extern void nvc0_instmem_unmap(struct nouveau_gpuobj *);

extern void nvc0_instmem_flush(struct drm_device *);



/* nv04_mc.c */

extern int  nv04_mc_init(struct drm_device *);

drivers/gpu/drm/nouveau/nouveau_mem.c

+0 −3
Original line number Diff line number Diff line
@@ -255,9 +255,6 @@ nouveau_mem_detect(struct drm_device *dev) 
	if (dev_priv->card_type < NV_50) {

		dev_priv->vram_size  = nv_rd32(dev, NV04_PFB_FIFO_DATA);

		dev_priv->vram_size &= NV10_PFB_FIFO_DATA_RAM_AMOUNT_MB_MASK;

	} else {

		dev_priv->vram_size  = nv_rd32(dev, 0x10f20c) << 20;

		dev_priv->vram_size *= nv_rd32(dev, 0x121c74);

	}



	if (dev_priv->vram_size)

drivers/gpu/drm/nouveau/nouveau_mm.h

+5 −0
Original line number Diff line number Diff line
@@ -59,4 +59,9 @@ int nv50_vram_new(struct drm_device *, u64 size, u32 align, u32 size_nc, 
void nv50_vram_del(struct drm_device *, struct nouveau_vram **);

bool nv50_vram_flags_valid(struct drm_device *, u32 tile_flags);



int  nvc0_vram_init(struct drm_device *);

int  nvc0_vram_new(struct drm_device *, u64 size, u32 align, u32 ncmin,

		    u32 memtype, struct nouveau_vram **);

bool nvc0_vram_flags_valid(struct drm_device *, u32 tile_flags);



#endif