gpu: nvgpu: Add NVIDIA GPU Driver

This patch moves the NVIDIA GPU driver to a new location.

Bug 1482562

Change-Id: I24293810b9d0f1504fd9be00135e21dad656ccb6
Signed-off-by: Arto Merilainen <amerilainen@nvidia.com>
Reviewed-on: http://git-master/r/383722
Reviewed-by: Terje Bergstrom <tbergstrom@nvidia.com>

diff --git a/drivers/Kconfig b/drivers/Kconfig
index 1b9b2e6c5a0758a6ca1be8db01f1d06363847ae1..71731fd36a5186bfd849f362d14cb5029ea1bc81 100644 (file)
--- a/drivers/Kconfig
+++ b/drivers/Kconfig
@@ -178,4 +178,6 @@ source "drivers/reset/Kconfig"
 
 source "drivers/edp/Kconfig"
 
+source "drivers/gpu/nvgpu/Kconfig"
+
 endmenu

diff --git a/drivers/gpu/Makefile b/drivers/gpu/Makefile
index d8a22c2a579d458c17f4fd5d7b57f5bdee13cf65..89cd272bdefed68c14307746376b9bfb32985c7b 100644 (file)
--- a/drivers/gpu/Makefile
+++ b/drivers/gpu/Makefile
@@ -1,2 +1,3 @@
 obj-y                  += drm/ vga/
 obj-$(CONFIG_TEGRA_HOST1X)     += host1x/
+obj-$(CONFIG_GK20A)    += nvgpu/gk20a/

diff --git a/drivers/video/tegra/host/gk20a/Kconfig b/drivers/gpu/nvgpu/Kconfig
similarity index 100%
rename from drivers/video/tegra/host/gk20a/Kconfig
rename to drivers/gpu/nvgpu/Kconfig

diff --git a/drivers/video/tegra/host/gk20a/Makefile b/drivers/gpu/nvgpu/gk20a/Makefile
similarity index 100%
rename from drivers/video/tegra/host/gk20a/Makefile
rename to drivers/gpu/nvgpu/gk20a/Makefile

diff --git a/drivers/video/tegra/host/gk20a/as_gk20a.c b/drivers/gpu/nvgpu/gk20a/as_gk20a.c
similarity index 100%
rename from drivers/video/tegra/host/gk20a/as_gk20a.c
rename to drivers/gpu/nvgpu/gk20a/as_gk20a.c

diff --git a/drivers/video/tegra/host/gk20a/as_gk20a.h b/drivers/gpu/nvgpu/gk20a/as_gk20a.h
similarity index 100%
rename from drivers/video/tegra/host/gk20a/as_gk20a.h
rename to drivers/gpu/nvgpu/gk20a/as_gk20a.h

diff --git a/drivers/video/tegra/host/gk20a/channel_gk20a.c b/drivers/gpu/nvgpu/gk20a/channel_gk20a.c
similarity index 100%
rename from drivers/video/tegra/host/gk20a/channel_gk20a.c
rename to drivers/gpu/nvgpu/gk20a/channel_gk20a.c

diff --git a/drivers/video/tegra/host/gk20a/channel_gk20a.h b/drivers/gpu/nvgpu/gk20a/channel_gk20a.h
similarity index 100%
rename from drivers/video/tegra/host/gk20a/channel_gk20a.h
rename to drivers/gpu/nvgpu/gk20a/channel_gk20a.h

diff --git a/drivers/video/tegra/host/gk20a/channel_sync_gk20a.c b/drivers/gpu/nvgpu/gk20a/channel_sync_gk20a.c
similarity index 99%
rename from drivers/video/tegra/host/gk20a/channel_sync_gk20a.c
rename to drivers/gpu/nvgpu/gk20a/channel_sync_gk20a.c
index 286e974e73334be30ee8d43274b85e3f67d561a0..9f9c3ba7ac71cdcc42f3261b79a3576f626473e5 100644 (file)
--- a/drivers/video/tegra/host/gk20a/channel_sync_gk20a.c
+++ b/drivers/gpu/nvgpu/gk20a/channel_sync_gk20a.c
@@ -21,7 +21,7 @@
 #include "gk20a.h"
 
 #ifdef CONFIG_SYNC
-#include "../../../../staging/android/sync.h"
+#include "../../../staging/android/sync.h"
 #endif
 
 #ifdef CONFIG_TEGRA_GK20A

