From 6dd57c29b064774e065b001266aef9dd37bc7feb Mon Sep 17 00:00:00 2001
From: Alex Waterman <alexw@nvidia.com>
Date: Fri, 28 Oct 2016 17:11:10 -0700
Subject: gpu: nvgpu: Move gm206 HW headers

Move the gm206 HW headers to a new directory specially for them:

  include/nvgpu/hw/gm206

And change the code to include like so:

  #include <nvgpu/hw/gm206/hw_fb_gm206.h>

This is part of the process to restructure the nvgpu driver.

Bug 1799159

Change-Id: I90dc39e64e1b58ee9e87fbc26ad0d18c361e239c
Signed-off-by: Alex Waterman <alexw@nvidia.com>
Reviewed-on: http://git-master/r/1244792
GVS: Gerrit_Virtual_Submit
Reviewed-by: Terje Bergstrom <tbergstrom@nvidia.com>
---
 drivers/gpu/nvgpu/gm206/hw_pri_ringmaster_gm206.h | 145 ----------------------
 1 file changed, 145 deletions(-)
 delete mode 100644 drivers/gpu/nvgpu/gm206/hw_pri_ringmaster_gm206.h

(limited to 'drivers/gpu/nvgpu/gm206/hw_pri_ringmaster_gm206.h')

diff --git a/drivers/gpu/nvgpu/gm206/hw_pri_ringmaster_gm206.h b/drivers/gpu/nvgpu/gm206/hw_pri_ringmaster_gm206.h
deleted file mode 100644
index 6dcd9434..00000000
--- a/drivers/gpu/nvgpu/gm206/hw_pri_ringmaster_gm206.h
+++ /dev/null
@@ -1,145 +0,0 @@
-/*
- * Copyright (c) 2016, 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,
- * version 2, as published by the Free Software Foundation.
- *
- * 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.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-/*
- * Function naming determines intended use:
- *
- *     <x>_r(void) : Returns the offset for register <x>.
- *
- *     <x>_o(void) : Returns the offset for element <x>.
- *
- *     <x>_w(void) : Returns the word offset for word (4 byte) element <x>.
- *
- *     <x>_<y>_s(void) : Returns size of field <y> of register <x> in bits.
- *
- *     <x>_<y>_f(u32 v) : Returns a value based on 'v' which has been shifted
- *         and masked to place it at field <y> of register <x>.  This value
- *         can be |'d with others to produce a full register value for
- *         register <x>.
- *
- *     <x>_<y>_m(void) : Returns a mask for field <y> of register <x>.  This
- *         value can be ~'d and then &'d to clear the value of field <y> for
- *         register <x>.
- *
- *     <x>_<y>_<z>_f(void) : Returns the constant value <z> after being shifted
- *         to place it at field <y> of register <x>.  This value can be |'d
- *         with others to produce a full register value for <x>.
- *
- *     <x>_<y>_v(u32 r) : Returns the value of field <y> from a full register
- *         <x> value 'r' after being shifted to place its LSB at bit 0.
- *         This value is suitable for direct comparison with other unshifted
- *         values appropriate for use in field <y> of register <x>.
- *
- *     <x>_<y>_<z>_v(void) : Returns the constant value for <z> defined for
- *         field <y> of register <x>.  This value is suitable for direct
- *         comparison with unshifted values appropriate for use in field <y>
- *         of register <x>.
- */
-#ifndef _hw_pri_ringmaster_gm206_h_
-#define _hw_pri_ringmaster_gm206_h_
-
-static inline u32 pri_ringmaster_command_r(void)
-{
-	return 0x0012004c;
-}
-static inline u32 pri_ringmaster_command_cmd_m(void)
-{
-	return 0x3f << 0;
-}
-static inline u32 pri_ringmaster_command_cmd_v(u32 r)
-{
-	return (r >> 0) & 0x3f;
-}
-static inline u32 pri_ringmaster_command_cmd_no_cmd_v(void)
-{
-	return 0x00000000;
-}
-static inline u32 pri_ringmaster_command_cmd_start_ring_f(void)
-{
-	return 0x1;
-}
-static inline u32 pri_ringmaster_command_cmd_ack_interrupt_f(void)
-{
-	return 0x2;
-}
-static inline u32 pri_ringmaster_command_cmd_enumerate_stations_f(void)
-{
-	return 0x3;
-}
-static inline u32 pri_ringmaster_command_cmd_enumerate_stations_bc_grp_all_f(void)
-{
-	return 0x0;
-}
-static inline u32 pri_ringmaster_command_data_r(void)
-{
-	return 0x00120048;
-}
-static inline u32 pri_ringmaster_start_results_r(void)
-{
-	return 0x00120050;
-}
-static inline u32 pri_ringmaster_start_results_connectivity_v(u32 r)
-{
-	return (r >> 0) & 0x1;
-}
-static inline u32 pri_ringmaster_start_results_connectivity_pass_v(void)
-{
-	return 0x00000001;
-}
-static inline u32 pri_ringmaster_intr_status0_r(void)
-{
-	return 0x00120058;
-}
-static inline u32 pri_ringmaster_intr_status1_r(void)
-{
-	return 0x0012005c;
-}
-static inline u32 pri_ringmaster_global_ctl_r(void)
-{
-	return 0x00120060;
-}
-static inline u32 pri_ringmaster_global_ctl_ring_reset_asserted_f(void)
-{
-	return 0x1;
-}
-static inline u32 pri_ringmaster_global_ctl_ring_reset_deasserted_f(void)
-{
-	return 0x0;
-}
-static inline u32 pri_ringmaster_enum_fbp_r(void)
-{
-	return 0x00120074;
-}
-static inline u32 pri_ringmaster_enum_fbp_count_v(u32 r)
-{
-	return (r >> 0) & 0x1f;
-}
-static inline u32 pri_ringmaster_enum_gpc_r(void)
-{
-	return 0x00120078;
-}
-static inline u32 pri_ringmaster_enum_gpc_count_v(u32 r)
-{
-	return (r >> 0) & 0x1f;
-}
-static inline u32 pri_ringmaster_enum_ltc_r(void)
-{
-	return 0x0012006c;
-}
-static inline u32 pri_ringmaster_enum_ltc_count_v(u32 r)
-{
-	return (r >> 0) & 0x1f;
-}
-#endif
-- 
cgit v1.2.2