drm/amd/pm: Use driver table structure in smuv13

Use driver table structure for gpu metrics in smuv13. The default cache
interval is set at 5ms.

Signed-off-by: Lijo Lazar <lijo.lazar@amd.com>
Reviewed-by: Asad Kamal <asad.kamal@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

diff --git a/drivers/gpu/drm/amd/pm/swsmu/smu13/aldebaran_ppt.c b/drivers/gpu/drm/amd/pm/swsmu/smu13/aldebaran_ppt.c
index a72aaf36c282cb27ea6d2ffdc22e22cbb8d9a3a5..e999ee7d053e4e8cd34b0b7672414df8e0b104f8 100644 (file)
--- a/drivers/gpu/drm/amd/pm/swsmu/smu13/aldebaran_ppt.c
+++ b/drivers/gpu/drm/amd/pm/swsmu/smu13/aldebaran_ppt.c
@@ -225,6 +225,7 @@ static int aldebaran_tables_init(struct smu_context *smu)
 {
        struct smu_table_context *smu_table = &smu->smu_table;
        struct smu_table *tables = smu_table->tables;
+       int ret;
 
        SMU_TABLE_INIT(tables, SMU_TABLE_PPTABLE, sizeof(PPTable_t),
                       PAGE_SIZE, AMDGPU_GEM_DOMAIN_VRAM);
@@ -246,17 +247,18 @@ static int aldebaran_tables_init(struct smu_context *smu)
                return -ENOMEM;
        smu_table->metrics_time = 0;
 
-       smu_table->gpu_metrics_table_size = sizeof(struct gpu_metrics_v1_3);
-       smu_table->gpu_metrics_table = kzalloc(smu_table->gpu_metrics_table_size, GFP_KERNEL);
-       if (!smu_table->gpu_metrics_table) {
+       ret = smu_driver_table_init(smu, SMU_DRIVER_TABLE_GPU_METRICS,
+                                    sizeof(struct gpu_metrics_v1_3),
+                                    SMU_GPU_METRICS_CACHE_INTERVAL);
+       if (ret) {
                kfree(smu_table->metrics_table);
-               return -ENOMEM;
+               return ret;
        }
 
        smu_table->ecc_table = kzalloc(tables[SMU_TABLE_ECCINFO].size, GFP_KERNEL);
        if (!smu_table->ecc_table) {
                kfree(smu_table->metrics_table);
-               kfree(smu_table->gpu_metrics_table);
+               smu_driver_table_fini(smu, SMU_DRIVER_TABLE_GPU_METRICS);
                return -ENOMEM;
        }
 
@@ -1641,9 +1643,9 @@ static int aldebaran_get_current_pcie_link_speed(struct smu_context *smu)
 static ssize_t aldebaran_get_gpu_metrics(struct smu_context *smu,
                                         void **table)
 {
-       struct smu_table_context *smu_table = &smu->smu_table;
        struct gpu_metrics_v1_3 *gpu_metrics =
-               (struct gpu_metrics_v1_3 *)smu_table->gpu_metrics_table;
+               (struct gpu_metrics_v1_3 *)smu_driver_table_ptr(
+                       smu, SMU_DRIVER_TABLE_GPU_METRICS);
        SmuMetrics_t metrics;
        int i, ret = 0;
 
@@ -1715,6 +1717,8 @@ static ssize_t aldebaran_get_gpu_metrics(struct smu_context *smu,
 
        *table = (void *)gpu_metrics;
 
+       smu_driver_table_update_cache_time(smu, SMU_DRIVER_TABLE_GPU_METRICS);
+
        return sizeof(struct gpu_metrics_v1_3);
 }
 

diff --git a/drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0.c b/drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0.c
index 7340237b3c35792a7f559dfeb09d900ee5e8df16..bf00ed3f284860ae6829f63ff293768dcd2411c5 100644 (file)
--- a/drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0.c
+++ b/drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0.c
@@ -507,14 +507,13 @@ int smu_v13_0_fini_smc_tables(struct smu_context *smu)
        struct smu_table_context *smu_table = &smu->smu_table;
        struct smu_dpm_context *smu_dpm = &smu->smu_dpm;
 
-       kfree(smu_table->gpu_metrics_table);
+       smu_driver_table_fini(smu, SMU_DRIVER_TABLE_GPU_METRICS);
        kfree(smu_table->combo_pptable);
        kfree(smu_table->user_overdrive_table);
        kfree(smu_table->boot_overdrive_table);
        kfree(smu_table->overdrive_table);
        kfree(smu_table->max_sustainable_clocks);
        kfree(smu_table->driver_pptable);
-       smu_table->gpu_metrics_table = NULL;
        smu_table->combo_pptable = NULL;
        smu_table->user_overdrive_table = NULL;
        smu_table->boot_overdrive_table = NULL;

diff --git a/drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_0_ppt.c b/drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_0_ppt.c
index cddb8b283e3b6efca77c8195605136d46b0541a3..91442e39aa79d580fa94b7f3220a04527a0a59db 100644 (file)
--- a/drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_0_ppt.c
+++ b/drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_0_ppt.c
@@ -482,6 +482,7 @@ static int smu_v13_0_0_tables_init(struct smu_context *smu)
 {
        struct smu_table_context *smu_table = &smu->smu_table;
        struct smu_table *tables = smu_table->tables;
+       int ret;
 
        SMU_TABLE_INIT(tables, SMU_TABLE_PPTABLE, sizeof(PPTable_t),
                       PAGE_SIZE, AMDGPU_GEM_DOMAIN_VRAM);
@@ -511,9 +512,10 @@ static int smu_v13_0_0_tables_init(struct smu_context *smu)
                goto err0_out;
        smu_table->metrics_time = 0;
 
-       smu_table->gpu_metrics_table_size = sizeof(struct gpu_metrics_v1_3);
-       smu_table->gpu_metrics_table = kzalloc(smu_table->gpu_metrics_table_size, GFP_KERNEL);
-       if (!smu_table->gpu_metrics_table)
+       ret = smu_driver_table_init(smu, SMU_DRIVER_TABLE_GPU_METRICS,
+                                   sizeof(struct gpu_metrics_v1_3),
+                                   SMU_GPU_METRICS_CACHE_INTERVAL);
+       if (ret)
                goto err1_out;
 
        smu_table->watermarks_table = kzalloc(sizeof(Watermarks_t), GFP_KERNEL);
@@ -529,7 +531,7 @@ static int smu_v13_0_0_tables_init(struct smu_context *smu)
 err3_out:
        kfree(smu_table->watermarks_table);
 err2_out:
-       kfree(smu_table->gpu_metrics_table);
+       smu_driver_table_fini(smu, SMU_DRIVER_TABLE_GPU_METRICS);
 err1_out:
        kfree(smu_table->metrics_table);
 err0_out:
@@ -2039,9 +2041,9 @@ static int smu_v13_0_0_get_thermal_temperature_range(struct smu_context *smu,
 static ssize_t smu_v13_0_0_get_gpu_metrics(struct smu_context *smu,
                                           void **table)
 {
-       struct smu_table_context *smu_table = &smu->smu_table;
        struct gpu_metrics_v1_3 *gpu_metrics =
-               (struct gpu_metrics_v1_3 *)smu_table->gpu_metrics_table;
+               (struct gpu_metrics_v1_3 *)smu_driver_table_ptr(
+                       smu, SMU_DRIVER_TABLE_GPU_METRICS);
        SmuMetricsExternal_t metrics_ext;
        SmuMetrics_t *metrics = &metrics_ext.SmuMetrics;
        int ret = 0;
@@ -2115,6 +2117,8 @@ static ssize_t smu_v13_0_0_get_gpu_metrics(struct smu_context *smu,
 
        *table = (void *)gpu_metrics;
 
+       smu_driver_table_update_cache_time(smu, SMU_DRIVER_TABLE_GPU_METRICS);
+
        return sizeof(struct gpu_metrics_v1_3);
 }
 

diff --git a/drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_4_ppt.c b/drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_4_ppt.c
index b0fa726ea25dec7172eb7f0078d492334bbda8bb..4a99f585f0710fcd4c93b0e801536bd40ff8f3dc 100644 (file)
--- a/drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_4_ppt.c
+++ b/drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_4_ppt.c
@@ -151,6 +151,7 @@ static int smu_v13_0_4_init_smc_tables(struct smu_context *smu)
 {
        struct smu_table_context *smu_table = &smu->smu_table;
        struct smu_table *tables = smu_table->tables;
+       int ret;
 
        SMU_TABLE_INIT(tables, SMU_TABLE_WATERMARKS, sizeof(Watermarks_t),
                PAGE_SIZE, AMDGPU_GEM_DOMAIN_VRAM);
@@ -172,9 +173,10 @@ static int smu_v13_0_4_init_smc_tables(struct smu_context *smu)
        if (!smu_table->watermarks_table)
                goto err2_out;
 
-       smu_table->gpu_metrics_table_size = sizeof(struct gpu_metrics_v2_1);
-       smu_table->gpu_metrics_table = kzalloc(smu_table->gpu_metrics_table_size, GFP_KERNEL);
-       if (!smu_table->gpu_metrics_table)
+       ret = smu_driver_table_init(smu, SMU_DRIVER_TABLE_GPU_METRICS,
+                                    sizeof(struct gpu_metrics_v2_1),
+                                    SMU_GPU_METRICS_CACHE_INTERVAL);
+       if (ret)
                goto err3_out;
 
        return 0;
@@ -202,8 +204,7 @@ static int smu_v13_0_4_fini_smc_tables(struct smu_context *smu)
        kfree(smu_table->watermarks_table);
        smu_table->watermarks_table = NULL;
 
-       kfree(smu_table->gpu_metrics_table);
-       smu_table->gpu_metrics_table = NULL;
+       smu_driver_table_fini(smu, SMU_DRIVER_TABLE_GPU_METRICS);
 
        return 0;
 }
@@ -247,9 +248,9 @@ static int smu_v13_0_4_system_features_control(struct smu_context *smu, bool en)
 static ssize_t smu_v13_0_4_get_gpu_metrics(struct smu_context *smu,
                                           void **table)
 {
-       struct smu_table_context *smu_table = &smu->smu_table;
        struct gpu_metrics_v2_1 *gpu_metrics =
-               (struct gpu_metrics_v2_1 *)smu_table->gpu_metrics_table;
+               (struct gpu_metrics_v2_1 *)smu_driver_table_ptr(
+                       smu, SMU_DRIVER_TABLE_GPU_METRICS);
        SmuMetrics_t metrics;
        int ret = 0;
 
@@ -294,6 +295,8 @@ static ssize_t smu_v13_0_4_get_gpu_metrics(struct smu_context *smu,
 
        *table = (void *)gpu_metrics;
 
+       smu_driver_table_update_cache_time(smu, SMU_DRIVER_TABLE_GPU_METRICS);
+
        return sizeof(struct gpu_metrics_v2_1);
 }
 

diff --git a/drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_5_ppt.c b/drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_5_ppt.c
index 796b2eb231742fd0730ec97bcccc53f67dd87284..f2e3c80ee203cc04b91e2f896398e8335ba1a201 100644 (file)
--- a/drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_5_ppt.c
+++ b/drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_5_ppt.c
@@ -125,6 +125,7 @@ static int smu_v13_0_5_init_smc_tables(struct smu_context *smu)
 {
        struct smu_table_context *smu_table = &smu->smu_table;
        struct smu_table *tables = smu_table->tables;
+       int ret;
 
        SMU_TABLE_INIT(tables, SMU_TABLE_WATERMARKS, sizeof(Watermarks_t),
                PAGE_SIZE, AMDGPU_GEM_DOMAIN_VRAM);
@@ -146,9 +147,10 @@ static int smu_v13_0_5_init_smc_tables(struct smu_context *smu)
        if (!smu_table->watermarks_table)
                goto err2_out;
 
-       smu_table->gpu_metrics_table_size = sizeof(struct gpu_metrics_v2_1);
-       smu_table->gpu_metrics_table = kzalloc(smu_table->gpu_metrics_table_size, GFP_KERNEL);
-       if (!smu_table->gpu_metrics_table)
+       ret = smu_driver_table_init(smu, SMU_DRIVER_TABLE_GPU_METRICS,
+                                    sizeof(struct gpu_metrics_v2_1),
+                                    SMU_GPU_METRICS_CACHE_INTERVAL);
+       if (ret)
                goto err3_out;
 
        return 0;
@@ -176,8 +178,7 @@ static int smu_v13_0_5_fini_smc_tables(struct smu_context *smu)
        kfree(smu_table->watermarks_table);
        smu_table->watermarks_table = NULL;
 
-       kfree(smu_table->gpu_metrics_table);
-       smu_table->gpu_metrics_table = NULL;
+       smu_driver_table_fini(smu, SMU_DRIVER_TABLE_GPU_METRICS);
 
        return 0;
 }
@@ -466,11 +467,11 @@ static int smu_v13_0_5_set_watermarks_table(struct smu_context *smu,
 }
 
 static ssize_t smu_v13_0_5_get_gpu_metrics(struct smu_context *smu,
-                                               void **table)
+                                          void **table)
 {
-       struct smu_table_context *smu_table = &smu->smu_table;
        struct gpu_metrics_v2_1 *gpu_metrics =
-               (struct gpu_metrics_v2_1 *)smu_table->gpu_metrics_table;
+               (struct gpu_metrics_v2_1 *)smu_driver_table_ptr(
+                       smu, SMU_DRIVER_TABLE_GPU_METRICS);
        SmuMetrics_t metrics;
        int ret = 0;
 
@@ -500,6 +501,8 @@ static ssize_t smu_v13_0_5_get_gpu_metrics(struct smu_context *smu,
 
        *table = (void *)gpu_metrics;
 
+       smu_driver_table_update_cache_time(smu, SMU_DRIVER_TABLE_GPU_METRICS);
+
        return sizeof(struct gpu_metrics_v2_1);
 }
 

diff --git a/drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_6_ppt.c b/drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_6_ppt.c
index 57ce7a38bba8132b1efad5380165ce591c77fd17..2c16da1065c88129f9b9489dd92535f436f92b98 100644 (file)
--- a/drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_6_ppt.c
+++ b/drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_6_ppt.c
@@ -584,20 +584,22 @@ static int smu_v13_0_6_tables_init(struct smu_context *smu)
        if (!driver_pptable)
                return -ENOMEM;
 
-       ret = smu_table_cache_init(smu, SMU_TABLE_SMU_METRICS,
-                                  sizeof(struct smu_v13_0_6_gpu_metrics), 1);
+       ret = smu_driver_table_init(smu, SMU_DRIVER_TABLE_GPU_METRICS,
+                                   sizeof(struct smu_v13_0_6_gpu_metrics),
+                                   SMU_GPU_METRICS_CACHE_INTERVAL);
        if (ret)
                return ret;
 
-       gpu_metrics = (struct smu_v13_0_6_gpu_metrics
-                              *)(tables[SMU_TABLE_SMU_METRICS].cache.buffer);
+       gpu_metrics = (struct smu_v13_0_6_gpu_metrics *)smu_driver_table_ptr(
+               smu, SMU_DRIVER_TABLE_GPU_METRICS);
 
        smu_v13_0_6_gpu_metrics_init(gpu_metrics, 1, 9);
        if (amdgpu_ip_version(smu->adev, MP1_HWIP, 0) ==
            IP_VERSION(13, 0, 12)) {
                ret = smu_v13_0_12_tables_init(smu);
                if (ret) {
-                       smu_table_cache_fini(smu, SMU_TABLE_SMU_METRICS);
+                       smu_driver_table_fini(smu,
+                                             SMU_DRIVER_TABLE_GPU_METRICS);
                        return ret;
                }
        }
@@ -737,7 +739,6 @@ static int smu_v13_0_6_fini_smc_tables(struct smu_context *smu)
 {
        if (amdgpu_ip_version(smu->adev, MP1_HWIP, 0) == IP_VERSION(13, 0, 12))
                smu_v13_0_12_tables_fini(smu);
-       smu_table_cache_fini(smu, SMU_TABLE_SMU_METRICS);
        return smu_v13_0_fini_smc_tables(smu);
 }
 
@@ -2673,8 +2674,6 @@ static ssize_t smu_v13_0_6_get_xcp_metrics(struct smu_context *smu, int xcp_id,
 
 static ssize_t smu_v13_0_6_get_gpu_metrics(struct smu_context *smu, void **table)
 {
-       struct smu_table_context *smu_table = &smu->smu_table;
-       struct smu_table *tables = smu_table->tables;
        struct smu_v13_0_6_gpu_metrics *gpu_metrics;
        int version = smu_v13_0_6_get_metrics_version(smu);
        MetricsTableV0_t *metrics_v0 __free(kfree) = NULL;
@@ -2692,8 +2691,8 @@ static ssize_t smu_v13_0_6_get_gpu_metrics(struct smu_context *smu, void **table
                return ret;
 
        metrics_v2 = (MetricsTableV2_t *)metrics_v0;
-       gpu_metrics = (struct smu_v13_0_6_gpu_metrics
-                              *)(tables[SMU_TABLE_SMU_METRICS].cache.buffer);
+       gpu_metrics = (struct smu_v13_0_6_gpu_metrics *)smu_driver_table_ptr(
+               smu, SMU_DRIVER_TABLE_GPU_METRICS);
 
        if (amdgpu_ip_version(smu->adev, MP1_HWIP, 0) == IP_VERSION(13, 0, 12) &&
            smu_v13_0_6_cap_supported(smu, SMU_CAP(STATIC_METRICS))) {
@@ -2878,7 +2877,9 @@ static ssize_t smu_v13_0_6_get_gpu_metrics(struct smu_context *smu, void **table
        gpu_metrics->firmware_timestamp = GET_METRIC_FIELD(Timestamp, version);
 
 fill:
-       *table = tables[SMU_TABLE_SMU_METRICS].cache.buffer;
+       *table = gpu_metrics;
+
+       smu_driver_table_update_cache_time(smu, SMU_DRIVER_TABLE_GPU_METRICS);
 
        return sizeof(*gpu_metrics);
 }

diff --git a/drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_7_ppt.c b/drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_7_ppt.c
index b60c7ff75a64b8156d06b76eef88313a48374edb..26f4e0383ace44bb0c25fc82f1a425f036c00758 100644 (file)
--- a/drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_7_ppt.c
+++ b/drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_7_ppt.c
@@ -497,6 +497,7 @@ static int smu_v13_0_7_tables_init(struct smu_context *smu)
 {
        struct smu_table_context *smu_table = &smu->smu_table;
        struct smu_table *tables = smu_table->tables;
+       int ret;
 
        SMU_TABLE_INIT(tables, SMU_TABLE_PPTABLE, sizeof(PPTable_t),
                PAGE_SIZE, AMDGPU_GEM_DOMAIN_VRAM);
@@ -525,9 +526,10 @@ static int smu_v13_0_7_tables_init(struct smu_context *smu)
                goto err0_out;
        smu_table->metrics_time = 0;
 
-       smu_table->gpu_metrics_table_size = sizeof(struct gpu_metrics_v1_3);
-       smu_table->gpu_metrics_table = kzalloc(smu_table->gpu_metrics_table_size, GFP_KERNEL);
-       if (!smu_table->gpu_metrics_table)
+       ret = smu_driver_table_init(smu, SMU_DRIVER_TABLE_GPU_METRICS,
+                                    sizeof(struct gpu_metrics_v1_3),
+                                    SMU_GPU_METRICS_CACHE_INTERVAL);
+       if (ret)
                goto err1_out;
 
        smu_table->watermarks_table = kzalloc(sizeof(Watermarks_t), GFP_KERNEL);
@@ -537,7 +539,7 @@ static int smu_v13_0_7_tables_init(struct smu_context *smu)
        return 0;
 
 err2_out:
-       kfree(smu_table->gpu_metrics_table);
+       smu_driver_table_fini(smu, SMU_DRIVER_TABLE_GPU_METRICS);
 err1_out:
        kfree(smu_table->metrics_table);
 err0_out:
@@ -2025,9 +2027,9 @@ static int smu_v13_0_7_get_thermal_temperature_range(struct smu_context *smu,
 static ssize_t smu_v13_0_7_get_gpu_metrics(struct smu_context *smu,
                                           void **table)
 {
-       struct smu_table_context *smu_table = &smu->smu_table;
        struct gpu_metrics_v1_3 *gpu_metrics =
-               (struct gpu_metrics_v1_3 *)smu_table->gpu_metrics_table;
+               (struct gpu_metrics_v1_3 *)smu_driver_table_ptr(
+                       smu, SMU_DRIVER_TABLE_GPU_METRICS);
        SmuMetricsExternal_t metrics_ext;
        SmuMetrics_t *metrics = &metrics_ext.SmuMetrics;
        int ret = 0;
@@ -2101,6 +2103,8 @@ static ssize_t smu_v13_0_7_get_gpu_metrics(struct smu_context *smu,
 
        *table = (void *)gpu_metrics;
 
+       smu_driver_table_update_cache_time(smu, SMU_DRIVER_TABLE_GPU_METRICS);
+
        return sizeof(struct gpu_metrics_v1_3);
 }
 

diff --git a/drivers/gpu/drm/amd/pm/swsmu/smu13/yellow_carp_ppt.c b/drivers/gpu/drm/amd/pm/swsmu/smu13/yellow_carp_ppt.c
index e261edbf7852863d41be72a2c44d2d7e34aaf57a..358fe97ceea31b2e88d2d64445ad93c2e48884d3 100644 (file)
--- a/drivers/gpu/drm/amd/pm/swsmu/smu13/yellow_carp_ppt.c
+++ b/drivers/gpu/drm/amd/pm/swsmu/smu13/yellow_carp_ppt.c
@@ -152,6 +152,7 @@ static int yellow_carp_init_smc_tables(struct smu_context *smu)
 {
        struct smu_table_context *smu_table = &smu->smu_table;
        struct smu_table *tables = smu_table->tables;
+       int ret;
 
        SMU_TABLE_INIT(tables, SMU_TABLE_WATERMARKS, sizeof(Watermarks_t),
                PAGE_SIZE, AMDGPU_GEM_DOMAIN_VRAM);
@@ -173,9 +174,10 @@ static int yellow_carp_init_smc_tables(struct smu_context *smu)
        if (!smu_table->watermarks_table)
                goto err2_out;
 
-       smu_table->gpu_metrics_table_size = sizeof(struct gpu_metrics_v2_1);
-       smu_table->gpu_metrics_table = kzalloc(smu_table->gpu_metrics_table_size, GFP_KERNEL);
-       if (!smu_table->gpu_metrics_table)
+       ret = smu_driver_table_init(smu, SMU_DRIVER_TABLE_GPU_METRICS,
+                                    sizeof(struct gpu_metrics_v2_1),
+                                    SMU_GPU_METRICS_CACHE_INTERVAL);
+       if (ret)
                goto err3_out;
 
        return 0;
@@ -203,8 +205,7 @@ static int yellow_carp_fini_smc_tables(struct smu_context *smu)
        kfree(smu_table->watermarks_table);
        smu_table->watermarks_table = NULL;
 
-       kfree(smu_table->gpu_metrics_table);
-       smu_table->gpu_metrics_table = NULL;
+       smu_driver_table_fini(smu, SMU_DRIVER_TABLE_GPU_METRICS);
 
        return 0;
 }
@@ -557,11 +558,11 @@ static int yellow_carp_set_watermarks_table(struct smu_context *smu,
 }
 
 static ssize_t yellow_carp_get_gpu_metrics(struct smu_context *smu,
-                                               void **table)
+                                           void **table)
 {
-       struct smu_table_context *smu_table = &smu->smu_table;
        struct gpu_metrics_v2_1 *gpu_metrics =
-               (struct gpu_metrics_v2_1 *)smu_table->gpu_metrics_table;
+               (struct gpu_metrics_v2_1 *)smu_driver_table_ptr(
+                       smu, SMU_DRIVER_TABLE_GPU_METRICS);
        SmuMetrics_t metrics;
        int ret = 0;
 
@@ -606,6 +607,8 @@ static ssize_t yellow_carp_get_gpu_metrics(struct smu_context *smu,
 
        *table = (void *)gpu_metrics;
 
+       smu_driver_table_update_cache_time(smu, SMU_DRIVER_TABLE_GPU_METRICS);
+
        return sizeof(struct gpu_metrics_v2_1);
 }