drm/radeon: allow TA_CS_BC_BASE_ADDR on SI
Subsystems (2)
PATCH 1/1 drm/radeon: allow TA_CS_BC_BASE_ADDR on SI
From: Marek Olšák <[email protected]>
Required for border colors in compute shaders.
--- drivers/gpu/drm/radeon/radeon_drv.c | 3 ++- drivers/gpu/drm/radeon/si.c | 1 + drivers/gpu/drm/radeon/sid.h | 1 + 3 files changed, 4 insertions(+), 1 deletion(-)
drivers/gpu/drm/radeon/radeon_drv.c +2 -1
@@ -90,23 +90,24 @@* 2.39.0 - Add INFO query for number of active CUs * 2.40.0 - Add RADEON_GEM_GTT_WC/UC, flush HDP cache before submitting * CS to GPU on >= r600 * 2.41.0 - evergreen/cayman: Add SET_BASE/DRAW_INDIRECT command parsing support * 2.42.0 - Add VCE/VUI (Video Usability Information) support * 2.43.0 - RADEON_INFO_GPU_RESET_COUNTER * 2.44.0 - SET_APPEND_CNT packet3 support * 2.45.0 - Allow setting shader registers using DMA/COPY packet3 on SI * 2.46.0 - Add PFP_SYNC_ME support on evergreen * 2.47.0 - Add UVD_NO_OP register support +* 2.48.0 - TA_CS_BC_BASE_ADDR allowed on SI */ #define KMS_DRIVER_MAJOR 2 -#define KMS_DRIVER_MINOR 47 +#define KMS_DRIVER_MINOR 48#define KMS_DRIVER_PATCHLEVEL 0int radeon_driver_load_kms (struct drm_device *dev,unsigned long flags);int radeon_driver_unload_kms (struct drm_device *dev);void radeon_driver_lastclose_kms (struct drm_device *dev);int radeon_driver_open_kms (struct drm_device *dev,struct drm_file *file_priv);void radeon_driver_postclose_kms (struct drm_device *dev,struct drm_file *file_priv);void radeon_driver_preclose_kms (struct drm_device *dev,struct drm_file *file_priv); int radeon_suspend_kms(struct drm_device *dev, bool suspend,
drivers/gpu/drm/radeon/si.c +1 -0
@@ -4424,20 +4424,21 @@ static bool si_vm_reg_valid(u32 reg)case PA_SC_LINE_STIPPLE_STATE :case PA_SC_ENHANCE :case SQC_CACHES :case SPI_STATIC_THREAD_MGMT_1 :case SPI_STATIC_THREAD_MGMT_2 :case SPI_STATIC_THREAD_MGMT_3 :case SPI_PS_MAX_WAVE_ID :case SPI_CONFIG_CNTL :case SPI_CONFIG_CNTL_1 :case TA_CNTL_AUX : +case TA_CS_BC_BASE_ADDR :return true;default :DRM_ERROR ("Invalid register 0x%x in CS\n" , reg);return false; } }static int si_vm_packet3_ce_check (struct radeon_device *rdev,u32 *ib,struct radeon_cs_packet *pkt) {
drivers/gpu/drm/radeon/sid.h +1 -0
@@ -1138,20 +1138,21 @@#define CGTS_USER_TCC_DISABLE 0x914C#define TCC_DISABLE_MASK 0xFFFF0000#define TCC_DISABLE_SHIFT 16#define CGTS_SM_CTRL_REG 0x9150#define OVERRIDE (1 << 21)#define LS_OVERRIDE (1 << 22)#define SPI_LB_CU_MASK 0x9354#define TA_CNTL_AUX 0x9508 +#define TA_CS_BC_BASE_ADDR 0x950C#define CC_RB_BACKEND_DISABLE 0x98F4#define BACKEND_DISABLE (x) ((x) << 16)#define GB_ADDR_CONFIG 0x98F8#define NUM_PIPES (x) ((x) << 0)#define NUM_PIPES_MASK 0x00000007#define NUM_PIPES_SHIFT 0#define PIPE_INTERLEAVE_SIZE (x) ((x) << 4)#define PIPE_INTERLEAVE_SIZE_MASK 0x00000070#define PIPE_INTERLEAVE_SIZE_SHIFT 4
Signature · 6 lines
2.7.4 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
A message that is not in the archive (sent off-list or not yet received): 1476098605-8594-1-git-send-email-maraeo-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org
Christian König
Reviewed-byAm 10.10.2016 um 13:23 schrieb Marek Olšák:
Quoted 5 lines
From: Marek Olšák <[email protected]>
Required for border colors in compute shaders.
Signed-off-by Marek Olšák <[email protected]>
Quoted 78 lines
--- drivers/gpu/drm/radeon/radeon_drv.c | 3 ++- drivers/gpu/drm/radeon/si.c | 1 + drivers/gpu/drm/radeon/sid.h | 1 + 3 files changed, 4 insertions(+), 1 deletion(-)drivers/gpu/drm/radeon/radeon_drv.c +2
-1@@ -90,23 +90,24 @@* 2.39.0 - Add INFO query for number of active CUs * 2.40.0 - Add RADEON_GEM_GTT_WC/UC, flush HDP cache before submitting * CS to GPU on >= r600 * 2.41.0 - evergreen/cayman: Add SET_BASE/DRAW_INDIRECT command parsing support * 2.42.0 - Add VCE/VUI (Video Usability Information) support * 2.43.0 - RADEON_INFO_GPU_RESET_COUNTER * 2.44.0 - SET_APPEND_CNT packet3 support * 2.45.0 - Allow setting shader registers using DMA/COPY packet3 on SI * 2.46.0 - Add PFP_SYNC_ME support on evergreen * 2.47.0 - Add UVD_NO_OP register support +* 2.48.0 - TA_CS_BC_BASE_ADDR allowed on SI */ #define KMS_DRIVER_MAJOR 2 -#define KMS_DRIVER_MINOR 47 +#define KMS_DRIVER_MINOR 48#define KMS_DRIVER_PATCHLEVEL 0int radeon_driver_load_kms (struct drm_device *dev,unsigned long flags);int radeon_driver_unload_kms (struct drm_device *dev);void radeon_driver_lastclose_kms (struct drm_device *dev);int radeon_driver_open_kms (struct drm_device *dev,struct drm_file *file_priv);void radeon_driver_postclose_kms (struct drm_device *dev,struct drm_file *file_priv);void radeon_driver_preclose_kms (struct drm_device *dev,struct drm_file *file_priv); int radeon_suspend_kms(struct drm_device *dev, bool suspend,drivers/gpu/drm/radeon/si.c +1
-0@@ -4424,20 +4424,21 @@ static bool si_vm_reg_valid(u32 reg)case PA_SC_LINE_STIPPLE_STATE :case PA_SC_ENHANCE :case SQC_CACHES :case SPI_STATIC_THREAD_MGMT_1 :case SPI_STATIC_THREAD_MGMT_2 :case SPI_STATIC_THREAD_MGMT_3 :case SPI_PS_MAX_WAVE_ID :case SPI_CONFIG_CNTL :case SPI_CONFIG_CNTL_1 :case TA_CNTL_AUX : +case TA_CS_BC_BASE_ADDR :return true;default :DRM_ERROR ("Invalid register 0x%x in CS\n" , reg);return false; } }static int si_vm_packet3_ce_check (struct radeon_device *rdev,u32 *ib,struct radeon_cs_packet *pkt) {drivers/gpu/drm/radeon/sid.h +1
-0@@ -1138,20 +1138,21 @@#define CGTS_USER_TCC_DISABLE 0x914C#define TCC_DISABLE_MASK 0xFFFF0000#define TCC_DISABLE_SHIFT 16#define CGTS_SM_CTRL_REG 0x9150#define OVERRIDE (1 << 21)#define LS_OVERRIDE (1 << 22)#define SPI_LB_CU_MASK 0x9354#define TA_CNTL_AUX 0x9508 +#define TA_CS_BC_BASE_ADDR 0x950C
drivers/gpu/drm/radeon/sid.h line 1158
Quoted 10 lines
drivers/gpu/drm/radeon/sid.h +0
-0#define CC_RB_BACKEND_DISABLE 0x98F4#define BACKEND_DISABLE (x) ((x) << 16)#define GB_ADDR_CONFIG 0x98F8#define NUM_PIPES (x) ((x) << 0)#define NUM_PIPES_MASK 0x00000007#define NUM_PIPES_SHIFT 0#define PIPE_INTERLEAVE_SIZE (x) ((x) << 4)#define PIPE_INTERLEAVE_SIZE_MASK 0x00000070#define PIPE_INTERLEAVE_SIZE_SHIFT 4
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
Alex Deucher
Reviewed-byQuoted 5 lines · Marek Olšák
From: Marek Olšák <[email protected]>
Required for border colors in compute shaders.
Signed-off-by Marek Olšák <[email protected]>
Quoted 91 lines
--- drivers/gpu/drm/radeon/radeon_drv.c | 3 ++- drivers/gpu/drm/radeon/si.c | 1 + drivers/gpu/drm/radeon/sid.h | 1 + 3 files changed, 4 insertions(+), 1 deletion(-)drivers/gpu/drm/radeon/radeon_drv.c +2
-1@@ -90,23 +90,24 @@* 2.39.0 - Add INFO query for number of active CUs * 2.40.0 - Add RADEON_GEM_GTT_WC/UC, flush HDP cache before submitting * CS to GPU on >= r600 * 2.41.0 - evergreen/cayman: Add SET_BASE/DRAW_INDIRECT command parsing support * 2.42.0 - Add VCE/VUI (Video Usability Information) support * 2.43.0 - RADEON_INFO_GPU_RESET_COUNTER * 2.44.0 - SET_APPEND_CNT packet3 support * 2.45.0 - Allow setting shader registers using DMA/COPY packet3 on SI * 2.46.0 - Add PFP_SYNC_ME support on evergreen * 2.47.0 - Add UVD_NO_OP register support +* 2.48.0 - TA_CS_BC_BASE_ADDR allowed on SI */ #define KMS_DRIVER_MAJOR 2 -#define KMS_DRIVER_MINOR 47 +#define KMS_DRIVER_MINOR 48#define KMS_DRIVER_PATCHLEVEL 0int radeon_driver_load_kms (struct drm_device *dev,unsigned long flags);int radeon_driver_unload_kms (struct drm_device *dev);void radeon_driver_lastclose_kms (struct drm_device *dev);int radeon_driver_open_kms (struct drm_device *dev,struct drm_file *file_priv);void radeon_driver_postclose_kms (struct drm_device *dev,struct drm_file *file_priv);void radeon_driver_preclose_kms (struct drm_device *dev,struct drm_file *file_priv); int radeon_suspend_kms(struct drm_device *dev, bool suspend,drivers/gpu/drm/radeon/si.c +1
-0@@ -4424,20 +4424,21 @@ static bool si_vm_reg_valid(u32 reg)case PA_SC_LINE_STIPPLE_STATE :case PA_SC_ENHANCE :case SQC_CACHES :case SPI_STATIC_THREAD_MGMT_1 :case SPI_STATIC_THREAD_MGMT_2 :case SPI_STATIC_THREAD_MGMT_3 :case SPI_PS_MAX_WAVE_ID :case SPI_CONFIG_CNTL :case SPI_CONFIG_CNTL_1 :case TA_CNTL_AUX : +case TA_CS_BC_BASE_ADDR :return true;default :DRM_ERROR ("Invalid register 0x%x in CS\n" , reg);return false; } }static int si_vm_packet3_ce_check (struct radeon_device *rdev,u32 *ib,struct radeon_cs_packet *pkt) {drivers/gpu/drm/radeon/sid.h +1
-1@@ -1138,20 +1138,21 @@#define CGTS_USER_TCC_DISABLE 0x914C#define TCC_DISABLE_MASK 0xFFFF0000#define TCC_DISABLE_SHIFT 16#define CGTS_SM_CTRL_REG 0x9150#define OVERRIDE (1 << 21)#define LS_OVERRIDE (1 << 22)#define SPI_LB_CU_MASK 0x9354#define TA_CNTL_AUX 0x9508 +#define TA_CS_BC_BASE_ADDR 0x950C#define CC_RB_BACKEND_DISABLE 0x98F4#define BACKEND_DISABLE (x) ((x) << 16)#define GB_ADDR_CONFIG 0x98F8#define NUM_PIPES (x) ((x) << 0)#define NUM_PIPES_MASK 0x00000007#define NUM_PIPES_SHIFT 0#define PIPE_INTERLEAVE_SIZE (x) ((x) << 4)#define PIPE_INTERLEAVE_SIZE_MASK 0x00000070#define PIPE_INTERLEAVE_SIZE_SHIFT 4 --2.7.4
Quoted 4 lines
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
Edward O'Callaghan
Reviewed-byQuoted 5 lines · Marek Olšák
From: Marek Olšák <[email protected]>
Required for border colors in compute shaders.
Signed-off-by Marek Olšák <[email protected]>
Quoted 79 lines
--- drivers/gpu/drm/radeon/radeon_drv.c | 3 ++- drivers/gpu/drm/radeon/si.c | 1 + drivers/gpu/drm/radeon/sid.h | 1 + 3 files changed, 4 insertions(+), 1 deletion(-)drivers/gpu/drm/radeon/radeon_drv.c +2
-1@@ -90,23 +90,24 @@* 2.39.0 - Add INFO query for number of active CUs * 2.40.0 - Add RADEON_GEM_GTT_WC/UC, flush HDP cache before submitting * CS to GPU on >= r600 * 2.41.0 - evergreen/cayman: Add SET_BASE/DRAW_INDIRECT command parsing support * 2.42.0 - Add VCE/VUI (Video Usability Information) support * 2.43.0 - RADEON_INFO_GPU_RESET_COUNTER * 2.44.0 - SET_APPEND_CNT packet3 support * 2.45.0 - Allow setting shader registers using DMA/COPY packet3 on SI * 2.46.0 - Add PFP_SYNC_ME support on evergreen * 2.47.0 - Add UVD_NO_OP register support +* 2.48.0 - TA_CS_BC_BASE_ADDR allowed on SI */ #define KMS_DRIVER_MAJOR 2 -#define KMS_DRIVER_MINOR 47 +#define KMS_DRIVER_MINOR 48#define KMS_DRIVER_PATCHLEVEL 0int radeon_driver_load_kms (struct drm_device *dev,unsigned long flags);int radeon_driver_unload_kms (struct drm_device *dev);void radeon_driver_lastclose_kms (struct drm_device *dev);int radeon_driver_open_kms (struct drm_device *dev,struct drm_file *file_priv);void radeon_driver_postclose_kms (struct drm_device *dev,struct drm_file *file_priv);void radeon_driver_preclose_kms (struct drm_device *dev,struct drm_file *file_priv); int radeon_suspend_kms(struct drm_device *dev, bool suspend,drivers/gpu/drm/radeon/si.c +1
-0@@ -4424,20 +4424,21 @@ static bool si_vm_reg_valid(u32 reg)case PA_SC_LINE_STIPPLE_STATE :case PA_SC_ENHANCE :case SQC_CACHES :case SPI_STATIC_THREAD_MGMT_1 :case SPI_STATIC_THREAD_MGMT_2 :case SPI_STATIC_THREAD_MGMT_3 :case SPI_PS_MAX_WAVE_ID :case SPI_CONFIG_CNTL :case SPI_CONFIG_CNTL_1 :case TA_CNTL_AUX : +case TA_CS_BC_BASE_ADDR :return true;default :DRM_ERROR ("Invalid register 0x%x in CS\n" , reg);return false; } }static int si_vm_packet3_ce_check (struct radeon_device *rdev,u32 *ib,struct radeon_cs_packet *pkt) {drivers/gpu/drm/radeon/sid.h +1
-0@@ -1138,20 +1138,21 @@#define CGTS_USER_TCC_DISABLE 0x914C#define TCC_DISABLE_MASK 0xFFFF0000#define TCC_DISABLE_SHIFT 16#define CGTS_SM_CTRL_REG 0x9150#define OVERRIDE (1 << 21)#define LS_OVERRIDE (1 << 22)#define SPI_LB_CU_MASK 0x9354#define TA_CNTL_AUX 0x9508 +#define TA_CS_BC_BASE_ADDR 0x950C
drivers/gpu/drm/radeon/sid.h line 1158
Quoted 10 lines
drivers/gpu/drm/radeon/sid.h +0
-0#define CC_RB_BACKEND_DISABLE 0x98F4#define BACKEND_DISABLE (x) ((x) << 16)#define GB_ADDR_CONFIG 0x98F8#define NUM_PIPES (x) ((x) << 0)#define NUM_PIPES_MASK 0x00000007#define NUM_PIPES_SHIFT 0#define PIPE_INTERLEAVE_SIZE (x) ((x) << 4)#define PIPE_INTERLEAVE_SIZE_MASK 0x00000070#define PIPE_INTERLEAVE_SIZE_SHIFT 4
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx