summaryrefslogtreecommitdiff
path: root/drivers/gpu/drm/radeon/radeon_device.c
diff options
context:
space:
mode:
authorAlex Deucher <alexander.deucher@amd.com>2016-09-19 19:35:22 +0300
committerAlex Deucher <alexander.deucher@amd.com>2016-09-22 17:24:15 +0300
commit884031f0aacf57dad1575f96714efc80de9b19cc (patch)
treeb017a9d67dc3889641c0c4d8513723d3d6d0b80b /drivers/gpu/drm/radeon/radeon_device.c
parentfc76cbf45651f58284b8035ae1938e8ff5d19ee7 (diff)
downloadlinux-884031f0aacf57dad1575f96714efc80de9b19cc.tar.xz
drm/radeon: narrow asic_init for virtualization
Only needed on CIK+ due to the way pci reset is handled by the GPU. Signed-off-by: Alex Deucher <alexander.deucher@amd.com> Cc: stable@vger.kernel.org
Diffstat (limited to 'drivers/gpu/drm/radeon/radeon_device.c')
-rw-r--r--drivers/gpu/drm/radeon/radeon_device.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/gpu/drm/radeon/radeon_device.c b/drivers/gpu/drm/radeon/radeon_device.c
index bbc895891631..eb92aef46e3c 100644
--- a/drivers/gpu/drm/radeon/radeon_device.c
+++ b/drivers/gpu/drm/radeon/radeon_device.c
@@ -661,8 +661,9 @@ bool radeon_card_posted(struct radeon_device *rdev)
{
uint32_t reg;
- /* for pass through, always force asic_init */
- if (radeon_device_is_virtual())
+ /* for pass through, always force asic_init for CI */
+ if (rdev->family >= CHIP_BONAIRE &&
+ radeon_device_is_virtual())
return false;
/* required for EFI mode on macbook2,1 which uses an r5xx asic */