From 4f3871309d5216b50179feed8f8024193b2224cf Mon Sep 17 00:00:00 2001 From: seshendra Gadagottu Date: Fri, 13 Jan 2017 13:34:24 -0800 Subject: gpu: nvgpu: gv11b: restore golden context Restore golden context correctly with subcontext header. Increase subctx header size to hold complete golden context. Also fill function pointer for freeing context header. Bug 1834201 Change-Id: Id8a3437bc437fef02ee15333c1163290217d34d1 Signed-off-by: seshendra Gadagottu Reviewed-on: http://git-master/r/1282440 Reviewed-by: Alex Waterman Reviewed-by: svccoveritychecker GVS: Gerrit_Virtual_Submit Reviewed-by: Terje Bergstrom --- drivers/gpu/nvgpu/gv11b/fifo_gv11b.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'drivers/gpu/nvgpu/gv11b/fifo_gv11b.c') diff --git a/drivers/gpu/nvgpu/gv11b/fifo_gv11b.c b/drivers/gpu/nvgpu/gv11b/fifo_gv11b.c index 4929f4d1..7f2f5a65 100644 --- a/drivers/gpu/nvgpu/gv11b/fifo_gv11b.c +++ b/drivers/gpu/nvgpu/gv11b/fifo_gv11b.c @@ -185,7 +185,6 @@ static u32 gv11b_userd_gp_get(struct gk20a *g, struct channel_gk20a *c) return gk20a_mem_rd32(g, userd_mem, offset + ram_userd_gp_get_w()); - } static void gv11b_userd_gp_put(struct gk20a *g, struct channel_gk20a *c) @@ -199,17 +198,13 @@ static void gv11b_userd_gp_put(struct gk20a *g, struct channel_gk20a *c) smp_mb(); gv11b_ring_channel_doorbell(c); - } static void channel_gv11b_unbind(struct channel_gk20a *ch) { gk20a_dbg_fn(""); - gv11b_free_subctx_header(ch); - channel_gk20a_unbind(ch); - } static u32 gv11b_fifo_get_num_fifos(struct gk20a *g) @@ -231,4 +226,5 @@ void gv11b_init_fifo(struct gpu_ops *gops) gops->fifo.setup_ramfc = channel_gv11b_setup_ramfc; gops->fifo.unbind_channel = channel_gv11b_unbind; gops->fifo.eng_runlist_base_size = fifo_eng_runlist_base__size_1_v; + gops->fifo.free_channel_ctx_header = gv11b_free_subctx_header; } -- cgit v1.2.2