Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1575482

[PATCH v2 7/7] drm/rockchip: Call drm_gem_object_release() to destroy GEM base

Show all headers | View raw

From: Tomasz Figa <tfiga@chromium.org>

When converting the driver to use shmem-backed GEMs for IOMMU-enabled
systems, we forgot to add calls to drm_gem_object_release(), which gave
us a quite nice memory leak. This patch adds the missing calls.

Fixes: f11d5f0 ("FROMLIST: drm/rockchip: Do not use DMA mapping API if
attached to IOMMU domain")

TEST=while true; do backlight_dbus_tool --set --percent=0 && sleep 8 &&
 backlight_dbus_tool --set --percent=100 && sleep 3 ; done

Signed-off-by: Tomasz Figa <tfiga@chromium.org>
Signed-off-by: Mark Yao <mark.yao@rock-chips.com>
Reviewed-on: https://chromium-review.googlesource.com/385456
Reviewed-by: Douglas Anderson <dianders@chromium.org>
Reviewed-by: Daniel Kurtz <djkurtz@chromium.org>
---
 drivers/gpu/drm/rockchip/rockchip_drm_gem.c | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_gem.c b/drivers/gpu/drm/rockchip/rockchip_drm_gem.c
index 1769146..df9e570 100644
--- a/drivers/gpu/drm/rockchip/rockchip_drm_gem.c
+++ b/drivers/gpu/drm/rockchip/rockchip_drm_gem.c
@@ -301,6 +301,12 @@ int rockchip_gem_mmap(struct file *filp, struct vm_area_struct *vma)
 	return rockchip_drm_gem_object_mmap(obj, vma);
 }
 
+static void rockchip_gem_release_object(struct rockchip_gem_object *rk_obj)
+{
+	drm_gem_object_release(&rk_obj->base);
+	kfree(rk_obj);
+}
+
 struct rockchip_gem_object *
 	rockchip_gem_create_object(struct drm_device *drm, unsigned int size,
 				   bool alloc_kmap)
@@ -326,7 +332,7 @@ struct rockchip_gem_object *
 	return rk_obj;
 
 err_free_rk_obj:
-	kfree(rk_obj);
+	rockchip_gem_release_object(rk_obj);
 	return ERR_PTR(ret);
 }
 
@@ -338,13 +344,11 @@ void rockchip_gem_free_object(struct drm_gem_object *obj)
 {
 	struct rockchip_gem_object *rk_obj;
 
-	drm_gem_free_mmap_offset(obj);
-
 	rk_obj = to_rockchip_obj(obj);
 
 	rockchip_gem_free_buf(rk_obj);
 
-	kfree(rk_obj);
+	rockchip_gem_release_object(rk_obj);
 }
 
 /*
-- 
1.9.1

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[PATCH v2 0/7] drm/rockchip: switch to drm_mm for support arm64 iommu Mark Yao <mark.yao@rock-chips.com> - 2017-02-07 09:40 +0100
  [PATCH v2 6/7] drm/rockchip: Respect page offset in IOMMU mmap Mark Yao <mark.yao@rock-chips.com> - 2017-02-07 09:40 +0100
    Re: [PATCH v2 6/7] drm/rockchip: Respect page offset in IOMMU mmap Thierry Reding <thierry.reding@gmail.com> - 2017-02-07 13:40 +0100
  [PATCH v2 1/7] drm/rockchip: Do not use DMA mapping API if attached to IOMMU domain Mark Yao <mark.yao@rock-chips.com> - 2017-02-07 09:40 +0100
  [PATCH v2 7/7] drm/rockchip: Call drm_gem_object_release() to destroy GEM base Mark Yao <mark.yao@rock-chips.com> - 2017-02-07 09:40 +0100
    Re: [PATCH v2 7/7] drm/rockchip: Call drm_gem_object_release() to  destroy GEM base Thierry Reding <thierry.reding@gmail.com> - 2017-02-07 13:40 +0100
      Re: [PATCH v2 7/7] drm/rockchip: Call drm_gem_object_release() to  destroy GEM base Tomasz Figa <tfiga@chromium.org> - 2017-02-07 14:10 +0100
  Re: [PATCH v2 0/7] drm/rockchip: switch to drm_mm for support arm64  iommu Thierry Reding <thierry.reding@gmail.com> - 2017-02-07 13:40 +0100
    Re: [PATCH v2 0/7] drm/rockchip: switch to drm_mm for support arm64  iommu Mark yao <mark.yao@rock-chips.com> - 2017-02-08 02:20 +0100
  Re: [PATCH v2 0/7] drm/rockchip: switch to drm_mm for support arm64 iommu Heiko Stübner <heiko@sntech.de> - 2017-02-09 00:40 +0100

csiph-web