DC Patches July 19, 2023
cover DC Patches July 19, 2023
This DC patchset brings improvements in multiple areas. In summary, we highlight:
- Fix underflow issue on 175hz timing
- Add interface to modify DMUB panel power options
- Remove check for default eDP panel_mode
- Add new sequence for 4-lane HBR3 on vendor specific retimers
- Update DPG test pattern programming
- Correct unit conversion for vstartup
- Exit idle optimizations before attempt to access PHY
- Refactor recout calculation with a more generic formula
- Read down-spread percentage from lut to adjust dprefclk.
- Don't apply FIFO resync W/A if rdivider = 0
- Prevent invalid pipe connections
- Rearrange dmub_cmd defs order
- Add VESA SCR case for default aux backlight
- Guard DCN31 PHYD32CLK logic against chip family
- Correct grammar mistakes
Alvin Lee (1):
drm/amd/display: Don't apply FIFO resync W/A if rdivider = 0
Anthony Koo (1):
drm/amd/display: Rearrange dmub_cmd defs order
Aric Cyr (1):
drm/amd/display: 3.2.244
Ethan Bitnun (1):
drm/amd/display: Prevent invalid pipe connections
George Shen (1):
drm/amd/display: Guard DCN31 PHYD32CLK logic against chip family
Iswara Nagulendran (1):
drm/amd/display: Add VESA SCR case for default aux backlight
Leo Chen (1):
drm/amd/display: Exit idle optimizations before attempt to access PHY
Leo Ma (1):
drm/amd/display: Fix underflow issue on 175hz timing
Martin Tsai (1):
drm/amd/display: Read down-spread percentage from lut to adjust
dprefclk.
Ovidiu Bunea (1):
drm/amd/display: Add new sequence for 4-lane HBR3 on vendor specific
retimers
Paul Hsieh (1):
drm/amd/display: Add interface to modify DMUB panel power options
Reza Amini (2):
drm/amd/display: Correct grammar mistakes drm/amd/display: Correct unit conversion for vstartup
Taimur Hassan (1):
drm/amd/display: Remove check for default eDP panel_mode
Wenjing Liu (2):
drm/amd/display: Refactor recout calculation with a more generic
formula
drm/amd/display: Update DPG test pattern programming
.../dc/clk_mgr/dcn314/dcn314_clk_mgr.c | 33 +- .../dc/clk_mgr/dcn314/dcn314_clk_mgr.h | 7 + .../gpu/drm/amd/display/dc/core/dc_resource.c | 597 +++++++++++++----- drivers/gpu/drm/amd/display/dc/dc.h | 2 +- .../display/dc/dce110/dce110_hw_sequencer.c | 3 + .../drm/amd/display/dc/dcn20/dcn20_hwseq.c | 45 +- .../drm/amd/display/dc/dcn21/dcn21_resource.c | 4 +- .../drm/amd/display/dc/dcn30/dcn30_resource.c | 4 +- .../gpu/drm/amd/display/dc/dcn31/dcn31_dccg.c | 3 +- .../gpu/drm/amd/display/dc/dcn32/dcn32_dccg.c | 5 +- .../amd/display/dc/dml/dcn314/dcn314_fpu.c | 25 +- .../drm/amd/display/dc/dml/dcn32/dcn32_fpu.c | 4 +- .../dc/dml/dcn32/display_mode_vba_util_32.c | 7 +- .../display/dc/link/accessories/link_dp_cts.c | 107 ++-- .../link_dp_training_fixed_vs_pe_retimer.c | 67 +- .../link/protocols/link_edp_panel_control.c | 67 +- drivers/gpu/drm/amd/display/dmub/dmub_srv.h | 3 + .../gpu/drm/amd/display/dmub/inc/dmub_cmd.h | 74 +-- .../gpu/drm/amd/display/dmub/src/dmub_srv.c | 12 + 19 files changed, 750 insertions(+), 319 deletions(-)
Signature · 1 line
2.41.0
PATCH 1/16 drm/amd/display: Correct grammar mistakes
From: Reza Amini <[email protected]>
[Why]
There are grammer mistakes in comments
[How]
Correct grammar mistakes
--- .../gpu/drm/amd/display/dmub/inc/dmub_cmd.h | 20 ++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-)
drivers/gpu/drm/amd/display/dmub/inc/dmub_cmd.h +11 -9
@@ -149,39 +149,40 @@union abm_flags {struct {/** -* @abm_enabled: indicates if abm is enabled. +* @abm_enabled: Indicates if ABM is enabled. */ unsigned int abm_enabled :1 ;/** -* @disable_abm_requested: indicates if driver has requested abm to be disabled. +* @disable_abm_requested: Indicates if driver has requested ABM to be disabled. */ unsigned int disable_abm_requested :1 ;/** -* @disable_abm_immediately: indicates if driver has requested abm to be disabled immediately. +* @disable_abm_immediately: Indicates if driver has requested ABM to be disabled +* immediately. */ unsigned int disable_abm_immediately :1 ;/** -* @disable_abm_immediate_keep_gain: indicates if driver has requested abm +* @disable_abm_immediate_keep_gain: Indicates if driver has requested ABM * to be disabled immediately and keep gain. */ unsigned int disable_abm_immediate_keep_gain :1 ;/** -* @fractional_pwm: indicates if fractional duty cycle for backlight pwm is enabled. +* @fractional_pwm: Indicates if fractional duty cycle for backlight PWM is enabled. */ unsigned int fractional_pwm :1 ;/** -* @abm_gradual_bl_change: indicates if algorithm has completed gradual adjustment +* @abm_gradual_bl_change: Indicates if algorithm has completed gradual adjustment * of user backlight level. */ unsigned int abm_gradual_bl_change :1 ; } bitfields; -unsigned int u32all; +unsigned int u32All; };struct abm_save_restore {
@@ -192,7 +193,7 @@ struct abm_save_restore {/** * @pause: true: pause ABM and get state -* false: un-pause ABM after setting state +* false: unpause ABM after setting state */ uint32_t pause;
@@ -2764,7 +2765,7 @@ enum dmub_cmd_abm_type {DMUB_CMD__ABM_PAUSE =6 ,/** -* * Save and Restore ABM state. On save we save parameters, and +* Save and Restore ABM state. On save we save parameters, and * on restore we update state with passed in data. */ DMUB_CMD__ABM_SAVE_RESTORE = 7,
@@ -3152,6 +3153,7 @@ struct dmub_cmd_abm_pause_data {uint8_t pad[1 ]; }; +/** * Definition of a DMUB_CMD__ABM_PAUSE command. */
Signature · 1 line
2.41.0
PATCH 2/16 drm/amd/display: Guard DCN31 PHYD32CLK logic against chip family
In reply to Alex HungFrom: George Shen <[email protected]>
[Why]
Current yellow carp B0 PHYD32CLK logic is incorrectly applied to other ASICs.
[How]
Add guard to check chip family is yellow carp before applying logic.
--- drivers/gpu/drm/amd/display/dc/dcn31/dcn31_dccg.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/gpu/drm/amd/display/dc/dcn31/dcn31_dccg.c +2 -1
@@ -84,7 +84,8 @@ static enum phyd32clk_clock_source get_phy_mux_symclk( struct dcn_dccg *dccg_dcn, enum phyd32clk_clock_source src) { -if (dccg_dcn->base.ctx->asic_id.hw_internal_rev ==YELLOW_CARP_B0 ) { +if (dccg_dcn->base.ctx->asic_id.chip_family ==FAMILY_YELLOW_CARP && + dccg_dcn->base.ctx->asic_id.hw_internal_rev ==YELLOW_CARP_B0 ) {if (src ==PHYD32CLKC ) src =PHYD32CLKF ;if (src ==PHYD32CLKD )
Signature · 1 line
2.41.0
PATCH 3/16 drm/amd/display: Add VESA SCR case for default aux backlight
In reply to Alex HungFrom: Iswara Nagulendran <[email protected]>
[How & Why]
When determining default aux backlight level, read from DPCD address 0x734 for VESA SCR on OLED.
--- .../dc/link/protocols/link_edp_panel_control.c | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-)
drivers/gpu/drm/amd/display/dc/link/protocols/link_edp_panel_control.c +14 -4
@@ -252,10 +252,20 @@ static bool read_default_bl_aux(struct dc_link *link, uint32_t *backlight_millin link->connector_signal != SIGNAL_TYPE_DISPLAY_PORT))return false; -if (!core_link_read_dpcd (link,DP_SOURCE_BACKLIGHT_LEVEL , - (uint8_t *) backlight_millinits, -sizeof (uint32_t ))) -return false; +if (!link->dpcd_caps.panel_luminance_control) { +if (!core_link_read_dpcd (link,DP_SOURCE_BACKLIGHT_LEVEL , + (uint8_t *)backlight_millinits, +sizeof (uint32_t ))) +return false; + }else { +//setting to 0 as a precaution, since target_luminance_value is 3 bytes +memset (backlight_millinits,0 ,sizeof (uint32_t )); + +if (!core_link_read_dpcd (link,DP_EDP_PANEL_TARGET_LUMINANCE_VALUE , + (uint8_t *)backlight_millinits, +sizeof (struct target_luminance_value ))) +return false; + }return true; }
Signature · 1 line
2.41.0
PATCH 4/16 drm/amd/display: Prevent invalid pipe connections
In reply to Alex HungFrom: Ethan Bitnun <[email protected]>
[Description]
- Prevent ODM pipe connections between pipes that are not part of the same plane when adding a plane to context
- Re-attach child pipes of ODM slice about to be disconnected to prevent any lost pipes with invalid tops/bottoms
- We cannot split if head_pipe is not in ODM. Preventing this avoids creating an invalid context with an invalid pipe.
--- .../gpu/drm/amd/display/dc/core/dc_resource.c | 37 +++++++++++++++++-- 1 file changed, 34 insertions(+), 3 deletions(-)
drivers/gpu/drm/amd/display/dc/core/dc_resource.c +34 -3
@@ -75,6 +75,9 @@#define DC_LOGGER_INIT (logger) +#define HEAD_NOT_IN_ODM -2 +#define UNABLE_TO_SPLIT -1 +enum dce_version resource_parse_asic_id (struct hw_asic_id asic_id) {enum dce_version dc_version =DCE_VERSION_UNKNOWN ;
@@ -1471,7 +1474,24 @@ static int acquire_first_split_pipe(return i; }else if (split_pipe->prev_odm_pipe && split_pipe->prev_odm_pipe->plane_state == split_pipe->plane_state) { + +// Fix case where ODM slice has child planes +// Re-attach child planes +struct pipe_ctx *temp_head_pipe =resource_get_head_pipe_for_stream (res_ctx, split_pipe->stream); + +if (split_pipe->bottom_pipe && temp_head_pipe) { + +struct pipe_ctx *temp_tail_pipe =resource_get_tail_pipe (res_ctx, temp_head_pipe); + +if (temp_tail_pipe) { + + split_pipe->bottom_pipe->top_pipe = temp_tail_pipe; + temp_tail_pipe->bottom_pipe = split_pipe->bottom_pipe; + } + } + split_pipe->prev_odm_pipe->next_odm_pipe = split_pipe->next_odm_pipe; +if (split_pipe->next_odm_pipe) split_pipe->next_odm_pipe->prev_odm_pipe = split_pipe->prev_odm_pipe;
@@ -1479,6 +1499,11 @@ static int acquire_first_split_pipe(resource_build_scaling_params (split_pipe->prev_odm_pipe);memset (split_pipe,0 ,sizeof (*split_pipe)); + +// We cannot split if head pipe is not odm +if (temp_head_pipe && !temp_head_pipe->next_odm_pipe && !temp_head_pipe->prev_odm_pipe) +return HEAD_NOT_IN_ODM ; + split_pipe->stream_res.tg = pool->timing_generators[i]; split_pipe->plane_res.hubp = pool->hubps[i]; split_pipe->plane_res.ipp = pool->ipps[i];
@@ -1491,7 +1516,7 @@ static int acquire_first_split_pipe(return i; } } -return -1 ; +return UNABLE_TO_SPLIT ; } bool dc_add_plane_to_context(
@@ -1543,6 +1568,10 @@ bool dc_add_plane_to_context(int pipe_idx =acquire_first_split_pipe (&context->res_ctx, pool, stream);if (pipe_idx >=0 ) free_pipe = &context->res_ctx.pipe_ctx[pipe_idx]; +else if (pipe_idx ==HEAD_NOT_IN_ODM ) +break ; +else +ASSERT (false); }if (!free_pipe) {
@@ -1699,12 +1728,14 @@ bool dc_add_plane_to_context( (free_pipe->plane_state->clip_rect.x + free_pipe->plane_state->clip_rect.width <= free_pipe->stream->src.x + free_pipe->stream->src.width/2))) {if (!free_pipe->next_odm_pipe && - tail_pipe->next_odm_pipe && tail_pipe->next_odm_pipe->bottom_pipe) { + tail_pipe->next_odm_pipe && tail_pipe->next_odm_pipe->bottom_pipe && + tail_pipe->next_odm_pipe->bottom_pipe->plane_state == free_pipe->plane_state) { free_pipe->next_odm_pipe = tail_pipe->next_odm_pipe->bottom_pipe; tail_pipe->next_odm_pipe->bottom_pipe->prev_odm_pipe = free_pipe; }if (!free_pipe->prev_odm_pipe && - tail_pipe->prev_odm_pipe && tail_pipe->prev_odm_pipe->bottom_pipe) { + tail_pipe->prev_odm_pipe && tail_pipe->prev_odm_pipe->bottom_pipe && + tail_pipe->prev_odm_pipe->bottom_pipe->plane_state == free_pipe->plane_state) { free_pipe->prev_odm_pipe = tail_pipe->prev_odm_pipe->bottom_pipe; tail_pipe->prev_odm_pipe->bottom_pipe->next_odm_pipe = free_pipe; }
Signature · 1 line
2.41.0
PATCH 5/16 drm/amd/display: Don't apply FIFO resync W/A if rdivider = 0
In reply to Alex HungFrom: Alvin Lee <[email protected]>
[Description]
It is not valid to set the WDIVIDER value to 0, so do not re-write to DISPCLK_WDIVIDER if the current value is 0 (i.e., it is at it's initial value and we have not made any requests to change DISPCLK yet).
--- drivers/gpu/drm/amd/display/dc/dcn32/dcn32_dccg.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
drivers/gpu/drm/amd/display/dc/dcn32/dcn32_dccg.c +4 -1
@@ -49,7 +49,10 @@ static void dccg32_trigger_dio_fifo_resync(uint32_t dispclk_rdivider_value =0 ;REG_GET (DENTIST_DISPCLK_CNTL ,DENTIST_DISPCLK_RDIVIDER , &dispclk_rdivider_value); -REG_UPDATE (DENTIST_DISPCLK_CNTL ,DENTIST_DISPCLK_WDIVIDER , dispclk_rdivider_value); + +/* Not valid for the WDIVIDER to be set to 0 */ +if (dispclk_rdivider_value !=0 ) +REG_UPDATE (DENTIST_DISPCLK_CNTL ,DENTIST_DISPCLK_WDIVIDER , dispclk_rdivider_value); } static void dccg32_get_pixel_rate_div(
Signature · 1 line
2.41.0
PATCH 6/16 drm/amd/display: Read down-spread percentage from lut to adjust dprefclk.
In reply to Alex HungFrom: Martin Tsai <[email protected]>
[Why]
Panels show corruption with high refresh rate timings when ss is enabled.
[How]
Read down-spread percentage from lut to adjust dprefclk.
--- .../dc/clk_mgr/dcn314/dcn314_clk_mgr.c | 33 +++++++++++++++++-- .../dc/clk_mgr/dcn314/dcn314_clk_mgr.h | 7 ++++ 2 files changed, 38 insertions(+), 2 deletions(-)
drivers/gpu/drm/amd/display/dc/clk_mgr/dcn314/dcn314_clk_mgr.c +31 -2
@@ -87,6 +87,14 @@ static const struct IP_BASE CLK_BASE = { { { { 0x00016C00, 0x02401800, 0, 0, 0,#define CLK1_CLK_PLL_REQ__PllSpineDiv_MASK 0x0000F000L#define CLK1_CLK_PLL_REQ__FbMult_frac_MASK 0xFFFF0000L +#define regCLK1_CLK2_BYPASS_CNTL 0x029c +#define regCLK1_CLK2_BYPASS_CNTL_BASE_IDX 0 + +#define CLK1_CLK2_BYPASS_CNTL__CLK2_BYPASS_SEL__SHIFT 0x0 +#define CLK1_CLK2_BYPASS_CNTL__LK2_BYPASS_DIV__SHIFT 0x10 +#define CLK1_CLK2_BYPASS_CNTL__CLK2_BYPASS_SEL_MASK 0x00000007L +#define CLK1_CLK2_BYPASS_CNTL__LK2_BYPASS_DIV_MASK 0x000F0000L +#define REG (reg_name) \ (CLK_BASE.instance[0].segment[reg ## reg_name ## _BASE_IDX] + reg ## reg_name)
@@ -436,6 +444,11 @@ static DpmClocks314_t dummy_clocks;static struct dcn314_watermarks dummy_wms = {0 }; +static struct dcn314_ss_info_table ss_info_table = { + .ss_divider =1000 , + .ss_percentage = {0 ,0 ,375 ,375 ,375 } +}; +static void dcn314_build_watermark_ranges (struct clk_bw_params *bw_params,struct dcn314_watermarks *table) {int i, num_valid_sets;
@@ -715,6 +728,20 @@ static struct clk_mgr_funcs dcn314_funcs = { };extern struct clk_mgr_funcs dcn3_fpga_funcs; +static void dcn314_read_ss_info_from_lut (struct clk_mgr_internal *clk_mgr) +{ +uint32_t clock_source; + +REG_GET (CLK1_CLK2_BYPASS_CNTL ,CLK2_BYPASS_SEL , &clock_source); + + clk_mgr->dprefclk_ss_percentage = ss_info_table.ss_percentage[clock_source]; + +if (clk_mgr->dprefclk_ss_percentage !=0 ) { + clk_mgr->ss_on_dprefclk = true; + clk_mgr->dprefclk_ss_divider = ss_info_table.ss_divider; + } +} + void dcn314_clk_mgr_construct( struct dc_context *ctx, struct clk_mgr_dcn314 *clk_mgr,
@@ -781,9 +808,11 @@ void dcn314_clk_mgr_construct( clk_mgr->base.base.dprefclk_khz =600000 ; clk_mgr->base.base.clks.ref_dtbclk_khz =600000 ; -dce_clock_read_ss_info (&clk_mgr->base); + +dcn314_read_ss_info_from_lut (&clk_mgr->base);/*if bios enabled SS, driver needs to adjust dtb clock, only enable with correct bios*/ -//clk_mgr->base.dccg->ref_dtbclk_khz = dce_adjust_dp_ref_freq_for_ss(clk_mgr_internal, clk_mgr->base.base.dprefclk_khz); + clk_mgr->base.base.dprefclk_khz = +dce_adjust_dp_ref_freq_for_ss (&clk_mgr->base, clk_mgr->base.base.dprefclk_khz); clk_mgr->base.base.bw_params = &dcn314_bw_params;
drivers/gpu/drm/amd/display/dc/clk_mgr/dcn314/dcn314_clk_mgr.h +7 -0
@@ -28,6 +28,8 @@#define __DCN314_CLK_MGR_H__#include "clk_mgr_internal.h" +#define NUM_CLOCK_SOURCES 5 +struct dcn314_watermarks ;struct dcn314_smu_watermark_set {
@@ -40,6 +42,11 @@ struct clk_mgr_dcn314 {struct dcn314_smu_watermark_set smu_wm_set; }; +struct dcn314_ss_info_table { +uint32_t ss_divider; +uint32_t ss_percentage[NUM_CLOCK_SOURCES ]; +}; +bool dcn314_are_clock_states_equal (struct dc_clocks *a,struct dc_clocks *b);
Signature · 1 line
2.41.0
PATCH 7/16 drm/amd/display: Refactor recout calculation with a more generic formula
In reply to Alex HungFrom: Wenjing Liu <[email protected]>
[Why]
Current recout calculation has a few assumptions and implementation for MPO + ODM combine calculation is very specific. The equation has too many cases without enough comments to document the detail.
[How]
The change remove the following assumptions:
1. When MPO is enabled, we only allow ODM Combine 2:1
2. ODM Combine always has even segment width.
3. Secondary MPO plane's pipe_ctx copies pre_odm_pipe from its top pipe.
The change applies a generic formula with more details in comment to document this solution so it is eaiser to learn and debug later.
--- .../gpu/drm/amd/display/dc/core/dc_resource.c | 560 +++++++++++++----- .../drm/amd/display/dc/dcn21/dcn21_resource.c | 4 +- .../drm/amd/display/dc/dcn30/dcn30_resource.c | 4 +- .../drm/amd/display/dc/dml/dcn32/dcn32_fpu.c | 4 +- 4 files changed, 404 insertions(+), 168 deletions(-)
drivers/gpu/drm/amd/display/dc/core/dc_resource.c +398 -162
@@ -69,9 +69,10 @@#include "../dcn32/dcn32_resource.h" #include "../dcn321/dcn321_resource.h" -#define VISUAL_CONFIRM_RECT_HEIGHT_DEFAULT 3 -#define VISUAL_CONFIRM_RECT_HEIGHT_MIN 1 -#define VISUAL_CONFIRM_RECT_HEIGHT_MAX 10 +#define VISUAL_CONFIRM_BASE_DEFAULT 3 +#define VISUAL_CONFIRM_BASE_MIN 1 +#define VISUAL_CONFIRM_BASE_MAX 10 +#define VISUAL_CONFIRM_DPP_OFFSET 3#define DC_LOGGER_INIT (logger)
@@ -746,7 +747,12 @@ int get_num_mpc_splits(struct pipe_ctx *pipe)int get_num_odm_splits (struct pipe_ctx *pipe) {int odm_split_count =0 ; -struct pipe_ctx *next_pipe = pipe->next_odm_pipe; +struct pipe_ctx *next_pipe =NULL ; + +while (pipe->top_pipe) + pipe = pipe->top_pipe; + + next_pipe = pipe->next_odm_pipe;while (next_pipe) { odm_split_count++; next_pipe = next_pipe->next_odm_pipe;
@@ -759,32 +765,35 @@ int get_num_odm_splits(struct pipe_ctx *pipe)return odm_split_count; } -static void calculate_split_count_and_index (struct pipe_ctx *pipe_ctx,int *split_count,int *split_idx) +static int get_odm_split_index (struct pipe_ctx *pipe_ctx) { - *split_count =get_num_odm_splits (pipe_ctx); - *split_idx =0 ; -if (*split_count ==0 ) { -/*Check for mpc split*/ -struct pipe_ctx *split_pipe = pipe_ctx->top_pipe; - - *split_count =get_num_mpc_splits (pipe_ctx); -while (split_pipe && split_pipe->plane_state == pipe_ctx->plane_state) { - (*split_idx)++; - split_pipe = split_pipe->top_pipe; - } +struct pipe_ctx *split_pipe =NULL ; +int index =0 ; -/* MPO window on right side of ODM split */ -if (split_pipe && split_pipe->prev_odm_pipe && !pipe_ctx->prev_odm_pipe) - (*split_idx)++; - }else { -/*Get odm split index*/ -struct pipe_ctx *split_pipe = pipe_ctx->prev_odm_pipe; +while (pipe_ctx->top_pipe) + pipe_ctx = pipe_ctx->top_pipe; -while (split_pipe) { - (*split_idx)++; - split_pipe = split_pipe->prev_odm_pipe; - } + split_pipe = pipe_ctx->prev_odm_pipe; + +while (split_pipe) { + index++; + split_pipe = split_pipe->prev_odm_pipe; } + +return index; +} + +static int get_mpc_split_index (struct pipe_ctx *pipe_ctx) +{ +struct pipe_ctx *split_pipe = pipe_ctx->top_pipe; +int index =0 ; + +while (split_pipe && split_pipe->plane_state == pipe_ctx->plane_state) { + index++; + split_pipe = split_pipe->top_pipe; + } + +return index; }/*
@@ -806,101 +815,357 @@ static void calculate_viewport_size(struct pipe_ctx *pipe_ctx) } } -static void calculate_recout (struct pipe_ctx *pipe_ctx) +static struct rect intersect_rec (const struct rect *r0,const struct rect *r1) { -const struct dc_plane_state *plane_state = pipe_ctx->plane_state; -const struct dc_stream_state *stream = pipe_ctx->stream; -struct scaler_data *data = &pipe_ctx->plane_res.scl_data; -struct rect surf_clip = plane_state->clip_rect; -bool split_tb = stream->view_format ==VIEW_3D_FORMAT_TOP_AND_BOTTOM ; -int split_count, split_idx; -struct dpp *dpp = pipe_ctx->plane_res.dpp; -unsigned short visual_confirm_rect_height =VISUAL_CONFIRM_RECT_HEIGHT_DEFAULT ; +struct rect rec; +int r0_x_end = r0->x + r0->width; +int r1_x_end = r1->x + r1->width; +int r0_y_end = r0->y + r0->height; +int r1_y_end = r1->y + r1->height; + + rec.x = r0->x > r1->x ? r0->x : r1->x; + rec.width = r0_x_end > r1_x_end ? r1_x_end - rec.x : r0_x_end - rec.x; + rec.y = r0->y > r1->y ? r0->y : r1->y; + rec.height = r0_y_end > r1_y_end ? r1_y_end - rec.y : r0_y_end - rec.y; + +/* in case that there is no intersection */ +if (rec.width <0 || rec.height <0 ) +memset (&rec,0 ,sizeof (rec)); + +return rec; +} -calculate_split_count_and_index (pipe_ctx, &split_count, &split_idx); -if (stream->view_format ==VIEW_3D_FORMAT_SIDE_BY_SIDE ) - split_idx =0 ; +static struct rect shift_rec (const struct rect *rec_in,int x,int y) +{ +struct rect rec_out = *rec_in; + + rec_out.x += x; + rec_out.y += y; + +return rec_out; +} +static struct rect calculate_odm_slice_in_timing_active (struct pipe_ctx *pipe_ctx) +{ +const struct dc_stream_state *stream = pipe_ctx->stream; +int odm_slice_count =get_num_odm_splits (pipe_ctx) +1 ; +int odm_slice_idx =get_odm_split_index (pipe_ctx); +bool is_last_odm_slice = (odm_slice_idx +1 ) == odm_slice_count; +int h_active = stream->timing.h_addressable + + stream->timing.h_border_left + + stream->timing.h_border_right; +int odm_slice_width = h_active / odm_slice_count; +struct rect odm_rec; + + odm_rec.x = odm_slice_width * odm_slice_idx; + odm_rec.width = is_last_odm_slice ? +/* last slice width is the reminder of h_active */ + h_active - odm_slice_width * (odm_slice_count -1 ) : +/* odm slice width is the floor of h_active / count */ + odm_slice_width; + odm_rec.y =0 ; + odm_rec.height = stream->timing.v_addressable + + stream->timing.v_border_bottom + + stream->timing.v_border_top; + +return odm_rec; +} + +static struct rect calculate_plane_rec_in_timing_active ( +struct pipe_ctx *pipe_ctx, +const struct rect *rec_in) +{/* -* Only the leftmost ODM pipe should be offset by a nonzero distance +* The following diagram shows an example where we map a 1920x1200 +* desktop to a 2560x1440 timing with a plane rect in the middle +* of the screen. To map a plane rect from Stream Source to Timing +* Active space, we first multiply stream scaling ratios (i.e 2304/1920 +* horizontal and 1440/1200 vertical) to the plane's x and y, then +* we add stream destination offsets (i.e 128 horizontal, 0 vertical). +* This will give us a plane rect's position in Timing Active. However +* we have to remove the fractional. The rule is that we find left/right +* and top/bottom positions and round the value to the adjacent integer. +* +* Stream Source Space +* ------------ +* __________________________________________________ +* |Stream Source (1920 x 1200) ^ | +* | y | +* | <------- w --------|> | +* | __________________V | +* |<-- x -->|Plane//////////////| ^ | +* | |(pre scale)////////| | | +* | |///////////////////| | | +* | |///////////////////| h | +* | |///////////////////| | | +* | |///////////////////| | | +* | |///////////////////| V | +* | | +* | | +* |__________________________________________________| +* +* +* Timing Active Space +* --------------------------------- +* +* Timing Active (2560 x 1440) +* __________________________________________________ +* |*****| Stteam Destination (2304 x 1440) |*****| +* |*****| |*****| +* |<128>| |*****| +* |*****| __________________ |*****| +* |*****| |Plane/////////////| |*****| +* |*****| |(post scale)//////| |*****| +* |*****| |//////////////////| |*****| +* |*****| |//////////////////| |*****| +* |*****| |//////////////////| |*****| +* |*****| |//////////////////| |*****| +* |*****| |*****| +* |*****| |*****| +* |*****| |*****| +* |*****|______________________________________|*****| +* +* So the resulting formulas are shown below: +* +* recout_x = 128 + round(plane_x * 2304 / 1920) +* recout_w = 128 + round((plane_x + plane_w) * 2304 / 1920) - recout_x +* recout_y = 0 + round(plane_y * 1440 / 1280) +* recout_h = 0 + round((plane_y + plane_h) * 1440 / 1200) - recout_y +* +* NOTE: fixed point division is not error free. To reduce errors +* introduced by fixed point division, we divide only after +* multiplication is complete. */ -if (pipe_ctx->top_pipe && pipe_ctx->top_pipe->prev_odm_pipe && !pipe_ctx->prev_odm_pipe) { -/* MPO window on right side of ODM split */ - data->recout.x = stream->dst.x + (surf_clip.x - stream->src.x - stream->src.width/2 ) * - stream->dst.width / stream->src.width; - }else if (!pipe_ctx->prev_odm_pipe || split_idx == split_count) { - data->recout.x = stream->dst.x; -if (stream->src.x < surf_clip.x) - data->recout.x += (surf_clip.x - stream->src.x) * stream->dst.width - / stream->src.width; - }else - data->recout.x =0 ; - -if (stream->src.x > surf_clip.x) - surf_clip.width -= stream->src.x - surf_clip.x; - data->recout.width = surf_clip.width * stream->dst.width / stream->src.width; -if (data->recout.width + data->recout.x > stream->dst.x + stream->dst.width) - data->recout.width = stream->dst.x + stream->dst.width - data->recout.x; - - data->recout.y = stream->dst.y; -if (stream->src.y < surf_clip.y) - data->recout.y += (surf_clip.y - stream->src.y) * stream->dst.height - / stream->src.height; -else if (stream->src.y > surf_clip.y) - surf_clip.height -= stream->src.y - surf_clip.y; - - data->recout.height = surf_clip.height * stream->dst.height / stream->src.height; -if (data->recout.height + data->recout.y > stream->dst.y + stream->dst.height) - data->recout.height = stream->dst.y + stream->dst.height - data->recout.y; - -/* Handle h & v split */ -if (split_tb) { -ASSERT (data->recout.height %2 ==0 ); - data->recout.height /=2 ; - }else if (split_count) { -if (!pipe_ctx->next_odm_pipe && !pipe_ctx->prev_odm_pipe) { -/* extra pixels in the division remainder need to go to pipes after -* the extra pixel index minus one(epimo) defined here as: -*/ -int epimo = split_count - data->recout.width % (split_count +1 ); +const struct dc_stream_state *stream = pipe_ctx->stream; +struct rect rec_out = {0 }; +struct fixed31_32 temp; - data->recout.x += (data->recout.width / (split_count +1 )) * split_idx; -if (split_idx > epimo) - data->recout.x += split_idx - epimo -1 ; -ASSERT (stream->view_format !=VIEW_3D_FORMAT_SIDE_BY_SIDE || data->recout.width %2 ==0 ); - data->recout.width = data->recout.width / (split_count +1 ) + (split_idx > epimo ?1 :0 ); - }else { -/* odm */ -if (split_idx == split_count) { -/* rightmost pipe is the remainder recout */ - data->recout.width -= data->h_active * split_count - data->recout.x; - -/* ODM combine cases with MPO we can get negative widths */ -if (data->recout.width <0 ) - data->recout.width =0 ; - - data->recout.x =0 ; - }else - data->recout.width = data->h_active - data->recout.x; - } - } + temp =dc_fixpt_from_fraction (rec_in->x * stream->dst.width, + stream->src.width); + rec_out.x = stream->dst.x +dc_fixpt_round (temp); -/* Check bounds to ensure the VC bar height was set to a sane value */ -if (dpp !=NULL ) { -if ((dpp->ctx->dc->debug.visual_confirm_rect_height >=VISUAL_CONFIRM_RECT_HEIGHT_MIN ) && - (dpp->ctx->dc->debug.visual_confirm_rect_height <=VISUAL_CONFIRM_RECT_HEIGHT_MAX )) { - visual_confirm_rect_height = dpp->ctx->dc->debug.visual_confirm_rect_height; - } + temp =dc_fixpt_from_fraction ( + (rec_in->x + rec_in->width) * stream->dst.width, + stream->src.width); + rec_out.width = stream->dst.x +dc_fixpt_round (temp) - rec_out.x; + + temp =dc_fixpt_from_fraction (rec_in->y * stream->dst.height, + stream->src.height); + rec_out.y = stream->dst.y +dc_fixpt_round (temp); + + temp =dc_fixpt_from_fraction ( + (rec_in->y + rec_in->height) * stream->dst.height, + stream->src.height); + rec_out.height = stream->dst.y +dc_fixpt_round (temp) - rec_out.y; -if (dpp->ctx->dc->debug.visual_confirm != -VISUAL_CONFIRM_DISABLE ) - data->recout.height = data->recout.height - -2 * ((pipe_ctx->prev_odm_pipe || - (pipe_ctx->top_pipe && - pipe_ctx->top_pipe->plane_state == - pipe_ctx->plane_state)) + - visual_confirm_rect_height); +return rec_out; +} + +static struct rect calculate_mpc_slice_in_timing_active ( +struct pipe_ctx *pipe_ctx, +struct rect *plane_clip_rec) +{ +const struct dc_stream_state *stream = pipe_ctx->stream; +int mpc_slice_count =get_num_mpc_splits (pipe_ctx) +1 ; +int mpc_slice_idx =get_mpc_split_index (pipe_ctx); +int epimo = mpc_slice_count - plane_clip_rec->width % mpc_slice_count -1 ; +struct rect mpc_rec; + + mpc_rec.width = plane_clip_rec->width / mpc_slice_count; + mpc_rec.x = plane_clip_rec->x + mpc_rec.width * mpc_slice_idx; + mpc_rec.height = plane_clip_rec->height; + mpc_rec.y = plane_clip_rec->y; +ASSERT (mpc_slice_count ==1 || + stream->view_format !=VIEW_3D_FORMAT_SIDE_BY_SIDE || + mpc_rec.width %2 ==0 ); + +/* extra pixels in the division remainder need to go to pipes after +* the extra pixel index minus one(epimo) defined here as: +*/ +if (mpc_slice_idx > epimo) { + mpc_rec.x += mpc_slice_idx - epimo -1 ; + mpc_rec.width +=1 ; } + +if (stream->view_format ==VIEW_3D_FORMAT_TOP_AND_BOTTOM ) { +ASSERT (mpc_rec.height %2 ==0 ); + mpc_rec.height /=2 ; + } +return mpc_rec; +} + +static void adjust_recout_for_visual_confirm (struct rect *recout, +struct pipe_ctx *pipe_ctx) +{ +struct dc *dc = pipe_ctx->stream->ctx->dc; +int dpp_offset, base_offset; + +if (dc->debug.visual_confirm ==VISUAL_CONFIRM_DISABLE ) +return ; + + dpp_offset = pipe_ctx->plane_res.dpp->inst *VISUAL_CONFIRM_DPP_OFFSET ; + +if ((dc->debug.visual_confirm_rect_height >=VISUAL_CONFIRM_BASE_MIN ) && + dc->debug.visual_confirm_rect_height <=VISUAL_CONFIRM_BASE_MAX ) + base_offset = dc->debug.visual_confirm_rect_height; +else + base_offset =VISUAL_CONFIRM_BASE_DEFAULT ; + + recout->height -= base_offset; + recout->height -= dpp_offset; +} + +/* +* The function maps a plane clip from Stream Source Space to ODM Slice Space +* and calculates the rec of the overlapping area of MPC slice of the plane +* clip, ODM slice associated with the pipe context and stream destination rec. +*/ +static void calculate_recout (struct pipe_ctx *pipe_ctx) +{ +/* +* A plane clip represents the desired plane size and position in Stream +* Source Space. Stream Source is the destination where all planes are +* blended (i.e. positioned, scaled and overlaid). It is a canvas where +* all planes associated with the current stream are drawn together. +* After Stream Source is completed, we will further scale and +* reposition the entire canvas of the stream source to Stream +* Destination in Timing Active Space. This could be due to display +* overscan adjustment where we will need to rescale and reposition all +* the planes so they can fit into a TV with overscan or downscale +* upscale features such as GPU scaling or VSR. +* +* This two step blending is a virtual procedure in software. In +* hardware there is no such thing as Stream Source. all planes are +* blended once in Timing Active Space. Software virtualizes a Stream +* Source space to decouple the math complicity so scaling param +* calculation focuses on one step at a time. +* +* In the following two diagrams, user applied 10% overscan adjustment +* so the Stream Source needs to be scaled down a little before mapping +* to Timing Active Space. As a result the Plane Clip is also scaled +* down by the same ratio, Plane Clip position (i.e. x and y) with +* respect to Stream Source is also scaled down. To map it in Timing +* Active Space additional x and y offsets from Stream Destination are +* added to Plane Clip as well. +* +* Stream Source Space +* ------------ +* __________________________________________________ +* |Stream Source (3840 x 2160) ^ | +* | y | +* | | | +* | __________________V | +* |<-- x -->|Plane Clip/////////| | +* | |(pre scale)////////| | +* | |///////////////////| | +* | |///////////////////| | +* | |///////////////////| | +* | |///////////////////| | +* | |///////////////////| | +* | | +* | | +* |__________________________________________________| +* +* +* Timing Active Space (3840 x 2160) +* --------------------------------- +* +* Timing Active +* __________________________________________________ +* | y_____________________________________________ | +* |x |Stream Destination (3456 x 1944) | | +* | | | | +* | | __________________ | | +* | | |Plane Clip////////| | | +* | | |(post scale)//////| | | +* | | |//////////////////| | | +* | | |//////////////////| | | +* | | |//////////////////| | | +* | | |//////////////////| | | +* | | | | +* | | | | +* | |____________________________________________| | +* |__________________________________________________| +* +* +* In Timing Active Space a plane clip could be further sliced into +* pieces called MPC slices. Each Pipe Context is responsible for +* processing only one MPC slice so the plane processing workload can be +* distributed to multiple DPP Pipes. MPC slices could be blended +* together to a single ODM slice. Each ODM slice is responsible for +* processing a portion of Timing Active divided horizontally so the +* output pixel processing workload can be distributed to multiple OPP +* pipes. All ODM slices are mapped together in ODM block so all MPC +* slices belong to different ODM slices could be pieced together to +* form a single image in Timing Active. MPC slices must belong to +* single ODM slice. If an MPC slice goes across ODM slice boundary, it +* needs to be divided into two MPC slices one for each ODM slice. +* +* In the following diagram the output pixel processing workload is +* divided horizontally into two ODM slices one for each OPP blend tree. +* OPP0 blend tree is responsible for processing left half of Timing +* Active, while OPP2 blend tree is responsible for processing right +* half. +* +* The plane has two MPC slices. However since the right MPC slice goes +* across ODM boundary, two DPP pipes are needed one for each OPP blend +* tree. (i.e. DPP1 for OPP0 blend tree and DPP2 for OPP2 blend tree). +* +* Assuming that we have a Pipe Context associated with OPP0 and DPP1 +* working on processing the plane in the diagram. We want to know the +* width and height of the shaded rectangle and its relative position +* with respect to the ODM slice0. This is called the recout of the pipe +* context. +* +* Planes can be at arbitrary size and position and there could be an +* arbitrary number of MPC and ODM slices. The algorithm needs to take +* all scenarios into account. +* +* Timing Active Space (3840 x 2160) +* --------------------------------- +* +* Timing Active +* __________________________________________________ +* |OPP0(ODM slice0)^ |OPP2(ODM slice1) | +* | y | | +* | | <- w -> | +* | _____V________|____ | +* | |DPP0 ^ |DPP1 |DPP2| | +* |<------ x |-----|->|/////| | | +* | | | |/////| | | +* | | h |/////| | | +* | | | |/////| | | +* | |_____V__|/////|____| | +* | | | +* | | | +* | | | +* |_________________________|________________________| +* +* +*/ +struct rect plane_clip; +struct rect mpc_slice_of_plane_clip; +struct rect odm_slice; +struct rect overlapping_area; + + plane_clip =calculate_plane_rec_in_timing_active (pipe_ctx, + &pipe_ctx->plane_state->clip_rect); +/* guard plane clip from drawing beyond stream dst here */ + plane_clip =intersect_rec (&plane_clip, + &pipe_ctx->stream->dst); + mpc_slice_of_plane_clip =calculate_mpc_slice_in_timing_active ( + pipe_ctx, &plane_clip); + odm_slice =calculate_odm_slice_in_timing_active (pipe_ctx); + overlapping_area =intersect_rec (&mpc_slice_of_plane_clip, &odm_slice); +/* shift the overlapping area so it is with respect to current ODM +* slice's position +*/ + pipe_ctx->plane_res.scl_data.recout =shift_rec ( + &overlapping_area, + -odm_slice.x, -odm_slice.y); + +adjust_recout_for_visual_confirm (&pipe_ctx->plane_res.scl_data.recout, + pipe_ctx); }static void calculate_scaling_ratios (struct pipe_ctx *pipe_ctx)
@@ -1022,34 +1287,25 @@ static void calculate_init_and_vp(static void calculate_inits_and_viewports (struct pipe_ctx *pipe_ctx) {const struct dc_plane_state *plane_state = pipe_ctx->plane_state; -const struct dc_stream_state *stream = pipe_ctx->stream;struct scaler_data *data = &pipe_ctx->plane_res.scl_data;struct rect src = plane_state->src_rect; +struct rect recout_dst_in_active_timing; +struct rect recout_clip_in_active_timing; +struct rect recout_clip_in_recout_dst; +struct rect odm_slice =calculate_odm_slice_in_timing_active (pipe_ctx);int vpc_div = (data->format ==PIXEL_FORMAT_420BPP8 || data->format ==PIXEL_FORMAT_420BPP10 ) ?2 :1 ; -int split_count, split_idx, ro_lb, ro_tb, recout_full_x, recout_full_y;bool orthogonal_rotation, flip_vert_scan_dir, flip_horz_scan_dir; -calculate_split_count_and_index (pipe_ctx, &split_count, &split_idx); -/* -* recout full is what the recout would have been if we didnt clip -* the source plane at all. We only care about left(ro_lb) and top(ro_tb) -* offsets of recout within recout full because those are the directions -* we scan from and therefore the only ones that affect inits. -*/ - recout_full_x = stream->dst.x + (plane_state->dst_rect.x - stream->src.x) - * stream->dst.width / stream->src.width; - recout_full_y = stream->dst.y + (plane_state->dst_rect.y - stream->src.y) - * stream->dst.height / stream->src.height; -if (pipe_ctx->prev_odm_pipe && split_idx) - ro_lb = data->h_active * split_idx - recout_full_x; -else if (pipe_ctx->top_pipe && pipe_ctx->top_pipe->prev_odm_pipe) - ro_lb = data->h_active * split_idx - recout_full_x + data->recout.x; -else - ro_lb = data->recout.x - recout_full_x; - ro_tb = data->recout.y - recout_full_y; -ASSERT (ro_lb >=0 && ro_tb >=0 ); - + recout_clip_in_active_timing =shift_rec ( + &data->recout, odm_slice.x, odm_slice.y); + recout_dst_in_active_timing =calculate_plane_rec_in_timing_active ( + pipe_ctx, &plane_state->dst_rect); + recout_clip_in_recout_dst =shift_rec (&recout_clip_in_active_timing, + -recout_dst_in_active_timing.x, + -recout_dst_in_active_timing.y); +ASSERT (recout_clip_in_recout_dst.x >=0 && + recout_clip_in_recout_dst.y >=0 );/* * Work in recout rotation since that requires less transformations */
@@ -1067,7 +1323,7 @@ static void calculate_inits_and_viewports(struct pipe_ctx *pipe_ctx) calculate_init_and_vp( flip_horz_scan_dir, - ro_lb, + recout_clip_in_recout_dst.x, data->recout.width, src.width, data->taps.h_taps,
@@ -1077,7 +1333,7 @@ static void calculate_inits_and_viewports(struct pipe_ctx *pipe_ctx) &data->viewport.width); calculate_init_and_vp( flip_horz_scan_dir, - ro_lb, + recout_clip_in_recout_dst.x, data->recout.width, src.width / vpc_div, data->taps.h_taps_c,
@@ -1087,7 +1343,7 @@ static void calculate_inits_and_viewports(struct pipe_ctx *pipe_ctx) &data->viewport_c.width); calculate_init_and_vp( flip_vert_scan_dir, - ro_tb, + recout_clip_in_recout_dst.y, data->recout.height, src.height, data->taps.v_taps,
@@ -1097,7 +1353,7 @@ static void calculate_inits_and_viewports(struct pipe_ctx *pipe_ctx) &data->viewport.height); calculate_init_and_vp( flip_vert_scan_dir, - ro_tb, + recout_clip_in_recout_dst.y, data->recout.height, src.height / vpc_div, data->taps.v_taps_c,
@@ -1122,6 +1378,7 @@ bool resource_build_scaling_params(struct pipe_ctx *pipe_ctx) {const struct dc_plane_state *plane_state = pipe_ctx->plane_state;struct dc_crtc_timing *timing = &pipe_ctx->stream->timing; +const struct rect odm_slice_rec =calculate_odm_slice_in_timing_active (pipe_ctx);bool res = false;DC_LOGGER_INIT (pipe_ctx->stream->ctx->logger);
@@ -1146,30 +1403,9 @@ bool resource_build_scaling_params(struct pipe_ctx *pipe_ctx) pipe_ctx->stream->dst.y += timing->v_border_top;/* Calculate H and V active size */ - pipe_ctx->plane_res.scl_data.h_active = timing->h_addressable + - timing->h_border_left + timing->h_border_right; - pipe_ctx->plane_res.scl_data.v_active = timing->v_addressable + - timing->v_border_top + timing->v_border_bottom; -if (pipe_ctx->next_odm_pipe || pipe_ctx->prev_odm_pipe) { - pipe_ctx->plane_res.scl_data.h_active /=get_num_odm_splits (pipe_ctx) +1 ; - -DC_LOG_SCALER ("%s pipe %d: next_odm_pipe:%d prev_odm_pipe:%d\n" , - __func__, - pipe_ctx->pipe_idx, - pipe_ctx->next_odm_pipe ? pipe_ctx->next_odm_pipe->pipe_idx :-1 , - pipe_ctx->prev_odm_pipe ? pipe_ctx->prev_odm_pipe->pipe_idx :-1 ); - }/* ODM + windows MPO, where window is on either right or left ODM half */ -else if (pipe_ctx->top_pipe && (pipe_ctx->top_pipe->next_odm_pipe || pipe_ctx->top_pipe->prev_odm_pipe)) { - - pipe_ctx->plane_res.scl_data.h_active /=get_num_odm_splits (pipe_ctx->top_pipe) +1 ; - -DC_LOG_SCALER ("%s ODM + windows MPO: pipe:%d top_pipe:%d top_pipe->next_odm_pipe:%d top_pipe->prev_odm_pipe:%d\n" , - __func__, - pipe_ctx->pipe_idx, - pipe_ctx->top_pipe->pipe_idx, - pipe_ctx->top_pipe->next_odm_pipe ? pipe_ctx->top_pipe->next_odm_pipe->pipe_idx :-1 , - pipe_ctx->top_pipe->prev_odm_pipe ? pipe_ctx->top_pipe->prev_odm_pipe->pipe_idx :-1 ); - } + pipe_ctx->plane_res.scl_data.h_active = odm_slice_rec.width; + pipe_ctx->plane_res.scl_data.v_active = odm_slice_rec.height; +/* depends on h_active */ calculate_recout (pipe_ctx);/* depends on pixel format */
drivers/gpu/drm/amd/display/dc/dcn21/dcn21_resource.c +2 -2
@@ -854,8 +854,8 @@ bool dcn21_fast_validate_bw(struct dc *dc,/* We only support full screen mpo with ODM */ if (vba->ODMCombineEnabled[vba->pipe_plane[pipe_idx]] != dm_odm_combine_mode_disabled && pipe->plane_state && mpo_pipe - &&memcmp (&mpo_pipe->plane_res.scl_data.recout, - &pipe->plane_res.scl_data.recout, + &&memcmp (&mpo_pipe->plane_state->clip_rect, + &pipe->stream->src,sizeof (struct rect )) !=0 ) {ASSERT (mpo_pipe->plane_state != pipe->plane_state); goto validate_fail;
drivers/gpu/drm/amd/display/dc/dcn30/dcn30_resource.c +2 -2
@@ -1705,8 +1705,8 @@ noinline bool dcn30_internal_validate_bw(/* We only support full screen mpo with ODM */ if (vba->ODMCombineEnabled[vba->pipe_plane[pipe_idx]] != dm_odm_combine_mode_disabled && pipe->plane_state && mpo_pipe - &&memcmp (&mpo_pipe->plane_res.scl_data.recout, - &pipe->plane_res.scl_data.recout, + &&memcmp (&mpo_pipe->plane_state->clip_rect, + &pipe->stream->src,sizeof (struct rect )) !=0 ) {ASSERT (mpo_pipe->plane_state != pipe->plane_state); goto validate_fail;
drivers/gpu/drm/amd/display/dc/dml/dcn32/dcn32_fpu.c +2 -2
@@ -1717,8 +1717,8 @@ bool dcn32_internal_validate_bw(struct dc *dc,if (vba->ODMCombineEnabled[vba->pipe_plane[pipe_idx]] != dm_odm_combine_mode_disabled && !dc->config.enable_windowed_mpo_odm && pipe->plane_state && mpo_pipe - &&memcmp (&mpo_pipe->plane_res.scl_data.recout, - &pipe->plane_res.scl_data.recout, + &&memcmp (&mpo_pipe->plane_state->clip_rect, + &pipe->stream->src,sizeof (struct rect )) !=0 ) {ASSERT (mpo_pipe->plane_state != pipe->plane_state); goto validate_fail;
Signature · 1 line
2.41.0
PATCH 8/16 drm/amd/display: Exit idle optimizations before attempt to access PHY
In reply to Alex HungFrom: Leo Chen <[email protected]>
[Why & How]
DMUB may hang when powering down pixel clocks due to no dprefclk.
It is fixed by exiting idle optimization before the attempt to access PHY.
--- drivers/gpu/drm/amd/display/dc/dce110/dce110_hw_sequencer.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/gpu/drm/amd/display/dc/dce110/dce110_hw_sequencer.c +3 -0
@@ -1792,10 +1792,13 @@ void dce110_enable_accelerated_mode(struct dc *dc, struct dc_state *context) hws->funcs.edp_backlight_control (edp_link_with_sink, false); }/*resume from S3, no vbios posting, no need to power down again*/ +clk_mgr_exit_optimized_pwr_state (dc, dc->clk_mgr); +power_down_all_hw_blocks (dc);disable_vga_and_power_gate_all_controllers (dc);if (edp_link_with_sink && !keep_edp_vdd_on) dc->hwss.edp_power_control (edp_link_with_sink, false); +clk_mgr_optimize_pwr_state (dc, dc->clk_mgr); }bios_set_scratch_acc_mode_change (dc->ctx->dc_bios,1 ); }
Signature · 1 line
2.41.0
PATCH 9/16 drm/amd/display: Correct unit conversion for vstartup
In reply to Alex HungFrom: Reza Amini <[email protected]>
[Why]
vstartup is calculated to be a large number. It works because it is within vertical blank, but it reduces region of blank that can be used for power gating.
[How]
Calculation needs to convert micro seconds to number of vertical lines.
--- .../amd/display/dc/dml/dcn314/dcn314_fpu.c | 25 ++++++++++++++++++- 1 file changed, 24 insertions(+), 1 deletion(-)
drivers/gpu/drm/amd/display/dc/dml/dcn314/dcn314_fpu.c +24 -1
@@ -31,6 +31,7 @@#include "dml/dcn20/dcn20_fpu.h" #include "dml/dcn31/dcn31_fpu.h" #include "dml/display_mode_vba.h" +#include "dml/dml_inline_defs.h" struct _vcs_dpi_ip_params_st dcn3_14_ip = { .VBlankNomDefaultUS =668 ,
@@ -273,6 +274,25 @@ static bool is_dual_plane(enum surface_pixel_format format)return format >=SURFACE_PIXEL_FORMAT_VIDEO_BEGIN || format ==SURFACE_PIXEL_FORMAT_GRPH_RGBE_ALPHA ; } +/* +* micro_sec_to_vert_lines () - converts time to number of vertical lines for a given timing +* +* @param: num_us: number of microseconds +* @return: number of vertical lines. If exact number of vertical lines is not found then +* it will round up to next number of lines to guarantee num_us +*/ +static unsigned int micro_sec_to_vert_lines (unsigned int num_us,struct dc_crtc_timing *timing) +{ +unsigned int num_lines =0 ; +unsigned int lines_time_in_ns =1000.0 * + (((float )timing->h_total *1000.0 ) / + ((float )timing->pix_clk_100hz /10.0 )); + + num_lines =dml_ceil (1000.0 * num_us / lines_time_in_ns,1.0 ); + +return num_lines; +} +int dcn314_populate_dml_pipes_from_context_fpu (struct dc *dc,struct dc_state *context,display_e2e_pipe_params_st *pipes,bool fast_validate)
@@ -289,19 +309,22 @@ int dcn314_populate_dml_pipes_from_context_fpu(struct dc *dc, struct dc_state *cfor (i =0 , pipe_cnt =0 ; i < dc->res_pool->pipe_count; i++) {struct dc_crtc_timing *timing; +unsigned int num_lines =0 ;if (!res_ctx->pipe_ctx[i].stream)continue ; pipe = &res_ctx->pipe_ctx[i]; timing = &pipe->stream->timing; + num_lines =micro_sec_to_vert_lines (dcn3_14_ip.VBlankNomDefaultUS, timing); +if (pipe->stream->adjust.v_total_min !=0 ) pipes[pipe_cnt].pipe.dest.vtotal = pipe->stream->adjust.v_total_min;else pipes[pipe_cnt].pipe.dest.vtotal = timing->v_total; pipes[pipe_cnt].pipe.dest.vblank_nom = timing->v_total - pipes[pipe_cnt].pipe.dest.vactive; - pipes[pipe_cnt].pipe.dest.vblank_nom =min (pipes[pipe_cnt].pipe.dest.vblank_nom, dcn3_14_ip.VBlankNomDefaultUS); + pipes[pipe_cnt].pipe.dest.vblank_nom =min (pipes[pipe_cnt].pipe.dest.vblank_nom, num_lines); pipes[pipe_cnt].pipe.dest.vblank_nom =max (pipes[pipe_cnt].pipe.dest.vblank_nom, timing->v_sync_width); pipes[pipe_cnt].pipe.dest.vblank_nom =min (pipes[pipe_cnt].pipe.dest.vblank_nom, max_allowed_vblank_nom);
Signature · 1 line
2.41.0
PATCH 10/16 drm/amd/display: Update DPG test pattern programming
In reply to Alex HungFrom: Wenjing Liu <[email protected]>
[Why]
Last ODM slice could be slightly larger than other slice because it can be including the residual.
[How]
Update DPG pattern programming sequence to use a different width for last odm slice.
--- .../drm/amd/display/dc/dcn20/dcn20_hwseq.c | 45 ++++---- .../display/dc/link/accessories/link_dp_cts.c | 107 +++++++++--------- 2 files changed, 78 insertions(+), 74 deletions(-)
drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hwseq.c +24 -21
@@ -1054,9 +1054,9 @@ void dcn20_blank_pixel_data(enum controller_dp_color_space test_pattern_color_space =CONTROLLER_DP_COLOR_SPACE_UDEFINED ;struct pipe_ctx *odm_pipe;int odm_cnt =1 ; - -int width = stream->timing.h_addressable + stream->timing.h_border_left + stream->timing.h_border_right; -int height = stream->timing.v_addressable + stream->timing.v_border_bottom + stream->timing.v_border_top; +int h_active = stream->timing.h_addressable + stream->timing.h_border_left + stream->timing.h_border_right; +int v_active = stream->timing.v_addressable + stream->timing.v_border_bottom + stream->timing.v_border_top; +int odm_slice_width, last_odm_slice_width, offset =0 ;if (stream->link->test_pattern_enabled)return ;
@@ -1066,8 +1066,8 @@ void dcn20_blank_pixel_data(for (odm_pipe = pipe_ctx->next_odm_pipe; odm_pipe; odm_pipe = odm_pipe->next_odm_pipe) odm_cnt++; - - width = width / odm_cnt; + odm_slice_width = h_active / odm_cnt; + last_odm_slice_width = h_active - odm_slice_width * (odm_cnt -1 );if (blank) { dc->hwss.set_abm_immediate_disable (pipe_ctx);
@@ -1080,29 +1080,32 @@ void dcn20_blank_pixel_data( test_pattern =CONTROLLER_DP_TEST_PATTERN_VIDEOMODE ; } - dc->hwss.set_disp_pattern_generator (dc, - pipe_ctx, - test_pattern, - test_pattern_color_space, - stream->timing.display_color_depth, - &black_color, - width, - height, -0 ); + odm_pipe = pipe_ctx; -for (odm_pipe = pipe_ctx->next_odm_pipe; odm_pipe; odm_pipe = odm_pipe->next_odm_pipe) { +while (odm_pipe->next_odm_pipe) { dc->hwss.set_disp_pattern_generator (dc, - odm_pipe, - dc->debug.visual_confirm !=VISUAL_CONFIRM_DISABLE && blank ? -CONTROLLER_DP_TEST_PATTERN_COLORRAMP : test_pattern, + pipe_ctx, + test_pattern, test_pattern_color_space, stream->timing.display_color_depth, &black_color, - width, - height, -0 ); + odm_slice_width, + v_active, + offset); + offset += odm_slice_width; + odm_pipe = odm_pipe->next_odm_pipe; } + dc->hwss.set_disp_pattern_generator (dc, + odm_pipe, + test_pattern, + test_pattern_color_space, + stream->timing.display_color_depth, + &black_color, + last_odm_slice_width, + v_active, + offset); +if (!blank && dc->debug.enable_single_display_2to1_odm_policy) {/* when exiting dynamic ODM need to reinit DPG state for unused pipes */ struct pipe_ctx *old_odm_pipe = dc->current_state->res_ctx.pipe_ctx[pipe_ctx->pipe_idx].next_odm_pipe;
drivers/gpu/drm/amd/display/dc/link/accessories/link_dp_cts.c +54 -53
163 lines not on this page · raw message
Signature · 1 line
2.41.0
PATCH 11/16 drm/amd/display: Add new sequence for 4-lane HBR3 on vendor specific retimers
In reply to Alex HungFrom: Ovidiu Bunea <[email protected]>
[Why]
In some vendor specific retimer setups for downstream 4-lane HBR3 configuration, the sink will show severe corruption (horizontal shifting) and intermittent blanking.
[How]
Add new retimer programming sequence before clock recovery when 4 lanes are active.
--- .../link_dp_training_fixed_vs_pe_retimer.c | 67 ++++++++++++++++++- 1 file changed, 66 insertions(+), 1 deletion(-)
drivers/gpu/drm/amd/display/dc/link/protocols/link_dp_training_fixed_vs_pe_retimer.c +66 -1
@@ -236,6 +236,11 @@ enum link_training_result dp_perform_fixed_vs_pe_training_sequence_legacy(uint32_t pre_disable_intercept_delay_ms =0 ;uint8_t vendor_lttpr_write_data_vs[4 ] = {0x1 ,0x51 ,0x63 ,0x0 };uint8_t vendor_lttpr_write_data_pe[4 ] = {0x1 ,0x52 ,0x63 ,0x0 }; +const uint8_t vendor_lttpr_write_data_4lane_1[4 ] = {0x1 ,0x6E ,0xF2 ,0x19 }; +const uint8_t vendor_lttpr_write_data_4lane_2[4 ] = {0x1 ,0x6B ,0xF2 ,0x01 }; +const uint8_t vendor_lttpr_write_data_4lane_3[4 ] = {0x1 ,0x6D ,0xF2 ,0x18 }; +const uint8_t vendor_lttpr_write_data_4lane_4[4 ] = {0x1 ,0x6C ,0xF2 ,0x03 }; +const uint8_t vendor_lttpr_write_data_4lane_5[4 ] = {0x1 ,0x03 ,0xF3 ,0x06 };uint32_t vendor_lttpr_write_address =0xF004F ;enum link_training_result status =LINK_TRAINING_SUCCESS ;uint8_t lane =0 ;
@@ -338,6 +343,34 @@ enum link_training_result dp_perform_fixed_vs_pe_training_sequence_legacy(DP_DOWNSPREAD_CTRL , lt_settings->link_settings.link_spread); +if (lt_settings->link_settings.lane_count ==LANE_COUNT_FOUR ) { +core_link_write_dpcd ( + link, + vendor_lttpr_write_address, + &vendor_lttpr_write_data_4lane_1[0 ], +sizeof (vendor_lttpr_write_data_4lane_1)); +core_link_write_dpcd ( + link, + vendor_lttpr_write_address, + &vendor_lttpr_write_data_4lane_2[0 ], +sizeof (vendor_lttpr_write_data_4lane_2)); +core_link_write_dpcd ( + link, + vendor_lttpr_write_address, + &vendor_lttpr_write_data_4lane_3[0 ], +sizeof (vendor_lttpr_write_data_4lane_3)); +core_link_write_dpcd ( + link, + vendor_lttpr_write_address, + &vendor_lttpr_write_data_4lane_4[0 ], +sizeof (vendor_lttpr_write_data_4lane_4)); +core_link_write_dpcd ( + link, + vendor_lttpr_write_address, + &vendor_lttpr_write_data_4lane_5[0 ], +sizeof (vendor_lttpr_write_data_4lane_5)); + } +/* 2. Perform link training */ /* Perform Clock Recovery Sequence */
@@ -598,7 +631,11 @@ enum link_training_result dp_perform_fixed_vs_pe_training_sequence(uint32_t pre_disable_intercept_delay_ms =0 ;uint8_t vendor_lttpr_write_data_vs[4 ] = {0x1 ,0x51 ,0x63 ,0x0 };uint8_t vendor_lttpr_write_data_pe[4 ] = {0x1 ,0x52 ,0x63 ,0x0 }; - +const uint8_t vendor_lttpr_write_data_4lane_1[4 ] = {0x1 ,0x6E ,0xF2 ,0x19 }; +const uint8_t vendor_lttpr_write_data_4lane_2[4 ] = {0x1 ,0x6B ,0xF2 ,0x01 }; +const uint8_t vendor_lttpr_write_data_4lane_3[4 ] = {0x1 ,0x6D ,0xF2 ,0x18 }; +const uint8_t vendor_lttpr_write_data_4lane_4[4 ] = {0x1 ,0x6C ,0xF2 ,0x03 }; +const uint8_t vendor_lttpr_write_data_4lane_5[4 ] = {0x1 ,0x03 ,0xF3 ,0x06 };uint32_t vendor_lttpr_write_address =0xF004F ;enum link_training_result status =LINK_TRAINING_SUCCESS ;uint8_t lane =0 ;
@@ -701,6 +738,34 @@ enum link_training_result dp_perform_fixed_vs_pe_training_sequence(DP_DOWNSPREAD_CTRL , lt_settings->link_settings.link_spread); +if (lt_settings->link_settings.lane_count ==LANE_COUNT_FOUR ) { +core_link_write_dpcd ( + link, + vendor_lttpr_write_address, + &vendor_lttpr_write_data_4lane_1[0 ], +sizeof (vendor_lttpr_write_data_4lane_1)); +core_link_write_dpcd ( + link, + vendor_lttpr_write_address, + &vendor_lttpr_write_data_4lane_2[0 ], +sizeof (vendor_lttpr_write_data_4lane_2)); +core_link_write_dpcd ( + link, + vendor_lttpr_write_address, + &vendor_lttpr_write_data_4lane_3[0 ], +sizeof (vendor_lttpr_write_data_4lane_3)); +core_link_write_dpcd ( + link, + vendor_lttpr_write_address, + &vendor_lttpr_write_data_4lane_4[0 ], +sizeof (vendor_lttpr_write_data_4lane_4)); +core_link_write_dpcd ( + link, + vendor_lttpr_write_address, + &vendor_lttpr_write_data_4lane_5[0 ], +sizeof (vendor_lttpr_write_data_4lane_5)); + } +/* 2. Perform link training */ /* Perform Clock Recovery Sequence */
Signature · 1 line
2.41.0
PATCH 12/16 drm/amd/display: Remove check for default eDP panel_mode
In reply to Alex HungFrom: Taimur Hassan <[email protected]>
[Why]
DPCD read is skipped first time after driver initialization.
--- .../link/protocols/link_edp_panel_control.c | 49 +++++++++---------- 1 file changed, 24 insertions(+), 25 deletions(-)
drivers/gpu/drm/amd/display/dc/link/protocols/link_edp_panel_control.c +24 -25
@@ -46,43 +46,42 @@ void dp_set_panel_mode(struct dc_link *link, enum dp_panel_mode panel_mode) {union dpcd_edp_config edp_config_set;bool panel_mode_edp = false; +enum dc_status result;memset (&edp_config_set,'\0' ,sizeof (union dpcd_edp_config )); -if (panel_mode !=DP_PANEL_MODE_DEFAULT ) { +switch (panel_mode) { +case DP_PANEL_MODE_EDP : +case DP_PANEL_MODE_SPECIAL : + panel_mode_edp = true; +break ; -switch (panel_mode) { -case DP_PANEL_MODE_EDP : -case DP_PANEL_MODE_SPECIAL : - panel_mode_edp = true; -break ; +default : +break ; + } -default : -break ; - } +/*set edp panel mode in receiver*/ + result =core_link_read_dpcd ( + link, +DP_EDP_CONFIGURATION_SET , + &edp_config_set.raw, +sizeof (edp_config_set.raw)); + +if (result ==DC_OK && + edp_config_set.bits.PANEL_MODE_EDP + != panel_mode_edp) { -/*set edp panel mode in receiver*/ -core_link_read_dpcd ( + edp_config_set.bits.PANEL_MODE_EDP = + panel_mode_edp; + result =core_link_write_dpcd ( link,DP_EDP_CONFIGURATION_SET , &edp_config_set.raw,sizeof (edp_config_set.raw)); -if (edp_config_set.bits.PANEL_MODE_EDP - != panel_mode_edp) { -enum dc_status result; - - edp_config_set.bits.PANEL_MODE_EDP = - panel_mode_edp; - result =core_link_write_dpcd ( - link, -DP_EDP_CONFIGURATION_SET , - &edp_config_set.raw, -sizeof (edp_config_set.raw)); - -ASSERT (result ==DC_OK ); - } +ASSERT (result ==DC_OK ); } + link->panel_mode = panel_mode; DC_LOG_DETECTION_DP_CAPS("Link: %d eDP panel mode supported: %d " "eDP panel mode enabled: %d \n",
Signature · 1 line
2.41.0
PATCH 13/16 drm/amd/display: Rearrange dmub_cmd defs order
In reply to Alex HungFrom: Anthony Koo <[email protected]>
- Rearranged defs order
--- .../gpu/drm/amd/display/dmub/inc/dmub_cmd.h | 54 +++++++++---------- 1 file changed, 26 insertions(+), 28 deletions(-)
drivers/gpu/drm/amd/display/dmub/inc/dmub_cmd.h +26 -28
@@ -144,6 +144,32 @@#define PHYSICAL_ADDRESS_LOC union large_integer#endif +/** +* OS/FW agnostic memcpy +*/ +#ifndef dmub_memcpy +#define dmub_memcpy (dest, source, bytes) memcpy((dest), (source), (bytes)) +#endif + +/** +* OS/FW agnostic memset +*/ +#ifndef dmub_memset +#define dmub_memset (dest, val, bytes) memset((dest), (val), (bytes)) +#endif + +#if defined(__cplusplus) +extern "C" { +#endif + +/** + * OS/FW agnostic udelay + */ +#ifndef dmub_udelay +#define dmub_udelay(microseconds) udelay(microseconds) +#endif + +#pragma pack(push, 1) #define ABM_NUM_OF_ACE_SEGMENTS 5 union abm_flags {
@@ -233,34 +259,6 @@ struct abm_save_restore { }; - - -/** -* OS/FW agnostic memcpy -*/ -#ifndef dmub_memcpy -#define dmub_memcpy (dest, source, bytes) memcpy((dest), (source), (bytes)) -#endif - -/** -* OS/FW agnostic memset -*/ -#ifndef dmub_memset -#define dmub_memset (dest, val, bytes) memset((dest), (val), (bytes)) -#endif - -#if defined(__cplusplus) -extern "C" { -#endif - -/** -* OS/FW agnostic udelay -*/ -#ifndef dmub_udelay -#define dmub_udelay (microseconds) udelay(microseconds) -#endif - -#pragma pack(push, 1)/** * union dmub_addr - DMUB physical/virtual 64-bit address. */
Signature · 1 line
2.41.0
PATCH 14/16 drm/amd/display: Add interface to modify DMUB panel power options
In reply to Alex HungFrom: Paul Hsieh <[email protected]>
[Why]
This option can vary depending on the panel and may be required to be called during sink detection phase before transmitter control.
[How]
Allow modify the bit depending on the eDP panel connected with a new interface.
--- drivers/gpu/drm/amd/display/dmub/dmub_srv.h | 3 +++ drivers/gpu/drm/amd/display/dmub/src/dmub_srv.c | 12 ++++++++++++ 2 files changed, 15 insertions(+)
drivers/gpu/drm/amd/display/dmub/dmub_srv.h +3 -0
@@ -785,6 +785,9 @@ enum dmub_status dmub_srv_get_fw_boot_option(struct dmub_srv *dmub,enum dmub_status dmub_srv_cmd_with_reply_data (struct dmub_srv *dmub,union dmub_rb_cmd *cmd); +enum dmub_status dmub_srv_set_skip_panel_power_sequence (struct dmub_srv *dmub, +bool skip); +bool dmub_srv_get_outbox0_msg (struct dmub_srv *dmub,struct dmcub_trace_buf_entry *entry);bool dmub_srv_get_diagnostic_data (struct dmub_srv *dmub,struct dmub_diagnostic_data *diag_data);
drivers/gpu/drm/amd/display/dmub/src/dmub_srv.c +12 -0
@@ -861,6 +861,18 @@ enum dmub_status dmub_srv_get_fw_boot_option(struct dmub_srv *dmub,return DMUB_STATUS_OK ; } +enum dmub_status dmub_srv_set_skip_panel_power_sequence (struct dmub_srv *dmub, +bool skip) +{ +if (!dmub->sw_init) +return DMUB_STATUS_INVALID ; + +if (dmub->hw_funcs.skip_dmub_panel_power_sequence && !dmub->is_virtual) + dmub->hw_funcs.skip_dmub_panel_power_sequence (dmub, skip); + +return DMUB_STATUS_OK ; +} +enum dmub_status dmub_srv_cmd_with_reply_data (struct dmub_srv *dmub,union dmub_rb_cmd *cmd) {
Signature · 1 line
2.41.0
PATCH 15/16 drm/amd/display: Fix underflow issue on 175hz timing
In reply to Alex HungFrom: Leo Ma <[email protected]>
[Why]
Screen underflows happen on 175hz timing for 3 plane overlay case.
[How]
Based on dst y prefetch value clamp to equ or oto for bandwidth calculation.
--- .../amd/display/dc/dml/dcn32/display_mode_vba_util_32.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)
drivers/gpu/drm/amd/display/dc/dml/dcn32/display_mode_vba_util_32.c +6 -1
@@ -3459,6 +3459,7 @@ bool dml32_CalculatePrefetchSchedule(double TimeForFetchingMetaPTE =0 ;double TimeForFetchingRowInVBlank =0 ;double LinesToRequestPrefetchPixelData =0 ; +double LinesForPrefetchBandwidth =0 ;unsigned int HostVMDynamicLevelsTrips;double trip_to_mem;double Tvm_trips;
@@ -3888,11 +3889,15 @@ bool dml32_CalculatePrefetchSchedule( TimeForFetchingMetaPTE = Tvm_oto; TimeForFetchingRowInVBlank = Tr0_oto; *PrefetchBandwidth = prefetch_bw_oto; +/* Clamp to oto for bandwidth calculation */ + LinesForPrefetchBandwidth = dst_y_prefetch_oto; }else { *DestinationLinesForPrefetch = dst_y_prefetch_equ; TimeForFetchingMetaPTE = Tvm_equ; TimeForFetchingRowInVBlank = Tr0_equ; *PrefetchBandwidth = prefetch_bw_equ; +/* Clamp to equ for bandwidth calculation */ + LinesForPrefetchBandwidth = dst_y_prefetch_equ; } *DestinationLinesToRequestVMInVBlank =dml_ceil (4.0 * TimeForFetchingMetaPTE / LineTime,1.0 ) /4.0 ;
@@ -3900,7 +3905,7 @@ bool dml32_CalculatePrefetchSchedule( *DestinationLinesToRequestRowInVBlank =dml_ceil (4.0 * TimeForFetchingRowInVBlank / LineTime,1.0 ) /4.0 ; - LinesToRequestPrefetchPixelData = *DestinationLinesForPrefetch - + LinesToRequestPrefetchPixelData = LinesForPrefetchBandwidth - *DestinationLinesToRequestVMInVBlank -2 * *DestinationLinesToRequestRowInVBlank;#ifdef __DML_VBA_DEBUG__
Signature · 1 line
2.41.0
PATCH 16/16 drm/amd/display: 3.2.244
In reply to Alex HungFrom: Aric Cyr <[email protected]>
This version brings along following fixes:
- Fix underflow issue on 175hz timing
- Add interface to modify DMUB panel power options
- Remove check for default eDP panel_mode
- Add new sequence for 4-lane HBR3 on vendor specific retimers
- Update DPG test pattern programming
- Correct unit conversion for vstartup
- Exit idle optimizations before attempt to access PHY
- Refactor recout calculation with a more generic formula
- Read down-spread percentage from lut to adjust dprefclk.
- Don't apply FIFO resync W/A if rdivider = 0
- Prevent invalid pipe connections
- Rearrange dmub_cmd defs order
- Add VESA SCR case for default aux backlight
- Guard DCN31 PHYD32CLK logic against chip family
- Correct grammar mistakes
--- drivers/gpu/drm/amd/display/dc/dc.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/amd/display/dc/dc.h +1 -1
@@ -47,7 +47,7 @@ struct aux_payload;struct set_config_cmd_payload ;struct dmub_notification ; -#define DC_VER "3.2.243" +#define DC_VER "3.2.244"#define MAX_SURFACES 3#define MAX_PLANES 6
Signature · 1 line
2.41.0