summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonathan Gray <jsg@cvs.openbsd.org>2020-08-26 12:44:23 +0000
committerJonathan Gray <jsg@cvs.openbsd.org>2020-08-26 12:44:23 +0000
commited5b51aca5cceb406f428abc2ab8b92a65c97845 (patch)
treecf62cdf299d46fdc40820638c86c89a64c6b8d87
parent9a8f7e438955cb337a861b9cb50a89f0dcc012bd (diff)
drm/amd/display: Fix DFPstate hang due to view port changed
From Paul Hsieh 3f88e2e7a7943ef07a384f653f01832600bb91dd in linux 5.7.y/5.7.18 8e80d482608a4e6a97c75272ef8b4bcfc5d0c490 in mainline linux
-rw-r--r--sys/dev/pci/drm/amd/display/dc/dcn20/dcn20_hwseq.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/sys/dev/pci/drm/amd/display/dc/dcn20/dcn20_hwseq.c b/sys/dev/pci/drm/amd/display/dc/dcn20/dcn20_hwseq.c
index c4fa13e4eaf..ab93cecb78f 100644
--- a/sys/dev/pci/drm/amd/display/dc/dcn20/dcn20_hwseq.c
+++ b/sys/dev/pci/drm/amd/display/dc/dcn20/dcn20_hwseq.c
@@ -1386,8 +1386,8 @@ static void dcn20_update_dchubp_dpp(
/* Any updates are handled in dc interface, just need to apply existing for plane enable */
if ((pipe_ctx->update_flags.bits.enable || pipe_ctx->update_flags.bits.opp_changed ||
- pipe_ctx->update_flags.bits.scaler || pipe_ctx->update_flags.bits.viewport)
- && pipe_ctx->stream->cursor_attributes.address.quad_part != 0) {
+ pipe_ctx->update_flags.bits.scaler || viewport_changed == true) &&
+ pipe_ctx->stream->cursor_attributes.address.quad_part != 0) {
dc->hwss.set_cursor_position(pipe_ctx);
dc->hwss.set_cursor_attribute(pipe_ctx);