From 73679f1ec8f2652ef8c4ad364d9e558f4068b715 Mon Sep 17 00:00:00 2001 From: Rajesh Devaraj Date: Wed, 25 Jan 2023 15:29:21 +0000 Subject: [PATCH] gpu: nvgpu: update enable_fifo_interrupts To reuse enable_fifo_interrupts API in future chips, this patch renames it as ga10b_fifo_enable_intr and adds it to FIFO specific header file. JIRA NVGPU-9325 Change-Id: I9f313e417281d5861f568bd41593c5135d9c77a9 Signed-off-by: Rajesh Devaraj Reviewed-on: https://git-master.nvidia.com/r/c/linux-nvgpu/+/2848816 Reviewed-by: svcacv Reviewed-by: svc-mobile-coverity Reviewed-by: svc-mobile-misra Reviewed-by: svc-mobile-cert Reviewed-by: Seema Khowala GVS: Gerrit_Virtual_Submit --- drivers/gpu/nvgpu/hal/fifo/fifo_ga10b.h | 3 ++- drivers/gpu/nvgpu/hal/fifo/fifo_ga10b_fusa.c | 6 +++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/drivers/gpu/nvgpu/hal/fifo/fifo_ga10b.h b/drivers/gpu/nvgpu/hal/fifo/fifo_ga10b.h index cef1d26d3..520b7da94 100644 --- a/drivers/gpu/nvgpu/hal/fifo/fifo_ga10b.h +++ b/drivers/gpu/nvgpu/hal/fifo/fifo_ga10b.h @@ -1,7 +1,7 @@ /* * GA10B Fifo * - * Copyright (c) 2020, NVIDIA CORPORATION. All rights reserved. + * Copyright (c) 2020-2023, NVIDIA CORPORATION. All rights reserved. * * Permission is hereby granted, free of charge, to any person obtaining a * copy of this software and associated documentation files (the "Software"), @@ -32,5 +32,6 @@ struct gk20a; int ga10b_init_fifo_reset_enable_hw(struct gk20a *g); int ga10b_init_fifo_setup_hw(struct gk20a *g); u32 ga10b_fifo_mmu_fault_id_to_pbdma_id(struct gk20a *g, u32 mmu_fault_id); +void ga10b_fifo_enable_intr(struct gk20a *g); #endif /* NVGPU_FIFO_GA10B_H */ diff --git a/drivers/gpu/nvgpu/hal/fifo/fifo_ga10b_fusa.c b/drivers/gpu/nvgpu/hal/fifo/fifo_ga10b_fusa.c index b44e272d9..a64af3902 100644 --- a/drivers/gpu/nvgpu/hal/fifo/fifo_ga10b_fusa.c +++ b/drivers/gpu/nvgpu/hal/fifo/fifo_ga10b_fusa.c @@ -1,7 +1,7 @@ /* * GA10B Fifo * - * Copyright (c) 2020-2021, NVIDIA CORPORATION. All rights reserved. + * Copyright (c) 2020-2023, NVIDIA CORPORATION. All rights reserved. * * Permission is hereby granted, free of charge, to any person obtaining a * copy of this software and associated documentation files (the "Software"), @@ -36,7 +36,7 @@ #include "fifo_ga10b.h" #include "fifo_intr_ga10b.h" -static void enable_fifo_interrupts(struct gk20a *g) +void ga10b_fifo_enable_intr(struct gk20a *g) { g->ops.fifo.intr_top_enable(g, NVGPU_CIC_INTR_ENABLE); g->ops.fifo.intr_0_enable(g, true); @@ -133,7 +133,7 @@ int ga10b_init_fifo_setup_hw(struct gk20a *g) g->ops.usermode.setup_hw(g); - enable_fifo_interrupts(g); + ga10b_fifo_enable_intr(g); ga10b_fifo_config_userd_writeback_timer(g);