* [PATCH] drm/amd/display: Fully switch to dmub for all dcn21 asics
@ 2021-10-15 22:31 Roman.Li
2021-10-18 13:36 ` Alex Deucher
` (2 more replies)
0 siblings, 3 replies; 7+ messages in thread
From: Roman.Li @ 2021-10-15 22:31 UTC (permalink / raw)
To: amd-gfx, Alexander.Deucher, Mario.Limonciello, rodrigo.siqueira
Cc: Roman Li, stable
From: Roman Li <Roman.Li@amd.com>
[Why]
On renoir usb-c port stops functioning on resume after f/w update.
New dmub firmware caused regression due to conflict with dmcu.
With new dmub f/w dmcu is superseded and should be disabled.
[How]
- Disable dmcu for all dcn21.
Check dmesg for dmub f/w version.
The old firmware (before regression):
[drm] DMUB hardware initialized: version=0x00000001
All other versions require that patch for renoir.
Bug: https://gitlab.freedesktop.org/drm/amd/-/issues/1735
Cc: stable@vger.kernel.org
Signed-off-by: Roman Li <Roman.Li@amd.com>
---
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 3 +--
1 file changed, 1 insertion(+), 2 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 ff54550..e56f73e 100644
--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
+++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
@@ -1356,8 +1356,7 @@ static int amdgpu_dm_init(struct amdgpu_device *adev)
switch (adev->ip_versions[DCE_HWIP][0]) {
case IP_VERSION(2, 1, 0):
init_data.flags.gpu_vm_support = true;
- if (ASICREV_IS_GREEN_SARDINE(adev->external_rev_id))
- init_data.flags.disable_dmcu = true;
+ init_data.flags.disable_dmcu = true;
break;
case IP_VERSION(1, 0, 0):
case IP_VERSION(1, 0, 1):
--
2.7.4
^ permalink raw reply related [flat|nested] 7+ messages in thread
* Re: [PATCH] drm/amd/display: Fully switch to dmub for all dcn21 asics
2021-10-15 22:31 [PATCH] drm/amd/display: Fully switch to dmub for all dcn21 asics Roman.Li
@ 2021-10-18 13:36 ` Alex Deucher
2021-10-18 13:38 ` Harry Wentland
2021-10-18 13:41 ` Limonciello, Mario
2 siblings, 0 replies; 7+ messages in thread
From: Alex Deucher @ 2021-10-18 13:36 UTC (permalink / raw)
To: Roman Li
Cc: amd-gfx list, Deucher, Alexander, Limonciello, Mario, Siqueira,
Rodrigo, for 3.8
On Fri, Oct 15, 2021 at 6:33 PM <Roman.Li@amd.com> wrote:
>
> From: Roman Li <Roman.Li@amd.com>
>
> [Why]
> On renoir usb-c port stops functioning on resume after f/w update.
> New dmub firmware caused regression due to conflict with dmcu.
> With new dmub f/w dmcu is superseded and should be disabled.
>
> [How]
> - Disable dmcu for all dcn21.
>
> Check dmesg for dmub f/w version.
> The old firmware (before regression):
> [drm] DMUB hardware initialized: version=0x00000001
> All other versions require that patch for renoir.
>
> Bug: https://gitlab.freedesktop.org/drm/amd/-/issues/1735
> Cc: stable@vger.kernel.org
> Signed-off-by: Roman Li <Roman.Li@amd.com>
Acked-by: Alex Deucher <alexander.deucher@amd.com>
> ---
> drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 3 +--
> 1 file changed, 1 insertion(+), 2 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 ff54550..e56f73e 100644
> --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
> +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
> @@ -1356,8 +1356,7 @@ static int amdgpu_dm_init(struct amdgpu_device *adev)
> switch (adev->ip_versions[DCE_HWIP][0]) {
> case IP_VERSION(2, 1, 0):
> init_data.flags.gpu_vm_support = true;
> - if (ASICREV_IS_GREEN_SARDINE(adev->external_rev_id))
> - init_data.flags.disable_dmcu = true;
> + init_data.flags.disable_dmcu = true;
> break;
> case IP_VERSION(1, 0, 0):
> case IP_VERSION(1, 0, 1):
> --
> 2.7.4
>
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH] drm/amd/display: Fully switch to dmub for all dcn21 asics
2021-10-15 22:31 [PATCH] drm/amd/display: Fully switch to dmub for all dcn21 asics Roman.Li
2021-10-18 13:36 ` Alex Deucher
@ 2021-10-18 13:38 ` Harry Wentland
2021-10-18 13:39 ` Limonciello, Mario
2021-10-18 13:41 ` Limonciello, Mario
2 siblings, 1 reply; 7+ messages in thread
From: Harry Wentland @ 2021-10-18 13:38 UTC (permalink / raw)
To: Roman.Li, amd-gfx, Alexander.Deucher, Mario.Limonciello,
rodrigo.siqueira
Cc: stable
On 2021-10-15 18:31, Roman.Li@amd.com wrote:
> From: Roman Li <Roman.Li@amd.com>
>
> [Why]
> On renoir usb-c port stops functioning on resume after f/w update.
> New dmub firmware caused regression due to conflict with dmcu.
> With new dmub f/w dmcu is superseded and should be disabled.
>
> [How]
> - Disable dmcu for all dcn21.
>
> Check dmesg for dmub f/w version.
> The old firmware (before regression):
> [drm] DMUB hardware initialized: version=0x00000001
> All other versions require that patch for renoir.
>
> Bug: https://gitlab.freedesktop.org/drm/amd/-/issues/1735
> Cc: stable@vger.kernel.org
> Signed-off-by: Roman Li <Roman.Li@amd.com>
Reviewed-by: Harry Wentland <harry.wentland@amd.com>
Harry
> ---
> drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 3 +--
> 1 file changed, 1 insertion(+), 2 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 ff54550..e56f73e 100644
> --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
> +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
> @@ -1356,8 +1356,7 @@ static int amdgpu_dm_init(struct amdgpu_device *adev)
> switch (adev->ip_versions[DCE_HWIP][0]) {
> case IP_VERSION(2, 1, 0):
> init_data.flags.gpu_vm_support = true;
> - if (ASICREV_IS_GREEN_SARDINE(adev->external_rev_id))
> - init_data.flags.disable_dmcu = true;
> + init_data.flags.disable_dmcu = true;
> break;
> case IP_VERSION(1, 0, 0):
> case IP_VERSION(1, 0, 1):
>
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH] drm/amd/display: Fully switch to dmub for all dcn21 asics
2021-10-18 13:38 ` Harry Wentland
@ 2021-10-18 13:39 ` Limonciello, Mario
0 siblings, 0 replies; 7+ messages in thread
From: Limonciello, Mario @ 2021-10-18 13:39 UTC (permalink / raw)
To: Harry Wentland, Roman.Li, amd-gfx, Alexander.Deucher, rodrigo.siqueira
Cc: stable
On 10/18/2021 08:38, Harry Wentland wrote:
> On 2021-10-15 18:31, Roman.Li@amd.com wrote:
>> From: Roman Li <Roman.Li@amd.com>
>>
>> [Why]
>> On renoir usb-c port stops functioning on resume after f/w update.
>> New dmub firmware caused regression due to conflict with dmcu.
>> With new dmub f/w dmcu is superseded and should be disabled.
>>
>> [How]
>> - Disable dmcu for all dcn21.
>>
>> Check dmesg for dmub f/w version.
>> The old firmware (before regression):
>> [drm] DMUB hardware initialized: version=0x00000001
>> All other versions require that patch for renoir.
>>
>> Bug: https://gitlab.freedesktop.org/drm/amd/-/issues/1735
>> Cc: stable@vger.kernel.org
>> Signed-off-by: Roman Li <Roman.Li@amd.com>
>
> Reviewed-by: Harry Wentland <harry.wentland@amd.com>
Tested-by: Mario Limonciello <mario.limonciello@amd.com>
>
> Harry
>
>> ---
>> drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 3 +--
>> 1 file changed, 1 insertion(+), 2 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 ff54550..e56f73e 100644
>> --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
>> +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
>> @@ -1356,8 +1356,7 @@ static int amdgpu_dm_init(struct amdgpu_device *adev)
>> switch (adev->ip_versions[DCE_HWIP][0]) {
>> case IP_VERSION(2, 1, 0):
>> init_data.flags.gpu_vm_support = true;
>> - if (ASICREV_IS_GREEN_SARDINE(adev->external_rev_id))
>> - init_data.flags.disable_dmcu = true;
>> + init_data.flags.disable_dmcu = true;
>> break;
>> case IP_VERSION(1, 0, 0):
>> case IP_VERSION(1, 0, 1):
>>
>
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH] drm/amd/display: Fully switch to dmub for all dcn21 asics
2021-10-15 22:31 [PATCH] drm/amd/display: Fully switch to dmub for all dcn21 asics Roman.Li
2021-10-18 13:36 ` Alex Deucher
2021-10-18 13:38 ` Harry Wentland
@ 2021-10-18 13:41 ` Limonciello, Mario
2021-10-18 13:57 ` Harry Wentland
2 siblings, 1 reply; 7+ messages in thread
From: Limonciello, Mario @ 2021-10-18 13:41 UTC (permalink / raw)
To: Roman.Li, amd-gfx, Alexander.Deucher, rodrigo.siqueira; +Cc: stable
On 10/15/2021 17:31, Roman.Li@amd.com wrote:
> From: Roman Li <Roman.Li@amd.com>
>
> [Why]
> On renoir usb-c port stops functioning on resume after f/w update.
> New dmub firmware caused regression due to conflict with dmcu.
> With new dmub f/w dmcu is superseded and should be disabled.
>
> [How]
> - Disable dmcu for all dcn21.
>
> Check dmesg for dmub f/w version.
> The old firmware (before regression):
> [drm] DMUB hardware initialized: version=0x00000001
> All other versions require that patch for renoir.
>
> Bug: https://gitlab.freedesktop.org/drm/amd/-/issues/1735
> Cc: stable@vger.kernel.org
This won't backport cleanly to stable 5.15 and earlier don't use IP
version to detect the chip.
Also - a question: *should* this go to stable? If a user has the older
FW what happens with this change?
> Signed-off-by: Roman Li <Roman.Li@amd.com>
> ---
> drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 3 +--
> 1 file changed, 1 insertion(+), 2 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 ff54550..e56f73e 100644
> --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
> +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
> @@ -1356,8 +1356,7 @@ static int amdgpu_dm_init(struct amdgpu_device *adev)
> switch (adev->ip_versions[DCE_HWIP][0]) {
> case IP_VERSION(2, 1, 0):
> init_data.flags.gpu_vm_support = true;
> - if (ASICREV_IS_GREEN_SARDINE(adev->external_rev_id))
> - init_data.flags.disable_dmcu = true;
> + init_data.flags.disable_dmcu = true;
> break;
> case IP_VERSION(1, 0, 0):
> case IP_VERSION(1, 0, 1):
>
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH] drm/amd/display: Fully switch to dmub for all dcn21 asics
2021-10-18 13:41 ` Limonciello, Mario
@ 2021-10-18 13:57 ` Harry Wentland
2021-10-18 14:12 ` Li, Roman
0 siblings, 1 reply; 7+ messages in thread
From: Harry Wentland @ 2021-10-18 13:57 UTC (permalink / raw)
To: Limonciello, Mario, Roman.Li, amd-gfx, Alexander.Deucher,
rodrigo.siqueira
Cc: stable
On 2021-10-18 09:41, Limonciello, Mario wrote:
> On 10/15/2021 17:31, Roman.Li@amd.com wrote:
>> From: Roman Li <Roman.Li@amd.com>
>>
>> [Why]
>> On renoir usb-c port stops functioning on resume after f/w update.
>> New dmub firmware caused regression due to conflict with dmcu.
>> With new dmub f/w dmcu is superseded and should be disabled.
>>
>> [How]
>> - Disable dmcu for all dcn21.
>>
>> Check dmesg for dmub f/w version.
>> The old firmware (before regression):
>> [drm] DMUB hardware initialized: version=0x00000001
>> All other versions require that patch for renoir.
>>
>> Bug: https://gitlab.freedesktop.org/drm/amd/-/issues/1735>>> Cc: stable@vger.kernel.org
>
> This won't backport cleanly to stable 5.15 and earlier don't use IP version to detect the chip.
>
> Also - a question: *should* this go to stable? If a user has the older FW what happens with this change?
>
Good point. Might be better of we drop Cc: stable from this patch
Harry
>> Signed-off-by: Roman Li <Roman.Li@amd.com>
>> ---
>> drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 3 +--
>> 1 file changed, 1 insertion(+), 2 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 ff54550..e56f73e 100644
>> --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
>> +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
>> @@ -1356,8 +1356,7 @@ static int amdgpu_dm_init(struct amdgpu_device *adev)
>> switch (adev->ip_versions[DCE_HWIP][0]) {
>> case IP_VERSION(2, 1, 0):
>> init_data.flags.gpu_vm_support = true;
>> - if (ASICREV_IS_GREEN_SARDINE(adev->external_rev_id))
>> - init_data.flags.disable_dmcu = true;
>> + init_data.flags.disable_dmcu = true;
>> break;
>> case IP_VERSION(1, 0, 0):
>> case IP_VERSION(1, 0, 1):
>>
>
^ permalink raw reply [flat|nested] 7+ messages in thread
* RE: [PATCH] drm/amd/display: Fully switch to dmub for all dcn21 asics
2021-10-18 13:57 ` Harry Wentland
@ 2021-10-18 14:12 ` Li, Roman
0 siblings, 0 replies; 7+ messages in thread
From: Li, Roman @ 2021-10-18 14:12 UTC (permalink / raw)
To: Wentland, Harry, Limonciello, Mario, amd-gfx, Deucher, Alexander,
Siqueira, Rodrigo
Cc: stable
[Public]
> -----Original Message-----
> From: Wentland, Harry <Harry.Wentland@amd.com>
> Sent: Monday, October 18, 2021 9:57 AM
> To: Limonciello, Mario <Mario.Limonciello@amd.com>; Li, Roman
> <Roman.Li@amd.com>; amd-gfx@lists.freedesktop.org; Deucher, Alexander
> <Alexander.Deucher@amd.com>; Siqueira, Rodrigo
> <Rodrigo.Siqueira@amd.com>
> Cc: stable@vger.kernel.org
> Subject: Re: [PATCH] drm/amd/display: Fully switch to dmub for all dcn21 asics
>
>
>
> On 2021-10-18 09:41, Limonciello, Mario wrote:
> > On 10/15/2021 17:31, Roman.Li@amd.com wrote:
> >> From: Roman Li <Roman.Li@amd.com>
> >>
> >> [Why]
> >> On renoir usb-c port stops functioning on resume after f/w update.
> >> New dmub firmware caused regression due to conflict with dmcu.
> >> With new dmub f/w dmcu is superseded and should be disabled.
> >>
> >> [How]
> >> - Disable dmcu for all dcn21.
> >>
> >> Check dmesg for dmub f/w version.
> >> The old firmware (before regression):
> >> [drm] DMUB hardware initialized: version=0x00000001 All other
> >> versions require that patch for renoir.
> >>
> >> Bug: https://gitlab.freedesktop.org/drm/amd/-/issues/1735>>> Cc:
> >> stable@vger.kernel.org
> >
> > This won't backport cleanly to stable 5.15 and earlier don't use IP version to
> detect the chip.
> >
> > Also - a question: *should* this go to stable? If a user has the older FW what
> happens with this change?
> >
>
> Good point. Might be better of we drop Cc: stable from this patch
>
> Harry
I will drop Cc: stable@vger.kernel.org, thank you Mario and Harry.
- Roman
> >> Signed-off-by: Roman Li <Roman.Li@amd.com>
> >> ---
> >> drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 3 +--
> >> 1 file changed, 1 insertion(+), 2 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 ff54550..e56f73e 100644
> >> --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
> >> +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
> >> @@ -1356,8 +1356,7 @@ static int amdgpu_dm_init(struct amdgpu_device
> >> *adev)
> >> switch (adev->ip_versions[DCE_HWIP][0]) {
> >> case IP_VERSION(2, 1, 0):
> >> init_data.flags.gpu_vm_support = true;
> >> - if (ASICREV_IS_GREEN_SARDINE(adev->external_rev_id))
> >> - init_data.flags.disable_dmcu = true;
> >> + init_data.flags.disable_dmcu = true;
> >> break;
> >> case IP_VERSION(1, 0, 0):
> >> case IP_VERSION(1, 0, 1):
> >>
> >
^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2021-10-18 14:12 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-10-15 22:31 [PATCH] drm/amd/display: Fully switch to dmub for all dcn21 asics Roman.Li
2021-10-18 13:36 ` Alex Deucher
2021-10-18 13:38 ` Harry Wentland
2021-10-18 13:39 ` Limonciello, Mario
2021-10-18 13:41 ` Limonciello, Mario
2021-10-18 13:57 ` Harry Wentland
2021-10-18 14:12 ` Li, Roman
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).