summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/amd/display/dc/core/dc.c
diff options
context:
space:
mode:
authorSivapiriyanKumarasamy <sivapiriyan.kumarasamy@amd.com>2018-02-13 17:37:23 -0500
committerAlex Deucher <alexander.deucher@amd.com>2018-03-14 15:08:41 -0500
commitaa5a5777304228819a52562d346bc3eb1b4873fa (patch)
treeec88e555b89d22338efda0f57ebd1e58ac761815 /drivers/gpu/drm/amd/display/dc/core/dc.c
parentd5400aab15761cd836e3d5d0ad34c330784bbe1a (diff)
downloadlinux-aa5a5777304228819a52562d346bc3eb1b4873fa.tar.bz2
drm/amd/display: Vari-bright looks disabled near end of MM14
Avoid hanging DMCU by setting abm level only when OTG unblanked Signed-off-by: SivapiriyanKumarasamy <sivapiriyan.kumarasamy@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>
Diffstat (limited to 'drivers/gpu/drm/amd/display/dc/core/dc.c')
-rw-r--r--drivers/gpu/drm/amd/display/dc/core/dc.c8
1 files changed, 8 insertions, 0 deletions
diff --git a/drivers/gpu/drm/amd/display/dc/core/dc.c b/drivers/gpu/drm/amd/display/dc/core/dc.c
index 8394d69b963f..a0b91eeb1939 100644
--- a/drivers/gpu/drm/amd/display/dc/core/dc.c
+++ b/drivers/gpu/drm/amd/display/dc/core/dc.c
@@ -42,6 +42,7 @@
#include "dmcu.h"
#include "dpp.h"
#include "timing_generator.h"
+#include "abm.h"
#include "virtual/virtual_link_encoder.h"
#include "link_hwss.h"
@@ -1361,6 +1362,13 @@ static void commit_planes_for_stream(struct dc *dc,
dc->hwss.apply_ctx_for_surface(
dc, pipe_ctx->stream, stream_status->plane_count, context);
+
+ if (stream_update->abm_setting.stream_update) {
+ if (dc->res_pool->abm)
+ dc->res_pool->abm->funcs->set_abm_level(
+ dc->res_pool->abm, stream->abm_settings.abm_level);
+ stream->abm_settings.stream_update = 0;
+ }
}
}