Commit 6133470c authored by Julian Parkin's avatar Julian Parkin Committed by Alex Deucher
Browse files

drm/amd/display: drop dc_validate_guaranteed 



Block FP16 scaling in validate_resources codepath.

Signed-off-by: default avatarJulian Parkin <jparkin@amd.com>
Reviewed-by: default avatarTony Cheng <Tony.Cheng@amd.com>
Acked-by: default avatarHarry Wentland <harry.wentland@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent f8931ea7

drivers/gpu/drm/amd/display/dc/core/dc_resource.c

+0 −32
Original line number Diff line number Diff line
@@ -1599,18 +1599,6 @@ enum dc_status dc_remove_stream_from_ctx( 
	return DC_OK;

}



static void copy_pipe_ctx(

	const struct pipe_ctx *from_pipe_ctx, struct pipe_ctx *to_pipe_ctx)

{

	struct dc_plane_state *plane_state = to_pipe_ctx->plane_state;

	struct dc_stream_state *stream = to_pipe_ctx->stream;



	*to_pipe_ctx = *from_pipe_ctx;

	to_pipe_ctx->stream = stream;

	if (plane_state != NULL)

		to_pipe_ctx->plane_state = plane_state;

}



static struct dc_stream_state *find_pll_sharable_stream(

		struct dc_stream_state *stream_needs_pll,

		struct dc_state *context)
@@ -1752,26 +1740,6 @@ enum dc_status resource_map_pool_resources( 
	return DC_ERROR_UNEXPECTED;

}



/* first stream in the context is used to populate the rest */

void validate_guaranteed_copy_streams(

		struct dc_state *context,

		int max_streams)

{

	int i;



	for (i = 1; i < max_streams; i++) {

		context->streams[i] = context->streams[0];



		copy_pipe_ctx(&context->res_ctx.pipe_ctx[0],

			      &context->res_ctx.pipe_ctx[i]);

		context->res_ctx.pipe_ctx[i].stream =

				context->res_ctx.pipe_ctx[0].stream;



		dc_stream_retain(context->streams[i]);

		context->stream_count++;

	}

}



void dc_resource_state_copy_construct_current(

		const struct dc *dc,

		struct dc_state *dst_ctx)

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

