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

fbdev/radeon: use pci aperture helpers 



It's not exactly the same since the open coded version doesn't set
primary correctly. But that's a bugfix, so shouldn't hurt really.

Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: linux-fbdev@vger.kernel.org
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-7-daniel.vetter@ffwll.ch
parent deddc912

drivers/video/fbdev/aty/radeon_base.c

+1 −9
Original line number Diff line number Diff line
@@ -2238,14 +2238,6 @@ static const struct bin_attribute edid2_attr = { 
	.read	= radeon_show_edid2,

};



static int radeon_kick_out_firmware_fb(struct pci_dev *pdev)

{

	resource_size_t base = pci_resource_start(pdev, 0);

	resource_size_t size = pci_resource_len(pdev, 0);



	return aperture_remove_conflicting_devices(base, size, false, KBUILD_MODNAME);

}



static int radeonfb_pci_register(struct pci_dev *pdev,

				 const struct pci_device_id *ent)

{
@@ -2296,7 +2288,7 @@ static int radeonfb_pci_register(struct pci_dev *pdev, 
	rinfo->fb_base_phys = pci_resource_start (pdev, 0);

	rinfo->mmio_base_phys = pci_resource_start (pdev, 2);



	ret = radeon_kick_out_firmware_fb(pdev);

	ret = aperture_remove_conflicting_pci_devices(pdev, KBUILD_MODNAME);

	if (ret)

		goto err_release_fb;