diff options
| author | Matthew Garrett <mjg@redhat.com> | 2011-08-08 16:21:16 +0000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2011-08-12 11:04:29 +0100 |
| commit | bcc65fd8e929a9d9d34d814d6efc1d2793546922 (patch) | |
| tree | 966776acccd00380caf73d6e16c384a313ae85c3 /drivers/gpu/drm | |
| parent | 13bb9430cd6154d1f088549656c4a3ed10eaf35e (diff) | |
| download | linux-3.10-bcc65fd8e929a9d9d34d814d6efc1d2793546922.tar.gz linux-3.10-bcc65fd8e929a9d9d34d814d6efc1d2793546922.tar.bz2 linux-3.10-bcc65fd8e929a9d9d34d814d6efc1d2793546922.zip | |
drm/radeon: re-POST the asic on Apple hardware when booted via EFI
At least some Apples program the GPU into a state that wedges the engine
once userspace starts trying to perform accelerated operations. Executing
the Atom init scripts gets the hardware back into a working state. The
same hardware works fine when booted via BIOS emulation, so let's just
execute the init scripts on Apples when we're using EFI.
Signed-off-by: Matthew Garrett <mjg@redhat.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'drivers/gpu/drm')
| -rw-r--r-- | drivers/gpu/drm/radeon/radeon_device.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/gpu/drm/radeon/radeon_device.c b/drivers/gpu/drm/radeon/radeon_device.c index 440e6ecccc4..a3b011b4946 100644 --- a/drivers/gpu/drm/radeon/radeon_device.c +++ b/drivers/gpu/drm/radeon/radeon_device.c @@ -32,6 +32,7 @@ #include <drm/radeon_drm.h> #include <linux/vgaarb.h> #include <linux/vga_switcheroo.h> +#include <linux/efi.h> #include "radeon_reg.h" #include "radeon.h" #include "atom.h" @@ -348,6 +349,9 @@ bool radeon_card_posted(struct radeon_device *rdev) { uint32_t reg; + if (efi_enabled && rdev->pdev->subsystem_vendor == PCI_VENDOR_ID_APPLE) + return false; + /* first check CRTCs */ if (ASIC_IS_DCE41(rdev)) { reg = RREG32(EVERGREEN_CRTC_CONTROL + EVERGREEN_CRTC0_REGISTER_OFFSET) | |