diff options
Diffstat (limited to 'meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/3503-drm-amd-display-Remove-couple-of-unused-OPTC-registe.patch')
| -rw-r--r-- | meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/3503-drm-amd-display-Remove-couple-of-unused-OPTC-registe.patch | 65 |
1 files changed, 65 insertions, 0 deletions
diff --git a/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/3503-drm-amd-display-Remove-couple-of-unused-OPTC-registe.patch b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/3503-drm-amd-display-Remove-couple-of-unused-OPTC-registe.patch new file mode 100644 index 00000000..17d0a1f6 --- /dev/null +++ b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/3503-drm-amd-display-Remove-couple-of-unused-OPTC-registe.patch @@ -0,0 +1,65 @@ +From 980a33b2ad14ab0dc81b9e86e394a3411a5db52c Mon Sep 17 00:00:00 2001 +From: Nikola Cornij <nikola.cornij@amd.com> +Date: Thu, 11 Jan 2018 12:51:14 -0500 +Subject: [PATCH 3503/4131] drm/amd/display: Remove couple of unused OPTC + registers + +Signed-off-by: Nikola Cornij <nikola.cornij@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/dcn10/dcn10_optc.h | 8 ++++---- + drivers/gpu/drm/amd/display/dc/inc/hw/timing_generator.h | 1 + + 2 files changed, 5 insertions(+), 4 deletions(-) + +diff --git a/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_optc.h b/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_optc.h +index a3c7c20..0145432 100644 +--- a/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_optc.h ++++ b/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_optc.h +@@ -131,7 +131,6 @@ struct dcn_optc_registers { + uint32_t OTG_GSL_WINDOW_X; + uint32_t OTG_GSL_WINDOW_Y; + uint32_t OTG_VUPDATE_KEEPOUT; +- uint32_t OTG_DSC_START_POSITION; + }; + + #define TG_COMMON_MASK_SH_LIST_DCN(mask_sh)\ +@@ -241,7 +240,7 @@ struct dcn_optc_registers { + SF(OTG0_OTG_TEST_PATTERN_COLOR, OTG_TEST_PATTERN_DATA, mask_sh),\ + SF(ODM0_OPTC_DATA_SOURCE_SELECT, OPTC_SRC_SEL, mask_sh) + +-#define TG_REG_FIELD_LIST(type) \ ++#define TG_REG_FIELD_LIST_DCN1_0(type) \ + type VSTARTUP_START;\ + type VUPDATE_OFFSET;\ + type VUPDATE_WIDTH;\ +@@ -352,10 +351,11 @@ struct dcn_optc_registers { + type OTG_MASTER_UPDATE_LOCK_GSL_EN;\ + type MASTER_UPDATE_LOCK_VUPDATE_KEEPOUT_START_OFFSET;\ + type MASTER_UPDATE_LOCK_VUPDATE_KEEPOUT_END_OFFSET;\ +- type OTG_DSC_START_POSITION_X;\ +- type OTG_DSC_START_POSITION_LINE_NUM;\ + type OTG_MASTER_UPDATE_LOCK_VUPDATE_KEEPOUT_EN; + ++#define TG_REG_FIELD_LIST(type) \ ++ TG_REG_FIELD_LIST_DCN1_0(type) ++ + + struct dcn_optc_shift { + TG_REG_FIELD_LIST(uint8_t) +diff --git a/drivers/gpu/drm/amd/display/dc/inc/hw/timing_generator.h b/drivers/gpu/drm/amd/display/dc/inc/hw/timing_generator.h +index 3ca3462..3217b5b 100644 +--- a/drivers/gpu/drm/amd/display/dc/inc/hw/timing_generator.h ++++ b/drivers/gpu/drm/amd/display/dc/inc/hw/timing_generator.h +@@ -217,6 +217,7 @@ struct timing_generator_funcs { + */ + bool (*get_crc)(struct timing_generator *tg, + uint32_t *r_cr, uint32_t *g_y, uint32_t *b_cb); ++ + }; + + #endif +-- +2.7.4 + |