From fda4f49f393d94ff34ccf4e714caf2795229a75a Mon Sep 17 00:00:00 2001 From: Deepak Nibade Date: Fri, 24 Nov 2017 00:08:06 -0800 Subject: [PATCH] gpu: nvgpu: move gv11b platform specific file to linux gv11b/platform_gv11b_tegra.c is mostly linux specific so move it to linux specific directory Change-Id: I3e10bafcf672967e35a7955038cd9285b8697a57 Signed-off-by: Deepak Nibade Reviewed-on: https://git-master.nvidia.com/r/1604283 GVS: Gerrit_Virtual_Submit Reviewed-by: Konsta Holtta Reviewed-by: Vijayakumar Subbu Reviewed-by: mobile promotions Tested-by: mobile promotions --- drivers/gpu/nvgpu/Makefile | 2 +- .../linux}/platform_gv11b_tegra.c | 37 ++++++++----------- 2 files changed, 17 insertions(+), 22 deletions(-) rename drivers/gpu/nvgpu/{gv11b => common/linux}/platform_gv11b_tegra.c (92%) diff --git a/drivers/gpu/nvgpu/Makefile b/drivers/gpu/nvgpu/Makefile index a4ef22e5d..29966d847 100644 --- a/drivers/gpu/nvgpu/Makefile +++ b/drivers/gpu/nvgpu/Makefile @@ -289,7 +289,7 @@ nvgpu-y += \ gv100/regops_gv100.o \ gv100/hal_gv100.o -nvgpu-$(CONFIG_TEGRA_GK20A) += gv11b/platform_gv11b_tegra.o +nvgpu-$(CONFIG_TEGRA_GK20A) += common/linux/platform_gv11b_tegra.o nvgpu-$(CONFIG_TEGRA_GK20A_NVHOST) += common/linux/nvhost_t19x.o nvgpu-$(CONFIG_TEGRA_GR_VIRTUALIZATION) += \ diff --git a/drivers/gpu/nvgpu/gv11b/platform_gv11b_tegra.c b/drivers/gpu/nvgpu/common/linux/platform_gv11b_tegra.c similarity index 92% rename from drivers/gpu/nvgpu/gv11b/platform_gv11b_tegra.c rename to drivers/gpu/nvgpu/common/linux/platform_gv11b_tegra.c index 723e2e80d..3c6eac77d 100644 --- a/drivers/gpu/nvgpu/gv11b/platform_gv11b_tegra.c +++ b/drivers/gpu/nvgpu/common/linux/platform_gv11b_tegra.c @@ -3,23 +3,17 @@ * * Copyright (c) 2016-2017, 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"), - * to deal in the Software without restriction, including without limitation - * the rights to use, copy, modify, merge, publish, distribute, sublicense, - * and/or sell copies of the Software, and to permit persons to whom the - * Software is furnished to do so, subject to the following conditions: + * This program is free software; you can redistribute it and/or modify it + * under the terms and conditions of the GNU General Public License, + * version 2, as published by the Free Software Foundation. * - * The above copyright notice and this permission notice shall be included in - * all copies or substantial portions of the Software. + * This program is distributed in the hope it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for + * more details. * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL - * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING - * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER - * DEALINGS IN THE SOFTWARE. + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . */ #include @@ -29,6 +23,7 @@ #include #include #include + #include #include @@ -38,15 +33,15 @@ #include #include "gk20a/gk20a.h" -#include "common/linux/platform_gk20a.h" -#include "common/linux/clk.h" +#include "platform_gk20a.h" +#include "clk.h" #include "gp10b/platform_gp10b.h" -#include "common/linux/platform_gp10b_tegra.h" +#include "platform_gp10b_tegra.h" -#include "common/linux/os_linux.h" -#include "common/linux/platform_gk20a_tegra.h" -#include "gr_gv11b.h" +#include "os_linux.h" +#include "platform_gk20a_tegra.h" +#include "gv11b/gr_gv11b.h" #include "nvgpu_gpuid_t19x.h" static void gr_gv11b_remove_sysfs(struct device *dev);