korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-11-17 09:14:19 +08:00
Code Issues Packages Projects Releases Wiki Activity

drm/nvd0: add a card_type for 0xdX chipsets

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

Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
This commit is contained in:
Ben Skeggs 2011-07-02 20:28:49 +10:00
parent f3f2f54e11
commit 2e9733ff7d
4 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/gpu/drm/nouveau/nouveau_bo.c
View File

@ -956,7 +956,7 @@ nouveau_ttm_io_mem_reserve(struct ttm_bo_device *bdev, struct ttm_mem_reg *mem)
break; break;
} }
if (dev_priv->card_type == NV_C0) if (dev_priv->card_type >= NV_C0)
page_shift = node->page_shift; page_shift = node->page_shift;
else else
page_shift = 12; page_shift = 12;

1
drivers/gpu/drm/nouveau/nouveau_drv.h
View File

@ -637,6 +637,7 @@ enum nouveau_card_type {
NV_40 = 0x40, NV_40 = 0x40,
NV_50 = 0x50, NV_50 = 0x50,
NV_C0 = 0xc0, NV_C0 = 0xc0,
NV_D0 = 0xd0
}; };
struct drm_nouveau_private { struct drm_nouveau_private {

2
drivers/gpu/drm/nouveau/nouveau_object.c
View File

@ -746,7 +746,7 @@ nouveau_gpuobj_channel_init(struct nouveau_channel *chan,
int ret, i; int ret, i;
NV_DEBUG(dev, "ch%d vram=0x%08x tt=0x%08x\n", chan->id, vram_h, tt_h); 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); return nvc0_gpuobj_channel_init(chan, vm);
/* Allocate a chunk of memory for per-channel object storage */ /* Allocate a chunk of memory for per-channel object storage */

2
drivers/gpu/drm/nouveau/nouveau_vm.c
View File

@ -306,7 +306,7 @@ nouveau_vm_new(struct drm_device *dev, u64 offset, u64 length, u64 mm_offset,
block = length; block = length;
} else } else
if (dev_priv->card_type == NV_C0) { if (dev_priv->card_type >= NV_C0) {
vm->map_pgt = nvc0_vm_map_pgt; vm->map_pgt = nvc0_vm_map_pgt;
vm->map = nvc0_vm_map; vm->map = nvc0_vm_map;
vm->map_sg = nvc0_vm_map_sg; vm->map_sg = nvc0_vm_map_sg;