Skip to contentSkip to conversation

amdgpu/pp: move amdgpu_fuses_default into static const.

PATCH In review Dave Airlie 2 participants 2 messages Sep 27, 2017 – Sep 28, 2017 1 message not in the archive

Subsystems (2)
DRM drivers Radeon and amdgpu DRM drivers
lore
Share & tools
lore

Dave Airlie

author
#0 lore raw

PATCH 1/1 amdgpu/pp: move amdgpu_fuses_default into static const.

From: Dave Airlie <[email protected]>

There is no reason that this gets passed back into the function from outside the file, just reference the table directly.

Signed-off-by Dave Airlie <[email protected]>
---
 drivers/gpu/drm/amd/powerplay/hwmgr/pp_overdriver.c | 4 ++--
 drivers/gpu/drm/amd/powerplay/hwmgr/pp_overdriver.h | 2 --
 drivers/gpu/drm/amd/powerplay/hwmgr/vega10_hwmgr.c  | 2 +-
 3 files changed, 3 insertions(+), 5 deletions(-)
drivers/gpu/drm/amd/powerplay/hwmgr/pp_overdriver.c +2 -2
index 34fdf1a..2b08371 100644
@@ -1,7 +1,7 @@
 #include "pp_overdriver.h"
 #include <linux/errno.h>
 
