| Message ID | 20240930130921.689876-7-tzimmermann@suse.de (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | drm: Remove DRM aperture helpers | expand |
On Mon, Sep 30, 2024 at 6:09 AM Thomas Zimmermann <tzimmermann@suse.de> 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@suse.de> > Cc: Deepak Rawat <drawat.floss@gmail.com> > --- > drivers/gpu/drm/hyperv/hyperv_drm_drv.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/drivers/gpu/drm/hyperv/hyperv_drm_drv.c b/drivers/gpu/drm/hyperv/hyperv_drm_drv.c > index 3077ce5470f6..e0953777a206 100644 > --- a/drivers/gpu/drm/hyperv/hyperv_drm_drv.c > +++ b/drivers/gpu/drm/hyperv/hyperv_drm_drv.c > @@ -3,12 +3,12 @@ > * Copyright 2021 Microsoft > */ > > +#include <linux/aperture.h> > #include <linux/efi.h> > #include <linux/hyperv.h> > #include <linux/module.h> > #include <linux/pci.h> > > -#include <drm/drm_aperture.h> > #include <drm/drm_atomic_helper.h> > #include <drm/drm_client_setup.h> > #include <drm/drm_drv.h> > @@ -126,7 +126,7 @@ static int hyperv_vmbus_probe(struct hv_device *hdev, > goto err_hv_set_drv_data; > } > > - drm_aperture_remove_framebuffers(&hyperv_driver); > + aperture_remove_all_conflicting_devices(hyperv_driver.name); > > ret = hyperv_setup_vram(hv, hdev); > if (ret) > -- > 2.46.0 > Reviewed-by: Deepak Rawat <drawat.floss@gmail.com>
diff --git a/drivers/gpu/drm/hyperv/hyperv_drm_drv.c b/drivers/gpu/drm/hyperv/hyperv_drm_drv.c index 3077ce5470f6..e0953777a206 100644 --- a/drivers/gpu/drm/hyperv/hyperv_drm_drv.c +++ b/drivers/gpu/drm/hyperv/hyperv_drm_drv.c @@ -3,12 +3,12 @@ * Copyright 2021 Microsoft */ +#include <linux/aperture.h> #include <linux/efi.h> #include <linux/hyperv.h> #include <linux/module.h> #include <linux/pci.h> -#include <drm/drm_aperture.h> #include <drm/drm_atomic_helper.h> #include <drm/drm_client_setup.h> #include <drm/drm_drv.h> @@ -126,7 +126,7 @@ static int hyperv_vmbus_probe(struct hv_device *hdev, goto err_hv_set_drv_data; } - drm_aperture_remove_framebuffers(&hyperv_driver); + aperture_remove_all_conflicting_devices(hyperv_driver.name); ret = hyperv_setup_vram(hv, hdev); if (ret)
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: Deepak Rawat <drawat.floss@gmail.com> --- drivers/gpu/drm/hyperv/hyperv_drm_drv.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)