[PATCH 1/3] drm/amd/amdgpu: add SI defines/registers

Christian König deathsimple at vodafone.de
Wed Nov 9 07:50:19 UTC 2016


Am 08.11.2016 um 22:02 schrieb Alex Deucher:
> From: Tom St Denis <tom.stdenis at amd.com>
>
> Add missing gca MMIO registers and defines necessary for the
> next patch which re-works a lot of gfx v6 to use the new SI
> headers.
>
> Signed-off-by: Tom St Denis <tom.stdenis at amd.com>
> Reviewed-by: Alex Deucher <alexander.deucher at amd.com>
> Signed-off-by: Alex Deucher <alexander.deucher at amd.com>

Acked-by: Christian König <christian.koenig at amd.com>.

> ---
>
> The patch which adds the new register headers for SI is here:
> https://cgit.freedesktop.org/~agd5f/linux/commit/?h=drm-next-4.10-wip&id=d193cf2f61fab6f4d7de39ce130804b729223d57
> It's kind of giant for the mailing list.
>
> drivers/gpu/drm/amd/amdgpu/si_enums.h              | 186 +++++++++++++++++++++
>   .../gpu/drm/amd/include/asic_reg/gca/gfx_6_0_d.h   |  24 +++
>   .../gpu/drm/amd/include/asic_reg/oss/oss_1_0_d.h   |   3 +
>   3 files changed, 213 insertions(+)
>   create mode 100644 drivers/gpu/drm/amd/amdgpu/si_enums.h
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/si_enums.h b/drivers/gpu/drm/amd/amdgpu/si_enums.h
> new file mode 100644
> index 0000000..63c057f
> --- /dev/null
> +++ b/drivers/gpu/drm/amd/amdgpu/si_enums.h
> @@ -0,0 +1,186 @@
> +/*
> + * Copyright 2016 Advanced Micro Devices, Inc.
> + *
> + * 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:
> + *
> + * The above copyright notice and this permission notice shall be included in
> + * all copies or substantial portions of the Software.
> + *
> + * 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 COPYRIGHT HOLDER(S) OR AUTHOR(S) 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.
> + *
> + */
> +#ifndef SI_ENUMS_H
> +#define SI_ENUMS_H
> +
> +#define DMA0_REGISTER_OFFSET 0x000
> +#define DMA1_REGISTER_OFFSET 0x200
> +#define ES_AND_GS_AUTO       3
> +#define RADEON_PACKET_TYPE3  3
> +#define CE_PARTITION_BASE    3
> +#define BUF_SWAP_32BIT       (2 << 16)
> +
> +#define GFX_POWER_STATUS                           (1 << 1)
> +#define GFX_CLOCK_STATUS                           (1 << 2)
> +#define GFX_LS_STATUS                              (1 << 3)
> +#define RLC_BUSY_STATUS                            (1 << 0)
> +
> +#define RLC_PUD(x)                               ((x) << 0)
> +#define RLC_PUD_MASK                             (0xff << 0)
> +#define RLC_PDD(x)                               ((x) << 8)
> +#define RLC_PDD_MASK                             (0xff << 8)
> +#define RLC_TTPD(x)                              ((x) << 16)
> +#define RLC_TTPD_MASK                            (0xff << 16)
> +#define RLC_MSD(x)                               ((x) << 24)
> +#define RLC_MSD_MASK                             (0xff << 24)
> +#define WRITE_DATA_ENGINE_SEL(x) ((x) << 30)
> +#define WRITE_DATA_DST_SEL(x) ((x) << 8)
> +#define EVENT_TYPE(x) ((x) << 0)
> +#define EVENT_INDEX(x) ((x) << 8)
> +#define WAIT_REG_MEM_MEM_SPACE(x)               ((x) << 4)
> +#define WAIT_REG_MEM_FUNCTION(x)                ((x) << 0)
> +#define WAIT_REG_MEM_ENGINE(x)                  ((x) << 8)
> +
> +#define GFX6_NUM_GFX_RINGS     1
> +#define GFX6_NUM_COMPUTE_RINGS 2
> +#define RLC_SAVE_AND_RESTORE_STARTING_OFFSET 0x90
> +#define RLC_CLEAR_STATE_DESCRIPTOR_OFFSET    0x3D
> +
> +#define TAHITI_GB_ADDR_CONFIG_GOLDEN        0x12011003
> +#define VERDE_GB_ADDR_CONFIG_GOLDEN         0x12010002
> +#define HAINAN_GB_ADDR_CONFIG_GOLDEN        0x02010001
> +
> +#define PACKET3(op, n)  ((RADEON_PACKET_TYPE3 << 30) |                  \
> +                         (((op) & 0xFF) << 8) |                         \
> +                         ((n) & 0x3FFF) << 16)
> +#define PACKET3_COMPUTE(op, n) (PACKET3(op, n) | 1 << 1)
> +#define	PACKET3_NOP					0x10
> +#define	PACKET3_SET_BASE				0x11
> +#define		PACKET3_BASE_INDEX(x)                  ((x) << 0)
> +#define	PACKET3_CLEAR_STATE				0x12
> +#define	PACKET3_INDEX_BUFFER_SIZE			0x13
> +#define	PACKET3_DISPATCH_DIRECT				0x15
> +#define	PACKET3_DISPATCH_INDIRECT			0x16
> +#define	PACKET3_ALLOC_GDS				0x1B
> +#define	PACKET3_WRITE_GDS_RAM				0x1C
> +#define	PACKET3_ATOMIC_GDS				0x1D
> +#define	PACKET3_ATOMIC					0x1E
> +#define	PACKET3_OCCLUSION_QUERY				0x1F
> +#define	PACKET3_SET_PREDICATION				0x20
> +#define	PACKET3_REG_RMW					0x21
> +#define	PACKET3_COND_EXEC				0x22
> +#define	PACKET3_PRED_EXEC				0x23
> +#define	PACKET3_DRAW_INDIRECT				0x24
> +#define	PACKET3_DRAW_INDEX_INDIRECT			0x25
> +#define	PACKET3_INDEX_BASE				0x26
> +#define	PACKET3_DRAW_INDEX_2				0x27
> +#define	PACKET3_CONTEXT_CONTROL				0x28
> +#define	PACKET3_INDEX_TYPE				0x2A
> +#define	PACKET3_DRAW_INDIRECT_MULTI			0x2C
> +#define	PACKET3_DRAW_INDEX_AUTO				0x2D
> +#define	PACKET3_DRAW_INDEX_IMMD				0x2E
> +#define	PACKET3_NUM_INSTANCES				0x2F
> +#define	PACKET3_DRAW_INDEX_MULTI_AUTO			0x30
> +#define	PACKET3_INDIRECT_BUFFER_CONST			0x31
> +#define	PACKET3_INDIRECT_BUFFER				0x3F
> +#define	PACKET3_STRMOUT_BUFFER_UPDATE			0x34
> +#define	PACKET3_DRAW_INDEX_OFFSET_2			0x35
> +#define	PACKET3_DRAW_INDEX_MULTI_ELEMENT		0x36
> +#define	PACKET3_WRITE_DATA				0x37
> +#define	PACKET3_DRAW_INDEX_INDIRECT_MULTI		0x38
> +#define	PACKET3_MEM_SEMAPHORE				0x39
> +#define	PACKET3_MPEG_INDEX				0x3A
> +#define	PACKET3_COPY_DW					0x3B
> +#define	PACKET3_WAIT_REG_MEM				0x3C
> +#define	PACKET3_MEM_WRITE				0x3D
> +#define	PACKET3_COPY_DATA				0x40
> +#define	PACKET3_CP_DMA					0x41
> +#              define PACKET3_CP_DMA_DST_SEL(x)    ((x) << 20)
> +#              define PACKET3_CP_DMA_ENGINE(x)     ((x) << 27)
> +#              define PACKET3_CP_DMA_SRC_SEL(x)    ((x) << 29)
> +#              define PACKET3_CP_DMA_CP_SYNC       (1 << 31)
> +#              define PACKET3_CP_DMA_DIS_WC        (1 << 21)
> +#              define PACKET3_CP_DMA_CMD_SRC_SWAP(x) ((x) << 22)
> +#              define PACKET3_CP_DMA_CMD_DST_SWAP(x) ((x) << 24)
> +#              define PACKET3_CP_DMA_CMD_SAS       (1 << 26)
> +#              define PACKET3_CP_DMA_CMD_DAS       (1 << 27)
> +#              define PACKET3_CP_DMA_CMD_SAIC      (1 << 28)
> +#              define PACKET3_CP_DMA_CMD_DAIC      (1 << 29)
> +#              define PACKET3_CP_DMA_CMD_RAW_WAIT  (1 << 30)
> +#define	PACKET3_PFP_SYNC_ME				0x42
> +#define	PACKET3_SURFACE_SYNC				0x43
> +#              define PACKET3_DEST_BASE_0_ENA      (1 << 0)
> +#              define PACKET3_DEST_BASE_1_ENA      (1 << 1)
> +#              define PACKET3_CB0_DEST_BASE_ENA    (1 << 6)
> +#              define PACKET3_CB1_DEST_BASE_ENA    (1 << 7)
> +#              define PACKET3_CB2_DEST_BASE_ENA    (1 << 8)
> +#              define PACKET3_CB3_DEST_BASE_ENA    (1 << 9)
> +#              define PACKET3_CB4_DEST_BASE_ENA    (1 << 10)
> +#              define PACKET3_CB5_DEST_BASE_ENA    (1 << 11)
> +#              define PACKET3_CB6_DEST_BASE_ENA    (1 << 12)
> +#              define PACKET3_CB7_DEST_BASE_ENA    (1 << 13)
> +#              define PACKET3_DB_DEST_BASE_ENA     (1 << 14)
> +#              define PACKET3_DEST_BASE_2_ENA      (1 << 19)
> +#              define PACKET3_DEST_BASE_3_ENA      (1 << 21)
> +#              define PACKET3_TCL1_ACTION_ENA      (1 << 22)
> +#              define PACKET3_TC_ACTION_ENA        (1 << 23)
> +#              define PACKET3_CB_ACTION_ENA        (1 << 25)
> +#              define PACKET3_DB_ACTION_ENA        (1 << 26)
> +#              define PACKET3_SH_KCACHE_ACTION_ENA (1 << 27)
> +#              define PACKET3_SH_ICACHE_ACTION_ENA (1 << 29)
> +#define	PACKET3_ME_INITIALIZE				0x44
> +#define		PACKET3_ME_INITIALIZE_DEVICE_ID(x) ((x) << 16)
> +#define	PACKET3_COND_WRITE				0x45
> +#define	PACKET3_EVENT_WRITE				0x46
> +#define	PACKET3_EVENT_WRITE_EOP				0x47
> +#define	PACKET3_EVENT_WRITE_EOS				0x48
> +#define	PACKET3_PREAMBLE_CNTL				0x4A
> +#              define PACKET3_PREAMBLE_BEGIN_CLEAR_STATE     (2 << 28)
> +#              define PACKET3_PREAMBLE_END_CLEAR_STATE       (3 << 28)
> +#define	PACKET3_ONE_REG_WRITE				0x57
> +#define	PACKET3_LOAD_CONFIG_REG				0x5F
> +#define	PACKET3_LOAD_CONTEXT_REG			0x60
> +#define	PACKET3_LOAD_SH_REG				0x61
> +#define	PACKET3_SET_CONFIG_REG				0x68
> +#define		PACKET3_SET_CONFIG_REG_START			0x00002000
> +#define		PACKET3_SET_CONFIG_REG_END			0x00002c00
> +#define	PACKET3_SET_CONTEXT_REG				0x69
> +#define		PACKET3_SET_CONTEXT_REG_START			0x000a000
> +#define		PACKET3_SET_CONTEXT_REG_END			0x000a400
> +#define	PACKET3_SET_CONTEXT_REG_INDIRECT		0x73
> +#define	PACKET3_SET_RESOURCE_INDIRECT			0x74
> +#define	PACKET3_SET_SH_REG				0x76
> +#define		PACKET3_SET_SH_REG_START			0x00002c00
> +#define		PACKET3_SET_SH_REG_END				0x00003000
> +#define	PACKET3_SET_SH_REG_OFFSET			0x77
> +#define	PACKET3_ME_WRITE				0x7A
> +#define	PACKET3_SCRATCH_RAM_WRITE			0x7D
> +#define	PACKET3_SCRATCH_RAM_READ			0x7E
> +#define	PACKET3_CE_WRITE				0x7F
> +#define	PACKET3_LOAD_CONST_RAM				0x80
> +#define	PACKET3_WRITE_CONST_RAM				0x81
> +#define	PACKET3_WRITE_CONST_RAM_OFFSET			0x82
> +#define	PACKET3_DUMP_CONST_RAM				0x83
> +#define	PACKET3_INCREMENT_CE_COUNTER			0x84
> +#define	PACKET3_INCREMENT_DE_COUNTER			0x85
> +#define	PACKET3_WAIT_ON_CE_COUNTER			0x86
> +#define	PACKET3_WAIT_ON_DE_COUNTER			0x87
> +#define	PACKET3_WAIT_ON_DE_COUNTER_DIFF			0x88
> +#define	PACKET3_SET_CE_DE_COUNTERS			0x89
> +#define	PACKET3_WAIT_ON_AVAIL_BUFFER			0x8A
> +#define	PACKET3_SWITCH_BUFFER				0x8B
> +#define PACKET3_SEM_WAIT_ON_SIGNAL    (0x1 << 12)
> +#define PACKET3_SEM_SEL_SIGNAL	    (0x6 << 29)
> +#define PACKET3_SEM_SEL_WAIT	    (0x7 << 29)
> +
> +#endif
> diff --git a/drivers/gpu/drm/amd/include/asic_reg/gca/gfx_6_0_d.h b/drivers/gpu/drm/amd/include/asic_reg/gca/gfx_6_0_d.h
> index b2829d0..c75aee2 100644
> --- a/drivers/gpu/drm/amd/include/asic_reg/gca/gfx_6_0_d.h
> +++ b/drivers/gpu/drm/amd/include/asic_reg/gca/gfx_6_0_d.h
> @@ -1757,4 +1757,28 @@
>   #define mmVGT_VTX_CNT_EN 0xA2AE
>   #define mmVGT_VTX_VECT_EJECT_REG 0x222C
>   
> +/* manually added from old sid.h */
> +#define mmCB_PERFCOUNTER0_SELECT0                       0x2688
> +#define mmCB_PERFCOUNTER1_SELECT0                       0x268A
> +#define mmCB_PERFCOUNTER1_SELECT1                       0x268B
> +#define mmCB_PERFCOUNTER2_SELECT0                       0x268C
> +#define mmCB_PERFCOUNTER2_SELECT1                       0x268D
> +#define mmCB_PERFCOUNTER3_SELECT0                       0x268E
> +#define mmCB_PERFCOUNTER3_SELECT1                       0x268F
> +#define mmCP_COHER_CNTL2                                0x217A
> +#define mmCP_DEBUG                                      0x307F
> +#define mmRLC_SERDES_MASTER_BUSY_0                      0x3119
> +#define mmRLC_SERDES_MASTER_BUSY_1                      0x311A
> +#define mmRLC_RL_BASE                                   0x30C1
> +#define mmRLC_RL_SIZE                                   0x30C2
> +#define mmRLC_UCODE_ADDR                                0x30CB
> +#define mmRLC_UCODE_DATA                                0x30CC
> +#define mmRLC_GCPM_GENERAL_3                            0x311E
> +#define mmRLC_SERDES_WR_MASTER_MASK_0                   0x3115
> +#define mmRLC_SERDES_WR_MASTER_MASK_1                   0x3116
> +#define mmRLC_TTOP_D                                    0x3105
> +#define mmRLC_CLEAR_STATE_RESTORE_BASE                  0x30C8
> +#define mmRLC_PG_AO_CU_MASK                             0x310B
> +#define mmSPI_STATIC_THREAD_MGMT_3                      0x243A
> +
>   #endif
> diff --git a/drivers/gpu/drm/amd/include/asic_reg/oss/oss_1_0_d.h b/drivers/gpu/drm/amd/include/asic_reg/oss/oss_1_0_d.h
> index e5c817d..edc8a79 100644
> --- a/drivers/gpu/drm/amd/include/asic_reg/oss/oss_1_0_d.h
> +++ b/drivers/gpu/drm/amd/include/asic_reg/oss/oss_1_0_d.h
> @@ -269,4 +269,7 @@
>   #define mmVCE_CONFIG 0x0F94
>   #define mmXDMA_MSTR_MEM_OVERFLOW_CNTL 0x03F8
>   
> +/* from the old sid.h */
> +#define mmDMA_TILING_CONFIG 0x342E
> +
>   #endif




More information about the amd-gfx mailing list