[Public] Reviewed-by: Roman Li <Roman.Li@xxxxxxx> > -----Original Message----- > From: Alex Deucher <alexdeucher@xxxxxxxxx> > Sent: Tuesday, November 2, 2021 11:58 AM > To: Limonciello, Mario <Mario.Limonciello@xxxxxxx> > Cc: amd-gfx list <amd-gfx@xxxxxxxxxxxxxxxxxxxxx>; Li, Roman > <Roman.Li@xxxxxxx> > Subject: Re: [PATCH v3] drm/amd/display: Look at firmware version to > determine using dmub on dcn21 > > On Tue, Nov 2, 2021 at 11:04 AM Mario Limonciello > <mario.limonciello@xxxxxxx> wrote: > > > > commit b1c61212d8dc ("drm/amd/display: Fully switch to dmub for all > > dcn21 > > asics") switched over to using dmub on Renoir to fix Gitlab 1735, but > > this implied a new dependency on newer firmware which might not be met > > on older kernel versions. > > > > Since sw_init runs before hw_init, there is an opportunity to > > determine whether or not the firmware version is new to adjust the behavior. > > > > Cc: Roman.Li@xxxxxxx > > BugLink: > > https://nam11.safelinks.protection.outlook.com/?url=https%3A%2F%2Fgitl > > ab.freedesktop.org%2Fdrm%2Famd%2F- > %2Fissues%2F1772&data=04%7C01%7C > > > Roman.Li%40amd.com%7C29e4fd818a2446e0cf5208d99e198897%7C3dd8961f > e4884e > > > 608e11a82d994e183d%7C0%7C0%7C637714654774196023%7CUnknown%7CT > WFpbGZsb3 > > > d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3 > D%7 > > > C1000&sdata=NrV1aszBAZkJ%2FQELpzxx7NCKXjWKPEvgk6rEAwfhWYk%3D > &r > > eserved=0 > > BugLink: > > https://nam11.safelinks.protection.outlook.com/?url=https%3A%2F%2Fgitl > > ab.freedesktop.org%2Fdrm%2Famd%2F- > %2Fissues%2F1735&data=04%7C01%7C > > > Roman.Li%40amd.com%7C29e4fd818a2446e0cf5208d99e198897%7C3dd8961f > e4884e > > > 608e11a82d994e183d%7C0%7C0%7C637714654774196023%7CUnknown%7CT > WFpbGZsb3 > > > d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3 > D%7 > > > C1000&sdata=EqjhSIwtkgo%2BtJFwUkf%2FDTY4RiSNVSh8DjXLu7LAszM%3 > D& > > ;reserved=0 > > Fixes: b1c61212d8dc ("drm/amd/display: Fully switch to dmub for all > > dcn21 asics") > > Signed-off-by: Mario Limonciello <mario.limonciello@xxxxxxx> > > Acked-by: Alex Deucher <alexander.deucher@xxxxxxx> > > > --- > > Changes from v2->v3: > > * Don't special case Green Sardine / Renoir anymore > > * Special case the two Renoir firmware that have this problem > > (that weren't released for green sardine) > > * Special case development version of ucode version > > drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 8 ++++++++ > > 1 file changed, 8 insertions(+) > > > > 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 b48f3cb5ddeb..dcc97ef28c50 100644 > > --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c > > +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c > > @@ -1410,7 +1410,15 @@ 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; > > + 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 IP_VERSION(1, 0, 0): > > case IP_VERSION(1, 0, 1): > > -- > > 2.25.1 > >