diff options
Diffstat (limited to 'common/recipes-kernel/linux/linux-yocto-4.14.71/0455-drm-amd-display-remove-GRPH_SURFACE_UPDATE_IMMEDIATE.patch')
-rw-r--r-- | common/recipes-kernel/linux/linux-yocto-4.14.71/0455-drm-amd-display-remove-GRPH_SURFACE_UPDATE_IMMEDIATE.patch | 63 |
1 files changed, 63 insertions, 0 deletions
diff --git a/common/recipes-kernel/linux/linux-yocto-4.14.71/0455-drm-amd-display-remove-GRPH_SURFACE_UPDATE_IMMEDIATE.patch b/common/recipes-kernel/linux/linux-yocto-4.14.71/0455-drm-amd-display-remove-GRPH_SURFACE_UPDATE_IMMEDIATE.patch new file mode 100644 index 00000000..8387831a --- /dev/null +++ b/common/recipes-kernel/linux/linux-yocto-4.14.71/0455-drm-amd-display-remove-GRPH_SURFACE_UPDATE_IMMEDIATE.patch @@ -0,0 +1,63 @@ +From 75b6b7c255521b9ed29122bc2a34dfa21396bd79 Mon Sep 17 00:00:00 2001 +From: Dmytro Laktyushkin <Dmytro.Laktyushkin@amd.com> +Date: Thu, 18 May 2017 17:02:43 -0400 +Subject: [PATCH 0455/4131] 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> +--- + drivers/gpu/drm/amd/display/dc/dce/dce_mem_input.c | 7 +------ + drivers/gpu/drm/amd/display/dc/dce/dce_mem_input.h | 2 -- + 2 files changed, 1 insertion(+), 8 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 673371e..157f4e1 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) { +diff --git a/drivers/gpu/drm/amd/display/dc/dce/dce_mem_input.h b/drivers/gpu/drm/amd/display/dc/dce/dce_mem_input.h +index 9d083cd..05d39c0 100644 +--- a/drivers/gpu/drm/amd/display/dc/dce/dce_mem_input.h ++++ b/drivers/gpu/drm/amd/display/dc/dce/dce_mem_input.h +@@ -162,7 +162,6 @@ struct dce_mem_input_registers { + SFB(blk, GRPH_FLIP_CONTROL, GRPH_SURFACE_UPDATE_H_RETRACE_EN, mask_sh) + + #define MI_DCP_DCE11_MASK_SH_LIST(mask_sh, blk)\ +- SFB(blk, GRPH_FLIP_CONTROL, GRPH_SURFACE_UPDATE_IMMEDIATE_EN, mask_sh),\ + SFB(blk, GRPH_PIPE_OUTSTANDING_REQUEST_LIMIT, GRPH_PIPE_OUTSTANDING_REQUEST_LIMIT, mask_sh) + + #define MI_DCP_PTE_MASK_SH_LIST(mask_sh, blk)\ +@@ -278,7 +277,6 @@ struct dce_mem_input_registers { + type GRPH_PRIMARY_SURFACE_ADDRESS_HIGH; \ + type GRPH_PRIMARY_SURFACE_ADDRESS; \ + type GRPH_SURFACE_UPDATE_PENDING; \ +- type GRPH_SURFACE_UPDATE_IMMEDIATE_EN; \ + type GRPH_SURFACE_UPDATE_H_RETRACE_EN; \ + type GRPH_UPDATE_LOCK; \ + type PIXEL_DURATION; \ +-- +2.7.4 + |