Re: iommu/rockchip: Fix bugs and enable on ARM64
Shunqian, something is depending on these patches, can you resend these patches to solve the compile errors? -Caesar 在 2016年07月16日 00:16, Joerg Roedel 写道: On Fri, Jul 15, 2016 at 05:32:02PM +0200, Matthias Brugger wrote: The drm rockchip patches are dependent on iommu/rockchip patches, can you also apply these patches together? So that can avoid compile problem. While at it. I don't see patch 8 (iommu/Kconfig) in linux-next. I suppose you forgot to pick that one. I picked it up first, but it causes compile errors, so I removed it for now. Joerg ___ Linux-rockchip mailing list linux-rockc...@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-rockchip ___ dri-devel mailing list dri-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dri-devel
iommu/rockchip: Fix bugs and enable on ARM64
On 08/07/16 03:01, Mark yao wrote: > On 2016å¹´06æ27æ¥ 20:57, Joerg Roedel wrote: >> On Fri, Jun 24, 2016 at 10:13:25AM +0800, Shunqian Zheng wrote: >>> drivers/gpu/drm/rockchip/rockchip_drm_drv.c | 100 +++-- >>> drivers/gpu/drm/rockchip/rockchip_drm_drv.h | 3 + >>> drivers/gpu/drm/rockchip/rockchip_drm_gem.c | 221 >>> ++-- >>> drivers/gpu/drm/rockchip/rockchip_drm_gem.h | 9 ++ >>> drivers/iommu/Kconfig | 2 +- >>> drivers/iommu/rockchip-iommu.c | 181 >>> +-- >>> 6 files changed, 413 insertions(+), 103 deletions(-) >> Applied the IOMMU patches, thanks. >> >> >> Joerg >> >> >> >> > > Hi Joerg > > The drm rockchip patches are dependent on iommu/rockchip patches, can > you also apply these patches together? So that can avoid compile problem. > While at it. I don't see patch 8 (iommu/Kconfig) in linux-next. I suppose you forgot to pick that one. Regards, Matthias
iommu/rockchip: Fix bugs and enable on ARM64
On 2016å¹´06æ27æ¥ 20:57, Joerg Roedel wrote: > On Fri, Jun 24, 2016 at 10:13:25AM +0800, Shunqian Zheng wrote: >> drivers/gpu/drm/rockchip/rockchip_drm_drv.c | 100 +++-- >> drivers/gpu/drm/rockchip/rockchip_drm_drv.h | 3 + >> drivers/gpu/drm/rockchip/rockchip_drm_gem.c | 221 >> ++-- >> drivers/gpu/drm/rockchip/rockchip_drm_gem.h | 9 ++ >> drivers/iommu/Kconfig | 2 +- >> drivers/iommu/rockchip-iommu.c | 181 +-- >> 6 files changed, 413 insertions(+), 103 deletions(-) > Applied the IOMMU patches, thanks. > > > Joerg > > > > Hi Joerg The drm rockchip patches are dependent on iommu/rockchip patches, can you also apply these patches together? So that can avoid compile problem. Thanks. -- ï¼ark Yao
iommu/rockchip: Fix bugs and enable on ARM64
On Fri, Jun 24, 2016 at 10:13:25AM +0800, Shunqian Zheng wrote: > drivers/gpu/drm/rockchip/rockchip_drm_drv.c | 100 +++-- > drivers/gpu/drm/rockchip/rockchip_drm_drv.h | 3 + > drivers/gpu/drm/rockchip/rockchip_drm_gem.c | 221 > ++-- > drivers/gpu/drm/rockchip/rockchip_drm_gem.h | 9 ++ > drivers/iommu/Kconfig | 2 +- > drivers/iommu/rockchip-iommu.c | 181 +-- > 6 files changed, 413 insertions(+), 103 deletions(-) Applied the IOMMU patches, thanks. Joerg
iommu/rockchip: Fix bugs and enable on ARM64
This series intends mostly to enable support for ARM64 architecture
in the rockchip-iommu driver. On the way to do so, some bugs are also
fixed.
The most important changes here are:
- making the Rockchip IOMMU driver use DMA API for managing cache
coherency of page tables,
- making the Rockchip DRM driver not use DMA API on behalf of a virtual
device (behind a virtual IOMMU) to allocate and map buffers, but
instead proper DRM helpers and IOMMU API directly.
Changes since v4:
- Address some coding style comments on:
- https://chromium-review.googlesource.com/#/c/346328/38
- https://chromium-review.googlesource.com/#/c/353591/10
Changes since v3:
- Drop the idea of virtual IOMMU. Instead replace hacky allocation code
in DRM driver, with proper management of IOMMU domain.
- Add one more fix for allocation of IOMMU register base addresses.
Changes since v2:
- Instead of registering virtual IOMMU from DTS, create it when
attaching.
- Fix some bugs found in internal review.
Shunqian Zheng (4):
iommu/rockchip: Fix allocation of bases array in driver probe
iommu/rockchip: Use DMA API to manage coherency
iommu/rockchip: Prepare to support generic DMA mapping
drm/rockchip: Use common IOMMU API to attach devices
Simon Xue (3):
iommu/rockchip: Fix devm_{request,free}_irq parameter
iommu/rockchip: Add map_sg callback for rk_iommu_ops
iommu/rockchip: Enable Rockchip IOMMU on ARM64
Tomasz Figa (1):
drm/rockchip: Do not use DMA mapping API if attached to IOMMU domain
drivers/gpu/drm/rockchip/rockchip_drm_drv.c | 100 +++--
drivers/gpu/drm/rockchip/rockchip_drm_drv.h | 3 +
drivers/gpu/drm/rockchip/rockchip_drm_gem.c | 221 ++--
drivers/gpu/drm/rockchip/rockchip_drm_gem.h | 9 ++
drivers/iommu/Kconfig | 2 +-
drivers/iommu/rockchip-iommu.c | 181 +--
6 files changed, 413 insertions(+), 103 deletions(-)
--
1.9.1
[PATCH v4 0/8] iommu/rockchip: Fix bugs and enable on ARM64
Hi Joerg, On Tue, Jun 21, 2016 at 6:17 PM, Joerg Roedel wrote: > > On Tue, Jun 21, 2016 at 01:34:33PM +0900, Tomasz Figa wrote: > > This series intends mostly to enable support for ARM64 architecture > > in the rockchip-iommu driver. On the way to do so, some bugs are also > > fixed. > > > > The most important changes here are: > > - making the Rockchip IOMMU driver use DMA API for managing cache > >coherency of page tables, > > - making the Rockchip DRM driver not use DMA API on behalf of a virtual > >device (behind a virtual IOMMU) to allocate and map buffers, but > >instead proper DRM helpers and IOMMU API directly. > > Are these two parts dependent on each other or can the IOMMU and the DRM > part merged independently? In simple words, DRM patches depend on IOMMU patches. More precisely: The IOMMU patches alone are supposed to not break anything. Same goes for the first DRM patch (7/8). Only second DRM patch (8/8) depends on changes introduced by its predecessors. Best regards, Tomasz
[PATCH v4 0/8] iommu/rockchip: Fix bugs and enable on ARM64
On Tue, Jun 21, 2016 at 03:18:49PM +0200, Heiko Stübner wrote: > Am Dienstag, 21. Juni 2016, 14:54:35 schrieb Joerg Roedel: > > Hi Tomasz, > > > > On Tue, Jun 21, 2016 at 09:42:16PM +0900, Tomasz Figa wrote: > > > In simple words, DRM patches depend on IOMMU patches. > > > > > > More precisely: The IOMMU patches alone are supposed to not break > > > anything. Same goes for the first DRM patch (7/8). Only second DRM > > > patch (8/8) depends on changes introduced by its predecessors. > > > > The first DRM patch is 6/7, so it is 7/8 with the iommu dependency, > > right? Anyway, I think the best is I take the iommu patches when Heiko > > is ok with them and then the DRM tree can merge that branch in to apply > > the DRM patches. > > > > But first Heiko should have a look at the patches. > > I think from all his previous work on the rockchip iommus Tomasz is a lot > more > qualified to judge them - which I guess he did when picking up the ones from > Rockchip devs :-) . In that case you guys should probably co-maintain that driver? > > >From a style-side, please don't carry the Reviewed-on gerrit tags over to > mainline patches (patches 1 and 2). Okay. Joerg
[PATCH v4 0/8] iommu/rockchip: Fix bugs and enable on ARM64
Am Dienstag, 21. Juni 2016, 14:54:35 schrieb Joerg Roedel: > Hi Tomasz, > > On Tue, Jun 21, 2016 at 09:42:16PM +0900, Tomasz Figa wrote: > > In simple words, DRM patches depend on IOMMU patches. > > > > More precisely: The IOMMU patches alone are supposed to not break > > anything. Same goes for the first DRM patch (7/8). Only second DRM > > patch (8/8) depends on changes introduced by its predecessors. > > The first DRM patch is 6/7, so it is 7/8 with the iommu dependency, > right? Anyway, I think the best is I take the iommu patches when Heiko > is ok with them and then the DRM tree can merge that branch in to apply > the DRM patches. > > But first Heiko should have a look at the patches. I think from all his previous work on the rockchip iommus Tomasz is a lot more qualified to judge them - which I guess he did when picking up the ones from Rockchip devs :-) . >From a style-side, please don't carry the Reviewed-on gerrit tags over to mainline patches (patches 1 and 2). Other than that, I didn't see anything jump out and it looks all pretty nice. Heiko
[PATCH v4 0/8] iommu/rockchip: Fix bugs and enable on ARM64
Hi Tomasz, On Tue, Jun 21, 2016 at 09:42:16PM +0900, Tomasz Figa wrote: > In simple words, DRM patches depend on IOMMU patches. > > More precisely: The IOMMU patches alone are supposed to not break > anything. Same goes for the first DRM patch (7/8). Only second DRM > patch (8/8) depends on changes introduced by its predecessors. The first DRM patch is 6/7, so it is 7/8 with the iommu dependency, right? Anyway, I think the best is I take the iommu patches when Heiko is ok with them and then the DRM tree can merge that branch in to apply the DRM patches. But first Heiko should have a look at the patches. Thanks, Joerg
[PATCH v4 0/8] iommu/rockchip: Fix bugs and enable on ARM64
This series intends mostly to enable support for ARM64 architecture
in the rockchip-iommu driver. On the way to do so, some bugs are also
fixed.
The most important changes here are:
- making the Rockchip IOMMU driver use DMA API for managing cache
coherency of page tables,
- making the Rockchip DRM driver not use DMA API on behalf of a virtual
device (behind a virtual IOMMU) to allocate and map buffers, but
instead proper DRM helpers and IOMMU API directly.
Changes since v3:
- Drop the idea of virtual IOMMU. Instead replace hacky allocation code
in DRM driver, with proper management of IOMMU domain.
- Add one more fix for allocation of IOMMU register base addresses.
Changes since v2:
- Instead of registering virtual IOMMU from DTS, create it when
attaching.
- Fix some bugs found in internal review.
Shunqian Zheng (4):
iommu/rockchip: Fix allocation of bases array in driver probe
iommu/rockchip: Use DMA API to manage coherency
iommu/rockchip: Prepare to support generic DMA mapping
drm/rockchip: Use common IOMMU API to attach devices
Simon Xue (3):
iommu/rockchip: Fix devm_{request,free}_irq parameter
iommu/rockchip: Add map_sg callback for rk_iommu_ops
iommu/rockchip: Enable Rockchip IOMMU on ARM64
Tomasz Figa (1):
drm/rockchip: Do not use DMA mapping API if attached to IOMMU domain
drivers/gpu/drm/rockchip/rockchip_drm_drv.c | 100 ++--
drivers/gpu/drm/rockchip/rockchip_drm_drv.h | 3 +
drivers/gpu/drm/rockchip/rockchip_drm_gem.c | 236 ++--
drivers/gpu/drm/rockchip/rockchip_drm_gem.h | 9 ++
drivers/iommu/Kconfig | 2 +-
drivers/iommu/rockchip-iommu.c | 180 +++--
6 files changed, 427 insertions(+), 103 deletions(-)
--
2.8.0.rc3.226.g39d4020
[PATCH v4 0/8] iommu/rockchip: Fix bugs and enable on ARM64
On Tue, Jun 21, 2016 at 01:34:33PM +0900, Tomasz Figa wrote: > This series intends mostly to enable support for ARM64 architecture > in the rockchip-iommu driver. On the way to do so, some bugs are also > fixed. > > The most important changes here are: > - making the Rockchip IOMMU driver use DMA API for managing cache >coherency of page tables, > - making the Rockchip DRM driver not use DMA API on behalf of a virtual >device (behind a virtual IOMMU) to allocate and map buffers, but >instead proper DRM helpers and IOMMU API directly. Are these two parts dependent on each other or can the IOMMU and the DRM part merged independently? Joerg