-const struct phm_fuses_default vega10_fuses_default[] = {
+static const struct phm_fuses_default vega10_fuses_default[] = {
 	{"0000001000010011111010101001010011011110000011100100100101100100",0x00003C96,0xFFFFE226,0x00000656,0x00002203,0xFFFFF201,0x000003FF,0x00002203,0xFFFFF201,0x000003FF},
 	{"0000001000010011111010101001010011011110000010100001100010000100",0x00003CC5,0xFFFFE23A,0x0000064E,0x00002258,0xFFFFF1F7,0x000003FC,0x00002258,0xFFFFF1F7,0x000003FC},
 	{"0000001000010011111010101001010011011110000011100011000110100100",0x00003CAF,0xFFFFE36E,0x00000602,0x00001E98,0xFFFFF569,0x00000357,0x00001E98,0xFFFFF569,0x00000357},

@@ -1240,9 +1240,9 @@ const struct phm_fuses_default vega10_fuses_default[] = {
 };
 
 int pp_override_get_default_fuse_value(uint64_t key,
-			const struct phm_fuses_default list[],
 			struct phm_fuses_default *result)
 {
+	const struct phm_fuses_default *list = vega10_fuses_default;
 	uint32_t i;
 	uint64_t temp_serial_numer;
 	uint32_t bit;
drivers/gpu/drm/amd/powerplay/hwmgr/pp_overdriver.h +0 -2
index 133745f..22e2dd0 100644
@@ -40,9 +40,7 @@ struct phm_fuses_default {
 	uint32_t VFT0_b;
 };
 
-extern const struct phm_fuses_default vega10_fuses_default[];
 extern int pp_override_get_default_fuse_value(uint64_t key,
-			const struct phm_fuses_default list[],
 			struct phm_fuses_default *result);
 
 #endif
\ No newline at end of file
drivers/gpu/drm/amd/powerplay/hwmgr/vega10_hwmgr.c +1 -1
index 71b9424..6a85954 100644
@@ -2393,7 +2393,7 @@ static int vega10_populate_and_upload_avfs_fuse_override(struct pp_hwmgr *hwmgr)
 
 	serial_number = ((uint64_t)bottom32 << 32) | top32;
 
-	if (pp_override_get_default_fuse_value(serial_number, vega10_fuses_default, &fuse) == 0) {
+	if (pp_override_get_default_fuse_value(serial_number, &fuse) == 0) {
 		avfs_fuse_table->VFT0_b  = fuse.VFT0_b;
 		avfs_fuse_table->VFT0_m1 = fuse.VFT0_m1;
 		avfs_fuse_table->VFT0_m2 = fuse.VFT0_m2;
Signature · 6 lines
2.9.4

_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

A message that is not in the archive (sent off-list or not yet received): 20170927233738.21108-1-airlied-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org

Reviewed-by
#2 lore raw
Quoted 6 lines · Dave Airlie

From: Dave Airlie <[email protected]>

There is no reason that this gets passed back into the function from outside the file, just reference the table directly.

Signed-off-by Dave Airlie <[email protected]>
Reviewed-by Alex Deucher <[email protected]>
Quoted 61 lines
---
 drivers/gpu/drm/amd/powerplay/hwmgr/pp_overdriver.c | 4 ++--
 drivers/gpu/drm/amd/powerplay/hwmgr/pp_overdriver.h | 2 --
 drivers/gpu/drm/amd/powerplay/hwmgr/vega10_hwmgr.c  | 2 +-
 3 files changed, 3 insertions(+), 5 deletions(-)
drivers/gpu/drm/amd/powerplay/hwmgr/pp_overdriver.c +2 -2
index 34fdf1a..2b08371 100644
@@ -1,7 +1,7 @@
 #include "pp_overdriver.h"
 #include <linux/errno.h>
 
-const struct phm_fuses_default vega10_fuses_default[] = {
+static const struct phm_fuses_default vega10_fuses_default[] = {
        {"0000001000010011111010101001010011011110000011100100100101100100",0x00003C96,0xFFFFE226,0x00000656,0x00002203,0xFFFFF201,0x000003FF,0x00002203,0xFFFFF201,0x000003FF},
        {"0000001000010011111010101001010011011110000010100001100010000100",0x00003CC5,0xFFFFE23A,0x0000064E,0x00002258,0xFFFFF1F7,0x000003FC,0x00002258,0xFFFFF1F7,0x000003FC},
        {"0000001000010011111010101001010011011110000011100011000110100100",0x00003CAF,0xFFFFE36E,0x00000602,0x00001E98,0xFFFFF569,0x00000357,0x00001E98,0xFFFFF569,0x00000357},

@@ -1240,9 +1240,9 @@ const struct phm_fuses_default vega10_fuses_default[] = {
 };
 
 int pp_override_get_default_fuse_value(uint64_t key,
-                       const struct phm_fuses_default list[],
                        struct phm_fuses_default *result)
 {
+       const struct phm_fuses_default *list = vega10_fuses_default;
        uint32_t i;
        uint64_t temp_serial_numer;
        uint32_t bit;
drivers/gpu/drm/amd/powerplay/hwmgr/pp_overdriver.h +0 -2
index 133745f..22e2dd0 100644
@@ -40,9 +40,7 @@ struct phm_fuses_default {
        uint32_t VFT0_b;
 };
 
-extern const struct phm_fuses_default vega10_fuses_default[];
 extern int pp_override_get_default_fuse_value(uint64_t key,
-                       const struct phm_fuses_default list[],
                        struct phm_fuses_default *result);
 
 #endif
\ No newline at end of file
drivers/gpu/drm/amd/powerplay/hwmgr/vega10_hwmgr.c +1 -2
index 71b9424..6a85954 100644
@@ -2393,7 +2393,7 @@ static int vega10_populate_and_upload_avfs_fuse_override(struct pp_hwmgr *hwmgr)
 
        serial_number = ((uint64_t)bottom32 << 32) | top32;
 
-       if (pp_override_get_default_fuse_value(serial_number, vega10_fuses_default, &fuse) == 0) {
+       if (pp_override_get_default_fuse_value(serial_number, &fuse) == 0) {
                avfs_fuse_table->VFT0_b  = fuse.VFT0_b;
                avfs_fuse_table->VFT0_m1 = fuse.VFT0_m1;
                avfs_fuse_table->VFT0_m2 = fuse.VFT0_m2;
--

2.9.4

Quoted 4 lines

_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx