From 1a7e2231715399ee69014429cde7513a1c17a6bb Mon Sep 17 00:00:00 2001 From: Dave Airlie Date: Mon, 21 Jun 2010 13:31:38 +1000 Subject: [PATCH] --- yaml --- r: 200725 b: refs/heads/master c: 8b5d8dec7c85b6f1a4ae9c57500f1378d79556bc h: refs/heads/master i: 200723: f6508f975c83ab71cf0ad8170f82f2f94bcd4e15 v: v3 --- [refs] | 2 +- trunk/drivers/gpu/drm/radeon/radeon_bios.c | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 4e620abce05b..49b3510a7dc1 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f96b35cd6f499d1219e5c1aac95f818b3e566e67 +refs/heads/master: 8b5d8dec7c85b6f1a4ae9c57500f1378d79556bc diff --git a/trunk/drivers/gpu/drm/radeon/radeon_bios.c b/trunk/drivers/gpu/drm/radeon/radeon_bios.c index fbba938f8048..2c9213739999 100644 --- a/trunk/drivers/gpu/drm/radeon/radeon_bios.c +++ b/trunk/drivers/gpu/drm/radeon/radeon_bios.c @@ -48,6 +48,10 @@ static bool igp_read_bios_from_vram(struct radeon_device *rdev) resource_size_t vram_base; resource_size_t size = 256 * 1024; /* ??? */ + if (!(rdev->flags & RADEON_IS_IGP)) + if (!radeon_card_posted(rdev)) + return false; + rdev->bios = NULL; vram_base = drm_get_resource_start(rdev->ddev, 0); bios = ioremap(vram_base, size);