]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
drm/radeon: narrow asic_init for virtualization
authorAlex Deucher <alexander.deucher@amd.com>
Mon, 19 Sep 2016 16:35:22 +0000 (12:35 -0400)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 31 Oct 2016 11:02:05 +0000 (05:02 -0600)
commit 884031f0aacf57dad1575f96714efc80de9b19cc upstream.

Only needed on CIK+ due to the way pci reset is handled
by the GPU.

Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/gpu/drm/radeon/radeon_device.c

index a00dd2f745271ec760bff14d5455571388313ebd..554ca7115f983a6c09ab0c55bcb65cb06a8fb9fc 100644 (file)
@@ -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 */