Skip to content

L
linux
Commit 5034b935 authored by Dillon Varone's avatar Dillon Varone Committed by Alex Deucher
Browse files
Options

drm/amd/display: Modify DHCUB waterwark structures and functions 

[WHY&HOW]
Converting the watermark set structure to a union and modifying some interfaces
to accommodate future usage.
Reviewed-by: default avatarChaitanya Dhere <chaitanya.dhere@amd.com>
Acked-by: default avatarTom Chung <chiahsuan.chung@amd.com>
Signed-off-by: default avatarDillon Varone <dillon.varone@amd.com>
Tested-by: default avatarDaniel Wheeler <daniel.wheeler@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 285a7054
Hide whitespace changes
Inline Side-by-side
Showing with 56 additions and 50 deletions
drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hubbub.c
View file @ 5034b935
...@@ -242,7 +242,7 @@ void hubbub1_wm_change_req_wa(struct hubbub *hubbub) ...@@ -242,7 +242,7 @@ void hubbub1_wm_change_req_wa(struct hubbub *hubbub)
bool hubbub1_program_urgent_watermarks( bool hubbub1_program_urgent_watermarks(
struct hubbub *hubbub, struct hubbub *hubbub,
struct dcn_watermark_set *watermarks, union dcn_watermark_set *watermarks,
unsigned int refclk_mhz, unsigned int refclk_mhz,
bool safe_to_lower) bool safe_to_lower)
{ {
...@@ -356,7 +356,7 @@ bool hubbub1_program_urgent_watermarks( ...@@ -356,7 +356,7 @@ bool hubbub1_program_urgent_watermarks(
bool hubbub1_program_stutter_watermarks( bool hubbub1_program_stutter_watermarks(
struct hubbub *hubbub, struct hubbub *hubbub,
struct dcn_watermark_set *watermarks, union dcn_watermark_set *watermarks,
unsigned int refclk_mhz, unsigned int refclk_mhz,
bool safe_to_lower) bool safe_to_lower)
{ {
...@@ -501,7 +501,7 @@ bool hubbub1_program_stutter_watermarks( ...@@ -501,7 +501,7 @@ bool hubbub1_program_stutter_watermarks(
bool hubbub1_program_pstate_watermarks( bool hubbub1_program_pstate_watermarks(
struct hubbub *hubbub, struct hubbub *hubbub,
struct dcn_watermark_set *watermarks, union dcn_watermark_set *watermarks,
unsigned int refclk_mhz, unsigned int refclk_mhz,
bool safe_to_lower) bool safe_to_lower)
{ {
...@@ -582,7 +582,7 @@ bool hubbub1_program_pstate_watermarks( ...@@ -582,7 +582,7 @@ bool hubbub1_program_pstate_watermarks(
bool hubbub1_program_watermarks( bool hubbub1_program_watermarks(
struct hubbub *hubbub, struct hubbub *hubbub,
struct dcn_watermark_set *watermarks, union dcn_watermark_set *watermarks,
unsigned int refclk_mhz, unsigned int refclk_mhz,
bool safe_to_lower) bool safe_to_lower)
{ {
......
drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hubbub.h
View file @ 5034b935
...@@ -409,7 +409,7 @@ struct dcn10_hubbub { ...@@ -409,7 +409,7 @@ struct dcn10_hubbub {
const struct dcn_hubbub_shift *shifts; const struct dcn_hubbub_shift *shifts;
const struct dcn_hubbub_mask *masks; const struct dcn_hubbub_mask *masks;
unsigned int debug_test_index_pstate; unsigned int debug_test_index_pstate;
struct dcn_watermark_set watermarks; union dcn_watermark_set watermarks;
}; };
void hubbub1_update_dchub( void hubbub1_update_dchub(
...@@ -423,7 +423,7 @@ void hubbub1_wm_change_req_wa(struct hubbub *hubbub); ...@@ -423,7 +423,7 @@ void hubbub1_wm_change_req_wa(struct hubbub *hubbub);
bool hubbub1_program_watermarks( bool hubbub1_program_watermarks(
struct hubbub *hubbub, struct hubbub *hubbub,
struct dcn_watermark_set *watermarks, union dcn_watermark_set *watermarks,
unsigned int refclk_mhz, unsigned int refclk_mhz,
bool safe_to_lower); bool safe_to_lower);
...@@ -446,17 +446,17 @@ void hubbub1_construct(struct hubbub *hubbub, ...@@ -446,17 +446,17 @@ void hubbub1_construct(struct hubbub *hubbub,
bool hubbub1_program_urgent_watermarks( bool hubbub1_program_urgent_watermarks(
struct hubbub *hubbub, struct hubbub *hubbub,
struct dcn_watermark_set *watermarks, union dcn_watermark_set *watermarks,
unsigned int refclk_mhz, unsigned int refclk_mhz,
bool safe_to_lower); bool safe_to_lower);
bool hubbub1_program_stutter_watermarks( bool hubbub1_program_stutter_watermarks(
struct hubbub *hubbub, struct hubbub *hubbub,
struct dcn_watermark_set *watermarks, union dcn_watermark_set *watermarks,
unsigned int refclk_mhz, unsigned int refclk_mhz,
bool safe_to_lower); bool safe_to_lower);
bool hubbub1_program_pstate_watermarks( bool hubbub1_program_pstate_watermarks(
struct hubbub *hubbub, struct hubbub *hubbub,
struct dcn_watermark_set *watermarks, union dcn_watermark_set *watermarks,
unsigned int refclk_mhz, unsigned int refclk_mhz,
bool safe_to_lower); bool safe_to_lower);
......
drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hubbub.c
View file @ 5034b935
...@@ -570,7 +570,7 @@ void hubbub2_get_dchub_ref_freq(struct hubbub *hubbub, ...@@ -570,7 +570,7 @@ void hubbub2_get_dchub_ref_freq(struct hubbub *hubbub,
static bool hubbub2_program_watermarks( static bool hubbub2_program_watermarks(
struct hubbub *hubbub, struct hubbub *hubbub,
struct dcn_watermark_set *watermarks, union dcn_watermark_set *watermarks,
unsigned int refclk_mhz, unsigned int refclk_mhz,
bool safe_to_lower) bool safe_to_lower)
{ {
......
drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hubbub.h
View file @ 5034b935
...@@ -85,7 +85,7 @@ struct dcn20_hubbub { ...@@ -85,7 +85,7 @@ struct dcn20_hubbub {
const struct dcn_hubbub_shift *shifts; const struct dcn_hubbub_shift *shifts;
const struct dcn_hubbub_mask *masks; const struct dcn_hubbub_mask *masks;
unsigned int debug_test_index_pstate; unsigned int debug_test_index_pstate;
struct dcn_watermark_set watermarks; union dcn_watermark_set watermarks;
int num_vmid; int num_vmid;
struct dcn20_vmid vmid[16]; struct dcn20_vmid vmid[16];
unsigned int detile_buf_size; unsigned int detile_buf_size;
......
drivers/gpu/drm/amd/display/dc/dcn201/dcn201_hubbub.c
View file @ 5034b935
...@@ -52,7 +52,7 @@ ...@@ -52,7 +52,7 @@
static bool hubbub201_program_watermarks( static bool hubbub201_program_watermarks(
struct hubbub *hubbub, struct hubbub *hubbub,
struct dcn_watermark_set *watermarks, union dcn_watermark_set *watermarks,
unsigned int refclk_mhz, unsigned int refclk_mhz,
bool safe_to_lower) bool safe_to_lower)
{ {
......
drivers/gpu/drm/amd/display/dc/dcn21/dcn21_hubbub.c
View file @ 5034b935
...@@ -140,7 +140,7 @@ int hubbub21_init_dchub(struct hubbub *hubbub, ...@@ -140,7 +140,7 @@ int hubbub21_init_dchub(struct hubbub *hubbub,
bool hubbub21_program_urgent_watermarks( bool hubbub21_program_urgent_watermarks(
struct hubbub *hubbub, struct hubbub *hubbub,
struct dcn_watermark_set *watermarks, union dcn_watermark_set *watermarks,
unsigned int refclk_mhz, unsigned int refclk_mhz,
bool safe_to_lower) bool safe_to_lower)
{ {
...@@ -334,7 +334,7 @@ bool hubbub21_program_urgent_watermarks( ...@@ -334,7 +334,7 @@ bool hubbub21_program_urgent_watermarks(
bool hubbub21_program_stutter_watermarks( bool hubbub21_program_stutter_watermarks(
struct hubbub *hubbub, struct hubbub *hubbub,
struct dcn_watermark_set *watermarks, union dcn_watermark_set *watermarks,
unsigned int refclk_mhz, unsigned int refclk_mhz,
bool safe_to_lower) bool safe_to_lower)
{ {
...@@ -487,7 +487,7 @@ bool hubbub21_program_stutter_watermarks( ...@@ -487,7 +487,7 @@ bool hubbub21_program_stutter_watermarks(
bool hubbub21_program_pstate_watermarks( bool hubbub21_program_pstate_watermarks(
struct hubbub *hubbub, struct hubbub *hubbub,
struct dcn_watermark_set *watermarks, union dcn_watermark_set *watermarks,
unsigned int refclk_mhz, unsigned int refclk_mhz,
bool safe_to_lower) bool safe_to_lower)
{ {
...@@ -573,7 +573,7 @@ bool hubbub21_program_pstate_watermarks( ...@@ -573,7 +573,7 @@ bool hubbub21_program_pstate_watermarks(
bool hubbub21_program_watermarks( bool hubbub21_program_watermarks(
struct hubbub *hubbub, struct hubbub *hubbub,
struct dcn_watermark_set *watermarks, union dcn_watermark_set *watermarks,
unsigned int refclk_mhz, unsigned int refclk_mhz,
bool safe_to_lower) bool safe_to_lower)
{ {
......
drivers/gpu/drm/amd/display/dc/dcn21/dcn21_hubbub.h
View file @ 5034b935
...@@ -127,22 +127,22 @@ int hubbub21_init_dchub(struct hubbub *hubbub, ...@@ -127,22 +127,22 @@ int hubbub21_init_dchub(struct hubbub *hubbub,
struct dcn_hubbub_phys_addr_config *pa_config); struct dcn_hubbub_phys_addr_config *pa_config);
bool hubbub21_program_watermarks( bool hubbub21_program_watermarks(
struct hubbub *hubbub, struct hubbub *hubbub,
struct dcn_watermark_set *watermarks, union dcn_watermark_set *watermarks,
unsigned int refclk_mhz, unsigned int refclk_mhz,
bool safe_to_lower); bool safe_to_lower);
bool hubbub21_program_urgent_watermarks( bool hubbub21_program_urgent_watermarks(
struct hubbub *hubbub, struct hubbub *hubbub,
struct dcn_watermark_set *watermarks, union dcn_watermark_set *watermarks,
unsigned int refclk_mhz, unsigned int refclk_mhz,
bool safe_to_lower); bool safe_to_lower);
bool hubbub21_program_stutter_watermarks( bool hubbub21_program_stutter_watermarks(
struct hubbub *hubbub, struct hubbub *hubbub,
struct dcn_watermark_set *watermarks, union dcn_watermark_set *watermarks,
unsigned int refclk_mhz, unsigned int refclk_mhz,
bool safe_to_lower); bool safe_to_lower);
bool hubbub21_program_pstate_watermarks( bool hubbub21_program_pstate_watermarks(
struct hubbub *hubbub, struct hubbub *hubbub,
struct dcn_watermark_set *watermarks, union dcn_watermark_set *watermarks,
unsigned int refclk_mhz, unsigned int refclk_mhz,
bool safe_to_lower); bool safe_to_lower);
......
drivers/gpu/drm/amd/display/dc/dcn30/dcn30_hubbub.c
View file @ 5034b935
...@@ -95,7 +95,7 @@ int hubbub3_init_dchub_sys_ctx(struct hubbub *hubbub, ...@@ -95,7 +95,7 @@ int hubbub3_init_dchub_sys_ctx(struct hubbub *hubbub,
bool hubbub3_program_watermarks( bool hubbub3_program_watermarks(
struct hubbub *hubbub, struct hubbub *hubbub,
struct dcn_watermark_set *watermarks, union dcn_watermark_set *watermarks,
unsigned int refclk_mhz, unsigned int refclk_mhz,
bool safe_to_lower) bool safe_to_lower)
{ {
......
drivers/gpu/drm/amd/display/dc/dcn30/dcn30_hubbub.h
View file @ 5034b935
...@@ -124,7 +124,7 @@ bool hubbub3_get_dcc_compression_cap(struct hubbub *hubbub, ...@@ -124,7 +124,7 @@ bool hubbub3_get_dcc_compression_cap(struct hubbub *hubbub,
bool hubbub3_program_watermarks( bool hubbub3_program_watermarks(
struct hubbub *hubbub, struct hubbub *hubbub,
struct dcn_watermark_set *watermarks, union dcn_watermark_set *watermarks,
unsigned int refclk_mhz, unsigned int refclk_mhz,
bool safe_to_lower); bool safe_to_lower);
......
drivers/gpu/drm/amd/display/dc/dcn31/dcn31_hubbub.c
View file @ 5034b935
...@@ -172,7 +172,7 @@ static uint32_t convert_and_clamp( ...@@ -172,7 +172,7 @@ static uint32_t convert_and_clamp(
static bool hubbub31_program_urgent_watermarks( static bool hubbub31_program_urgent_watermarks(
struct hubbub *hubbub, struct hubbub *hubbub,
struct dcn_watermark_set *watermarks, union dcn_watermark_set *watermarks,
unsigned int refclk_mhz, unsigned int refclk_mhz,
bool safe_to_lower) bool safe_to_lower)
{ {
...@@ -362,7 +362,7 @@ static bool hubbub31_program_urgent_watermarks( ...@@ -362,7 +362,7 @@ static bool hubbub31_program_urgent_watermarks(
static bool hubbub31_program_stutter_watermarks( static bool hubbub31_program_stutter_watermarks(
struct hubbub *hubbub, struct hubbub *hubbub,
struct dcn_watermark_set *watermarks, union dcn_watermark_set *watermarks,
unsigned int refclk_mhz, unsigned int refclk_mhz,
bool safe_to_lower) bool safe_to_lower)
{ {
...@@ -635,7 +635,7 @@ static bool hubbub31_program_stutter_watermarks( ...@@ -635,7 +635,7 @@ static bool hubbub31_program_stutter_watermarks(
static bool hubbub31_program_pstate_watermarks( static bool hubbub31_program_pstate_watermarks(
struct hubbub *hubbub, struct hubbub *hubbub,
struct dcn_watermark_set *watermarks, union dcn_watermark_set *watermarks,
unsigned int refclk_mhz, unsigned int refclk_mhz,
bool safe_to_lower) bool safe_to_lower)
{ {
...@@ -717,7 +717,7 @@ static bool hubbub31_program_pstate_watermarks( ...@@ -717,7 +717,7 @@ static bool hubbub31_program_pstate_watermarks(
static bool hubbub31_program_watermarks( static bool hubbub31_program_watermarks(
struct hubbub *hubbub, struct hubbub *hubbub,
struct dcn_watermark_set *watermarks, union dcn_watermark_set *watermarks,
unsigned int refclk_mhz, unsigned int refclk_mhz,
bool safe_to_lower) bool safe_to_lower)
{ {
......
drivers/gpu/drm/amd/display/dc/dcn32/dcn32_hubbub.c
View file @ 5034b935
...@@ -167,7 +167,7 @@ static uint32_t convert_and_clamp( ...@@ -167,7 +167,7 @@ static uint32_t convert_and_clamp(
bool hubbub32_program_urgent_watermarks( bool hubbub32_program_urgent_watermarks(
struct hubbub *hubbub, struct hubbub *hubbub,
struct dcn_watermark_set *watermarks, union dcn_watermark_set *watermarks,
unsigned int refclk_mhz, unsigned int refclk_mhz,
bool safe_to_lower) bool safe_to_lower)
{ {
...@@ -357,7 +357,7 @@ bool hubbub32_program_urgent_watermarks( ...@@ -357,7 +357,7 @@ bool hubbub32_program_urgent_watermarks(
bool hubbub32_program_stutter_watermarks( bool hubbub32_program_stutter_watermarks(
struct hubbub *hubbub, struct hubbub *hubbub,
struct dcn_watermark_set *watermarks, union dcn_watermark_set *watermarks,
unsigned int refclk_mhz, unsigned int refclk_mhz,
bool safe_to_lower) bool safe_to_lower)
{ {
...@@ -503,7 +503,7 @@ bool hubbub32_program_stutter_watermarks( ...@@ -503,7 +503,7 @@ bool hubbub32_program_stutter_watermarks(
bool hubbub32_program_pstate_watermarks( bool hubbub32_program_pstate_watermarks(
struct hubbub *hubbub, struct hubbub *hubbub,
struct dcn_watermark_set *watermarks, union dcn_watermark_set *watermarks,
unsigned int refclk_mhz, unsigned int refclk_mhz,
bool safe_to_lower) bool safe_to_lower)
{ {
...@@ -656,7 +656,7 @@ bool hubbub32_program_pstate_watermarks( ...@@ -656,7 +656,7 @@ bool hubbub32_program_pstate_watermarks(
bool hubbub32_program_usr_watermarks( bool hubbub32_program_usr_watermarks(
struct hubbub *hubbub, struct hubbub *hubbub,
struct dcn_watermark_set *watermarks, union dcn_watermark_set *watermarks,
unsigned int refclk_mhz, unsigned int refclk_mhz,
bool safe_to_lower) bool safe_to_lower)
{ {
...@@ -750,7 +750,7 @@ void hubbub32_force_usr_retraining_allow(struct hubbub *hubbub, bool allow) ...@@ -750,7 +750,7 @@ void hubbub32_force_usr_retraining_allow(struct hubbub *hubbub, bool allow)
static bool hubbub32_program_watermarks( static bool hubbub32_program_watermarks(
struct hubbub *hubbub, struct hubbub *hubbub,
struct dcn_watermark_set *watermarks, union dcn_watermark_set *watermarks,
unsigned int refclk_mhz, unsigned int refclk_mhz,
bool safe_to_lower) bool safe_to_lower)
{ {
......
drivers/gpu/drm/amd/display/dc/dcn32/dcn32_hubbub.h
View file @ 5034b935
...@@ -118,25 +118,25 @@ ...@@ -118,25 +118,25 @@
bool hubbub32_program_urgent_watermarks( bool hubbub32_program_urgent_watermarks(
struct hubbub *hubbub, struct hubbub *hubbub,
struct dcn_watermark_set *watermarks, union dcn_watermark_set *watermarks,
unsigned int refclk_mhz, unsigned int refclk_mhz,
bool safe_to_lower); bool safe_to_lower);
bool hubbub32_program_stutter_watermarks( bool hubbub32_program_stutter_watermarks(
struct hubbub *hubbub, struct hubbub *hubbub,
struct dcn_watermark_set *watermarks, union dcn_watermark_set *watermarks,
unsigned int refclk_mhz, unsigned int refclk_mhz,
bool safe_to_lower); bool safe_to_lower);
bool hubbub32_program_pstate_watermarks( bool hubbub32_program_pstate_watermarks(
struct hubbub *hubbub, struct hubbub *hubbub,
struct dcn_watermark_set *watermarks, union dcn_watermark_set *watermarks,
unsigned int refclk_mhz, unsigned int refclk_mhz,
bool safe_to_lower); bool safe_to_lower);
bool hubbub32_program_usr_watermarks( bool hubbub32_program_usr_watermarks(
struct hubbub *hubbub, struct hubbub *hubbub,
struct dcn_watermark_set *watermarks, union dcn_watermark_set *watermarks,
unsigned int refclk_mhz, unsigned int refclk_mhz,
bool safe_to_lower); bool safe_to_lower);
......
drivers/gpu/drm/amd/display/dc/dcn35/dcn35_hubbub.c
View file @ 5034b935
...@@ -111,7 +111,7 @@ static uint32_t convert_and_clamp( ...@@ -111,7 +111,7 @@ static uint32_t convert_and_clamp(
static bool hubbub35_program_stutter_z8_watermarks( static bool hubbub35_program_stutter_z8_watermarks(
struct hubbub *hubbub, struct hubbub *hubbub,
struct dcn_watermark_set *watermarks, union dcn_watermark_set *watermarks,
unsigned int refclk_mhz, unsigned int refclk_mhz,
bool safe_to_lower) bool safe_to_lower)
{ {
...@@ -297,7 +297,7 @@ static void hubbub35_get_dchub_ref_freq(struct hubbub *hubbub, ...@@ -297,7 +297,7 @@ static void hubbub35_get_dchub_ref_freq(struct hubbub *hubbub,
static bool hubbub35_program_watermarks( static bool hubbub35_program_watermarks(
struct hubbub *hubbub, struct hubbub *hubbub,
struct dcn_watermark_set *watermarks, union dcn_watermark_set *watermarks,
unsigned int refclk_mhz, unsigned int refclk_mhz,
bool safe_to_lower) bool safe_to_lower)
{ {
......
drivers/gpu/drm/amd/display/dc/hwss/dcn20/dcn20_hwseq.c
View file @ 5034b935
...@@ -1910,9 +1910,11 @@ static void dcn20_program_pipe( ...@@ -1910,9 +1910,11 @@ static void dcn20_program_pipe(
dc->res_pool->hubbub->funcs->force_wm_propagate_to_pipes(dc->res_pool->hubbub); dc->res_pool->hubbub->funcs->force_wm_propagate_to_pipes(dc->res_pool->hubbub);
} }
if (dc->res_pool->hubbub->funcs->program_det_size && pipe_ctx->update_flags.bits.det_size) if (pipe_ctx->update_flags.bits.det_size) {
dc->res_pool->hubbub->funcs->program_det_size( if (dc->res_pool->hubbub->funcs->program_det_size)
dc->res_pool->hubbub, pipe_ctx->plane_res.hubp->inst, pipe_ctx->det_buffer_size_kb); dc->res_pool->hubbub->funcs->program_det_size(
dc->res_pool->hubbub, pipe_ctx->plane_res.hubp->inst, pipe_ctx->det_buffer_size_kb);
}
if (pipe_ctx->update_flags.raw || pipe_ctx->plane_state->update_flags.raw || pipe_ctx->stream->update_flags.raw) if (pipe_ctx->update_flags.raw || pipe_ctx->plane_state->update_flags.raw || pipe_ctx->stream->update_flags.raw)
dcn20_update_dchubp_dpp(dc, pipe_ctx, context); dcn20_update_dchubp_dpp(dc, pipe_ctx, context);
...@@ -2073,9 +2075,11 @@ void dcn20_program_front_end_for_ctx( ...@@ -2073,9 +2075,11 @@ void dcn20_program_front_end_for_ctx(
* turned on (i.e. in an MCLK switch) which can come in too late and cause issues with * turned on (i.e. in an MCLK switch) which can come in too late and cause issues with
* DET allocation. * DET allocation.
*/ */
if (hubbub->funcs->program_det_size && (context->res_ctx.pipe_ctx[i].update_flags.bits.disable || if ((context->res_ctx.pipe_ctx[i].update_flags.bits.disable ||
(context->res_ctx.pipe_ctx[i].plane_state && dc_state_get_pipe_subvp_type(context, &context->res_ctx.pipe_ctx[i]) == SUBVP_PHANTOM))) (context->res_ctx.pipe_ctx[i].plane_state && dc_state_get_pipe_subvp_type(context, &context->res_ctx.pipe_ctx[i]) == SUBVP_PHANTOM))) {
hubbub->funcs->program_det_size(hubbub, dc->current_state->res_ctx.pipe_ctx[i].plane_res.hubp->inst, 0); if (hubbub->funcs->program_det_size)
hubbub->funcs->program_det_size(hubbub, dc->current_state->res_ctx.pipe_ctx[i].plane_res.hubp->inst, 0);
}
hws->funcs.plane_atomic_disconnect(dc, dc->current_state, &dc->current_state->res_ctx.pipe_ctx[i]); hws->funcs.plane_atomic_disconnect(dc, dc->current_state, &dc->current_state->res_ctx.pipe_ctx[i]);
DC_LOG_DC("Reset mpcc for pipe %d\n", dc->current_state->res_ctx.pipe_ctx[i].pipe_idx); DC_LOG_DC("Reset mpcc for pipe %d\n", dc->current_state->res_ctx.pipe_ctx[i].pipe_idx);
} }
......
drivers/gpu/drm/amd/display/dc/inc/core_types.h
View file @ 5034b935
...@@ -499,7 +499,7 @@ struct dcn_bw_writeback { ...@@ -499,7 +499,7 @@ struct dcn_bw_writeback {
struct dcn_bw_output { struct dcn_bw_output {
struct dc_clocks clk; struct dc_clocks clk;
struct dcn_watermark_set watermarks; union dcn_watermark_set watermarks;
struct dcn_bw_writeback bw_writeback; struct dcn_bw_writeback bw_writeback;
int compbuf_size_kb; int compbuf_size_kb;
unsigned int mall_ss_size_bytes; unsigned int mall_ss_size_bytes;
......
drivers/gpu/drm/amd/display/dc/inc/hw/dchubbub.h
View file @ 5034b935
...@@ -160,7 +160,7 @@ struct hubbub_funcs { ...@@ -160,7 +160,7 @@ struct hubbub_funcs {
bool (*program_watermarks)( bool (*program_watermarks)(
struct hubbub *hubbub, struct hubbub *hubbub,
struct dcn_watermark_set *watermarks, union dcn_watermark_set *watermarks,
unsigned int refclk_mhz, unsigned int refclk_mhz,
bool safe_to_lower); bool safe_to_lower);
......
drivers/gpu/drm/amd/display/dc/inc/hw/mem_input.h
View file @ 5034b935
...@@ -50,11 +50,13 @@ struct dcn_watermarks { ...@@ -50,11 +50,13 @@ struct dcn_watermarks {
uint32_t usr_retraining_ns; uint32_t usr_retraining_ns;
}; };
struct dcn_watermark_set { union dcn_watermark_set {
struct dcn_watermarks a; struct {
struct dcn_watermarks b; struct dcn_watermarks a;
struct dcn_watermarks c; struct dcn_watermarks b;
struct dcn_watermarks d; struct dcn_watermarks c;
struct dcn_watermarks d;
}; // legacy
}; };
struct dce_watermarks { struct dce_watermarks {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7