Skip to content

Commit 5072963

Browse files
committed
drm/amdgpu: Add additional DCE6 SCL registers
Fixes: 102b2f5 ("drm/amd/display: dce_transform: DCE6 Scaling Horizontal Filter Init (v2)") Signed-off-by: Alex Deucher <[email protected]>
1 parent b2ec5ca commit 5072963

File tree

2 files changed

+9
-0
lines changed

2 files changed

+9
-0
lines changed

drivers/gpu/drm/amd/include/asic_reg/dce/dce_6_0_d.h

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4115,6 +4115,7 @@
41154115
#define mmSCL0_SCL_COEF_RAM_CONFLICT_STATUS 0x1B55
41164116
#define mmSCL0_SCL_COEF_RAM_SELECT 0x1B40
41174117
#define mmSCL0_SCL_COEF_RAM_TAP_DATA 0x1B41
4118+
#define mmSCL0_SCL_SCALER_ENABLE 0x1B42
41184119
#define mmSCL0_SCL_CONTROL 0x1B44
41194120
#define mmSCL0_SCL_DEBUG 0x1B6A
41204121
#define mmSCL0_SCL_DEBUG2 0x1B69
@@ -4144,6 +4145,7 @@
41444145
#define mmSCL1_SCL_COEF_RAM_CONFLICT_STATUS 0x1E55
41454146
#define mmSCL1_SCL_COEF_RAM_SELECT 0x1E40
41464147
#define mmSCL1_SCL_COEF_RAM_TAP_DATA 0x1E41
4148+
#define mmSCL1_SCL_SCALER_ENABLE 0x1E42
41474149
#define mmSCL1_SCL_CONTROL 0x1E44
41484150
#define mmSCL1_SCL_DEBUG 0x1E6A
41494151
#define mmSCL1_SCL_DEBUG2 0x1E69
@@ -4173,6 +4175,7 @@
41734175
#define mmSCL2_SCL_COEF_RAM_CONFLICT_STATUS 0x4155
41744176
#define mmSCL2_SCL_COEF_RAM_SELECT 0x4140
41754177
#define mmSCL2_SCL_COEF_RAM_TAP_DATA 0x4141
4178+
#define mmSCL2_SCL_SCALER_ENABLE 0x4142
41764179
#define mmSCL2_SCL_CONTROL 0x4144
41774180
#define mmSCL2_SCL_DEBUG 0x416A
41784181
#define mmSCL2_SCL_DEBUG2 0x4169
@@ -4202,6 +4205,7 @@
42024205
#define mmSCL3_SCL_COEF_RAM_CONFLICT_STATUS 0x4455
42034206
#define mmSCL3_SCL_COEF_RAM_SELECT 0x4440
42044207
#define mmSCL3_SCL_COEF_RAM_TAP_DATA 0x4441
4208+
#define mmSCL3_SCL_SCALER_ENABLE 0x4442
42054209
#define mmSCL3_SCL_CONTROL 0x4444
42064210
#define mmSCL3_SCL_DEBUG 0x446A
42074211
#define mmSCL3_SCL_DEBUG2 0x4469
@@ -4231,6 +4235,7 @@
42314235
#define mmSCL4_SCL_COEF_RAM_CONFLICT_STATUS 0x4755
42324236
#define mmSCL4_SCL_COEF_RAM_SELECT 0x4740
42334237
#define mmSCL4_SCL_COEF_RAM_TAP_DATA 0x4741
4238+
#define mmSCL4_SCL_SCALER_ENABLE 0x4742
42344239
#define mmSCL4_SCL_CONTROL 0x4744
42354240
#define mmSCL4_SCL_DEBUG 0x476A
42364241
#define mmSCL4_SCL_DEBUG2 0x4769
@@ -4260,6 +4265,7 @@
42604265
#define mmSCL5_SCL_COEF_RAM_CONFLICT_STATUS 0x4A55
42614266
#define mmSCL5_SCL_COEF_RAM_SELECT 0x4A40
42624267
#define mmSCL5_SCL_COEF_RAM_TAP_DATA 0x4A41
4268+
#define mmSCL5_SCL_SCALER_ENABLE 0x4A42
42634269
#define mmSCL5_SCL_CONTROL 0x4A44
42644270
#define mmSCL5_SCL_DEBUG 0x4A6A
42654271
#define mmSCL5_SCL_DEBUG2 0x4A69
@@ -4287,6 +4293,7 @@
42874293
#define mmSCL_COEF_RAM_CONFLICT_STATUS 0x1B55
42884294
#define mmSCL_COEF_RAM_SELECT 0x1B40
42894295
#define mmSCL_COEF_RAM_TAP_DATA 0x1B41
4296+
#define mmSCL_SCALER_ENABLE 0x1B42
42904297
#define mmSCL_CONTROL 0x1B44
42914298
#define mmSCL_DEBUG 0x1B6A
42924299
#define mmSCL_DEBUG2 0x1B69

drivers/gpu/drm/amd/include/asic_reg/dce/dce_6_0_sh_mask.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8650,6 +8650,8 @@
86508650
#define REGAMMA_LUT_INDEX__REGAMMA_LUT_INDEX__SHIFT 0x00000000
86518651
#define REGAMMA_LUT_WRITE_EN_MASK__REGAMMA_LUT_WRITE_EN_MASK_MASK 0x00000007L
86528652
#define REGAMMA_LUT_WRITE_EN_MASK__REGAMMA_LUT_WRITE_EN_MASK__SHIFT 0x00000000
8653+
#define SCL_SCALER_ENABLE__SCL_SCALE_EN_MASK 0x00000001L
8654+
#define SCL_SCALER_ENABLE__SCL_SCALE_EN__SHIFT 0x00000000
86538655
#define SCL_ALU_CONTROL__SCL_ALU_DISABLE_MASK 0x00000001L
86548656
#define SCL_ALU_CONTROL__SCL_ALU_DISABLE__SHIFT 0x00000000
86558657
#define SCL_BYPASS_CONTROL__SCL_BYPASS_MODE_MASK 0x00000003L

0 commit comments

Comments
 (0)