Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 841686df authored by Maruthi Bayyavarapu's avatar Maruthi Bayyavarapu Committed by Alex Deucher
Browse files

drm/amdgpu: add SI DPM support (v4) 



v2: corrected register offset shift
v3: rebase fixes
v4: fix firmware paths
    add SI smc firmware versions for sysfs dump
    remove unused function forward define
    fix the tahiti specific value of DEEP_SLEEP_CLK_SEL field
    fix to miss adding thermal controller
    use vram_type instead of checking mem_gddr5 flag
    fix incorrect index of CG_FFCT_0 register
    fix incorrect reading method at si_get_current_pcie_speed

Signed-off-by: default avatarMaruthi Bayyavarapu <maruthi.bayyavarapu@amd.com>
Reviewed-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 0c34f453

drivers/gpu/drm/amd/amdgpu/amdgpu.h

+6 −0
Original line number Diff line number Diff line
@@ -1826,6 +1826,9 @@ struct amdgpu_asic_funcs { 
	int (*set_vce_clocks)(struct amdgpu_device *adev, u32 evclk, u32 ecclk);

	/* query virtual capabilities */

	u32 (*get_virtual_caps)(struct amdgpu_device *adev);

	/* static power management */

	int (*get_pcie_lanes)(struct amdgpu_device *adev);

	void (*set_pcie_lanes)(struct amdgpu_device *adev, int lanes);

};



/*
@@ -2242,6 +2245,9 @@ amdgpu_get_sdma_instance(struct amdgpu_ring *ring) 
#define amdgpu_asic_set_uvd_clocks(adev, v, d) (adev)->asic_funcs->set_uvd_clocks((adev), (v), (d))

#define amdgpu_asic_set_vce_clocks(adev, ev, ec) (adev)->asic_funcs->set_vce_clocks((adev), (ev), (ec))

#define amdgpu_asic_get_virtual_caps(adev) ((adev)->asic_funcs->get_virtual_caps((adev)))

#define amdgpu_get_pcie_lanes(adev) (adev)->asic_funcs->get_pcie_lanes((adev))

#define amdgpu_set_pcie_lanes(adev, l) (adev)->asic_funcs->set_pcie_lanes((adev), (l))

#define amdgpu_asic_get_gpu_clock_counter(adev) (adev)->asic_funcs->get_gpu_clock_counter((adev))

#define amdgpu_asic_read_disabled_bios(adev) (adev)->asic_funcs->read_disabled_bios((adev))

#define amdgpu_asic_read_bios_from_rom(adev, b, l) (adev)->asic_funcs->read_bios_from_rom((adev), (b), (l))

#define amdgpu_asic_read_register(adev, se, sh, offset, v)((adev)->asic_funcs->read_register((adev), (se), (sh), (offset), (v)))

drivers/gpu/drm/amd/amdgpu/r600_dpm.h

0 → 100644
+127 −0
Original line number Diff line number Diff line 
/*

 * Copyright 2011 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 __R600_DPM_H__

#define __R600_DPM_H__



#define R600_ASI_DFLT                                10000

#define R600_BSP_DFLT                                0x41EB

#define R600_BSU_DFLT                                0x2

#define R600_AH_DFLT                                 5

#define R600_RLP_DFLT                                25

#define R600_RMP_DFLT                                65

#define R600_LHP_DFLT                                40

#define R600_LMP_DFLT                                15

#define R600_TD_DFLT                                 0

#define R600_UTC_DFLT_00                             0x24

#define R600_UTC_DFLT_01                             0x22

#define R600_UTC_DFLT_02                             0x22

#define R600_UTC_DFLT_03                             0x22

#define R600_UTC_DFLT_04                             0x22

#define R600_UTC_DFLT_05                             0x22

#define R600_UTC_DFLT_06                             0x22

#define R600_UTC_DFLT_07                             0x22

#define R600_UTC_DFLT_08                             0x22

#define R600_UTC_DFLT_09                             0x22

#define R600_UTC_DFLT_10                             0x22

#define R600_UTC_DFLT_11                             0x22

#define R600_UTC_DFLT_12                             0x22

#define R600_UTC_DFLT_13                             0x22

#define R600_UTC_DFLT_14                             0x22

#define R600_DTC_DFLT_00                             0x24

#define R600_DTC_DFLT_01                             0x22

#define R600_DTC_DFLT_02                             0x22

#define R600_DTC_DFLT_03                             0x22

#define R600_DTC_DFLT_04                             0x22

#define R600_DTC_DFLT_05                             0x22

#define R600_DTC_DFLT_06                             0x22

#define R600_DTC_DFLT_07                             0x22

#define R600_DTC_DFLT_08                             0x22

#define R600_DTC_DFLT_09                             0x22

#define R600_DTC_DFLT_10                             0x22

#define R600_DTC_DFLT_11                             0x22

#define R600_DTC_DFLT_12                             0x22

#define R600_DTC_DFLT_13                             0x22

#define R600_DTC_DFLT_14                             0x22

#define R600_VRC_DFLT                                0x0000C003

#define R600_VOLTAGERESPONSETIME_DFLT                1000

#define R600_BACKBIASRESPONSETIME_DFLT               1000

#define R600_VRU_DFLT                                0x3

#define R600_SPLLSTEPTIME_DFLT                       0x1000

#define R600_SPLLSTEPUNIT_DFLT                       0x3

#define R600_TPU_DFLT                                0

#define R600_TPC_DFLT                                0x200

#define R600_SSTU_DFLT                               0

#define R600_SST_DFLT                                0x00C8

#define R600_GICST_DFLT                              0x200

#define R600_FCT_DFLT                                0x0400

#define R600_FCTU_DFLT                               0

#define R600_CTXCGTT3DRPHC_DFLT                      0x20

#define R600_CTXCGTT3DRSDC_DFLT                      0x40

#define R600_VDDC3DOORPHC_DFLT                       0x100

#define R600_VDDC3DOORSDC_DFLT                       0x7

#define R600_VDDC3DOORSU_DFLT                        0

#define R600_MPLLLOCKTIME_DFLT                       100

#define R600_MPLLRESETTIME_DFLT                      150

#define R600_VCOSTEPPCT_DFLT                          20

#define R600_ENDINGVCOSTEPPCT_DFLT                    5

#define R600_REFERENCEDIVIDER_DFLT                    4



#define R600_PM_NUMBER_OF_TC 15

#define R600_PM_NUMBER_OF_SCLKS 20

#define R600_PM_NUMBER_OF_MCLKS 4

#define R600_PM_NUMBER_OF_VOLTAGE_LEVELS 4

#define R600_PM_NUMBER_OF_ACTIVITY_LEVELS 3



/* XXX are these ok? */

