diff options
author | Aingara Paramakuru <aparamakuru@nvidia.com> | 2014-10-06 21:10:10 -0400 |
---|---|---|
committer | Dan Willemsen <dwillemsen@nvidia.com> | 2015-03-18 15:11:39 -0400 |
commit | 47caf9f7f5119c301c0690595c5e5f7318ddc595 (patch) | |
tree | abd810e514182689a5089ee36d90a6f6e0611dc6 /drivers | |
parent | 1517aaf26f07214e9a4459ee951399262ecc200e (diff) |
gpu: nvgpu: vgpu: fix build break
Switch struct definitions to use nvgpu version instead of
nvhost one.
Bug 1509608
Change-Id: Id8c1b0c198536766f0399437bdf2c35c6a6bfe85
Signed-off-by: Aingara Paramakuru <aparamakuru@nvidia.com>
Reviewed-on: http://git-master/r/554027
Reviewed-by: Automatic_Commit_Validation_User
Reviewed-by: Terje Bergstrom <tbergstrom@nvidia.com>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/gpu/nvgpu/vgpu/gr_vgpu.c | 4 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/vgpu/mm_vgpu.c | 3 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/vgpu/vgpu.c | 4 |
3 files changed, 6 insertions, 5 deletions
diff --git a/drivers/gpu/nvgpu/vgpu/gr_vgpu.c b/drivers/gpu/nvgpu/vgpu/gr_vgpu.c index a7e966da..6f8baa4b 100644 --- a/drivers/gpu/nvgpu/vgpu/gr_vgpu.c +++ b/drivers/gpu/nvgpu/vgpu/gr_vgpu.c | |||
@@ -379,7 +379,7 @@ static void vgpu_gr_free_channel_ctx(struct channel_gk20a *c) | |||
379 | } | 379 | } |
380 | 380 | ||
381 | static int vgpu_gr_alloc_obj_ctx(struct channel_gk20a *c, | 381 | static int vgpu_gr_alloc_obj_ctx(struct channel_gk20a *c, |
382 | struct nvhost_alloc_obj_ctx_args *args) | 382 | struct nvgpu_alloc_obj_ctx_args *args) |
383 | { | 383 | { |
384 | struct gk20a *g = c->g; | 384 | struct gk20a *g = c->g; |
385 | struct fifo_gk20a *f = &g->fifo; | 385 | struct fifo_gk20a *f = &g->fifo; |
@@ -483,7 +483,7 @@ out: | |||
483 | } | 483 | } |
484 | 484 | ||
485 | static int vgpu_gr_free_obj_ctx(struct channel_gk20a *c, | 485 | static int vgpu_gr_free_obj_ctx(struct channel_gk20a *c, |
486 | struct nvhost_free_obj_ctx_args *args) | 486 | struct nvgpu_free_obj_ctx_args *args) |
487 | { | 487 | { |
488 | unsigned long timeout = gk20a_get_gr_idle_timeout(c->g); | 488 | unsigned long timeout = gk20a_get_gr_idle_timeout(c->g); |
489 | 489 | ||
diff --git a/drivers/gpu/nvgpu/vgpu/mm_vgpu.c b/drivers/gpu/nvgpu/vgpu/mm_vgpu.c index 6ed1dece..ed5e1548 100644 --- a/drivers/gpu/nvgpu/vgpu/mm_vgpu.c +++ b/drivers/gpu/nvgpu/vgpu/mm_vgpu.c | |||
@@ -15,6 +15,7 @@ | |||
15 | 15 | ||
16 | #include <linux/dma-mapping.h> | 16 | #include <linux/dma-mapping.h> |
17 | #include "vgpu/vgpu.h" | 17 | #include "vgpu/vgpu.h" |
18 | #include "gk20a/semaphore_gk20a.h" | ||
18 | 19 | ||
19 | /* note: keep the page sizes sorted lowest to highest here */ | 20 | /* note: keep the page sizes sorted lowest to highest here */ |
20 | static const u32 gmmu_page_sizes[gmmu_nr_page_sizes] = { SZ_4K, SZ_128K }; | 21 | static const u32 gmmu_page_sizes[gmmu_nr_page_sizes] = { SZ_4K, SZ_128K }; |
@@ -107,7 +108,7 @@ static u64 vgpu_locked_gmmu_map(struct vm_gk20a *vm, | |||
107 | p->iova = mapping ? 1 : 0; | 108 | p->iova = mapping ? 1 : 0; |
108 | p->kind = kind_v; | 109 | p->kind = kind_v; |
109 | p->cacheable = | 110 | p->cacheable = |
110 | (flags & NVHOST_MAP_BUFFER_FLAGS_CACHEABLE_TRUE) ? 1 : 0; | 111 | (flags & NVGPU_MAP_BUFFER_FLAGS_CACHEABLE_TRUE) ? 1 : 0; |
111 | p->prot = prot; | 112 | p->prot = prot; |
112 | p->ctag_offset = ctag_offset; | 113 | p->ctag_offset = ctag_offset; |
113 | p->clear_ctags = clear_ctags; | 114 | p->clear_ctags = clear_ctags; |
diff --git a/drivers/gpu/nvgpu/vgpu/vgpu.c b/drivers/gpu/nvgpu/vgpu/vgpu.c index cfe307ff..84fd6d18 100644 --- a/drivers/gpu/nvgpu/vgpu/vgpu.c +++ b/drivers/gpu/nvgpu/vgpu/vgpu.c | |||
@@ -209,7 +209,7 @@ int vgpu_pm_prepare_poweroff(struct device *dev) | |||
209 | 209 | ||
210 | static void vgpu_detect_chip(struct gk20a *g) | 210 | static void vgpu_detect_chip(struct gk20a *g) |
211 | { | 211 | { |
212 | struct nvhost_gpu_characteristics *gpu = &g->gpu_characteristics; | 212 | struct nvgpu_gpu_characteristics *gpu = &g->gpu_characteristics; |
213 | struct gk20a_platform *platform = gk20a_get_platform(g->dev); | 213 | struct gk20a_platform *platform = gk20a_get_platform(g->dev); |
214 | 214 | ||
215 | u32 mc_boot_0_value; | 215 | u32 mc_boot_0_value; |
@@ -222,7 +222,7 @@ static void vgpu_detect_chip(struct gk20a *g) | |||
222 | } | 222 | } |
223 | 223 | ||
224 | gpu->arch = mc_boot_0_architecture_v(mc_boot_0_value) << | 224 | gpu->arch = mc_boot_0_architecture_v(mc_boot_0_value) << |
225 | NVHOST_GPU_ARCHITECTURE_SHIFT; | 225 | NVGPU_GPU_ARCHITECTURE_SHIFT; |
226 | gpu->impl = mc_boot_0_implementation_v(mc_boot_0_value); | 226 | gpu->impl = mc_boot_0_implementation_v(mc_boot_0_value); |
227 | gpu->rev = | 227 | gpu->rev = |
228 | (mc_boot_0_major_revision_v(mc_boot_0_value) << 4) | | 228 | (mc_boot_0_major_revision_v(mc_boot_0_value) << 4) | |