From ac0b97b14a0c77da5840a392ec0939705897b2a0 Mon Sep 17 00:00:00 2001 From: Debarshi Dutta Date: Mon, 1 Apr 2019 12:25:33 +0530 Subject: [PATCH] gpu: nvgpu: add pbdma_timeout_register for gm20b and gp10b Add pbdma_timeout_r register and the corresponding fields for GM20B and GP10B. Jira NVGPU-2950 Change-Id: I7441314b2244a9be5addb06b23b87c9b91571fba Signed-off-by: Debarshi Dutta Reviewed-on: https://git-master.nvidia.com/r/2086444 Reviewed-by: Seema Khowala Reviewed-by: Alex Waterman Tested-by: Thomas Fleury GVS: Gerrit_Virtual_Submit Reviewed-by: Vijayakumar Subbu Reviewed-by: mobile promotions Tested-by: mobile promotions --- .../include/nvgpu/hw/gm20b/hw_pbdma_gm20b.h | 18 +++++++++++++++++- .../include/nvgpu/hw/gp10b/hw_pbdma_gp10b.h | 18 +++++++++++++++++- 2 files changed, 34 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/nvgpu/include/nvgpu/hw/gm20b/hw_pbdma_gm20b.h b/drivers/gpu/nvgpu/include/nvgpu/hw/gm20b/hw_pbdma_gm20b.h index b11f2563a..6c8685c02 100644 --- a/drivers/gpu/nvgpu/include/nvgpu/hw/gm20b/hw_pbdma_gm20b.h +++ b/drivers/gpu/nvgpu/include/nvgpu/hw/gm20b/hw_pbdma_gm20b.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014-2018, NVIDIA CORPORATION. All rights reserved. + * Copyright (c) 2014-2019, 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"), @@ -114,6 +114,22 @@ static inline u32 pbdma_gp_put_r(u32 i) { return 0x00040000U + i*8192U; } +static inline u32 pbdma_timeout_r(u32 i) +{ + return 0x0004012cU + i*8192U; +} +static inline u32 pbdma_timeout__size_1_v(void) +{ + return 0x00000001U; +} +static inline u32 pbdma_timeout_period_m(void) +{ + return U32(0xffffffffU) << 0U; +} +static inline u32 pbdma_timeout_period_max_f(void) +{ + return 0xffffffffU; +} static inline u32 pbdma_pb_fetch_r(u32 i) { return 0x00040054U + i*8192U; diff --git a/drivers/gpu/nvgpu/include/nvgpu/hw/gp10b/hw_pbdma_gp10b.h b/drivers/gpu/nvgpu/include/nvgpu/hw/gp10b/hw_pbdma_gp10b.h index fd0b2a7ac..9717697ef 100644 --- a/drivers/gpu/nvgpu/include/nvgpu/hw/gp10b/hw_pbdma_gp10b.h +++ b/drivers/gpu/nvgpu/include/nvgpu/hw/gp10b/hw_pbdma_gp10b.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014-2018, NVIDIA CORPORATION. All rights reserved. + * Copyright (c) 2014-2019, 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"), @@ -114,6 +114,22 @@ static inline u32 pbdma_gp_put_r(u32 i) { return 0x00040000U + i*8192U; } +static inline u32 pbdma_timeout_r(u32 i) +{ + return 0x0004012cU + i*8192U; +} +static inline u32 pbdma_timeout__size_1_v(void) +{ + return 0x00000001U; +} +static inline u32 pbdma_timeout_period_m(void) +{ + return U32(0xffffffffU) << 0U; +} +static inline u32 pbdma_timeout_period_max_f(void) +{ + return 0xffffffffU; +} static inline u32 pbdma_pb_fetch_r(u32 i) { return 0x00040054U + i*8192U;