Commit 21cf0293 authored by Xiaomeng Hou's avatar Xiaomeng Hou Committed by Alex Deucher
Browse files

drm/amd/pm: drop smu_v13_0_1.c|h files for yellow carp 



Since there's nothing special in smu implementation for yellow carp,
it's better to reuse the common smu_v13_0 interfaces and drop the
specific smu_v13_0_1.c|h files.

v2: remove the duplicate register offset and shift mask header files as
well.

Signed-off-by: default avatarXiaomeng Hou <Xiaomeng.Hou@amd.com>
Reviewed-by: default avatarLijo Lazar <lijo.lazar@amd.com>
Reviewed-by: default avatarKevin Wang <kevin1.wang@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 9849e71a

drivers/gpu/drm/amd/include/asic_reg/mp/mp_13_0_1_offset.h

deleted100644 → 0
+0 −355

File deleted.

Preview size limit exceeded, changes collapsed.

drivers/gpu/drm/amd/include/asic_reg/mp/mp_13_0_1_sh_mask.h

deleted100644 → 0
+0 −531

File deleted.

Preview size limit exceeded, changes collapsed.

drivers/gpu/drm/amd/pm/inc/smu_v13_0.h

+1 −0
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ 
#include "amdgpu_smu.h"



#define SMU13_DRIVER_IF_VERSION_INV 0xFFFFFFFF

#define SMU13_DRIVER_IF_VERSION_YELLOW_CARP 0x03

#define SMU13_DRIVER_IF_VERSION_ALDE 0x07



/* MP Apertures */

drivers/gpu/drm/amd/pm/inc/smu_v13_0_1.h

deleted100644 → 0
+0 −57
Original line number Diff line number Diff line 
/*

 * Copyright 2020 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 __SMU_V13_0_1_H__

#define __SMU_V13_0_1_H__



#include "amdgpu_smu.h"



#define SMU13_0_1_DRIVER_IF_VERSION_INV 0xFFFFFFFF

#define SMU13_0_1_DRIVER_IF_VERSION_YELLOW_CARP 0x3



/* MP Apertures */

#define MP0_Public			0x03800000

#define MP0_SRAM			0x03900000

#define MP1_Public			0x03b00000

#define MP1_SRAM			0x03c00004



/* address block */

#define smnMP1_FIRMWARE_FLAGS		0x3010024





#if defined(SWSMU_CODE_LAYER_L2) || defined(SWSMU_CODE_LAYER_L3)



int smu_v13_0_1_check_fw_status(struct smu_context *smu);



int smu_v13_0_1_check_fw_version(struct smu_context *smu);



int smu_v13_0_1_fini_smc_tables(struct smu_context *smu);



int smu_v13_0_1_get_vbios_bootup_values(struct smu_context *smu);



int smu_v13_0_1_set_default_dpm_tables(struct smu_context *smu);



int smu_v13_0_1_set_driver_table_location(struct smu_context *smu);



int smu_v13_0_1_gfx_off_control(struct smu_context *smu, bool enable);

#endif

#endif

drivers/gpu/drm/amd/pm/swsmu/smu13/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ 
# Makefile for the 'smu manager' sub-component of powerplay.

# It provides the smu management services for the driver.



SMU13_MGR = smu_v13_0.o aldebaran_ppt.o smu_v13_0_1.o yellow_carp_ppt.o

SMU13_MGR = smu_v13_0.o aldebaran_ppt.o yellow_carp_ppt.o



AMD_SWSMU_SMU13MGR = $(addprefix $(AMD_SWSMU_PATH)/smu13/,$(SMU13_MGR))