Commit 2e9733ff authored by Ben Skeggs's avatar Ben Skeggs
Browse files

drm/nvd0: add a card_type for 0xdX chipsets 



These are different enough from 0xcX to justify it, half fermi, half
kepler(??)..

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

drivers/gpu/drm/nouveau/nouveau_bo.c

+1 −1
Original line number Diff line number Diff line
@@ -956,7 +956,7 @@ nouveau_ttm_io_mem_reserve(struct ttm_bo_device *bdev, struct ttm_mem_reg *mem) 
			break;

		}



		if (dev_priv->card_type == NV_C0)

		if (dev_priv->card_type >= NV_C0)

			page_shift = node->page_shift;

		else

			page_shift = 12;

drivers/gpu/drm/nouveau/nouveau_drv.h

+1 −0
Original line number Diff line number Diff line
@@ -637,6 +637,7 @@ enum nouveau_card_type { 
	NV_40      = 0x40,

	NV_50      = 0x50,

	NV_C0      = 0xc0,

	NV_D0      = 0xd0

};



struct drm_nouveau_private {

drivers/gpu/drm/nouveau/nouveau_object.c

+1 −1
Original line number Diff line number Diff line
@@ -746,7 +746,7 @@ nouveau_gpuobj_channel_init(struct nouveau_channel *chan, 
	int ret, i;



	NV_DEBUG(dev, "ch%d vram=0x%08x tt=0x%08x\n", chan->id, vram_h, tt_h);

	if (dev_priv->card_type == NV_C0)

	if (dev_priv->card_type >= NV_C0)

		return nvc0_gpuobj_channel_init(chan, vm);



	/* Allocate a chunk of memory for per-channel object storage */

drivers/gpu/drm/nouveau/nouveau_vm.c

+1 −1
Original line number Diff line number Diff line
@@ -306,7 +306,7 @@ nouveau_vm_new(struct drm_device *dev, u64 offset, u64 length, u64 mm_offset, 
			block = length;



	} else

	if (dev_priv->card_type == NV_C0) {

	if (dev_priv->card_type >= NV_C0) {

		vm->map_pgt = nvc0_vm_map_pgt;

		vm->map = nvc0_vm_map;

		vm->map_sg = nvc0_vm_map_sg;