From c37f0fa8e763c471ddaccc08da9ec9bb1a715451 Mon Sep 17 00:00:00 2001 From: Thomas Zimmermann Date: Mon, 27 Jun 2022 10:51:44 +0200 Subject: [PATCH] drm/amdgpu: Remove firmware framebuffer without PCI helper The DRM aperture helper for PCI devices fails to remove the firmware framebuffer's device. Manually tell it where to look. Reported-by: Linus Torvalds Signed-off-by: Thomas Zimmermann --- drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c index 46ef57b07c15..e00318ff66ff 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c @@ -2073,7 +2073,8 @@ static int amdgpu_pci_probe(struct pci_dev *pdev, is_fw_fb = amdgpu_is_fw_framebuffer(base, size); /* Get rid of things like offb */ - ret = drm_aperture_remove_conflicting_pci_framebuffers(pdev, &amdgpu_kms_driver); + ret = drm_aperture_remove_conflicting_framebuffers(base, size, is_fw_fb, + &amdgpu_kms_driver); if (ret) return ret; -- 2.36.1