aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlex Deucher <[email protected]>2016-09-19 16:35:22 +0000
committerAlex Deucher <[email protected]>2016-09-22 14:24:15 +0000
commit884031f0aacf57dad1575f96714efc80de9b19cc (patch)
treeb017a9d67dc3889641c0c4d8513723d3d6d0b80b
parentdrm/amdgpu:add fw version entry to info (diff)
downloadkernel-884031f0aacf57dad1575f96714efc80de9b19cc.tar.gz
kernel-884031f0aacf57dad1575f96714efc80de9b19cc.zip
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 <[email protected]> Cc: [email protected]
-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 */