From 5248d6b4b5f74a5dca492d7666e80a819734f8da Mon Sep 17 00:00:00 2001 From: Sunny He Date: Fri, 11 Aug 2017 14:44:06 -0700 Subject: Revert "gpu: nvgpu: remove kind map inheritance" Conflicts with gv100 changes This reverts commit 83e49b39181a86d32f6350c65659b5892f8f7670. Change-Id: Ic5720fd3c214fa306645fb628a28ecf7d6d0c26d Signed-off-by: Sunny He Reviewed-on: https://git-master.nvidia.com/r/1537673 Reviewed-by: Shu Zhong Tested-by: Shu Zhong --- drivers/gpu/nvgpu/gk20a/kind_gk20a.h | 18 +----------------- 1 file changed, 1 insertion(+), 17 deletions(-) (limited to 'drivers/gpu/nvgpu/gk20a/kind_gk20a.h') 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 @@ * * GK20A memory kind management * - * Copyright (c) 2011-2017, NVIDIA CORPORATION. All rights reserved. + * Copyright (c) 2011-2014, 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, @@ -36,22 +36,6 @@ extern u16 gk20a_kind_attr[]; #define GK20A_KIND_ATTR_C BIT(3) #define GK20A_KIND_ATTR_ZBC BIT(4) -/* TBD: not sure on the work creation for gk20a, doubtful */ -static inline bool gk20a_kind_work_creation_sked(u8 k) -{ - return false; -} -static inline bool gk20a_kind_work_creation_host(u8 k) -{ - return false; -} - -static inline bool gk20a_kind_work_creation(u8 k) -{ - return gk20a_kind_work_creation_sked(k) || - gk20a_kind_work_creation_host(k); -} - static inline bool gk20a_kind_is_supported(u8 k) { return !!(gk20a_kind_attr[k] & GK20A_KIND_ATTR_SUPPORTED); -- cgit v1.2.2