diff --git a/drivers/video/tegra/host/gk20a/channel_sync_gk20a.h b/drivers/gpu/nvgpu/gk20a/channel_sync_gk20a.h
similarity index 100%
rename from drivers/video/tegra/host/gk20a/channel_sync_gk20a.h
rename to drivers/gpu/nvgpu/gk20a/channel_sync_gk20a.h

diff --git a/drivers/video/tegra/host/gk20a/clk_gk20a.c b/drivers/gpu/nvgpu/gk20a/clk_gk20a.c
similarity index 100%
rename from drivers/video/tegra/host/gk20a/clk_gk20a.c
rename to drivers/gpu/nvgpu/gk20a/clk_gk20a.c

diff --git a/drivers/video/tegra/host/gk20a/clk_gk20a.h b/drivers/gpu/nvgpu/gk20a/clk_gk20a.h
similarity index 100%
rename from drivers/video/tegra/host/gk20a/clk_gk20a.h
rename to drivers/gpu/nvgpu/gk20a/clk_gk20a.h

diff --git a/drivers/video/tegra/host/gk20a/ctrl_gk20a.c b/drivers/gpu/nvgpu/gk20a/ctrl_gk20a.c
similarity index 100%
rename from drivers/video/tegra/host/gk20a/ctrl_gk20a.c
rename to drivers/gpu/nvgpu/gk20a/ctrl_gk20a.c

diff --git a/drivers/video/tegra/host/gk20a/ctrl_gk20a.h b/drivers/gpu/nvgpu/gk20a/ctrl_gk20a.h
similarity index 100%
rename from drivers/video/tegra/host/gk20a/ctrl_gk20a.h
rename to drivers/gpu/nvgpu/gk20a/ctrl_gk20a.h

diff --git a/drivers/video/tegra/host/gk20a/dbg_gpu_gk20a.c b/drivers/gpu/nvgpu/gk20a/dbg_gpu_gk20a.c
similarity index 100%
rename from drivers/video/tegra/host/gk20a/dbg_gpu_gk20a.c
rename to drivers/gpu/nvgpu/gk20a/dbg_gpu_gk20a.c

diff --git a/drivers/video/tegra/host/gk20a/dbg_gpu_gk20a.h b/drivers/gpu/nvgpu/gk20a/dbg_gpu_gk20a.h
similarity index 100%
rename from drivers/video/tegra/host/gk20a/dbg_gpu_gk20a.h
rename to drivers/gpu/nvgpu/gk20a/dbg_gpu_gk20a.h

diff --git a/drivers/video/tegra/host/gk20a/debug_gk20a.c b/drivers/gpu/nvgpu/gk20a/debug_gk20a.c
similarity index 100%
rename from drivers/video/tegra/host/gk20a/debug_gk20a.c
rename to drivers/gpu/nvgpu/gk20a/debug_gk20a.c

diff --git a/drivers/video/tegra/host/gk20a/debug_gk20a.h b/drivers/gpu/nvgpu/gk20a/debug_gk20a.h
similarity index 100%
rename from drivers/video/tegra/host/gk20a/debug_gk20a.h
rename to drivers/gpu/nvgpu/gk20a/debug_gk20a.h

diff --git a/drivers/video/tegra/host/gk20a/fb_gk20a.c b/drivers/gpu/nvgpu/gk20a/fb_gk20a.c
similarity index 100%
rename from drivers/video/tegra/host/gk20a/fb_gk20a.c
rename to drivers/gpu/nvgpu/gk20a/fb_gk20a.c

diff --git a/drivers/video/tegra/host/gk20a/fb_gk20a.h b/drivers/gpu/nvgpu/gk20a/fb_gk20a.h
similarity index 100%
rename from drivers/video/tegra/host/gk20a/fb_gk20a.h
rename to drivers/gpu/nvgpu/gk20a/fb_gk20a.h

diff --git a/drivers/video/tegra/host/gk20a/fifo_gk20a.c b/drivers/gpu/nvgpu/gk20a/fifo_gk20a.c
similarity index 100%
rename from drivers/video/tegra/host/gk20a/fifo_gk20a.c
rename to drivers/gpu/nvgpu/gk20a/fifo_gk20a.c

diff --git a/drivers/video/tegra/host/gk20a/fifo_gk20a.h b/drivers/gpu/nvgpu/gk20a/fifo_gk20a.h
similarity index 100%
rename from drivers/video/tegra/host/gk20a/fifo_gk20a.h
rename to drivers/gpu/nvgpu/gk20a/fifo_gk20a.h

