From: Ilia Mirkin Date: Wed, 5 Feb 2014 19:33:03 +0000 (-0500) Subject: drm/nv4c/vga: decode register is in a different place on nv4x igp's X-Git-Tag: submit/tizen/20160607.132125~5022^2~8^2~6 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=b71313e14bbc0b8fc25eeff53828ab8e2aee4f25;p=sdk%2Femulator%2Femulator-kernel.git drm/nv4c/vga: decode register is in a different place on nv4x igp's Suggested-by: Marcin Kościelnicki Signed-off-by: Ilia Mirkin Signed-off-by: Ben Skeggs --- diff --git a/drivers/gpu/drm/nouveau/nouveau_vga.c b/drivers/gpu/drm/nouveau/nouveau_vga.c index 81638d7..471347e 100644 --- a/drivers/gpu/drm/nouveau/nouveau_vga.c +++ b/drivers/gpu/drm/nouveau/nouveau_vga.c @@ -14,7 +14,9 @@ nouveau_vga_set_decode(void *priv, bool state) { struct nouveau_device *device = nouveau_dev(priv); - if (device->chipset >= 0x40) + if (device->card_type == NV_40 && device->chipset >= 0x4c) + nv_wr32(device, 0x088060, state); + else if (device->chipset >= 0x40) nv_wr32(device, 0x088054, state); else nv_wr32(device, 0x001854, state);