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

Commit bc4b539e authored by Alex Deucher's avatar Alex Deucher
Browse files

drm/amdgpu: remove old CI DPM implementation 



The power smu7 powerplay code is much more robust and has
been the default for a while now.  Remove the old code.

Acked-by: default avatarChristian König <christian.koenig@amd.com>
Reviewed-by: default avatarEvan Quan <evan.quan@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 089888c4

drivers/gpu/drm/amd/amdgpu/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -57,7 +57,7 @@ amdgpu-y += amdgpu_device.o amdgpu_kms.o \ 


# add asic specific block

amdgpu-$(CONFIG_DRM_AMDGPU_CIK)+= cik.o cik_ih.o kv_smc.o kv_dpm.o \

	ci_smc.o ci_dpm.o dce_v8_0.o gfx_v7_0.o cik_sdma.o uvd_v4_2.o vce_v2_0.o

	dce_v8_0.o gfx_v7_0.o cik_sdma.o uvd_v4_2.o vce_v2_0.o



amdgpu-$(CONFIG_DRM_AMDGPU_SI)+= si.o gmc_v6_0.o gfx_v6_0.o si_ih.o si_dma.o dce_v6_0.o si_dpm.o si_smc.o

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

deleted100644 → 0
+0 −6844

File deleted.

Preview size limit exceeded, changes collapsed.

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

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

 * Copyright 2013 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 __CI_DPM_H__

#define __CI_DPM_H__



#include "amdgpu_atombios.h"

#include "ppsmc.h"



#define SMU__NUM_SCLK_DPM_STATE  8

#define SMU__NUM_MCLK_DPM_LEVELS 6

#define SMU__NUM_LCLK_DPM_LEVELS 8

#define SMU__NUM_PCIE_DPM_LEVELS 8

#include "smu7_discrete.h"



#define CISLANDS_MAX_HARDWARE_POWERLEVELS 2



#define CISLANDS_UNUSED_GPIO_PIN 0x7F



struct ci_pl {

	u32 mclk;

	u32 sclk;

	enum amdgpu_pcie_gen pcie_gen;

	u16 pcie_lane;

};



struct ci_ps {

	u16 performance_level_count;

	bool dc_compatible;

	u32 sclk_t;

	struct ci_pl performance_levels[CISLANDS_MAX_HARDWARE_POWERLEVELS];

};



struct ci_dpm_level {

	bool enabled;

	u32 value;

	u32 param1;

};



#define CISLAND_MAX_DEEPSLEEP_DIVIDER_ID 5

#define MAX_REGULAR_DPM_NUMBER 8

#define CISLAND_MINIMUM_ENGINE_CLOCK 800



struct ci_single_dpm_table {

	u32 count;

	struct ci_dpm_level dpm_levels[MAX_REGULAR_DPM_NUMBER];

};



struct ci_dpm_table {

	struct ci_single_dpm_table sclk_table;

	struct ci_single_dpm_table mclk_table;

	struct ci_single_dpm_table pcie_speed_table;

	struct ci_single_dpm_table vddc_table;

	struct ci_single_dpm_table vddci_table;

	struct ci_single_dpm_table mvdd_table;

};



struct ci_mc_reg_entry {

	u32 mclk_max;

	u32 mc_data[SMU7_DISCRETE_MC_REGISTER_ARRAY_SIZE];

};



struct ci_mc_reg_table {

	u8 last;

	u8 num_entries;

	u16 valid_flag;

	struct ci_mc_reg_entry mc_reg_table_entry[MAX_AC_TIMING_ENTRIES];

	SMU7_Discrete_MCRegisterAddress mc_reg_address[SMU7_DISCRETE_MC_REGISTER_ARRAY_SIZE];

};



struct ci_ulv_parm

{

	bool supported;

	u32 cg_ulv_parameter;

	u32 volt_change_delay;

	struct ci_pl pl;

};



#define CISLANDS_MAX_LEAKAGE_COUNT  8



struct ci_leakage_voltage {

	u16 count;

	u16 leakage_id[CISLANDS_MAX_LEAKAGE_COUNT];

	u16 actual_voltage[CISLANDS_MAX_LEAKAGE_COUNT];

};



struct ci_dpm_level_enable_mask {