diff --git a/drivers/video/tegra/host/gk20a/gk20a.c b/drivers/gpu/nvgpu/gk20a/gk20a.c
similarity index 100%
rename from drivers/video/tegra/host/gk20a/gk20a.c
rename to drivers/gpu/nvgpu/gk20a/gk20a.c

diff --git a/drivers/video/tegra/host/gk20a/gk20a.h b/drivers/gpu/nvgpu/gk20a/gk20a.h
similarity index 99%
rename from drivers/video/tegra/host/gk20a/gk20a.h
rename to drivers/gpu/nvgpu/gk20a/gk20a.h
index 997a8781cd7d7c5aeebb4b197434da4c5023a193..a9081a9dfb1c94b71a7445641224c76e81c2fa82 100644 (file)
--- a/drivers/video/tegra/host/gk20a/gk20a.h
+++ b/drivers/gpu/nvgpu/gk20a/gk20a.h
@@ -33,7 +33,7 @@ struct sim_gk20a;
 #include <linux/nvhost_gpu_ioctl.h>
 #include <linux/tegra-soc.h>
 
-#include "../../../../../arch/arm/mach-tegra/iomap.h"
+#include "../../../arch/arm/mach-tegra/iomap.h"
 
 #include "as_gk20a.h"
 #include "clk_gk20a.h"

diff --git a/drivers/video/tegra/host/gk20a/gk20a_allocator.c b/drivers/gpu/nvgpu/gk20a/gk20a_allocator.c
similarity index 100%
rename from drivers/video/tegra/host/gk20a/gk20a_allocator.c
rename to drivers/gpu/nvgpu/gk20a/gk20a_allocator.c

diff --git a/drivers/video/tegra/host/gk20a/gk20a_allocator.h b/drivers/gpu/nvgpu/gk20a/gk20a_allocator.h
similarity index 100%
rename from drivers/video/tegra/host/gk20a/gk20a_allocator.h
rename to drivers/gpu/nvgpu/gk20a/gk20a_allocator.h

diff --git a/drivers/video/tegra/host/gk20a/gk20a_gating_reglist.c b/drivers/gpu/nvgpu/gk20a/gk20a_gating_reglist.c
similarity index 100%
rename from drivers/video/tegra/host/gk20a/gk20a_gating_reglist.c
rename to drivers/gpu/nvgpu/gk20a/gk20a_gating_reglist.c

diff --git a/drivers/video/tegra/host/gk20a/gk20a_gating_reglist.h b/drivers/gpu/nvgpu/gk20a/gk20a_gating_reglist.h
similarity index 100%
rename from drivers/video/tegra/host/gk20a/gk20a_gating_reglist.h
rename to drivers/gpu/nvgpu/gk20a/gk20a_gating_reglist.h

diff --git a/drivers/video/tegra/host/gk20a/gk20a_scale.c b/drivers/gpu/nvgpu/gk20a/gk20a_scale.c
similarity index 100%
rename from drivers/video/tegra/host/gk20a/gk20a_scale.c
rename to drivers/gpu/nvgpu/gk20a/gk20a_scale.c

diff --git a/drivers/video/tegra/host/gk20a/gk20a_scale.h b/drivers/gpu/nvgpu/gk20a/gk20a_scale.h
similarity index 100%
rename from drivers/video/tegra/host/gk20a/gk20a_scale.h
rename to drivers/gpu/nvgpu/gk20a/gk20a_scale.h

diff --git a/drivers/video/tegra/host/gk20a/gk20a_sysfs.c b/drivers/gpu/nvgpu/gk20a/gk20a_sysfs.c
similarity index 100%
rename from drivers/video/tegra/host/gk20a/gk20a_sysfs.c
rename to drivers/gpu/nvgpu/gk20a/gk20a_sysfs.c

diff --git a/drivers/video/tegra/host/gk20a/gr_ctx_gk20a.c b/drivers/gpu/nvgpu/gk20a/gr_ctx_gk20a.c
similarity index 100%
rename from drivers/video/tegra/host/gk20a/gr_ctx_gk20a.c
rename to drivers/gpu/nvgpu/gk20a/gr_ctx_gk20a.c

diff --git a/drivers/video/tegra/host/gk20a/gr_ctx_gk20a.h b/drivers/gpu/nvgpu/gk20a/gr_ctx_gk20a.h
similarity index 100%
rename from drivers/video/tegra/host/gk20a/gr_ctx_gk20a.h
rename to drivers/gpu/nvgpu/gk20a/gr_ctx_gk20a.h

diff --git a/drivers/video/tegra/host/gk20a/gr_ctx_gk20a_sim.c b/drivers/gpu/nvgpu/gk20a/gr_ctx_gk20a_sim.c
similarity index 100%
rename from drivers/video/tegra/host/gk20a/gr_ctx_gk20a_sim.c
rename to drivers/gpu/nvgpu/gk20a/gr_ctx_gk20a_sim.c

diff --git a/drivers/video/tegra/host/gk20a/gr_gk20a.c b/drivers/gpu/nvgpu/gk20a/gr_gk20a.c
similarity index 100%
rename from drivers/video/tegra/host/gk20a/gr_gk20a.c
rename to drivers/gpu/nvgpu/gk20a/gr_gk20a.c

diff --git a/drivers/video/tegra/host/gk20a/gr_gk20a.h b/drivers/gpu/nvgpu/gk20a/gr_gk20a.h
similarity index 100%
rename from drivers/video/tegra/host/gk20a/gr_gk20a.h
rename to drivers/gpu/nvgpu/gk20a/gr_gk20a.h

diff --git a/drivers/video/tegra/host/gk20a/gr_pri_gk20a.h b/drivers/gpu/nvgpu/gk20a/gr_pri_gk20a.h
similarity index 100%
rename from drivers/video/tegra/host/gk20a/gr_pri_gk20a.h
rename to drivers/gpu/nvgpu/gk20a/gr_pri_gk20a.h

diff --git a/drivers/video/tegra/host/gk20a/hal.c b/drivers/gpu/nvgpu/gk20a/hal.c
similarity index 100%
rename from drivers/video/tegra/host/gk20a/hal.c
rename to drivers/gpu/nvgpu/gk20a/hal.c

diff --git a/drivers/video/tegra/host/gk20a/hal.h b/drivers/gpu/nvgpu/gk20a/hal.h
similarity index 100%
rename from drivers/video/tegra/host/gk20a/hal.h
rename to drivers/gpu/nvgpu/gk20a/hal.h

diff --git a/drivers/video/tegra/host/gk20a/hal_gk20a.c b/drivers/gpu/nvgpu/gk20a/hal_gk20a.c
similarity index 100%
rename from drivers/video/tegra/host/gk20a/hal_gk20a.c
rename to drivers/gpu/nvgpu/gk20a/hal_gk20a.c

diff --git a/drivers/video/tegra/host/gk20a/hal_gk20a.h b/drivers/gpu/nvgpu/gk20a/hal_gk20a.h
similarity index 100%
rename from drivers/video/tegra/host/gk20a/hal_gk20a.h
rename to drivers/gpu/nvgpu/gk20a/hal_gk20a.h

diff --git a/drivers/video/tegra/host/gk20a/hw_bus_gk20a.h b/drivers/gpu/nvgpu/gk20a/hw_bus_gk20a.h
similarity index 100%
rename from drivers/video/tegra/host/gk20a/hw_bus_gk20a.h
rename to drivers/gpu/nvgpu/gk20a/hw_bus_gk20a.h

diff --git a/drivers/video/tegra/host/gk20a/hw_ccsr_gk20a.h b/drivers/gpu/nvgpu/gk20a/hw_ccsr_gk20a.h
similarity index 100%
rename from drivers/video/tegra/host/gk20a/hw_ccsr_gk20a.h
rename to drivers/gpu/nvgpu/gk20a/hw_ccsr_gk20a.h

diff --git a/drivers/video/tegra/host/gk20a/hw_chiplet_pwr_gk20a.h b/drivers/gpu/nvgpu/gk20a/hw_chiplet_pwr_gk20a.h
similarity index 100%
rename from drivers/video/tegra/host/gk20a/hw_chiplet_pwr_gk20a.h
rename to drivers/gpu/nvgpu/gk20a/hw_chiplet_pwr_gk20a.h

diff --git a/drivers/video/tegra/host/gk20a/hw_ctxsw_prog_gk20a.h b/drivers/gpu/nvgpu/gk20a/hw_ctxsw_prog_gk20a.h
similarity index 100%
rename from drivers/video/tegra/host/gk20a/hw_ctxsw_prog_gk20a.h
rename to drivers/gpu/nvgpu/gk20a/hw_ctxsw_prog_gk20a.h

diff --git a/drivers/video/tegra/host/gk20a/hw_fb_gk20a.h b/drivers/gpu/nvgpu/gk20a/hw_fb_gk20a.h
similarity index 100%
rename from drivers/video/tegra/host/gk20a/hw_fb_gk20a.h
rename to drivers/gpu/nvgpu/gk20a/hw_fb_gk20a.h

