Commit 19544aa5 authored by Saleemkhan Jamadar's avatar Saleemkhan Jamadar Committed by Alex Deucher
Browse files

drm/amdgpu/jpeg: configure doorbell for each playback 



Doorbell is configured during start of each playback.

v1 - add comment for the doorbell programming change

Signed-off-by: default avatarSaleemkhan Jamadar <saleemkhan.jamadar@amd.com>
Acked-by: default avatarLeo Liu <leo.liu@amd.com>
Reviewed-by: default avatarVeerabadhran Gopalakrishnan <Veerabadhran.Gopalakrishnan@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent b96ab339

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

+8 −7
Original line number Diff line number Diff line
@@ -155,13 +155,6 @@ static int jpeg_v4_0_5_hw_init(void *handle) 
	struct amdgpu_ring *ring = adev->jpeg.inst->ring_dec;

	int r;



	adev->nbio.funcs->vcn_doorbell_range(adev, ring->use_doorbell,

				(adev->doorbell_index.vcn.vcn_ring0_1 << 1), 0);



	WREG32_SOC15(VCN, 0, regVCN_JPEG_DB_CTRL,

		ring->doorbell_index << VCN_JPEG_DB_CTRL__OFFSET__SHIFT |

		VCN_JPEG_DB_CTRL__EN_MASK);



	r = amdgpu_ring_test_helper(ring);

	if (r)

		return r;
@@ -336,6 +329,14 @@ static int jpeg_v4_0_5_start(struct amdgpu_device *adev) 
	if (adev->pm.dpm_enabled)

		amdgpu_dpm_enable_jpeg(adev, true);



	/* doorbell programming is done for every playback */

	adev->nbio.funcs->vcn_doorbell_range(adev, ring->use_doorbell,

				(adev->doorbell_index.vcn.vcn_ring0_1 << 1), 0);



	WREG32_SOC15(VCN, 0, regVCN_JPEG_DB_CTRL,

		ring->doorbell_index << VCN_JPEG_DB_CTRL__OFFSET__SHIFT |

		VCN_JPEG_DB_CTRL__EN_MASK);



	/* disable power gating */

	r = jpeg_v4_0_5_disable_static_power_gating(adev);

	if (r)