From 8371833f4273c2d4a6f923eb3270b4ab93967743 Mon Sep 17 00:00:00 2001 From: Terje Bergstrom Date: Mon, 27 Oct 2014 11:03:00 +0200 Subject: gpu: nvgpu: Per-chip interrupt processing Move accesses to MC registers under HAL so that they can be reimplemented per chip. Do chip detection and HAL initialization only once. Bug 1567274 Change-Id: I20bf2f439d267d284bfd536f1a1dfb5d5a2dce4c Signed-off-by: Terje Bergstrom Reviewed-on: http://git-master/r/590385 --- drivers/gpu/nvgpu/gm20b/hal_gm20b.c | 2 ++ drivers/gpu/nvgpu/gm20b/mc_gm20b.c | 29 +++++++++++++++++++++++++++++ drivers/gpu/nvgpu/gm20b/mc_gm20b.h | 18 ++++++++++++++++++ 3 files changed, 49 insertions(+) create mode 100644 drivers/gpu/nvgpu/gm20b/mc_gm20b.c create mode 100644 drivers/gpu/nvgpu/gm20b/mc_gm20b.h (limited to 'drivers/gpu/nvgpu/gm20b') diff --git a/drivers/gpu/nvgpu/gm20b/hal_gm20b.c b/drivers/gpu/nvgpu/gm20b/hal_gm20b.c index ec786a44..574ad926 100644 --- a/drivers/gpu/nvgpu/gm20b/hal_gm20b.c +++ b/drivers/gpu/nvgpu/gm20b/hal_gm20b.c @@ -27,6 +27,7 @@ #include "mm_gm20b.h" #include "pmu_gm20b.h" #include "clk_gm20b.h" +#include "mc_gm20b.h" #include #include "regops_gm20b.h" @@ -113,6 +114,7 @@ int gm20b_init_hal(struct gpu_ops *gops) } #endif + gm20b_init_mc(gops); gm20b_init_ltc(gops); gm20b_init_gr(gops); gm20b_init_ltc(gops); diff --git a/drivers/gpu/nvgpu/gm20b/mc_gm20b.c b/drivers/gpu/nvgpu/gm20b/mc_gm20b.c new file mode 100644 index 00000000..22dce1e7 --- /dev/null +++ b/drivers/gpu/nvgpu/gm20b/mc_gm20b.c @@ -0,0 +1,29 @@ +/* + * GK20A memory interface + * + * Copyright (c) 2014, NVIDIA CORPORATION. All rights reserved. + * + * This program is free software; you can redistribute it and/or modify it + * under the terms and conditions of the GNU General Public License, + * version 2, as published by the Free Software Foundation. + * + * This program is distributed in the hope it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for + * more details. + */ + +#include + +#include "gk20a/gk20a.h" +#include "gk20a/mc_gk20a.h" +#include "mc_gm20b.h" + +void gm20b_init_mc(struct gpu_ops *gops) +{ + gops->mc.intr_enable = mc_gk20a_intr_enable; + gops->mc.isr_stall = mc_gk20a_isr_stall; + gops->mc.isr_nonstall = mc_gk20a_isr_nonstall; + gops->mc.isr_thread_stall = mc_gk20a_intr_thread_stall; + gops->mc.isr_thread_nonstall = mc_gk20a_intr_thread_nonstall; +} diff --git a/drivers/gpu/nvgpu/gm20b/mc_gm20b.h b/drivers/gpu/nvgpu/gm20b/mc_gm20b.h new file mode 100644 index 00000000..b19bf6fe --- /dev/null +++ b/drivers/gpu/nvgpu/gm20b/mc_gm20b.h @@ -0,0 +1,18 @@ +/* + * Copyright (c) 2014, NVIDIA CORPORATION. All rights reserved. + * + * This program is free software; you can redistribute it and/or modify it + * under the terms and conditions of the GNU General Public License, + * version 2, as published by the Free Software Foundation. + * + * This program is distributed in the hope it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for + * more details. + */ + +#ifndef MC_GM20B_H +#define MC_GM20B_H + +void gm20b_init_mc(struct gpu_ops *gops); +#endif -- cgit v1.2.2