diff --git a/drivers/video/tegra/host/gk20a/hw_fifo_gk20a.h b/drivers/gpu/nvgpu/gk20a/hw_fifo_gk20a.h
similarity index 100%
rename from drivers/video/tegra/host/gk20a/hw_fifo_gk20a.h
rename to drivers/gpu/nvgpu/gk20a/hw_fifo_gk20a.h

diff --git a/drivers/video/tegra/host/gk20a/hw_flush_gk20a.h b/drivers/gpu/nvgpu/gk20a/hw_flush_gk20a.h
similarity index 100%
rename from drivers/video/tegra/host/gk20a/hw_flush_gk20a.h
rename to drivers/gpu/nvgpu/gk20a/hw_flush_gk20a.h

diff --git a/drivers/video/tegra/host/gk20a/hw_gmmu_gk20a.h b/drivers/gpu/nvgpu/gk20a/hw_gmmu_gk20a.h
similarity index 100%
rename from drivers/video/tegra/host/gk20a/hw_gmmu_gk20a.h
rename to drivers/gpu/nvgpu/gk20a/hw_gmmu_gk20a.h

diff --git a/drivers/video/tegra/host/gk20a/hw_gr_gk20a.h b/drivers/gpu/nvgpu/gk20a/hw_gr_gk20a.h
similarity index 100%
rename from drivers/video/tegra/host/gk20a/hw_gr_gk20a.h
rename to drivers/gpu/nvgpu/gk20a/hw_gr_gk20a.h

diff --git a/drivers/video/tegra/host/gk20a/hw_ltc_gk20a.h b/drivers/gpu/nvgpu/gk20a/hw_ltc_gk20a.h
similarity index 100%
rename from drivers/video/tegra/host/gk20a/hw_ltc_gk20a.h
rename to drivers/gpu/nvgpu/gk20a/hw_ltc_gk20a.h

diff --git a/drivers/video/tegra/host/gk20a/hw_mc_gk20a.h b/drivers/gpu/nvgpu/gk20a/hw_mc_gk20a.h
similarity index 100%
rename from drivers/video/tegra/host/gk20a/hw_mc_gk20a.h
rename to drivers/gpu/nvgpu/gk20a/hw_mc_gk20a.h

diff --git a/drivers/video/tegra/host/gk20a/hw_pbdma_gk20a.h b/drivers/gpu/nvgpu/gk20a/hw_pbdma_gk20a.h
similarity index 100%
rename from drivers/video/tegra/host/gk20a/hw_pbdma_gk20a.h
rename to drivers/gpu/nvgpu/gk20a/hw_pbdma_gk20a.h

diff --git a/drivers/video/tegra/host/gk20a/hw_pri_ringmaster_gk20a.h b/drivers/gpu/nvgpu/gk20a/hw_pri_ringmaster_gk20a.h
similarity index 100%
rename from drivers/video/tegra/host/gk20a/hw_pri_ringmaster_gk20a.h
rename to drivers/gpu/nvgpu/gk20a/hw_pri_ringmaster_gk20a.h

diff --git a/drivers/video/tegra/host/gk20a/hw_pri_ringstation_fbp_gk20a.h b/drivers/gpu/nvgpu/gk20a/hw_pri_ringstation_fbp_gk20a.h
similarity index 100%
rename from drivers/video/tegra/host/gk20a/hw_pri_ringstation_fbp_gk20a.h
rename to drivers/gpu/nvgpu/gk20a/hw_pri_ringstation_fbp_gk20a.h

diff --git a/drivers/video/tegra/host/gk20a/hw_pri_ringstation_gpc_gk20a.h b/drivers/gpu/nvgpu/gk20a/hw_pri_ringstation_gpc_gk20a.h
similarity index 100%
rename from drivers/video/tegra/host/gk20a/hw_pri_ringstation_gpc_gk20a.h
rename to drivers/gpu/nvgpu/gk20a/hw_pri_ringstation_gpc_gk20a.h

diff --git a/drivers/video/tegra/host/gk20a/hw_pri_ringstation_sys_gk20a.h b/drivers/gpu/nvgpu/gk20a/hw_pri_ringstation_sys_gk20a.h
similarity index 100%
rename from drivers/video/tegra/host/gk20a/hw_pri_ringstation_sys_gk20a.h
rename to drivers/gpu/nvgpu/gk20a/hw_pri_ringstation_sys_gk20a.h

