drm/arm/hdlcd: Use video aperture helpers
authorThomas Zimmermann <tzimmermann@suse.de>
Mon, 30 Sep 2024 13:03:00 +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: Liviu Dudau <liviu.dudau@arm.com>
Acked-by: Liviu Dudau <liviu.dudau@arm.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-3-tzimmermann@suse.de
drivers/gpu/drm/arm/hdlcd_drv.c

index f5d358f..cd43898 100644 (file)
@@ -9,6 +9,7 @@
  *  ARM HDLCD Driver
  */
 
+#include <linux/aperture.h>
 #include <linux/module.h>
 #include <linux/spinlock.h>
 #include <linux/clk.h>
@@ -21,7 +22,6 @@
 #include <linux/platform_device.h>
 #include <linux/pm_runtime.h>
 
-#include <drm/drm_aperture.h>
 #include <drm/drm_atomic_helper.h>
 #include <drm/drm_client_setup.h>
 #include <drm/drm_crtc.h>
@@ -287,7 +287,7 @@ static int hdlcd_drm_bind(struct device *dev)
         */
        if (hdlcd_read(hdlcd, HDLCD_REG_COMMAND)) {
                hdlcd_write(hdlcd, HDLCD_REG_COMMAND, 0);
-               drm_aperture_remove_framebuffers(&hdlcd_driver);
+               aperture_remove_all_conflicting_devices(hdlcd_driver.name);
        }
 
        drm_mode_config_reset(drm);