summaryrefslogtreecommitdiff
path: root/sys
diff options
context:
space:
mode:
authorJonathan Gray <jsg@cvs.openbsd.org>2022-08-18 00:43:55 +0000
committerJonathan Gray <jsg@cvs.openbsd.org>2022-08-18 00:43:55 +0000
commit6542d389f82d6573c346b08275eec98150150f1b (patch)
tree697f18b53b2631bd73be55f12477982ee8072db2 /sys
parent43c57146701d41ac69d96c67a2ce97fc18abc10b (diff)
drm/amdgpu: fix check in fbdev init
From Alex Deucher 27f8f5219fe4658537ba28fd01657e1062ac3960 in linux 5.15.y/5.15.61
Diffstat (limited to 'sys')
-rw-r--r--sys/dev/pci/drm/amd/amdgpu/amdgpu_fb.c3
1 files changed, 2 insertions, 1 deletions
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);