Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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: Ben Skeggs <bskeggs@redhat.com>

+4 -3
+1 -1
drivers/gpu/drm/nouveau/nouveau_bo.c
··· 956 956 break; 957 957 } 958 958 959 - if (dev_priv->card_type == NV_C0) 959 + if (dev_priv->card_type >= NV_C0) 960 960 page_shift = node->page_shift; 961 961 else 962 962 page_shift = 12;
+1
drivers/gpu/drm/nouveau/nouveau_drv.h
··· 637 637 NV_40 = 0x40, 638 638 NV_50 = 0x50, 639 639 NV_C0 = 0xc0, 640 + NV_D0 = 0xd0 640 641 }; 641 642 642 643 struct drm_nouveau_private {
+1 -1
drivers/gpu/drm/nouveau/nouveau_object.c
··· 746 746 int ret, i; 747 747 748 748 NV_DEBUG(dev, "ch%d vram=0x%08x tt=0x%08x\n", chan->id, vram_h, tt_h); 749 - if (dev_priv->card_type == NV_C0) 749 + if (dev_priv->card_type >= NV_C0) 750 750 return nvc0_gpuobj_channel_init(chan, vm); 751 751 752 752 /* Allocate a chunk of memory for per-channel object storage */
+1 -1
drivers/gpu/drm/nouveau/nouveau_vm.c
··· 306 306 block = length; 307 307 308 308 } else 309 - if (dev_priv->card_type == NV_C0) { 309 + if (dev_priv->card_type >= NV_C0) { 310 310 vm->map_pgt = nvc0_vm_map_pgt; 311 311 vm->map = nvc0_vm_map; 312 312 vm->map_sg = nvc0_vm_map_sg;