diff options
Diffstat (limited to 'common/recipes-kernel/linux/linux-yocto-4.14.71/0507-drm-amd-display-Use-surface-update-inuse-for-pending.patch')
-rw-r--r-- | common/recipes-kernel/linux/linux-yocto-4.14.71/0507-drm-amd-display-Use-surface-update-inuse-for-pending.patch | 110 |
1 files changed, 0 insertions, 110 deletions
diff --git a/common/recipes-kernel/linux/linux-yocto-4.14.71/0507-drm-amd-display-Use-surface-update-inuse-for-pending.patch b/common/recipes-kernel/linux/linux-yocto-4.14.71/0507-drm-amd-display-Use-surface-update-inuse-for-pending.patch deleted file mode 100644 index 1ee827de..00000000 --- a/common/recipes-kernel/linux/linux-yocto-4.14.71/0507-drm-amd-display-Use-surface-update-inuse-for-pending.patch +++ /dev/null @@ -1,110 +0,0 @@ -From 78daaa1fc65ede3435f65d83177de1052cd1b4db Mon Sep 17 00:00:00 2001 -From: Yongqiang Sun <yongqiang.sun@amd.com> -Date: Tue, 6 Jun 2017 16:41:00 -0400 -Subject: [PATCH 0507/4131] drm/amd/display: Use surface update inuse for - pending check. - -Signed-off-by: Yongqiang Sun <yongqiang.sun@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> ---- - .../gpu/drm/amd/display/dc/dcn10/dcn10_mem_input.c | 10 +++++++ - .../gpu/drm/amd/display/dc/dcn10/dcn10_mem_input.h | 32 ++++++++++++++++++++++ - 2 files changed, 42 insertions(+) - -diff --git a/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_mem_input.c b/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_mem_input.c -index 3e3fcf2..8ad7062 100644 ---- a/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_mem_input.c -+++ b/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_mem_input.c -@@ -821,13 +821,23 @@ bool mem_input_is_flip_pending(struct mem_input *mem_input) - { - uint32_t update_pending = 0; - struct dcn10_mem_input *mi = TO_DCN10_MEM_INPUT(mem_input); -+ struct dc_plane_address earliest_inuse_address; - - REG_GET(DCSURF_FLIP_CONTROL, - SURFACE_UPDATE_PENDING, &update_pending); - -+ REG_GET(DCSURF_SURFACE_EARLIEST_INUSE, -+ SURFACE_EARLIEST_INUSE_ADDRESS, &earliest_inuse_address.grph.addr.low_part); -+ -+ REG_GET(DCSURF_SURFACE_EARLIEST_INUSE_HIGH, -+ SURFACE_EARLIEST_INUSE_ADDRESS_HIGH, &earliest_inuse_address.grph.addr.high_part); -+ - if (update_pending) - return true; - -+ if (earliest_inuse_address.grph.addr.quad_part != mem_input->request_address.grph.addr.quad_part) -+ return true; -+ - mem_input->current_address = mem_input->request_address; - return false; - } -diff --git a/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_mem_input.h b/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_mem_input.h -index 37683d0..9e2f1bb 100644 ---- a/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_mem_input.h -+++ b/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_mem_input.h -@@ -52,6 +52,14 @@ - SRI(DCSURF_PRIMARY_SURFACE_ADDRESS_C, HUBPREQ, id),\ - SRI(DCSURF_PRIMARY_META_SURFACE_ADDRESS_HIGH_C, HUBPREQ, id),\ - SRI(DCSURF_PRIMARY_META_SURFACE_ADDRESS_C, HUBPREQ, id),\ -+ SRI(DCSURF_SURFACE_INUSE, HUBPREQ, id),\ -+ SRI(DCSURF_SURFACE_INUSE_HIGH, HUBPREQ, id),\ -+ SRI(DCSURF_SURFACE_INUSE_C, HUBPREQ, id),\ -+ SRI(DCSURF_SURFACE_INUSE_HIGH_C, HUBPREQ, id),\ -+ SRI(DCSURF_SURFACE_EARLIEST_INUSE, HUBPREQ, id),\ -+ SRI(DCSURF_SURFACE_EARLIEST_INUSE_HIGH, HUBPREQ, id),\ -+ SRI(DCSURF_SURFACE_EARLIEST_INUSE_C, HUBPREQ, id),\ -+ SRI(DCSURF_SURFACE_EARLIEST_INUSE_HIGH_C, HUBPREQ, id),\ - SRI(DCSURF_SURFACE_CONTROL, HUBPREQ, id),\ - SRI(HUBPRET_CONTROL, HUBPRET, id),\ - SRI(DCN_EXPANSION_MODE, HUBPREQ, id),\ -@@ -165,6 +173,14 @@ struct dcn_mi_registers { - uint32_t DCSURF_PRIMARY_SURFACE_ADDRESS_C; - uint32_t DCSURF_PRIMARY_META_SURFACE_ADDRESS_HIGH_C; - uint32_t DCSURF_PRIMARY_META_SURFACE_ADDRESS_C; -+ uint32_t DCSURF_SURFACE_INUSE; -+ uint32_t DCSURF_SURFACE_INUSE_HIGH; -+ uint32_t DCSURF_SURFACE_INUSE_C; -+ uint32_t DCSURF_SURFACE_INUSE_HIGH_C; -+ uint32_t DCSURF_SURFACE_EARLIEST_INUSE; -+ uint32_t DCSURF_SURFACE_EARLIEST_INUSE_HIGH; -+ uint32_t DCSURF_SURFACE_EARLIEST_INUSE_C; -+ uint32_t DCSURF_SURFACE_EARLIEST_INUSE_HIGH_C; - uint32_t DCSURF_SURFACE_CONTROL; - uint32_t HUBPRET_CONTROL; - uint32_t DCN_EXPANSION_MODE; -@@ -297,6 +313,14 @@ struct dcn_mi_registers { - MI_SF(HUBPREQ0_DCSURF_PRIMARY_SURFACE_ADDRESS_C, PRIMARY_SURFACE_ADDRESS_C, mask_sh),\ - MI_SF(HUBPREQ0_DCSURF_PRIMARY_META_SURFACE_ADDRESS_HIGH_C, PRIMARY_META_SURFACE_ADDRESS_HIGH_C, mask_sh),\ - MI_SF(HUBPREQ0_DCSURF_PRIMARY_META_SURFACE_ADDRESS_C, PRIMARY_META_SURFACE_ADDRESS_C, mask_sh),\ -+ MI_SF(HUBPREQ0_DCSURF_SURFACE_INUSE, SURFACE_INUSE_ADDRESS, mask_sh),\ -+ MI_SF(HUBPREQ0_DCSURF_SURFACE_INUSE_HIGH, SURFACE_INUSE_ADDRESS_HIGH, mask_sh),\ -+ MI_SF(HUBPREQ0_DCSURF_SURFACE_INUSE_C, SURFACE_INUSE_ADDRESS_C, mask_sh),\ -+ MI_SF(HUBPREQ0_DCSURF_SURFACE_INUSE_HIGH_C, SURFACE_INUSE_ADDRESS_HIGH_C, mask_sh),\ -+ MI_SF(HUBPREQ0_DCSURF_SURFACE_EARLIEST_INUSE, SURFACE_EARLIEST_INUSE_ADDRESS, mask_sh),\ -+ MI_SF(HUBPREQ0_DCSURF_SURFACE_EARLIEST_INUSE_HIGH, SURFACE_EARLIEST_INUSE_ADDRESS_HIGH, mask_sh),\ -+ MI_SF(HUBPREQ0_DCSURF_SURFACE_EARLIEST_INUSE_C, SURFACE_EARLIEST_INUSE_ADDRESS_C, mask_sh),\ -+ MI_SF(HUBPREQ0_DCSURF_SURFACE_EARLIEST_INUSE_HIGH_C, SURFACE_EARLIEST_INUSE_ADDRESS_HIGH_C, mask_sh),\ - MI_SF(HUBPREQ0_DCSURF_SURFACE_CONTROL, PRIMARY_SURFACE_DCC_EN, mask_sh),\ - MI_SF(HUBPREQ0_DCSURF_SURFACE_CONTROL, PRIMARY_SURFACE_DCC_IND_64B_BLK, mask_sh),\ - MI_SF(HUBPRET0_HUBPRET_CONTROL, DET_BUF_PLANE1_BASE_ADDRESS, mask_sh),\ -@@ -433,6 +457,14 @@ struct dcn_mi_registers { - type PRIMARY_SURFACE_ADDRESS_C;\ - type PRIMARY_META_SURFACE_ADDRESS_HIGH_C;\ - type PRIMARY_META_SURFACE_ADDRESS_C;\ -+ type SURFACE_INUSE_ADDRESS;\ -+ type SURFACE_INUSE_ADDRESS_HIGH;\ -+ type SURFACE_INUSE_ADDRESS_C;\ -+ type SURFACE_INUSE_ADDRESS_HIGH_C;\ -+ type SURFACE_EARLIEST_INUSE_ADDRESS;\ -+ type SURFACE_EARLIEST_INUSE_ADDRESS_HIGH;\ -+ type SURFACE_EARLIEST_INUSE_ADDRESS_C;\ -+ type SURFACE_EARLIEST_INUSE_ADDRESS_HIGH_C;\ - type PRIMARY_SURFACE_DCC_EN;\ - type PRIMARY_SURFACE_DCC_IND_64B_BLK;\ - type DET_BUF_PLANE1_BASE_ADDRESS;\ --- -2.7.4 - |