From 1fd722f592c2e0523c5e399a2406a4e387057188 Mon Sep 17 00:00:00 2001 From: Aingara Paramakuru Date: Mon, 5 May 2014 21:14:22 -0400 Subject: gpu: nvgpu: support gk20a virtualization The nvgpu driver now supports using the Tegra graphics virtualization interfaces to support gk20a in a virtualized environment. Bug 1509608 Change-Id: I6ede15ee7bf0b0ad8a13e8eb5f557c3516ead676 Signed-off-by: Aingara Paramakuru Reviewed-on: http://git-master/r/440122 Reviewed-by: Terje Bergstrom Tested-by: Terje Bergstrom --- drivers/gpu/nvgpu/gm20b/fifo_gm20b.c | 9 +++++++++ drivers/gpu/nvgpu/gm20b/gr_gm20b.c | 5 +++++ drivers/gpu/nvgpu/gm20b/mm_gm20b.c | 9 +++++++++ 3 files changed, 23 insertions(+) (limited to 'drivers/gpu/nvgpu/gm20b') diff --git a/drivers/gpu/nvgpu/gm20b/fifo_gm20b.c b/drivers/gpu/nvgpu/gm20b/fifo_gm20b.c index 7e580136..86d049cf 100644 --- a/drivers/gpu/nvgpu/gm20b/fifo_gm20b.c +++ b/drivers/gpu/nvgpu/gm20b/fifo_gm20b.c @@ -102,5 +102,14 @@ static void gm20b_fifo_trigger_mmu_fault(struct gk20a *g, void gm20b_init_fifo(struct gpu_ops *gops) { gops->fifo.bind_channel = channel_gm20b_bind; + gops->fifo.unbind_channel = channel_gk20a_unbind; + gops->fifo.disable_channel = channel_gk20a_disable; + gops->fifo.alloc_inst = channel_gk20a_alloc_inst; + gops->fifo.free_inst = channel_gk20a_free_inst; + gops->fifo.setup_ramfc = channel_gk20a_setup_ramfc; + + gops->fifo.preempt_channel = gk20a_fifo_preempt_channel; + gops->fifo.update_runlist = gk20a_fifo_update_runlist; gops->fifo.trigger_mmu_fault = gm20b_fifo_trigger_mmu_fault; + gops->fifo.wait_engine_idle = gk20a_fifo_wait_engine_idle; } diff --git a/drivers/gpu/nvgpu/gm20b/gr_gm20b.c b/drivers/gpu/nvgpu/gm20b/gr_gm20b.c index 72500b0e..c9c32b9f 100644 --- a/drivers/gpu/nvgpu/gm20b/gr_gm20b.c +++ b/drivers/gpu/nvgpu/gm20b/gr_gm20b.c @@ -751,4 +751,9 @@ void gm20b_init_gr(struct gpu_ops *gops) gops->gr.load_ctxsw_ucode = gr_gk20a_load_ctxsw_ucode; #endif gops->gr.get_gpc_tpc_mask = gr_gm20b_get_gpc_tpc_mask; + gops->gr.free_channel_ctx = gk20a_free_channel_ctx; + gops->gr.alloc_obj_ctx = gk20a_alloc_obj_ctx; + gops->gr.free_obj_ctx = gk20a_free_obj_ctx; + gops->gr.bind_ctxsw_zcull = gr_gk20a_bind_ctxsw_zcull; + gops->gr.get_zcull_info = gr_gk20a_get_zcull_info; } diff --git a/drivers/gpu/nvgpu/gm20b/mm_gm20b.c b/drivers/gpu/nvgpu/gm20b/mm_gm20b.c index ac82d56a..ed5b5e0d 100644 --- a/drivers/gpu/nvgpu/gm20b/mm_gm20b.c +++ b/drivers/gpu/nvgpu/gm20b/mm_gm20b.c @@ -327,4 +327,13 @@ void gm20b_init_mm(struct gpu_ops *gops) gops->mm.set_sparse = gm20b_vm_put_sparse; gops->mm.clear_sparse = gm20b_vm_clear_sparse; gops->mm.is_debug_mode_enabled = gm20b_mm_mmu_debug_mode_enabled; + gops->mm.gmmu_map = gk20a_locked_gmmu_map; + gops->mm.gmmu_unmap = gk20a_locked_gmmu_unmap; + gops->mm.vm_remove = gk20a_vm_remove_support; + gops->mm.vm_alloc_share = gk20a_vm_alloc_share; + gops->mm.vm_bind_channel = gk20a_vm_bind_channel; + gops->mm.fb_flush = gk20a_mm_fb_flush; + gops->mm.l2_invalidate = gk20a_mm_l2_invalidate; + gops->mm.l2_flush = gk20a_mm_l2_flush; + gops->mm.tlb_invalidate = gk20a_mm_tlb_invalidate; } -- cgit v1.2.2