On Mon, 30 Sep 2024, Thomas Zimmermann <tzimmermann@xxxxxxx> wrote: > 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@xxxxxxx> > Cc: Jani Nikula <jani.nikula@xxxxxxxxxxxxxxx> > Cc: Joonas Lahtinen <joonas.lahtinen@xxxxxxxxxxxxxxx> > Cc: Rodrigo Vivi <rodrigo.vivi@xxxxxxxxx> > Cc: Tvrtko Ursulin <tursulin@xxxxxxxxxxx> Acked-by: Jani Nikula <jani.nikula@xxxxxxxxx> > --- > drivers/gpu/drm/i915/i915_driver.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/drivers/gpu/drm/i915/i915_driver.c b/drivers/gpu/drm/i915/i915_driver.c > index b3eb35fa5ff8..365329ff8a07 100644 > --- a/drivers/gpu/drm/i915/i915_driver.c > +++ b/drivers/gpu/drm/i915/i915_driver.c > @@ -27,6 +27,7 @@ > * > */ > > +#include <linux/aperture.h> > #include <linux/acpi.h> > #include <linux/device.h> > #include <linux/module.h> > @@ -39,7 +40,6 @@ > #include <linux/vga_switcheroo.h> > #include <linux/vt.h> > > -#include <drm/drm_aperture.h> > #include <drm/drm_atomic_helper.h> > #include <drm/drm_ioctl.h> > #include <drm/drm_managed.h> > @@ -485,7 +485,7 @@ static int i915_driver_hw_probe(struct drm_i915_private *dev_priv) > if (ret) > goto err_perf; > > - ret = drm_aperture_remove_conflicting_pci_framebuffers(pdev, dev_priv->drm.driver); > + ret = aperture_remove_conflicting_pci_devices(pdev, dev_priv->drm.driver->name); > if (ret) > goto err_ggtt; -- Jani Nikula, Intel
