drm/jpeg: add init value for num_jpeg_rings
Need init new num_jpeg_rings to 1 on jpeg. Signed-off-by: James Zhu <James.Zhu@amd.com> Acked-by: Alex Deucher <alexander.deucher@amd.com> Reviewed-by: Richard Liang <rliang1@amd.com> Tested-by: Ying Li <ying.li@amd.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
This commit is contained in:
parent
491ae27829
commit
28bb7f13e7
@ -460,6 +460,7 @@ int jpeg_v1_0_early_init(void *handle)
|
|||||||
struct amdgpu_device *adev = (struct amdgpu_device *)handle;
|
struct amdgpu_device *adev = (struct amdgpu_device *)handle;
|
||||||
|
|
||||||
adev->jpeg.num_jpeg_inst = 1;
|
adev->jpeg.num_jpeg_inst = 1;
|
||||||
|
adev->jpeg.num_jpeg_rings = 1;
|
||||||
|
|
||||||
jpeg_v1_0_set_dec_ring_funcs(adev);
|
jpeg_v1_0_set_dec_ring_funcs(adev);
|
||||||
jpeg_v1_0_set_irq_funcs(adev);
|
jpeg_v1_0_set_irq_funcs(adev);
|
||||||
|
@ -49,6 +49,7 @@ static int jpeg_v2_0_early_init(void *handle)
|
|||||||
struct amdgpu_device *adev = (struct amdgpu_device *)handle;
|
struct amdgpu_device *adev = (struct amdgpu_device *)handle;
|
||||||
|
|
||||||
adev->jpeg.num_jpeg_inst = 1;
|
adev->jpeg.num_jpeg_inst = 1;
|
||||||
|
adev->jpeg.num_jpeg_rings = 1;
|
||||||
|
|
||||||
jpeg_v2_0_set_dec_ring_funcs(adev);
|
jpeg_v2_0_set_dec_ring_funcs(adev);
|
||||||
jpeg_v2_0_set_irq_funcs(adev);
|
jpeg_v2_0_set_irq_funcs(adev);
|
||||||
|
@ -60,6 +60,7 @@ static int jpeg_v2_5_early_init(void *handle)
|
|||||||
u32 harvest;
|
u32 harvest;
|
||||||
int i;
|
int i;
|
||||||
|
|
||||||
|
adev->jpeg.num_jpeg_rings = 1;
|
||||||
adev->jpeg.num_jpeg_inst = JPEG25_MAX_HW_INSTANCES_ARCTURUS;
|
adev->jpeg.num_jpeg_inst = JPEG25_MAX_HW_INSTANCES_ARCTURUS;
|
||||||
for (i = 0; i < adev->jpeg.num_jpeg_inst; i++) {
|
for (i = 0; i < adev->jpeg.num_jpeg_inst; i++) {
|
||||||
harvest = RREG32_SOC15(JPEG, i, mmCC_UVD_HARVESTING);
|
harvest = RREG32_SOC15(JPEG, i, mmCC_UVD_HARVESTING);
|
||||||
|
@ -64,6 +64,7 @@ static int jpeg_v3_0_early_init(void *handle)
|
|||||||
}
|
}
|
||||||
|
|
||||||
adev->jpeg.num_jpeg_inst = 1;
|
adev->jpeg.num_jpeg_inst = 1;
|
||||||
|
adev->jpeg.num_jpeg_rings = 1;
|
||||||
|
|
||||||
jpeg_v3_0_set_dec_ring_funcs(adev);
|
jpeg_v3_0_set_dec_ring_funcs(adev);
|
||||||
jpeg_v3_0_set_irq_funcs(adev);
|
jpeg_v3_0_set_irq_funcs(adev);
|
||||||
|
@ -58,6 +58,7 @@ static int jpeg_v4_0_early_init(void *handle)
|
|||||||
|
|
||||||
|
|
||||||
adev->jpeg.num_jpeg_inst = 1;
|
adev->jpeg.num_jpeg_inst = 1;
|
||||||
|
adev->jpeg.num_jpeg_rings = 1;
|
||||||
|
|
||||||
jpeg_v4_0_set_dec_ring_funcs(adev);
|
jpeg_v4_0_set_dec_ring_funcs(adev);
|
||||||
jpeg_v4_0_set_irq_funcs(adev);
|
jpeg_v4_0_set_irq_funcs(adev);
|
||||||
|
Loading…
x
Reference in New Issue
Block a user