	u32 uvd_dpm_enable_mask;

	u32 vce_dpm_enable_mask;

	u32 acp_dpm_enable_mask;

	u32 samu_dpm_enable_mask;

	u32 sclk_dpm_enable_mask;

	u32 mclk_dpm_enable_mask;

	u32 pcie_dpm_enable_mask;

};



struct ci_vbios_boot_state

{

	u16 mvdd_bootup_value;

	u16 vddc_bootup_value;

	u16 vddci_bootup_value;

	u32 sclk_bootup_value;

	u32 mclk_bootup_value;

	u16 pcie_gen_bootup_value;

	u16 pcie_lane_bootup_value;

};



struct ci_clock_registers {

	u32 cg_spll_func_cntl;

	u32 cg_spll_func_cntl_2;

	u32 cg_spll_func_cntl_3;

	u32 cg_spll_func_cntl_4;

	u32 cg_spll_spread_spectrum;

	u32 cg_spll_spread_spectrum_2;

	u32 dll_cntl;

	u32 mclk_pwrmgt_cntl;

	u32 mpll_ad_func_cntl;

	u32 mpll_dq_func_cntl;

	u32 mpll_func_cntl;

	u32 mpll_func_cntl_1;

	u32 mpll_func_cntl_2;

	u32 mpll_ss1;

	u32 mpll_ss2;

};



struct ci_thermal_temperature_setting {

	s32 temperature_low;

	s32 temperature_high;

	s32 temperature_shutdown;

};



struct ci_pcie_perf_range {

	u16 max;

	u16 min;

};



enum ci_pt_config_reg_type {

	CISLANDS_CONFIGREG_MMR = 0,

	CISLANDS_CONFIGREG_SMC_IND,

	CISLANDS_CONFIGREG_DIDT_IND,

	CISLANDS_CONFIGREG_CACHE,

	CISLANDS_CONFIGREG_MAX

};



#define POWERCONTAINMENT_FEATURE_BAPM            0x00000001

#define POWERCONTAINMENT_FEATURE_TDCLimit        0x00000002

#define POWERCONTAINMENT_FEATURE_PkgPwrLimit     0x00000004



struct ci_pt_config_reg {

	u32 offset;

	u32 mask;

	u32 shift;

	u32 value;

	enum ci_pt_config_reg_type type;

};



struct ci_pt_defaults {

	u8 svi_load_line_en;

	u8 svi_load_line_vddc;

	u8 tdc_vddc_throttle_release_limit_perc;

	u8 tdc_mawt;

	u8 tdc_waterfall_ctl;

	u8 dte_ambient_temp_base;

	u32 display_cac;

	u32 bapm_temp_gradient;

	u16 bapmti_r[SMU7_DTE_ITERATIONS * SMU7_DTE_SOURCES * SMU7_DTE_SINKS];

	u16 bapmti_rc[SMU7_DTE_ITERATIONS * SMU7_DTE_SOURCES * SMU7_DTE_SINKS];

};



#define DPMTABLE_OD_UPDATE_SCLK     0x00000001

#define DPMTABLE_OD_UPDATE_MCLK     0x00000002

#define DPMTABLE_UPDATE_SCLK        0x00000004

#define DPMTABLE_UPDATE_MCLK        0x00000008



struct ci_power_info {

	struct ci_dpm_table dpm_table;

	struct ci_dpm_table golden_dpm_table;

	u32 voltage_control;

	u32 mvdd_control;

	u32 vddci_control;

	u32 active_auto_throttle_sources;

	struct ci_clock_registers clock_registers;

	u16 acpi_vddc;

	u16 acpi_vddci;

	enum amdgpu_pcie_gen force_pcie_gen;

	enum amdgpu_pcie_gen acpi_pcie_gen;

	struct ci_leakage_voltage vddc_leakage;

	struct ci_leakage_voltage vddci_leakage;

	u16 max_vddc_in_pp_table;

	u16 min_vddc_in_pp_table;

	u16 max_vddci_in_pp_table;

	u16 min_vddci_in_pp_table;

	u32 mclk_strobe_mode_threshold;

	u32 mclk_stutter_mode_threshold;

	u32 mclk_edc_enable_threshold;

	u32 mclk_edc_wr_enable_threshold;

	struct ci_vbios_boot_state vbios_boot_state;

	/* smc offsets */

	u32 sram_end;

	u32 dpm_table_start;

	u32 soft_regs_start;

	u32 mc_reg_table_start;

	u32 fan_table_start;

	u32 arb_table_start;

	/* smc tables */

	SMU7_Discrete_DpmTable smc_state_table;

	SMU7_Discrete_MCRegisters smc_mc_reg_table;

	SMU7_Discrete_PmFuses smc_powertune_table;

	/* other stuff */

	struct ci_mc_reg_table mc_reg_table;

	struct atom_voltage_table vddc_voltage_table;

	struct atom_voltage_table vddci_voltage_table;

	struct atom_voltage_table mvdd_voltage_table;

	struct ci_ulv_parm ulv;

	u32 power_containment_features;

	const struct ci_pt_defaults *powertune_defaults;

	u32 dte_tj_offset;

	bool vddc_phase_shed_control;

	struct ci_thermal_temperature_setting thermal_temp_setting;

	struct ci_dpm_level_enable_mask dpm_level_enable_mask;

	u32 need_update_smu7_dpm_table;

	u32 sclk_dpm_key_disabled;

	u32 mclk_dpm_key_disabled;

	u32 pcie_dpm_key_disabled;

	u32 thermal_sclk_dpm_enabled;

	struct ci_pcie_perf_range pcie_gen_performance;

	struct ci_pcie_perf_range pcie_lane_performance;

	struct ci_pcie_perf_range pcie_gen_powersaving;

	struct ci_pcie_perf_range pcie_lane_powersaving;

	u32 activity_target[SMU7_MAX_LEVELS_GRAPHICS];

	u32 mclk_activity_target;

	u32 low_sclk_interrupt_t;

	u32 last_mclk_dpm_enable_mask;

	u32 sys_pcie_mask;

	/* caps */

	bool caps_power_containment;

	bool caps_cac;

	bool caps_sq_ramping;

	bool caps_db_ramping;

	bool caps_td_ramping;

	bool caps_tcp_ramping;

	bool caps_fps;

	bool caps_sclk_ds;

	bool caps_sclk_ss_support;

	bool caps_mclk_ss_support;

	bool caps_uvd_dpm;

	bool caps_vce_dpm;

	bool caps_samu_dpm;

	bool caps_acp_dpm;

	bool caps_automatic_dc_transition;

	bool caps_sclk_throttle_low_notification;

	bool caps_dynamic_ac_timing;

	bool caps_od_fuzzy_fan_control_support;

	/* flags */

	bool thermal_protection;

	bool pcie_performance_request;

	bool dynamic_ss;

	bool dll_default_on;

	bool cac_enabled;

	bool uvd_enabled;

	bool battery_state;

	bool pspp_notify_required;

	bool enable_bapm_feature;

	bool enable_tdc_limit_feature;

	bool enable_pkg_pwr_tracking_feature;

	bool use_pcie_performance_levels;

	bool use_pcie_powersaving_levels;

	bool uvd_power_gated;

	/* driver states */

	struct amdgpu_ps current_rps;

	struct ci_ps current_ps;

	struct amdgpu_ps requested_rps;

	struct ci_ps requested_ps;

	/* fan control */

	bool fan_ctrl_is_in_default_mode;

	bool fan_is_controlled_by_smc;

	u32 t_min;

	u32 fan_ctrl_default_mode;

};



#define CISLANDS_VOLTAGE_CONTROL_NONE                   0x0

#define CISLANDS_VOLTAGE_CONTROL_BY_GPIO                0x1

#define CISLANDS_VOLTAGE_CONTROL_BY_SVID2               0x2



#define CISLANDS_Q88_FORMAT_CONVERSION_UNIT             256



#define CISLANDS_VRC_DFLT0                              0x3FFFC000

#define CISLANDS_VRC_DFLT1                              0x000400

#define CISLANDS_VRC_DFLT2                              0xC00080

#define CISLANDS_VRC_DFLT3                              0xC00200

#define CISLANDS_VRC_DFLT4                              0xC01680

#define CISLANDS_VRC_DFLT5                              0xC00033

#define CISLANDS_VRC_DFLT6                              0xC00033

