Skip to contentSkip to conversation

Enable BACO function on VG20

PATCH New Jim Qu 1 participant 6 messages Jan 11, 2019 1 message not in the archive

Subsystems (2)
lore
Share & tools
lore

Jim Qu

author
#0 lore raw

cover Enable BACO function on VG20

Jim Qu (5):
drm/amdgpu: update NBIO v7.4 to support BACO drm/amdgpu: also include NBIO v7.4 register mask header drm/amdgpu: update THM IP register header to support BACO drm/amdgpu/powerper: add vega20 BACO functins drm/amdgpu: use BACO reset on vega20 if platform support

 drivers/gpu/drm/amd/amdgpu/soc15.c            |  1 +
 .../include/asic_reg/nbio/nbio_7_4_offset.h   |  2 +
 .../include/asic_reg/nbio/nbio_7_4_sh_mask.h  |  3 +
 .../include/asic_reg/thm/thm_11_0_2_offset.h  |  3 +
 drivers/gpu/drm/amd/powerplay/hwmgr/Makefile  |  2 +-
 .../gpu/drm/amd/powerplay/hwmgr/vega20_baco.c | 81 +++++++++++++++++++
 .../gpu/drm/amd/powerplay/hwmgr/vega20_baco.h | 34 ++++++++
 .../drm/amd/powerplay/hwmgr/vega20_hwmgr.c    |  5 ++
 .../gpu/drm/amd/powerplay/hwmgr/vega20_inc.h  |  1 +
 9 files changed, 131 insertions(+), 1 deletion(-)
 create mode 100644 drivers/gpu/drm/amd/powerplay/hwmgr/vega20_baco.c
 create mode 100644 drivers/gpu/drm/amd/powerplay/hwmgr/vega20_baco.h
Signature · 6 lines
2.17.1

_______________________________________________
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): [email protected]

author
#2 lore raw

PATCH 1/5 drm/amdgpu: update NBIO v7.4 to support BACO

Change-Id Ie2ecdb78114e4c319aba33fdc68713047417bc7b
---
 drivers/gpu/drm/amd/include/asic_reg/nbio/nbio_7_4_offset.h  | 2 ++
 drivers/gpu/drm/amd/include/asic_reg/nbio/nbio_7_4_sh_mask.h | 3 +++
 2 files changed, 5 insertions(+)
drivers/gpu/drm/amd/include/asic_reg/nbio/nbio_7_4_offset.h +2 -0
index e932213f87f0..994e796a28d7 100644
@@ -2567,6 +2567,8 @@
 
 // addressBlock: nbio_nbif0_rcc_strap_BIFDEC1
 // base address: 0x0
+#define mmRCC_BIF_STRAP0                                                                               0x0000
+#define mmRCC_BIF_STRAP0_BASE_IDX                                                                      2
 #define mmRCC_DEV0_EPF0_STRAP0                                                                         0x0011
 #define mmRCC_DEV0_EPF0_STRAP0_BASE_IDX                                                                2
 
drivers/gpu/drm/amd/include/asic_reg/nbio/nbio_7_4_sh_mask.h +3 -0
index d3704b438f2d..d467b939c971 100644
@@ -19690,6 +19690,9 @@
 
 
 // addressBlock: nbio_nbif0_rcc_strap_BIFDEC1
+//RCC_BIF_STRAP0
+#define RCC_BIF_STRAP0__STRAP_PX_CAPABLE__SHIFT                                                               0x7
+#define RCC_BIF_STRAP0__STRAP_PX_CAPABLE_MASK                                                                 0x00000080L
 //RCC_DEV0_EPF0_STRAP0
 #define RCC_DEV0_EPF0_STRAP0__STRAP_DEVICE_ID_DEV0_F0__SHIFT                                                  0x0
 #define RCC_DEV0_EPF0_STRAP0__STRAP_MAJOR_REV_ID_DEV0_F0__SHIFT                                               0x10
Signature · 6 lines
2.17.1

_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
author
#3 lore raw

PATCH 2/5 drm/amdgpu: also include NBIO v7.4 register mask header

In reply to a message not in the archive
Change-Id Ib5f3afa6c2da4733e39373ce2a950b6ec63ccdff
---
 drivers/gpu/drm/amd/powerplay/hwmgr/vega20_inc.h | 1 +
 1 file changed, 1 insertion(+)
drivers/gpu/drm/amd/powerplay/hwmgr/vega20_inc.h +1 -0
index 6738bad53602..613cb1989b3d 100644
@@ -31,5 +31,6 @@
 #include "asic_reg/mp/mp_9_0_sh_mask.h"
 
 #include "asic_reg/nbio/nbio_7_4_offset.h"
+#include "asic_reg/nbio/nbio_7_4_sh_mask.h"
 
 #endif
Signature · 6 lines
2.17.1

_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
author
#4 lore raw

PATCH 3/5 drm/amdgpu: update THM IP register header to support BACO

In reply to a message not in the archive
Change-Id I484ba66c2e6f20123e6004cb6671e6a6ee6cf27b
---
 drivers/gpu/drm/amd/include/asic_reg/thm/thm_11_0_2_offset.h | 3 +++
 1 file changed, 3 insertions(+)
