Various minor Display DCE120 cleanups
Subsystems (3)
Various small tidy up patches for the dce120 display driver. Should be no functional changes.
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
A message that is not in the archive (sent off-list or not yet received): [email protected]
PATCH 1/6 drm/amd/display: Tidy up dce120_timing_generator_enable_advanced_request()
Simplify the function by removing identical looking code blocks.
--- .../display/dc/dce120/dce120_timing_generator.c | 37 +++++++--------------- 1 file changed, 12 insertions(+), 25 deletions(-)
drivers/gpu/drm/amd/display/dc/dce120/dce120_timing_generator.c +12 -25
@@ -669,36 +669,23 @@ void dce120_timing_generator_enable_advanced_request( mmCRTC0_CRTC_START_LINE_CONTROL, tg110->offsets.crtc); - -if (enable) { -set_reg_field_value ( - value, -0 , -CRTC0_CRTC_START_LINE_CONTROL , -CRTC_LEGACY_REQUESTOR_EN ); - }else { -set_reg_field_value ( - value, -1 , -CRTC0_CRTC_START_LINE_CONTROL , -CRTC_LEGACY_REQUESTOR_EN ); - } +set_reg_field_value ( + value, + enable ?0 :1 , +CRTC0_CRTC_START_LINE_CONTROL , +CRTC_LEGACY_REQUESTOR_EN );/* Program advanced line position acc.to the best case from fetching data perspective to hide MC latency * and prefilling Line Buffer in V Blank (to 10 lines as LB can store max 10 lines) */ if (v_sync_width_and_b_porch >10 ) -set_reg_field_value ( - value, -10 , -CRTC0_CRTC_START_LINE_CONTROL , -CRTC_ADVANCED_START_LINE_POSITION ); -else -set_reg_field_value ( - value, - v_sync_width_and_b_porch, -CRTC0_CRTC_START_LINE_CONTROL , -CRTC_ADVANCED_START_LINE_POSITION ); + v_sync_width_and_b_porch =10 ; + +set_reg_field_value ( + value, + v_sync_width_and_b_porch, +CRTC0_CRTC_START_LINE_CONTROL , +CRTC_ADVANCED_START_LINE_POSITION ); dm_write_reg_soc15(tg->ctx, mmCRTC0_CRTC_START_LINE_CONTROL,
Signature · 6 lines
2.12.0 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 2/6 drm/amd/display: Fix indentation in dce120_tg_program_timing()
In reply to a message not in the archive--- drivers/gpu/drm/amd/display/dc/dce120/dce120_timing_generator.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/gpu/drm/amd/display/dc/dce120/dce120_timing_generator.c +3 -3
@@ -733,9 +733,9 @@ void dce120_tg_program_timing(struct timing_generator *tg, bool use_vbios) {if (use_vbios) -dce110_timing_generator_program_timing_generator (tg, timing); -else -dce120_timing_generator_program_blanking (tg, timing); +dce110_timing_generator_program_timing_generator (tg, timing); +else +dce120_timing_generator_program_blanking (tg, timing); }bool dce120_tg_is_blanked (struct timing_generator *tg)
Signature · 6 lines
2.12.0 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 3/6 drm/amd/display: Make dce120_tg_is_blanked() more legible
In reply to a message not in the archive--- .../drm/amd/display/dc/dce120/dce120_timing_generator.c | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-)
drivers/gpu/drm/amd/display/dc/dce120/dce120_timing_generator.c +8 -9
@@ -746,15 +746,14 @@ bool dce120_tg_is_blanked(struct timing_generator *tg) mmCRTC0_CRTC_BLANK_CONTROL, tg110->offsets.crtc); -if ( -get_reg_field_value ( - value, -CRTC0_CRTC_BLANK_CONTROL , -CRTC_BLANK_DATA_EN ) ==1 && -get_reg_field_value ( - value, -CRTC0_CRTC_BLANK_CONTROL , -CRTC_CURRENT_BLANK_STATE ) ==1 ) +if (get_reg_field_value ( + value, +CRTC0_CRTC_BLANK_CONTROL , +CRTC_BLANK_DATA_EN ) ==1 && +get_reg_field_value ( + value, +CRTC0_CRTC_BLANK_CONTROL , +CRTC_CURRENT_BLANK_STATE ) ==1 )return true;return false;
Signature · 6 lines
2.12.0 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 4/6 drm/amd/display: Clean up indentation in dce120_tg_set_blank()
In reply to a message not in the archive--- .../drm/amd/display/dc/dce120/dce120_timing_generator.c | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-)
drivers/gpu/drm/amd/display/dc/dce120/dce120_timing_generator.c +5 -11
@@ -768,17 +768,11 @@ void dce120_tg_set_blank(struct timing_generator *tg,CRTC0_CRTC_DOUBLE_BUFFER_CONTROL , CRTC_BLANK_DATA_DOUBLE_BUFFER_EN, 0); -if (enable_blanking) { -CRTC_REG_SET ( -CRTC0_CRTC_BLANK_CONTROL , -CRTC_BLANK_DATA_EN ,1 ); - - }else -dm_write_reg_soc15 ( - tg->ctx, - mmCRTC0_CRTC_BLANK_CONTROL, - tg110->offsets.crtc, -0 ); +if (enable_blanking) +CRTC_REG_SET (CRTC0_CRTC_BLANK_CONTROL ,CRTC_BLANK_DATA_EN ,1 ); +else +dm_write_reg_soc15 (tg->ctx, mmCRTC0_CRTC_BLANK_CONTROL, + tg110->offsets.crtc,0 ); } bool dce120_tg_validate_timing(struct timing_generator *tg,
Signature · 6 lines
2.12.0 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 5/6 drm/amd/display: Tidy up dce120_clock_source_create()
In reply to a message not in the archiveAlso change sizeof to be automatic based on type declaration.
--- drivers/gpu/drm/amd/display/dc/dce120/dce120_resource.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/gpu/drm/amd/display/dc/dce120/dce120_resource.c +2 -2
@@ -444,13 +444,13 @@ struct clock_source *dce120_clock_source_create( bool dp_clk_src) {struct dce110_clk_src *clk_src = -dm_alloc (sizeof (struct dce110_clk_src )); +dm_alloc (sizeof (*clk_src));if (!clk_src)return NULL ;if (dce110_clk_src_construct (clk_src, ctx, bios, id, - regs, &cs_shift, &cs_mask)) { + regs, &cs_shift, &cs_mask)) { clk_src->base.dp_clk_src = dp_clk_src;return &clk_src->base; }
Signature · 6 lines
2.12.0 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 6/6 drm/amd/display: Tidy up mem_input_program_surface_flip_and_addr()
In reply to a message not in the archive--- .../drm/amd/display/dc/dce120/dce120_mem_input.c | 27 ++++++++-------------- 1 file changed, 9 insertions(+), 18 deletions(-)
drivers/gpu/drm/amd/display/dc/dce120/dce120_mem_input.c +9 -18
@@ -195,20 +195,12 @@ static bool mem_input_program_surface_flip_and_addr(* non-XDMA Mode: GRPH_SURFACE_UPDATE_IMMEDIATE_EN = 1 * XDMA Mode: GRPH_SURFACE_UPDATE_H_RETRACE_EN = 1 */ -DCP_REG_UPDATE (DCP0_GRPH_UPDATE , -GRPH_UPDATE_LOCK ,1 ); - -if (flip_immediate) { -DCP_REG_UPDATE_2 ( -DCP0_GRPH_FLIP_CONTROL , -GRPH_SURFACE_UPDATE_IMMEDIATE_EN ,0 , -GRPH_SURFACE_UPDATE_H_RETRACE_EN ,1 ); - }else { -DCP_REG_UPDATE_2 ( -DCP0_GRPH_FLIP_CONTROL , -GRPH_SURFACE_UPDATE_IMMEDIATE_EN ,0 , -GRPH_SURFACE_UPDATE_H_RETRACE_EN ,0 ); - } +DCP_REG_UPDATE (DCP0_GRPH_UPDATE ,GRPH_UPDATE_LOCK ,1 ); + +DCP_REG_UPDATE_2 ( +DCP0_GRPH_FLIP_CONTROL , +GRPH_SURFACE_UPDATE_IMMEDIATE_EN ,0 , +GRPH_SURFACE_UPDATE_H_RETRACE_EN , flip_immediate ?1 :0 );switch (address->type) {case PLN_ADDR_TYPE_GRAPHICS :
@@ -217,8 +209,8 @@ static bool mem_input_program_surface_flip_and_addr(program_pri_addr (mem_input110, address->grph.addr);break ;case PLN_ADDR_TYPE_GRPH_STEREO : -if (address->grph_stereo.left_addr.quad_part ==0 - || address->grph_stereo.right_addr.quad_part ==0 ) +if (address->grph_stereo.left_addr.quad_part ==0 || + address->grph_stereo.right_addr.quad_part ==0 )break ;program_pri_addr (mem_input110, address->grph_stereo.left_addr);program_sec_addr (mem_input110, address->grph_stereo.right_addr);
@@ -234,8 +226,7 @@ static bool mem_input_program_surface_flip_and_addr(if (flip_immediate) mem_input->current_address = *address; -DCP_REG_UPDATE (DCP0_GRPH_UPDATE , -GRPH_UPDATE_LOCK ,0 ); +DCP_REG_UPDATE (DCP0_GRPH_UPDATE ,GRPH_UPDATE_LOCK ,0 );return true; }
Signature · 6 lines
2.12.0 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
A message that is not in the archive (sent off-list or not yet received): [email protected]
RE: [PATCH 6/6] drm/amd/display: Tidy up mem_input_program_surface_flip_and_addr()
Quoted 10 lines
-----Original Message-----
From: amd-gfx [mailto:[email protected]] On Behalf Of Tom St Denis
Sent: Tuesday, May 16, 2017 10:22 AM
To: [email protected]
Cc: StDenis, Tom
Subject: [PATCH 6/6] drm/amd/display: Tidy upmem_input_program_surface_flip_and_addr()Signed-off-by Tom St Denis <[email protected]>
Patches are Acked-by: Alex Deucher <[email protected]>
If Harry is ok with them, please coordinate to pull them through the dal tree.
Alex
Quoted 67 lines
--- .../drm/amd/display/dc/dce120/dce120_mem_input.c | 27 ++++++++------- ------- 1 file changed, 9 insertions(+), 18 deletions(-)drivers/gpu/drm/amd/display/dc/dce120/dce120_mem_input.c +0
-0@@ -195,20 +195,12 @@ static boolmem_input_program_surface_flip_and_addr(
drivers/gpu/drm/amd/display/dc/dce120/dce120_mem_input.c +6
-14* non-XDMA Mode: GRPH_SURFACE_UPDATE_IMMEDIATE_EN = 1 * XDMA Mode: GRPH_SURFACE_UPDATE_H_RETRACE_EN = 1 */ -DCP_REG_UPDATE (DCP0_GRPH_UPDATE , -GRPH_UPDATE_LOCK ,1 ); - -if (flip_immediate) { -DCP_REG_UPDATE_2 ( -DCP0_GRPH_FLIP_CONTROL , -GRPH_SURFACE_UPDATE_IMMEDIATE_EN ,0 , -GRPH_SURFACE_UPDATE_H_RETRACE_EN ,1 ); - }else { -DCP_REG_UPDATE_2 ( -DCP0_GRPH_FLIP_CONTROL , -GRPH_SURFACE_UPDATE_IMMEDIATE_EN ,0 , -GRPH_SURFACE_UPDATE_H_RETRACE_EN ,0 ); - } +DCP_REG_UPDATE (DCP0_GRPH_UPDATE ,GRPH_UPDATE_LOCK ,1 ); + + DCP_REG_UPDATE_2( + DCP0_GRPH_FLIP_CONTROL, + GRPH_SURFACE_UPDATE_IMMEDIATE_EN, 0, + GRPH_SURFACE_UPDATE_H_RETRACE_EN, flip_immediate ?1 : 0);
drivers/gpu/drm/amd/display/dc/dce120/dce120_mem_input.c +0
-0switch (address->type) {case PLN_ADDR_TYPE_GRAPHICS :@@ -217,8 +209,8 @@ static boolmem_input_program_surface_flip_and_addr(
drivers/gpu/drm/amd/display/dc/dce120/dce120_mem_input.c +2
-2program_pri_addr (mem_input110, address->grph.addr);break ;case PLN_ADDR_TYPE_GRPH_STEREO : -if (address->grph_stereo.left_addr.quad_part ==0 - || address->grph_stereo.right_addr.quad_part ==0 ) +if (address->grph_stereo.left_addr.quad_part ==0 || + address->grph_stereo.right_addr.quad_part ==0 )break ; program_pri_addr(mem_input110, address-Quoted 1 line
grph_stereo.left_addr);
program_sec_addr(mem_input110, address-
Quoted 1 line
grph_stereo.right_addr);
drivers/gpu/drm/amd/display/dc/dce120/dce120_mem_input.c +0
-0@@ -234,8 +226,7 @@ static boolmem_input_program_surface_flip_and_addr(
drivers/gpu/drm/amd/display/dc/dce120/dce120_mem_input.c +1
-3if (flip_immediate) mem_input->current_address = *address; -DCP_REG_UPDATE (DCP0_GRPH_UPDATE , -GRPH_UPDATE_LOCK ,0 ); +DCP_REG_UPDATE (DCP0_GRPH_UPDATE ,GRPH_UPDATE_LOCK ,0 );return true; } --2.12.0
Quoted 4 lines
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
A message that is not in the archive (sent off-list or not yet received): BN6PR12MB1652B96CB688DCD1A7507C6CF7F90-/b2+HYfkarQqUD6E6FAiowdYzm3356FpvxpqHgZTriW3zl9H0oFU5g@public.gmane.org
Re: [PATCH 6/6] drm/amd/display: Tidy up mem_input_program_surface_flip_and_addr()
Quoted 9 lines · Alexander
Quoted 9 lines
-----Original Message-----
From: amd-gfx [mailto:[email protected]] On Behalf Of Tom St Denis
Sent: Tuesday, May 16, 2017 10:22 AM
To: [email protected]
Cc: StDenis, Tom
Subject: [PATCH 6/6] drm/amd/display: Tidy upmem_input_program_surface_flip_and_addr()
Quoted 6 lines
Quoted 1 line
Signed-off-by Tom St Denis <[email protected]>Patches are Acked-by: Alex Deucher <[email protected]>
If Harry is ok with them, please coordinate to pull them through the dal tree.
Thanks, Alex.
Already part of the internal dal tree and on the way for amd-staging-4.9 as part of today's set of DC patches.
Harry
Quoted 69 lines
Alex
Quoted 67 lines
--- .../drm/amd/display/dc/dce120/dce120_mem_input.c | 27 ++++++++------- ------- 1 file changed, 9 insertions(+), 18 deletions(-)drivers/gpu/drm/amd/display/dc/dce120/dce120_mem_input.c +0
-0@@ -195,20 +195,12 @@ static boolmem_input_program_surface_flip_and_addr(
* non-XDMA Mode:GRPH_SURFACE_UPDATE_IMMEDIATE_EN= 1
* XDMA Mode:GRPH_SURFACE_UPDATE_H_RETRACE_EN= 1 */drivers/gpu/drm/amd/display/dc/dce120/dce120_mem_input.c +6
-14-DCP_REG_UPDATE (DCP0_GRPH_UPDATE , -GRPH_UPDATE_LOCK ,1 ); - -if (flip_immediate) { -DCP_REG_UPDATE_2 ( -DCP0_GRPH_FLIP_CONTROL , -GRPH_SURFACE_UPDATE_IMMEDIATE_EN ,0 , -GRPH_SURFACE_UPDATE_H_RETRACE_EN ,1 ); - }else { -DCP_REG_UPDATE_2 ( -DCP0_GRPH_FLIP_CONTROL , -GRPH_SURFACE_UPDATE_IMMEDIATE_EN ,0 , -GRPH_SURFACE_UPDATE_H_RETRACE_EN ,0 ); - } +DCP_REG_UPDATE (DCP0_GRPH_UPDATE ,GRPH_UPDATE_LOCK ,1 ); + + DCP_REG_UPDATE_2( + DCP0_GRPH_FLIP_CONTROL, + GRPH_SURFACE_UPDATE_IMMEDIATE_EN, 0, + GRPH_SURFACE_UPDATE_H_RETRACE_EN, flip_immediate ?1 : 0);
switch (address->type) { case PLN_ADDR_TYPE_GRAPHICS:drivers/gpu/drm/amd/display/dc/dce120/dce120_mem_input.c +0
-0@@ -217,8 +209,8 @@ static boolmem_input_program_surface_flip_and_addr(
program_pri_addr(mem_input110, address->grph.addr); break;
casePLN_ADDR_TYPE_GRPH_STEREO:drivers/gpu/drm/amd/display/dc/dce120/dce120_mem_input.c +2
-2-if (address->grph_stereo.left_addr.quad_part ==0 - || address->grph_stereo.right_addr.quad_part ==0 ) +if (address->grph_stereo.left_addr.quad_part ==0 || + address->grph_stereo.right_addr.quad_part ==0 )break ; program_pri_addr(mem_input110, address-Quoted 1 line
grph_stereo.left_addr);
program_sec_addr(mem_input110, address-
Quoted 1 line
grph_stereo.right_addr);
drivers/gpu/drm/amd/display/dc/dce120/dce120_mem_input.c +0
-0@@ -234,8 +226,7 @@ static boolmem_input_program_surface_flip_and_addr(
if (flip_immediate)
mem_input->current_address= *address;drivers/gpu/drm/amd/display/dc/dce120/dce120_mem_input.c +1
-3-DCP_REG_UPDATE (DCP0_GRPH_UPDATE , -GRPH_UPDATE_LOCK ,0 ); +DCP_REG_UPDATE (DCP0_GRPH_UPDATE ,GRPH_UPDATE_LOCK ,0 );return true; } --2.12.0
Quoted 9 lines
Quoted 4 lines
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx