Commit 2cf3a4fc authored by Alex Deucher's avatar Alex Deucher

drm/radeon: don't check crtcs in card_posted() on cards without DCE

Skip checking crtcs in hardware without them.  Avoids checking
non-existent hardware.
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 09fb8bd1
...@@ -471,6 +471,9 @@ bool radeon_card_posted(struct radeon_device *rdev) ...@@ -471,6 +471,9 @@ bool radeon_card_posted(struct radeon_device *rdev)
rdev->pdev->subsystem_vendor == PCI_VENDOR_ID_APPLE) rdev->pdev->subsystem_vendor == PCI_VENDOR_ID_APPLE)
return false; return false;
if (ASIC_IS_NODCE(rdev))
goto check_memsize;
/* first check CRTCs */ /* first check CRTCs */
if (ASIC_IS_DCE4(rdev)) { if (ASIC_IS_DCE4(rdev)) {
reg = RREG32(EVERGREEN_CRTC_CONTROL + EVERGREEN_CRTC0_REGISTER_OFFSET) | reg = RREG32(EVERGREEN_CRTC_CONTROL + EVERGREEN_CRTC0_REGISTER_OFFSET) |
...@@ -499,6 +502,7 @@ bool radeon_card_posted(struct radeon_device *rdev) ...@@ -499,6 +502,7 @@ bool radeon_card_posted(struct radeon_device *rdev)
} }
} }
check_memsize:
/* then check MEM_SIZE, in case the crtcs are off */ /* then check MEM_SIZE, in case the crtcs are off */
if (rdev->family >= CHIP_R600) if (rdev->family >= CHIP_R600)
reg = RREG32(R600_CONFIG_MEMSIZE); reg = RREG32(R600_CONFIG_MEMSIZE);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment