From: "Kazlauskas, Nicholas" <nicholas.kazlauskas@amd.com>
To: Alex Deucher <alexdeucher@gmail.com>,
amd-gfx list <amd-gfx@lists.freedesktop.org>
Cc: Alex Deucher <alexander.deucher@amd.com>
Subject: Re: [PATCH] drm/amdgpu/display: fix warnings when CONFIG_DRM_AMD_DC_DCN is not set
Date: Mon, 2 Nov 2020 14:13:43 -0500 [thread overview]
Message-ID: <ea1a77f2-66b9-3201-f460-1c5487dcf62d@amd.com> (raw)
In-Reply-To: <CADnq5_MktP-NEq0s7c_gqV8wFYqxR21eQ1mVvGzEFF3b_K7vJw@mail.gmail.com>
On 2020-11-02 1:49 p.m., Alex Deucher wrote:
> Ping?
>
> Alex
>
> On Tue, Oct 27, 2020 at 11:04 AM Alex Deucher <alexdeucher@gmail.com> wrote:
>>
>> Properly protect the relevant code with CONFIG_DRM_AMD_DC_DCN.
>>
>> Fixes: 0b08c54bb7a3 ("drm/amd/display: Fix the display corruption issue on Navi10")
>> Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Reviewed-by: Nicholas Kazlauskas <nicholas.kazlauskas@amd.com>
Regards,
Nicholas Kazlauskas
>> ---
>> drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 5 ++++-
>> 1 file changed, 4 insertions(+), 1 deletion(-)
>>
>> 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 fdb1fa72061a..843080e4c39e 100644
>> --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
>> +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
>> @@ -893,6 +893,7 @@ static int dm_dmub_hw_init(struct amdgpu_device *adev)
>> return 0;
>> }
>>
>> +#if defined(CONFIG_DRM_AMD_DC_DCN)
>> static void mmhub_read_system_context(struct amdgpu_device *adev, struct dc_phy_addr_space_config *pa_config)
>> {
>> uint64_t pt_base;
>> @@ -945,6 +946,7 @@ static void mmhub_read_system_context(struct amdgpu_device *adev, struct dc_phy_
>> pa_config->is_hvm_enabled = 0;
>>
>> }
>> +#endif
>>
>> static int amdgpu_dm_init(struct amdgpu_device *adev)
>> {
>> @@ -952,7 +954,6 @@ static int amdgpu_dm_init(struct amdgpu_device *adev)
>> #ifdef CONFIG_DRM_AMD_DC_HDCP
>> struct dc_callback_init init_params;
>> #endif
>> - struct dc_phy_addr_space_config pa_config;
>> int r;
>>
>> adev->dm.ddev = adev_to_drm(adev);
>> @@ -1060,6 +1061,8 @@ static int amdgpu_dm_init(struct amdgpu_device *adev)
>>
>> #if defined(CONFIG_DRM_AMD_DC_DCN)
>> if (adev->asic_type == CHIP_RENOIR) {
>> + struct dc_phy_addr_space_config pa_config;
>> +
>> mmhub_read_system_context(adev, &pa_config);
>>
>> // Call the DC init_memory func
>> --
>> 2.25.4
>>
> _______________________________________________
> amd-gfx mailing list
> amd-gfx@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/amd-gfx
>
_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
prev parent reply other threads:[~2020-11-02 19:13 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-10-27 15:03 [PATCH] drm/amdgpu/display: fix warnings when CONFIG_DRM_AMD_DC_DCN is not set Alex Deucher
2020-11-02 18:49 ` Alex Deucher
2020-11-02 19:13 ` Kazlauskas, Nicholas [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=ea1a77f2-66b9-3201-f460-1c5487dcf62d@amd.com \
--to=nicholas.kazlauskas@amd.com \
--cc=alexander.deucher@amd.com \
--cc=alexdeucher@gmail.com \
--cc=amd-gfx@lists.freedesktop.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;
as well as URLs for NNTP newsgroup(s).