#define CISLANDS_VRC_DFLT7                              0x3FFFC000



#define CISLANDS_CGULVPARAMETER_DFLT                    0x00040035

#define CISLAND_TARGETACTIVITY_DFLT                     30

#define CISLAND_MCLK_TARGETACTIVITY_DFLT                10



#define PCIE_PERF_REQ_REMOVE_REGISTRY   0

#define PCIE_PERF_REQ_FORCE_LOWPOWER    1

#define PCIE_PERF_REQ_PECI_GEN1         2

#define PCIE_PERF_REQ_PECI_GEN2         3

#define PCIE_PERF_REQ_PECI_GEN3         4



#define CISLANDS_SSTU_DFLT                               0

#define CISLANDS_SST_DFLT                                0x00C8



/* XXX are these ok? */

#define CISLANDS_TEMP_RANGE_MIN (90 * 1000)

#define CISLANDS_TEMP_RANGE_MAX (120 * 1000)



int amdgpu_ci_copy_bytes_to_smc(struct amdgpu_device *adev,

			 u32 smc_start_address,

			 const u8 *src, u32 byte_count, u32 limit);

void amdgpu_ci_start_smc(struct amdgpu_device *adev);

void amdgpu_ci_reset_smc(struct amdgpu_device *adev);

int amdgpu_ci_program_jump_on_start(struct amdgpu_device *adev);

void amdgpu_ci_stop_smc_clock(struct amdgpu_device *adev);

void amdgpu_ci_start_smc_clock(struct amdgpu_device *adev);

bool amdgpu_ci_is_smc_running(struct amdgpu_device *adev);

PPSMC_Result amdgpu_ci_send_msg_to_smc(struct amdgpu_device *adev, PPSMC_Msg msg);

PPSMC_Result amdgpu_ci_wait_for_smc_inactive(struct amdgpu_device *adev);

int amdgpu_ci_load_smc_ucode(struct amdgpu_device *adev, u32 limit);

int amdgpu_ci_read_smc_sram_dword(struct amdgpu_device *adev,

			   u32 smc_address, u32 *value, u32 limit);

int amdgpu_ci_write_smc_sram_dword(struct amdgpu_device *adev,

			    u32 smc_address, u32 value, u32 limit);



#endif

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

deleted100644 → 0
+0 −279
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.

 *

 * Authors: Alex Deucher

 */



#include <linux/firmware.h>

#include <drm/drmP.h>

#include "amdgpu.h"

#include "cikd.h"

#include "ppsmc.h"

#include "amdgpu_ucode.h"

#include "ci_dpm.h"



#include "smu/smu_7_0_1_d.h"

#include "smu/smu_7_0_1_sh_mask.h"



static int ci_set_smc_sram_address(struct amdgpu_device *adev,

				   u32 smc_address, u32 limit)

{

	if (smc_address & 3)

		return -EINVAL;

	if ((smc_address + 3) > limit)

		return -EINVAL;



	WREG32(mmSMC_IND_INDEX_0, smc_address);

	WREG32_P(mmSMC_IND_ACCESS_CNTL, 0, ~SMC_IND_ACCESS_CNTL__AUTO_INCREMENT_IND_0_MASK);



	return 0;

}



int amdgpu_ci_copy_bytes_to_smc(struct amdgpu_device *adev,

			 u32 smc_start_address,

			 const u8 *src, u32 byte_count, u32 limit)

{

	unsigned long flags;

	u32 data, original_data;

	u32 addr;

	u32 extra_shift;

	int ret = 0;



	if (smc_start_address & 3)

		return -EINVAL;

	if ((smc_start_address + byte_count) > limit)

		return -EINVAL;



	addr = smc_start_address;



	spin_lock_irqsave(&adev->smc_idx_lock, flags);

	while (byte_count >= 4) {

		/* SMC address space is BE */

		data = (src[0] << 24) | (src[1] << 16) | (src[2] << 8) | src[3];



		ret = ci_set_smc_sram_address(adev, addr, limit);

		if (ret)

			goto done;



		WREG32(mmSMC_IND_DATA_0, data);



		src += 4;

		byte_count -= 4;

		addr += 4;

	}



	/* RMW for the final bytes */

	if (byte_count > 0) {

		data = 0;



		ret = ci_set_smc_sram_address(adev, addr, limit);

		if (ret)

			goto done;



		original_data = RREG32(mmSMC_IND_DATA_0);



		extra_shift = 8 * (4 - byte_count);



		while (byte_count > 0) {

			data = (data << 8) + *src++;

			byte_count--;

		}



		data <<= extra_shift;



		data |= (original_data & ~((~0UL) << extra_shift));



		ret = ci_set_smc_sram_address(adev, addr, limit);

		if (ret)

			goto done;



		WREG32(mmSMC_IND_DATA_0, data);

	}



done:

	spin_unlock_irqrestore(&adev->smc_idx_lock, flags);



	return ret;

}



