On Sun, May 10, 2026 at 6:14 AM Andre Luiz Batista Bueno
<[email protected]> wrote:
>
> Both jpeg_v5_0_1.c and jpeg_v5_0_2.c implement identical
> interrupt processing routines. To avoid code duplication,
> extract this implementation into a shared common function
> in new jpeg_v5_0_interrupt.c and .h files.
>
> Signed-off-by: Andre Luiz Batista Bueno <[email protected]>
> Co-developed-by: Enzo Furegatti Spinella <[email protected]>
> Signed-off-by: Enzo Furegatti Spinella <[email protected]>
> ---
> drivers/gpu/drm/amd/amdgpu/Makefile | 1 +
> drivers/gpu/drm/amd/amdgpu/jpeg_v5_0_1.c | 57 +----------------
> drivers/gpu/drm/amd/amdgpu/jpeg_v5_0_2.c | 57 +----------------
> .../gpu/drm/amd/amdgpu/jpeg_v5_0_interrupt.c | 64 +++++++++++++++++++
> .../gpu/drm/amd/amdgpu/jpeg_v5_0_interrupt.h | 12 ++++
> 5 files changed, 83 insertions(+), 108 deletions(-)
> create mode 100644 drivers/gpu/drm/amd/amdgpu/jpeg_v5_0_interrupt.c
> create mode 100644 drivers/gpu/drm/amd/amdgpu/jpeg_v5_0_interrupt.h
This is not common to jpeg v5. jpeg_v5_0_0.c has a different
interrupt handler, although it could probably be shared with that as
well. I think the additional fields in the IH should be 0s so it
should work correctly, but we'd need to verify. If you do want to
share this, I would just make the implementation in jpeg_v5_0_1.c
non-static and then just use it directly in jpeg_v5_0_2.c.
Alex
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/Makefile
> b/drivers/gpu/drm/amd/amdgpu/Makefile
> index db66c6372199..69e5e55e1a2b 100644
> --- a/drivers/gpu/drm/amd/amdgpu/Makefile
> +++ b/drivers/gpu/drm/amd/amdgpu/Makefile
> @@ -229,6 +229,7 @@ amdgpu-y += \
> jpeg_v5_0_0.o \
> jpeg_v5_0_1.o \
> jpeg_v5_0_2.o \
> + jpeg_v5_0_interrupt.o \
> jpeg_v5_3_0.o
>
> # add VPE block
> diff --git a/drivers/gpu/drm/amd/amdgpu/jpeg_v5_0_1.c
> b/drivers/gpu/drm/amd/amdgpu/jpeg_v5_0_1.c
> index edecbfe66c79..6e5611921eda 100644
> --- a/drivers/gpu/drm/amd/amdgpu/jpeg_v5_0_1.c
> +++ b/drivers/gpu/drm/amd/amdgpu/jpeg_v5_0_1.c
> @@ -34,6 +34,8 @@
> #include "vcn/vcn_5_0_0_sh_mask.h"
> #include "ivsrcid/vcn/irqsrcs_vcn_5_0.h"
>
> +#include "jpeg_v5_0_interrupt.h"
> +
> static int jpeg_v5_0_1_start_sriov(struct amdgpu_device *adev);
> static void jpeg_v5_0_1_set_dec_ring_funcs(struct amdgpu_device *adev);
> static void jpeg_v5_0_1_set_irq_funcs(struct amdgpu_device *adev);
> @@ -759,60 +761,7 @@ static int jpeg_v5_0_1_process_interrupt(struct
> amdgpu_device *adev,
> struct amdgpu_irq_src *source,
> struct amdgpu_iv_entry *entry)
> {
> - u32 i, inst;
> -
> - i = node_id_to_phys_map[entry->node_id];
> - DRM_DEV_DEBUG(adev->dev, "IH: JPEG TRAP\n");
> -
> - for (inst = 0; inst < adev->jpeg.num_jpeg_inst; ++inst)
> - if (adev->jpeg.inst[inst].aid_id == i)
> - break;
> -
> - if (inst >= adev->jpeg.num_jpeg_inst) {
> - dev_WARN_ONCE(adev->dev, 1,
> - "Interrupt received for unknown JPEG instance
> %d",
> - entry->node_id);
> - return 0;
> - }
> -
> - switch (entry->src_id) {
> - case VCN_5_0__SRCID__JPEG_DECODE:
> - amdgpu_fence_process(&adev->jpeg.inst[inst].ring_dec[0]);
> - break;
> - case VCN_5_0__SRCID__JPEG1_DECODE:
> - amdgpu_fence_process(&adev->jpeg.inst[inst].ring_dec[1]);
> - break;
> - case VCN_5_0__SRCID__JPEG2_DECODE:
> - amdgpu_fence_process(&adev->jpeg.inst[inst].ring_dec[2]);
> - break;
> - case VCN_5_0__SRCID__JPEG3_DECODE:
> - amdgpu_fence_process(&adev->jpeg.inst[inst].ring_dec[3]);
> - break;
> - case VCN_5_0__SRCID__JPEG4_DECODE:
> - amdgpu_fence_process(&adev->jpeg.inst[inst].ring_dec[4]);
> - break;
> - case VCN_5_0__SRCID__JPEG5_DECODE:
> - amdgpu_fence_process(&adev->jpeg.inst[inst].ring_dec[5]);
> - break;
> - case VCN_5_0__SRCID__JPEG6_DECODE:
> - amdgpu_fence_process(&adev->jpeg.inst[inst].ring_dec[6]);
> - break;
> - case VCN_5_0__SRCID__JPEG7_DECODE:
> - amdgpu_fence_process(&adev->jpeg.inst[inst].ring_dec[7]);
> - break;
> - case VCN_5_0__SRCID__JPEG8_DECODE:
> - amdgpu_fence_process(&adev->jpeg.inst[inst].ring_dec[8]);
> - break;
> - case VCN_5_0__SRCID__JPEG9_DECODE:
> - amdgpu_fence_process(&adev->jpeg.inst[inst].ring_dec[9]);
> - break;
> - default:
> - DRM_DEV_ERROR(adev->dev, "Unhandled interrupt: %d %d\n",
> - entry->src_id, entry->src_data[0]);
> - break;
> - }
> -
> - return 0;
> + return jpeg_v5_0_process_interrupt_common(adev, entry);
> }
>
> static void jpeg_v5_0_1_core_stall_reset(struct amdgpu_ring *ring)
> diff --git a/drivers/gpu/drm/amd/amdgpu/jpeg_v5_0_2.c
> b/drivers/gpu/drm/amd/amdgpu/jpeg_v5_0_2.c
> index 285c459379c4..daea95907639 100644
> --- a/drivers/gpu/drm/amd/amdgpu/jpeg_v5_0_2.c
> +++ b/drivers/gpu/drm/amd/amdgpu/jpeg_v5_0_2.c
> @@ -34,6 +34,8 @@
> #include "vcn/vcn_5_0_0_sh_mask.h"
> #include "ivsrcid/vcn/irqsrcs_vcn_5_0.h"
>
> +#include "jpeg_v5_0_interrupt.h"
> +
> static void jpeg_v5_0_2_set_dec_ring_funcs(struct amdgpu_device *adev);
> static void jpeg_v5_0_2_set_irq_funcs(struct amdgpu_device *adev);
> static int jpeg_v5_0_2_set_powergating_state(struct amdgpu_ip_block
> *ip_block,
> @@ -587,60 +589,7 @@ static int jpeg_v5_0_2_process_interrupt(struct
> amdgpu_device *adev,
> struct amdgpu_irq_src *source,
> struct amdgpu_iv_entry *entry)
> {
> - u32 i, inst;
> -
> - i = node_id_to_phys_map[entry->node_id];
> - DRM_DEV_DEBUG(adev->dev, "IH: JPEG TRAP\n");
> -
> - for (inst = 0; inst < adev->jpeg.num_jpeg_inst; ++inst)
> - if (adev->jpeg.inst[inst].aid_id == i)
> - break;
> -
> - if (inst >= adev->jpeg.num_jpeg_inst) {
> - dev_WARN_ONCE(adev->dev, 1,
> - "Interrupt received for unknown JPEG instance
> %d",
> - entry->node_id);
> - return 0;
> - }
> -
> - switch (entry->src_id) {
> - case VCN_5_0__SRCID__JPEG_DECODE:
> - amdgpu_fence_process(&adev->jpeg.inst[inst].ring_dec[0]);
> - break;
> - case VCN_5_0__SRCID__JPEG1_DECODE:
> - amdgpu_fence_process(&adev->jpeg.inst[inst].ring_dec[1]);
> - break;
> - case VCN_5_0__SRCID__JPEG2_DECODE:
> - amdgpu_fence_process(&adev->jpeg.inst[inst].ring_dec[2]);
> - break;
> - case VCN_5_0__SRCID__JPEG3_DECODE:
> - amdgpu_fence_process(&adev->jpeg.inst[inst].ring_dec[3]);
> - break;
> - case VCN_5_0__SRCID__JPEG4_DECODE:
> - amdgpu_fence_process(&adev->jpeg.inst[inst].ring_dec[4]);
> - break;
> - case VCN_5_0__SRCID__JPEG5_DECODE:
> - amdgpu_fence_process(&adev->jpeg.inst[inst].ring_dec[5]);
> - break;
> - case VCN_5_0__SRCID__JPEG6_DECODE:
> - amdgpu_fence_process(&adev->jpeg.inst[inst].ring_dec[6]);
> - break;
> - case VCN_5_0__SRCID__JPEG7_DECODE:
> - amdgpu_fence_process(&adev->jpeg.inst[inst].ring_dec[7]);
> - break;
> - case VCN_5_0__SRCID__JPEG8_DECODE:
> - amdgpu_fence_process(&adev->jpeg.inst[inst].ring_dec[8]);
> - break;
> - case VCN_5_0__SRCID__JPEG9_DECODE:
> - amdgpu_fence_process(&adev->jpeg.inst[inst].ring_dec[9]);
> - break;
> - default:
> - DRM_DEV_ERROR(adev->dev, "Unhandled interrupt: %d %d\n",
> - entry->src_id, entry->src_data[0]);
> - break;
> - }
> -
> - return 0;
> + return jpeg_v5_0_process_interrupt_common(adev, entry);
> }
>
> static void jpeg_v5_0_2_core_stall_reset(struct amdgpu_ring *ring)
> diff --git a/drivers/gpu/drm/amd/amdgpu/jpeg_v5_0_interrupt.c
> b/drivers/gpu/drm/amd/amdgpu/jpeg_v5_0_interrupt.c
> new file mode 100644
> index 000000000000..a76ee6586b63
> --- /dev/null
> +++ b/drivers/gpu/drm/amd/amdgpu/jpeg_v5_0_interrupt.c
> @@ -0,0 +1,64 @@
> +// SPDX-License-Identifier: GPL-2.0 OR MIT
> +
> +#include "amdgpu.h"
> +#include "ivsrcid/vcn/irqsrcs_vcn_5_0.h"
> +#include "jpeg_v5_0_interrupt.h"
> +
> +int jpeg_v5_0_process_interrupt_common(struct amdgpu_device *adev,
> + struct amdgpu_iv_entry *entry)
> +{
> + u32 i, inst;
> +
> + i = node_id_to_phys_map[entry->node_id];
> + DRM_DEV_DEBUG(adev->dev, "IH: JPEG TRAP\n");
> +
> + for (inst = 0; inst < adev->jpeg.num_jpeg_inst; ++inst)
> + if (adev->jpeg.inst[inst].aid_id == i)
> + break;
> +
> + if (inst >= adev->jpeg.num_jpeg_inst) {
> + dev_WARN_ONCE(adev->dev, 1,
> + "Interrupt received for unknown JPEG instance
> %d",
> + entry->node_id);
> + return 0;
> + }
> +
> + switch (entry->src_id) {
> + case VCN_5_0__SRCID__JPEG_DECODE:
> + amdgpu_fence_process(&adev->jpeg.inst[inst].ring_dec[0]);
> + break;
> + case VCN_5_0__SRCID__JPEG1_DECODE:
> + amdgpu_fence_process(&adev->jpeg.inst[inst].ring_dec[1]);
> + break;
> + case VCN_5_0__SRCID__JPEG2_DECODE:
> + amdgpu_fence_process(&adev->jpeg.inst[inst].ring_dec[2]);
> + break;
> + case VCN_5_0__SRCID__JPEG3_DECODE:
> + amdgpu_fence_process(&adev->jpeg.inst[inst].ring_dec[3]);
> + break;
> + case VCN_5_0__SRCID__JPEG4_DECODE:
> + amdgpu_fence_process(&adev->jpeg.inst[inst].ring_dec[4]);
> + break;
> + case VCN_5_0__SRCID__JPEG5_DECODE:
> + amdgpu_fence_process(&adev->jpeg.inst[inst].ring_dec[5]);
> + break;
> + case VCN_5_0__SRCID__JPEG6_DECODE:
> + amdgpu_fence_process(&adev->jpeg.inst[inst].ring_dec[6]);
> + break;
> + case VCN_5_0__SRCID__JPEG7_DECODE:
> + amdgpu_fence_process(&adev->jpeg.inst[inst].ring_dec[7]);
> + break;
> + case VCN_5_0__SRCID__JPEG8_DECODE:
> + amdgpu_fence_process(&adev->jpeg.inst[inst].ring_dec[8]);
> + break;
> + case VCN_5_0__SRCID__JPEG9_DECODE:
> + amdgpu_fence_process(&adev->jpeg.inst[inst].ring_dec[9]);
> + break;
> + default:
> + DRM_DEV_ERROR(adev->dev, "Unhandled interrupt: %d %d\n",
> + entry->src_id, entry->src_data[0]);
> + break;
> + }
> +
> + return 0;
> +}
> diff --git a/drivers/gpu/drm/amd/amdgpu/jpeg_v5_0_interrupt.h
> b/drivers/gpu/drm/amd/amdgpu/jpeg_v5_0_interrupt.h
> new file mode 100644
> index 000000000000..046bcb4a3906
> --- /dev/null
> +++ b/drivers/gpu/drm/amd/amdgpu/jpeg_v5_0_interrupt.h
> @@ -0,0 +1,12 @@
> +/* SPDX-License-Identifier: GPL-2.0 OR MIT */
> +
> +#ifndef __JPEG_V5_0_INTERRUPT_H__
> +#define __JPEG_V5_0_INTERRUPT_H__
> +
> +struct amdgpu_device;
> +struct amdgpu_iv_entry;
> +
> +int jpeg_v5_0_process_interrupt_common(struct amdgpu_device *adev,
> + struct amdgpu_iv_entry *entry);
> +
> +#endif /* __JPEG_V5_0_INTERRUPT_H__ */
> --
> 2.43.0
>
