Commit 1f721ebc authored by Timur Kristóf's avatar Timur Kristóf Committed by Alex Deucher
Browse files

drm/amd/display: Share dce100_validate_global with DCE6-8 



The dce100_validate_global function was verbatim exactly the
same as dce60_validate_global and dce80_validate_global.

Share dce100_validate_global between DCE6-10 to save code size.

Signed-off-by: default avatarTimur Kristóf <timur.kristof@gmail.com>
Reviewed-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Signed-off-by: default avatarMario Limonciello <mario.limonciello@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent ee352f6c

drivers/gpu/drm/amd/display/dc/resource/dce100/dce100_resource.c

+1 −1
Original line number Diff line number Diff line
@@ -898,7 +898,7 @@ static bool dce100_validate_surface_sets( 
	return true;

}



static enum dc_status dce100_validate_global(

enum dc_status dce100_validate_global(

		struct dc  *dc,

		struct dc_state *context)

{

drivers/gpu/drm/amd/display/dc/resource/dce100/dce100_resource.h

+4 −0
Original line number Diff line number Diff line
@@ -41,6 +41,10 @@ struct resource_pool *dce100_create_resource_pool( 


enum dc_status dce100_validate_plane(const struct dc_plane_state *plane_state, struct dc_caps *caps);



enum dc_status dce100_validate_global(

		struct dc  *dc,

		struct dc_state *context);



enum dc_status dce100_validate_bandwidth(

		struct dc  *dc,

		struct dc_state *context,

drivers/gpu/drm/amd/display/dc/resource/dce60/dce60_resource.c

+1 −31
Original line number Diff line number Diff line
@@ -864,36 +864,6 @@ static void dce60_resource_destruct(struct dce110_resource_pool *pool) 
	}

}



static bool dce60_validate_surface_sets(

		struct dc_state *context)

{

	int i;



	for (i = 0; i < context->stream_count; i++) {

		if (context->stream_status[i].plane_count == 0)

			continue;



		if (context->stream_status[i].plane_count > 1)

			return false;



		if (context->stream_status[i].plane_states[0]->format

				>= SURFACE_PIXEL_FORMAT_VIDEO_BEGIN)

			return false;

	}



	return true;

}



static enum dc_status dce60_validate_global(

		struct dc *dc,

		struct dc_state *context)

{

	if (!dce60_validate_surface_sets(context))

		return DC_FAIL_SURFACE_VALIDATE;



	return DC_OK;

}



static void dce60_destroy_resource_pool(struct resource_pool **pool)

{

	struct dce110_resource_pool *dce110_pool = TO_DCE110_RES_POOL(*pool);
@@ -910,7 +880,7 @@ static const struct resource_funcs dce60_res_pool_funcs = { 
	.validate_bandwidth = dce100_validate_bandwidth,

	.validate_plane = dce100_validate_plane,

	.add_stream_to_ctx = dce100_add_stream_to_ctx,

	.validate_global = dce60_validate_global,

	.validate_global = dce100_validate_global,

	.find_first_free_match_stream_enc_for_link = dce100_find_first_free_match_stream_enc_for_link

};

drivers/gpu/drm/amd/display/dc/resource/dce80/dce80_resource.c

+1 −31
Original line number Diff line number Diff line
@@ -870,36 +870,6 @@ static void dce80_resource_destruct(struct dce110_resource_pool *pool) 
	}

}



static bool dce80_validate_surface_sets(

		struct dc_state *context)

{

	int i;



	for (i = 0; i < context->stream_count; i++) {

		if (context->stream_status[i].plane_count == 0)

			continue;



		if (context->stream_status[i].plane_count > 1)

			return false;



		if (context->stream_status[i].plane_states[0]->format

				>= SURFACE_PIXEL_FORMAT_VIDEO_BEGIN)

			return false;

	}



	return true;

}



static enum dc_status dce80_validate_global(

		struct dc *dc,

		struct dc_state *context)

{

	if (!dce80_validate_surface_sets(context))

		return DC_FAIL_SURFACE_VALIDATE;



	return DC_OK;

}



static void dce80_destroy_resource_pool(struct resource_pool **pool)

{

	struct dce110_resource_pool *dce110_pool = TO_DCE110_RES_POOL(*pool);
@@ -916,7 +886,7 @@ static const struct resource_funcs dce80_res_pool_funcs = { 
	.validate_bandwidth = dce100_validate_bandwidth,

	.validate_plane = dce100_validate_plane,

	.add_stream_to_ctx = dce100_add_stream_to_ctx,

	.validate_global = dce80_validate_global,

	.validate_global = dce100_validate_global,

	.find_first_free_match_stream_enc_for_link = dce100_find_first_free_match_stream_enc_for_link

};