From 3429657f9308b27e4721d88b1c1c307b23bfb316 Mon Sep 17 00:00:00 2001 From: Richard Zhao Date: Thu, 6 Apr 2017 17:32:14 -0700 Subject: gpu: nvgpu: vgpu: merge tegra_vgpu_t18x.h to tegra_vgpu.h No need to keep two vgpu headers anymore. Jira VFND-3796 Change-Id: I400cbfa5b2c0e62963eff247adcd9483be975379 Signed-off-by: Richard Zhao Reviewed-on: http://git-master/r/1457480 Reviewed-by: mobile promotions Tested-by: mobile promotions --- drivers/gpu/nvgpu/vgpu/gp10b/vgpu_gr_gp10b.c | 3 -- include/linux/tegra_vgpu.h | 25 ++++++++++++----- include/linux/tegra_vgpu_t18x.h | 42 ---------------------------- 3 files changed, 18 insertions(+), 52 deletions(-) delete mode 100644 include/linux/tegra_vgpu_t18x.h diff --git a/drivers/gpu/nvgpu/vgpu/gp10b/vgpu_gr_gp10b.c b/drivers/gpu/nvgpu/vgpu/gp10b/vgpu_gr_gp10b.c index da41abd4..1a5811fe 100644 --- a/drivers/gpu/nvgpu/vgpu/gp10b/vgpu_gr_gp10b.c +++ b/drivers/gpu/nvgpu/vgpu/gp10b/vgpu_gr_gp10b.c @@ -117,9 +117,6 @@ static int vgpu_gr_gp10b_set_ctxsw_preemption_mode(struct gk20a *g, &msg.params.gr_bind_ctxsw_buffers; int err = 0; - WARN_ON(TEGRA_VGPU_GR_BIND_CTXSW_BUFFER_MAX != - TEGRA_VGPU_GR_BIND_CTXSW_BUFFER_LAST); - if (class == PASCAL_A && g->gr.t18x.ctx_vars.force_preemption_gfxp) graphics_preempt_mode = NVGPU_GRAPHICS_PREEMPTION_MODE_GFXP; diff --git a/include/linux/tegra_vgpu.h b/include/linux/tegra_vgpu.h index bb9bdcab..d9a6f7fd 100644 --- a/include/linux/tegra_vgpu.h +++ b/include/linux/tegra_vgpu.h @@ -19,10 +19,6 @@ #ifndef __TEGRA_VGPU_H #define __TEGRA_VGPU_H -#ifdef CONFIG_ARCH_TEGRA_18x_SOC -#include -#endif - enum { TEGRA_VGPU_MODULE_GPU = 0, }; @@ -139,6 +135,7 @@ enum { TEGRA_VGPU_ATTRIB_TPC_COUNT = 19, /* deprecated */ TEGRA_VGPU_ATTRIB_GPC0_TPC_COUNT = 20, /* deprecated */ TEGRA_VGPU_ATTRIB_MAX_FREQ = 21, /* deprecated */ + TEGRA_VGPU_ATTRIB_PREEMPT_CTX_SIZE = 64, /* gap to hide T18x IP */ }; struct tegra_vgpu_attrib_params { @@ -281,12 +278,26 @@ struct tegra_vgpu_zbc_query_table_params { u32 index_size; /* [out] size, [in] index */ }; -#define TEGRA_VGPU_GR_BIND_CTXSW_BUFFER_MAX 4 +enum { + TEGRA_VGPU_GR_BIND_CTXSW_BUFFER_MAIN, + TEGRA_VGPU_GR_BIND_CTXSW_BUFFER_SPILL, + TEGRA_VGPU_GR_BIND_CTXSW_BUFFER_PAGEPOOL, + TEGRA_VGPU_GR_BIND_CTXSW_BUFFER_BETACB, + TEGRA_VGPU_GR_BIND_CTXSW_BUFFER_LAST +}; + +enum { + TEGRA_VGPU_GR_CTXSW_PREEMPTION_MODE_WFI, + TEGRA_VGPU_GR_CTXSW_PREEMPTION_MODE_GFX_GFXP, + TEGRA_VGPU_GR_CTXSW_PREEMPTION_MODE_COMPUTE_CTA, + TEGRA_VGPU_GR_CTXSW_PREEMPTION_MODE_COMPUTE_CILP, + TEGRA_VGPU_GR_CTXSW_PREEMPTION_MODE_LAST +}; struct tegra_vgpu_gr_bind_ctxsw_buffers_params { u64 handle; /* deprecated */ - u64 gpu_va[TEGRA_VGPU_GR_BIND_CTXSW_BUFFER_MAX]; - u64 size[TEGRA_VGPU_GR_BIND_CTXSW_BUFFER_MAX]; + u64 gpu_va[TEGRA_VGPU_GR_BIND_CTXSW_BUFFER_LAST]; + u64 size[TEGRA_VGPU_GR_BIND_CTXSW_BUFFER_LAST]; u32 mode; u64 gr_ctx_handle; }; diff --git a/include/linux/tegra_vgpu_t18x.h b/include/linux/tegra_vgpu_t18x.h deleted file mode 100644 index 121f4103..00000000 --- a/include/linux/tegra_vgpu_t18x.h +++ /dev/null @@ -1,42 +0,0 @@ -/* - * Tegra GPU Virtualization Interfaces to Server - * - * Copyright (c) 2015, 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. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#ifndef __TEGRA_VGPU_T18X_H -#define __TEGRA_VGPU_T18X_H - -enum { - TEGRA_VGPU_GR_BIND_CTXSW_BUFFER_MAIN, - TEGRA_VGPU_GR_BIND_CTXSW_BUFFER_SPILL, - TEGRA_VGPU_GR_BIND_CTXSW_BUFFER_PAGEPOOL, - TEGRA_VGPU_GR_BIND_CTXSW_BUFFER_BETACB, - TEGRA_VGPU_GR_BIND_CTXSW_BUFFER_LAST -}; - -enum { - TEGRA_VGPU_GR_CTXSW_PREEMPTION_MODE_WFI, - TEGRA_VGPU_GR_CTXSW_PREEMPTION_MODE_GFX_GFXP, - TEGRA_VGPU_GR_CTXSW_PREEMPTION_MODE_COMPUTE_CTA, - TEGRA_VGPU_GR_CTXSW_PREEMPTION_MODE_COMPUTE_CILP, - TEGRA_VGPU_GR_CTXSW_PREEMPTION_MODE_LAST -}; - -enum { - TEGRA_VGPU_ATTRIB_PREEMPT_CTX_SIZE = 64 -}; - -#endif -- cgit v1.2.2