commit 91adec9e0709 ("drm/amd/display: Look at firmware version to determine using dmub on dcn21")
Newer DMUB firmware on Renoir and Green Sardine do not need to disable dmcu and this actually causes problems with DP-C alt mode for a number of machines.
Backport the fix from this from hand modified backport because mainline switched to IP version checking which doesn't exist in linux-stable.
BugLink: https://gitlab.freedesktop.org/drm/amd/-/issues/1772 BugLink: https://gitlab.freedesktop.org/drm/amd/-/issues/1735 Signed-off-by: Mario Limonciello mario.limonciello@amd.com Reviewed-by: Alex Deucher alexander.deucher@amd.com --- Changes from v1->v2: * Update commit message syntax for hand modified commit drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 9 ++++++++- 1 file changed, 8 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 1ea31dcc7a8b..084491afe540 100644 --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c @@ -1141,8 +1141,15 @@ static int amdgpu_dm_init(struct amdgpu_device *adev) case CHIP_RAVEN: case CHIP_RENOIR: init_data.flags.gpu_vm_support = true; - if (ASICREV_IS_GREEN_SARDINE(adev->external_rev_id)) + switch (adev->dm.dmcub_fw_version) { + case 0: /* development */ + case 0x1: /* linux-firmware.git hash 6d9f399 */ + case 0x01000000: /* linux-firmware.git hash 9a0b0f4 */ + init_data.flags.disable_dmcu = false; + break; + default: init_data.flags.disable_dmcu = true; + } break; case CHIP_VANGOGH: case CHIP_YELLOW_CARP:
On Mon, Nov 15, 2021 at 09:36:55AM -0600, Mario Limonciello wrote:
commit 91adec9e0709 ("drm/amd/display: Look at firmware version to determine using dmub on dcn21")
Newer DMUB firmware on Renoir and Green Sardine do not need to disable dmcu and this actually causes problems with DP-C alt mode for a number of machines.
Backport the fix from this from hand modified backport because mainline switched to IP version checking which doesn't exist in linux-stable.
BugLink: https://gitlab.freedesktop.org/drm/amd/-/issues/1772 BugLink: https://gitlab.freedesktop.org/drm/amd/-/issues/1735 Signed-off-by: Mario Limonciello mario.limonciello@amd.com Reviewed-by: Alex Deucher alexander.deucher@amd.com
Changes from v1->v2:
- Update commit message syntax for hand modified commit
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-)
What tree(s) are you wanting this backported to?
thanks,
greg k-h
[AMD Official Use Only]
-----Original Message----- From: Greg KH gregkh@linuxfoundation.org Sent: Monday, November 15, 2021 09:46 To: Limonciello, Mario Mario.Limonciello@amd.com Cc: stable@vger.kernel.org; Deucher, Alexander Alexander.Deucher@amd.com Subject: Re: [PATCH v2] drm/amd/display: Look at firmware version to determine using dmub on dcn21
On Mon, Nov 15, 2021 at 09:36:55AM -0600, Mario Limonciello wrote:
commit 91adec9e0709 ("drm/amd/display: Look at firmware version to determine using dmub on dcn21")
Newer DMUB firmware on Renoir and Green Sardine do not need to
disable
dmcu and this actually causes problems with DP-C alt mode for a number of machines.
Backport the fix from this from hand modified backport because mainline switched to IP version checking which doesn't exist in linux-stable.
BugLink:
https://nam11.safelinks.protection.outlook.com/?url=https%3A%2F%2Fgitla b.freedesktop.org%2Fdrm%2Famd%2F- %2Fissues%2F1772&data=04%7C01%7Cmario.limonciello%40amd.com% 7C6601c50631344fa7148208d9a84f050a%7C3dd8961fe4884e608e11a82d994e1 83d%7C0%7C0%7C637725879609631767%7CUnknown%7CTWFpbGZsb3d8eyJ WIjoiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D% 7C3000&sdata=jIGJARLqpAL6Vc6AyK8qVj1yZ7qFm5sXFj%2FerhoMEUc %3D&reserved=0
BugLink:
https://nam11.safelinks.protection.outlook.com/?url=https%3A%2F%2Fgitla b.freedesktop.org%2Fdrm%2Famd%2F- %2Fissues%2F1735&data=04%7C01%7Cmario.limonciello%40amd.com% 7C6601c50631344fa7148208d9a84f050a%7C3dd8961fe4884e608e11a82d994e1 83d%7C0%7C0%7C637725879609631767%7CUnknown%7CTWFpbGZsb3d8eyJ WIjoiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D% 7C3000&sdata=t8iG0MlBgncmZ5Py%2FhWuWBHMbSCCK%2BtFTV4faxcl N3c%3D&reserved=0
Signed-off-by: Mario Limonciello mario.limonciello@amd.com Reviewed-by: Alex Deucher alexander.deucher@amd.com
Changes from v1->v2:
- Update commit message syntax for hand modified commit
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-)
What tree(s) are you wanting this backported to?
5.13+
Thanks,
On Mon, Nov 15, 2021 at 03:47:24PM +0000, Limonciello, Mario wrote:
[AMD Official Use Only]
-----Original Message----- From: Greg KH gregkh@linuxfoundation.org Sent: Monday, November 15, 2021 09:46 To: Limonciello, Mario Mario.Limonciello@amd.com Cc: stable@vger.kernel.org; Deucher, Alexander Alexander.Deucher@amd.com Subject: Re: [PATCH v2] drm/amd/display: Look at firmware version to determine using dmub on dcn21
On Mon, Nov 15, 2021 at 09:36:55AM -0600, Mario Limonciello wrote:
commit 91adec9e0709 ("drm/amd/display: Look at firmware version to determine using dmub on dcn21")
Newer DMUB firmware on Renoir and Green Sardine do not need to
disable
dmcu and this actually causes problems with DP-C alt mode for a number of machines.
Backport the fix from this from hand modified backport because mainline switched to IP version checking which doesn't exist in linux-stable.
BugLink:
https://nam11.safelinks.protection.outlook.com/?url=https%3A%2F%2Fgitla b.freedesktop.org%2Fdrm%2Famd%2F- %2Fissues%2F1772&data=04%7C01%7Cmario.limonciello%40amd.com% 7C6601c50631344fa7148208d9a84f050a%7C3dd8961fe4884e608e11a82d994e1 83d%7C0%7C0%7C637725879609631767%7CUnknown%7CTWFpbGZsb3d8eyJ WIjoiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D% 7C3000&sdata=jIGJARLqpAL6Vc6AyK8qVj1yZ7qFm5sXFj%2FerhoMEUc %3D&reserved=0
BugLink:
https://nam11.safelinks.protection.outlook.com/?url=https%3A%2F%2Fgitla b.freedesktop.org%2Fdrm%2Famd%2F- %2Fissues%2F1735&data=04%7C01%7Cmario.limonciello%40amd.com% 7C6601c50631344fa7148208d9a84f050a%7C3dd8961fe4884e608e11a82d994e1 83d%7C0%7C0%7C637725879609631767%7CUnknown%7CTWFpbGZsb3d8eyJ WIjoiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D% 7C3000&sdata=t8iG0MlBgncmZ5Py%2FhWuWBHMbSCCK%2BtFTV4faxcl N3c%3D&reserved=0
Signed-off-by: Mario Limonciello mario.limonciello@amd.com Reviewed-by: Alex Deucher alexander.deucher@amd.com
Changes from v1->v2:
- Update commit message syntax for hand modified commit
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-)
What tree(s) are you wanting this backported to?
5.13+
Now queued up, thanks.
greg k-h
linux-stable-mirror@lists.linaro.org
-
Greg KH -
Limonciello, Mario -
Mario Limonciello