Commit 2fb05e8d authored by Thomas Zimmermann's avatar Thomas Zimmermann
Browse files

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: default avatarThomas 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: default avatarJavier Martinez Canillas <javierm@redhat.com>
Acked-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20240930130921.689876-27-tzimmermann@suse.de
parent d2c323d0

drivers/gpu/drm/vmwgfx/vmwgfx_drv.c

+3 −2
Original line number Diff line number Diff line
@@ -35,7 +35,6 @@ 
#include "vmwgfx_vkms.h"

#include "ttm_object.h"



#include <drm/drm_aperture.h>

#include <drm/drm_client_setup.h>

#include <drm/drm_drv.h>

#include <drm/drm_fbdev_ttm.h>
@@ -50,6 +49,8 @@ 
#ifdef CONFIG_X86

#include <asm/hypervisor.h>

#endif



#include <linux/aperture.h>

#include <linux/cc_platform.h>

#include <linux/dma-mapping.h>

#include <linux/module.h>
@@ -1654,7 +1655,7 @@ static int vmw_probe(struct pci_dev *pdev, const struct pci_device_id *ent) 
	struct vmw_private *vmw;

	int ret;



	ret = drm_aperture_remove_conflicting_pci_framebuffers(pdev, &driver);

	ret = aperture_remove_conflicting_pci_devices(pdev, driver.name);

	if (ret)

		goto out_error;