Commit ae030570 authored by Atufa Khan's avatar Atufa Khan Committed by Alex Deucher
Browse files

drm/amd/display: Separate caps for maximum RGB and YUV plane counts 



Not all ASICs have same plane capabilities so need to split them
out for proper support handling.

Tested-by: default avatarDaniel Wheeler <daniel.wheeler@amd.com>
Signed-off-by: default avatarAtufa Khan <Atufa.Khan@amd.com>
Reviewed-by: default avatarAric Cyr <Aric.Cyr@amd.com>
Acked-by: default avatarSolomon Chiu <solomon.chiu@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent e69231c4

drivers/gpu/drm/amd/display/dc/dc.h

+2 −0
Original line number Diff line number Diff line
@@ -155,6 +155,8 @@ struct dc_caps { 
	uint32_t max_links;

	uint32_t max_audios;

	uint32_t max_slave_planes;

	uint32_t max_slave_yuv_planes;

	uint32_t max_slave_rgb_planes;

	uint32_t max_planes;

	uint32_t max_downscale_ratio;

	uint32_t i2c_speed_in_khz;

drivers/gpu/drm/amd/display/dc/dce110/dce110_resource.c

+2 −0
Original line number Diff line number Diff line
@@ -1272,6 +1272,8 @@ static bool underlay_create(struct dc_context *ctx, struct resource_pool *pool) 


	/* update the public caps to indicate an underlay is available */

	ctx->dc->caps.max_slave_planes = 1;

	ctx->dc->caps.max_slave_yuv_planes = 1;

	ctx->dc->caps.max_slave_rgb_planes = 0;



	return true;

}

drivers/gpu/drm/amd/display/dc/dcn10/dcn10_resource.c

+2 −0
Original line number Diff line number Diff line
@@ -1422,6 +1422,8 @@ static bool dcn10_resource_construct( 
	dc->caps.max_cursor_size = 256;

	dc->caps.min_horizontal_blanking_period = 80;

	dc->caps.max_slave_planes = 1;

	dc->caps.max_slave_yuv_planes = 1;

	dc->caps.max_slave_rgb_planes = 0;

	dc->caps.is_apu = true;

	dc->caps.post_blend_color_processing = false;

	dc->caps.extended_aux_timeout_support = false;

drivers/gpu/drm/amd/display/dc/dcn20/dcn20_resource.c

+2 −0
Original line number Diff line number Diff line
@@ -3703,6 +3703,8 @@ static bool dcn20_resource_construct( 
	dc->caps.dmdata_alloc_size = 2048;



	dc->caps.max_slave_planes = 1;

	dc->caps.max_slave_yuv_planes = 1;

	dc->caps.max_slave_rgb_planes = 1;

	dc->caps.post_blend_color_processing = true;

	dc->caps.force_dp_tps4_for_cp2520 = true;

	dc->caps.extended_aux_timeout_support = true;

drivers/gpu/drm/amd/display/dc/dcn21/dcn21_resource.c

+2 −0
Original line number Diff line number Diff line
@@ -1982,6 +1982,8 @@ static bool dcn21_resource_construct( 
	dc->caps.dmdata_alloc_size = 2048;



	dc->caps.max_slave_planes = 1;

	dc->caps.max_slave_yuv_planes = 1;

	dc->caps.max_slave_rgb_planes = 1;

	dc->caps.post_blend_color_processing = true;

	dc->caps.force_dp_tps4_for_cp2520 = true;

	dc->caps.extended_aux_timeout_support = true;