leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

drm/amd/display: Remove couple of unused OPTC registers

Browse Source 
Signed-off-by: Nikola Cornij <nikola.cornij@amd.com>
Reviewed-by: Tony Cheng <Tony.Cheng@amd.com>
Acked-by: Harry Wentland <harry.wentland@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
This commit is contained in:
Nikola Cornij 2018-01-11 12:51:14 -05:00 committed by Alex Deucher
parent 5af9d013ef
commit 5f353208c3
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/gpu/drm/amd/display/dc/dcn10/dcn10_optc.h
View File

@ -131,7 +131,6 @@ struct dcn_optc_registers {
uint32_t OTG_GSL_WINDOW_X; uint32_t OTG_GSL_WINDOW_X;
uint32_t OTG_GSL_WINDOW_Y; uint32_t OTG_GSL_WINDOW_Y;
uint32_t OTG_VUPDATE_KEEPOUT; uint32_t OTG_VUPDATE_KEEPOUT;
uint32_t OTG_DSC_START_POSITION;
}; };
#define TG_COMMON_MASK_SH_LIST_DCN(mask_sh)\ #define TG_COMMON_MASK_SH_LIST_DCN(mask_sh)\
@ -241,7 +240,7 @@ struct dcn_optc_registers {
SF(OTG0_OTG_TEST_PATTERN_COLOR, OTG_TEST_PATTERN_DATA, mask_sh),\ SF(OTG0_OTG_TEST_PATTERN_COLOR, OTG_TEST_PATTERN_DATA, mask_sh),\
SF(ODM0_OPTC_DATA_SOURCE_SELECT, OPTC_SRC_SEL, mask_sh) SF(ODM0_OPTC_DATA_SOURCE_SELECT, OPTC_SRC_SEL, mask_sh)
#define TG_REG_FIELD_LIST(type) \ #define TG_REG_FIELD_LIST_DCN1_0(type) \
type VSTARTUP_START;\ type VSTARTUP_START;\
type VUPDATE_OFFSET;\ type VUPDATE_OFFSET;\
type VUPDATE_WIDTH;\ type VUPDATE_WIDTH;\
@ -352,10 +351,11 @@ struct dcn_optc_registers {
type OTG_MASTER_UPDATE_LOCK_GSL_EN;\ type OTG_MASTER_UPDATE_LOCK_GSL_EN;\
type MASTER_UPDATE_LOCK_VUPDATE_KEEPOUT_START_OFFSET;\ type MASTER_UPDATE_LOCK_VUPDATE_KEEPOUT_START_OFFSET;\
type MASTER_UPDATE_LOCK_VUPDATE_KEEPOUT_END_OFFSET;\ type MASTER_UPDATE_LOCK_VUPDATE_KEEPOUT_END_OFFSET;\
type OTG_DSC_START_POSITION_X;\
type OTG_DSC_START_POSITION_LINE_NUM;\
type OTG_MASTER_UPDATE_LOCK_VUPDATE_KEEPOUT_EN; type OTG_MASTER_UPDATE_LOCK_VUPDATE_KEEPOUT_EN;
#define TG_REG_FIELD_LIST(type) \
TG_REG_FIELD_LIST_DCN1_0(type)
struct dcn_optc_shift { struct dcn_optc_shift {
TG_REG_FIELD_LIST(uint8_t) TG_REG_FIELD_LIST(uint8_t)

1
drivers/gpu/drm/amd/display/dc/inc/hw/timing_generator.h
View File

@ -217,6 +217,7 @@ struct timing_generator_funcs {
*/ */
bool (*get_crc)(struct timing_generator *tg, bool (*get_crc)(struct timing_generator *tg,
uint32_t *r_cr, uint32_t *g_y, uint32_t *b_cb); uint32_t *r_cr, uint32_t *g_y, uint32_t *b_cb);
}; };
#endif #endif