From 4bd9682c924d4e10e715f9f271a1e7461f9c1f59 Mon Sep 17 00:00:00 2001 From: Terje Bergstrom Date: Thu, 25 Aug 2016 15:38:57 -0700 Subject: gpu: nvgpu: Reset priv ring properly on error We did not follow the proper sequence to reset priv ring on error. Instead we just re-enabled priv ring, which does not reset anything. Rename the gk20a_reset_priv_ring() to gk20a_enable_priv_ring() to indicate its proper use. Add another gk20a_reset_priv_ring() which actually resets priv ring properly. Change-Id: Ied74465b1215daa447a565b7e9cafef7fbe67d1b Signed-off-by: Terje Bergstrom Reviewed-on: http://git-master/r/1294681 Reviewed-by: Seema Khowala Reviewed-by: svccoveritychecker GVS: Gerrit_Virtual_Submit --- drivers/gpu/nvgpu/gk20a/priv_ring_gk20a.h | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'drivers/gpu/nvgpu/gk20a/priv_ring_gk20a.h') diff --git a/drivers/gpu/nvgpu/gk20a/priv_ring_gk20a.h b/drivers/gpu/nvgpu/gk20a/priv_ring_gk20a.h index cb9d49c7..8a6320d7 100644 --- a/drivers/gpu/nvgpu/gk20a/priv_ring_gk20a.h +++ b/drivers/gpu/nvgpu/gk20a/priv_ring_gk20a.h @@ -1,9 +1,7 @@ /* - * drivers/video/tegra/host/gk20a/priv_ring_gk20a.h - * * GK20A PRIV ringmaster * - * Copyright (c) 2011-2012, NVIDIA CORPORATION. All rights reserved. + * Copyright (c) 2011-2017, NVIDIA CORPORATION. All rights reserved. * * This program is free software; you can redistribute it and/or modify it * under the terms and conditions of the GNU General Public License, @@ -21,7 +19,7 @@ #ifndef __PRIV_RING_GK20A_H__ #define __PRIV_RING_GK20A_H__ -void gk20a_reset_priv_ring(struct gk20a *g); +void gk20a_enable_priv_ring(struct gk20a *g); void gk20a_priv_ring_isr(struct gk20a *g); #endif /*__PRIV_RING_GK20A_H__*/ -- cgit v1.2.2