diff options
author | Alex Deucher <alexander.deucher@amd.com> | 2013-01-24 10:35:23 -0500 |
---|---|---|
committer | Alex Deucher <alexander.deucher@amd.com> | 2013-02-20 08:51:21 -0500 |
commit | d0418894142f88041d2b7b5aa4f8bf3178d89514 (patch) | |
tree | 4f5fd10c72b8ea4203535a11731db50a36911e81 /drivers/gpu/drm/radeon/r600.c | |
parent | 454d2e2a32f02a4f8e0364ba0e8ce4f8dbe9810c (diff) |
drm/radeon: switch get_gpu_clock() to a callback (v2)
Cleans up the code for future asics
v2: rebase, fix some missing radeon_asic updates
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Diffstat (limited to 'drivers/gpu/drm/radeon/r600.c')
-rw-r--r-- | drivers/gpu/drm/radeon/r600.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/radeon/r600.c b/drivers/gpu/drm/radeon/r600.c index 37d81fd09555..6d4b5611daf4 100644 --- a/drivers/gpu/drm/radeon/r600.c +++ b/drivers/gpu/drm/radeon/r600.c | |||
@@ -4461,14 +4461,14 @@ static void r600_pcie_gen2_enable(struct radeon_device *rdev) | |||
4461 | } | 4461 | } |
4462 | 4462 | ||
4463 | /** | 4463 | /** |
4464 | * r600_get_gpu_clock - return GPU clock counter snapshot | 4464 | * r600_get_gpu_clock_counter - return GPU clock counter snapshot |
4465 | * | 4465 | * |
4466 | * @rdev: radeon_device pointer | 4466 | * @rdev: radeon_device pointer |
4467 | * | 4467 | * |
4468 | * Fetches a GPU clock counter snapshot (R6xx-cayman). | 4468 | * Fetches a GPU clock counter snapshot (R6xx-cayman). |
4469 | * Returns the 64 bit clock counter snapshot. | 4469 | * Returns the 64 bit clock counter snapshot. |
4470 | */ | 4470 | */ |
4471 | uint64_t r600_get_gpu_clock(struct radeon_device *rdev) | 4471 | uint64_t r600_get_gpu_clock_counter(struct radeon_device *rdev) |
4472 | { | 4472 | { |
4473 | uint64_t clock; | 4473 | uint64_t clock; |
4474 | 4474 | ||