diff options
Diffstat (limited to 'drivers/gpu/nvgpu')
-rw-r--r-- | drivers/gpu/nvgpu/Makefile | 2 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/common/linux/module.c | 2 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/common/linux/sim.c (renamed from drivers/gpu/nvgpu/common/linux/sim_gk20a.c) | 2 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/common/linux/sim.h (renamed from drivers/gpu/nvgpu/common/linux/sim_gk20a.h) | 5 |
4 files changed, 5 insertions, 6 deletions
diff --git a/drivers/gpu/nvgpu/Makefile b/drivers/gpu/nvgpu/Makefile index ef8237f3..8a95065f 100644 --- a/drivers/gpu/nvgpu/Makefile +++ b/drivers/gpu/nvgpu/Makefile | |||
@@ -48,7 +48,7 @@ nvgpu-y := \ | |||
48 | common/linux/sched.o \ | 48 | common/linux/sched.o \ |
49 | common/linux/channel.o \ | 49 | common/linux/channel.o \ |
50 | common/linux/ce2.o \ | 50 | common/linux/ce2.o \ |
51 | common/linux/sim_gk20a.o \ | 51 | common/linux/sim.o \ |
52 | common/mm/nvgpu_allocator.o \ | 52 | common/mm/nvgpu_allocator.o \ |
53 | common/mm/bitmap_allocator.o \ | 53 | common/mm/bitmap_allocator.o \ |
54 | common/mm/buddy_allocator.o \ | 54 | common/mm/buddy_allocator.o \ |
diff --git a/drivers/gpu/nvgpu/common/linux/module.c b/drivers/gpu/nvgpu/common/linux/module.c index 950b1581..4fe38588 100644 --- a/drivers/gpu/nvgpu/common/linux/module.c +++ b/drivers/gpu/nvgpu/common/linux/module.c | |||
@@ -47,7 +47,7 @@ | |||
47 | #include "intr.h" | 47 | #include "intr.h" |
48 | #include "cde.h" | 48 | #include "cde.h" |
49 | #include "ioctl.h" | 49 | #include "ioctl.h" |
50 | #include "sim_gk20a.h" | 50 | #include "sim.h" |
51 | #ifdef CONFIG_TEGRA_19x_GPU | 51 | #ifdef CONFIG_TEGRA_19x_GPU |
52 | #include "nvgpu_gpuid_t19x.h" | 52 | #include "nvgpu_gpuid_t19x.h" |
53 | #ifdef CONFIG_TEGRA_GR_VIRTUALIZATION | 53 | #ifdef CONFIG_TEGRA_GR_VIRTUALIZATION |
diff --git a/drivers/gpu/nvgpu/common/linux/sim_gk20a.c b/drivers/gpu/nvgpu/common/linux/sim.c index 6b148df6..b7481784 100644 --- a/drivers/gpu/nvgpu/common/linux/sim_gk20a.c +++ b/drivers/gpu/nvgpu/common/linux/sim.c | |||
@@ -22,7 +22,7 @@ | |||
22 | #include <nvgpu/linux/vm.h> | 22 | #include <nvgpu/linux/vm.h> |
23 | 23 | ||
24 | #include "gk20a/gk20a.h" | 24 | #include "gk20a/gk20a.h" |
25 | #include "sim_gk20a.h" | 25 | #include "sim.h" |
26 | 26 | ||
27 | #include <nvgpu/hw/gk20a/hw_sim_gk20a.h> | 27 | #include <nvgpu/hw/gk20a/hw_sim_gk20a.h> |
28 | 28 | ||
diff --git a/drivers/gpu/nvgpu/common/linux/sim_gk20a.h b/drivers/gpu/nvgpu/common/linux/sim.h index c2d975b1..a9ec0dba 100644 --- a/drivers/gpu/nvgpu/common/linux/sim_gk20a.h +++ b/drivers/gpu/nvgpu/common/linux/sim.h | |||
@@ -1,5 +1,4 @@ | |||
1 | /* | 1 | /* |
2 | * drivers/video/tegra/host/gk20a/sim_gk20a.h | ||
3 | * | 2 | * |
4 | * GK20A sim support | 3 | * GK20A sim support |
5 | * | 4 | * |
@@ -18,8 +17,8 @@ | |||
18 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | 17 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
19 | */ | 18 | */ |
20 | 19 | ||
21 | #ifndef __SIM_GK20A_LINUX_H__ | 20 | #ifndef __SIM_LINUX_H__ |
22 | #define __SIM_GK20A_LINUX_H__ | 21 | #define __SIM_LINUX_H__ |
23 | 22 | ||
24 | #include "gk20a/sim_gk20a.h" | 23 | #include "gk20a/sim_gk20a.h" |
25 | 24 | ||