From 14ae54ff747d8a1af83c07831a9b125265ea2295 Mon Sep 17 00:00:00 2001 From: Alex Deucher Date: Wed, 15 Aug 2012 17:10:32 -0400 Subject: [PATCH] --- yaml --- r: 329515 b: refs/heads/master c: 46437057bd2a178b12d3a55bac06cbbd46eea4be h: refs/heads/master i: 329513: ad9e039f5d1d07a50b4998bd0450e374ec4ed041 329511: 5c70f89621b434b127a34feb85ea2ed2554ff4ab v: v3 --- [refs] | 2 +- trunk/drivers/gpu/drm/radeon/evergreen.c | 18 +++--------------- 2 files changed, 4 insertions(+), 16 deletions(-) diff --git a/[refs] b/[refs] index 33ab1726f5dd..e4e9e2902d44 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4a15903db02026728d0cf2755c6fabae16b8db6a +refs/heads/master: 46437057bd2a178b12d3a55bac06cbbd46eea4be diff --git a/trunk/drivers/gpu/drm/radeon/evergreen.c b/trunk/drivers/gpu/drm/radeon/evergreen.c index 0c79d9eb2ce4..585c11741d02 100644 --- a/trunk/drivers/gpu/drm/radeon/evergreen.c +++ b/trunk/drivers/gpu/drm/radeon/evergreen.c @@ -2345,22 +2345,10 @@ int evergreen_asic_reset(struct radeon_device *rdev) u32 evergreen_get_vblank_counter(struct radeon_device *rdev, int crtc) { - switch (crtc) { - case 0: - return RREG32(CRTC_STATUS_FRAME_COUNT + EVERGREEN_CRTC0_REGISTER_OFFSET); - case 1: - return RREG32(CRTC_STATUS_FRAME_COUNT + EVERGREEN_CRTC1_REGISTER_OFFSET); - case 2: - return RREG32(CRTC_STATUS_FRAME_COUNT + EVERGREEN_CRTC2_REGISTER_OFFSET); - case 3: - return RREG32(CRTC_STATUS_FRAME_COUNT + EVERGREEN_CRTC3_REGISTER_OFFSET); - case 4: - return RREG32(CRTC_STATUS_FRAME_COUNT + EVERGREEN_CRTC4_REGISTER_OFFSET); - case 5: - return RREG32(CRTC_STATUS_FRAME_COUNT + EVERGREEN_CRTC5_REGISTER_OFFSET); - default: + if (crtc >= rdev->num_crtc) return 0; - } + else + return RREG32(CRTC_STATUS_FRAME_COUNT + crtc_offsets[crtc]); } void evergreen_disable_interrupt_state(struct radeon_device *rdev)