lkml.org 
[lkml]   [2023]   [Jan]   [12]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
Date
SubjectRe: [PATCH 01/11] drm/ast: Use drm_aperture_remove_conflicting_pci_framebuffers
From


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.

It apparently worked this time. Tested on an AST2100 chip.

>
> Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
> 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: Thomas Zimmmermann <tzimmermann@suse.de>
Reviewed-by: Thomas Zimmermann <tzimmermann@suse.de>

> ---
> 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
[unhandled content-type:application/pgp-signature]
\
 
 \ /
  Last update: 2023-03-26 23:37    [W:0.206 / U:0.420 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site