diff options
| author | Alex Deucher <alexander.deucher@amd.com> | 2016-09-19 12:35:22 -0400 |
|---|---|---|
| committer | Alex Deucher <alexander.deucher@amd.com> | 2016-09-22 10:24:15 -0400 |
| commit | 884031f0aacf57dad1575f96714efc80de9b19cc (patch) | |
| tree | b017a9d67dc3889641c0c4d8513723d3d6d0b80b | |
| parent | fc76cbf45651f58284b8035ae1938e8ff5d19ee7 (diff) | |
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
| -rw-r--r-- | drivers/gpu/drm/radeon/radeon_device.c | 5 |
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) | |||
| 661 | { | 661 | { |
| 662 | uint32_t reg; | 662 | uint32_t reg; |
| 663 | 663 | ||
| 664 | /* for pass through, always force asic_init */ | 664 | /* for pass through, always force asic_init for CI */ |
| 665 | if (radeon_device_is_virtual()) | 665 | if (rdev->family >= CHIP_BONAIRE && |
| 666 | radeon_device_is_virtual()) | ||
| 666 | return false; | 667 | return false; |
| 667 | 668 | ||
| 668 | /* required for EFI mode on macbook2,1 which uses an r5xx asic */ | 669 | /* required for EFI mode on macbook2,1 which uses an r5xx asic */ |