From: Sean Paul Subject: [PATCH] drm/msm/a6xx: Avoid freeing gmu resources multiple times Date: Tue, 21 May 2019 12:54:20 -0400 Message-ID: <20190521165433.2895-1-sean@poorly.run> 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: freedreno-bounces-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org Sender: "Freedreno" To: dri-devel-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org, freedreno-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org Cc: Sean Paul , Jordan Crouse , Sean Paul , Rob Clark , linux-arm-msm-u79uwXL29TY76Z2rM5mHXA@public.gmane.org List-Id: dri-devel@lists.freedesktop.org RnJvbTogU2VhbiBQYXVsIDxzZWFucGF1bEBjaHJvbWl1bS5vcmc+CgpUaGUgZHJpdmVyIGNoZWNr cyBmb3IgZ211LT5tbWlvIGFzIGEgc2lnbiB0aGF0IHRoZSBkZXZpY2UgaGFzIGJlZW4KaW5pdGlh bGl6ZWQsIGhvd2V2ZXIgdGhlcmUgYXJlIGZhaWx1cmVzIGluIHByb2JlIGJlbG93IHRoZSBtbWlv IGluaXQuCklmIG9uZSBvZiB0aG9zZSBpcyBoaXQsIG1taW8gd2lsbCBiZSBub24tbnVsbCBidXQg ZnJlZWQuCgpJbiB0aGF0IGNhc2UsIGE2eHhfZ211X3Byb2JlIHdpbGwgcmV0dXJuIGFuIGVycm9y IHRvIGE2eHhfZ3B1X2luaXQgd2hpY2gKd2lsbCBpbiB0dXJuIGNhbGwgYTZ4eF9nbXVfcmVtb3Zl IHdoaWNoIGNoZWNrcyBnbXUtPm1taW8gYW5kIHRyaWVzIHRvIGZyZWUKcmVzb3VyY2VzIGZvciBh IHNlY29uZCB0aW1lLiBUaGlzIGNhdXNlcyBhIGdyZWF0IGJvb20uCgpGaXggdGhpcyBieSBhZGRp bmcgYW4gaW5pdGlhbGl6ZWQgbWVtYmVyIHRvIGdtdSB3aGljaCBpcyBzZXQgb24Kc3VjY2Vzc2Z1 bCBwcm9iZSBhbmQgY2xlYXJlZCBvbiByZW1vdmFsLgoKQ2M6IEpvcmRhbiBDcm91c2UgPGpjcm91 c2VAY29kZWF1cm9yYS5vcmc+ClNpZ25lZC1vZmYtYnk6IFNlYW4gUGF1bCA8c2VhbnBhdWxAY2hy b21pdW0ub3JnPgotLS0KIGRyaXZlcnMvZ3B1L2RybS9tc20vYWRyZW5vL2E2eHhfZ211LmMgfCAx NCArKysrKysrKystLS0tLQogZHJpdmVycy9ncHUvZHJtL21zbS9hZHJlbm8vYTZ4eF9nbXUuaCB8 ICAxICsKIDIgZmlsZXMgY2hhbmdlZCwgMTAgaW5zZXJ0aW9ucygrKSwgNSBkZWxldGlvbnMoLSkK CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vbXNtL2FkcmVuby9hNnh4X2dtdS5jIGIvZHJp dmVycy9ncHUvZHJtL21zbS9hZHJlbm8vYTZ4eF9nbXUuYwppbmRleCAzOGUyY2ZhOWNlYzcuLmFh ODRlZGIyNWQ5MSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL21zbS9hZHJlbm8vYTZ4eF9n bXUuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vbXNtL2FkcmVuby9hNnh4X2dtdS5jCkBAIC03NCw3 ICs3NCw3IEBAIGJvb2wgYTZ4eF9nbXVfc3B0cHJhY19pc19vbihzdHJ1Y3QgYTZ4eF9nbXUgKmdt dSkKIAl1MzIgdmFsOwogCiAJLyogVGhpcyBjYW4gYmUgY2FsbGVkIGZyb20gZ3B1IHN0YXRlIGNv ZGUgc28gbWFrZSBzdXJlIEdNVSBpcyB2YWxpZCAqLwotCWlmIChJU19FUlJfT1JfTlVMTChnbXUt Pm1taW8pKQorCWlmICghZ211LT5pbml0aWFsaXplZCkKIAkJcmV0dXJuIGZhbHNlOwogCiAJdmFs ID0gZ211X3JlYWQoZ211LCBSRUdfQTZYWF9HTVVfU1BUUFJBQ19QV1JfQ0xLX1NUQVRVUyk7CkBA IC05MCw3ICs5MCw3IEBAIGJvb2wgYTZ4eF9nbXVfZ3hfaXNfb24oc3RydWN0IGE2eHhfZ211ICpn bXUpCiAJdTMyIHZhbDsKIAogCS8qIFRoaXMgY2FuIGJlIGNhbGxlZCBmcm9tIGdwdSBzdGF0ZSBj b2RlIHNvIG1ha2Ugc3VyZSBHTVUgaXMgdmFsaWQgKi8KLQlpZiAoSVNfRVJSX09SX05VTEwoZ211 LT5tbWlvKSkKKwlpZiAoIWdtdS0+aW5pdGlhbGl6ZWQpCiAJCXJldHVybiBmYWxzZTsKIAogCXZh bCA9IGdtdV9yZWFkKGdtdSwgUkVHX0E2WFhfR01VX1NQVFBSQUNfUFdSX0NMS19TVEFUVVMpOwpA QCAtNjk1LDcgKzY5NSw3IEBAIGludCBhNnh4X2dtdV9yZXN1bWUoc3RydWN0IGE2eHhfZ3B1ICph Nnh4X2dwdSkKIAlzdHJ1Y3QgYTZ4eF9nbXUgKmdtdSA9ICZhNnh4X2dwdS0+Z211OwogCWludCBz dGF0dXMsIHJldDsKIAotCWlmIChXQVJOKCFnbXUtPm1taW8sICJUaGUgR01VIGlzIG5vdCBzZXQg dXAgeWV0XG4iKSkKKwlpZiAoV0FSTighZ211LT5pbml0aWFsaXplZCwgIlRoZSBHTVUgaXMgbm90 IHNldCB1cCB5ZXRcbiIpKQogCQlyZXR1cm4gMDsKIAogCWdtdS0+aHVuZyA9IGZhbHNlOwpAQCAt NzY1LDcgKzc2NSw3IEBAIGJvb2wgYTZ4eF9nbXVfaXNpZGxlKHN0cnVjdCBhNnh4X2dtdSAqZ211 KQogewogCXUzMiByZWc7CiAKLQlpZiAoIWdtdS0+bW1pbykKKwlpZiAoIWdtdS0+aW5pdGlhbGl6 ZWQpCiAJCXJldHVybiB0cnVlOwogCiAJcmVnID0gZ211X3JlYWQoZ211LCBSRUdfQTZYWF9HUFVf R01VX0FPX0dQVV9DWF9CVVNZX1NUQVRVUyk7CkBAIC0xMjI3LDcgKzEyMjcsNyBAQCB2b2lkIGE2 eHhfZ211X3JlbW92ZShzdHJ1Y3QgYTZ4eF9ncHUgKmE2eHhfZ3B1KQogewogCXN0cnVjdCBhNnh4 X2dtdSAqZ211ID0gJmE2eHhfZ3B1LT5nbXU7CiAKLQlpZiAoSVNfRVJSX09SX05VTEwoZ211LT5t bWlvKSkKKwlpZiAoIWdtdS0+aW5pdGlhbGl6ZWQpCiAJCXJldHVybjsKIAogCWE2eHhfZ211X3N0 b3AoYTZ4eF9ncHUpOwpAQCAtMTI0NSw2ICsxMjQ1LDggQEAgdm9pZCBhNnh4X2dtdV9yZW1vdmUo c3RydWN0IGE2eHhfZ3B1ICphNnh4X2dwdSkKIAlpb21tdV9kZXRhY2hfZGV2aWNlKGdtdS0+ZG9t YWluLCBnbXUtPmRldik7CiAKIAlpb21tdV9kb21haW5fZnJlZShnbXUtPmRvbWFpbik7CisKKwln bXUtPmluaXRpYWxpemVkID0gZmFsc2U7CiB9CiAKIGludCBhNnh4X2dtdV9wcm9iZShzdHJ1Y3Qg YTZ4eF9ncHUgKmE2eHhfZ3B1LCBzdHJ1Y3QgZGV2aWNlX25vZGUgKm5vZGUpCkBAIC0xMzA5LDYg KzEzMTEsOCBAQCBpbnQgYTZ4eF9nbXVfcHJvYmUoc3RydWN0IGE2eHhfZ3B1ICphNnh4X2dwdSwg c3RydWN0IGRldmljZV9ub2RlICpub2RlKQogCS8qIFNldCB1cCB0aGUgSEZJIHF1ZXVlcyAqLwog CWE2eHhfaGZpX2luaXQoZ211KTsKIAorCWdtdS0+aW5pdGlhbGl6ZWQgPSB0cnVlOworCiAJcmV0 dXJuIDA7CiBlcnI6CiAJYTZ4eF9nbXVfbWVtb3J5X2ZyZWUoZ211LCBnbXUtPmhmaSk7CmRpZmYg LS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vbXNtL2FkcmVuby9hNnh4X2dtdS5oIGIvZHJpdmVycy9n cHUvZHJtL21zbS9hZHJlbm8vYTZ4eF9nbXUuaAppbmRleCBiZWRkOGU2YTYzYWEuLjM5YTI2ZGQ2 MzY3NCAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL21zbS9hZHJlbm8vYTZ4eF9nbXUuaAor KysgYi9kcml2ZXJzL2dwdS9kcm0vbXNtL2FkcmVuby9hNnh4X2dtdS5oCkBAIC03NSw2ICs3NSw3 IEBAIHN0cnVjdCBhNnh4X2dtdSB7CiAKIAlzdHJ1Y3QgYTZ4eF9oZmlfcXVldWUgcXVldWVzWzJd OwogCisJYm9vbCBpbml0aWFsaXplZDsKIAlib29sIGh1bmc7CiB9OwogCi0tIApTZWFuIFBhdWws IFNvZnR3YXJlIEVuZ2luZWVyLCBHb29nbGUgLyBDaHJvbWl1bSBPUwoKX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KRnJlZWRyZW5vIG1haWxpbmcgbGlzdApG cmVlZHJlbm9AbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Au b3JnL21haWxtYW4vbGlzdGluZm8vZnJlZWRyZW5v