From 78ad8a23ea896abde95f76b2ced0fe353cb4cb60 Mon Sep 17 00:00:00 2001
From: Alex Waterman <alexw@nvidia.com>
Date: Fri, 28 Oct 2016 18:03:55 -0700
Subject: gpu: nvgpu: Move gp106 HW headers

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

  include/nvgpu/hw/gp106

And change the code to include like so:

  #include <nvgpu/hw/gp106/hw_fb_gp106.h>

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

Bug 1799159

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

(limited to 'drivers/gpu/nvgpu/gp106/hw_ccsr_gp106.h')

diff --git a/drivers/gpu/nvgpu/gp106/hw_ccsr_gp106.h b/drivers/gpu/nvgpu/gp106/hw_ccsr_gp106.h
deleted file mode 100644
index 65146d39..00000000
--- a/drivers/gpu/nvgpu/gp106/hw_ccsr_gp106.h
+++ /dev/null
@@ -1,125 +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_ccsr_gp106_h_
-#define _hw_ccsr_gp106_h_
-
-static inline u32 ccsr_channel_inst_r(u32 i)
-{
-	return 0x00800000 + i*8;
-}
-static inline u32 ccsr_channel_inst__size_1_v(void)
-{
-	return 0x00001000;
-}
-static inline u32 ccsr_channel_inst_ptr_f(u32 v)
-{
-	return (v & 0xfffffff) << 0;
-}
-static inline u32 ccsr_channel_inst_target_vid_mem_f(void)
-{
-	return 0x0;
-}
-static inline u32 ccsr_channel_inst_target_sys_mem_coh_f(void)
-{
-	return 0x20000000;
-}
-static inline u32 ccsr_channel_inst_target_sys_mem_ncoh_f(void)
-{
-	return 0x30000000;
-}
-static inline u32 ccsr_channel_inst_bind_false_f(void)
-{
-	return 0x0;
-}
-static inline u32 ccsr_channel_inst_bind_true_f(void)
-{
-	return 0x80000000;
-}
-static inline u32 ccsr_channel_r(u32 i)
-{
-	return 0x00800004 + i*8;
-}
-static inline u32 ccsr_channel__size_1_v(void)
-{
-	return 0x00001000;
-}
-static inline u32 ccsr_channel_enable_v(u32 r)
-{
-	return (r >> 0) & 0x1;
-}
-static inline u32 ccsr_channel_enable_set_f(u32 v)
-{
-	return (v & 0x1) << 10;
-}
-static inline u32 ccsr_channel_enable_set_true_f(void)
-{
-	return 0x400;
-}
-static inline u32 ccsr_channel_enable_clr_true_f(void)
-{
-	return 0x800;
-}
-static inline u32 ccsr_channel_status_v(u32 r)
-{
-	return (r >> 24) & 0xf;
-}
-static inline u32 ccsr_channel_status_pending_ctx_reload_v(void)
-{
-	return 0x00000002;
-}
-static inline u32 ccsr_channel_busy_v(u32 r)
-{
-	return (r >> 28) & 0x1;
-}
-static inline u32 ccsr_channel_next_v(u32 r)
-{
-	return (r >> 1) & 0x1;
-}
-#endif
-- 
cgit v1.2.2