diff options
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/amdgpu.h')
| -rw-r--r-- | drivers/gpu/drm/amd/amdgpu/amdgpu.h | 91 | 
1 files changed, 26 insertions, 65 deletions
| diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu.h b/drivers/gpu/drm/amd/amdgpu/amdgpu.h index 313b0cc8d676..5e7770f9a415 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu.h +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu.h @@ -87,6 +87,8 @@ extern int amdgpu_sched_jobs;  extern int amdgpu_sched_hw_submission;  extern int amdgpu_enable_semaphores;  extern int amdgpu_powerplay; +extern unsigned amdgpu_pcie_gen_cap; +extern unsigned amdgpu_pcie_lane_cap;  #define AMDGPU_WAIT_IDLE_TIMEOUT_IN_MS	        3000  #define AMDGPU_MAX_USEC_TIMEOUT			100000	/* 100 ms */ @@ -132,47 +134,6 @@ extern int amdgpu_powerplay;  #define AMDGPU_RESET_VCE			(1 << 13)  #define AMDGPU_RESET_VCE1			(1 << 14) -/* CG block flags */ -#define AMDGPU_CG_BLOCK_GFX			(1 << 0) -#define AMDGPU_CG_BLOCK_MC			(1 << 1) -#define AMDGPU_CG_BLOCK_SDMA			(1 << 2) -#define AMDGPU_CG_BLOCK_UVD			(1 << 3) -#define AMDGPU_CG_BLOCK_VCE			(1 << 4) -#define AMDGPU_CG_BLOCK_HDP			(1 << 5) -#define AMDGPU_CG_BLOCK_BIF			(1 << 6) - -/* CG flags */ -#define AMDGPU_CG_SUPPORT_GFX_MGCG		(1 << 0) -#define AMDGPU_CG_SUPPORT_GFX_MGLS		(1 << 1) -#define AMDGPU_CG_SUPPORT_GFX_CGCG		(1 << 2) -#define AMDGPU_CG_SUPPORT_GFX_CGLS		(1 << 3) -#define AMDGPU_CG_SUPPORT_GFX_CGTS		(1 << 4) -#define AMDGPU_CG_SUPPORT_GFX_CGTS_LS		(1 << 5) -#define AMDGPU_CG_SUPPORT_GFX_CP_LS		(1 << 6) -#define AMDGPU_CG_SUPPORT_GFX_RLC_LS		(1 << 7) -#define AMDGPU_CG_SUPPORT_MC_LS			(1 << 8) -#define AMDGPU_CG_SUPPORT_MC_MGCG		(1 << 9) -#define AMDGPU_CG_SUPPORT_SDMA_LS		(1 << 10) -#define AMDGPU_CG_SUPPORT_SDMA_MGCG		(1 << 11) -#define AMDGPU_CG_SUPPORT_BIF_LS		(1 << 12) -#define AMDGPU_CG_SUPPORT_UVD_MGCG		(1 << 13) -#define AMDGPU_CG_SUPPORT_VCE_MGCG		(1 << 14) -#define AMDGPU_CG_SUPPORT_HDP_LS		(1 << 15) -#define AMDGPU_CG_SUPPORT_HDP_MGCG		(1 << 16) - -/* PG flags */ -#define AMDGPU_PG_SUPPORT_GFX_PG		(1 << 0) -#define AMDGPU_PG_SUPPORT_GFX_SMG		(1 << 1) -#define AMDGPU_PG_SUPPORT_GFX_DMG		(1 << 2) -#define AMDGPU_PG_SUPPORT_UVD			(1 << 3) -#define AMDGPU_PG_SUPPORT_VCE			(1 << 4) -#define AMDGPU_PG_SUPPORT_CP			(1 << 5) -#define AMDGPU_PG_SUPPORT_GDS			(1 << 6) -#define AMDGPU_PG_SUPPORT_RLC_SMU_HS		(1 << 7) -#define AMDGPU_PG_SUPPORT_SDMA			(1 << 8) -#define AMDGPU_PG_SUPPORT_ACP			(1 << 9) -#define AMDGPU_PG_SUPPORT_SAMU			(1 << 10) -  /* GFX current status */  #define AMDGPU_GFX_NORMAL_MODE			0x00000000L  #define AMDGPU_GFX_SAFE_MODE			0x00000001L @@ -606,8 +567,6 @@ struct amdgpu_sa_manager {  	uint32_t		align;  }; -struct amdgpu_sa_bo; -  /* sub-allocation buffer */  struct amdgpu_sa_bo {  	struct list_head		olist; @@ -2278,60 +2237,60 @@ amdgpu_get_sdma_instance(struct amdgpu_ring *ring)  #define amdgpu_dpm_enable_bapm(adev, e) (adev)->pm.funcs->enable_bapm((adev), (e))  #define amdgpu_dpm_get_temperature(adev) \ -	(adev)->pp_enabled ?						\ +	((adev)->pp_enabled ?						\  	      (adev)->powerplay.pp_funcs->get_temperature((adev)->powerplay.pp_handle) : \ -	      (adev)->pm.funcs->get_temperature((adev)) +	      (adev)->pm.funcs->get_temperature((adev)))  #define amdgpu_dpm_set_fan_control_mode(adev, m) \ -	(adev)->pp_enabled ?						\ +	((adev)->pp_enabled ?						\  	      (adev)->powerplay.pp_funcs->set_fan_control_mode((adev)->powerplay.pp_handle, (m)) : \ -	      (adev)->pm.funcs->set_fan_control_mode((adev), (m)) +	      (adev)->pm.funcs->set_fan_control_mode((adev), (m)))  #define amdgpu_dpm_get_fan_control_mode(adev) \ -	(adev)->pp_enabled ?						\ +	((adev)->pp_enabled ?						\  	      (adev)->powerplay.pp_funcs->get_fan_control_mode((adev)->powerplay.pp_handle) : \ -	      (adev)->pm.funcs->get_fan_control_mode((adev)) +	      (adev)->pm.funcs->get_fan_control_mode((adev)))  #define amdgpu_dpm_set_fan_speed_percent(adev, s) \ -	(adev)->pp_enabled ?						\ +	((adev)->pp_enabled ?						\  	      (adev)->powerplay.pp_funcs->set_fan_speed_percent((adev)->powerplay.pp_handle, (s)) : \ -	      (adev)->pm.funcs->set_fan_speed_percent((adev), (s)) +	      (adev)->pm.funcs->set_fan_speed_percent((adev), (s)))  #define amdgpu_dpm_get_fan_speed_percent(adev, s) \ -	(adev)->pp_enabled ?						\ +	((adev)->pp_enabled ?						\  	      (adev)->powerplay.pp_funcs->get_fan_speed_percent((adev)->powerplay.pp_handle, (s)) : \ -	      (adev)->pm.funcs->get_fan_speed_percent((adev), (s)) +	      (adev)->pm.funcs->get_fan_speed_percent((adev), (s)))  #define amdgpu_dpm_get_sclk(adev, l) \ -	(adev)->pp_enabled ?						\ +	((adev)->pp_enabled ?						\  	      (adev)->powerplay.pp_funcs->get_sclk((adev)->powerplay.pp_handle, (l)) : \ -		(adev)->pm.funcs->get_sclk((adev), (l)) +		(adev)->pm.funcs->get_sclk((adev), (l)))  #define amdgpu_dpm_get_mclk(adev, l)  \ -	(adev)->pp_enabled ?						\ +	((adev)->pp_enabled ?						\  	      (adev)->powerplay.pp_funcs->get_mclk((adev)->powerplay.pp_handle, (l)) : \ -	      (adev)->pm.funcs->get_mclk((adev), (l)) +	      (adev)->pm.funcs->get_mclk((adev), (l)))  #define amdgpu_dpm_force_performance_level(adev, l) \ -	(adev)->pp_enabled ?						\ +	((adev)->pp_enabled ?						\  	      (adev)->powerplay.pp_funcs->force_performance_level((adev)->powerplay.pp_handle, (l)) : \ -	      (adev)->pm.funcs->force_performance_level((adev), (l)) +	      (adev)->pm.funcs->force_performance_level((adev), (l)))  #define amdgpu_dpm_powergate_uvd(adev, g) \ -	(adev)->pp_enabled ?						\ +	((adev)->pp_enabled ?						\  	      (adev)->powerplay.pp_funcs->powergate_uvd((adev)->powerplay.pp_handle, (g)) : \ -	      (adev)->pm.funcs->powergate_uvd((adev), (g)) +	      (adev)->pm.funcs->powergate_uvd((adev), (g)))  #define amdgpu_dpm_powergate_vce(adev, g) \ -	(adev)->pp_enabled ?						\ +	((adev)->pp_enabled ?						\  	      (adev)->powerplay.pp_funcs->powergate_vce((adev)->powerplay.pp_handle, (g)) : \ -	      (adev)->pm.funcs->powergate_vce((adev), (g)) +	      (adev)->pm.funcs->powergate_vce((adev), (g)))  #define amdgpu_dpm_debugfs_print_current_performance_level(adev, m) \ -	(adev)->pp_enabled ?						\ +	((adev)->pp_enabled ?						\  	      (adev)->powerplay.pp_funcs->print_current_performance_level((adev)->powerplay.pp_handle, (m)) : \ -	      (adev)->pm.funcs->debugfs_print_current_performance_level((adev), (m)) +	      (adev)->pm.funcs->debugfs_print_current_performance_level((adev), (m)))  #define amdgpu_dpm_get_current_power_state(adev) \  	(adev)->powerplay.pp_funcs->get_current_power_state((adev)->powerplay.pp_handle) @@ -2360,6 +2319,8 @@ bool amdgpu_ttm_bo_is_amdgpu_bo(struct ttm_buffer_object *bo);  int amdgpu_ttm_tt_set_userptr(struct ttm_tt *ttm, uint64_t addr,  				     uint32_t flags);  bool amdgpu_ttm_tt_has_userptr(struct ttm_tt *ttm); +bool amdgpu_ttm_tt_affect_userptr(struct ttm_tt *ttm, unsigned long start, +				  unsigned long end);  bool amdgpu_ttm_tt_is_readonly(struct ttm_tt *ttm);  uint32_t amdgpu_ttm_tt_pte_flags(struct amdgpu_device *adev, struct ttm_tt *ttm,  				 struct ttm_mem_reg *mem); | 
