nv-tegra-mirror/linux-nvgpu
1
0
Fork 0
mirror of git://nv-tegra.nvidia.com/linux-nvgpu.git synced 2025-12-24 10:34:43 +03:00
Code Issues Packages Projects Releases Wiki Activity

gpu: nvgpu: created os-agnostic sim header.

Browse Source 
added a os-agnostic sim.h header which could be
included in by any platform, moved out os specific
headers to nvgpu/linux.

JIRA VQRM-2368

Change-Id: I3861bfa75a6b8d2d909bc7223467fd68c208275b
Signed-off-by: Antony Clince Alex <aalex@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/1702816
Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com>
Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>
This commit is contained in:
Antony Clince Alex
2018-04-26 09:59:35 +05:30
committed by mobile promotions
parent 50d1b0c72b
commit 7e66f2a63d
11 changed files with 31 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/gpu/nvgpu/common/linux/module.c
View File

@@ -41,6 +41,7 @@
#include <nvgpu/debug.h>
#include <nvgpu/ctxsw_trace.h>
#include <nvgpu/vidmem.h>
#include <nvgpu/sim.h>
#include "platform_gk20a.h"
#include "sysfs.h"
@@ -51,7 +52,6 @@
#include "module_usermode.h"
#include "intr.h"
#include "ioctl.h"
#include "sim.h"
#include "os_linux.h"
#include "ctxsw_trace.h"

3
drivers/gpu/nvgpu/common/linux/pci.c
View File

@@ -35,8 +35,7 @@
#include "sysfs.h"
#include "os_linux.h"
#include "platform_gk20a.h"
#include "sim.h"
#include "sim_pci.h"
#include <nvgpu/sim.h>
#include "pci.h"
#include "pci_usermode.h"

7
drivers/gpu/nvgpu/common/linux/sim.c
View File

@@ -25,11 +25,11 @@
#include <nvgpu/dma.h>
#include <nvgpu/soc.h>
#include <nvgpu/hw_sim.h>
#include <nvgpu/sim.h>
#include "gk20a/gk20a.h"
#include "platform_gk20a.h"
#include "os_linux.h"
#include "module.h"
#include "sim.h" /* will be removed in next patch */
void sim_writel(struct sim_nvgpu *sim, u32 r, u32 v)
{
@@ -51,10 +51,9 @@ void nvgpu_remove_sim_support_linux(struct gk20a *g)
{
struct sim_nvgpu_linux *sim_linux;
if (!g->sim) {
nvgpu_warn(g, "sim not allocated or not in sim_mode");
if (!g->sim)
return;
}
sim_linux = container_of(g->sim, struct sim_nvgpu_linux, sim);
if (sim_linux->regs) {
sim_writel(g->sim, sim_config_r(), sim_config_mode_disabled_v());

43
drivers/gpu/nvgpu/common/linux/sim.h
View File

@@ -1,43 +0,0 @@
/*
*
* nvgpu sim support
*
* Copyright (c) 2018, 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 <http://www.gnu.org/licenses/>.
*/
#ifndef __SIM_LINUX_H__
#define __SIM_LINUX_H__
#include <nvgpu/nvgpu_mem.h>
#include "gk20a/sim_gk20a.h"
struct sim_nvgpu_linux {
struct sim_nvgpu sim;
struct resource *reg_mem;
void __iomem *regs;
void (*remove_support_linux)(struct gk20a *g);
};
void sim_writel(struct sim_nvgpu *sim, u32 r, u32 v);
u32 sim_readl(struct sim_nvgpu *sim, u32 r);
int nvgpu_init_sim_support(struct gk20a *g); /* will be moved to common in subsequent patch */
int nvgpu_alloc_sim_buffer(struct gk20a *g, struct nvgpu_mem *mem); /* will be moved to common in subsequent patch */
void nvgpu_free_sim_buffer(struct gk20a *g, struct nvgpu_mem *mem); /* will be moved to common in subsequent patch */
void nvgpu_free_sim_support(struct gk20a *g); /* will be moved to common in subsequent patch */
void nvgpu_remove_sim_support(struct gk20a *g); /* will be moved to common in subsequent patch */
int nvgpu_init_sim_support_linux(struct gk20a *g,
struct platform_device *dev);
void nvgpu_remove_sim_support_linux(struct gk20a *g);
#endif

4
drivers/gpu/nvgpu/common/linux/sim_pci.c
View File

@@ -24,11 +24,10 @@
#include <nvgpu/nvgpu_mem.h>
#include <nvgpu/dma.h>
#include <nvgpu/hw_sim_pci.h>
#include <nvgpu/sim.h>
#include "gk20a/gk20a.h"
#include "os_linux.h"
#include "module.h"
#include "sim.h" /* will be removed in subsequent patches */
#include "sim_pci.h"/* will be removed in subsequent patches */
static bool _nvgpu_pci_is_simulation(struct gk20a *g, u32 sim_base)
{
@@ -50,7 +49,6 @@ void nvgpu_remove_sim_support_linux_pci(struct gk20a *g)
is_simulation = _nvgpu_pci_is_simulation(g, sim_r());
if (!is_simulation) {
nvgpu_warn(g, "not in sim_mode");
return;
}

29
drivers/gpu/nvgpu/common/linux/sim_pci.h
View File

@@ -1,29 +0,0 @@
/*
*
* GK20A sim support
*
* Copyright (c) 2018, 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 <http://www.gnu.org/licenses/>.
*/
#ifndef __SIM_PCI_LINUX_H__
#define __SIM_PCI_LINUX_H__
#include "gk20a/sim_gk20a.h"
#include "sim.h"
int nvgpu_init_sim_support_pci(struct gk20a *g); /* this will be moved */
int nvgpu_init_sim_support_linux_pci(struct gk20a *g);
void nvgpu_remove_sim_support_linux_pci(struct gk20a *g);
#endif