From 0da0effbeef0b3a18173b8a524f2ae76ceb568a9 Mon Sep 17 00:00:00 2001 From: jsg Date: Mon, 22 Jun 2020 10:00:28 +0000 Subject: drm/amd/display: Correct updating logic of dcn21's pipe VM flags From Dale Zhao 21b7c6033823d3888a195a24271cbea34279dd62 in linux 5.7.y/5.7.5 2a28fe92220a116735ef45939b7edcfee83cc6b0 in mainline linux --- sys/dev/pci/drm/amd/display/dc/dcn21/dcn21_resource.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/sys/dev/pci/drm/amd/display/dc/dcn21/dcn21_resource.c b/sys/dev/pci/drm/amd/display/dc/dcn21/dcn21_resource.c index a721bb401ef..6d1736cf5c1 100644 --- a/sys/dev/pci/drm/amd/display/dc/dcn21/dcn21_resource.c +++ b/sys/dev/pci/drm/amd/display/dc/dcn21/dcn21_resource.c @@ -1694,12 +1694,8 @@ static int dcn21_populate_dml_pipes_from_context( { uint32_t pipe_cnt = dcn20_populate_dml_pipes_from_context(dc, context, pipes); int i; - struct resource_context *res_ctx = &context->res_ctx; - for (i = 0; i < dc->res_pool->pipe_count; i++) { - - if (!res_ctx->pipe_ctx[i].stream) - continue; + for (i = 0; i < pipe_cnt; i++) { pipes[i].pipe.src.hostvm = 1; pipes[i].pipe.src.gpuvm = 1; -- cgit v1.2.3-59-g8ed1b