[PATCH 11/13] drm/xe/memirq: Refactor xe_memirq_hwe_handler

[Michal Wajdeczko <michal.wajdeczko@intel.com>]

We can use helper functions that take care of adjusting source
and status vector offsets based on the MSI-X support, no need
to duplicate logic here.

Signed-off-by: Michal Wajdeczko <michal.wajdeczko@intel.com>
---
 drivers/gpu/drm/xe/xe_memirq.c | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/drivers/gpu/drm/xe/xe_memirq.c b/drivers/gpu/drm/xe/xe_memirq.c
index f5e139f4525b..30266b258087 100644
--- a/drivers/gpu/drm/xe/xe_memirq.c
+++ b/drivers/gpu/drm/xe/xe_memirq.c
@@ -493,16 +493,18 @@ static void memirq_dispatch_guc(struct xe_memirq *memirq, struct iosys_map *stat
  */
 void xe_memirq_hwe_handler(struct xe_memirq *memirq, struct xe_hw_engine *hwe)
 {
-	u16 offset = hwe->irq_offset;
-	u16 instance = hw_reports_to_instance_zero(memirq) ? hwe->instance : 0;
-	struct iosys_map src_offset = IOSYS_MAP_INIT_OFFSET(&memirq->bo->vmap,
-							    XE_MEMIRQ_SOURCE_OFFSET(instance));
+	struct iosys_map source_map =
+		IOSYS_MAP_INIT_OFFSET(&memirq->bo->vmap,
+				      memirq_source_page_offset(memirq, hwe->instance));
 
-	if (memirq_received(memirq, &src_offset, offset, "SRC")) {
-		struct iosys_map status_offset =
+	if (memirq_received(memirq, &source_map, hwe->irq_offset, "SRC")) {
+		struct iosys_map status_map =
 			IOSYS_MAP_INIT_OFFSET(&memirq->bo->vmap,
-					      XE_MEMIRQ_STATUS_OFFSET(instance) + offset * SZ_16);
-		memirq_dispatch_engine(memirq, &status_offset, hwe);
+					      memirq_status_vector_offset(memirq,
+									  hwe->irq_offset,
+									  hwe->instance));
+
+		memirq_dispatch_engine(memirq, &status_map, hwe);
 	}
 }
 
-- 
2.47.1