[PATCH] drm/jpeg: add init value for num_jpeg_rings

[Li, Ying]

[AMD Official Use Only - General]

Tested-by: Ying Li <Ying.Li at amd.com> for the patch

-----Original Message-----
From: Zhu, James <James.Zhu at amd.com>
Sent: Wednesday, May 24, 2023 4:35 PM
To: amd-gfx at lists.freedesktop.org; Li, Ying <YING.LI at amd.com>
Cc: Wu, Jason <Jason.Wu2 at amd.com>; Deng, Bonnie <Bonnie.Deng at amd.com>; Liang, Richard qi <Richardqi.Liang at amd.com>
Subject: [PATCH] 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 at amd.com>
---
 drivers/gpu/drm/amd/amdgpu/jpeg_v1_0.c | 1 +  drivers/gpu/drm/amd/amdgpu/jpeg_v2_0.c | 1 +  drivers/gpu/drm/amd/amdgpu/jpeg_v2_5.c | 1 +  drivers/gpu/drm/amd/amdgpu/jpeg_v3_0.c | 1 +  drivers/gpu/drm/amd/amdgpu/jpeg_v4_0.c | 1 +
 5 files changed, 5 insertions(+)

diff --git a/drivers/gpu/drm/amd/amdgpu/jpeg_v1_0.c b/drivers/gpu/drm/amd/amdgpu/jpeg_v1_0.c
index 1c5b60604a19..77595e9622da 100644
--- a/drivers/gpu/drm/amd/amdgpu/jpeg_v1_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/jpeg_v1_0.c
@@ -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);
diff --git a/drivers/gpu/drm/amd/amdgpu/jpeg_v2_0.c b/drivers/gpu/drm/amd/amdgpu/jpeg_v2_0.c
index 3aeeceae34a5..c25d4a07350b 100644
--- a/drivers/gpu/drm/amd/amdgpu/jpeg_v2_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/jpeg_v2_0.c
@@ -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);
diff --git a/drivers/gpu/drm/amd/amdgpu/jpeg_v2_5.c b/drivers/gpu/drm/amd/amdgpu/jpeg_v2_5.c
index f533ede484d4..aadb74de52bc 100644
--- a/drivers/gpu/drm/amd/amdgpu/jpeg_v2_5.c
+++ b/drivers/gpu/drm/amd/amdgpu/jpeg_v2_5.c
@@ -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); diff --git a/drivers/gpu/drm/amd/amdgpu/jpeg_v3_0.c b/drivers/gpu/drm/amd/amdgpu/jpeg_v3_0.c
index cb5494effc0f..79791379fc2b 100644
--- a/drivers/gpu/drm/amd/amdgpu/jpeg_v3_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/jpeg_v3_0.c
@@ -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);
diff --git a/drivers/gpu/drm/amd/amdgpu/jpeg_v4_0.c b/drivers/gpu/drm/amd/amdgpu/jpeg_v4_0.c
index 86383fbf9358..a707d407fbd0 100644
--- a/drivers/gpu/drm/amd/amdgpu/jpeg_v4_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/jpeg_v4_0.c
@@ -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);
--
2.34.1