diff --git a/drivers/video/tegra/host/gk20a/hw_proj_gk20a.h b/drivers/gpu/nvgpu/gk20a/hw_proj_gk20a.h
similarity index 100%
rename from drivers/video/tegra/host/gk20a/hw_proj_gk20a.h
rename to drivers/gpu/nvgpu/gk20a/hw_proj_gk20a.h

diff --git a/drivers/video/tegra/host/gk20a/hw_pwr_gk20a.h b/drivers/gpu/nvgpu/gk20a/hw_pwr_gk20a.h
similarity index 100%
rename from drivers/video/tegra/host/gk20a/hw_pwr_gk20a.h
rename to drivers/gpu/nvgpu/gk20a/hw_pwr_gk20a.h

diff --git a/drivers/video/tegra/host/gk20a/hw_ram_gk20a.h b/drivers/gpu/nvgpu/gk20a/hw_ram_gk20a.h
similarity index 100%
rename from drivers/video/tegra/host/gk20a/hw_ram_gk20a.h
rename to drivers/gpu/nvgpu/gk20a/hw_ram_gk20a.h

diff --git a/drivers/video/tegra/host/gk20a/hw_sim_gk20a.h b/drivers/gpu/nvgpu/gk20a/hw_sim_gk20a.h
similarity index 100%
rename from drivers/video/tegra/host/gk20a/hw_sim_gk20a.h
rename to drivers/gpu/nvgpu/gk20a/hw_sim_gk20a.h

diff --git a/drivers/video/tegra/host/gk20a/hw_therm_gk20a.h b/drivers/gpu/nvgpu/gk20a/hw_therm_gk20a.h
similarity index 100%
rename from drivers/video/tegra/host/gk20a/hw_therm_gk20a.h
rename to drivers/gpu/nvgpu/gk20a/hw_therm_gk20a.h

diff --git a/drivers/video/tegra/host/gk20a/hw_timer_gk20a.h b/drivers/gpu/nvgpu/gk20a/hw_timer_gk20a.h
similarity index 100%
rename from drivers/video/tegra/host/gk20a/hw_timer_gk20a.h
rename to drivers/gpu/nvgpu/gk20a/hw_timer_gk20a.h

diff --git a/drivers/video/tegra/host/gk20a/hw_top_gk20a.h b/drivers/gpu/nvgpu/gk20a/hw_top_gk20a.h
similarity index 100%
rename from drivers/video/tegra/host/gk20a/hw_top_gk20a.h
rename to drivers/gpu/nvgpu/gk20a/hw_top_gk20a.h

diff --git a/drivers/video/tegra/host/gk20a/hw_trim_gk20a.h b/drivers/gpu/nvgpu/gk20a/hw_trim_gk20a.h
similarity index 100%
rename from drivers/video/tegra/host/gk20a/hw_trim_gk20a.h
rename to drivers/gpu/nvgpu/gk20a/hw_trim_gk20a.h

diff --git a/drivers/video/tegra/host/gk20a/kind_gk20a.c b/drivers/gpu/nvgpu/gk20a/kind_gk20a.c
similarity index 100%
rename from drivers/video/tegra/host/gk20a/kind_gk20a.c
rename to drivers/gpu/nvgpu/gk20a/kind_gk20a.c

diff --git a/drivers/video/tegra/host/gk20a/kind_gk20a.h b/drivers/gpu/nvgpu/gk20a/kind_gk20a.h
similarity index 100%
rename from drivers/video/tegra/host/gk20a/kind_gk20a.h
rename to drivers/gpu/nvgpu/gk20a/kind_gk20a.h

diff --git a/drivers/video/tegra/host/gk20a/ltc_common.c b/drivers/gpu/nvgpu/gk20a/ltc_common.c
similarity index 100%
rename from drivers/video/tegra/host/gk20a/ltc_common.c
rename to drivers/gpu/nvgpu/gk20a/ltc_common.c

diff --git a/drivers/video/tegra/host/gk20a/ltc_gk20a.c b/drivers/gpu/nvgpu/gk20a/ltc_gk20a.c
similarity index 100%
rename from drivers/video/tegra/host/gk20a/ltc_gk20a.c
rename to drivers/gpu/nvgpu/gk20a/ltc_gk20a.c

diff --git a/drivers/video/tegra/host/gk20a/ltc_gk20a.h b/drivers/gpu/nvgpu/gk20a/ltc_gk20a.h
similarity index 100%
rename from drivers/video/tegra/host/gk20a/ltc_gk20a.h
rename to drivers/gpu/nvgpu/gk20a/ltc_gk20a.h

