diff options
| author | Ken Wang <Qingqing.Wang@amd.com> | 2016-07-01 01:54:23 -0400 |
|---|---|---|
| committer | Alex Deucher <alexander.deucher@amd.com> | 2016-07-07 15:06:21 -0400 |
| commit | a334bc7df010b5d427b6f37bc9db34759e372a2e (patch) | |
| tree | 278982a4f397d287c0f94c095683fabccf375551 /drivers/gpu/drm/amd/include | |
| parent | 696b2d7370c63f1f28636a5b8f61cc06e5012b23 (diff) | |
drm/amdgpu: remove gfx8 registers that vary between asics
those register mask definitions are different in polaris compare to
former gfx 8 gpus, so remove them from misusing.
Signed-off-by: Ken Wang <Qingqing.Wang@amd.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Diffstat (limited to 'drivers/gpu/drm/amd/include')
| -rw-r--r-- | drivers/gpu/drm/amd/include/asic_reg/gca/gfx_8_0_sh_mask.h | 22 |
1 files changed, 0 insertions, 22 deletions
diff --git a/drivers/gpu/drm/amd/include/asic_reg/gca/gfx_8_0_sh_mask.h b/drivers/gpu/drm/amd/include/asic_reg/gca/gfx_8_0_sh_mask.h index 64a1953ebae4..a43754efd953 100644 --- a/drivers/gpu/drm/amd/include/asic_reg/gca/gfx_8_0_sh_mask.h +++ b/drivers/gpu/drm/amd/include/asic_reg/gca/gfx_8_0_sh_mask.h | |||
| @@ -8730,8 +8730,6 @@ | |||
| 8730 | #define RLC_GPM_STAT__DYN_CU_POWERING_DOWN__SHIFT 0x10 | 8730 | #define RLC_GPM_STAT__DYN_CU_POWERING_DOWN__SHIFT 0x10 |
| 8731 | #define RLC_GPM_STAT__ABORTED_PD_SEQUENCE_MASK 0x20000 | 8731 | #define RLC_GPM_STAT__ABORTED_PD_SEQUENCE_MASK 0x20000 |
| 8732 | #define RLC_GPM_STAT__ABORTED_PD_SEQUENCE__SHIFT 0x11 | 8732 | #define RLC_GPM_STAT__ABORTED_PD_SEQUENCE__SHIFT 0x11 |
| 8733 | #define RLC_GPM_STAT__RESERVED_MASK 0xfc0000 | ||
| 8734 | #define RLC_GPM_STAT__RESERVED__SHIFT 0x12 | ||
| 8735 | #define RLC_GPM_STAT__PG_ERROR_STATUS_MASK 0xff000000 | 8733 | #define RLC_GPM_STAT__PG_ERROR_STATUS_MASK 0xff000000 |
| 8736 | #define RLC_GPM_STAT__PG_ERROR_STATUS__SHIFT 0x18 | 8734 | #define RLC_GPM_STAT__PG_ERROR_STATUS__SHIFT 0x18 |
| 8737 | #define RLC_GPU_CLOCK_32_RES_SEL__RES_SEL_MASK 0x3f | 8735 | #define RLC_GPU_CLOCK_32_RES_SEL__RES_SEL_MASK 0x3f |
| @@ -9104,8 +9102,6 @@ | |||
| 9104 | #define RLC_GPM_LOG_CONT__CONT__SHIFT 0x0 | 9102 | #define RLC_GPM_LOG_CONT__CONT__SHIFT 0x0 |
| 9105 | #define RLC_PG_DELAY_3__CGCG_ACTIVE_BEFORE_CGPG_MASK 0xff | 9103 | #define RLC_PG_DELAY_3__CGCG_ACTIVE_BEFORE_CGPG_MASK 0xff |
| 9106 | #define RLC_PG_DELAY_3__CGCG_ACTIVE_BEFORE_CGPG__SHIFT 0x0 | 9104 | #define RLC_PG_DELAY_3__CGCG_ACTIVE_BEFORE_CGPG__SHIFT 0x0 |
| 9107 | #define RLC_PG_DELAY_3__RESERVED_MASK 0xffffff00 | ||
| 9108 | #define RLC_PG_DELAY_3__RESERVED__SHIFT 0x8 | ||
| 9109 | #define RLC_GPM_INT_DISABLE_TH0__DISABLE_MASK 0xffffffff | 9105 | #define RLC_GPM_INT_DISABLE_TH0__DISABLE_MASK 0xffffffff |
| 9110 | #define RLC_GPM_INT_DISABLE_TH0__DISABLE__SHIFT 0x0 | 9106 | #define RLC_GPM_INT_DISABLE_TH0__DISABLE__SHIFT 0x0 |
| 9111 | #define RLC_GPM_INT_DISABLE_TH1__DISABLE_MASK 0xffffffff | 9107 | #define RLC_GPM_INT_DISABLE_TH1__DISABLE_MASK 0xffffffff |
| @@ -9126,14 +9122,8 @@ | |||
| 9126 | #define RLC_SRM_DEBUG_SELECT__RESERVED__SHIFT 0x8 | 9122 | #define RLC_SRM_DEBUG_SELECT__RESERVED__SHIFT 0x8 |
| 9127 | #define RLC_SRM_DEBUG__DATA_MASK 0xffffffff | 9123 | #define RLC_SRM_DEBUG__DATA_MASK 0xffffffff |
| 9128 | #define RLC_SRM_DEBUG__DATA__SHIFT 0x0 | 9124 | #define RLC_SRM_DEBUG__DATA__SHIFT 0x0 |
| 9129 | #define RLC_SRM_ARAM_ADDR__ADDR_MASK 0x3ff | ||
| 9130 | #define RLC_SRM_ARAM_ADDR__ADDR__SHIFT 0x0 | ||
| 9131 | #define RLC_SRM_ARAM_ADDR__RESERVED_MASK 0xfffffc00 | ||
| 9132 | #define RLC_SRM_ARAM_ADDR__RESERVED__SHIFT 0xa | ||
| 9133 | #define RLC_SRM_ARAM_DATA__DATA_MASK 0xffffffff | 9125 | #define RLC_SRM_ARAM_DATA__DATA_MASK 0xffffffff |
| 9134 | #define RLC_SRM_ARAM_DATA__DATA__SHIFT 0x0 | 9126 | #define RLC_SRM_ARAM_DATA__DATA__SHIFT 0x0 |
| 9135 | #define RLC_SRM_DRAM_ADDR__ADDR_MASK 0x3ff | ||
| 9136 | #define RLC_SRM_DRAM_ADDR__ADDR__SHIFT 0x0 | ||
| 9137 | #define RLC_SRM_DRAM_ADDR__RESERVED_MASK 0xfffffc00 | 9127 | #define RLC_SRM_DRAM_ADDR__RESERVED_MASK 0xfffffc00 |
| 9138 | #define RLC_SRM_DRAM_ADDR__RESERVED__SHIFT 0xa | 9128 | #define RLC_SRM_DRAM_ADDR__RESERVED__SHIFT 0xa |
| 9139 | #define RLC_SRM_DRAM_DATA__DATA_MASK 0xffffffff | 9129 | #define RLC_SRM_DRAM_DATA__DATA_MASK 0xffffffff |
| @@ -17948,8 +17938,6 @@ | |||
| 17948 | #define VGT_TESS_DISTRIBUTION__ACCUM_TRI__SHIFT 0x8 | 17938 | #define VGT_TESS_DISTRIBUTION__ACCUM_TRI__SHIFT 0x8 |
| 17949 | #define VGT_TESS_DISTRIBUTION__ACCUM_QUAD_MASK 0xff0000 | 17939 | #define VGT_TESS_DISTRIBUTION__ACCUM_QUAD_MASK 0xff0000 |
| 17950 | #define VGT_TESS_DISTRIBUTION__ACCUM_QUAD__SHIFT 0x10 | 17940 | #define VGT_TESS_DISTRIBUTION__ACCUM_QUAD__SHIFT 0x10 |
| 17951 | #define VGT_TESS_DISTRIBUTION__DONUT_SPLIT_MASK 0xff000000 | ||
| 17952 | #define VGT_TESS_DISTRIBUTION__DONUT_SPLIT__SHIFT 0x18 | ||
| 17953 | #define VGT_TF_RING_SIZE__SIZE_MASK 0xffff | 17941 | #define VGT_TF_RING_SIZE__SIZE_MASK 0xffff |
| 17954 | #define VGT_TF_RING_SIZE__SIZE__SHIFT 0x0 | 17942 | #define VGT_TF_RING_SIZE__SIZE__SHIFT 0x0 |
| 17955 | #define VGT_SYS_CONFIG__DUAL_CORE_EN_MASK 0x1 | 17943 | #define VGT_SYS_CONFIG__DUAL_CORE_EN_MASK 0x1 |
| @@ -20504,8 +20492,6 @@ | |||
| 20504 | #define DIDT_SQ_CTRL0__DIDT_CTRL_RST__SHIFT 0x4 | 20492 | #define DIDT_SQ_CTRL0__DIDT_CTRL_RST__SHIFT 0x4 |
| 20505 | #define DIDT_SQ_CTRL0__DIDT_CLK_EN_OVERRIDE_MASK 0x20 | 20493 | #define DIDT_SQ_CTRL0__DIDT_CLK_EN_OVERRIDE_MASK 0x20 |
| 20506 | #define DIDT_SQ_CTRL0__DIDT_CLK_EN_OVERRIDE__SHIFT 0x5 | 20494 | #define DIDT_SQ_CTRL0__DIDT_CLK_EN_OVERRIDE__SHIFT 0x5 |
| 20507 | #define DIDT_SQ_CTRL0__UNUSED_0_MASK 0xffffffc0 | ||
| 20508 | #define DIDT_SQ_CTRL0__UNUSED_0__SHIFT 0x6 | ||
| 20509 | #define DIDT_SQ_CTRL1__MIN_POWER_MASK 0xffff | 20495 | #define DIDT_SQ_CTRL1__MIN_POWER_MASK 0xffff |
| 20510 | #define DIDT_SQ_CTRL1__MIN_POWER__SHIFT 0x0 | 20496 | #define DIDT_SQ_CTRL1__MIN_POWER__SHIFT 0x0 |
| 20511 | #define DIDT_SQ_CTRL1__MAX_POWER_MASK 0xffff0000 | 20497 | #define DIDT_SQ_CTRL1__MAX_POWER_MASK 0xffff0000 |
| @@ -20560,8 +20546,6 @@ | |||
| 20560 | #define DIDT_DB_CTRL0__DIDT_CTRL_RST__SHIFT 0x4 | 20546 | #define DIDT_DB_CTRL0__DIDT_CTRL_RST__SHIFT 0x4 |
| 20561 | #define DIDT_DB_CTRL0__DIDT_CLK_EN_OVERRIDE_MASK 0x20 | 20547 | #define DIDT_DB_CTRL0__DIDT_CLK_EN_OVERRIDE_MASK 0x20 |
| 20562 | #define DIDT_DB_CTRL0__DIDT_CLK_EN_OVERRIDE__SHIFT 0x5 | 20548 | #define DIDT_DB_CTRL0__DIDT_CLK_EN_OVERRIDE__SHIFT 0x5 |
| 20563 | #define DIDT_DB_CTRL0__UNUSED_0_MASK 0xffffffc0 | ||
| 20564 | #define DIDT_DB_CTRL0__UNUSED_0__SHIFT 0x6 | ||
| 20565 | #define DIDT_DB_CTRL1__MIN_POWER_MASK 0xffff | 20549 | #define DIDT_DB_CTRL1__MIN_POWER_MASK 0xffff |
| 20566 | #define DIDT_DB_CTRL1__MIN_POWER__SHIFT 0x0 | 20550 | #define DIDT_DB_CTRL1__MIN_POWER__SHIFT 0x0 |
| 20567 | #define DIDT_DB_CTRL1__MAX_POWER_MASK 0xffff0000 | 20551 | #define DIDT_DB_CTRL1__MAX_POWER_MASK 0xffff0000 |
| @@ -20616,8 +20600,6 @@ | |||
| 20616 | #define DIDT_TD_CTRL0__DIDT_CTRL_RST__SHIFT 0x4 | 20600 | #define DIDT_TD_CTRL0__DIDT_CTRL_RST__SHIFT 0x4 |
| 20617 | #define DIDT_TD_CTRL0__DIDT_CLK_EN_OVERRIDE_MASK 0x20 | 20601 | #define DIDT_TD_CTRL0__DIDT_CLK_EN_OVERRIDE_MASK 0x20 |
| 20618 | #define DIDT_TD_CTRL0__DIDT_CLK_EN_OVERRIDE__SHIFT 0x5 | 20602 | #define DIDT_TD_CTRL0__DIDT_CLK_EN_OVERRIDE__SHIFT 0x5 |
| 20619 | #define DIDT_TD_CTRL0__UNUSED_0_MASK 0xffffffc0 | ||
| 20620 | #define DIDT_TD_CTRL0__UNUSED_0__SHIFT 0x6 | ||
| 20621 | #define DIDT_TD_CTRL1__MIN_POWER_MASK 0xffff | 20603 | #define DIDT_TD_CTRL1__MIN_POWER_MASK 0xffff |
| 20622 | #define DIDT_TD_CTRL1__MIN_POWER__SHIFT 0x0 | 20604 | #define DIDT_TD_CTRL1__MIN_POWER__SHIFT 0x0 |
| 20623 | #define DIDT_TD_CTRL1__MAX_POWER_MASK 0xffff0000 | 20605 | #define DIDT_TD_CTRL1__MAX_POWER_MASK 0xffff0000 |
| @@ -20672,8 +20654,6 @@ | |||
| 20672 | #define DIDT_TCP_CTRL0__DIDT_CTRL_RST__SHIFT 0x4 | 20654 | #define DIDT_TCP_CTRL0__DIDT_CTRL_RST__SHIFT 0x4 |
| 20673 | #define DIDT_TCP_CTRL0__DIDT_CLK_EN_OVERRIDE_MASK 0x20 | 20655 | #define DIDT_TCP_CTRL0__DIDT_CLK_EN_OVERRIDE_MASK 0x20 |
| 20674 | #define DIDT_TCP_CTRL0__DIDT_CLK_EN_OVERRIDE__SHIFT 0x5 | 20656 | #define DIDT_TCP_CTRL0__DIDT_CLK_EN_OVERRIDE__SHIFT 0x5 |
| 20675 | #define DIDT_TCP_CTRL0__UNUSED_0_MASK 0xffffffc0 | ||
| 20676 | #define DIDT_TCP_CTRL0__UNUSED_0__SHIFT 0x6 | ||
| 20677 | #define DIDT_TCP_CTRL1__MIN_POWER_MASK 0xffff | 20657 | #define DIDT_TCP_CTRL1__MIN_POWER_MASK 0xffff |
| 20678 | #define DIDT_TCP_CTRL1__MIN_POWER__SHIFT 0x0 | 20658 | #define DIDT_TCP_CTRL1__MIN_POWER__SHIFT 0x0 |
| 20679 | #define DIDT_TCP_CTRL1__MAX_POWER_MASK 0xffff0000 | 20659 | #define DIDT_TCP_CTRL1__MAX_POWER_MASK 0xffff0000 |
| @@ -20728,8 +20708,6 @@ | |||
| 20728 | #define DIDT_DBR_CTRL0__DIDT_CTRL_RST__SHIFT 0x4 | 20708 | #define DIDT_DBR_CTRL0__DIDT_CTRL_RST__SHIFT 0x4 |
| 20729 | #define DIDT_DBR_CTRL0__DIDT_CLK_EN_OVERRIDE_MASK 0x20 | 20709 | #define DIDT_DBR_CTRL0__DIDT_CLK_EN_OVERRIDE_MASK 0x20 |
| 20730 | #define DIDT_DBR_CTRL0__DIDT_CLK_EN_OVERRIDE__SHIFT 0x5 | 20710 | #define DIDT_DBR_CTRL0__DIDT_CLK_EN_OVERRIDE__SHIFT 0x5 |
| 20731 | #define DIDT_DBR_CTRL0__UNUSED_0_MASK 0xffffffc0 | ||
| 20732 | #define DIDT_DBR_CTRL0__UNUSED_0__SHIFT 0x6 | ||
| 20733 | #define DIDT_DBR_CTRL1__MIN_POWER_MASK 0xffff | 20711 | #define DIDT_DBR_CTRL1__MIN_POWER_MASK 0xffff |
| 20734 | #define DIDT_DBR_CTRL1__MIN_POWER__SHIFT 0x0 | 20712 | #define DIDT_DBR_CTRL1__MIN_POWER__SHIFT 0x0 |
| 20735 | #define DIDT_DBR_CTRL1__MAX_POWER_MASK 0xffff0000 | 20713 | #define DIDT_DBR_CTRL1__MAX_POWER_MASK 0xffff0000 |
