summaryrefslogtreecommitdiffstats
path: root/drivers/gpu
diff options
context:
space:
mode:
authorIlia Mirkin <imirkin@alum.mit.edu>2014-02-05 14:33:04 -0500
committerBen Skeggs <bskeggs@redhat.com>2014-02-18 10:36:52 +1000
commit5ac607ec4006d61c425c7846f29de8a9d8ce4f9f (patch)
tree65dccdd869d33791bc495c1786d759c63d9130d9 /drivers/gpu
parentb71313e14bbc0b8fc25eeff53828ab8e2aee4f25 (diff)
downloadop-kernel-dev-5ac607ec4006d61c425c7846f29de8a9d8ce4f9f.zip
op-kernel-dev-5ac607ec4006d61c425c7846f29de8a9d8ce4f9f.tar.gz
drm/nv4c/bios: disallow retrieving from prom on nv4x igp's
Suggested-by: Marcin Koƛcielnicki <koriakin@0x04.net> Signed-off-by: Ilia Mirkin <imirkin@alum.mit.edu> Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'drivers/gpu')
-rw-r--r--drivers/gpu/drm/nouveau/core/subdev/bios/base.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/gpu/drm/nouveau/core/subdev/bios/base.c b/drivers/gpu/drm/nouveau/core/subdev/bios/base.c
index aa0fbbe..ef0c9c4 100644
--- a/drivers/gpu/drm/nouveau/core/subdev/bios/base.c
+++ b/drivers/gpu/drm/nouveau/core/subdev/bios/base.c
@@ -130,6 +130,10 @@ nouveau_bios_shadow_prom(struct nouveau_bios *bios)
u16 pcir;
int i;
+ /* there is no prom on nv4x IGP's */
+ if (device->card_type == NV_40 && device->chipset >= 0x4c)
+ return;
+
/* enable access to rom */
if (device->card_type >= NV_50)
pcireg = 0x088050;
OpenPOWER on IntegriCloud