Skip to contentSkip to conversation

drm/amd/pp: rename ci_smc.c to ci_smumgr.c

PATCH In review Rex Zhu 2 participants 6 messages Oct 9, 2017 2 messages not in the archive

Subsystems (2)
lore
Share & tools
lore

Rex Zhu

author
#0 lore raw

PATCH 1/5 drm/amd/pp: rename ci_smc.c to ci_smumgr.c

Change-Id Id86d3e48ba75b1aaeac644899501d16ca0b294af
---
 drivers/gpu/drm/amd/powerplay/smumgr/Makefile    |    2 +-
 drivers/gpu/drm/amd/powerplay/smumgr/ci_smc.c    | 2818 ----------------------
 drivers/gpu/drm/amd/powerplay/smumgr/ci_smumgr.c | 2818 ++++++++++++++++++++++
 3 files changed, 2819 insertions(+), 2819 deletions(-)
 delete mode 100644 drivers/gpu/drm/amd/powerplay/smumgr/ci_smc.c
 create mode 100644 drivers/gpu/drm/amd/powerplay/smumgr/ci_smumgr.c
drivers/gpu/drm/amd/powerplay/smumgr/Makefile +1 -1
index 4e29888..d7be783 100644
@@ -4,7 +4,7 @@
 
 SMU_MGR = smumgr.o cz_smumgr.o tonga_smumgr.o fiji_smumgr.o fiji_smc.o \
 	  polaris10_smumgr.o iceland_smumgr.o polaris10_smc.o tonga_smc.o \
-	  smu7_smumgr.o iceland_smc.o vega10_smumgr.o rv_smumgr.o ci_smc.o
+	  smu7_smumgr.o iceland_smc.o vega10_smumgr.o rv_smumgr.o ci_smumgr.o
 
 AMD_PP_SMUMGR = $(addprefix $(AMD_PP_PATH)/smumgr/,$(SMU_MGR))
 
drivers/gpu/drm/amd/powerplay/smumgr/ci_smc.c deleted +0 -2818

2,818 lines not on this page · raw message

drivers/gpu/drm/amd/powerplay/smumgr/ci_smumgr.c new file +2818 -0

174 lines not on this page · raw message

The rest of this diff is not shown. View the raw message.

Signature · 6 lines
1.9.1

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

Part of the diff is not shown here. View the raw message.

A message that is not in the archive (sent off-list or not yet received): 1507538622-5362-1-git-send-email-Rex.Zhu-5C7GfCeVMHo@public.gmane.org

author
#2 lore raw

PATCH 2/5 drm/amd/pp: remove fiji_smc/smumgr split.

make all functions in fiji_smumgr.c static and
exported by pp_smumgr_func table.

Change-Id Ice21eeda6e3363afe3e5dfbdd4eec69664ba4d5c
---
 drivers/gpu/drm/amd/powerplay/smumgr/Makefile      |    2 +-
 drivers/gpu/drm/amd/powerplay/smumgr/fiji_smc.c    | 2496 --------------------
 drivers/gpu/drm/amd/powerplay/smumgr/fiji_smc.h    |   53 -
 drivers/gpu/drm/amd/powerplay/smumgr/fiji_smumgr.c | 2379 ++++++++++++++++++-
 drivers/gpu/drm/amd/powerplay/smumgr/fiji_smumgr.h |    9 +
 5 files changed, 2381 insertions(+), 2558 deletions(-)
 delete mode 100644 drivers/gpu/drm/amd/powerplay/smumgr/fiji_smc.c
 delete mode 100644 drivers/gpu/drm/amd/powerplay/smumgr/fiji_smc.h
drivers/gpu/drm/amd/powerplay/smumgr/Makefile +1 -1
index d7be783..ec8229e 100644
@@ -2,7 +2,7 @@
 # Makefile for the 'smu manager' sub-component of powerplay.
 # It provides the smu management services for the driver.
 
-SMU_MGR = smumgr.o cz_smumgr.o tonga_smumgr.o fiji_smumgr.o fiji_smc.o \
+SMU_MGR = smumgr.o cz_smumgr.o tonga_smumgr.o fiji_smumgr.o \
 	  polaris10_smumgr.o iceland_smumgr.o polaris10_smc.o tonga_smc.o \
 	  smu7_smumgr.o iceland_smc.o vega10_smumgr.o rv_smumgr.o ci_smumgr.o
 
drivers/gpu/drm/amd/powerplay/smumgr/fiji_smc.c deleted +0 -2496

2,496 lines not on this page · raw message

drivers/gpu/drm/amd/powerplay/smumgr/fiji_smc.h deleted +0 -53

53 lines not on this page · raw message

drivers/gpu/drm/amd/powerplay/smumgr/fiji_smumgr.c +2371 -8

443 lines not on this page · raw message

drivers/gpu/drm/amd/powerplay/smumgr/fiji_smumgr.h +9 -0
index 175bf9f..2796477 100644

Lines of this file are not shown. View the raw message.

The rest of this diff is not shown. View the raw message.

