]> git.proxmox.com Git - mirror_ubuntu-focal-kernel.git/commitdiff
drm/amd/display: Fix new stream count check in dc_add_stream_to_ctx
authorKen Chalmers <ken.chalmers@amd.com>
Wed, 27 Jun 2018 16:48:21 +0000 (12:48 -0400)
committerAlex Deucher <alexander.deucher@amd.com>
Fri, 13 Jul 2018 19:52:00 +0000 (14:52 -0500)
[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>
drivers/gpu/drm/amd/display/dc/core/dc_resource.c

index c5fc5250e2bfc43980bda04c7078721e814f14dc..9abe5481e40c8c2d5d0e4994c619f3d860b52e1e 100644 (file)
@@ -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;
        }