Skip to content

Commit

Permalink
drm/radeon: don't check crtcs in card_posted() on cards without DCE
Browse files Browse the repository at this point in the history
Skip checking crtcs in hardware without them.  Avoids checking
non-existent hardware.

Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
  • Loading branch information
Alex Deucher committed May 29, 2013
1 parent 09fb8bd commit 2cf3a4f
Showing 1 changed file with 4 additions and 0 deletions.
4 changes: 4 additions & 0 deletions drivers/gpu/drm/radeon/radeon_device.c
Original file line number Diff line number Diff line change
Expand Up @@ -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) |
Expand Down Expand Up @@ -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);
Expand Down

0 comments on commit 2cf3a4f

Please sign in to comment.