From 000b10782deb1ff854fb0a1d0224ff218bfe25ae Mon Sep 17 00:00:00 2001 From: Deepak Nibade Date: Tue, 12 Jun 2018 19:04:02 -0700 Subject: gpu: nvgpu: deprecate fb flush timeout registers FB flush timeout is deprecated in h/w and we use memop timeout instead which has same bits in the register Hence remove fb flush timeout accessors and use memop timeout ones Jira NVGPUT-50 Change-Id: Ia4696275f721f28cbb7e300889c4d70aaf0824ef Signed-off-by: Deepak Nibade Reviewed-on: https://git-master.nvidia.com/r/1747956 Reviewed-by: mobile promotions Tested-by: mobile promotions --- drivers/gpu/nvgpu/gv11b/fifo_gv11b.c | 2 +- drivers/gpu/nvgpu/include/nvgpu/hw/gv100/hw_fifo_gv100.h | 6 +++--- drivers/gpu/nvgpu/include/nvgpu/hw/gv11b/hw_fifo_gv11b.h | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) (limited to 'drivers/gpu/nvgpu') diff --git a/drivers/gpu/nvgpu/gv11b/fifo_gv11b.c b/drivers/gpu/nvgpu/gv11b/fifo_gv11b.c index a7c6360b..84d63b91 100644 --- a/drivers/gpu/nvgpu/gv11b/fifo_gv11b.c +++ b/drivers/gpu/nvgpu/gv11b/fifo_gv11b.c @@ -373,7 +373,7 @@ u32 gv11b_fifo_intr_0_error_mask(struct gk20a *g) fifo_intr_0_bind_error_pending_f() | fifo_intr_0_sched_error_pending_f() | fifo_intr_0_chsw_error_pending_f() | - fifo_intr_0_fb_flush_timeout_pending_f() | + fifo_intr_0_memop_timeout_pending_f() | fifo_intr_0_lb_error_pending_f(); return intr_0_error_mask; diff --git a/drivers/gpu/nvgpu/include/nvgpu/hw/gv100/hw_fifo_gv100.h b/drivers/gpu/nvgpu/include/nvgpu/hw/gv100/hw_fifo_gv100.h index 743afb1e..ac936181 100644 --- a/drivers/gpu/nvgpu/include/nvgpu/hw/gv100/hw_fifo_gv100.h +++ b/drivers/gpu/nvgpu/include/nvgpu/hw/gv100/hw_fifo_gv100.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017, NVIDIA CORPORATION. All rights reserved. + * Copyright (c) 2017-2018, NVIDIA CORPORATION. All rights reserved. * * Permission is hereby granted, free of charge, to any person obtaining a * copy of this software and associated documentation files (the "Software"), @@ -208,11 +208,11 @@ static inline u32 fifo_intr_0_chsw_error_reset_f(void) { return 0x10000U; } -static inline u32 fifo_intr_0_fb_flush_timeout_pending_f(void) +static inline u32 fifo_intr_0_memop_timeout_pending_f(void) { return 0x800000U; } -static inline u32 fifo_intr_0_fb_flush_timeout_reset_f(void) +static inline u32 fifo_intr_0_memop_timeout_reset_f(void) { return 0x800000U; } diff --git a/drivers/gpu/nvgpu/include/nvgpu/hw/gv11b/hw_fifo_gv11b.h b/drivers/gpu/nvgpu/include/nvgpu/hw/gv11b/hw_fifo_gv11b.h index 59cc7a1d..cb8bf611 100644 --- a/drivers/gpu/nvgpu/include/nvgpu/hw/gv11b/hw_fifo_gv11b.h +++ b/drivers/gpu/nvgpu/include/nvgpu/hw/gv11b/hw_fifo_gv11b.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2017, NVIDIA CORPORATION. All rights reserved. + * Copyright (c) 2016-2018, NVIDIA CORPORATION. All rights reserved. * * Permission is hereby granted, free of charge, to any person obtaining a * copy of this software and associated documentation files (the "Software"), @@ -208,11 +208,11 @@ static inline u32 fifo_intr_0_chsw_error_reset_f(void) { return 0x10000U; } -static inline u32 fifo_intr_0_fb_flush_timeout_pending_f(void) +static inline u32 fifo_intr_0_memop_timeout_pending_f(void) { return 0x800000U; } -static inline u32 fifo_intr_0_fb_flush_timeout_reset_f(void) +static inline u32 fifo_intr_0_memop_timeout_reset_f(void) { return 0x800000U; } -- cgit v1.2.2