Re: [PATCH 01/11] drm/ast: Use drm_aperture_remove_conflicting_pci_framebuffers

[Thomas Zimmermann]

Hi,

FYI I have merged patches 1, 6 and 7 of this patchset. They look fine 
and are worthwhile fixes on their own.

Best regards
Thomas

Am 11.01.23 um 16:41 schrieb Daniel Vetter:
> 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@xxxxxxxxx>
> 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
> ---
>   drivers/gpu/drm/ast/ast_drv.c | 16 +---------------
>   1 file changed, 1 insertion(+), 15 deletions(-)
>
> diff --git a/drivers/gpu/drm/ast/ast_drv.c b/drivers/gpu/drm/ast/ast_drv.c
> index 420fc75c240e..3ac24a780f50 100644
> --- a/drivers/gpu/drm/ast/ast_drv.c
> +++ b/drivers/gpu/drm/ast/ast_drv.c
> @@ -90,27 +90,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;
>   

--
Thomas Zimmermann
Graphics Driver Developer
SUSE Software Solutions Germany GmbH
Maxfeldstr. 5, 90409 Nürnberg, Germany
(HRB 36809, AG Nürnberg)
Geschäftsführer: Ivo Totev

Attachment: OpenPGP_signature
Description: OpenPGP digital signature