Signature · 6 lines
1.9.1

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

Part of the diff is not shown here. View the raw message.

author
#3 lore raw

PATCH 3/5 drm/amd/pp: remove iceland_smc/smumgr split.

In reply to a message not in the archive

move functions in iceland_smc.c to iceland_smumgr.c and make all functions in iceland_smumgr.c static.

Change-Id: Iab75e1e937a5b0438a838a4c9549d4601b5e4008

---
 drivers/gpu/drm/amd/powerplay/smumgr/Makefile      |    2 +-
 drivers/gpu/drm/amd/powerplay/smumgr/iceland_smc.c | 2578 --------------------
 drivers/gpu/drm/amd/powerplay/smumgr/iceland_smc.h |   40 -
 .../gpu/drm/amd/powerplay/smumgr/iceland_smumgr.c  | 2489 ++++++++++++++++++-
 4 files changed, 2480 insertions(+), 2629 deletions(-)
 delete mode 100644 drivers/gpu/drm/amd/powerplay/smumgr/iceland_smc.c
 delete mode 100644 drivers/gpu/drm/amd/powerplay/smumgr/iceland_smc.h
drivers/gpu/drm/amd/powerplay/smumgr/Makefile +1 -1
index ec8229e..33ab0bc 100644
@@ -4,7 +4,7 @@
 
 SMU_MGR = smumgr.o cz_smumgr.o tonga_smumgr.o fiji_smumgr.o \
 	  polaris10_smumgr.o iceland_smumgr.o polaris10_smc.o tonga_smc.o \
-	  smu7_smumgr.o iceland_smc.o vega10_smumgr.o rv_smumgr.o ci_smumgr.o
+	  smu7_smumgr.o vega10_smumgr.o rv_smumgr.o ci_smumgr.o
 
 AMD_PP_SMUMGR = $(addprefix $(AMD_PP_PATH)/smumgr/,$(SMU_MGR))
 
drivers/gpu/drm/amd/powerplay/smumgr/iceland_smc.c deleted +0 -2578

2,578 lines not on this page · raw message

drivers/gpu/drm/amd/powerplay/smumgr/iceland_smc.h deleted +0 -40
deleted file mode 100644
index 13c8dbb..0000000
@@ -1,40 +0,0 @@
-/*
- * Copyright 2015 Advanced Micro Devices, Inc.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
- * THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR
- * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
- * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
- * OTHER DEALINGS IN THE SOFTWARE.
- *
- */
-#ifndef _ICELAND_SMC_H
-#define _ICELAND_SMC_H
-
-#include "smumgr.h"
-
-
-int iceland_populate_all_graphic_levels(struct pp_hwmgr *hwmgr);
-int iceland_populate_all_memory_levels(struct pp_hwmgr *hwmgr);
-int iceland_init_smc_table(struct pp_hwmgr *hwmgr);
-int iceland_thermal_setup_fan_table(struct pp_hwmgr *hwmgr);
-int iceland_update_sclk_threshold(struct pp_hwmgr *hwmgr);
-uint32_t iceland_get_offsetof(uint32_t type, uint32_t member);
-uint32_t iceland_get_mac_definition(uint32_t value);
-int iceland_process_firmware_header(struct pp_hwmgr *hwmgr);
-int iceland_initialize_mc_reg_table(struct pp_hwmgr *hwmgr);
-bool iceland_is_dpm_running(struct pp_hwmgr *hwmgr);
-#endif
-
drivers/gpu/drm/amd/powerplay/smumgr/iceland_smumgr.c +2479 -10

374 lines not on this page · raw message

The rest of this diff is not shown. View the raw message.

Signature · 6 lines
1.9.1

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

Part of the diff is not shown here. View the raw message.

author
#4 lore raw

PATCH 4/5 drm/amd/pp: remove tonga_smc/smumgr split.

In reply to a message not in the archive

move functions in tonga_smc.c to tonga_smumgr.c
and make all functions in tonga_smumgr.c static.

Change-Id: If5b8fbdd0f5beca3cacd7a433ecf3de60ac9a966

---
 drivers/gpu/drm/amd/powerplay/smumgr/Makefile      |    2 +-
 drivers/gpu/drm/amd/powerplay/smumgr/tonga_smc.c   | 3271 --------------------
 drivers/gpu/drm/amd/powerplay/smumgr/tonga_smc.h   |   62 -
 .../gpu/drm/amd/powerplay/smumgr/tonga_smumgr.c    | 3117 ++++++++++++++++++-
 .../gpu/drm/amd/powerplay/smumgr/tonga_smumgr.h    |   20 +-
 5 files changed, 3128 insertions(+), 3344 deletions(-)
 delete mode 100644 drivers/gpu/drm/amd/powerplay/smumgr/tonga_smc.c
 delete mode 100644 drivers/gpu/drm/amd/powerplay/smumgr/tonga_smc.h
