diff options
author | Sunny He <suhe@nvidia.com> | 2017-08-11 17:44:06 -0400 |
---|---|---|
committer | Shu Zhong <shuz@nvidia.com> | 2017-08-11 17:57:42 -0400 |
commit | 5248d6b4b5f74a5dca492d7666e80a819734f8da (patch) | |
tree | 47b7fd47d02fb39b210d9e21cd4ef36d898450b1 /drivers/gpu/nvgpu/gk20a/kind_gk20a.h | |
parent | 36c07aaf5da4d0e739c5143ed00d4ca8a2263ce1 (diff) |
Revert "gpu: nvgpu: remove kind map inheritance"
Conflicts with gv100 changes
This reverts commit 83e49b39181a86d32f6350c65659b5892f8f7670.
Change-Id: Ic5720fd3c214fa306645fb628a28ecf7d6d0c26d
Signed-off-by: Sunny He <suhe@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/1537673
Reviewed-by: Shu Zhong <shuz@nvidia.com>
Tested-by: Shu Zhong <shuz@nvidia.com>
Diffstat (limited to 'drivers/gpu/nvgpu/gk20a/kind_gk20a.h')
-rw-r--r-- | drivers/gpu/nvgpu/gk20a/kind_gk20a.h | 18 |
1 files changed, 1 insertions, 17 deletions
diff --git a/drivers/gpu/nvgpu/gk20a/kind_gk20a.h b/drivers/gpu/nvgpu/gk20a/kind_gk20a.h index dcc33f7d..28d5802c 100644 --- a/drivers/gpu/nvgpu/gk20a/kind_gk20a.h +++ b/drivers/gpu/nvgpu/gk20a/kind_gk20a.h | |||
@@ -3,7 +3,7 @@ | |||
3 | * | 3 | * |
4 | * GK20A memory kind management | 4 | * GK20A memory kind management |
5 | * | 5 | * |
6 | * Copyright (c) 2011-2017, NVIDIA CORPORATION. All rights reserved. | 6 | * Copyright (c) 2011-2014, NVIDIA CORPORATION. All rights reserved. |
7 | * | 7 | * |
8 | * This program is free software; you can redistribute it and/or modify it | 8 | * This program is free software; you can redistribute it and/or modify it |
9 | * under the terms and conditions of the GNU General Public License, | 9 | * under the terms and conditions of the GNU General Public License, |
@@ -36,22 +36,6 @@ extern u16 gk20a_kind_attr[]; | |||
36 | #define GK20A_KIND_ATTR_C BIT(3) | 36 | #define GK20A_KIND_ATTR_C BIT(3) |
37 | #define GK20A_KIND_ATTR_ZBC BIT(4) | 37 | #define GK20A_KIND_ATTR_ZBC BIT(4) |
38 | 38 | ||
39 | /* TBD: not sure on the work creation for gk20a, doubtful */ | ||
40 | static inline bool gk20a_kind_work_creation_sked(u8 k) | ||
41 | { | ||
42 | return false; | ||
43 | } | ||
44 | static inline bool gk20a_kind_work_creation_host(u8 k) | ||
45 | { | ||
46 | return false; | ||
47 | } | ||
48 | |||
49 | static inline bool gk20a_kind_work_creation(u8 k) | ||
50 | { | ||
51 | return gk20a_kind_work_creation_sked(k) || | ||
52 | gk20a_kind_work_creation_host(k); | ||
53 | } | ||
54 | |||
55 | static inline bool gk20a_kind_is_supported(u8 k) | 39 | static inline bool gk20a_kind_is_supported(u8 k) |
56 | { | 40 | { |
57 | return !!(gk20a_kind_attr[k] & GK20A_KIND_ATTR_SUPPORTED); | 41 | return !!(gk20a_kind_attr[k] & GK20A_KIND_ATTR_SUPPORTED); |