From: Alex Deucher Date: Mon, 19 Sep 2016 16:35:22 +0000 (-0400) Subject: drm/radeon: narrow asic_init for virtualization X-Git-Tag: v3.16.40~246 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=1caebfb554c8c667d4d32700990373c954d6da41;p=thirdparty%2Fkernel%2Fstable.git drm/radeon: narrow asic_init for virtualization commit 884031f0aacf57dad1575f96714efc80de9b19cc upstream. Only needed on CIK+ due to the way pci reset is handled by the GPU. Signed-off-by: Alex Deucher Signed-off-by: Ben Hutchings --- diff --git a/drivers/gpu/drm/radeon/radeon_device.c b/drivers/gpu/drm/radeon/radeon_device.c index 7a7a4af75630b..93324c9ddfc6c 100644 --- a/drivers/gpu/drm/radeon/radeon_device.c +++ b/drivers/gpu/drm/radeon/radeon_device.c @@ -629,8 +629,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 */