leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

drm/gm100/bios: hw disable register has moved

Browse Source 
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
This commit is contained in:
Ben Skeggs 2014-02-24 12:30:06 +10:00
parent 4bf23ead3a
commit 13a49a10a0
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
drivers/gpu/drm/nouveau/core/subdev/bios/base.c
View File

@ -90,10 +90,16 @@ nouveau_bios_shadow_pramin(struct nouveau_bios *bios)
int i; int i;
if (device->card_type >= NV_50) { if (device->card_type >= NV_50) {
if ( device->card_type < NV_C0 || if (device->card_type >= NV_C0 && device->card_type < GM100) {
!(nv_rd32(bios, 0x022500) & 0x00000001)) if (nv_rd32(bios, 0x022500) & 0x00000001)
addr = (u64)(nv_rd32(bios, 0x619f04) & 0xffffff00) << 8; return;
} else
if (device->card_type >= GM100) {
if (nv_rd32(bios, 0x021c04) & 0x00000001)
return;
}
addr = (u64)(nv_rd32(bios, 0x619f04) & 0xffffff00) << 8;
if (!addr) { if (!addr) {
addr = (u64)nv_rd32(bios, 0x001700) << 16; addr = (u64)nv_rd32(bios, 0x001700) << 16;
addr += 0xf0000; addr += 0xf0000;