From aa36d3786aeed6755b9744fed37aad000b582322 Mon Sep 17 00:00:00 2001 From: Alex Waterman Date: Thu, 12 Jan 2017 18:50:34 -0800 Subject: gpu: nvgpu: Organize semaphore_gk20a.[ch] Move semaphore_gk20a.c drivers/gpu/nvgpu/common/ since the semaphore code is common to all chips. Move the semaphore_gk20a.h header file to drivers/gpu/nvgpu/include/nvgpu and rename it to semaphore.h. Also update all places where the header is inluced to use the new path. This revealed an odd location for the enum gk20a_mem_rw_flag. This should be in the mm headers. As a result many places that did not need anything semaphore related had to include the semaphore header file. Fixing this oddity allowed the semaphore include to be removed from many C files that did not need it. Bug 1799159 Change-Id: Ie017219acf34c4c481747323b9f3ac33e76e064c Signed-off-by: Alex Waterman Reviewed-on: http://git-master/r/1284627 GVS: Gerrit_Virtual_Submit Reviewed-by: Terje Bergstrom --- drivers/gpu/nvgpu/gm206/acr_gm206.c | 1 - drivers/gpu/nvgpu/gm206/ce_gm206.c | 3 +-- 2 files changed, 1 insertion(+), 3 deletions(-) (limited to 'drivers/gpu/nvgpu/gm206') diff --git a/drivers/gpu/nvgpu/gm206/acr_gm206.c b/drivers/gpu/nvgpu/gm206/acr_gm206.c index 238114e3..3af59374 100644 --- a/drivers/gpu/nvgpu/gm206/acr_gm206.c +++ b/drivers/gpu/nvgpu/gm206/acr_gm206.c @@ -21,7 +21,6 @@ #include "gk20a/gk20a.h" #include "gk20a/pmu_gk20a.h" -#include "gk20a/semaphore_gk20a.h" #include "acr.h" #include "acr_gm206.h" diff --git a/drivers/gpu/nvgpu/gm206/ce_gm206.c b/drivers/gpu/nvgpu/gm206/ce_gm206.c index 5d5fd432..dd3eac95 100644 --- a/drivers/gpu/nvgpu/gm206/ce_gm206.c +++ b/drivers/gpu/nvgpu/gm206/ce_gm206.c @@ -1,7 +1,7 @@ /* * GM206 Copy Engine. * - * Copyright (c) 2016, NVIDIA CORPORATION. All rights reserved. + * Copyright (c) 2016-2017, 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, @@ -29,7 +29,6 @@ #include #include "gk20a/debug_gk20a.h" -#include "gk20a/semaphore_gk20a.h" #include #include -- cgit v1.2.2