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

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: default avatarThomas 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: 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-28-tzimmermann@suse.de
parent 2fb05e8d

drivers/gpu/drm/xe/xe_device.c

+2 −2
Original line number Diff line number Diff line
@@ -5,11 +5,11 @@ 


#include "xe_device.h"



#include <linux/aperture.h>

#include <linux/delay.h>

#include <linux/fault-inject.h>

#include <linux/units.h>



#include <drm/drm_aperture.h>

#include <drm/drm_atomic_helper.h>

#include <drm/drm_client.h>

#include <drm/drm_gem_ttm_helper.h>
@@ -311,7 +311,7 @@ struct xe_device *xe_device_create(struct pci_dev *pdev, 


	xe_display_driver_set_hooks(&driver);



	err = drm_aperture_remove_conflicting_pci_framebuffers(pdev, &driver);

	err = aperture_remove_conflicting_pci_devices(pdev, driver.name);

	if (err)

		return ERR_PTR(err);