Commit c1ebead3 authored by Daniel Vetter's avatar Daniel Vetter Committed by Thomas Zimmermann
Browse files

drm/ast: Use drm_aperture_remove_conflicting_pci_framebuffers 



It's just open coded and matches.

Note that Thomas said that his version apparently failed for some
reason, but hey maybe we should try again.

Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
Cc: Dave Airlie <airlied@redhat.com>
Cc: Thomas Zimmermann <tzimmermann@suse.de>
Cc: Javier Martinez Canillas <javierm@redhat.com>
Cc: Helge Deller <deller@gmx.de>
Cc: linux-fbdev@vger.kernel.org
Tested-by: default avatarThomas Zimmmermann <tzimmermann@suse.de>
Reviewed-by: default avatarThomas Zimmermann <tzimmermann@suse.de>
Signed-off-by: default avatarThomas Zimmermann <tzimmermann@suse.de>
Link: https://patchwork.freedesktop.org/patch/msgid/20230111154112.90575-1-daniel.vetter@ffwll.ch
parent 92ba6734

drivers/gpu/drm/ast/ast_drv.c

+1 −15
Original line number Diff line number Diff line
@@ -89,27 +89,13 @@ static const struct pci_device_id ast_pciidlist[] = { 


MODULE_DEVICE_TABLE(pci, ast_pciidlist);



static int ast_remove_conflicting_framebuffers(struct pci_dev *pdev)

{

	bool primary = false;

	resource_size_t base, size;



	base = pci_resource_start(pdev, 0);

	size = pci_resource_len(pdev, 0);

#ifdef CONFIG_X86

	primary = pdev->resource[PCI_ROM_RESOURCE].flags & IORESOURCE_ROM_SHADOW;

#endif



	return drm_aperture_remove_conflicting_framebuffers(base, size, primary, &ast_driver);

}



static int ast_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent)

{

	struct ast_device *ast;

	struct drm_device *dev;

	int ret;



	ret = ast_remove_conflicting_framebuffers(pdev);

	ret = drm_aperture_remove_conflicting_pci_framebuffers(pdev, &ast_driver);

	if (ret)

		return ret;