summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/nvgpu/gm206
diff options
context:
space:
mode:
authorAlex Waterman <alexw@nvidia.com>2017-01-12 21:50:34 -0500
committerVarun Colbert <vcolbert@nvidia.com>2017-02-13 21:14:45 -0500
commitaa36d3786aeed6755b9744fed37aad000b582322 (patch)
treed68d71632a01062e00fc2b057c5a0c37dfda4fb8 /drivers/gpu/nvgpu/gm206
parentb9194a1c3300e505d22fba97136dd305300397f0 (diff)
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 <alexw@nvidia.com> Reviewed-on: http://git-master/r/1284627 GVS: Gerrit_Virtual_Submit Reviewed-by: Terje Bergstrom <tbergstrom@nvidia.com>
Diffstat (limited to 'drivers/gpu/nvgpu/gm206')
-rw-r--r--drivers/gpu/nvgpu/gm206/acr_gm206.c1
-rw-r--r--drivers/gpu/nvgpu/gm206/ce_gm206.c3
2 files changed, 1 insertions, 3 deletions
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 @@
21 21
22#include "gk20a/gk20a.h" 22#include "gk20a/gk20a.h"
23#include "gk20a/pmu_gk20a.h" 23#include "gk20a/pmu_gk20a.h"
24#include "gk20a/semaphore_gk20a.h"
25 24
26#include "acr.h" 25#include "acr.h"
27#include "acr_gm206.h" 26#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 @@
1/* 1/*
2 * GM206 Copy Engine. 2 * GM206 Copy Engine.
3 * 3 *
4 * Copyright (c) 2016, NVIDIA CORPORATION. All rights reserved. 4 * Copyright (c) 2016-2017, NVIDIA CORPORATION. All rights reserved.
5 * 5 *
6 * This program is free software; you can redistribute it and/or modify it 6 * This program is free software; you can redistribute it and/or modify it
7 * under the terms and conditions of the GNU General Public License, 7 * under the terms and conditions of the GNU General Public License,
@@ -29,7 +29,6 @@
29#include <linux/nvhost.h> 29#include <linux/nvhost.h>
30 30
31#include "gk20a/debug_gk20a.h" 31#include "gk20a/debug_gk20a.h"
32#include "gk20a/semaphore_gk20a.h"
33 32
34#include <nvgpu/hw/gm206/hw_ce2_gm206.h> 33#include <nvgpu/hw/gm206/hw_ce2_gm206.h>
35#include <nvgpu/hw/gm206/hw_pbdma_gm206.h> 34#include <nvgpu/hw/gm206/hw_pbdma_gm206.h>