From 7989012df274ba166171ac652cf80fe61993c292 Mon Sep 17 00:00:00 2001
From: Alex Waterman <alexw@nvidia.com>
Date: Fri, 28 Oct 2016 17:03:37 -0700
Subject: gpu: nvgpu: Move gm20b HW headers

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

  include/nvgpu/hw/gm20b

And change the code to include like so:

  #include <nvgpu/hw/gm20b/hw_fb_gm20b.h>

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

Bug 1799159

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

(limited to 'drivers/gpu/nvgpu/gm20b/hw_ctxsw_prog_gm20b.h')

diff --git a/drivers/gpu/nvgpu/gm20b/hw_ctxsw_prog_gm20b.h b/drivers/gpu/nvgpu/gm20b/hw_ctxsw_prog_gm20b.h
deleted file mode 100644
index 535b6c6e..00000000
--- a/drivers/gpu/nvgpu/gm20b/hw_ctxsw_prog_gm20b.h
+++ /dev/null
@@ -1,465 +0,0 @@
-/*
- * Copyright (c) 2014-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_ctxsw_prog_gm20b_h_
-#define _hw_ctxsw_prog_gm20b_h_
-
-static inline u32 ctxsw_prog_fecs_header_v(void)
-{
-	return 0x00000100;
-}
-static inline u32 ctxsw_prog_main_image_num_gpcs_o(void)
-{
-	return 0x00000008;
-}
-static inline u32 ctxsw_prog_main_image_ctl_o(void)
-{
-	return 0x0000000c;
-}
-static inline u32 ctxsw_prog_main_image_ctl_cde_enabled_f(void)
-{
-	return 0x400;
-}
-static inline u32 ctxsw_prog_main_image_ctl_cde_disabled_f(void)
-{
-	return 0x0;
-}
-static inline u32 ctxsw_prog_main_image_patch_count_o(void)
-{
-	return 0x00000010;
-}
-static inline u32 ctxsw_prog_main_image_context_id_o(void)
-{
-	return 0x000000f0;
-}
-static inline u32 ctxsw_prog_main_image_patch_adr_lo_o(void)
-{
-	return 0x00000014;
-}
-static inline u32 ctxsw_prog_main_image_patch_adr_hi_o(void)
-{
-	return 0x00000018;
-}
-static inline u32 ctxsw_prog_main_image_zcull_o(void)
-{
-	return 0x0000001c;
-}
-static inline u32 ctxsw_prog_main_image_zcull_mode_no_ctxsw_v(void)
-{
-	return 0x00000001;
-}
-static inline u32 ctxsw_prog_main_image_zcull_mode_separate_buffer_v(void)
-{
-	return 0x00000002;
-}
-static inline u32 ctxsw_prog_main_image_zcull_ptr_o(void)
-{
-	return 0x00000020;
-}
-static inline u32 ctxsw_prog_main_image_pm_o(void)
-{
-	return 0x00000028;
-}
-static inline u32 ctxsw_prog_main_image_pm_mode_m(void)
-{
-	return 0x7 << 0;
-}
-static inline u32 ctxsw_prog_main_image_pm_mode_no_ctxsw_f(void)
-{
-	return 0x0;
-}
-static inline u32 ctxsw_prog_main_image_pm_smpc_mode_m(void)
-{
-	return 0x7 << 3;
-}
-static inline u32 ctxsw_prog_main_image_pm_smpc_mode_ctxsw_f(void)
-{
-	return 0x8;
-}
-static inline u32 ctxsw_prog_main_image_pm_smpc_mode_no_ctxsw_f(void)
-{
-	return 0x0;
-}
-static inline u32 ctxsw_prog_main_image_pm_pc_sampling_f(u32 v)
-{
-	return (v & 0x1) << 6;
-}
-static inline u32 ctxsw_prog_main_image_pm_pc_sampling_m(void)
-{
-	return 0x1 << 6;
-}
-static inline u32 ctxsw_prog_main_image_pm_ptr_o(void)
-{
-	return 0x0000002c;
-}
-static inline u32 ctxsw_prog_main_image_num_save_ops_o(void)
-{
-	return 0x000000f4;
-}
-static inline u32 ctxsw_prog_main_image_num_restore_ops_o(void)
-{
-	return 0x000000f8;
-}
-static inline u32 ctxsw_prog_main_image_magic_value_o(void)
-{
-	return 0x000000fc;
-}
-static inline u32 ctxsw_prog_main_image_magic_value_v_value_v(void)
-{
-	return 0x600dc0de;
-}
-static inline u32 ctxsw_prog_local_priv_register_ctl_o(void)
-{
-	return 0x0000000c;
-}
-static inline u32 ctxsw_prog_local_priv_register_ctl_offset_v(u32 r)
-{
-	return (r >> 0) & 0xffff;
-}
-static inline u32 ctxsw_prog_local_image_ppc_info_o(void)
-{
-	return 0x000000f4;
-}
-static inline u32 ctxsw_prog_local_image_ppc_info_num_ppcs_v(u32 r)
-{
-	return (r >> 0) & 0xffff;
-}
-static inline u32 ctxsw_prog_local_image_ppc_info_ppc_mask_v(u32 r)
-{
-	return (r >> 16) & 0xffff;
-}
-static inline u32 ctxsw_prog_local_image_num_tpcs_o(void)
-{
-	return 0x000000f8;
-}
-static inline u32 ctxsw_prog_local_magic_value_o(void)
-{
-	return 0x000000fc;
-}
-static inline u32 ctxsw_prog_local_magic_value_v_value_v(void)
-{
-	return 0xad0becab;
-}
-static inline u32 ctxsw_prog_main_extended_buffer_ctl_o(void)
-{
-	return 0x000000ec;
-}
-static inline u32 ctxsw_prog_main_extended_buffer_ctl_offset_v(u32 r)
-{
-	return (r >> 0) & 0xffff;
-}
-static inline u32 ctxsw_prog_main_extended_buffer_ctl_size_v(u32 r)
-{
-	return (r >> 16) & 0xff;
-}
-static inline u32 ctxsw_prog_extended_buffer_segments_size_in_bytes_v(void)
-{
-	return 0x00000100;
-}
-static inline u32 ctxsw_prog_extended_marker_size_in_bytes_v(void)
-{
-	return 0x00000004;
-}
-static inline u32 ctxsw_prog_extended_sm_dsm_perf_counter_register_stride_v(void)
-{
-	return 0x00000000;
-}
-static inline u32 ctxsw_prog_extended_sm_dsm_perf_counter_control_register_stride_v(void)
-{
-	return 0x00000002;
-}
-static inline u32 ctxsw_prog_main_image_priv_access_map_config_o(void)
-{
-	return 0x000000a0;
-}
-static inline u32 ctxsw_prog_main_image_priv_access_map_config_mode_s(void)
-{
-	return 2;
-}
-static inline u32 ctxsw_prog_main_image_priv_access_map_config_mode_f(u32 v)
-{
-	return (v & 0x3) << 0;
-}
-static inline u32 ctxsw_prog_main_image_priv_access_map_config_mode_m(void)
-{
-	return 0x3 << 0;
-}
-static inline u32 ctxsw_prog_main_image_priv_access_map_config_mode_v(u32 r)
-{
-	return (r >> 0) & 0x3;
-}
-static inline u32 ctxsw_prog_main_image_priv_access_map_config_mode_allow_all_f(void)
-{
-	return 0x0;
-}
-static inline u32 ctxsw_prog_main_image_priv_access_map_config_mode_use_map_f(void)
-{
-	return 0x2;
-}
-static inline u32 ctxsw_prog_main_image_priv_access_map_addr_lo_o(void)
-{
-	return 0x000000a4;
-}
-static inline u32 ctxsw_prog_main_image_priv_access_map_addr_hi_o(void)
-{
-	return 0x000000a8;
-}
-static inline u32 ctxsw_prog_main_image_misc_options_o(void)
-{
-	return 0x0000003c;
-}
-static inline u32 ctxsw_prog_main_image_misc_options_verif_features_m(void)
-{
-	return 0x1 << 3;
-}
-static inline u32 ctxsw_prog_main_image_misc_options_verif_features_disabled_f(void)
-{
-	return 0x0;
-}
-static inline u32 ctxsw_prog_main_image_context_timestamp_buffer_control_o(void)
-{
-	return 0x000000ac;
-}
-static inline u32 ctxsw_prog_main_image_context_timestamp_buffer_control_num_records_f(u32 v)
-{
-	return (v & 0xffff) << 0;
-}
-static inline u32 ctxsw_prog_main_image_context_timestamp_buffer_ptr_hi_o(void)
-{
-	return 0x000000b0;
-}
-static inline u32 ctxsw_prog_main_image_context_timestamp_buffer_ptr_hi_v_m(void)
-{
-	return 0xfffffff << 0;
-}
-static inline u32 ctxsw_prog_main_image_context_timestamp_buffer_ptr_hi_target_m(void)
-{
-	return 0x3 << 28;
-}
-static inline u32 ctxsw_prog_main_image_context_timestamp_buffer_ptr_hi_target_vid_mem_f(void)
-{
-	return 0x0;
-}
-static inline u32 ctxsw_prog_main_image_context_timestamp_buffer_ptr_hi_target_sys_mem_coherent_f(void)
-{
-	return 0x20000000;
-}
-static inline u32 ctxsw_prog_main_image_context_timestamp_buffer_ptr_hi_target_sys_mem_noncoherent_f(void)
-{
-	return 0x30000000;
-}
-static inline u32 ctxsw_prog_main_image_context_timestamp_buffer_ptr_o(void)
-{
-	return 0x000000b4;
-}
-static inline u32 ctxsw_prog_main_image_context_timestamp_buffer_ptr_v_f(u32 v)
-{
-	return (v & 0xffffffff) << 0;
-}
-static inline u32 ctxsw_prog_record_timestamp_record_size_in_bytes_v(void)
-{
-	return 0x00000080;
-}
-static inline u32 ctxsw_prog_record_timestamp_record_size_in_words_v(void)
-{
-	return 0x00000020;
-}
-static inline u32 ctxsw_prog_record_timestamp_magic_value_lo_o(void)
-{
-	return 0x00000000;
-}
-static inline u32 ctxsw_prog_record_timestamp_magic_value_lo_v_value_v(void)
-{
-	return 0x00000000;
-}
-static inline u32 ctxsw_prog_record_timestamp_magic_value_hi_o(void)
-{
-	return 0x00000004;
-}
-static inline u32 ctxsw_prog_record_timestamp_magic_value_hi_v_value_v(void)
-{
-	return 0x600dbeef;
-}
-static inline u32 ctxsw_prog_record_timestamp_context_id_o(void)
-{
-	return 0x00000008;
-}
-static inline u32 ctxsw_prog_record_timestamp_context_ptr_o(void)
-{
-	return 0x0000000c;
-}
-static inline u32 ctxsw_prog_record_timestamp_new_context_id_o(void)
-{
-	return 0x00000010;
-}
-static inline u32 ctxsw_prog_record_timestamp_new_context_ptr_o(void)
-{
-	return 0x00000014;
-}
-static inline u32 ctxsw_prog_record_timestamp_timestamp_lo_o(void)
-{
-	return 0x00000018;
-}
-static inline u32 ctxsw_prog_record_timestamp_timestamp_hi_o(void)
-{
-	return 0x0000001c;
-}
-static inline u32 ctxsw_prog_record_timestamp_timestamp_hi_v_f(u32 v)
-{
-	return (v & 0xffffff) << 0;
-}
-static inline u32 ctxsw_prog_record_timestamp_timestamp_hi_v_v(u32 r)
-{
-	return (r >> 0) & 0xffffff;
-}
-static inline u32 ctxsw_prog_record_timestamp_timestamp_hi_tag_f(u32 v)
-{
-	return (v & 0xff) << 24;
-}
-static inline u32 ctxsw_prog_record_timestamp_timestamp_hi_tag_m(void)
-{
-	return 0xff << 24;
-}
-static inline u32 ctxsw_prog_record_timestamp_timestamp_hi_tag_v(u32 r)
-{
-	return (r >> 24) & 0xff;
-}
-static inline u32 ctxsw_prog_record_timestamp_timestamp_hi_tag_ctxsw_req_by_host_v(void)
-{
-	return 0x00000001;
-}
-static inline u32 ctxsw_prog_record_timestamp_timestamp_hi_tag_ctxsw_req_by_host_f(void)
-{
-	return 0x1000000;
-}
-static inline u32 ctxsw_prog_record_timestamp_timestamp_hi_tag_fe_ack_v(void)
-{
-	return 0x00000002;
-}
-static inline u32 ctxsw_prog_record_timestamp_timestamp_hi_tag_fe_ack_f(void)
-{
-	return 0x2000000;
-}
-static inline u32 ctxsw_prog_record_timestamp_timestamp_hi_tag_fe_ack_wfi_v(void)
-{
-	return 0x0000000a;
-}
-static inline u32 ctxsw_prog_record_timestamp_timestamp_hi_tag_fe_ack_wfi_f(void)
-{
-	return 0xa000000;
-}
-static inline u32 ctxsw_prog_record_timestamp_timestamp_hi_tag_fe_ack_gfxp_v(void)
-{
-	return 0x0000000b;
-}
-static inline u32 ctxsw_prog_record_timestamp_timestamp_hi_tag_fe_ack_gfxp_f(void)
-{
-	return 0xb000000;
-}
-static inline u32 ctxsw_prog_record_timestamp_timestamp_hi_tag_fe_ack_ctap_v(void)
-{
-	return 0x0000000c;
-}
-static inline u32 ctxsw_prog_record_timestamp_timestamp_hi_tag_fe_ack_ctap_f(void)
-{
-	return 0xc000000;
-}
-static inline u32 ctxsw_prog_record_timestamp_timestamp_hi_tag_fe_ack_cilp_v(void)
-{
-	return 0x0000000d;
-}
-static inline u32 ctxsw_prog_record_timestamp_timestamp_hi_tag_fe_ack_cilp_f(void)
-{
-	return 0xd000000;
-}
-static inline u32 ctxsw_prog_record_timestamp_timestamp_hi_tag_save_end_v(void)
-{
-	return 0x00000003;
-}
-static inline u32 ctxsw_prog_record_timestamp_timestamp_hi_tag_save_end_f(void)
-{
-	return 0x3000000;
-}
-static inline u32 ctxsw_prog_record_timestamp_timestamp_hi_tag_restore_start_v(void)
-{
-	return 0x00000004;
-}
-static inline u32 ctxsw_prog_record_timestamp_timestamp_hi_tag_restore_start_f(void)
-{
-	return 0x4000000;
-}
-static inline u32 ctxsw_prog_record_timestamp_timestamp_hi_tag_context_start_v(void)
-{
-	return 0x00000005;
-}
-static inline u32 ctxsw_prog_record_timestamp_timestamp_hi_tag_context_start_f(void)
-{
-	return 0x5000000;
-}
-static inline u32 ctxsw_prog_record_timestamp_timestamp_hi_tag_invalid_timestamp_v(void)
-{
-	return 0x000000ff;
-}
-static inline u32 ctxsw_prog_record_timestamp_timestamp_hi_tag_invalid_timestamp_f(void)
-{
-	return 0xff000000;
-}
-static inline u32 ctxsw_prog_main_image_preemption_options_o(void)
-{
-	return 0x00000060;
-}
-static inline u32 ctxsw_prog_main_image_preemption_options_control_f(u32 v)
-{
-	return (v & 0x3) << 0;
-}
-static inline u32 ctxsw_prog_main_image_preemption_options_control_cta_enabled_f(void)
-{
-	return 0x1;
-}
-#endif
-- 
cgit v1.2.2