Skip to content

Commit 93df748

Browse files
committed
drm/amdgpu/jpeg: cancel the jpeg worker
Looks like these got missed when jpeg was split from vcn. Cancel the jpeg workers rather than vcn workers. Reviewed-by: Lijo Lazar <lijo.lazar@amd.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
1 parent b61badd commit 93df748

File tree

7 files changed

+7
-7
lines changed

7 files changed

+7
-7
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -604,7 +604,7 @@ static void jpeg_v1_0_set_irq_funcs(struct amdgpu_device *adev)
604604
static void jpeg_v1_0_ring_begin_use(struct amdgpu_ring *ring)
605605
{
606606
struct amdgpu_device *adev = ring->adev;
607-
bool set_clocks = !cancel_delayed_work_sync(&adev->vcn.idle_work);
607+
bool set_clocks = !cancel_delayed_work_sync(&adev->jpeg.idle_work);
608608
int cnt = 0;
609609

610610
mutex_lock(&adev->vcn.vcn1_jpeg1_workaround);

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,7 @@ static int jpeg_v2_0_hw_fini(struct amdgpu_ip_block *ip_block)
150150
{
151151
struct amdgpu_device *adev = ip_block->adev;
152152

153-
cancel_delayed_work_sync(&adev->vcn.idle_work);
153+
cancel_delayed_work_sync(&adev->jpeg.idle_work);
154154

155155
if (adev->jpeg.cur_state != AMD_PG_STATE_GATE &&
156156
RREG32_SOC15(JPEG, 0, mmUVD_JRBC_STATUS))

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -211,7 +211,7 @@ static int jpeg_v2_5_hw_fini(struct amdgpu_ip_block *ip_block)
211211
struct amdgpu_device *adev = ip_block->adev;
212212
int i;
213213

214-
cancel_delayed_work_sync(&adev->vcn.idle_work);
214+
cancel_delayed_work_sync(&adev->jpeg.idle_work);
215215

216216
for (i = 0; i < adev->jpeg.num_jpeg_inst; ++i) {
217217
if (adev->jpeg.harvest_config & (1 << i))

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,7 @@ static int jpeg_v3_0_hw_fini(struct amdgpu_ip_block *ip_block)
164164
{
165165
struct amdgpu_device *adev = ip_block->adev;
166166

167-
cancel_delayed_work_sync(&adev->vcn.idle_work);
167+
cancel_delayed_work_sync(&adev->jpeg.idle_work);
168168

169169
if (adev->jpeg.cur_state != AMD_PG_STATE_GATE &&
170170
RREG32_SOC15(JPEG, 0, mmUVD_JRBC_STATUS))

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -202,7 +202,7 @@ static int jpeg_v4_0_hw_fini(struct amdgpu_ip_block *ip_block)
202202
{
203203
struct amdgpu_device *adev = ip_block->adev;
204204

205-
cancel_delayed_work_sync(&adev->vcn.idle_work);
205+
cancel_delayed_work_sync(&adev->jpeg.idle_work);
206206
if (!amdgpu_sriov_vf(adev)) {
207207
if (adev->jpeg.cur_state != AMD_PG_STATE_GATE &&
208208
RREG32_SOC15(JPEG, 0, regUVD_JRBC_STATUS))

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -227,7 +227,7 @@ static int jpeg_v4_0_5_hw_fini(struct amdgpu_ip_block *ip_block)
227227
struct amdgpu_device *adev = ip_block->adev;
228228
int i;
229229

230-
cancel_delayed_work_sync(&adev->vcn.idle_work);
230+
cancel_delayed_work_sync(&adev->jpeg.idle_work);
231231

232232
for (i = 0; i < adev->jpeg.num_jpeg_inst; ++i) {
233233
if (adev->jpeg.harvest_config & (1 << i))

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -168,7 +168,7 @@ static int jpeg_v5_0_0_hw_fini(struct amdgpu_ip_block *ip_block)
168168
{
169169
struct amdgpu_device *adev = ip_block->adev;
170170

171-
cancel_delayed_work_sync(&adev->vcn.idle_work);
171+
cancel_delayed_work_sync(&adev->jpeg.idle_work);
172172

173173
if (adev->jpeg.cur_state != AMD_PG_STATE_GATE &&
174174
RREG32_SOC15(JPEG, 0, regUVD_JRBC_STATUS))

0 commit comments

Comments
 (0)