From: Harry Wentland <hwentlan-5C7GfCeVMHo@public.gmane.org>
To: Alex Deucher
<alexdeucher-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>,
"amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org"
<amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org>
Cc: "Deucher, Alexander" <Alexander.Deucher-5C7GfCeVMHo@public.gmane.org>
Subject: Re: [PATCH] drm/amdgpu/display: Drop some new CONFIG_DRM_AMD_DC_DCN1_01 guards
Date: Fri, 31 May 2019 18:05:51 +0000 [thread overview]
Message-ID: <7cd3d1c3-b2a1-17f1-631f-b44e871f2cb0@amd.com> (raw)
In-Reply-To: <20190531163707.21363-1-alexander.deucher-5C7GfCeVMHo@public.gmane.org>
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
prev parent reply other threads:[~2019-05-31 18:05 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
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 message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=7cd3d1c3-b2a1-17f1-631f-b44e871f2cb0@amd.com \
--to=hwentlan-5c7gfcevmho@public.gmane.org \
--cc=Alexander.Deucher-5C7GfCeVMHo@public.gmane.org \
--cc=alexdeucher-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org \
--cc=amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox