From 9992ec5691401fc0bc6b7f4a7da0d4f9fa912fd1 Mon Sep 17 00:00:00 2001 From: Eric Bernstein Date: Thu, 7 Dec 2017 15:49:43 -0500 Subject: [PATCH 3019/4131] drm/amd/display: Put dcn_mi_registers with other structs Signed-off-by: Eric Bernstein Reviewed-by: Harry Wentland --- drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hubp.h | 14 +++++--------- drivers/gpu/drm/amd/display/dc/inc/hw/hubp.h | 1 - 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 26f638d..33e91d9 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 @@ uint32_t CURSOR_CONTROL; \ uint32_t CURSOR_POSITION; \ uint32_t CURSOR_HOT_SPOT; \ - uint32_t CURSOR_DST_OFFSET; - - -struct dcn_mi_registers { - HUBP_COMMON_REG_VARIABLE_LIST -}; + uint32_t CURSOR_DST_OFFSET #define HUBP_SF(reg_name, field_name, post_fix)\ .field_name = reg_name ## __ ## field_name ## post_fix @@ -399,9 +394,6 @@ struct dcn_mi_registers { HUBP_SF(CURSOR0_CURSOR_HOT_SPOT, CURSOR_HOT_SPOT_Y, mask_sh), \ HUBP_SF(CURSOR0_CURSOR_DST_OFFSET, CURSOR_DST_X_OFFSET, mask_sh) - - - #define DCN_HUBP_REG_FIELD_LIST(type) \ type HUBP_BLANK_EN;\ type HUBP_TTU_DISABLE;\ @@ -581,6 +573,10 @@ struct dcn_mi_registers { type CURSOR_DST_X_OFFSET; \ type OUTPUT_FP +struct dcn_mi_registers { + HUBP_COMMON_REG_VARIABLE_LIST; +}; + struct dcn_mi_shift { DCN_HUBP_REG_FIELD_LIST(uint8_t); }; 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 6a4685f..b7c7e70 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 { CURSOR_LINE_PER_CHUNK_16 }; - struct hubp { struct hubp_funcs *funcs; struct dc_context *ctx; -- 2.7.4