aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hubp.h14
-rw-r--r--drivers/gpu/drm/amd/display/dc/inc/hw/hubp.h1
2 files changed, 5 insertions, 10 deletions
diff --git a/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hubp.h b/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hubp.h
index 26f638d36a20..33e91d9c010f 100644
--- a/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hubp.h
+++ b/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hubp.h
@@ -230,12 +230,7 @@
230 uint32_t CURSOR_CONTROL; \ 230 uint32_t CURSOR_CONTROL; \
231 uint32_t CURSOR_POSITION; \ 231 uint32_t CURSOR_POSITION; \
232 uint32_t CURSOR_HOT_SPOT; \ 232 uint32_t CURSOR_HOT_SPOT; \
233 uint32_t CURSOR_DST_OFFSET; 233 uint32_t CURSOR_DST_OFFSET
234
235
236struct dcn_mi_registers {
237 HUBP_COMMON_REG_VARIABLE_LIST
238};
239 234
240#define HUBP_SF(reg_name, field_name, post_fix)\ 235#define HUBP_SF(reg_name, field_name, post_fix)\
241 .field_name = reg_name ## __ ## field_name ## post_fix 236 .field_name = reg_name ## __ ## field_name ## post_fix
@@ -399,9 +394,6 @@ struct dcn_mi_registers {
399 HUBP_SF(CURSOR0_CURSOR_HOT_SPOT, CURSOR_HOT_SPOT_Y, mask_sh), \ 394 HUBP_SF(CURSOR0_CURSOR_HOT_SPOT, CURSOR_HOT_SPOT_Y, mask_sh), \
400 HUBP_SF(CURSOR0_CURSOR_DST_OFFSET, CURSOR_DST_X_OFFSET, mask_sh) 395 HUBP_SF(CURSOR0_CURSOR_DST_OFFSET, CURSOR_DST_X_OFFSET, mask_sh)
401 396
402
403
404
405#define DCN_HUBP_REG_FIELD_LIST(type) \ 397#define DCN_HUBP_REG_FIELD_LIST(type) \
406 type HUBP_BLANK_EN;\ 398 type HUBP_BLANK_EN;\
407 type HUBP_TTU_DISABLE;\ 399 type HUBP_TTU_DISABLE;\
@@ -581,6 +573,10 @@ struct dcn_mi_registers {
581 type CURSOR_DST_X_OFFSET; \ 573 type CURSOR_DST_X_OFFSET; \
582 type OUTPUT_FP 574 type OUTPUT_FP
583 575
576struct dcn_mi_registers {
577 HUBP_COMMON_REG_VARIABLE_LIST;
578};
579
584struct dcn_mi_shift { 580struct dcn_mi_shift {
585 DCN_HUBP_REG_FIELD_LIST(uint8_t); 581 DCN_HUBP_REG_FIELD_LIST(uint8_t);
586}; 582};
diff --git a/drivers/gpu/drm/amd/display/dc/inc/hw/hubp.h b/drivers/gpu/drm/amd/display/dc/inc/hw/hubp.h
index 6a4685f972e1..b7c7e70022e4 100644
--- a/drivers/gpu/drm/amd/display/dc/inc/hw/hubp.h
+++ b/drivers/gpu/drm/amd/display/dc/inc/hw/hubp.h
@@ -42,7 +42,6 @@ enum cursor_lines_per_chunk {
42 CURSOR_LINE_PER_CHUNK_16 42 CURSOR_LINE_PER_CHUNK_16
43}; 43};
44 44
45
46struct hubp { 45struct hubp {
47 struct hubp_funcs *funcs; 46 struct hubp_funcs *funcs;
48 struct dc_context *ctx; 47 struct dc_context *ctx;