Skip to content

Commit d2c323d

Browse files
committed
drm/virtgpu: Use video aperture helpers
DRM's aperture functions have long been implemented as helpers under drivers/video/ for use with fbdev. Avoid the DRM wrappers by calling the video functions directly. Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de> Cc: David Airlie <airlied@redhat.com> Cc: Gerd Hoffmann <kraxel@redhat.com> Cc: Gurchetan Singh <gurchetansingh@chromium.org> Cc: Chia-I Wu <olvaffe@gmail.com> Acked-by: Javier Martinez Canillas <javierm@redhat.com> Acked-by: Alex Deucher <alexander.deucher@amd.com> Link: https://patchwork.freedesktop.org/patch/msgid/20240930130921.689876-26-tzimmermann@suse.de
1 parent 7e89e43 commit d2c323d

1 file changed

Lines changed: 2 additions & 2 deletions

File tree

drivers/gpu/drm/virtio/virtgpu_drv.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,13 +26,13 @@
2626
* OTHER DEALINGS IN THE SOFTWARE.
2727
*/
2828

29+
#include <linux/aperture.h>
2930
#include <linux/module.h>
3031
#include <linux/pci.h>
3132
#include <linux/poll.h>
3233
#include <linux/wait.h>
3334

3435
#include <drm/drm.h>
35-
#include <drm/drm_aperture.h>
3636
#include <drm/drm_atomic_helper.h>
3737
#include <drm/drm_client_setup.h>
3838
#include <drm/drm_drv.h>
@@ -59,7 +59,7 @@ static int virtio_gpu_pci_quirk(struct drm_device *dev)
5959
vga ? "virtio-vga" : "virtio-gpu-pci",
6060
pname);
6161
if (vga) {
62-
ret = drm_aperture_remove_conflicting_pci_framebuffers(pdev, &driver);
62+
ret = aperture_remove_conflicting_pci_devices(pdev, driver.name);
6363
if (ret)
6464
return ret;
6565
}

0 commit comments

Comments
 (0)