diff --git a/drivers/video/tegra/host/gk20a/mm_gk20a.c b/drivers/gpu/nvgpu/gk20a/mm_gk20a.c
similarity index 100%
rename from drivers/video/tegra/host/gk20a/mm_gk20a.c
rename to drivers/gpu/nvgpu/gk20a/mm_gk20a.c

diff --git a/drivers/video/tegra/host/gk20a/mm_gk20a.h b/drivers/gpu/nvgpu/gk20a/mm_gk20a.h
similarity index 100%
rename from drivers/video/tegra/host/gk20a/mm_gk20a.h
rename to drivers/gpu/nvgpu/gk20a/mm_gk20a.h

diff --git a/drivers/video/tegra/host/gk20a/platform_gk20a.h b/drivers/gpu/nvgpu/gk20a/platform_gk20a.h
similarity index 100%
rename from drivers/video/tegra/host/gk20a/platform_gk20a.h
rename to drivers/gpu/nvgpu/gk20a/platform_gk20a.h

diff --git a/drivers/video/tegra/host/gk20a/platform_gk20a_generic.c b/drivers/gpu/nvgpu/gk20a/platform_gk20a_generic.c
similarity index 100%
rename from drivers/video/tegra/host/gk20a/platform_gk20a_generic.c
rename to drivers/gpu/nvgpu/gk20a/platform_gk20a_generic.c

diff --git a/drivers/video/tegra/host/gk20a/platform_gk20a_tegra.c b/drivers/gpu/nvgpu/gk20a/platform_gk20a_tegra.c
similarity index 99%
rename from drivers/video/tegra/host/gk20a/platform_gk20a_tegra.c
rename to drivers/gpu/nvgpu/gk20a/platform_gk20a_tegra.c
index 66044ce876e86277c721c9face77a6d0ce7c7b19..35658f31c9d83653519e2f87da5b373eb7a5664b 100644 (file)
--- a/drivers/video/tegra/host/gk20a/platform_gk20a_tegra.c
+++ b/drivers/gpu/nvgpu/gk20a/platform_gk20a_tegra.c
@@ -24,7 +24,7 @@
 #include <mach/irqs.h>
 #include <mach/pm_domains.h>
 
-#include "../../../../../arch/arm/mach-tegra/iomap.h"
+#include "../../../arch/arm/mach-tegra/iomap.h"
 
 #include "gk20a.h"
 #include "hal_gk20a.h"

diff --git a/drivers/video/tegra/host/gk20a/pmu_gk20a.c b/drivers/gpu/nvgpu/gk20a/pmu_gk20a.c
similarity index 100%
rename from drivers/video/tegra/host/gk20a/pmu_gk20a.c
rename to drivers/gpu/nvgpu/gk20a/pmu_gk20a.c

diff --git a/drivers/video/tegra/host/gk20a/pmu_gk20a.h b/drivers/gpu/nvgpu/gk20a/pmu_gk20a.h
similarity index 100%
rename from drivers/video/tegra/host/gk20a/pmu_gk20a.h
rename to drivers/gpu/nvgpu/gk20a/pmu_gk20a.h

diff --git a/drivers/video/tegra/host/gk20a/priv_ring_gk20a.c b/drivers/gpu/nvgpu/gk20a/priv_ring_gk20a.c
similarity index 100%
rename from drivers/video/tegra/host/gk20a/priv_ring_gk20a.c
rename to drivers/gpu/nvgpu/gk20a/priv_ring_gk20a.c

diff --git a/drivers/video/tegra/host/gk20a/priv_ring_gk20a.h b/drivers/gpu/nvgpu/gk20a/priv_ring_gk20a.h
similarity index 100%
rename from drivers/video/tegra/host/gk20a/priv_ring_gk20a.h
rename to drivers/gpu/nvgpu/gk20a/priv_ring_gk20a.h

diff --git a/drivers/video/tegra/host/gk20a/regops_gk20a.c b/drivers/gpu/nvgpu/gk20a/regops_gk20a.c
similarity index 100%
rename from drivers/video/tegra/host/gk20a/regops_gk20a.c
rename to drivers/gpu/nvgpu/gk20a/regops_gk20a.c

diff --git a/drivers/video/tegra/host/gk20a/regops_gk20a.h b/drivers/gpu/nvgpu/gk20a/regops_gk20a.h
similarity index 100%
rename from drivers/video/tegra/host/gk20a/regops_gk20a.h
rename to drivers/gpu/nvgpu/gk20a/regops_gk20a.h

