diff options
| author | Ben Skeggs <bskeggs@redhat.com> | 2014-02-24 12:30:06 +1000 |
|---|---|---|
| committer | Ben Skeggs <bskeggs@redhat.com> | 2014-03-26 14:00:56 +1000 |
| commit | 13a49a10a0846de1b73f6812fda39dd43072f58c (patch) | |
| tree | c4f42e3041cc9cd42d5985ae387e019a796219ac | |
| parent | 4bf23ead3a2223b77b82fc00de76623545864930 (diff) | |
| download | linux-stable-13a49a10a0846de1b73f6812fda39dd43072f58c.tar.gz linux-stable-13a49a10a0846de1b73f6812fda39dd43072f58c.tar.bz2 linux-stable-13a49a10a0846de1b73f6812fda39dd43072f58c.zip | |
drm/gm100/bios: hw disable register has moved
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
| -rw-r--r-- | drivers/gpu/drm/nouveau/core/subdev/bios/base.c | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/drivers/gpu/drm/nouveau/core/subdev/bios/base.c b/drivers/gpu/drm/nouveau/core/subdev/bios/base.c index ef0c9c4a8cc3..13bb829f959c 100644 --- a/drivers/gpu/drm/nouveau/core/subdev/bios/base.c +++ b/drivers/gpu/drm/nouveau/core/subdev/bios/base.c @@ -90,10 +90,16 @@ nouveau_bios_shadow_pramin(struct nouveau_bios *bios) int i; if (device->card_type >= NV_50) { - if ( device->card_type < NV_C0 || - !(nv_rd32(bios, 0x022500) & 0x00000001)) - addr = (u64)(nv_rd32(bios, 0x619f04) & 0xffffff00) << 8; + if (device->card_type >= NV_C0 && device->card_type < GM100) { + if (nv_rd32(bios, 0x022500) & 0x00000001) + return; + } else + if (device->card_type >= GM100) { + if (nv_rd32(bios, 0x021c04) & 0x00000001) + return; + } + addr = (u64)(nv_rd32(bios, 0x619f04) & 0xffffff00) << 8; if (!addr) { addr = (u64)nv_rd32(bios, 0x001700) << 16; addr += 0xf0000; |