drm/nouveau: Remove redundant _get
Subsystems (4)
PATCH 1/2 drm/nouveau: Remove redundant _get
From: Thierry Reding <[email protected]>
The nouveau_fence_get_get_driver_name() function has a redundant _get in its name. Remove it.
Signed-off-by Thierry Reding <[email protected]>
--- drivers/gpu/drm/nouveau/nouveau_fence.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/gpu/drm/nouveau/nouveau_fence.c +3 -3
@@ -426,7 +426,7 @@ nouveau_fence_new(struct nouveau_channel *chan, bool sysmem,return ret; } -static const char *nouveau_fence_get_get_driver_name (struct dma_fence *fence) +static const char *nouveau_fence_get_driver_name (struct dma_fence *fence) {return "nouveau" ; }
@@ -496,7 +496,7 @@ static void nouveau_fence_release(struct dma_fence *f) }static const struct dma_fence_ops nouveau_fence_ops_legacy = { - .get_driver_name = nouveau_fence_get_get_driver_name, + .get_driver_name = nouveau_fence_get_driver_name, .get_timeline_name = nouveau_fence_get_timeline_name, .enable_signaling = nouveau_fence_no_signaling, .signaled = nouveau_fence_is_signaled,
@@ -523,7 +523,7 @@ static bool nouveau_fence_enable_signaling(struct dma_fence *f) }static const struct dma_fence_ops nouveau_fence_ops_uevent = { - .get_driver_name = nouveau_fence_get_get_driver_name, + .get_driver_name = nouveau_fence_get_driver_name, .get_timeline_name = nouveau_fence_get_timeline_name, .enable_signaling = nouveau_fence_enable_signaling, .signaled = nouveau_fence_is_signaled,
Signature · 1 line
2.15.1
A message that is not in the archive (sent off-list or not yet received): 20180111214221.25919-1-thierry.reding-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org
PATCH 2/2 drm/nouveau: tegra: Use IOMMU groups
From: Thierry Reding <[email protected]>
Use IOMMU groups to attach the GPU to its IOMMU domain. This is not strictly necessary because the domain isn't shared with any other device, but it makes the code consistent with how IOMMU is handled in other drivers and provides an easy way to detect when no IOMMU has been attached via device tree.
Signed-off-by Thierry Reding <[email protected]>
--- drivers/gpu/drm/nouveau/include/nvkm/core/tegra.h | 1 + drivers/gpu/drm/nouveau/nvkm/engine/device/tegra.c | 18 +++++++++++------- 2 files changed, 12 insertions(+), 7 deletions(-)
drivers/gpu/drm/nouveau/include/nvkm/core/tegra.h +1 -0
@@ -25,6 +25,7 @@ struct nvkm_device_tegra {struct nvkm_mm mm;struct iommu_domain *domain; +struct iommu_group *group;unsigned long pgshift; } iommu;
drivers/gpu/drm/nouveau/nvkm/engine/device/tegra.c +11 -7
@@ -110,7 +110,8 @@ nvkm_device_tegra_probe_iommu(struct nvkm_device_tegra *tdev)mutex_init (&tdev->iommu.mutex); -if (iommu_present (&platform_bus_type)) { + tdev->iommu.group =iommu_group_get (dev); +if (tdev->iommu.group) { tdev->iommu.domain =iommu_domain_alloc (&platform_bus_type);if (!tdev->iommu.domain) goto error;
@@ -132,7 +133,7 @@ nvkm_device_tegra_probe_iommu(struct nvkm_device_tegra *tdev) tdev->iommu.pgshift -=1 ; } - ret =iommu_attach_device (tdev->iommu.domain, dev); + ret =iommu_attach_group (tdev->iommu.domain, tdev->iommu.group);if (ret) goto free_domain;
@@ -140,19 +141,21 @@ nvkm_device_tegra_probe_iommu(struct nvkm_device_tegra *tdev) (1ULL << tdev->func->iommu_bit) >> tdev->iommu.pgshift, 1);if (ret) - goto detach_device; + goto detach_group; }return ; -detach_device: -iommu_detach_device (tdev->iommu.domain, dev); +detach_group: +iommu_detach_group (tdev->iommu.domain, tdev->iommu.group); free_domain:iommu_domain_free (tdev->iommu.domain); error: +iommu_group_put (tdev->iommu.group); tdev->iommu.domain =NULL ; + tdev->iommu.group =NULL ; tdev->iommu.pgshift =0 ;dev_err (dev,"cannot initialize IOMMU MM\n" );#endif
@@ -162,10 +165,11 @@ static void nvkm_device_tegra_remove_iommu(struct nvkm_device_tegra *tdev) {#if IS_ENABLED (CONFIG_IOMMU_API ) -if (tdev->iommu.domain) { +if (tdev->iommu.group && tdev->iommu.domain) {nvkm_mm_fini (&tdev->iommu.mm); -iommu_detach_device (tdev->iommu.domain, tdev->device.dev); +iommu_detach_group (tdev->iommu.domain, tdev->iommu.group);iommu_domain_free (tdev->iommu.domain); +iommu_group_put (tdev->iommu.group); }#endif }
Signature · 6 lines
2.15.1 _______________________________________________ Nouveau mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/nouveau