From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 0E30DCD37B8 for ; Sun, 10 May 2026 10:07:23 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 6D5A310E41B; Sun, 10 May 2026 10:07:06 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="Z89L4ZST"; dkim-atps=neutral Received: from mail-dy1-f194.google.com (mail-dy1-f194.google.com [74.125.82.194]) by gabe.freedesktop.org (Postfix) with ESMTPS id 1A8A410E12F for ; Sat, 9 May 2026 02:04:11 +0000 (UTC) Received: by mail-dy1-f194.google.com with SMTP id 5a478bee46e88-2f0d3e07e30so6742145eec.0 for ; Fri, 08 May 2026 19:04:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1778292251; x=1778897051; darn=lists.freedesktop.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=tqUPrapJmfk162jOprC1A32Q+Yo8c7HKbfTLBNJ4ZkA=; b=Z89L4ZSTY3YynYeQccIBQoBWvtEc02wrpuJ65Q17FYmNDcBitWBClfUMop04yOjof4 35EiwORDEV9RKOmL1mbugI2RJSvLgFp7tM9pyZQMcHnHIpaEH5iDgfdtzchIpmz6PNVg s5uBwi81pZ5GBJkpuXP/la+AfsBu34SGq/LlolWCOMnwYw4/b2jEwqoplL0Rpqi0S0KD nQ/8YwKAjDzA9xtA6HRCTA7QfJ3dZdq7mDgrMwARlJc3NoMHE7ruYNjBjEm+bemiwicK /N6M/nSAU6t6qjZssXhh0AWZy2HfdFsVN7rhQNzHsbwiMwTltr9wtyf4UVbCtiXmNMZ8 uGyw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1778292251; x=1778897051; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-gg:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=tqUPrapJmfk162jOprC1A32Q+Yo8c7HKbfTLBNJ4ZkA=; b=LVc/U7k6v7T5ghsXq8HWhzsiUr3NSEPW95bw21XYP04D2890cLdMIbsNudKQOVnu5T NaubAiaWnnz5ZMboas2P2HQbSWzoEgExoZBlTnYLsrwTtmoiP/6qUrNAqiFH+EHxuskG 7ooq7ep9+oE7y6kVb2Cgu4C4aS2XVrDRbWpI2H+mL+EPTr1kd3VgAj60Oq37rd5+eDju T8xycboEFYyojxMBwQfHAsVuJjh8rcApH7TTlQL88luraCWTY5ItcDkM0Lza+LuQ6maH nIg0lD9EQs6BBpLd+KN5VGunLI0GX1+JHm/kQxpCliJLo8nSDl7BhxtesZztJG7U4S48 ajWg== X-Forwarded-Encrypted: i=1; AFNElJ+ch99la6q6b3SCqQK43nN9h2h4EbhtvqXOX6xsaHblNStqM0KA589VNB0NZiEIvwj2D7LD7z9f/No=@lists.freedesktop.org X-Gm-Message-State: AOJu0Yxgbkkm2/jMAHMzIRRtC6WmaBKmNbp7EO24waIKw+jVU0dgzH6v 60EDk2GjGlj3cHz6Zilc/29VJV1/ROp2TGXjInQEG6YFycb2rTy6CN9c X-Gm-Gg: AeBDiet0t0ltpj9pFQh7LGkOeOFwCijjNUtjwFa68UjK8auGHGjLRkLGpsY5ft/5Od+ +N5u4u+JBau8Z5jp6eKXHZHhHZ0RNe+3g4UaXLb0YfTJFzGStphDGcF204RmpRCl2g3qJ3Hqu/A L5KsF/BGhawfx6xcwqqbzd7MxiuSo6t4mpAlKZRknpsb8Vws74uF5MaX//WVUi9umwrBFLSPaTn EXWZ2WfmfsyrDVC9j7G+xwEqVBJnPEV/I7VDy/rEU6WpPz8S4Dwpyn7ksmBvbhPi/3stdCBDmMD FVxMGqDOawn4txPs/EtsThZP/uGRHgbYlzXRxInQ60tRewSHxAzrai6ETNEHlO3RVPDWZSr4fqW w74e+gMg+fOU1wmCeN35BV2zLw1flhpaTJh475VTuYyX7MwJbuH6blYkUJavAr7QU0wTZTMEGEB 8zfei35dgJh8HZxf12e0uudDZ0HYSd7PCQguuTcfCDhecUe5LUwDO8 X-Received: by 2002:a05:7300:bc1a:b0:2c7:ea98:da0 with SMTP id 5a478bee46e88-2f54ac74b5fmr6826709eec.19.1778292250853; Fri, 08 May 2026 19:04:10 -0700 (PDT) Received: from localhost.localdomain ([2804:1b3:a540:acd8:1326:c2e7:da88:93e]) by smtp.gmail.com with ESMTPSA id 5a478bee46e88-2f8859eafcdsm5895619eec.6.2026.05.08.19.04.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 08 May 2026 19:04:10 -0700 (PDT) From: Andre Luiz Batista Bueno To: amd-gfx@lists.freedesktop.org, alexander.deucher@amd.com, christian.koenig@amd.com, airlied@gmail.com, simona@ffwll.ch Cc: enzo.spinella@usp.br, Andre Luiz Batista Bueno , dri-devel@lists.freedesktop.org Subject: [PATCH V1 RESEND] drm/amdgpu: deduplicate JPEG v5.0 interrupt routine Date: Fri, 8 May 2026 23:03:35 -0300 Message-ID: <20260509020339.262889-1-andrebueno.mac@gmail.com> X-Mailer: git-send-email 2.43.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Mailman-Approved-At: Sun, 10 May 2026 10:07:04 +0000 X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" 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 Co-developed-by: Enzo Furegatti Spinella Signed-off-by: Enzo Furegatti Spinella --- 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 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