void amdgpu_ci_start_smc(struct amdgpu_device *adev)

{

	u32 tmp = RREG32_SMC(ixSMC_SYSCON_RESET_CNTL);



	tmp &= ~SMC_SYSCON_RESET_CNTL__rst_reg_MASK;

	WREG32_SMC(ixSMC_SYSCON_RESET_CNTL, tmp);

}



void amdgpu_ci_reset_smc(struct amdgpu_device *adev)

{

	u32 tmp = RREG32_SMC(ixSMC_SYSCON_RESET_CNTL);



	tmp |= SMC_SYSCON_RESET_CNTL__rst_reg_MASK;

	WREG32_SMC(ixSMC_SYSCON_RESET_CNTL, tmp);

}



int amdgpu_ci_program_jump_on_start(struct amdgpu_device *adev)

{

	static u8 data[] = { 0xE0, 0x00, 0x80, 0x40 };



	return amdgpu_ci_copy_bytes_to_smc(adev, 0x0, data, 4, sizeof(data)+1);

}



void amdgpu_ci_stop_smc_clock(struct amdgpu_device *adev)

{

	u32 tmp = RREG32_SMC(ixSMC_SYSCON_CLOCK_CNTL_0);



	tmp |= SMC_SYSCON_CLOCK_CNTL_0__ck_disable_MASK;



	WREG32_SMC(ixSMC_SYSCON_CLOCK_CNTL_0, tmp);

}



void amdgpu_ci_start_smc_clock(struct amdgpu_device *adev)

{

	u32 tmp = RREG32_SMC(ixSMC_SYSCON_CLOCK_CNTL_0);



	tmp &= ~SMC_SYSCON_CLOCK_CNTL_0__ck_disable_MASK;



	WREG32_SMC(ixSMC_SYSCON_CLOCK_CNTL_0, tmp);

}



bool amdgpu_ci_is_smc_running(struct amdgpu_device *adev)

{

	u32 clk = RREG32_SMC(ixSMC_SYSCON_CLOCK_CNTL_0);

	u32 pc_c = RREG32_SMC(ixSMC_PC_C);



	if (!(clk & SMC_SYSCON_CLOCK_CNTL_0__ck_disable_MASK) && (0x20100 <= pc_c))

		return true;



	return false;

}



PPSMC_Result amdgpu_ci_send_msg_to_smc(struct amdgpu_device *adev, PPSMC_Msg msg)

{

	u32 tmp;

	int i;



	if (!amdgpu_ci_is_smc_running(adev))

		return PPSMC_Result_Failed;



	WREG32(mmSMC_MESSAGE_0, msg);



	for (i = 0; i < adev->usec_timeout; i++) {

		tmp = RREG32(mmSMC_RESP_0);

		if (tmp != 0)

			break;

		udelay(1);

	}

	tmp = RREG32(mmSMC_RESP_0);



	return (PPSMC_Result)tmp;

}



PPSMC_Result amdgpu_ci_wait_for_smc_inactive(struct amdgpu_device *adev)

{

	u32 tmp;

	int i;



	if (!amdgpu_ci_is_smc_running(adev))

		return PPSMC_Result_OK;



	for (i = 0; i < adev->usec_timeout; i++) {

		tmp = RREG32_SMC(ixSMC_SYSCON_CLOCK_CNTL_0);

		if ((tmp & SMC_SYSCON_CLOCK_CNTL_0__cken_MASK) == 0)

			break;

		udelay(1);

	}



	return PPSMC_Result_OK;

}



