Skip to content

Commit 2fb05e8

Browse files
committed
drm/vmwgfx: 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: Zack Rusin <zack.rusin@broadcom.com> Cc: Broadcom internal kernel review list <bcm-kernel-feedback-list@broadcom.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-27-tzimmermann@suse.de
1 parent d2c323d commit 2fb05e8

1 file changed

Lines changed: 3 additions & 2 deletions

File tree

drivers/gpu/drm/vmwgfx/vmwgfx_drv.c

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@
3535
#include "vmwgfx_vkms.h"
3636
#include "ttm_object.h"
3737

38-
#include <drm/drm_aperture.h>
3938
#include <drm/drm_client_setup.h>
4039
#include <drm/drm_drv.h>
4140
#include <drm/drm_fbdev_ttm.h>
@@ -50,6 +49,8 @@
5049
#ifdef CONFIG_X86
5150
#include <asm/hypervisor.h>
5251
#endif
52+
53+
#include <linux/aperture.h>
5354
#include <linux/cc_platform.h>
5455
#include <linux/dma-mapping.h>
5556
#include <linux/module.h>
@@ -1654,7 +1655,7 @@ static int vmw_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
16541655
struct vmw_private *vmw;
16551656
int ret;
16561657

1657-
ret = drm_aperture_remove_conflicting_pci_framebuffers(pdev, &driver);
1658+
ret = aperture_remove_conflicting_pci_devices(pdev, driver.name);
16581659
if (ret)
16591660
goto out_error;
16601661

0 commit comments

Comments
 (0)