From: Dave Airlie Date: Mon, 27 Jul 2020 02:32:12 +0000 (+1000) Subject: Merge tag 'amd-drm-next-5.9-2020-07-24' of git://people.freedesktop.org/~agd5f/linux... X-Git-Tag: v5.9-rc1~134^2~6 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=92be42392256b30296843aa4d987ad8d175c0e10;p=thirdparty%2Fkernel%2Flinux.git Merge tag 'amd-drm-next-5.9-2020-07-24' of git://people.freedesktop.org/~agd5f/linux into drm-next amd-drm-next-5.9-2020-07-24: amdgpu: - Misc sienna cichlid fixes - Final bits of swSMU cleanup - Misc display fixes - Misc VCN fixes - Eeprom i2c cleanup - Drop amd vrr_range debugfs in favor of core drm Signed-off-by: Dave Airlie From: Alex Deucher Link: https://patchwork.freedesktop.org/patch/msgid/20200724205712.3913-1-alexander.deucher@amd.com --- 92be42392256b30296843aa4d987ad8d175c0e10 diff --cc drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c index f9cbbfa7acf40,45886649cc53e..533913bf8410e --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c @@@ -1376,9 -1376,9 +1376,9 @@@ static int dm_late_init(void *handle unsigned int linear_lut[16]; int i; struct dmcu *dmcu = NULL; - bool ret; + bool ret = true; - if (!adev->dm.fw_dmcu) + if (!adev->dm.fw_dmcu && !adev->dm.dmub_fw) return detect_mst_link_for_all_connectors(adev->ddev); dmcu = adev->dm.dc->res_pool->dmcu;