Commit 82a7c94f authored by Alex Deucher's avatar Alex Deucher
Browse files

drm/amdgpu/jpeg: clean up reset type handling 



Make the handling consistent with other IPs and across
JPEG versions.

Reviewed-by: default avatarSathishkumar S <sathishkumar.sundararaju@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 084300fe

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

+3 −1
Original line number Diff line number Diff line
@@ -118,8 +118,10 @@ static int jpeg_v2_0_sw_init(struct amdgpu_ip_block *ip_block) 
	if (r)

		return r;



	adev->jpeg.supported_reset =

		amdgpu_get_soft_full_reset_mask(adev->jpeg.inst[0].ring_dec);

	if (!amdgpu_sriov_vf(adev))

		adev->jpeg.supported_reset = AMDGPU_RESET_TYPE_PER_QUEUE;

		adev->jpeg.supported_reset |= AMDGPU_RESET_TYPE_PER_QUEUE;

	r = amdgpu_jpeg_sysfs_reset_mask_init(adev);



	return r;

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

+3 −1
Original line number Diff line number Diff line
@@ -167,8 +167,10 @@ static int jpeg_v2_5_sw_init(struct amdgpu_ip_block *ip_block) 
	if (r)

		return r;



	adev->jpeg.supported_reset =

		amdgpu_get_soft_full_reset_mask(adev->jpeg.inst[0].ring_dec);

	if (!amdgpu_sriov_vf(adev))

		adev->jpeg.supported_reset = AMDGPU_RESET_TYPE_PER_QUEUE;

		adev->jpeg.supported_reset |= AMDGPU_RESET_TYPE_PER_QUEUE;

	r = amdgpu_jpeg_sysfs_reset_mask_init(adev);



	return r;

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

+3 −1
Original line number Diff line number Diff line
@@ -132,8 +132,10 @@ static int jpeg_v3_0_sw_init(struct amdgpu_ip_block *ip_block) 
	if (r)

		return r;



	adev->jpeg.supported_reset =

		amdgpu_get_soft_full_reset_mask(adev->jpeg.inst[0].ring_dec);

	if (!amdgpu_sriov_vf(adev))

		adev->jpeg.supported_reset = AMDGPU_RESET_TYPE_PER_QUEUE;

		adev->jpeg.supported_reset |= AMDGPU_RESET_TYPE_PER_QUEUE;

	r = amdgpu_jpeg_sysfs_reset_mask_init(adev);



	return r;

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

+3 −1
Original line number Diff line number Diff line
@@ -143,8 +143,10 @@ static int jpeg_v4_0_sw_init(struct amdgpu_ip_block *ip_block) 
	if (r)

		return r;



	adev->jpeg.supported_reset =

		amdgpu_get_soft_full_reset_mask(adev->jpeg.inst[0].ring_dec);

	if (!amdgpu_sriov_vf(adev))

		adev->jpeg.supported_reset = AMDGPU_RESET_TYPE_PER_QUEUE;

		adev->jpeg.supported_reset |= AMDGPU_RESET_TYPE_PER_QUEUE;

	r = amdgpu_jpeg_sysfs_reset_mask_init(adev);



	return r;

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

+6 −8
Original line number Diff line number Diff line
@@ -216,12 +216,11 @@ static int jpeg_v4_0_3_sw_init(struct amdgpu_ip_block *ip_block) 
	if (r)

		return r;



	if (!amdgpu_sriov_vf(adev)) {

		adev->jpeg.supported_reset = AMDGPU_RESET_TYPE_PER_QUEUE;

	adev->jpeg.supported_reset =

		amdgpu_get_soft_full_reset_mask(adev->jpeg.inst[0].ring_dec);

	if (!amdgpu_sriov_vf(adev))

		adev->jpeg.supported_reset |= AMDGPU_RESET_TYPE_PER_QUEUE;

	r = amdgpu_jpeg_sysfs_reset_mask_init(adev);

		if (r)

			return r;

	}



	return 0;

}
@@ -242,7 +241,6 @@ static int jpeg_v4_0_3_sw_fini(struct amdgpu_ip_block *ip_block) 
	if (r)

		return r;



	if (!amdgpu_sriov_vf(adev))

	amdgpu_jpeg_sysfs_reset_mask_fini(adev);



	r = amdgpu_jpeg_sw_fini(adev);