diff --git a/drivers/video/tegra/host/gk20a/sim_gk20a.h b/drivers/gpu/nvgpu/gk20a/sim_gk20a.h
similarity index 100%
rename from drivers/video/tegra/host/gk20a/sim_gk20a.h
rename to drivers/gpu/nvgpu/gk20a/sim_gk20a.h

diff --git a/drivers/video/tegra/host/gk20a/therm_gk20a.c b/drivers/gpu/nvgpu/gk20a/therm_gk20a.c
similarity index 100%
rename from drivers/video/tegra/host/gk20a/therm_gk20a.c
rename to drivers/gpu/nvgpu/gk20a/therm_gk20a.c

diff --git a/drivers/video/tegra/host/gk20a/therm_gk20a.h b/drivers/gpu/nvgpu/gk20a/therm_gk20a.h
similarity index 100%
rename from drivers/video/tegra/host/gk20a/therm_gk20a.h
rename to drivers/gpu/nvgpu/gk20a/therm_gk20a.h

diff --git a/drivers/video/tegra/Kconfig b/drivers/video/tegra/Kconfig
index b5cdd115d332ce23985ff579434c347eb0359750..b6dd1e5a20d854e194eecc5a3e67fdca0af236ca 100644 (file)
--- a/drivers/video/tegra/Kconfig
+++ b/drivers/video/tegra/Kconfig
@@ -349,5 +349,3 @@ config TEGRA_CAMERA
          Enables support for the Tegra camera interface
 
          If unsure, say Y
-
-source "drivers/video/tegra/host/gk20a/Kconfig"

diff --git a/drivers/video/tegra/Makefile b/drivers/video/tegra/Makefile
index 3f1e200383744cb6511f3bc2dd4f039b087053c1..94910140cc446987a1d5fb5a783ff0e452e0dedb 100644 (file)
--- a/drivers/video/tegra/Makefile
+++ b/drivers/video/tegra/Makefile
@@ -7,7 +7,6 @@ subdir-ccflags-y += -Iarch/arm/mach-tegra/include
 ccflags += -Iarch/arm/mach-tegra/include
 endif
 obj-$(CONFIG_TEGRA_GRHOST) += host/
-obj-$(CONFIG_GK20A) += host/gk20a/
 obj-$(CONFIG_TEGRA_DC) += dc/
 obj-$(CONFIG_FB_TEGRA) += fb.o
 obj-$(CONFIG_ADF_TEGRA) += tegra_adf.o

diff --git a/drivers/video/tegra/host/t124/t124.c b/drivers/video/tegra/host/t124/t124.c
index f0c4b58ceb20504309231ce20d50d89e956fa7a1..a2c44b192c6653e3ac9112b4108888b87d5727ff 100644 (file)
--- a/drivers/video/tegra/host/t124/t124.c
+++ b/drivers/video/tegra/host/t124/t124.c
@@ -19,6 +19,7 @@
  */
 #include <linux/slab.h>
 #include <linux/tegra-powergate.h>
+#include <linux/tegra-fuse.h>
 
 #include <mach/mc.h>
 
@@ -26,25 +27,21 @@
 #include "nvhost_channel.h"
 #include "nvhost_job.h"
 #include "class_ids.h"
-
 #include "t124.h"
+#include "vic03/vic03.h"
 #include "host1x/host1x.h"
-
 #include "hardware_t124.h"
 #include "syncpt_t124.h"
-
-#include "gk20a/gk20a.h"
-#include "gk20a/gk20a_scale.h"
-#include "vic03/vic03.h"
 #include "msenc/msenc.h"
 #include "tsec/tsec.h"
 #include "vi/vi.h"
 #include "isp/isp.h"
 #include "gr3d/scale3d.h"
-
 #include "chip_support.h"
 #include "nvhost_scale.h"
 
+#include "../../../../arch/arm/mach-tegra/iomap.h"
+
 static int t124_num_alloc_channels = 0;
 
 #define HOST_EMC_FLOOR 300000000
@@ -562,9 +559,6 @@ static struct platform_device *t124_devices[] = {
        &tegra_vi01_device,
        &tegra_msenc03_device,
        &tegra_tsec01_device,
-#if defined(CONFIG_TEGRA_GK20A)
-       &tegra_gk20a_device,
-#endif
 #if defined(CONFIG_ARCH_TEGRA_VIC)
        &tegra_vic03_device,
 #endif