Commit 13a49a10 authored by Ben Skeggs's avatar Ben Skeggs

drm/gm100/bios: hw disable register has moved

Signed-off-by: default avatarBen Skeggs <bskeggs@redhat.com>
parent 4bf23ead
...@@ -90,10 +90,16 @@ nouveau_bios_shadow_pramin(struct nouveau_bios *bios) ...@@ -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;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment