* [PATCH] drm/amdgpu/display: Drop some new CONFIG_DRM_AMD_DC_DCN1_01 guards
@ 2019-05-31 16:37 Alex Deucher
[not found] ` <20190531163707.21363-1-alexander.deucher-5C7GfCeVMHo@public.gmane.org>
0 siblings, 1 reply; 4+ messages in thread
From: Alex Deucher @ 2019-05-31 16:37 UTC (permalink / raw)
To: amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW; +Cc: Alex Deucher
These got added back by subsequent merges accidently.
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
---
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);
--
2.20.1
_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
^ permalink raw reply related [flat|nested] 4+ messages in thread[parent not found: <20190531163707.21363-1-alexander.deucher-5C7GfCeVMHo@public.gmane.org>]
* Re: [PATCH] drm/amdgpu/display: Drop some new CONFIG_DRM_AMD_DC_DCN1_01 guards [not found] ` <20190531163707.21363-1-alexander.deucher-5C7GfCeVMHo@public.gmane.org> @ 2019-05-31 16:42 ` Christian König 2019-05-31 16:54 ` Kazlauskas, Nicholas 2019-05-31 18:05 ` Harry Wentland 2 siblings, 0 replies; 4+ messages in thread From: Christian König @ 2019-05-31 16:42 UTC (permalink / raw) To: Alex Deucher, amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW; +Cc: Alex Deucher Am 31.05.19 um 18:37 schrieb Alex Deucher: > These got added back by subsequent merges accidently. > > Signed-off-by: Alex Deucher <alexander.deucher@amd.com> Acked-by: Christian König <christian.koenig@amd.com> > --- > 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@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/amd-gfx ^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] drm/amdgpu/display: Drop some new CONFIG_DRM_AMD_DC_DCN1_01 guards [not found] ` <20190531163707.21363-1-alexander.deucher-5C7GfCeVMHo@public.gmane.org> 2019-05-31 16:42 ` Christian König @ 2019-05-31 16:54 ` Kazlauskas, Nicholas 2019-05-31 18:05 ` Harry Wentland 2 siblings, 0 replies; 4+ messages in thread From: Kazlauskas, Nicholas @ 2019-05-31 16:54 UTC (permalink / raw) To: Alex Deucher, amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org Cc: Deucher, Alexander 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@amd.com> Reviewed-by: Nicholas Kazlauskas <nicholas.kazlauskas@amd.com> > --- > 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@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/amd-gfx ^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] drm/amdgpu/display: Drop some new CONFIG_DRM_AMD_DC_DCN1_01 guards [not found] ` <20190531163707.21363-1-alexander.deucher-5C7GfCeVMHo@public.gmane.org> 2019-05-31 16:42 ` Christian König 2019-05-31 16:54 ` Kazlauskas, Nicholas @ 2019-05-31 18:05 ` Harry Wentland 2 siblings, 0 replies; 4+ messages in thread From: Harry Wentland @ 2019-05-31 18:05 UTC (permalink / raw) To: Alex Deucher, amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org Cc: Deucher, Alexander On 2019-05-31 12:37 p.m., Alex Deucher wrote: > These got added back by subsequent merges accidently. > > Signed-off-by: Alex Deucher <alexander.deucher@amd.com> Reviewed-by: Harry Wentland <harry.wentland@amd.com> Harry > --- > 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@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/amd-gfx ^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2019-05-31 18:05 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-05-31 16:37 [PATCH] drm/amdgpu/display: Drop some new CONFIG_DRM_AMD_DC_DCN1_01 guards Alex Deucher
[not found] ` <20190531163707.21363-1-alexander.deucher-5C7GfCeVMHo@public.gmane.org>
2019-05-31 16:42 ` Christian König
2019-05-31 16:54 ` Kazlauskas, Nicholas
2019-05-31 18:05 ` Harry Wentland
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).