diff options
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/amdgpu_xgmi.c')
| -rw-r--r-- | drivers/gpu/drm/amd/amdgpu/amdgpu_xgmi.c | 15 | 
1 files changed, 10 insertions, 5 deletions
| diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_xgmi.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_xgmi.c index 1162913c8bf4..541ef6be390f 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_xgmi.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_xgmi.c @@ -246,7 +246,7 @@ static ssize_t amdgpu_xgmi_show_error(struct device *dev,  	adev->df.funcs->set_fica(adev, ficaa_pie_status_in, 0, 0); -	return snprintf(buf, PAGE_SIZE, "%d\n", error_count); +	return snprintf(buf, PAGE_SIZE, "%u\n", error_count);  } @@ -395,12 +395,17 @@ void amdgpu_put_xgmi_hive(struct amdgpu_hive_info *hive)  int amdgpu_xgmi_set_pstate(struct amdgpu_device *adev, int pstate)  {  	int ret = 0; -	struct amdgpu_hive_info *hive = amdgpu_get_xgmi_hive(adev); -	struct amdgpu_device *request_adev = hive->hi_req_gpu ? -						hive->hi_req_gpu : adev; +	struct amdgpu_hive_info *hive; +	struct amdgpu_device *request_adev;  	bool is_hi_req = pstate == AMDGPU_XGMI_PSTATE_MAX_VEGA20; -	bool init_low = hive->pstate == AMDGPU_XGMI_PSTATE_UNKNOWN; +	bool init_low; + +	hive = amdgpu_get_xgmi_hive(adev); +	if (!hive) +		return 0; +	request_adev = hive->hi_req_gpu ? hive->hi_req_gpu : adev; +	init_low = hive->pstate == AMDGPU_XGMI_PSTATE_UNKNOWN;  	amdgpu_put_xgmi_hive(hive);  	/* fw bug so temporarily disable pstate switching */  	return 0; | 
