diff options
| author | Dmytro Laktyushkin <Dmytro.Laktyushkin@amd.com> | 2017-04-24 23:30:58 +0300 |
|---|---|---|
| committer | Alex Deucher <alexander.deucher@amd.com> | 2017-09-27 01:06:39 +0300 |
| commit | e6303950ea7221e49cabb240383fa4e2bd035b0c (patch) | |
| tree | 5f94643b11bba38f02d6eae56038cdd9bf4c226e /drivers/gpu/drm/amd/display/dc/dce120 | |
| parent | 86b6a203b966ea54e3225b49e53769cf4c116905 (diff) | |
| download | linux-e6303950ea7221e49cabb240383fa4e2bd035b0c.tar.xz | |
drm/amd/display: dce80, 100, 110 and 112 to dce ipp refactor
Signed-off-by: Dmytro Laktyushkin <Dmytro.Laktyushkin@amd.com>
Acked-by: Harry Wentland <Harry.Wentland@amd.com>
Reviewed-by: Tony Cheng <Tony.Cheng@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Diffstat (limited to 'drivers/gpu/drm/amd/display/dc/dce120')
| -rw-r--r-- | drivers/gpu/drm/amd/display/dc/dce120/dce120_resource.c | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/drivers/gpu/drm/amd/display/dc/dce120/dce120_resource.c b/drivers/gpu/drm/amd/display/dc/dce120/dce120_resource.c index 207d07b29e81..b6bdd1d52922 100644 --- a/drivers/gpu/drm/amd/display/dc/dce120/dce120_resource.c +++ b/drivers/gpu/drm/amd/display/dc/dce120/dce120_resource.c @@ -176,7 +176,7 @@ static const struct dce_abm_mask abm_mask = { #define ipp_regs(id)\ [id] = {\ - IPP_COMMON_REG_LIST_DCE_BASE(id)\ + IPP_DCE110_REG_LIST_DCE_BASE(id)\ } static const struct dce_ipp_registers ipp_regs[] = { @@ -189,11 +189,11 @@ static const struct dce_ipp_registers ipp_regs[] = { }; static const struct dce_ipp_shift ipp_shift = { - IPP_COMMON_MASK_SH_LIST_SOC_BASE(__SHIFT) + IPP_DCE120_MASK_SH_LIST_SOC_BASE(__SHIFT) }; static const struct dce_ipp_mask ipp_mask = { - IPP_COMMON_MASK_SH_LIST_SOC_BASE(_MASK) + IPP_DCE120_MASK_SH_LIST_SOC_BASE(_MASK) }; #define transform_regs(id)\ @@ -497,12 +497,6 @@ static struct timing_generator *dce120_timing_generator_create( return NULL; } -static void dce120_ipp_destroy(struct input_pixel_processor **ipp) -{ - dm_free(TO_DCE_IPP(*ipp)); - *ipp = NULL; -} - static void dce120_transform_destroy(struct transform **xfm) { dm_free(TO_DCE_TRANSFORM(*xfm)); @@ -521,7 +515,7 @@ static void destruct(struct dce110_resource_pool *pool) dce120_transform_destroy(&pool->base.transforms[i]); if (pool->base.ipps[i] != NULL) - dce120_ipp_destroy(&pool->base.ipps[i]); + dce_ipp_destroy(&pool->base.ipps[i]); if (pool->base.mis[i] != NULL) { dm_free(TO_DCE110_MEM_INPUT(pool->base.mis[i])); |