int amdgpu_ci_load_smc_ucode(struct amdgpu_device *adev, u32 limit)

{

	const struct smc_firmware_header_v1_0 *hdr;

	unsigned long flags;

	u32 ucode_start_address;

	u32 ucode_size;

	const u8 *src;

	u32 data;



	if (!adev->pm.fw)

		return -EINVAL;



	hdr = (const struct smc_firmware_header_v1_0 *)adev->pm.fw->data;

	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 *)

		(adev->pm.fw->data + le32_to_cpu(hdr->header.ucode_array_offset_bytes));



	if (ucode_size & 3)

		return -EINVAL;



	spin_lock_irqsave(&adev->smc_idx_lock, flags);

	WREG32(mmSMC_IND_INDEX_0, ucode_start_address);

	WREG32_P(mmSMC_IND_ACCESS_CNTL, SMC_IND_ACCESS_CNTL__AUTO_INCREMENT_IND_0_MASK,

		~SMC_IND_ACCESS_CNTL__AUTO_INCREMENT_IND_0_MASK);

	while (ucode_size >= 4) {

		/* SMC address space is BE */

		data = (src[0] << 24) | (src[1] << 16) | (src[2] << 8) | src[3];



		WREG32(mmSMC_IND_DATA_0, data);



		src += 4;

		ucode_size -= 4;

	}

	WREG32_P(mmSMC_IND_ACCESS_CNTL, 0, ~SMC_IND_ACCESS_CNTL__AUTO_INCREMENT_IND_0_MASK);

	spin_unlock_irqrestore(&adev->smc_idx_lock, flags);



	return 0;

}



int amdgpu_ci_read_smc_sram_dword(struct amdgpu_device *adev,

			   u32 smc_address, u32 *value, u32 limit)

{

	unsigned long flags;

	int ret;



	spin_lock_irqsave(&adev->smc_idx_lock, flags);

	ret = ci_set_smc_sram_address(adev, smc_address, limit);

	if (ret == 0)

		*value = RREG32(mmSMC_IND_DATA_0);

	spin_unlock_irqrestore(&adev->smc_idx_lock, flags);



	return ret;

}



int amdgpu_ci_write_smc_sram_dword(struct amdgpu_device *adev,

			    u32 smc_address, u32 value, u32 limit)

{

	unsigned long flags;

	int ret;



	spin_lock_irqsave(&adev->smc_idx_lock, flags);

	ret = ci_set_smc_sram_address(adev, smc_address, limit);

	if (ret == 0)

		WREG32(mmSMC_IND_DATA_0, value);

	spin_unlock_irqrestore(&adev->smc_idx_lock, flags);



	return ret;

}

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

+2 −8
Original line number Diff line number Diff line
@@ -2070,10 +2070,7 @@ int cik_set_ip_blocks(struct amdgpu_device *adev) 
		amdgpu_device_ip_block_add(adev, &cik_ih_ip_block);

		amdgpu_device_ip_block_add(adev, &gfx_v7_2_ip_block);

		amdgpu_device_ip_block_add(adev, &cik_sdma_ip_block);

		if (amdgpu_dpm == -1)

		amdgpu_device_ip_block_add(adev, &pp_smu_ip_block);

		else

			amdgpu_device_ip_block_add(adev, &ci_smu_ip_block);

		if (adev->enable_virtual_display)

			amdgpu_device_ip_block_add(adev, &dce_virtual_ip_block);

#if defined(CONFIG_DRM_AMD_DC)
@@ -2091,10 +2088,7 @@ int cik_set_ip_blocks(struct amdgpu_device *adev) 
		amdgpu_device_ip_block_add(adev, &cik_ih_ip_block);

		amdgpu_device_ip_block_add(adev, &gfx_v7_3_ip_block);

		amdgpu_device_ip_block_add(adev, &cik_sdma_ip_block);

		if (amdgpu_dpm == -1)

		amdgpu_device_ip_block_add(adev, &pp_smu_ip_block);

		else

			amdgpu_device_ip_block_add(adev, &ci_smu_ip_block);

		if (adev->enable_virtual_display)

			amdgpu_device_ip_block_add(adev, &dce_virtual_ip_block);

#if defined(CONFIG_DRM_AMD_DC)