drm/mgag200: Use video aperture helpers
authorThomas Zimmermann <tzimmermann@suse.de>
Mon, 30 Sep 2024 13:03:08 +0000 (15:03 +0200)
committerThomas Zimmermann <tzimmermann@suse.de>
Mon, 14 Oct 2024 13:28:47 +0000 (15:28 +0200)
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: Dave Airlie <airlied@redhat.com>
Cc: Jocelyn Falempe <jfalempe@redhat.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-11-tzimmermann@suse.de
drivers/gpu/drm/mgag200/mgag200_drv.c

index 29087e2..42fabe8 100644 (file)
@@ -6,10 +6,10 @@
  *          Dave Airlie
  */
 
+#include <linux/aperture.h>
 #include <linux/module.h>
 #include <linux/pci.h>
 
-#include <drm/drm_aperture.h>
 #include <drm/drm_atomic_helper.h>
 #include <drm/drm_client_setup.h>
 #include <drm/drm_drv.h>
@@ -266,7 +266,7 @@ mgag200_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
        struct drm_device *dev;
        int ret;
 
-       ret = drm_aperture_remove_conflicting_pci_framebuffers(pdev, &mgag200_driver);
+       ret = aperture_remove_conflicting_pci_devices(pdev, mgag200_driver.name);
        if (ret)
                return ret;