Commit e095026f authored by Sunil Khatri's avatar Sunil Khatri Committed by Alex Deucher
Browse files

drm/amdgpu: validate suspend before function call 



Before making a function call to suspend, validate
the function pointer like we do in sw_init.

Use the helper function amdgpu_ip_block_suspend where
same checks and calls are repeated.

Signed-off-by: default avatarSunil Khatri <sunil.khatri@amd.com>
Reviewed-by: default avatarChristian König <christian.koenig@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent dad01f93

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

+2 −9
Original line number Diff line number Diff line
@@ -85,18 +85,11 @@ static int aldebaran_mode2_suspend_ip(struct amdgpu_device *adev) 
			      AMD_IP_BLOCK_TYPE_SDMA))

			continue;



		r = adev->ip_blocks[i].version->funcs->suspend(&adev->ip_blocks[i]);



		if (r) {

			dev_err(adev->dev,

				"suspend of IP block <%s> failed %d\n",

				adev->ip_blocks[i].version->funcs->name, r);

		r = amdgpu_ip_block_suspend(&adev->ip_blocks[i]);

		if (r)

			return r;

	}



		adev->ip_blocks[i].status.hw = false;

	}



	return 0;

}

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

+1 −0
Original line number Diff line number Diff line
@@ -363,6 +363,7 @@ int amdgpu_device_ip_wait_for_idle(struct amdgpu_device *adev, 
				   enum amd_ip_block_type block_type);

bool amdgpu_device_ip_is_valid(struct amdgpu_device *adev,

			      enum amd_ip_block_type block_type);

int amdgpu_ip_block_suspend(struct amdgpu_ip_block *ip_block);



#define AMDGPU_MAX_IP_NUM 16

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

+22 −14
Original line number Diff line number Diff line
@@ -272,6 +272,24 @@ void amdgpu_reg_state_sysfs_fini(struct amdgpu_device *adev) 
	sysfs_remove_bin_file(&adev->dev->kobj, &bin_attr_reg_state);

}



int amdgpu_ip_block_suspend(struct amdgpu_ip_block *ip_block)

{

	int r;



	if (ip_block->version->funcs->suspend) {

		r = ip_block->version->funcs->suspend(ip_block);

		if (r) {

			dev_err(ip_block->adev->dev,

				"suspend of IP block <%s> failed %d\n",

				ip_block->version->funcs->name, r);

			return r;

		}

	}



	ip_block->status.hw = false;

	return 0;

}



/**

 * DOC: board_info

 *
@@ -3473,17 +3491,11 @@ static int amdgpu_device_ip_suspend_phase1(struct amdgpu_device *adev) 
			continue;



		/* XXX handle errors */

		r = adev->ip_blocks[i].version->funcs->suspend(&adev->ip_blocks[i]);

		/* XXX handle errors */

		if (r) {

			DRM_ERROR("suspend of IP block <%s> failed %d\n",

				  adev->ip_blocks[i].version->funcs->name, r);

		r = amdgpu_ip_block_suspend(&adev->ip_blocks[i]);

		if (r)

			return r;

	}



		adev->ip_blocks[i].status.hw = false;

	}



	return 0;

}
@@ -3555,13 +3567,9 @@ static int amdgpu_device_ip_suspend_phase2(struct amdgpu_device *adev) 
			continue;



		/* XXX handle errors */

		r = adev->ip_blocks[i].version->funcs->suspend(&adev->ip_blocks[i]);

		/* XXX handle errors */

		if (r) {

			DRM_ERROR("suspend of IP block <%s> failed %d\n",

				  adev->ip_blocks[i].version->funcs->name, r);

		}

		r = amdgpu_ip_block_suspend(&adev->ip_blocks[i]);

		adev->ip_blocks[i].status.hw = false;



		/* handle putting the SMC in the appropriate state */

		if (!amdgpu_sriov_vf(adev)) {

			if (adev->ip_blocks[i].version->type == AMD_IP_BLOCK_TYPE_SMC) {

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

+2 −7
Original line number Diff line number Diff line
@@ -28,7 +28,7 @@ 


static int amdgpu_reset_xgmi_reset_on_init_suspend(struct amdgpu_device *adev)

{

	int i, r;

	int i;



	for (i = adev->num_ip_blocks - 1; i >= 0; i--) {

		if (!adev->ip_blocks[i].status.valid)
@@ -40,12 +40,7 @@ static int amdgpu_reset_xgmi_reset_on_init_suspend(struct amdgpu_device *adev) 
			continue;



		/* XXX handle errors */

		r = adev->ip_blocks[i].version->funcs->suspend(&adev->ip_blocks[i]);

		/* XXX handle errors */

		if (r) {

			dev_err(adev->dev, "suspend of IP block <%s> failed %d",

				adev->ip_blocks[i].version->funcs->name, r);

		}

		amdgpu_ip_block_suspend(&adev->ip_blocks[i]);

		adev->ip_blocks[i].status.hw = false;

	}

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

+2 −8
Original line number Diff line number Diff line
@@ -81,16 +81,10 @@ static int sienna_cichlid_mode2_suspend_ip(struct amdgpu_device *adev) 
			      AMD_IP_BLOCK_TYPE_SDMA))

			continue;



		r = adev->ip_blocks[i].version->funcs->suspend(&adev->ip_blocks[i]);



		if (r) {

			dev_err(adev->dev,

				"suspend of IP block <%s> failed %d\n",

				adev->ip_blocks[i].version->funcs->name, r);

		r = amdgpu_ip_block_suspend(&adev->ip_blocks[i]);

		if (r)

			return r;

	}

		adev->ip_blocks[i].status.hw = false;

	}



	return 0;

}