diff options
Diffstat (limited to 'meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/4325-drm-amd-display-Drop-DMCUB-from-DCN21-resources.patch')
-rw-r--r-- | meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/4325-drm-amd-display-Drop-DMCUB-from-DCN21-resources.patch | 80 |
1 files changed, 80 insertions, 0 deletions
diff --git a/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/4325-drm-amd-display-Drop-DMCUB-from-DCN21-resources.patch b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/4325-drm-amd-display-Drop-DMCUB-from-DCN21-resources.patch new file mode 100644 index 00000000..ab751029 --- /dev/null +++ b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/4325-drm-amd-display-Drop-DMCUB-from-DCN21-resources.patch @@ -0,0 +1,80 @@ +From b9e226bd5d43b487569ff550ebdb0d9820b8bf3d Mon Sep 17 00:00:00 2001 +From: Nicholas Kazlauskas <nicholas.kazlauskas@amd.com> +Date: Fri, 25 Oct 2019 12:46:52 -0400 +Subject: [PATCH 4325/4736] drm/amd/display: Drop DMCUB from DCN21 resources + +The interface to the DMCUB won't be through DC itself. DC will instead +call into the DMUB interface introduced with a future change. + +The CONFIG_DRM_AMD_DC_DMUB defines will still be used for now but will +be dropped at the end of the series. + +Since this define was never configurable in the first place this code +wasn't used. + +Signed-off-by: Nicholas Kazlauskas <nicholas.kazlauskas@amd.com> +Reviewed-by: Hersen Wu <hersenxs.wu@amd.com> +Acked-by: Harry Wentland <harry.wentland@amd.com> +--- + .../drm/amd/display/dc/dcn21/dcn21_resource.c | 31 ------------------- + 1 file changed, 31 deletions(-) + +diff --git a/drivers/gpu/drm/amd/display/dc/dcn21/dcn21_resource.c b/drivers/gpu/drm/amd/display/dc/dcn21/dcn21_resource.c +index 987897748174..47367446f64c 100644 +--- a/drivers/gpu/drm/amd/display/dc/dcn21/dcn21_resource.c ++++ b/drivers/gpu/drm/amd/display/dc/dcn21/dcn21_resource.c +@@ -373,20 +373,6 @@ static const struct dce_abm_mask abm_mask = { + ABM_MASK_SH_LIST_DCN20(_MASK) + }; + +-#ifdef CONFIG_DRM_AMD_DC_DMUB +-static const struct dcn21_dmcub_registers dmcub_regs = { +- DMCUB_REG_LIST_DCN() +-}; +- +-static const struct dcn21_dmcub_shift dmcub_shift = { +- DMCUB_COMMON_MASK_SH_LIST_BASE(__SHIFT) +-}; +- +-static const struct dcn21_dmcub_mask dmcub_mask = { +- DMCUB_COMMON_MASK_SH_LIST_BASE(_MASK) +-}; +-#endif +- + #define audio_regs(id)\ + [id] = {\ + AUD_COMMON_REG_LIST(id)\ +@@ -970,11 +956,6 @@ static void destruct(struct dcn21_resource_pool *pool) + if (pool->base.dmcu != NULL) + dce_dmcu_destroy(&pool->base.dmcu); + +-#ifdef CONFIG_DRM_AMD_DC_DMUB +- if (pool->base.dmcub != NULL) +- dcn21_dmcub_destroy(&pool->base.dmcub); +-#endif +- + if (pool->base.dccg != NULL) + dcn_dccg_destroy(&pool->base.dccg); + +@@ -1787,18 +1768,6 @@ static bool construct( + goto create_fail; + } + +-#ifdef CONFIG_DRM_AMD_DC_DMUB +- pool->base.dmcub = dcn21_dmcub_create(ctx, +- &dmcub_regs, +- &dmcub_shift, +- &dmcub_mask); +- if (pool->base.dmcub == NULL) { +- dm_error("DC: failed to create dmcub!\n"); +- BREAK_TO_DEBUGGER(); +- goto create_fail; +- } +-#endif +- + pool->base.pp_smu = dcn21_pp_smu_create(ctx); + + num_pipes = dcn2_1_ip.max_num_dpp; +-- +2.17.1 + |