#define R600_TEMP_RANGE_MIN (90 * 1000)

#define R600_TEMP_RANGE_MAX (120 * 1000)



#define FDO_PWM_MODE_STATIC  1

#define FDO_PWM_MODE_STATIC_RPM 5



enum r600_power_level {

	R600_POWER_LEVEL_LOW = 0,

	R600_POWER_LEVEL_MEDIUM = 1,

	R600_POWER_LEVEL_HIGH = 2,

	R600_POWER_LEVEL_CTXSW = 3,

};



enum r600_td {

	R600_TD_AUTO,

	R600_TD_UP,

	R600_TD_DOWN,

};



enum r600_display_watermark {

	R600_DISPLAY_WATERMARK_LOW = 0,

	R600_DISPLAY_WATERMARK_HIGH = 1,

};



enum r600_display_gap

{

    R600_PM_DISPLAY_GAP_VBLANK_OR_WM = 0,

    R600_PM_DISPLAY_GAP_VBLANK       = 1,

    R600_PM_DISPLAY_GAP_WATERMARK    = 2,

    R600_PM_DISPLAY_GAP_IGNORE       = 3,

};

#endif

drivers/gpu/drm/amd/amdgpu/si_dpm.c

0 → 100644
+7986 −0

File added.

Preview size limit exceeded, changes collapsed.

drivers/gpu/drm/amd/amdgpu/si_dpm.h

0 → 100644
+1015 −0

File added.

Preview size limit exceeded, changes collapsed.

drivers/gpu/drm/amd/amdgpu/si_smc.c

+1 −0
Original line number Diff line number Diff line
@@ -224,6 +224,7 @@ int si_load_smc_ucode(struct amdgpu_device *adev, u32 limit) 


	amdgpu_ucode_print_smc_hdr(&hdr->header);



	adev->pm.fw_version = le32_to_cpu(hdr->header.ucode_version);

	ucode_start_address = le32_to_cpu(hdr->ucode_start_addr);

	ucode_size = le32_to_cpu(hdr->header.ucode_size_bytes);

	src = (const u8 *)