+0 −8
Original line number Diff line number Diff line
@@ -208,14 +208,6 @@ bool dc_add_all_planes_for_stream( 


enum dc_status dc_validate_stream(struct dc *dc, struct dc_stream_state *stream);



/*

 * This function takes a stream and checks if it is guaranteed to be supported.

 * Guaranteed means that MAX_COFUNC similar streams are supported.

 *

 * After this call:

 *   No hardware is programmed for call.  Only validation is done.

 */



/*

 * Set up streams and links associated to drive sinks

 * The streams parameter is an absolute set of all active streams.

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

+0 −33
Original line number Diff line number Diff line
@@ -733,38 +733,6 @@ enum dc_status dce100_add_stream_to_ctx( 
	return result;

}



enum dc_status dce100_validate_guaranteed(

		struct dc  *dc,

		struct dc_stream_state *dc_stream,

		struct dc_state *context)

{

	enum dc_status result = DC_ERROR_UNEXPECTED;



	context->streams[0] = dc_stream;

	dc_stream_retain(context->streams[0]);

	context->stream_count++;



	result = resource_map_pool_resources(dc, context, dc_stream);



	if (result == DC_OK)

		result = resource_map_clock_resources(dc, context, dc_stream);



	if (result == DC_OK)

		result = build_mapped_resource(dc, context, dc_stream);



	if (result == DC_OK) {

		validate_guaranteed_copy_streams(

				context, dc->caps.max_streams);

		result = resource_build_scaling_params_for_context(dc, context);

	}



	if (result == DC_OK)

		if (!dce100_validate_bandwidth(dc, context))

			result = DC_FAIL_BANDWIDTH_VALIDATE;



	return result;

}



static void dce100_destroy_resource_pool(struct resource_pool **pool)

{

	struct dce110_resource_pool *dce110_pool = TO_DCE110_RES_POOL(*pool);
@@ -786,7 +754,6 @@ enum dc_status dce100_validate_plane(const struct dc_plane_state *plane_state, s 
static const struct resource_funcs dce100_res_pool_funcs = {

	.destroy = dce100_destroy_resource_pool,

	.link_enc_create = dce100_link_encoder_create,

	.validate_guaranteed = dce100_validate_guaranteed,

	.validate_bandwidth = dce100_validate_bandwidth,

	.validate_plane = dce100_validate_plane,

	.add_stream_to_ctx = dce100_add_stream_to_ctx,

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

+0 −33
Original line number Diff line number Diff line
@@ -930,38 +930,6 @@ static enum dc_status dce110_add_stream_to_ctx( 
	return result;

}



static enum dc_status dce110_validate_guaranteed(

		struct dc *dc,

		struct dc_stream_state *dc_stream,

		struct dc_state *context)

{

	enum dc_status result = DC_ERROR_UNEXPECTED;



	context->streams[0] = dc_stream;

	dc_stream_retain(context->streams[0]);

	context->stream_count++;



	result = resource_map_pool_resources(dc, context, dc_stream);



	if (result == DC_OK)

		result = resource_map_clock_resources(dc, context, dc_stream);



	if (result == DC_OK)

		result = build_mapped_resource(dc, context, dc_stream);



	if (result == DC_OK) {

		validate_guaranteed_copy_streams(

				context, dc->caps.max_streams);

		result = resource_build_scaling_params_for_context(dc, context);

	}



	if (result == DC_OK)

		if (!dce110_validate_bandwidth(dc, context))

			result = DC_FAIL_BANDWIDTH_VALIDATE;



	return result;

}



static struct pipe_ctx *dce110_acquire_underlay(

		struct dc_state *context,

		const struct resource_pool *pool,
@@ -1036,7 +1004,6 @@ static void dce110_destroy_resource_pool(struct resource_pool **pool) 
static const struct resource_funcs dce110_res_pool_funcs = {

	.destroy = dce110_destroy_resource_pool,

	.link_enc_create = dce110_link_encoder_create,

	.validate_guaranteed = dce110_validate_guaranteed,

	.validate_bandwidth = dce110_validate_bandwidth,

	.validate_plane = dce110_validate_plane,

	.acquire_idle_pipe_for_layer = dce110_acquire_underlay,

drivers/gpu/drm/amd/display/dc/dce112/dce112_resource.c

+0 −33
Original line number Diff line number Diff line
@@ -867,38 +867,6 @@ enum dc_status dce112_add_stream_to_ctx( 
	return result;

}



enum dc_status dce112_validate_guaranteed(

		struct dc *dc,

		struct dc_stream_state *stream,

		struct dc_state *context)

{

	enum dc_status result = DC_ERROR_UNEXPECTED;



	context->streams[0] = stream;

	dc_stream_retain(context->streams[0]);

	context->stream_count++;



	result = resource_map_pool_resources(dc, context, stream);



	if (result == DC_OK)

		result = resource_map_phy_clock_resources(dc, context, stream);



	if (result == DC_OK)

		result = build_mapped_resource(dc, context, stream);



	if (result == DC_OK) {

		validate_guaranteed_copy_streams(

				context, dc->caps.max_streams);

		result = resource_build_scaling_params_for_context(dc, context);

	}



	if (result == DC_OK)

		if (!dce112_validate_bandwidth(dc, context))

			result = DC_FAIL_BANDWIDTH_VALIDATE;



	return result;

}



enum dc_status dce112_validate_global(

		struct dc *dc,

		struct dc_state *context)
@@ -921,7 +889,6 @@ static void dce112_destroy_resource_pool(struct resource_pool **pool) 
static const struct resource_funcs dce112_res_pool_funcs = {

	.destroy = dce112_destroy_resource_pool,

	.link_enc_create = dce112_link_encoder_create,

	.validate_guaranteed = dce112_validate_guaranteed,

	.validate_bandwidth = dce112_validate_bandwidth,

	.validate_plane = dce100_validate_plane,

	.add_stream_to_ctx = dce112_add_stream_to_ctx,