drm/radeon: fix card_posted check for newer asics
Subsystems (2)
PATCH 1/2 drm/radeon: fix card_posted check for newer asics
From: Alex Deucher <[email protected]>
Newer asics have variable numbers of crtcs. Use that rather than the asic family to determine which crtcs to check. This avoids checking non-existent crtcs or missing crtcs on certain asics.
Signed-off-by Alex Deucher <[email protected]>
--- drivers/gpu/drm/radeon/radeon_device.c | 19 +++++++++---------- 1 files changed, 9 insertions(+), 10 deletions(-)
drivers/gpu/drm/radeon/radeon_device.c +9 -10
@@ -472,18 +472,17 @@ bool radeon_card_posted(struct radeon_device *rdev)return false;/* first check CRTCs */ -if (ASIC_IS_DCE41 (rdev)) { +if (ASIC_IS_DCE4 (rdev)) { reg =RREG32 (EVERGREEN_CRTC_CONTROL +EVERGREEN_CRTC0_REGISTER_OFFSET ) |RREG32 (EVERGREEN_CRTC_CONTROL +EVERGREEN_CRTC1_REGISTER_OFFSET ); -if (reg &EVERGREEN_CRTC_MASTER_EN ) -return true; - }else if (ASIC_IS_DCE4 (rdev)) { - reg =RREG32 (EVERGREEN_CRTC_CONTROL +EVERGREEN_CRTC0_REGISTER_OFFSET ) | -RREG32 (EVERGREEN_CRTC_CONTROL +EVERGREEN_CRTC1_REGISTER_OFFSET ) | -RREG32 (EVERGREEN_CRTC_CONTROL +EVERGREEN_CRTC2_REGISTER_OFFSET ) | -RREG32 (EVERGREEN_CRTC_CONTROL +EVERGREEN_CRTC3_REGISTER_OFFSET ) | -RREG32 (EVERGREEN_CRTC_CONTROL +EVERGREEN_CRTC4_REGISTER_OFFSET ) | -RREG32 (EVERGREEN_CRTC_CONTROL +EVERGREEN_CRTC5_REGISTER_OFFSET ); +if (rdev->num_crtc >=4 ) { + reg |=RREG32 (EVERGREEN_CRTC_CONTROL +EVERGREEN_CRTC2_REGISTER_OFFSET ) | +RREG32 (EVERGREEN_CRTC_CONTROL +EVERGREEN_CRTC3_REGISTER_OFFSET ); + } +if (rdev->num_crtc >=6 ) { + reg |=RREG32 (EVERGREEN_CRTC_CONTROL +EVERGREEN_CRTC4_REGISTER_OFFSET ) | +RREG32 (EVERGREEN_CRTC_CONTROL +EVERGREEN_CRTC5_REGISTER_OFFSET ); + }if (reg &EVERGREEN_CRTC_MASTER_EN )return true; }else if (ASIC_IS_AVIVO (rdev)) {
Signature · 1 line
1.7.7.5
PATCH 2/2 drm/radeon: don't check crtcs in card_posted() on cards without DCE
From: Alex Deucher <[email protected]>
Skip checking crtcs in hardware without them. Avoids checking non-existent hardware.
Signed-off-by Alex Deucher <[email protected]>
--- drivers/gpu/drm/radeon/radeon_device.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-)
drivers/gpu/drm/radeon/radeon_device.c +4 -0
@@ -471,6 +471,9 @@ bool radeon_card_posted(struct radeon_device *rdev) rdev->pdev->subsystem_vendor == PCI_VENDOR_ID_APPLE)return false; +if (ASIC_IS_NODCE (rdev)) + goto check_memsize; +/* first check CRTCs */ if (ASIC_IS_DCE4 (rdev)) { reg = RREG32(EVERGREEN_CRTC_CONTROL + EVERGREEN_CRTC0_REGISTER_OFFSET) |
@@ -499,6 +502,7 @@ bool radeon_card_posted(struct radeon_device *rdev) } } +check_memsize:/* then check MEM_SIZE, in case the crtcs are off */ if (rdev->family >=CHIP_R600 ) reg =RREG32 (R600_CONFIG_MEMSIZE );
Signature · 1 line
1.7.7.5
Quoted 8 lines · On Mit, 2013-05-22 at 11:32 -0400, [email protected] wrote:
From: Alex Deucher <[email protected]>
Newer asics have variable numbers of crtcs. Use that rather than the asic family to determine which crtcs to check. This avoids checking non-existent crtcs or missing crtcs on certain asics.
Signed-off-by Alex Deucher <[email protected]>
Reviewed-by Michel Dänzer <[email protected]>
Signature · 6 lines
Earthling Michel Dänzer | http://www.amd.com Libre software enthusiast | Debian, X and DRI developer _______________________________________________ dri-devel mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/dri-devel