On 5/31/19 12:37 PM, Alex Deucher wrote:
> These got added back by subsequent merges accidently.
>
> Signed-off-by: Alex Deucher <alexander.deucher@xxxxxxx>
Reviewed-by: Nicholas Kazlauskas <nicholas.kazlauskas@xxxxxxx>
> ---
> drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 2 --
> drivers/gpu/drm/amd/display/dc/clk_mgr/clk_mgr.c | 4 ----
> 2 files changed, 6 deletions(-)
>
> diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
> index 33e39888211c..b5a5cfae7ba1 100644
> --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
> +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
> @@ -665,13 +665,11 @@ static int load_dmcu_fw(struct amdgpu_device *adev)
> case CHIP_VEGA20:
> return 0;
> case CHIP_RAVEN:
> -#if defined(CONFIG_DRM_AMD_DC_DCN1_01)
> if (ASICREV_IS_PICASSO(adev->external_rev_id))
> fw_name_dmcu = FIRMWARE_RAVEN_DMCU;
> else if (ASICREV_IS_RAVEN2(adev->external_rev_id))
> fw_name_dmcu = FIRMWARE_RAVEN_DMCU;
> else
> -#endif
> return 0;
> break;
> default:
> diff --git a/drivers/gpu/drm/amd/display/dc/clk_mgr/clk_mgr.c b/drivers/gpu/drm/amd/display/dc/clk_mgr/clk_mgr.c
> index 08b27c775cd4..eb2204d42337 100644
> --- a/drivers/gpu/drm/amd/display/dc/clk_mgr/clk_mgr.c
> +++ b/drivers/gpu/drm/amd/display/dc/clk_mgr/clk_mgr.c
> @@ -105,14 +105,10 @@ struct clk_mgr *dc_clk_mgr_create(struct dc_context *ctx, struct pp_smu_funcs *p
>
> #if defined(CONFIG_DRM_AMD_DC_DCN1_0)
> case FAMILY_RV:
> -
> -#if defined(CONFIG_DRM_AMD_DC_DCN1_01)
> if (ASICREV_IS_RAVEN2(asic_id.hw_internal_rev)) {
> rv2_clk_mgr_construct(ctx, clk_mgr, pp_smu);
> break;
> }
> -#endif /* DCN1_01 */
> -
> if (ASICREV_IS_RAVEN(asic_id.hw_internal_rev) ||
> ASICREV_IS_PICASSO(asic_id.hw_internal_rev)) {
> rv1_clk_mgr_construct(ctx, clk_mgr, pp_smu);
>
_______________________________________________
amd-gfx mailing list
amd-gfx@xxxxxxxxxxxxxxxxxxxxx
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
