Commit ece4147f authored Jun 27, 2018 by Ken Chalmers Committed by Alex Deucher Jul 13, 2018

drm/amd/display: Fix new stream count check in dc_add_stream_to_ctx



[Why]
The previous code could allow through attempts to enable more streams
than there are timing generators, in designs where the number of pipes
is greater than the number of timing generators.

[How]
Compare the new stream count to the resource pool's timing generator
count, instead of its pipe count.  Also correct a typo in the error
message.

Signed-off-by: Ken Chalmers <ken.chalmers@amd.com>
Reviewed-by: Charlene Liu <Charlene.Liu@amd.com>
Acked-by: Harry Wentland <harry.wentland@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

parent 245524d9

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

+2 −2

Original line number	Diff line number	Diff line
		@@ -1705,8 +1705,8 @@ enum dc_status dc_add_stream_to_ctx(
		struct dc_context *dc_ctx = dc->ctx;
		enum dc_status res;

		if (new_ctx->stream_count >= dc->res_pool->pipe_count) {
		DC_ERROR("Max streams reached, can add stream %p !\n", stream);
		if (new_ctx->stream_count >= dc->res_pool->timing_generator_count) {
		DC_ERROR("Max streams reached, can't add stream %p !\n", stream);
		return DC_ERROR_UNEXPECTED;
		}