drivers/gpu/drm/amd/include/asic_reg/thm/thm_11_0_2_offset.h +3 -0
index a9eb57a53e59..a485526f3a51 100644
@@ -46,4 +46,7 @@
 #define mmTHM_TCON_THERM_TRIP                                                                          0x0002
 #define mmTHM_TCON_THERM_TRIP_BASE_IDX                                                                 0
 
+#define mmTHM_BACO_CNTL                                                                                0x0081
+#define mmTHM_BACO_CNTL_BASE_IDX                                                                       0
+
 #endif
Signature · 6 lines
2.17.1

_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
author
#5 lore raw

PATCH 4/5 drm/amdgpu/powerper: add vega20 BACO functins

In reply to a message not in the archive
Change-Id I1e55db9e508f96353b1b2e6aa153e05962b9e7fe
---
 drivers/gpu/drm/amd/powerplay/hwmgr/Makefile  |  2 +-
 .../gpu/drm/amd/powerplay/hwmgr/vega20_baco.c | 81 +++++++++++++++++++
 .../gpu/drm/amd/powerplay/hwmgr/vega20_baco.h | 34 ++++++++
 .../drm/amd/powerplay/hwmgr/vega20_hwmgr.c    |  5 ++
 4 files changed, 121 insertions(+), 1 deletion(-)
 create mode 100644 drivers/gpu/drm/amd/powerplay/hwmgr/vega20_baco.c
 create mode 100644 drivers/gpu/drm/amd/powerplay/hwmgr/vega20_baco.h
drivers/gpu/drm/amd/powerplay/hwmgr/Makefile +1 -1
index e563811b2ebe..0b3c6d1d52e4 100644
@@ -35,7 +35,7 @@ HARDWARE_MGR = hwmgr.o processpptables.o \
 		vega12_thermal.o \
 		pp_overdriver.o smu_helper.o \
 		vega20_processpptables.o vega20_hwmgr.o vega20_powertune.o \
-		vega20_thermal.o common_baco.o vega10_baco.o
+		vega20_thermal.o common_baco.o vega10_baco.o  vega20_baco.o
 
 AMD_PP_HWMGR = $(addprefix $(AMD_PP_PATH)/hwmgr/,$(HARDWARE_MGR))
 
drivers/gpu/drm/amd/powerplay/hwmgr/vega20_baco.c new file +81 -0

81 lines not on this page · raw message

drivers/gpu/drm/amd/powerplay/hwmgr/vega20_baco.h new file +32 -0
new file mode 100644
index 000000000000..db50c20f3976
@@ -0,0 +1,32 @@
+/*
+ * Copyright 2018 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 __VEGA20_BOCO_H__
+#define __VEGA20_BOCO_H__
+#include "hwmgr.h"
+#include "common_baco.h"
+
+extern int vega20_baco_get_capability(struct pp_hwmgr *hwmgr, bool *cap);
+extern int vega20_baco_get_state(struct pp_hwmgr *hwmgr, enum BACO_STATE *state);
+extern int vega20_baco_set_state(struct pp_hwmgr *hwmgr, enum BACO_STATE state);
+
+#endif
drivers/gpu/drm/amd/powerplay/hwmgr/vega20_hwmgr.c +5 -0
index 82935a3bd950..2ba387b0f27c 100644
@@ -47,6 +47,7 @@
 #include "pp_overdriver.h"
 #include "pp_thermal.h"
 #include "soc15_common.h"
+#include "vega20_baco.h"
 #include "smuio/smuio_9_0_offset.h"
 #include "smuio/smuio_9_0_sh_mask.h"
 #include "nbio/nbio_7_4_sh_mask.h"
@@ -3591,6 +3592,10 @@ static const struct pp_hwmgr_func vega20_hwmgr_funcs = {
 	/* smu memory related */
 	.notify_cac_buffer_info = vega20_notify_cac_buffer_info,
 	.enable_mgpu_fan_boost = vega20_enable_mgpu_fan_boost,
+	/* BACO related */
+	.get_asic_baco_capability = vega20_baco_get_capability,
+	.get_asic_baco_state = vega20_baco_get_state,
+	.set_asic_baco_state = vega20_baco_set_state,
 };
 
 int vega20_hwmgr_init(struct pp_hwmgr *hwmgr)
Signature · 6 lines
2.17.1

_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
author
#6 lore raw

PATCH 5/5 drm/amdgpu: use BACO reset on vega20 if platform support

In reply to a message not in the archive
Change-Id I531fa83ccf4abf593194afd6ff0702ba1393d6c7
---
 drivers/gpu/drm/amd/amdgpu/soc15.c | 1 +
 1 file changed, 1 insertion(+)
drivers/gpu/drm/amd/amdgpu/soc15.c +1 -0
index ece6fca476d4..baf90380df6d 100644
@@ -462,6 +462,7 @@ static int soc15_asic_reset(struct amdgpu_device *adev)
 
 	switch (adev->asic_type) {
 	case CHIP_VEGA10:
+	case CHIP_VEGA20:
 		soc15_asic_get_baco_capability(adev, &baco_reset);
 		break;
 	default:
Signature · 6 lines
2.17.1

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