drm/radeon: revert Apple re-POST hack
Subsystems (2)
PATCH 1/1 drm/radeon: revert Apple re-POST hack
From: Alex Deucher <[email protected]>
This reverts:
drm/radeon: re-POST the asic on Apple hardware when booted via EFI
That patch prevents UVD from working on macs when booted in EFI mode. The original patch may not be required any more due to other fixes for UEFI on non-Mac platforms, but I don't have any Macs.
Fixes:
https://bugs.freedesktop.org/show_bug.cgi?id=63935
--- drivers/gpu/drm/radeon/radeon_device.c | 4 ---- 1 files changed, 0 insertions(+), 4 deletions(-)
drivers/gpu/drm/radeon/radeon_device.c +0 -4
@@ -467,10 +467,6 @@ bool radeon_card_posted(struct radeon_device *rdev) {uint32_t reg; -if (efi_enabled (EFI_BOOT ) && - rdev->pdev->subsystem_vendor ==PCI_VENDOR_ID_APPLE ) -return false; -if (ASIC_IS_NODCE (rdev)) goto check_memsize;
Signature · 1 line
1.7.7.5
Am 22.05.2013 19:38, schrieb [email protected]:
Quoted 9 lines
From: Alex Deucher <[email protected]>
This reverts:
drm/radeon: re-POST the asic on Apple hardware when booted via EFIThat patch prevents UVD from working on macs when booted in EFI mode. The original patch may not be required any more due to other fixes for UEFI on non-Mac platforms, but I don't have any Macs.
Quoted 5 lines
Fixes:
https://bugs.freedesktop.org/show_bug.cgi?id=63935Cc Matthew Garrett <[email protected]>Signed-off-by Alex Deucher <[email protected]>
Quoted 19 lines
--- drivers/gpu/drm/radeon/radeon_device.c | 4 ---- 1 files changed, 0 insertions(+), 4 deletions(-)drivers/gpu/drm/radeon/radeon_device.c +0
-4@@ -467,10 +467,6 @@ bool radeon_card_posted(struct radeon_device *rdev) {uint32_t reg; -if (efi_enabled (EFI_BOOT ) && - rdev->pdev->subsystem_vendor ==PCI_VENDOR_ID_APPLE ) -return false; -if (ASIC_IS_NODCE (rdev)) goto check_memsize;
PATCH 1/1 drm/radeon: narrow scope of Apple re-POST hack
In reply to [email protected]From: Alex Deucher <[email protected]>
This narrows the scope of the apple re-POST hack added in:
drm/radeon: re-POST the asic on Apple hardware when booted via EFI
That patch prevents UVD from working on macs when booted in EFI mode. The original patch fixed macbook2,1 systems which were r5xx and hence have no UVD. Limit the hack to those systems to prevent UVD breakage on newer systems.
Fixes:
https://bugs.freedesktop.org/show_bug.cgi?id=63935
--- drivers/gpu/drm/radeon/radeon_device.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-)
drivers/gpu/drm/radeon/radeon_device.c +3 -1
@@ -467,8 +467,10 @@ bool radeon_card_posted(struct radeon_device *rdev) {uint32_t reg; +/* required for EFI mode on macbook2,1 which uses an r5xx asic */ if (efi_enabled (EFI_BOOT ) && - rdev->pdev->subsystem_vendor ==PCI_VENDOR_ID_APPLE ) + (rdev->pdev->subsystem_vendor ==PCI_VENDOR_ID_APPLE ) && + (rdev->family <CHIP_R600 ))return false;if (ASIC_IS_NODCE (rdev))
Signature · 1 line
1.7.7.5
Re: [PATCH] drm/radeon: narrow scope of Apple re-POST hack
Quoted 10 lines · On Wed, May 29, 2013 at 12:24:25PM -0400, [email protected] wrote:
From: Alex Deucher <[email protected]>
This narrows the scope of the apple re-POST hack added in:
drm/radeon: re-POST the asic on Apple hardware when booted via EFIThat patch prevents UVD from working on macs when booted in EFI mode. The original patch fixed macbook2,1 systems which were r5xx and hence have no UVD. Limit the hack to those systems to prevent UVD breakage on newer systems.
Quoted 4 lines
Fixes:
https://bugs.freedesktop.org/show_bug.cgi?id=63935Cc Matthew Garrett <[email protected]>
There's some potential for this to break some other Apple systems, but let's try it and see.
Signature · 1 line
Matthew Garrett | [email protected]