From 47caf9f7f5119c301c0690595c5e5f7318ddc595 Mon Sep 17 00:00:00 2001 From: Aingara Paramakuru Date: Mon, 6 Oct 2014 21:10:10 -0400 Subject: 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 Reviewed-on: http://git-master/r/554027 Reviewed-by: Automatic_Commit_Validation_User Reviewed-by: Terje Bergstrom --- drivers/gpu/nvgpu/vgpu/gr_vgpu.c | 4 ++-- drivers/gpu/nvgpu/vgpu/mm_vgpu.c | 3 ++- drivers/gpu/nvgpu/vgpu/vgpu.c | 4 ++-- 3 files changed, 6 insertions(+), 5 deletions(-) (limited to 'drivers/gpu') 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) } static int vgpu_gr_alloc_obj_ctx(struct channel_gk20a *c, - struct nvhost_alloc_obj_ctx_args *args) + struct nvgpu_alloc_obj_ctx_args *args) { struct gk20a *g = c->g; struct fifo_gk20a *f = &g->fifo; @@ -483,7 +483,7 @@ out: } static int vgpu_gr_free_obj_ctx(struct channel_gk20a *c, - struct nvhost_free_obj_ctx_args *args) + struct nvgpu_free_obj_ctx_args *args) { unsigned long timeout = gk20a_get_gr_idle_timeout(c->g); 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 @@ #include #include "vgpu/vgpu.h" +#include "gk20a/semaphore_gk20a.h" /* note: keep the page sizes sorted lowest to highest here */ 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, p->iova = mapping ? 1 : 0; p->kind = kind_v; p->cacheable = - (flags & NVHOST_MAP_BUFFER_FLAGS_CACHEABLE_TRUE) ? 1 : 0; + (flags & NVGPU_MAP_BUFFER_FLAGS_CACHEABLE_TRUE) ? 1 : 0; p->prot = prot; p->ctag_offset = ctag_offset; 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) static void vgpu_detect_chip(struct gk20a *g) { - struct nvhost_gpu_characteristics *gpu = &g->gpu_characteristics; + struct nvgpu_gpu_characteristics *gpu = &g->gpu_characteristics; struct gk20a_platform *platform = gk20a_get_platform(g->dev); u32 mc_boot_0_value; @@ -222,7 +222,7 @@ static void vgpu_detect_chip(struct gk20a *g) } gpu->arch = mc_boot_0_architecture_v(mc_boot_0_value) << - NVHOST_GPU_ARCHITECTURE_SHIFT; + NVGPU_GPU_ARCHITECTURE_SHIFT; gpu->impl = mc_boot_0_implementation_v(mc_boot_0_value); gpu->rev = (mc_boot_0_major_revision_v(mc_boot_0_value) << 4) | -- cgit v1.2.2