diff options
| author | Dmytro Laktyushkin <Dmytro.Laktyushkin@amd.com> | 2017-05-18 17:02:43 -0400 |
|---|---|---|
| committer | Alex Deucher <alexander.deucher@amd.com> | 2017-09-26 18:07:26 -0400 |
| commit | a7562ab35ee96810e9e4c41969a375f1c3f249ae (patch) | |
| tree | e3a07a83062748c8929efd79cd4745a2c6fc0ebd /drivers/gpu/drm/amd/display/dc/dce/dce_mem_input.c | |
| parent | 89c872e595c48ccf357bbabcc9918bdef9de7ac8 (diff) | |
| download | linux-stable-a7562ab35ee96810e9e4c41969a375f1c3f249ae.tar.gz linux-stable-a7562ab35ee96810e9e4c41969a375f1c3f249ae.tar.bz2 linux-stable-a7562ab35ee96810e9e4c41969a375f1c3f249ae.zip | |
drm/amd/display: remove GRPH_SURFACE_UPDATE_IMMEDIATE_EN field programming
This is causing asserts for dce 8 and 10 since they do not contain this
field. It is also unnecessary for later DCEs as it is left in it's
default state of 0
Signed-off-by: Dmytro Laktyushkin <Dmytro.Laktyushkin@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/dce/dce_mem_input.c')
| -rw-r--r-- | drivers/gpu/drm/amd/display/dc/dce/dce_mem_input.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/drivers/gpu/drm/amd/display/dc/dce/dce_mem_input.c b/drivers/gpu/drm/amd/display/dc/dce/dce_mem_input.c index 673371e5f9f0..157f4e1680e3 100644 --- a/drivers/gpu/drm/amd/display/dc/dce/dce_mem_input.c +++ b/drivers/gpu/drm/amd/display/dc/dce/dce_mem_input.c @@ -621,15 +621,10 @@ static bool dce_mi_program_surface_flip_and_addr( { struct dce_mem_input *dce_mi = TO_DCE_MEM_INPUT(mem_input); - /* TODO: Figure out if two modes are needed: - * non-XDMA Mode: GRPH_SURFACE_UPDATE_IMMEDIATE_EN = 1 - * XDMA Mode: GRPH_SURFACE_UPDATE_H_RETRACE_EN = 1 - */ REG_UPDATE(GRPH_UPDATE, GRPH_UPDATE_LOCK, 1); - REG_UPDATE_2( + REG_UPDATE( GRPH_FLIP_CONTROL, - GRPH_SURFACE_UPDATE_IMMEDIATE_EN, 0, GRPH_SURFACE_UPDATE_H_RETRACE_EN, flip_immediate ? 1 : 0); switch (address->type) { |