Commit f0e3db90 authored by Harry Wentland's avatar Harry Wentland Committed by Alex Deucher

drm/amd/display: Don't reserve pipe for underlay on ASIC without underlay

Signed-off-by: default avatarHarry Wentland <harry.wentland@amd.com>
Acked-by: default avatarJordan Lazare <Jordan.Lazare@amd.com>
Reviewed-by: default avatarTony Cheng <Tony.Cheng@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent adc9b141
...@@ -621,7 +621,7 @@ struct dc *dc_create(const struct dc_init_data *init_params) ...@@ -621,7 +621,7 @@ struct dc *dc_create(const struct dc_init_data *init_params)
core_dc->hwss.init_hw(core_dc); core_dc->hwss.init_hw(core_dc);
full_pipe_count = core_dc->res_pool->pipe_count; full_pipe_count = core_dc->res_pool->pipe_count;
if (core_dc->res_pool->underlay_pipe_index >= 0) if (core_dc->res_pool->underlay_pipe_index != NO_UNDERLAY_PIPE)
full_pipe_count--; full_pipe_count--;
core_dc->public.caps.max_streams = min( core_dc->public.caps.max_streams = min(
full_pipe_count, full_pipe_count,
......
...@@ -934,7 +934,7 @@ static bool construct( ...@@ -934,7 +934,7 @@ static bool construct(
pool->base.res_cap = &res_cap; pool->base.res_cap = &res_cap;
pool->base.funcs = &dce100_res_pool_funcs; pool->base.funcs = &dce100_res_pool_funcs;
pool->base.underlay_pipe_index = -1; pool->base.underlay_pipe_index = NO_UNDERLAY_PIPE;
bp = ctx->dc_bios; bp = ctx->dc_bios;
...@@ -1004,7 +1004,7 @@ static bool construct( ...@@ -1004,7 +1004,7 @@ static bool construct(
/************************************************* /*************************************************
* Resource + asic cap harcoding * * Resource + asic cap harcoding *
*************************************************/ *************************************************/
pool->base.underlay_pipe_index = -1; pool->base.underlay_pipe_index = NO_UNDERLAY_PIPE;
pool->base.pipe_count = res_cap.num_timing_generator; pool->base.pipe_count = res_cap.num_timing_generator;
dc->public.caps.max_downscale_ratio = 200; dc->public.caps.max_downscale_ratio = 200;
dc->public.caps.i2c_speed_in_khz = 40; dc->public.caps.i2c_speed_in_khz = 40;
......
...@@ -1243,7 +1243,7 @@ static bool construct( ...@@ -1243,7 +1243,7 @@ static bool construct(
/************************************************* /*************************************************
* Resource + asic cap harcoding * * Resource + asic cap harcoding *
*************************************************/ *************************************************/
pool->base.underlay_pipe_index = -1; pool->base.underlay_pipe_index = NO_UNDERLAY_PIPE;
pool->base.pipe_count = pool->base.res_cap->num_timing_generator; pool->base.pipe_count = pool->base.res_cap->num_timing_generator;
dc->public.caps.max_downscale_ratio = 200; dc->public.caps.max_downscale_ratio = 200;
dc->public.caps.i2c_speed_in_khz = 100; dc->public.caps.i2c_speed_in_khz = 100;
......
...@@ -931,7 +931,7 @@ static bool construct( ...@@ -931,7 +931,7 @@ static bool construct(
/************************************************* /*************************************************
* Resource + asic cap harcoding * * Resource + asic cap harcoding *
*************************************************/ *************************************************/
pool->base.underlay_pipe_index = -1; pool->base.underlay_pipe_index = NO_UNDERLAY_PIPE;
pool->base.pipe_count = res_cap.num_timing_generator; pool->base.pipe_count = res_cap.num_timing_generator;
dc->public.caps.max_downscale_ratio = 200; dc->public.caps.max_downscale_ratio = 200;
dc->public.caps.i2c_speed_in_khz = 40; dc->public.caps.i2c_speed_in_khz = 40;
......
...@@ -230,6 +230,8 @@ struct audio_support{ ...@@ -230,6 +230,8 @@ struct audio_support{
bool hdmi_audio_native; bool hdmi_audio_native;
}; };
#define NO_UNDERLAY_PIPE -1
struct resource_pool { struct resource_pool {
struct mem_input *mis[MAX_PIPES]; struct mem_input *mis[MAX_PIPES];
struct input_pixel_processor *ipps[MAX_PIPES]; struct input_pixel_processor *ipps[MAX_PIPES];
......
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