| Message ID | 20230111154112.90575-1-daniel.vetter@ffwll.ch (mailing list archive) |
|---|---|
| State | Handled Elsewhere |
| Headers | show |
| Series | [01/11] drm/ast: Use drm_aperture_remove_conflicting_pci_framebuffers | expand |
Hi 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. I'll give this patch a test tomorrow. Best regards Thomas > > 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 > --- > 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; >
On Wed, Jan 11, 2023 at 04:48:39PM +0100, Thomas Zimmermann wrote: > Hi > > 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. > > I'll give this patch a test tomorrow. Thanks a lot! -Daniel > > Best regards > Thomas > > > > > 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 > > --- > > 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
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; >
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@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 > --- > 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; >
Hi Thomas, The Intel(x86) CPUs have a separate address space for "IO", but the ARM architecture only has "memory", so all IO devices are accessed as if they were memory. Which means ARM does not support isolated IO. Here is a related discussion on ARM's forum. https://community.arm.com/support-forums/f/architectures-and-processors-forum/52046/how-to-read-write-an-i-o-port-in-aarch64 Thus, we adapt MMIO only after this patch. On 2023/4/4 下午 10:45, Thomas Zimmermann wrote: > 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@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 >> --- >> 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; >
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;
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@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 --- drivers/gpu/drm/ast/ast_drv.c | 16 +--------------- 1 file changed, 1 insertion(+), 15 deletions(-)