Patch "drm/ast: Use drm_aperture_remove_conflicting_pci_framebuffers" has been added to the 6.1-stable tree

[Sasha Levin <sashal@xxxxxxxxxx>]

This is a note to let you know that I've just added the patch titled

    drm/ast: Use drm_aperture_remove_conflicting_pci_framebuffers

to the 6.1-stable tree which can be found at:
    http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
     drm-ast-use-drm_aperture_remove_conflicting_pci_fram.patch
and it can be found in the queue-6.1 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.



commit 11c8e60dff2ac07edb1d475a5a6dfff2592456a1
Author: Daniel Vetter <daniel.vetter@xxxxxxxx>
Date:   Wed Jan 11 16:41:02 2023 +0100

    drm/ast: Use drm_aperture_remove_conflicting_pci_framebuffers
    
    [ Upstream commit c1ebead36099deb85384f6fb262fe619a04cee73 ]
    
    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: Daniel Vetter <daniel.vetter@xxxxxxxx>
    Cc: Dave Airlie <airlied@xxxxxxxxxx>
    Cc: Thomas Zimmermann <tzimmermann@xxxxxxx>
    Cc: Javier Martinez Canillas <javierm@xxxxxxxxxx>
    Cc: Helge Deller <deller@xxxxxx>
    Cc: linux-fbdev@xxxxxxxxxxxxxxx
    Tested-by: Thomas Zimmmermann <tzimmermann@xxxxxxx>
    Reviewed-by: Thomas Zimmermann <tzimmermann@xxxxxxx>
    Signed-off-by: Thomas Zimmermann <tzimmermann@xxxxxxx>
    Link: https://patchwork.freedesktop.org/patch/msgid/20230111154112.90575-1-daniel.vetter@xxxxxxxx
    Stable-dep-of: 5ae3716cfdcd ("video/aperture: Only remove sysfb on the default vga pci device")
    Signed-off-by: Sasha Levin <sashal@xxxxxxxxxx>

diff --git a/drivers/gpu/drm/ast/ast_drv.c b/drivers/gpu/drm/ast/ast_drv.c
index b9392f31e6291..800471f2a2037 100644
--- a/drivers/gpu/drm/ast/ast_drv.c
+++ b/drivers/gpu/drm/ast/ast_drv.c
@@ -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_private *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;