| Message ID | 5049994e6c2ba92c2f30d51850c8929136d0f8ca.1649167878.git.robin.murphy@arm.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | drm/arm/malidp: Stop using iommu_present() | expand |
Hi Robin, On Tue, Apr 05, 2022 at 03:11:18PM +0100, Robin Murphy wrote: > iommu_get_domain_for_dev() is already perfectly happy to return NULL > if the given device has no IOMMU. Drop the unnecessary check. > > Signed-off-by: Robin Murphy <robin.murphy@arm.com> LGTM, Acked-by: Brian Starkey <brian.starkey@arm.com> I'll have to leave it to Liviu to push though. Thanks, -Brian > --- > drivers/gpu/drm/arm/malidp_planes.c | 14 +++++--------- > 1 file changed, 5 insertions(+), 9 deletions(-) > > diff --git a/drivers/gpu/drm/arm/malidp_planes.c b/drivers/gpu/drm/arm/malidp_planes.c > index 0562bdaac00c..81d9f5004025 100644 > --- a/drivers/gpu/drm/arm/malidp_planes.c > +++ b/drivers/gpu/drm/arm/malidp_planes.c > @@ -310,17 +310,13 @@ static int malidp_se_check_scaling(struct malidp_plane *mp, > > static u32 malidp_get_pgsize_bitmap(struct malidp_plane *mp) > { > - u32 pgsize_bitmap = 0; > + struct iommu_domain *mmu_dom; > > - if (iommu_present(&platform_bus_type)) { > - struct iommu_domain *mmu_dom = > - iommu_get_domain_for_dev(mp->base.dev->dev); > + mmu_dom = iommu_get_domain_for_dev(mp->base.dev->dev); > + if (mmu_dom) > + return mmu_dom->pgsize_bitmap; > > - if (mmu_dom) > - pgsize_bitmap = mmu_dom->pgsize_bitmap; > - } > - > - return pgsize_bitmap; > + return 0; > } > > /* > -- > 2.28.0.dirty >
On Wed, Apr 06, 2022 at 10:27:00AM +0100, Brian Starkey wrote: > Hi Robin, > > On Tue, Apr 05, 2022 at 03:11:18PM +0100, Robin Murphy wrote: > > iommu_get_domain_for_dev() is already perfectly happy to return NULL > > if the given device has no IOMMU. Drop the unnecessary check. > > > > Signed-off-by: Robin Murphy <robin.murphy@arm.com> > > LGTM, Acked-by: Brian Starkey <brian.starkey@arm.com> > > I'll have to leave it to Liviu to push though. I have now pushed the patch together with other 3 that have been lingering in my tree. Best regards, Liviu > > Thanks, > -Brian > > > --- > > drivers/gpu/drm/arm/malidp_planes.c | 14 +++++--------- > > 1 file changed, 5 insertions(+), 9 deletions(-) > > > > diff --git a/drivers/gpu/drm/arm/malidp_planes.c b/drivers/gpu/drm/arm/malidp_planes.c > > index 0562bdaac00c..81d9f5004025 100644 > > --- a/drivers/gpu/drm/arm/malidp_planes.c > > +++ b/drivers/gpu/drm/arm/malidp_planes.c > > @@ -310,17 +310,13 @@ static int malidp_se_check_scaling(struct malidp_plane *mp, > > > > static u32 malidp_get_pgsize_bitmap(struct malidp_plane *mp) > > { > > - u32 pgsize_bitmap = 0; > > + struct iommu_domain *mmu_dom; > > > > - if (iommu_present(&platform_bus_type)) { > > - struct iommu_domain *mmu_dom = > > - iommu_get_domain_for_dev(mp->base.dev->dev); > > + mmu_dom = iommu_get_domain_for_dev(mp->base.dev->dev); > > + if (mmu_dom) > > + return mmu_dom->pgsize_bitmap; > > > > - if (mmu_dom) > > - pgsize_bitmap = mmu_dom->pgsize_bitmap; > > - } > > - > > - return pgsize_bitmap; > > + return 0; > > } > > > > /* > > -- > > 2.28.0.dirty > >
diff --git a/drivers/gpu/drm/arm/malidp_planes.c b/drivers/gpu/drm/arm/malidp_planes.c index 0562bdaac00c..81d9f5004025 100644 --- a/drivers/gpu/drm/arm/malidp_planes.c +++ b/drivers/gpu/drm/arm/malidp_planes.c @@ -310,17 +310,13 @@ static int malidp_se_check_scaling(struct malidp_plane *mp, static u32 malidp_get_pgsize_bitmap(struct malidp_plane *mp) { - u32 pgsize_bitmap = 0; + struct iommu_domain *mmu_dom; - if (iommu_present(&platform_bus_type)) { - struct iommu_domain *mmu_dom = - iommu_get_domain_for_dev(mp->base.dev->dev); + mmu_dom = iommu_get_domain_for_dev(mp->base.dev->dev); + if (mmu_dom) + return mmu_dom->pgsize_bitmap; - if (mmu_dom) - pgsize_bitmap = mmu_dom->pgsize_bitmap; - } - - return pgsize_bitmap; + return 0; } /*
iommu_get_domain_for_dev() is already perfectly happy to return NULL if the given device has no IOMMU. Drop the unnecessary check. Signed-off-by: Robin Murphy <robin.murphy@arm.com> --- drivers/gpu/drm/arm/malidp_planes.c | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-)