From: Michel Thierry Subject: [PATCH v2 15/24] drm/i915/bdw: Use dynamic allocation idioms on free Date: Tue, 23 Dec 2014 17:16:18 +0000 Message-ID: <1419354987-4622-16-git-send-email-michel.thierry@intel.com> References: <1418922621-25818-1-git-send-email-michel.thierry@intel.com> <1419354987-4622-1-git-send-email-michel.thierry@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) by gabe.freedesktop.org (Postfix) with ESMTP id 6D6966E4E2 for ; Tue, 23 Dec 2014 09:16:25 -0800 (PST) In-Reply-To: <1419354987-4622-1-git-send-email-michel.thierry@intel.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" To: intel-gfx@lists.freedesktop.org List-Id: intel-gfx@lists.freedesktop.org RnJvbTogQmVuIFdpZGF3c2t5IDxiZW5qYW1pbi53aWRhd3NreUBpbnRlbC5jb20+CgpUaGUgcGFn ZSBkaXJlY3RvcnkgZnJlZXIgaXMgbGVmdCBoZXJlIGZvciBub3cgYXMgaXQncyBzdGlsbCB1c2Vm dWwgZ2l2ZW4KdGhhdCBHRU44IHN0aWxsIHByZWFsbG9jYXRlcy4gT25jZSB0aGUgYWxsb2NhdGlv biBmdW5jdGlvbnMgYXJlIGJyb2tlbgp1cCBpbnRvIG1vcmUgZGlzY3JldGUgY2h1bmtzLCB3ZSds bCBmb2xsb3cgc3VpdCBhbmQgZGVzdHJveSB0aGlzCmxlZnRvdmVyIHBpZWNlLgoKdjI6IE1hdGNo IHRyYWNlX2k5MTVfdmFfdGVhcmRvd24gcGFyYW1zCnYzOiBNdWx0aXBsZSByZWJhc2VzLgoKU2ln bmVkLW9mZi1ieTogQmVuIFdpZGF3c2t5IDxiZW5AYndpZGF3c2submV0PgpTaWduZWQtb2ZmLWJ5 OiBNaWNoZWwgVGhpZXJyeSA8bWljaGVsLnRoaWVycnlAaW50ZWwuY29tPiAodjIsIHYzKQotLS0K IGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2d0dC5jIHwgNTQgKysrKysrKysrKysrKysr KysrKysrKystLS0tLS0tLS0tLS0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fZ3R0 LmggfCA0NiArKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrCiAyIGZpbGVzIGNoYW5nZWQs IDgwIGluc2VydGlvbnMoKyksIDIwIGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMv Z3B1L2RybS9pOTE1L2k5MTVfZ2VtX2d0dC5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9n ZW1fZ3R0LmMKaW5kZXggMzJhMzU1YS4uOTcxYzA1YiAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUv ZHJtL2k5MTUvaTkxNV9nZW1fZ3R0LmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9n ZW1fZ3R0LmMKQEAgLTU3OSwyNyArNTc5LDMyIEBAIHN0YXRpYyB2b2lkIGdlbjhfcHBndHRfaW5z ZXJ0X2VudHJpZXMoc3RydWN0IGk5MTVfYWRkcmVzc19zcGFjZSAqdm0sCiAJfQogfQogCi1zdGF0 aWMgdm9pZCBnZW44X2ZyZWVfcGFnZV90YWJsZXMoc3RydWN0IGk5MTVfcGFnZWRpciAqcGQsIHN0 cnVjdCBkcm1fZGV2aWNlICpkZXYpCitzdGF0aWMgdm9pZCBnZW44X3RlYXJkb3duX3ZhX3Jhbmdl KHN0cnVjdCBpOTE1X2FkZHJlc3Nfc3BhY2UgKnZtLAorCQkJCSAgIHVpbnQ2NF90IHN0YXJ0LCB1 aW50NjRfdCBsZW5ndGgpCiB7Ci0JaW50IGk7Ci0KLQlpZiAoIXBkLT5wYWdlKQotCQlyZXR1cm47 Ci0KLQlmb3IgKGkgPSAwOyBpIDwgR0VOOF9QREVTX1BFUl9QQUdFOyBpKyspIHsKLQkJZnJlZV9w dF9zaW5nbGUocGQtPnBhZ2VfdGFibGVzW2ldLCBkZXYpOwotCQlwZC0+cGFnZV90YWJsZXNbaV0g PSBOVUxMOworCXN0cnVjdCBpOTE1X2h3X3BwZ3R0ICpwcGd0dCA9CisJCQkJY29udGFpbmVyX29m KHZtLCBzdHJ1Y3QgaTkxNV9od19wcGd0dCwgYmFzZSk7CisJc3RydWN0IGk5MTVfcGFnZWRpciAq cGQ7CisJc3RydWN0IGk5MTVfcGFnZXRhYiAqcHQ7CisJdWludDY0X3QgdGVtcDsKKwl1aW50MzJf dCBwZHBlLCBwZGU7CisKKwlnZW44X2Zvcl9lYWNoX3BkcGUocGQsICZwcGd0dC0+cGRwLCBzdGFy dCwgbGVuZ3RoLCB0ZW1wLCBwZHBlKSB7CisJCXVpbnQ2NF90IHBkX2xlbiA9IGdlbjhfY2xhbXBf cGQoc3RhcnQsIGxlbmd0aCk7CisJCXVpbnQ2NF90IHBkX3N0YXJ0ID0gc3RhcnQ7CisJCWdlbjhf Zm9yX2VhY2hfcGRlKHB0LCBwZCwgcGRfc3RhcnQsIHBkX2xlbiwgdGVtcCwgcGRlKSB7CisJCQlm cmVlX3B0X3NpbmdsZShwdCwgdm0tPmRldik7CisJCX0KKwkJZnJlZV9wZF9zaW5nbGUocGQpOwog CX0KIH0KIAotc3RhdGljIHZvaWQgZ2VuOF9wcGd0dF9mcmVlKHN0cnVjdCBpOTE1X2h3X3BwZ3R0 ICpwcGd0dCkKKy8qIFRoaXMgZnVuY3Rpb24gd2lsbCBkaWUgc29vbiAqLworc3RhdGljIHZvaWQg Z2VuOF9mcmVlX2Z1bGxfcGFnZWRpcihzdHJ1Y3QgaTkxNV9od19wcGd0dCAqcHBndHQsIGludCBp KQogewotCWludCBpOwotCi0JZm9yIChpID0gMDsgaSA8IHBwZ3R0LT5udW1fcGRfcGFnZXM7IGkr KykgewotCQlnZW44X2ZyZWVfcGFnZV90YWJsZXMocHBndHQtPnBkcC5wYWdlZGlyW2ldLCBwcGd0 dC0+YmFzZS5kZXYpOwotCQlmcmVlX3BkX3NpbmdsZShwcGd0dC0+cGRwLnBhZ2VkaXJbaV0pOwot CX0KKwlnZW44X3RlYXJkb3duX3ZhX3JhbmdlKCZwcGd0dC0+YmFzZSwKKwkJCSAgICAgICBpIDw8 IEdFTjhfUERQRV9TSElGVCwKKwkJCSAgICAgICAoMSA8PCBHRU44X1BEUEVfU0hJRlQpKTsKIH0K IAogc3RhdGljIHZvaWQgZ2VuOF9wcGd0dF91bm1hcF9wYWdlcyhzdHJ1Y3QgaTkxNV9od19wcGd0 dCAqcHBndHQpCkBAIC02MTQsMTkgKzYxOSwyOCBAQCBzdGF0aWMgdm9pZCBnZW44X3BwZ3R0X3Vu bWFwX3BhZ2VzKHN0cnVjdCBpOTE1X2h3X3BwZ3R0ICpwcGd0dCkKIAkJCWNvbnRpbnVlOwogCiAJ CXBjaV91bm1hcF9wYWdlKGh3ZGV2LCBwcGd0dC0+cGRwLnBhZ2VkaXJbaV0tPmRhZGRyLCBQQUdF X1NJWkUsCi0JCQkgICAgICAgUENJX0RNQV9CSURJUkVDVElPTkFMKTsKKwkJCQlQQ0lfRE1BX0JJ RElSRUNUSU9OQUwpOwogCiAJCWZvciAoaiA9IDA7IGogPCBHRU44X1BERVNfUEVSX1BBR0U7IGor KykgewogCQkJc3RydWN0IGk5MTVfcGFnZWRpciAqcGQgPSBwcGd0dC0+cGRwLnBhZ2VkaXJbaV07 Ci0JCQlzdHJ1Y3QgaTkxNV9wYWdldGFiICpwdCA9ICBwZC0+cGFnZV90YWJsZXNbal07CisJCQlz dHJ1Y3QgaTkxNV9wYWdldGFiICpwdCA9IHBkLT5wYWdlX3RhYmxlc1tqXTsKIAkJCWRtYV9hZGRy X3QgYWRkciA9IHB0LT5kYWRkcjsKIAkJCWlmIChhZGRyKQogCQkJCXBjaV91bm1hcF9wYWdlKGh3 ZGV2LCBhZGRyLCBQQUdFX1NJWkUsCi0JCQkJCSAgICAgICBQQ0lfRE1BX0JJRElSRUNUSU9OQUwp OworCQkJCQkJUENJX0RNQV9CSURJUkVDVElPTkFMKTsKIAkJfQogCX0KIH0KIAorc3RhdGljIHZv aWQgZ2VuOF9wcGd0dF9mcmVlKHN0cnVjdCBpOTE1X2h3X3BwZ3R0ICpwcGd0dCkKK3sKKwl0cmFj ZV9pOTE1X3ZhX3RlYXJkb3duKCZwcGd0dC0+YmFzZSwKKwkJCSAgICAgICBwcGd0dC0+YmFzZS5z dGFydCwgcHBndHQtPmJhc2UudG90YWwsCisJCQkgICAgICAgVk1fVE9fVFJBQ0VfTkFNRSgmcHBn dHQtPmJhc2UpKTsKKwlnZW44X3RlYXJkb3duX3ZhX3JhbmdlKCZwcGd0dC0+YmFzZSwKKwkJCSAg ICAgICBwcGd0dC0+YmFzZS5zdGFydCwgcHBndHQtPmJhc2UudG90YWwpOworfQorCiBzdGF0aWMg dm9pZCBnZW44X3BwZ3R0X2NsZWFudXAoc3RydWN0IGk5MTVfYWRkcmVzc19zcGFjZSAqdm0pCiB7 CiAJc3RydWN0IGk5MTVfaHdfcHBndHQgKnBwZ3R0ID0KQEAgLTY1MSw3ICs2NjUsNyBAQCBzdGF0 aWMgaW50IGdlbjhfcHBndHRfYWxsb2NhdGVfcGFnZV90YWJsZXMoc3RydWN0IGk5MTVfaHdfcHBn dHQgKnBwZ3R0KQogCiB1bndpbmRfb3V0OgogCXdoaWxlIChpLS0pCi0JCWdlbjhfZnJlZV9wYWdl X3RhYmxlcyhwcGd0dC0+cGRwLnBhZ2VkaXJbaV0sIHBwZ3R0LT5iYXNlLmRldik7CisJCWdlbjhf ZnJlZV9mdWxsX3BhZ2VkaXIocHBndHQsIGkpOwogCiAJcmV0dXJuIC1FTk9NRU07CiB9CmRpZmYg LS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9ndHQuaCBiL2RyaXZlcnMvZ3B1 L2RybS9pOTE1L2k5MTVfZ2VtX2d0dC5oCmluZGV4IGRjNzFjYWUuLjk2MjA5YzIgMTAwNjQ0Ci0t LSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2d0dC5oCisrKyBiL2RyaXZlcnMvZ3B1 L2RybS9pOTE1L2k5MTVfZ2VtX2d0dC5oCkBAIC0zODcsNiArMzg3LDUyIEBAIHN0YXRpYyBpbmxp bmUgdWludDMyX3QgZ2VuNl9wZGVfaW5kZXgodWludDMyX3QgYWRkcikKIAlyZXR1cm4gaTkxNV9w ZGVfaW5kZXgoYWRkciwgR0VONl9QREVfU0hJRlQpOwogfQogCisjZGVmaW5lIGdlbjhfZm9yX2Vh Y2hfcGRlKHB0LCBwZCwgc3RhcnQsIGxlbmd0aCwgdGVtcCwgaXRlcikJCVwKKwlmb3IgKGl0ZXIg PSBnZW44X3BkZV9pbmRleChzdGFydCksIHB0ID0gKHBkKS0+cGFnZV90YWJsZXNbaXRlcl07IFwK KwkgICAgIGxlbmd0aCA+IDAgJiYgaXRlciA8IEdFTjhfUERFU19QRVJfUEFHRTsJCQlcCisJICAg ICBwdCA9IChwZCktPnBhZ2VfdGFibGVzWysraXRlcl0sCQkJCVwKKwkgICAgIHRlbXAgPSBBTElH TihzdGFydCsxLCAxIDw8IEdFTjhfUERFX1NISUZUKSAtIHN0YXJ0LAlcCisJICAgICB0ZW1wID0g bWluKHRlbXAsIGxlbmd0aCksCQkJCQlcCisJICAgICBzdGFydCArPSB0ZW1wLCBsZW5ndGggLT0g dGVtcCkKKworI2RlZmluZSBnZW44X2Zvcl9lYWNoX3BkcGUocGQsIHBkcCwgc3RhcnQsIGxlbmd0 aCwgdGVtcCwgaXRlcikJCVwKKwlmb3IgKGl0ZXIgPSBnZW44X3BkcGVfaW5kZXgoc3RhcnQpLCBw ZCA9IChwZHApLT5wYWdlZGlyW2l0ZXJdOwlcCisJICAgICBsZW5ndGggPiAwICYmIGl0ZXIgPCBH RU44X0xFR0FDWV9QRFBFUzsJCQlcCisJICAgICBwZCA9IChwZHApLT5wYWdlZGlyWysraXRlcl0s CQkJCVwKKwkgICAgIHRlbXAgPSBBTElHTihzdGFydCsxLCAxIDw8IEdFTjhfUERQRV9TSElGVCkg LSBzdGFydCwJXAorCSAgICAgdGVtcCA9IG1pbih0ZW1wLCBsZW5ndGgpLAkJCQkJXAorCSAgICAg c3RhcnQgKz0gdGVtcCwgbGVuZ3RoIC09IHRlbXApCisKKy8qIENsYW1wIGxlbmd0aCB0byB0aGUg bmV4dCBwYWdlZGlyIGJvdW5kYXJ5ICovCitzdGF0aWMgaW5saW5lIHVpbnQ2NF90IGdlbjhfY2xh bXBfcGQodWludDY0X3Qgc3RhcnQsIHVpbnQ2NF90IGxlbmd0aCkKK3sKKwl1aW50NjRfdCBuZXh0 X3BkID0gQUxJR04oc3RhcnQgKyAxLCAxIDw8IEdFTjhfUERQRV9TSElGVCk7CisJaWYgKG5leHRf cGQgPiAoc3RhcnQgKyBsZW5ndGgpKQorCQlyZXR1cm4gbGVuZ3RoOworCisJcmV0dXJuIG5leHRf cGQgLSBzdGFydDsKK30KKworc3RhdGljIGlubGluZSB1aW50MzJfdCBnZW44X3B0ZV9pbmRleCh1 aW50NjRfdCBhZGRyZXNzKQoreworCXJldHVybiBpOTE1X3B0ZV9pbmRleChhZGRyZXNzLCBHRU44 X1BERV9TSElGVCk7Cit9CisKK3N0YXRpYyBpbmxpbmUgdWludDMyX3QgZ2VuOF9wZGVfaW5kZXgo dWludDY0X3QgYWRkcmVzcykKK3sKKwlyZXR1cm4gaTkxNV9wZGVfaW5kZXgoYWRkcmVzcywgR0VO OF9QREVfU0hJRlQpOworfQorCitzdGF0aWMgaW5saW5lIHVpbnQzMl90IGdlbjhfcGRwZV9pbmRl eCh1aW50NjRfdCBhZGRyZXNzKQoreworCXJldHVybiAoYWRkcmVzcyA+PiBHRU44X1BEUEVfU0hJ RlQpICYgR0VOOF9QRFBFX01BU0s7Cit9CisKK3N0YXRpYyBpbmxpbmUgdWludDMyX3QgZ2VuOF9w bWw0ZV9pbmRleCh1aW50NjRfdCBhZGRyZXNzKQoreworCUJVRygpOyAvKiBGb3IgNjRCICovCit9 CisKIGludCBpOTE1X2dlbV9ndHRfaW5pdChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KTsKIHZvaWQg aTkxNV9nZW1faW5pdF9nbG9iYWxfZ3R0KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpOwogdm9pZCBp OTE1X2dsb2JhbF9ndHRfY2xlYW51cChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KTsKLS0gCjIuMS4x CgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpJbnRlbC1n ZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cDovL2xp c3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeAo=