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://gitlab.freedesktop.org/drm/amd/-/issues/1772
> BugLink: https://gitlab.freedesktop.org/drm/amd/-/issues/1735
> 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
>
