Skip to content

Commit a522000

Browse files
committed
drm/xe: 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: Lucas De Marchi <lucas.demarchi@intel.com> Cc: "Thomas Hellström" <thomas.hellstrom@linux.intel.com> Cc: Rodrigo Vivi <rodrigo.vivi@intel.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-28-tzimmermann@suse.de
1 parent 2fb05e8 commit a522000

1 file changed

Lines changed: 2 additions & 2 deletions

File tree

drivers/gpu/drm/xe/xe_device.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,11 @@
55

66
#include "xe_device.h"
77

8+
#include <linux/aperture.h>
89
#include <linux/delay.h>
910
#include <linux/fault-inject.h>
1011
#include <linux/units.h>
1112

12-
#include <drm/drm_aperture.h>
1313
#include <drm/drm_atomic_helper.h>
1414
#include <drm/drm_client.h>
1515
#include <drm/drm_gem_ttm_helper.h>
@@ -311,7 +311,7 @@ struct xe_device *xe_device_create(struct pci_dev *pdev,
311311

312312
xe_display_driver_set_hooks(&driver);
313313

314-
err = drm_aperture_remove_conflicting_pci_framebuffers(pdev, &driver);
314+
err = aperture_remove_conflicting_pci_devices(pdev, driver.name);
315315
if (err)
316316
return ERR_PTR(err);
317317

0 commit comments

Comments
 (0)