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>

1 files changed, 9 insertions, 0 deletions

diff --git a/drivers/gpu/drm/radeon/radeon_asic.c b/drivers/gpu/drm/radeon/radeon_asic.c
index e1b4a6832312..aba0a893ea98 100644
--- a/drivers/gpu/drm/radeon/radeon_asic.c
+++ b/drivers/gpu/drm/radeon/radeon_asic.c
@@ -935,6 +935,7 @@ static struct radeon_asic r600_asic = {
         .gui_idle = &r600_gui_idle,
         .mc_wait_for_idle = &r600_mc_wait_for_idle,
         .get_xclk = &r600_get_xclk,
+        .get_gpu_clock_counter = &r600_get_gpu_clock_counter,
         .gart = {
                 .tlb_flush = &r600_pcie_gart_tlb_flush,
                 .set_page = &rs600_gart_set_page,
@@ -1020,6 +1021,7 @@ static struct radeon_asic rs780_asic = {
         .gui_idle = &r600_gui_idle,
         .mc_wait_for_idle = &r600_mc_wait_for_idle,
         .get_xclk = &r600_get_xclk,
+        .get_gpu_clock_counter = &r600_get_gpu_clock_counter,
         .gart = {
                 .tlb_flush = &r600_pcie_gart_tlb_flush,
                 .set_page = &rs600_gart_set_page,
@@ -1105,6 +1107,7 @@ static struct radeon_asic rv770_asic = {
         .gui_idle = &r600_gui_idle,
         .mc_wait_for_idle = &r600_mc_wait_for_idle,
         .get_xclk = &rv770_get_xclk,
+        .get_gpu_clock_counter = &r600_get_gpu_clock_counter,
         .gart = {
                 .tlb_flush = &r600_pcie_gart_tlb_flush,
                 .set_page = &rs600_gart_set_page,
@@ -1190,6 +1193,7 @@ static struct radeon_asic evergreen_asic = {
         .gui_idle = &r600_gui_idle,
         .mc_wait_for_idle = &evergreen_mc_wait_for_idle,
         .get_xclk = &rv770_get_xclk,
+        .get_gpu_clock_counter = &r600_get_gpu_clock_counter,
         .gart = {
                 .tlb_flush = &evergreen_pcie_gart_tlb_flush,
                 .set_page = &rs600_gart_set_page,
@@ -1275,6 +1279,7 @@ static struct radeon_asic sumo_asic = {
         .gui_idle = &r600_gui_idle,
         .mc_wait_for_idle = &evergreen_mc_wait_for_idle,
         .get_xclk = &r600_get_xclk,
+        .get_gpu_clock_counter = &r600_get_gpu_clock_counter,
         .gart = {
                 .tlb_flush = &evergreen_pcie_gart_tlb_flush,
                 .set_page = &rs600_gart_set_page,
@@ -1360,6 +1365,7 @@ static struct radeon_asic btc_asic = {
         .gui_idle = &r600_gui_idle,
         .mc_wait_for_idle = &evergreen_mc_wait_for_idle,
         .get_xclk = &rv770_get_xclk,
+        .get_gpu_clock_counter = &r600_get_gpu_clock_counter,
         .gart = {
                 .tlb_flush = &evergreen_pcie_gart_tlb_flush,
                 .set_page = &rs600_gart_set_page,
@@ -1445,6 +1451,7 @@ static struct radeon_asic cayman_asic = {
         .gui_idle = &r600_gui_idle,
         .mc_wait_for_idle = &evergreen_mc_wait_for_idle,
         .get_xclk = &rv770_get_xclk,
+        .get_gpu_clock_counter = &r600_get_gpu_clock_counter,
         .gart = {
                 .tlb_flush = &cayman_pcie_gart_tlb_flush,
                 .set_page = &rs600_gart_set_page,
@@ -1573,6 +1580,7 @@ static struct radeon_asic trinity_asic = {
         .gui_idle = &r600_gui_idle,
         .mc_wait_for_idle = &evergreen_mc_wait_for_idle,
         .get_xclk = &r600_get_xclk,
+        .get_gpu_clock_counter = &r600_get_gpu_clock_counter,
         .gart = {
                 .tlb_flush = &cayman_pcie_gart_tlb_flush,
                 .set_page = &rs600_gart_set_page,
@@ -1701,6 +1709,7 @@ static struct radeon_asic si_asic = {
         .gui_idle = &r600_gui_idle,
         .mc_wait_for_idle = &evergreen_mc_wait_for_idle,
         .get_xclk = &si_get_xclk,
+        .get_gpu_clock_counter = &si_get_gpu_clock_counter,
         .gart = {
                 .tlb_flush = &si_pcie_gart_tlb_flush,
                 .set_page = &rs600_gart_set_page,