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/radeon.h | |
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/radeon.h')
-rw-r--r-- | drivers/gpu/drm/radeon/radeon.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/gpu/drm/radeon/radeon.h b/drivers/gpu/drm/radeon/radeon.h index e425b412f246..081e55f66c40 100644 --- a/drivers/gpu/drm/radeon/radeon.h +++ b/drivers/gpu/drm/radeon/radeon.h | |||
@@ -1181,6 +1181,8 @@ struct radeon_asic { | |||
1181 | int (*mc_wait_for_idle)(struct radeon_device *rdev); | 1181 | int (*mc_wait_for_idle)(struct radeon_device *rdev); |
1182 | /* get the reference clock */ | 1182 | /* get the reference clock */ |
1183 | u32 (*get_xclk)(struct radeon_device *rdev); | 1183 | u32 (*get_xclk)(struct radeon_device *rdev); |
1184 | /* get the gpu clock counter */ | ||
1185 | uint64_t (*get_gpu_clock_counter)(struct radeon_device *rdev); | ||
1184 | /* gart */ | 1186 | /* gart */ |
1185 | struct { | 1187 | struct { |
1186 | void (*tlb_flush)(struct radeon_device *rdev); | 1188 | void (*tlb_flush)(struct radeon_device *rdev); |
@@ -1863,6 +1865,7 @@ void radeon_ring_write(struct radeon_ring *ring, uint32_t v); | |||
1863 | #define radeon_wait_for_vblank(rdev, crtc) (rdev)->asic->display.wait_for_vblank((rdev), (crtc)) | 1865 | #define radeon_wait_for_vblank(rdev, crtc) (rdev)->asic->display.wait_for_vblank((rdev), (crtc)) |
1864 | #define radeon_mc_wait_for_idle(rdev) (rdev)->asic->mc_wait_for_idle((rdev)) | 1866 | #define radeon_mc_wait_for_idle(rdev) (rdev)->asic->mc_wait_for_idle((rdev)) |
1865 | #define radeon_get_xclk(rdev) (rdev)->asic->get_xclk((rdev)) | 1867 | #define radeon_get_xclk(rdev) (rdev)->asic->get_xclk((rdev)) |
1868 | #define radeon_get_gpu_clock_counter(rdev) (rdev)->asic->get_gpu_clock_counter((rdev)) | ||
1866 | 1869 | ||
1867 | /* Common functions */ | 1870 | /* Common functions */ |
1868 | /* AGP */ | 1871 | /* AGP */ |