nv-tegra-mirror/linux-nvgpu
1
0
Fork 0
mirror of git://nv-tegra.nvidia.com/linux-nvgpu.git synced 2025-12-24 10:34:43 +03:00
Code Issues Packages Projects Releases Wiki Activity

gpu: nvgpu: deprecate fb flush timeout registers

Browse Source 
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 <dnibade@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/1747956
Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com>
Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>
This commit is contained in:
Deepak Nibade
2018-06-12 19:04:02 -07:00
committed by mobile promotions
parent a42c0ab935
commit 000b10782d
3 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/gpu/nvgpu/gv11b/fifo_gv11b.c
View File

@@ -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;

6
drivers/gpu/nvgpu/include/nvgpu/hw/gv100/hw_fifo_gv100.h
View File

@@ -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;
}

6
drivers/gpu/nvgpu/include/nvgpu/hw/gv11b/hw_fifo_gv11b.h
View File

@@ -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;
}