drivers/gpu/drm/amd/powerplay/smumgr/Makefile +1 -1
index 33ab0bc..e3c783a 100644
@@ -3,7 +3,7 @@
 # It provides the smu management services for the driver.
 
 SMU_MGR = smumgr.o cz_smumgr.o tonga_smumgr.o fiji_smumgr.o \
-	  polaris10_smumgr.o iceland_smumgr.o polaris10_smc.o tonga_smc.o \
+	  polaris10_smumgr.o iceland_smumgr.o polaris10_smc.o \
 	  smu7_smumgr.o vega10_smumgr.o rv_smumgr.o ci_smumgr.o
 
 AMD_PP_SMUMGR = $(addprefix $(AMD_PP_PATH)/smumgr/,$(SMU_MGR))
drivers/gpu/drm/amd/powerplay/smumgr/tonga_smc.c deleted +0 -3271

2,992 lines not on this page · raw message

drivers/gpu/drm/amd/powerplay/smumgr/tonga_smc.h deleted +0 -62

62 lines not on this page · raw message

drivers/gpu/drm/amd/powerplay/smumgr/tonga_smumgr.c +3108 -9

3,117 lines not on this page · raw message

drivers/gpu/drm/amd/powerplay/smumgr/tonga_smumgr.h +19 -1
index 8c4f761..5d70a00 100644

Lines of this file are not shown. View the raw message.

The rest of this diff is not shown. View the raw message.

Signature · 6 lines
1.9.1

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

Part of the diff is not shown here. View the raw message.

author
#5 lore raw

PATCH 5/5 drm/amd/pp: remove polaris10_smc/smumgr split.

In reply to a message not in the archive

move functions in polaris_smc.c to
polaris10_smumgr.c and make all functions in
polaris10_smumgr.c static.

Change-Id: Ia990fc29148fd7c4d9b18a5ef9c2ff5410cc9004

---
 drivers/gpu/drm/amd/powerplay/smumgr/Makefile      |    2 +-
 .../gpu/drm/amd/powerplay/smumgr/polaris10_smc.c   | 2354 --------------------
 .../gpu/drm/amd/powerplay/smumgr/polaris10_smc.h   |   44 -
 .../drm/amd/powerplay/smumgr/polaris10_smumgr.c    | 2226 +++++++++++++++++-
 4 files changed, 2226 insertions(+), 2400 deletions(-)
 delete mode 100644 drivers/gpu/drm/amd/powerplay/smumgr/polaris10_smc.c
 delete mode 100644 drivers/gpu/drm/amd/powerplay/smumgr/polaris10_smc.h
drivers/gpu/drm/amd/powerplay/smumgr/Makefile +1 -1
index e3c783a..b24b0f2 100644
@@ -3,7 +3,7 @@
 # It provides the smu management services for the driver.
 
 SMU_MGR = smumgr.o cz_smumgr.o tonga_smumgr.o fiji_smumgr.o \
-	  polaris10_smumgr.o iceland_smumgr.o polaris10_smc.o \
+	  polaris10_smumgr.o iceland_smumgr.o \
 	  smu7_smumgr.o vega10_smumgr.o rv_smumgr.o ci_smumgr.o
 
 AMD_PP_SMUMGR = $(addprefix $(AMD_PP_PATH)/smumgr/,$(SMU_MGR))
drivers/gpu/drm/amd/powerplay/smumgr/polaris10_smc.c deleted +0 -2354

2,354 lines not on this page · raw message

drivers/gpu/drm/amd/powerplay/smumgr/polaris10_smc.h deleted +0 -44

44 lines not on this page · raw message

drivers/gpu/drm/amd/powerplay/smumgr/polaris10_smumgr.c +2225 -1

594 lines not on this page · raw message

The rest of this diff is not shown. View the raw message.

Signature · 6 lines
1.9.1

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

Part of the diff is not shown here. View the raw message.

A message that is not in the archive (sent off-list or not yet received): 1507538622-5362-5-git-send-email-Rex.Zhu-5C7GfCeVMHo@public.gmane.org

Reviewed-by
#7 lore raw

Re: [PATCH 5/5] drm/amd/pp: remove polaris10_smc/smumgr split.

Quoted 7 lines · Rex Zhu

move functions in polaris_smc.c to
polaris10_smumgr.c and make all functions in
polaris10_smumgr.c static.

Change-Id: Ia990fc29148fd7c4d9b18a5ef9c2ff5410cc9004

Quoted 8 lines
---
 drivers/gpu/drm/amd/powerplay/smumgr/Makefile      |    2 +-
 .../gpu/drm/amd/powerplay/smumgr/polaris10_smc.c   | 2354 --------------------
 .../gpu/drm/amd/powerplay/smumgr/polaris10_smc.h   |   44 -
 .../drm/amd/powerplay/smumgr/polaris10_smumgr.c    | 2226 +++++++++++++++++-
 4 files changed, 2226 insertions(+), 2400 deletions(-)
 delete mode 100644 drivers/gpu/drm/amd/powerplay/smumgr/polaris10_smc.c
 delete mode 100644 drivers/gpu/drm/amd/powerplay/smumgr/polaris10_smc.h

Series is:

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