Skip to content

Commit 7e89e43

Browse files
committed
drm/vc4: 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: Maxime Ripard <mripard@kernel.org> Cc: Dave Stevenson <dave.stevenson@raspberrypi.com> Cc: Raspberry Pi Kernel Maintenance <kernel-list@raspberrypi.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-25-tzimmermann@suse.de
1 parent 574c1c3 commit 7e89e43

1 file changed

Lines changed: 2 additions & 2 deletions

File tree

drivers/gpu/drm/vc4/vc4_drv.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
* driver.
2121
*/
2222

23+
#include <linux/aperture.h>
2324
#include <linux/clk.h>
2425
#include <linux/component.h>
2526
#include <linux/device.h>
@@ -30,7 +31,6 @@
3031
#include <linux/platform_device.h>
3132
#include <linux/pm_runtime.h>
3233

33-
#include <drm/drm_aperture.h>
3434
#include <drm/drm_atomic_helper.h>
3535
#include <drm/drm_client_setup.h>
3636
#include <drm/drm_drv.h>
@@ -360,7 +360,7 @@ static int vc4_drm_bind(struct device *dev)
360360
}
361361
}
362362

363-
ret = drm_aperture_remove_framebuffers(driver);
363+
ret = aperture_remove_all_conflicting_devices(driver->name);
364364
if (ret)
365365
goto err;
366366

0 commit comments

Comments
 (0)