From b8faddfe2ad3d52837b0f766d74feb8e6d6f4ce5 Mon Sep 17 00:00:00 2001 From: Vijayakumar Date: Tue, 4 Aug 2015 17:14:54 +0530 Subject: gpu: nvgpu: fix runlist update timeout handling bug 1625901 1) disable ELPG before doing GR reset when runlist update times out 2) add mutex for GR reset to avoid multiple threads resetting GR 3) protect GR reset with FECS mutex so that no one else submits methods Change-Id: I02993fd1eabe6875ab1c58a40a06e6c79fcdeeae Signed-off-by: Vijayakumar Reviewed-on: http://git-master/r/793643 Reviewed-by: Automatic_Commit_Validation_User GVS: Gerrit_Virtual_Submit Reviewed-by: Terje Bergstrom --- drivers/gpu/nvgpu/gk20a/gr_gk20a.c | 22 ++++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-) (limited to 'drivers/gpu/nvgpu/gk20a/gr_gk20a.c') diff --git a/drivers/gpu/nvgpu/gk20a/gr_gk20a.c b/drivers/gpu/nvgpu/gk20a/gr_gk20a.c index 512a7d6b..0ae44c6f 100644 --- a/drivers/gpu/nvgpu/gk20a/gr_gk20a.c +++ b/drivers/gpu/nvgpu/gk20a/gr_gk20a.c @@ -4320,12 +4320,6 @@ static int gr_gk20a_init_ctxsw(struct gk20a *g) if (err) goto out; - /* this appears query for sw states but fecs actually init - ramchain, etc so this is hw init */ - err = g->ops.gr.init_ctx_state(g); - if (err) - goto out; - out: if (err) gk20a_err(dev_from_gk20a(g), "fail"); @@ -4553,6 +4547,12 @@ int gk20a_init_gr_support(struct gk20a *g) if (err) return err; + /* this appears query for sw states but fecs actually init + ramchain, etc so this is hw init */ + err = g->ops.gr.init_ctx_state(g); + if (err) + return err; + err = gk20a_init_gr_setup_sw(g); if (err) return err; @@ -4776,6 +4776,8 @@ int gk20a_gr_reset(struct gk20a *g) int err; u32 size; + mutex_lock(&g->gr.fecs_mutex); + err = gk20a_enable_gr_hw(g); if (err) return err; @@ -4788,6 +4790,14 @@ int gk20a_gr_reset(struct gk20a *g) if (err) return err; + mutex_unlock(&g->gr.fecs_mutex); + + /* this appears query for sw states but fecs actually init + ramchain, etc so this is hw init */ + err = g->ops.gr.init_ctx_state(g); + if (err) + return err; + size = 0; err = gr_gk20a_fecs_get_reglist_img_size(g, &size); if (err) { -- cgit v1.2.2