mirror of
https://github.com/torvalds/linux.git
synced 2026-05-25 15:41:52 +02:00
drm/qxl: 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: Dave Airlie <airlied@redhat.com> 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-15-tzimmermann@suse.de
This commit is contained in:
parent
148efebdcf
commit
6569392c1d
|
|
@ -29,12 +29,12 @@
|
|||
|
||||
#include "qxl_drv.h"
|
||||
|
||||
#include <linux/aperture.h>
|
||||
#include <linux/module.h>
|
||||
#include <linux/pci.h>
|
||||
#include <linux/vgaarb.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>
|
||||
|
|
@ -92,7 +92,7 @@ qxl_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
|
|||
if (ret)
|
||||
return ret;
|
||||
|
||||
ret = drm_aperture_remove_conflicting_pci_framebuffers(pdev, &qxl_driver);
|
||||
ret = aperture_remove_conflicting_pci_devices(pdev, qxl_driver.name);
|
||||
if (ret)
|
||||
goto disable_pci;
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user