Skip to content

Commit 0a8ff0c

Browse files
Li Maalexdeucher
authored andcommitted
drm/amdgpu: remove asymmetrical irq disabling in jpeg 4.0.5 suspend
A supplement to commit: 615dd56 There is an irq warning of jpeg during resume in s2idle process. No irq enabled in jpeg 4.0.5 resume. Fixes: 615dd56 ("drm/amdgpu: remove asymmetrical irq disabling in vcn 4.0.5 suspend") Signed-off-by: Li Ma <[email protected]> Acked-By: Saleemkhan Jamadar <[email protected]> Reviewed-by: Yifan Zhang <[email protected]> Reviewed-by: Veerabadhran Gopalakrishnan <[email protected]> Signed-off-by: Alex Deucher <[email protected]>
1 parent 3f719cf commit 0a8ff0c

File tree

2 files changed

+0
-19
lines changed

2 files changed

+0
-19
lines changed

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

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -674,14 +674,6 @@ static int jpeg_v4_0_set_powergating_state(void *handle,
674674
return ret;
675675
}
676676

677-
static int jpeg_v4_0_set_interrupt_state(struct amdgpu_device *adev,
678-
struct amdgpu_irq_src *source,
679-
unsigned type,
680-
enum amdgpu_interrupt_state state)
681-
{
682-
return 0;
683-
}
684-
685677
static int jpeg_v4_0_set_ras_interrupt_state(struct amdgpu_device *adev,
686678
struct amdgpu_irq_src *source,
687679
unsigned int type,
@@ -765,7 +757,6 @@ static void jpeg_v4_0_set_dec_ring_funcs(struct amdgpu_device *adev)
765757
}
766758

767759
static const struct amdgpu_irq_src_funcs jpeg_v4_0_irq_funcs = {
768-
.set = jpeg_v4_0_set_interrupt_state,
769760
.process = jpeg_v4_0_process_interrupt,
770761
};
771762

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

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -181,7 +181,6 @@ static int jpeg_v4_0_5_hw_fini(void *handle)
181181
RREG32_SOC15(JPEG, 0, regUVD_JRBC_STATUS))
182182
jpeg_v4_0_5_set_powergating_state(adev, AMD_PG_STATE_GATE);
183183
}
184-
amdgpu_irq_put(adev, &adev->jpeg.inst->irq, 0);
185184

186185
return 0;
187186
}
@@ -516,14 +515,6 @@ static int jpeg_v4_0_5_set_powergating_state(void *handle,
516515
return ret;
517516
}
518517

519-
static int jpeg_v4_0_5_set_interrupt_state(struct amdgpu_device *adev,
520-
struct amdgpu_irq_src *source,
521-
unsigned type,
522-
enum amdgpu_interrupt_state state)
523-
{
524-
return 0;
525-
}
526-
527518
static int jpeg_v4_0_5_process_interrupt(struct amdgpu_device *adev,
528519
struct amdgpu_irq_src *source,
529520
struct amdgpu_iv_entry *entry)
@@ -603,7 +594,6 @@ static void jpeg_v4_0_5_set_dec_ring_funcs(struct amdgpu_device *adev)
603594
}
604595

605596
static const struct amdgpu_irq_src_funcs jpeg_v4_0_5_irq_funcs = {
606-
.set = jpeg_v4_0_5_set_interrupt_state,
607597
.process = jpeg_v4_0_5_process_interrupt,
608598
};
609599

0 commit comments

Comments
 (0)