drm/amdgpu/display: Drop some new CONFIG_DRM_AMD_DC_DCN1_01 guards
Subsystems (3)
PATCH 1/1 drm/amdgpu/display: Drop some new CONFIG_DRM_AMD_DC_DCN1_01 guards
These got added back by subsequent merges accidently.
--- 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(-)
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +0 -2
@@ -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 :
drivers/gpu/drm/amd/display/dc/clk_mgr/clk_mgr.c +0 -4
@@ -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);
Signature · 6 lines
2.20.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
A message that is not in the archive (sent off-list or not yet received): 20190531163707.21363-1-alexander.deucher-5C7GfCeVMHo@public.gmane.org
Christian König
Acked-byAm 31.05.19 um 18:37 schrieb Alex Deucher:
Quoted 3 lines
These got added back by subsequent merges accidently.
Signed-off-by Alex Deucher <[email protected]>
Quoted 32 lines
--- 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(-)drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +0
-2@@ -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 :drivers/gpu/drm/amd/display/dc/clk_mgr/clk_mgr.c +0
-1@@ -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 : -
drivers/gpu/drm/amd/display/dc/clk_mgr/clk_mgr.c struct clk_mgr *dc_clk_mgr_create(struct dc_context *ctx, struct pp_smu_funcs *p · line 114
Quoted 10 lines
drivers/gpu/drm/amd/display/dc/clk_mgr/clk_mgr.c +0
-3-#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
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
Kazlauskas, Nicholas
Reviewed-by Nicholas KazlauskasQuoted 3 lines · Alex Deucher
These got added back by subsequent merges accidently.
Signed-off-by Alex Deucher <[email protected]>
Quoted 33 lines
--- 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(-)drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +0
-2@@ -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 :drivers/gpu/drm/amd/display/dc/clk_mgr/clk_mgr.c +0
-1@@ -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 : -
drivers/gpu/drm/amd/display/dc/clk_mgr/clk_mgr.c struct clk_mgr *dc_clk_mgr_create(struct dc_context *ctx, struct pp_smu_funcs *p · line 114
Quoted 10 lines
drivers/gpu/drm/amd/display/dc/clk_mgr/clk_mgr.c +0
-3-#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
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
Harry Wentland
Reviewed-byQuoted 3 lines · Alex Deucher
These got added back by subsequent merges accidently.
Signed-off-by Alex Deucher <[email protected]>
Harry
Quoted 33 lines
--- 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(-)drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +0
-2@@ -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 :drivers/gpu/drm/amd/display/dc/clk_mgr/clk_mgr.c +0
-1@@ -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 : -
drivers/gpu/drm/amd/display/dc/clk_mgr/clk_mgr.c struct clk_mgr *dc_clk_mgr_create(struct dc_context *ctx, struct pp_smu_funcs *p · line 114
Quoted 10 lines
drivers/gpu/drm/amd/display/dc/clk_mgr/clk_mgr.c +0
-3-#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
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx