From: Rex Zhu
Signed-off-by: Rex Zhu
Reviewed-by: Alex Deucher
---
drivers/gpu/drm/amd/powerplay/hwmgr/Makefile |3 +-
.../amd/powerplay/hwmgr/ellesmere_dyn_defaults.h | 62 +
.../gpu/drm/amd/powerplay/hwmgr/ellesmere_hwmgr.c | 4560
.../gpu/drm/amd/powerplay/hwmgr/ellesmere_hwmgr.h | 349 ++
.../drm/amd/powerplay/hwmgr/ellesmere_powertune.c | 396 ++
.../drm/amd/powerplay/hwmgr/ellesmere_powertune.h | 70 +
drivers/gpu/drm/amd/powerplay/hwmgr/ppatomctrl.c | 111 +-
drivers/gpu/drm/amd/powerplay/hwmgr/ppatomctrl.h | 40 +-
8 files changed, 5581 insertions(+), 10 deletions(-)
create mode 100644 drivers/gpu/drm/amd/powerplay/hwmgr/ellesmere_dyn_defaults.h
create mode 100644 drivers/gpu/drm/amd/powerplay/hwmgr/ellesmere_hwmgr.c
create mode 100644 drivers/gpu/drm/amd/powerplay/hwmgr/ellesmere_hwmgr.h
create mode 100644 drivers/gpu/drm/amd/powerplay/hwmgr/ellesmere_powertune.c
create mode 100644 drivers/gpu/drm/amd/powerplay/hwmgr/ellesmere_powertune.h
diff --git a/drivers/gpu/drm/amd/powerplay/hwmgr/Makefile
b/drivers/gpu/drm/amd/powerplay/hwmgr/Makefile
index b664e34..2982d5c 100644
--- a/drivers/gpu/drm/amd/powerplay/hwmgr/Makefile
+++ b/drivers/gpu/drm/amd/powerplay/hwmgr/Makefile
@@ -8,7 +8,8 @@ HARDWARE_MGR = hwmgr.o processpptables.o functiontables.o \
tonga_processpptables.o ppatomctrl.o \
tonga_hwmgr.o pppcielanes.o tonga_thermal.o\
fiji_powertune.o fiji_hwmgr.o tonga_clockpowergating.o \
- fiji_clockpowergating.o fiji_thermal.o
+ fiji_clockpowergating.o fiji_thermal.o \
+ ellesmere_hwmgr.o ellesmere_powertune.o
AMD_PP_HWMGR = $(addprefix $(AMD_PP_PATH)/hwmgr/,$(HARDWARE_MGR))
diff --git a/drivers/gpu/drm/amd/powerplay/hwmgr/ellesmere_dyn_defaults.h
b/drivers/gpu/drm/amd/powerplay/hwmgr/ellesmere_dyn_defaults.h
new file mode 100644
index 000..ba1187c
--- /dev/null
+++ b/drivers/gpu/drm/amd/powerplay/hwmgr/ellesmere_dyn_defaults.h
@@ -0,0 +1,62 @@
+/*
+ * 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 ELLESMERE_DYN_DEFAULTS_H
+#define ELLESMERE_DYN_DEFAULTS_H
+
+
+enum Ellesmeredpm_TrendDetection {
+ EllesmereAdpm_TrendDetection_AUTO,
+ EllesmereAdpm_TrendDetection_UP,
+ EllesmereAdpm_TrendDetection_DOWN
+};
+typedef enum Ellesmeredpm_TrendDetection Ellesmeredpm_TrendDetection;
+
+/* We need to fill in the default values */
+
+
+#define PPELLESMERE_VOTINGRIGHTSCLIENTS_DFLT0 0x3FFFC102
+#define PPELLESMERE_VOTINGRIGHTSCLIENTS_DFLT1 0x000400
+#define PPELLESMERE_VOTINGRIGHTSCLIENTS_DFLT2 0xC00080
+#define PPELLESMERE_VOTINGRIGHTSCLIENTS_DFLT3 0xC00200
+#define PPELLESMERE_VOTINGRIGHTSCLIENTS_DFLT4 0xC01680
+#define PPELLESMERE_VOTINGRIGHTSCLIENTS_DFLT5 0xC00033
+#define PPELLESMERE_VOTINGRIGHTSCLIENTS_DFLT6 0xC00033
+#define PPELLESMERE_VOTINGRIGHTSCLIENTS_DFLT7 0x3FFFC000
+
+
+#define PPELLESMERE_THERMALPROTECTCOUNTER_DFLT0x200
+#define PPELLESMERE_STATICSCREENTHRESHOLDUNIT_DFLT0
+#define PPELLESMERE_STATICSCREENTHRESHOLD_DFLT0x00C8
+#define PPELLESMERE_GFXIDLECLOCKSTOPTHRESHOLD_DFLT0x200
+#define PPELLESMERE_REFERENCEDIVIDER_DFLT 4
+
+#define PPELLESMERE_ULVVOLTAGECHANGEDELAY_DFLT 1687
+
+#define PPELLESMERE_CGULVPARAMETER_DFLT0x00040035
+#define PPELLESMERE_CGULVCONTROL_DFLT 0x7450
+#define PPELLESMERE_TARGETACTIVITY_DFLT 50
+#define PPELLESMERE_MCLK_TARGETACTIVITY_DFLT10
+
+#endif
+
diff --git a/drivers/gpu/drm/amd/powerplay/hwmgr/ellesmere_hwmgr.c
b/drivers/gpu/drm/amd/powerplay/hwmgr/ellesmere_hwmgr.c
new file mode 100644
index 000..10e8e87
--- /dev/null
+++ b/drivers/gpu/drm/a
