Skip to content

Commit 7934a1c

Browse files
committed
drm/bochs: 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: Gerd Hoffmann <kraxel@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-22-tzimmermann@suse.de
1 parent a29705e commit 7934a1c

1 file changed

Lines changed: 2 additions & 2 deletions

File tree

drivers/gpu/drm/tiny/bochs.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
// SPDX-License-Identifier: GPL-2.0-or-later
22

3+
#include <linux/aperture.h>
34
#include <linux/module.h>
45
#include <linux/pci.h>
56

6-
#include <drm/drm_aperture.h>
77
#include <drm/drm_atomic.h>
88
#include <drm/drm_atomic_helper.h>
99
#include <drm/drm_client_setup.h>
@@ -711,7 +711,7 @@ static int bochs_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent
711711
struct drm_device *dev;
712712
int ret;
713713

714-
ret = drm_aperture_remove_conflicting_pci_framebuffers(pdev, &bochs_driver);
714+
ret = aperture_remove_conflicting_pci_devices(pdev, bochs_driver.name);
715715
if (ret)
716716
return ret;
717717

0 commit comments

Comments
 (0)