From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ville =?iso-8859-1?Q?Syrj=E4l=E4?= Subject: Re: [PATCH 1/6] Revert "drm/atomic-helper: Fix leak in disable_all" Date: Wed, 21 Mar 2018 14:25:02 +0200 Message-ID: <20180321122502.GW5453@intel.com> References: <20180320191757.23869-1-ville.syrjala@linux.intel.com> <20180321082506.GY14155@phenom.ffwll.local> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Content-Disposition: inline In-Reply-To: <20180321082506.GY14155@phenom.ffwll.local> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" To: Daniel Vetter Cc: Daniel Vetter , intel-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org List-Id: dri-devel@lists.freedesktop.org T24gV2VkLCBNYXIgMjEsIDIwMTggYXQgMDk6MjU6MDZBTSArMDEwMCwgRGFuaWVsIFZldHRlciB3 cm90ZToKPiBPbiBUdWUsIE1hciAyMCwgMjAxOCBhdCAwOToxNzo1MlBNICswMjAwLCBWaWxsZSBT eXJqYWxhIHdyb3RlOgo+ID4gRnJvbTogVmlsbGUgU3lyasOkbMOkIDx2aWxsZS5zeXJqYWxhQGxp bnV4LmludGVsLmNvbT4KPiA+IAo+ID4gQ3VycmVudGx5IHdlJ3JlIGxlYWtpbmcgZmJzIG9uIGxv YWQgZGV0ZWN0IG9uIGFjY291bnQgb2Ygbm90aGluZyBzZXR0aW5nCj4gPiB1cCBwbGFuZS0+b2xk X2ZiIGZvciB0aGUgZHJtX2F0b21pY19jbGVhbl9vbGRfZmIoKSBjYWxsIGluCj4gPiBkcm1fYXRv bWljX2hlbHBlcl9jb21taXRfZHVwbGljYXRlZF9zdGF0ZSgpLiBSZW1vdmluZyB0aGUKPiA+IGRy bV9hdG9taWNfY2xlYW5fb2xkX2ZiKCkgY2FsbCBzZWVtcyBsaWtlIHRoZSByaWdodCBjYWxsIHRv IG1lIGhlcmUuCj4gPiBUaGlzIGRvZXMgbWVhbiB3ZSBlbmQgdXAgbGVha2luZyBzb21ldGhpbmcg dmlhCj4gPiBkcm1fYXRvbWljX2hlbHBlcl9zaHV0ZG93bigpIHRob3VnaCwgYnV0IHdlJ2xsIGZp eCB0aGF0IHVwIGluIGEKPiA+IGRpZmZlcmVudCB3YXkuCj4gPiAKPiA+IFRoaXMgcmV2ZXJ0cyBj b21taXQgNDlkNzBhZWFlY2E4ZjYyYjcyYjc3MTJlY2QxZTI5NjE5YTQ0NTg2Ni4KPiAKPiBTbyB0 aGUgcmVhc29uIEkgd2VudCB0aGlzIHdheSBhbmQgbm90IHdoYXQgeW91J3JlIHN1Z2dlc3Rpbmcg aW4gdGhpcyBwYXRjaAo+IHNlcmllcyBpcyB0aGF0IGk5MTUgaXMgdGhlIG9uZSBhbmQgb25seSBk cml2ZXIgbm9vZGxpbmcgYXJvdW5kIHdpdGggbG9hZAo+IGRldGVjdCBhbmQgZ3B1IHJlc2V0IHRo YXQgbmVlZHMgdGhpcy4KPiAKPiBJbW8gaXQnZCBiZSBiZXR0ZXIgdG8gZml4IHVwIG91ciBsb2Fk IGRldGVjdCBjb2RlIHRvIGFsc28gc2V0IHRoZSBvbGRfZmIKPiBzdHVmZiB1cCBjb3JyZWN0bHks CgpGZWVscyBhIGJpdCBzaWxseSB0byBqdXN0IHNldCBwbGFuZS0+b2xkX2ZiID0gcGxhbmUtPmZi IGFuZCBpbW1lZGlhdGVseQpmb2xsb3cgaXQgdXAgd2l0aCBpbmMocGxhbmUtPmZiKStkZWMocGxh bmUtPm9sZF9mYikgYW5kIG9sZF9mYj1OVUxMLgoKPiBhbmQgYWRkIGF0IGxlYXN0IGEgbG9uZy10 ZXJtIHRhc2sgdG8gdG9kby5yc3QgdG8gZ2V0Cj4gcmlkIG9mIGFsbCB0aGlzLgoKSSBoYXZlIGEg c2VyaWVzIHRoYXQgc3RvcHMgdXNpbmcgcGxhbmUtPmZiL29sZF9mYiBlbnRpcmVseSBvbiBhdG9t aWMKZHJpdmVycy4gVGhhdCByZW1vdmVzIHRoZSBlbnRpcmUgY2xlYW5fb2xkX2ZicygpIHRoaW5n LiBOb3Qgc3VyZSBhbGwKZHJpdmVycyBhcmUgcmVhZHkgZm9yIHRoYXQgdGhvdWdoLiBJIHRoaW5r IEknbGwgcG9zdCBpdCBhcyBhbiByZmMKYW55d2F5LgoKPiBJbmZsaWN0aW5nIGEgbmV3IHBhcmFt ZXRlciBvbiBhbGwgdGhlIG90aGVyIGRyaXZlcyAobGlrZQo+IHlvdSBkbyBpbiBwYXRjaCAyKSBp cyBpbW8gdGhlIHdyb25nIHdheSByb3VuZCAtIHdlIGhhdmUgMzEgb3RoZXIgYXRvbWljCj4gZHJp dmVycyB0aGFuIGk5MTUua28uCgpOb25lIG9mIHRoZW0gdXNlIGRpc2FibGVfYWxsKCkgZGlyZWN0 bHkuCgpCdXQgaWYgd2Ugd2FudCB0byBhdm9pZCB0aGUgbmV3IHBhcmFtZXRlciBiZWluZyB2aXNp YmxlIHRvbyBkcml2ZXJzIEkKY291bGQganVzdCBzcXVhc2ggaW46CgpkaWZmIC0tZ2l0IGEvZHJp dmVycy9ncHUvZHJtL2RybV9hdG9taWNfaGVscGVyLmMgYi9kcml2ZXJzL2dwdS9kcm0vZHJtX2F0 b21pY19oZWxwZXIuYwppbmRleCA3NjQyNGRkOTYxZDcuLmNkZjEwYjllNTE3NyAxMDA2NDQKLS0t IGEvZHJpdmVycy9ncHUvZHJtL2RybV9hdG9taWNfaGVscGVyLmMKKysrIGIvZHJpdmVycy9ncHUv ZHJtL2RybV9hdG9taWNfaGVscGVyLmMKQEAgLTI4ODEsMzMgKzI4ODEsOSBAQCBpbnQgX19kcm1f YXRvbWljX2hlbHBlcl9zZXRfY29uZmlnKHN0cnVjdCBkcm1fbW9kZV9zZXQgKnNldCwKIAlyZXR1 cm4gMDsKIH0KIAotLyoqCi0gKiBkcm1fYXRvbWljX2hlbHBlcl9kaXNhYmxlX2FsbCAtIGRpc2Fi bGUgYWxsIGN1cnJlbnRseSBhY3RpdmUgb3V0cHV0cwotICogQGRldjogRFJNIGRldmljZQotICog QGN0eDogbG9jayBhY3F1aXNpdGlvbiBjb250ZXh0Ci0gKiBAY2xlYW5fb2xkX2ZiczogdXBkYXRl IHRoZSBwbGFuZS0+ZmIvb2xkX2ZiIHBvaW50ZXJzPwotICoKLSAqIExvb3BzIHRocm91Z2ggYWxs IGNvbm5lY3RvcnMsIGZpbmRpbmcgdGhvc2UgdGhhdCBhcmVuJ3QgdHVybmVkIG9mZiBhbmQgdGhl bgotICogdHVybnMgdGhlbSBvZmYgYnkgc2V0dGluZyB0aGVpciBEUE1TIG1vZGUgdG8gT0ZGIGFu ZCBkZWFjdGl2YXRpbmcgdGhlIENSVEMKLSAqIHRoYXQgdGhleSBhcmUgY29ubmVjdGVkIHRvLgot ICoKLSAqIFRoaXMgaXMgdXNlZCBmb3IgZXhhbXBsZSBpbiBzdXNwZW5kL3Jlc3VtZSB0byBkaXNh YmxlIGFsbCBjdXJyZW50bHkgYWN0aXZlCi0gKiBmdW5jdGlvbnMgd2hlbiBzdXNwZW5kaW5nLiBJ ZiB5b3UganVzdCB3YW50IHRvIHNodXQgZG93biBldmVyeXRoaW5nIGF0IGUuZy4KLSAqIGRyaXZl ciB1bmxvYWQsIGxvb2sgYXQgZHJtX2F0b21pY19oZWxwZXJfc2h1dGRvd24oKS4KLSAqCi0gKiBO b3RlIHRoYXQgaWYgY2FsbGVycyBoYXZlbid0IGFscmVhZHkgYWNxdWlyZWQgYWxsIG1vZGVzZXQg bG9ja3MgdGhpcyBtaWdodAotICogcmV0dXJuIC1FREVBRExLLCB3aGljaCBtdXN0IGJlIGhhbmRs ZWQgYnkgY2FsbGluZyBkcm1fbW9kZXNldF9iYWNrb2ZmKCkuCi0gKgotICogUmV0dXJuczoKLSAq IDAgb24gc3VjY2VzcyBvciBhIG5lZ2F0aXZlIGVycm9yIGNvZGUgb24gZmFpbHVyZS4KLSAqCi0g KiBTZWUgYWxzbzoKLSAqIGRybV9hdG9taWNfaGVscGVyX3N1c3BlbmQoKSwgZHJtX2F0b21pY19o ZWxwZXJfcmVzdW1lKCkgYW5kCi0gKiBkcm1fYXRvbWljX2hlbHBlcl9zaHV0ZG93bigpLgotICov Ci1pbnQgZHJtX2F0b21pY19oZWxwZXJfZGlzYWJsZV9hbGwoc3RydWN0IGRybV9kZXZpY2UgKmRl diwKLQkJCQkgIHN0cnVjdCBkcm1fbW9kZXNldF9hY3F1aXJlX2N0eCAqY3R4LAotCQkJCSAgYm9v bCBjbGVhbl9vbGRfZmJzKQorc3RhdGljIGludCBfX2RybV9hdG9taWNfaGVscGVyX2Rpc2FibGVf YWxsKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsCisJCQkJCSAgIHN0cnVjdCBkcm1fbW9kZXNldF9h Y3F1aXJlX2N0eCAqY3R4LAorCQkJCQkgICBib29sIGNsZWFuX29sZF9mYnMpCiB7CiAJc3RydWN0 IGRybV9hdG9taWNfc3RhdGUgKnN0YXRlOwogCXN0cnVjdCBkcm1fY29ubmVjdG9yX3N0YXRlICpj b25uX3N0YXRlOwpAQCAtMjk3Myw3ICsyOTQ5LDM0IEBAIGludCBkcm1fYXRvbWljX2hlbHBlcl9k aXNhYmxlX2FsbChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LAogCWRybV9hdG9taWNfc3RhdGVfcHV0 KHN0YXRlKTsKIAlyZXR1cm4gcmV0OwogfQotCisvKioKKyAqIGRybV9hdG9taWNfaGVscGVyX2Rp c2FibGVfYWxsIC0gZGlzYWJsZSBhbGwgY3VycmVudGx5IGFjdGl2ZSBvdXRwdXRzCisgKiBAZGV2 OiBEUk0gZGV2aWNlCisgKiBAY3R4OiBsb2NrIGFjcXVpc2l0aW9uIGNvbnRleHQKKyAqCisgKiBM b29wcyB0aHJvdWdoIGFsbCBjb25uZWN0b3JzLCBmaW5kaW5nIHRob3NlIHRoYXQgYXJlbid0IHR1 cm5lZCBvZmYgYW5kIHRoZW4KKyAqIHR1cm5zIHRoZW0gb2ZmIGJ5IHNldHRpbmcgdGhlaXIgRFBN UyBtb2RlIHRvIE9GRiBhbmQgZGVhY3RpdmF0aW5nIHRoZSBDUlRDCisgKiB0aGF0IHRoZXkgYXJl IGNvbm5lY3RlZCB0by4KKyAqCisgKiBUaGlzIGlzIHVzZWQgZm9yIGV4YW1wbGUgaW4gc3VzcGVu ZC9yZXN1bWUgdG8gZGlzYWJsZSBhbGwgY3VycmVudGx5IGFjdGl2ZQorICogZnVuY3Rpb25zIHdo ZW4gc3VzcGVuZGluZy4gSWYgeW91IGp1c3Qgd2FudCB0byBzaHV0IGRvd24gZXZlcnl0aGluZyBh dCBlLmcuCisgKiBkcml2ZXIgdW5sb2FkLCBsb29rIGF0IGRybV9hdG9taWNfaGVscGVyX3NodXRk b3duKCkuCisgKgorICogTm90ZSB0aGF0IGlmIGNhbGxlcnMgaGF2ZW4ndCBhbHJlYWR5IGFjcXVp cmVkIGFsbCBtb2Rlc2V0IGxvY2tzIHRoaXMgbWlnaHQKKyAqIHJldHVybiAtRURFQURMSywgd2hp Y2ggbXVzdCBiZSBoYW5kbGVkIGJ5IGNhbGxpbmcgZHJtX21vZGVzZXRfYmFja29mZigpLgorICoK KyAqIFJldHVybnM6CisgKiAwIG9uIHN1Y2Nlc3Mgb3IgYSBuZWdhdGl2ZSBlcnJvciBjb2RlIG9u IGZhaWx1cmUuCisgKgorICogU2VlIGFsc286CisgKiBkcm1fYXRvbWljX2hlbHBlcl9zdXNwZW5k KCksIGRybV9hdG9taWNfaGVscGVyX3Jlc3VtZSgpIGFuZAorICogZHJtX2F0b21pY19oZWxwZXJf c2h1dGRvd24oKS4KKyAqLworaW50IGRybV9hdG9taWNfaGVscGVyX2Rpc2FibGVfYWxsKHN0cnVj dCBkcm1fZGV2aWNlICpkZXYsCisJCQkJICBzdHJ1Y3QgZHJtX21vZGVzZXRfYWNxdWlyZV9jdHgg KmN0eCkKK3sKKwlyZXR1cm4gX19kcm1fYXRvbWljX2hlbHBlcl9kaXNhYmxlX2FsbChkZXYsIGN0 eCwgZmFsc2UpOworfQogRVhQT1JUX1NZTUJPTChkcm1fYXRvbWljX2hlbHBlcl9kaXNhYmxlX2Fs bCk7CiAKIC8qKgpAQCAtMjk5Niw3ICsyOTk5LDcgQEAgdm9pZCBkcm1fYXRvbWljX2hlbHBlcl9z aHV0ZG93bihzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KQogCXdoaWxlICgxKSB7CiAJCXJldCA9IGRy bV9tb2Rlc2V0X2xvY2tfYWxsX2N0eChkZXYsICZjdHgpOwogCQlpZiAoIXJldCkKLQkJCXJldCA9 IGRybV9hdG9taWNfaGVscGVyX2Rpc2FibGVfYWxsKGRldiwgJmN0eCwgdHJ1ZSk7CisJCQlyZXQg PSBfX2RybV9hdG9taWNfaGVscGVyX2Rpc2FibGVfYWxsKGRldiwgJmN0eCwgdHJ1ZSk7CiAKIAkJ aWYgKHJldCAhPSAtRURFQURMSykKIAkJCWJyZWFrOwpAQCAtMzA3NCw3ICszMDc3LDcgQEAgc3Ry dWN0IGRybV9hdG9taWNfc3RhdGUgKmRybV9hdG9taWNfaGVscGVyX3N1c3BlbmQoc3RydWN0IGRy bV9kZXZpY2UgKmRldikKIAkJfQogCX0KIAotCWVyciA9IGRybV9hdG9taWNfaGVscGVyX2Rpc2Fi bGVfYWxsKGRldiwgJmN0eCwgZmFsc2UpOworCWVyciA9IGRybV9hdG9taWNfaGVscGVyX2Rpc2Fi bGVfYWxsKGRldiwgJmN0eCk7CiAJaWYgKGVyciA8IDApIHsKIAkJZHJtX2F0b21pY19zdGF0ZV9w dXQoc3RhdGUpOwogCQlzdGF0ZSA9IEVSUl9QVFIoZXJyKTsKZGlmZiAtLWdpdCBhL2RyaXZlcnMv Z3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVs X2Rpc3BsYXkuYwppbmRleCAwMDhmZTY5MDNjOGMuLjM0MjMxYjljNzhhZiAxMDA2NDQKLS0tIGEv ZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jCisrKyBiL2RyaXZlcnMvZ3B1L2Ry bS9pOTE1L2ludGVsX2Rpc3BsYXkuYwpAQCAtMzcyMSw3ICszNzIxLDcgQEAgdm9pZCBpbnRlbF9w cmVwYXJlX3Jlc2V0KHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdikKIAkJcmV0dXJu OwogCX0KIAotCXJldCA9IGRybV9hdG9taWNfaGVscGVyX2Rpc2FibGVfYWxsKGRldiwgY3R4LCBm YWxzZSk7CisJcmV0ID0gZHJtX2F0b21pY19oZWxwZXJfZGlzYWJsZV9hbGwoZGV2LCBjdHgpOwog CWlmIChyZXQpIHsKIAkJRFJNX0VSUk9SKCJTdXNwZW5kaW5nIGNydGMncyBmYWlsZWQgd2l0aCAl aVxuIiwgcmV0KTsKIAkJZHJtX2F0b21pY19zdGF0ZV9wdXQoc3RhdGUpOwpkaWZmIC0tZ2l0IGEv aW5jbHVkZS9kcm0vZHJtX2F0b21pY19oZWxwZXIuaCBiL2luY2x1ZGUvZHJtL2RybV9hdG9taWNf aGVscGVyLmgKaW5kZXggMTBlOTUyOTUxZDJmLi4yNmFhYmE1OGQ2Y2UgMTAwNjQ0Ci0tLSBhL2lu Y2x1ZGUvZHJtL2RybV9hdG9taWNfaGVscGVyLmgKKysrIGIvaW5jbHVkZS9kcm0vZHJtX2F0b21p Y19oZWxwZXIuaApAQCAtMTIyLDggKzEyMiw3IEBAIGludCBfX2RybV9hdG9taWNfaGVscGVyX3Nl dF9jb25maWcoc3RydWN0IGRybV9tb2RlX3NldCAqc2V0LAogCQlzdHJ1Y3QgZHJtX2F0b21pY19z dGF0ZSAqc3RhdGUpOwogCiBpbnQgZHJtX2F0b21pY19oZWxwZXJfZGlzYWJsZV9hbGwoc3RydWN0 IGRybV9kZXZpY2UgKmRldiwKLQkJCQkgIHN0cnVjdCBkcm1fbW9kZXNldF9hY3F1aXJlX2N0eCAq Y3R4LAotCQkJCSAgYm9vbCBjbGVhbl9vbGRfZmJzKTsKKwkJCQkgIHN0cnVjdCBkcm1fbW9kZXNl dF9hY3F1aXJlX2N0eCAqY3R4KTsKIHZvaWQgZHJtX2F0b21pY19oZWxwZXJfc2h1dGRvd24oc3Ry dWN0IGRybV9kZXZpY2UgKmRldik7CiBzdHJ1Y3QgZHJtX2F0b21pY19zdGF0ZSAqZHJtX2F0b21p Y19oZWxwZXJfc3VzcGVuZChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KTsKIGludCBkcm1fYXRvbWlj X2hlbHBlcl9jb21taXRfZHVwbGljYXRlZF9zdGF0ZShzdHJ1Y3QgZHJtX2F0b21pY19zdGF0ZSAq c3RhdGUsCgotLSAKVmlsbGUgU3lyasOkbMOkCkludGVsIE9UQwpfX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVs LWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcv bWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK