Commit d2c323d0 authored by Thomas Zimmermann's avatar Thomas Zimmermann
Browse files

drm/virtgpu: 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: David Airlie <airlied@redhat.com>
Cc: Gerd Hoffmann <kraxel@redhat.com>
Cc: Gurchetan Singh <gurchetansingh@chromium.org>
Cc: Chia-I Wu <olvaffe@gmail.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-26-tzimmermann@suse.de
parent 7e89e436

drivers/gpu/drm/virtio/virtgpu_drv.c

+2 −2
Original line number Diff line number Diff line
@@ -26,13 +26,13 @@ 
 * OTHER DEALINGS IN THE SOFTWARE.

 */



#include <linux/aperture.h>

#include <linux/module.h>

#include <linux/pci.h>

#include <linux/poll.h>

#include <linux/wait.h>



#include <drm/drm.h>

#include <drm/drm_aperture.h>

#include <drm/drm_atomic_helper.h>

#include <drm/drm_client_setup.h>

#include <drm/drm_drv.h>
@@ -59,7 +59,7 @@ static int virtio_gpu_pci_quirk(struct drm_device *dev) 
		 vga ? "virtio-vga" : "virtio-gpu-pci",

		 pname);

	if (vga) {

		ret = drm_aperture_remove_conflicting_pci_framebuffers(pdev, &driver);

		ret = aperture_remove_conflicting_pci_devices(pdev, driver.name);

		if (ret)

			return ret;

	}