drm/amd/display: Fix build break
Subsystems (3)
PATCH 1/1 drm/amd/display: Fix build break
1. Remove duplicate OTG_PIXEL_RATE_CNTL from dccg_registers
2. Fixes: 18827ee0cc28 ("drm/amd/display: Refactor visual confirm")
--- drivers/gpu/drm/amd/display/dc/dcn20/dcn20_dccg.h | 1 - drivers/gpu/drm/amd/display/dc/dcn31/dcn31_init.c | 3 +-- 2 files changed, 1 insertion(+), 3 deletions(-)
drivers/gpu/drm/amd/display/dc/dcn20/dcn20_dccg.h +0 -1
@@ -202,7 +202,6 @@ struct dccg_registers {#if defined(CONFIG_DRM_AMD_DC_DCN3_1 )uint32_t PHYDSYMCLK_CLOCK_CNTL ;uint32_t PHYESYMCLK_CLOCK_CNTL ; -uint32_t OTG_PIXEL_RATE_CNTL [MAX_PIPES ];uint32_t DTBCLK_DTO_MODULO [MAX_PIPES ];uint32_t DTBCLK_DTO_PHASE [MAX_PIPES ];uint32_t DCCG_AUDIO_DTBCLK_DTO_MODULO ;
drivers/gpu/drm/amd/display/dc/dcn31/dcn31_init.c +1 -2
@@ -100,6 +100,7 @@ static const struct hw_sequencer_funcs dcn31_funcs = { .z10_restore = dcn31_z10_restore, .is_abm_supported = dcn31_is_abm_supported, .set_disp_pattern_generator = dcn30_set_disp_pattern_generator, + .update_visual_confirm_color = dcn20_update_visual_confirm_color, };static const struct hwseq_private_funcs dcn31_private_funcs = {
@@ -129,8 +130,6 @@ static const struct hwseq_private_funcs dcn31_private_funcs = { .program_all_writeback_pipes_in_tree = dcn30_program_all_writeback_pipes_in_tree, .update_odm = dcn20_update_odm, .dsc_pg_control = dcn31_dsc_pg_control, - .get_surface_visual_confirm_color = dcn10_get_surface_visual_confirm_color, - .get_hdr_visual_confirm_color = dcn10_get_hdr_visual_confirm_color, .set_hdr_multiplier = dcn10_set_hdr_multiplier, .verify_allow_pstate_change_high = dcn10_verify_allow_pstate_change_high, .wait_for_blank_complete = dcn20_wait_for_blank_complete,
Signature · 6 lines
2.25.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
[Public]
________________________________
From: amd-gfx <[email protected]> on behalf of Anson Jacob <[email protected]>
Sent: Tuesday, June 8, 2021 11:36 AM
To: [email protected] <[email protected]>
Cc: Brol, Eryk <[email protected]>; Li, Sun peng (Leo) <[email protected]>; Wentland, Harry <[email protected]>; Zhuo, Qingqing <[email protected]>; Siqueira, Rodrigo <[email protected]>; Li, Roman <[email protected]>; Jacob, Anson <[email protected]>; Pillai, Aurabindo <[email protected]>; Lakha, Bhawanpreet <[email protected]>; R, Bindu <[email protected]>
Subject: [PATCH] drm/amd/display: Fix build break
1. Remove duplicate OTG_PIXEL_RATE_CNTL from dccg_registers
2. Fixes: 18827ee0cc28 ("drm/amd/display: Refactor visual confirm")
--- drivers/gpu/drm/amd/display/dc/dcn20/dcn20_dccg.h | 1 - drivers/gpu/drm/amd/display/dc/dcn31/dcn31_init.c | 3 +-- 2 files changed, 1 insertion(+), 3 deletions(-)
drivers/gpu/drm/amd/display/dc/dcn20/dcn20_dccg.h +0 -1
@@ -202,7 +202,6 @@ struct dccg_registers {#if defined(CONFIG_DRM_AMD_DC_DCN3_1 )uint32_t PHYDSYMCLK_CLOCK_CNTL ;uint32_t PHYESYMCLK_CLOCK_CNTL ; -uint32_t OTG_PIXEL_RATE_CNTL [MAX_PIPES ];uint32_t DTBCLK_DTO_MODULO [MAX_PIPES ];uint32_t DTBCLK_DTO_PHASE [MAX_PIPES ];uint32_t DCCG_AUDIO_DTBCLK_DTO_MODULO ;
drivers/gpu/drm/amd/display/dc/dcn31/dcn31_init.c +1 -2
@@ -100,6 +100,7 @@ static const struct hw_sequencer_funcs dcn31_funcs = { .z10_restore = dcn31_z10_restore, .is_abm_supported = dcn31_is_abm_supported, .set_disp_pattern_generator = dcn30_set_disp_pattern_generator, + .update_visual_confirm_color = dcn20_update_visual_confirm_color, };static const struct hwseq_private_funcs dcn31_private_funcs = {
@@ -129,8 +130,6 @@ static const struct hwseq_private_funcs dcn31_private_funcs = { .program_all_writeback_pipes_in_tree = dcn30_program_all_writeback_pipes_in_tree, .update_odm = dcn20_update_odm, .dsc_pg_control = dcn31_dsc_pg_control, - .get_surface_visual_confirm_color = dcn10_get_surface_visual_confirm_color, - .get_hdr_visual_confirm_color = dcn10_get_hdr_visual_confirm_color, .set_hdr_multiplier = dcn10_set_hdr_multiplier, .verify_allow_pstate_change_high = dcn10_verify_allow_pstate_change_high, .wait_for_blank_complete = dcn20_wait_for_blank_complete,
--
2.25.1
_______________________________________________
amd-gfx mailing list
[email protected]
https://nam11.safelinks.protection.outlook.com/?url=https%3A%2F%2Flists.freedesktop.org%2Fmailman%2Flistinfo%2Famd-gfx&data=04%7C01%7Calexander.deucher%40amd.com%7C5272e2b7a9204f8c5fac08d92a934655%7C3dd8961fe4884e608e11a82d994e183d%7C0%7C0%7C637587634302129644%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C1000&sdata=VI3%2B4jLpN%2Fk%2BCM0o%2BnmGBEEeth%2FYhB9v%2BHuxu8npBRc%3D&reserved=0
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx