diff options
Diffstat (limited to 'common/recipes-kernel/linux/files/0783-drm-amd-dal-Add-set_blender_mode-handling-for-underl.patch')
-rw-r--r-- | common/recipes-kernel/linux/files/0783-drm-amd-dal-Add-set_blender_mode-handling-for-underl.patch | 79 |
1 files changed, 0 insertions, 79 deletions
diff --git a/common/recipes-kernel/linux/files/0783-drm-amd-dal-Add-set_blender_mode-handling-for-underl.patch b/common/recipes-kernel/linux/files/0783-drm-amd-dal-Add-set_blender_mode-handling-for-underl.patch deleted file mode 100644 index 0bf731a4..00000000 --- a/common/recipes-kernel/linux/files/0783-drm-amd-dal-Add-set_blender_mode-handling-for-underl.patch +++ /dev/null @@ -1,79 +0,0 @@ -From 3a72181cdcda5e7219cf6d0a4ef5f588f3848ed5 Mon Sep 17 00:00:00 2001 -From: Eric Yang <eric.yang2@amd.com> -Date: Mon, 8 Feb 2016 14:36:05 -0500 -Subject: [PATCH 0783/1110] drm/amd/dal: Add set_blender_mode handling for - underlay pipe - -Signed-off-by: Eric Yang <eric.yang2@amd.com> -Acked-by: Jordan Lazare <Jordan.Lazare@amd.com> ---- - .../drm/amd/dal/dc/dce110/dce110_hw_sequencer.c | 44 ++++++++++++++++------ - 1 file changed, 32 insertions(+), 12 deletions(-) - -diff --git a/drivers/gpu/drm/amd/dal/dc/dce110/dce110_hw_sequencer.c b/drivers/gpu/drm/amd/dal/dc/dce110/dce110_hw_sequencer.c -index bacf88d..754e81d 100644 ---- a/drivers/gpu/drm/amd/dal/dc/dce110/dce110_hw_sequencer.c -+++ b/drivers/gpu/drm/amd/dal/dc/dce110/dce110_hw_sequencer.c -@@ -351,7 +351,7 @@ static void dce110_set_blender_mode( - uint32_t mode) - { - uint32_t value; -- uint32_t addr = HW_REG_BLND(mmBLND_CONTROL, controller_id); -+ uint32_t addr = 0; - uint32_t blnd_mode; - uint32_t feedthrough = 0; - -@@ -371,19 +371,39 @@ static void dce110_set_blender_mode( - break; - } - -- value = dm_read_reg(ctx, addr); -+ if (controller_id == CONTROLLER_ID_UNDERLAY0) { -+ addr = mmBLNDV_CONTROL; -+ value = dm_read_reg(ctx, addr); - -- set_reg_field_value( -- value, -- feedthrough, -- BLND_CONTROL, -- BLND_FEEDTHROUGH_EN); -+ set_reg_field_value( -+ value, -+ feedthrough, -+ BLNDV_CONTROL, -+ BLND_FEEDTHROUGH_EN); - -- set_reg_field_value( -- value, -- blnd_mode, -- BLND_CONTROL, -- BLND_MODE); -+ set_reg_field_value( -+ value, -+ blnd_mode, -+ BLNDV_CONTROL, -+ BLND_MODE); -+ -+ -+ } else { -+ addr = HW_REG_BLND(mmBLND_CONTROL, controller_id); -+ value = dm_read_reg(ctx, addr); -+ -+ set_reg_field_value( -+ value, -+ feedthrough, -+ BLND_CONTROL, -+ BLND_FEEDTHROUGH_EN); -+ -+ set_reg_field_value( -+ value, -+ blnd_mode, -+ BLND_CONTROL, -+ BLND_MODE); -+ } - - dm_write_reg(ctx, addr, value); - } --- -2.7.4 - |