Commit 28bb7f13 authored by James Zhu's avatar James Zhu Committed by Alex Deucher
Browse files

drm/jpeg: add init value for num_jpeg_rings 



Need init new num_jpeg_rings to 1 on jpeg.

Signed-off-by: default avatarJames Zhu <James.Zhu@amd.com>
Acked-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Reviewed-by: default avatarRichard Liang <rliang1@amd.com>
Tested-by: default avatarYing Li <ying.li@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 491ae278

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

+1 −0
Original line number Diff line number Diff line
@@ -460,6 +460,7 @@ int jpeg_v1_0_early_init(void *handle) 
	struct amdgpu_device *adev = (struct amdgpu_device *)handle;



	adev->jpeg.num_jpeg_inst = 1;

	adev->jpeg.num_jpeg_rings = 1;



	jpeg_v1_0_set_dec_ring_funcs(adev);

	jpeg_v1_0_set_irq_funcs(adev);

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

+1 −0
Original line number Diff line number Diff line
@@ -49,6 +49,7 @@ static int jpeg_v2_0_early_init(void *handle) 
	struct amdgpu_device *adev = (struct amdgpu_device *)handle;



	adev->jpeg.num_jpeg_inst = 1;

	adev->jpeg.num_jpeg_rings = 1;



	jpeg_v2_0_set_dec_ring_funcs(adev);

	jpeg_v2_0_set_irq_funcs(adev);

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

+1 −0
Original line number Diff line number Diff line
@@ -60,6 +60,7 @@ static int jpeg_v2_5_early_init(void *handle) 
	u32 harvest;

	int i;



	adev->jpeg.num_jpeg_rings = 1;

	adev->jpeg.num_jpeg_inst = JPEG25_MAX_HW_INSTANCES_ARCTURUS;

	for (i = 0; i < adev->jpeg.num_jpeg_inst; i++) {

		harvest = RREG32_SOC15(JPEG, i, mmCC_UVD_HARVESTING);

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

+1 −0
Original line number Diff line number Diff line
@@ -64,6 +64,7 @@ static int jpeg_v3_0_early_init(void *handle) 
	}



	adev->jpeg.num_jpeg_inst = 1;

	adev->jpeg.num_jpeg_rings = 1;



	jpeg_v3_0_set_dec_ring_funcs(adev);

	jpeg_v3_0_set_irq_funcs(adev);

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

+1 −0
Original line number Diff line number Diff line
@@ -58,6 +58,7 @@ static int jpeg_v4_0_early_init(void *handle) 




	adev->jpeg.num_jpeg_inst = 1;

	adev->jpeg.num_jpeg_rings = 1;



	jpeg_v4_0_set_dec_ring_funcs(adev);

	jpeg_v4_0_set_irq_funcs(adev);