2016-04-05 13:51:10

by John Keeping

Subject: [PATCH 1/2] drm/rockchip: remove redundant statement

The call to arm_iommu_detach_device() on the previous line sets
dev->archdata.mapping to NULL so this call is always a no-op.

Signed-off-by: John Keeping <[email protected]>
---
drivers/gpu/drm/rockchip/rockchip_drm_drv.c | 1 -
1 file changed, 1 deletion(-)

diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_drv.c b/drivers/gpu/drm/rockchip/rockchip_drm_drv.c
index f556a8f..7695c79 100644
--- a/drivers/gpu/drm/rockchip/rockchip_drm_drv.c
+++ b/drivers/gpu/drm/rockchip/rockchip_drm_drv.c
@@ -244,7 +244,6 @@ static int rockchip_drm_unload(struct drm_device *drm_dev)
drm_kms_helper_poll_fini(drm_dev);
component_unbind_all(dev, drm_dev);
arm_iommu_detach_device(dev);
- arm_iommu_release_mapping(dev->archdata.mapping);
drm_mode_config_cleanup(drm_dev);
drm_dev->dev_private = NULL;

--
2.8.0.rc4.238.g874082a

2016-04-05 13:51:08

by John Keeping

Subject: [PATCH 2/2] drm/rockchip: don't leak iommu mapping

arm_iommu_attach_device() takes its own reference to the mapping we give
it. Since we do not keep a reference to the mapping ourselves, we must
release it before returning.

Also fix the error path, which fails to release the mapping if it has
called arm_iommu_detach_device() since that clears archdata.mapping.

Signed-off-by: John Keeping <[email protected]>
---
drivers/gpu/drm/rockchip/rockchip_drm_drv.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_drv.c b/drivers/gpu/drm/rockchip/rockchip_drm_drv.c
index 7695c79..1e2d88b 100644
--- a/drivers/gpu/drm/rockchip/rockchip_drm_drv.c
+++ b/drivers/gpu/drm/rockchip/rockchip_drm_drv.c
@@ -218,6 +218,7 @@ static int rockchip_drm_load(struct drm_device *drm_dev, unsigned long flags)
if (ret)
goto err_vblank_cleanup;

+ arm_iommu_release_mapping(mapping);
return 0;
err_vblank_cleanup:
drm_vblank_cleanup(drm_dev);
@@ -228,7 +229,7 @@ err_unbind:
err_detach_device:
arm_iommu_detach_device(dev);
err_release_mapping:
- arm_iommu_release_mapping(dev->archdata.mapping);
+ arm_iommu_release_mapping(mapping);
err_config_cleanup:
drm_mode_config_cleanup(drm_dev);
drm_dev->dev_private = NULL;
--
2.8.0.rc4.238.g874082a

2016-04-11 02:52:48

by Mark yao

Subject: Re: [PATCH 1/2] drm/rockchip: remove redundant statement

On 2016年04月05日 21:50, John Keeping wrote:
> The call to arm_iommu_detach_device() on the previous line sets
> dev->archdata.mapping to NULL so this call is always a no-op.
>
> Signed-off-by: John Keeping <[email protected]>
> ---
> drivers/gpu/drm/rockchip/rockchip_drm_drv.c | 1 -
> 1 file changed, 1 deletion(-)
>
> diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_drv.c b/drivers/gpu/drm/rockchip/rockchip_drm_drv.c
> index f556a8f..7695c79 100644
> --- a/drivers/gpu/drm/rockchip/rockchip_drm_drv.c
> +++ b/drivers/gpu/drm/rockchip/rockchip_drm_drv.c
> @@ -244,7 +244,6 @@ static int rockchip_drm_unload(struct drm_device *drm_dev)
> drm_kms_helper_poll_fini(drm_dev);
> component_unbind_all(dev, drm_dev);
> arm_iommu_detach_device(dev);
> - arm_iommu_release_mapping(dev->archdata.mapping);
> drm_mode_config_cleanup(drm_dev);
> drm_dev->dev_private = NULL;
>
Applied to my drm-fixes

Thanks.:-)

--
Ｍark Yao

2016-04-11 02:53:16

by Mark yao

Subject: Re: [PATCH 2/2] drm/rockchip: don't leak iommu mapping

On 2016年04月05日 21:50, John Keeping wrote:
> arm_iommu_attach_device() takes its own reference to the mapping we give
> it. Since we do not keep a reference to the mapping ourselves, we must
> release it before returning.
>
> Also fix the error path, which fails to release the mapping if it has
> called arm_iommu_detach_device() since that clears archdata.mapping.
>
> Signed-off-by: John Keeping <[email protected]>
> ---
> drivers/gpu/drm/rockchip/rockchip_drm_drv.c | 3 ++-
> 1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_drv.c b/drivers/gpu/drm/rockchip/rockchip_drm_drv.c
> index 7695c79..1e2d88b 100644
> --- a/drivers/gpu/drm/rockchip/rockchip_drm_drv.c
> +++ b/drivers/gpu/drm/rockchip/rockchip_drm_drv.c
> @@ -218,6 +218,7 @@ static int rockchip_drm_load(struct drm_device *drm_dev, unsigned long flags)
> if (ret)
> goto err_vblank_cleanup;
>
> + arm_iommu_release_mapping(mapping);
> return 0;
> err_vblank_cleanup:
> drm_vblank_cleanup(drm_dev);
> @@ -228,7 +229,7 @@ err_unbind:
> err_detach_device:
> arm_iommu_detach_device(dev);
> err_release_mapping:
> - arm_iommu_release_mapping(dev->archdata.mapping);
> + arm_iommu_release_mapping(mapping);
> err_config_cleanup:
> drm_mode_config_cleanup(drm_dev);
> drm_dev->dev_private = NULL;
Applied to my drm-fixes

Thanks.

--
Ｍark Yao