From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mblankhorst.nl ([141.105.120.124]:51116 "EHLO mblankhorst.nl" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728378AbeKMBCV (ORCPT ); Mon, 12 Nov 2018 20:02:21 -0500 From: Maarten Lankhorst To: dri-devel@lists.freedesktop.org Cc: intel-gfx@lists.freedesktop.org, Maarten Lankhorst , Eric Anholt , stable@vger.kernel.org Subject: [PATCH 1/2] drm/vc4: Fix memory leak during gpu reset. Date: Mon, 12 Nov 2018 16:01:13 +0100 Message-Id: <20181112150114.18395-1-maarten.lankhorst@linux.intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org List-ID: __drm_atomic_helper_crtc_destroy_state does not free memory, it only cleans it up. Fix this by calling the functions own destroy function. Fixes: 6d6e50039187 ("drm/vc4: Allocate the right amount of space for boot-time CRTC state.") Cc: Eric Anholt Cc: # v4.6+ Signed-off-by: Maarten Lankhorst --- drivers/gpu/drm/vc4/vc4_crtc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/gpu/drm/vc4/vc4_crtc.c b/drivers/gpu/drm/vc4/vc4_crtc.c index 3ce136ba8791..cd226e63d557 100644 --- a/drivers/gpu/drm/vc4/vc4_crtc.c +++ b/drivers/gpu/drm/vc4/vc4_crtc.c @@ -999,7 +999,7 @@ static void vc4_crtc_reset(struct drm_crtc *crtc) { if (crtc->state) - __drm_atomic_helper_crtc_destroy_state(crtc->state); + vc4_crtc_destroy_state(crtc->state); crtc->state = kzalloc(sizeof(struct vc4_crtc_state), GFP_KERNEL); if (crtc->state) -- 2.19.1 From mboxrd@z Thu Jan 1 00:00:00 1970 From: Maarten Lankhorst Subject: [PATCH 1/2] drm/vc4: Fix memory leak during gpu reset. Date: Mon, 12 Nov 2018 16:01:13 +0100 Message-ID: <20181112150114.18395-1-maarten.lankhorst@linux.intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" To: dri-devel@lists.freedesktop.org Cc: intel-gfx@lists.freedesktop.org, stable@vger.kernel.org List-Id: dri-devel@lists.freedesktop.org X19kcm1fYXRvbWljX2hlbHBlcl9jcnRjX2Rlc3Ryb3lfc3RhdGUgZG9lcyBub3QgZnJlZSBtZW1v cnksIGl0IG9ubHkKY2xlYW5zIGl0IHVwLiBGaXggdGhpcyBieSBjYWxsaW5nIHRoZSBmdW5jdGlv bnMgb3duIGRlc3Ryb3kgZnVuY3Rpb24uCgpGaXhlczogNmQ2ZTUwMDM5MTg3ICgiZHJtL3ZjNDog QWxsb2NhdGUgdGhlIHJpZ2h0IGFtb3VudCBvZiBzcGFjZSBmb3IgYm9vdC10aW1lIENSVEMgc3Rh dGUuIikKQ2M6IEVyaWMgQW5ob2x0IDxlcmljQGFuaG9sdC5uZXQ+CkNjOiA8c3RhYmxlQHZnZXIu a2VybmVsLm9yZz4gIyB2NC42KwpTaWduZWQtb2ZmLWJ5OiBNYWFydGVuIExhbmtob3JzdCA8bWFh cnRlbi5sYW5raG9yc3RAbGludXguaW50ZWwuY29tPgotLS0KIGRyaXZlcnMvZ3B1L2RybS92YzQv dmM0X2NydGMuYyB8IDIgKy0KIDEgZmlsZSBjaGFuZ2VkLCAxIGluc2VydGlvbigrKSwgMSBkZWxl dGlvbigtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS92YzQvdmM0X2NydGMuYyBiL2Ry aXZlcnMvZ3B1L2RybS92YzQvdmM0X2NydGMuYwppbmRleCAzY2UxMzZiYTg3OTEuLmNkMjI2ZTYz ZDU1NyAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL3ZjNC92YzRfY3J0Yy5jCisrKyBiL2Ry aXZlcnMvZ3B1L2RybS92YzQvdmM0X2NydGMuYwpAQCAtOTk5LDcgKzk5OSw3IEBAIHN0YXRpYyB2 b2lkCiB2YzRfY3J0Y19yZXNldChzdHJ1Y3QgZHJtX2NydGMgKmNydGMpCiB7CiAJaWYgKGNydGMt PnN0YXRlKQotCQlfX2RybV9hdG9taWNfaGVscGVyX2NydGNfZGVzdHJveV9zdGF0ZShjcnRjLT5z dGF0ZSk7CisJCXZjNF9jcnRjX2Rlc3Ryb3lfc3RhdGUoY3J0Yy0+c3RhdGUpOwogCiAJY3J0Yy0+ c3RhdGUgPSBremFsbG9jKHNpemVvZihzdHJ1Y3QgdmM0X2NydGNfc3RhdGUpLCBHRlBfS0VSTkVM KTsKIAlpZiAoY3J0Yy0+c3RhdGUpCi0tIAoyLjE5LjEKCl9fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fCkludGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwtZ2Z4 QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWls bWFuL2xpc3RpbmZvL2ludGVsLWdmeAo=