blob: faf617a4888b33a686c3d5cd334ac60946289de7 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
|
From 03b8f30e58e5509c70f9f8853fd72f3dab5bea71 Mon Sep 17 00:00:00 2001
From: Tony Cheng <tony.cheng@amd.com>
Date: Tue, 7 Nov 2017 23:37:49 -0500
Subject: [PATCH 2750/4131] drm/amd/display: fix plane update prior to stream
enablement
plane update prior to stream enablement is there to recombine pipe
in case we need free pipe for new display. need to pass in new state
or we will just re-applyingwhat we already have
Signed-off-by: Tony Cheng <tony.cheng@amd.com>
Reviewed-by: Tony Cheng <Tony.Cheng@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.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/drivers/gpu/drm/amd/display/dc/core/dc.c b/drivers/gpu/drm/amd/display/dc/core/dc.c
index b0d4927..5ea0bab 100644
--- a/drivers/gpu/drm/amd/display/dc/core/dc.c
+++ b/drivers/gpu/drm/amd/display/dc/core/dc.c
@@ -846,12 +846,14 @@ static enum dc_status dc_commit_state_no_check(struct dc *dc, struct dc_state *c
if (!dcb->funcs->is_accelerated_mode(dcb))
dc->hwss.enable_accelerated_mode(dc);
- /* Combine planes if required, in case of pipe split disable */
+ /* re-program planes for existing stream, in case we need to
+ * free up plane resource for later use
+ */
for (i = 0; i < dc->current_state->stream_count; i++) {
dc->hwss.apply_ctx_for_surface(
dc, dc->current_state->streams[i],
dc->current_state->stream_status[i].plane_count,
- dc->current_state);
+ context); /* use new pipe config in new context */
}
/* Program hardware */
--
2.7.4
|
