From 4d1d9f4c6c483392f3929c2ec5332e4152b80a4f Mon Sep 17 00:00:00 2001 From: jsg Date: Thu, 18 Aug 2022 00:43:54 +0000 Subject: [PATCH] drm/amdgpu: fix check in fbdev init From Alex Deucher 27f8f5219fe4658537ba28fd01657e1062ac3960 in linux 5.15.y/5.15.61 --- sys/dev/pci/drm/amd/amdgpu/amdgpu_fb.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sys/dev/pci/drm/amd/amdgpu/amdgpu_fb.c b/sys/dev/pci/drm/amd/amdgpu/amdgpu_fb.c index 43f3762e8bb..8e7079585ef 100644 --- a/sys/dev/pci/drm/amd/amdgpu/amdgpu_fb.c +++ b/sys/dev/pci/drm/amd/amdgpu/amdgpu_fb.c @@ -379,7 +379,8 @@ int amdgpu_fbdev_init(struct amdgpu_device *adev) task_set(&adev->burner_task, amdgpu_burner_cb, adev); /* disable all the possible outputs/crtcs before entering KMS mode */ - if (!amdgpu_device_has_dc_support(adev) && !amdgpu_virtual_display) + if (!amdgpu_device_has_dc_support(adev) && !amdgpu_virtual_display && + !amdgpu_sriov_vf(adev)) drm_helper_disable_unused_functions(adev_to_drm(adev)); drm_fb_helper_initial_config(&rfbdev->helper, bpp_sel); -- 2.20.1