From: Michel Thierry Subject: [PATCH v3 16/25] drm/i915/bdw: Use dynamic allocation idioms on free Date: Tue, 13 Jan 2015 11:52:30 +0000 Message-ID: <1421149959-30383-17-git-send-email-michel.thierry@intel.com> References: <1418922621-25818-1-git-send-email-michel.thierry@intel.com> <1421149959-30383-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 mga14.intel.com (mga14.intel.com [192.55.52.115]) by gabe.freedesktop.org (Postfix) with ESMTP id 8DF046E5D7 for ; Tue, 13 Jan 2015 03:52:30 -0800 (PST) In-Reply-To: <1421149959-30383-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 IHRyYWNlX2k5MTVfdmFfdGVhcmRvd24gcGFyYW1zCnYzOiBNdWx0aXBsZSByZWJhc2VzLgp2NDog VXBkYXRlZCB0byB1c2UgdW5tYXBfYW5kX2ZyZWVfcHQuCgpTaWduZWQtb2ZmLWJ5OiBCZW4gV2lk YXdza3kgPGJlbkBid2lkYXdzay5uZXQ+ClNpZ25lZC1vZmYtYnk6IE1pY2hlbCBUaGllcnJ5IDxt aWNoZWwudGhpZXJyeUBpbnRlbC5jb20+ICh2MispCi0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUv aTkxNV9nZW1fZ3R0LmMgfCA1NCArKysrKysrKysrKysrKysrKysrKysrKy0tLS0tLS0tLS0tLS0t CiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9ndHQuaCB8IDQ2ICsrKysrKysrKysrKysr KysrKysrKysrKysrKysrKysKIDIgZmlsZXMgY2hhbmdlZCwgODAgaW5zZXJ0aW9ucygrKSwgMjAg ZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1f Z3R0LmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9ndHQuYwppbmRleCA0MDk5NmZl Li43NTY5MDdmIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9ndHQu YworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9ndHQuYwpAQCAtNTgwLDI3ICs1 ODAsMzIgQEAgc3RhdGljIHZvaWQgZ2VuOF9wcGd0dF9pbnNlcnRfZW50cmllcyhzdHJ1Y3QgaTkx NV9hZGRyZXNzX3NwYWNlICp2bSwKIAl9CiB9CiAKLXN0YXRpYyB2b2lkIGdlbjhfZnJlZV9wYWdl X3RhYmxlcyhzdHJ1Y3QgaTkxNV9wYWdlX2RpcmVjdG9yeV9lbnRyeSAqcGQsIHN0cnVjdCBkcm1f ZGV2aWNlICpkZXYpCitzdGF0aWMgdm9pZCBnZW44X3RlYXJkb3duX3ZhX3JhbmdlKHN0cnVjdCBp OTE1X2FkZHJlc3Nfc3BhY2UgKnZtLAorCQkJCSAgIHVpbnQ2NF90IHN0YXJ0LCB1aW50NjRfdCBs ZW5ndGgpCiB7Ci0JaW50IGk7Ci0KLQlpZiAoIXBkLT5wYWdlKQotCQlyZXR1cm47Ci0KLQlmb3Ig KGkgPSAwOyBpIDwgR0VOOF9QREVTX1BFUl9QQUdFOyBpKyspIHsKLQkJdW5tYXBfYW5kX2ZyZWVf cHQocGQtPnBhZ2VfdGFibGVzW2ldLCBkZXYpOwotCQlwZC0+cGFnZV90YWJsZXNbaV0gPSBOVUxM OworCXN0cnVjdCBpOTE1X2h3X3BwZ3R0ICpwcGd0dCA9CisJCQkJY29udGFpbmVyX29mKHZtLCBz dHJ1Y3QgaTkxNV9od19wcGd0dCwgYmFzZSk7CisJc3RydWN0IGk5MTVfcGFnZV9kaXJlY3Rvcnlf ZW50cnkgKnBkOworCXN0cnVjdCBpOTE1X3BhZ2VfdGFibGVfZW50cnkgKnB0OworCXVpbnQ2NF90 IHRlbXA7CisJdWludDMyX3QgcGRwZSwgcGRlOworCisJZ2VuOF9mb3JfZWFjaF9wZHBlKHBkLCAm cHBndHQtPnBkcCwgc3RhcnQsIGxlbmd0aCwgdGVtcCwgcGRwZSkgeworCQl1aW50NjRfdCBwZF9s ZW4gPSBnZW44X2NsYW1wX3BkKHN0YXJ0LCBsZW5ndGgpOworCQl1aW50NjRfdCBwZF9zdGFydCA9 IHN0YXJ0OworCQlnZW44X2Zvcl9lYWNoX3BkZShwdCwgcGQsIHBkX3N0YXJ0LCBwZF9sZW4sIHRl bXAsIHBkZSkgeworCQkJdW5tYXBfYW5kX2ZyZWVfcHQocHQsIHZtLT5kZXYpOworCQl9CisJCXVu bWFwX2FuZF9mcmVlX3BkKHBkKTsKIAl9CiB9CiAKLXN0YXRpYyB2b2lkIGdlbjhfcHBndHRfZnJl ZShzdHJ1Y3QgaTkxNV9od19wcGd0dCAqcHBndHQpCisvKiBUaGlzIGZ1bmN0aW9uIHdpbGwgZGll IHNvb24gKi8KK3N0YXRpYyB2b2lkIGdlbjhfZnJlZV9mdWxsX3BhZ2VfZGlyZWN0b3J5KHN0cnVj dCBpOTE1X2h3X3BwZ3R0ICpwcGd0dCwgaW50IGkpCiB7Ci0JaW50IGk7Ci0KLQlmb3IgKGkgPSAw OyBpIDwgcHBndHQtPm51bV9wZF9wYWdlczsgaSsrKSB7Ci0JCWdlbjhfZnJlZV9wYWdlX3RhYmxl cyhwcGd0dC0+cGRwLnBhZ2VfZGlyZWN0b3J5W2ldLCBwcGd0dC0+YmFzZS5kZXYpOwotCQl1bm1h cF9hbmRfZnJlZV9wZChwcGd0dC0+cGRwLnBhZ2VfZGlyZWN0b3J5W2ldKTsKLQl9CisJZ2VuOF90 ZWFyZG93bl92YV9yYW5nZSgmcHBndHQtPmJhc2UsCisJCQkgICAgICAgaSA8PCBHRU44X1BEUEVf U0hJRlQsCisJCQkgICAgICAgKDEgPDwgR0VOOF9QRFBFX1NISUZUKSk7CiB9CiAKIHN0YXRpYyB2 b2lkIGdlbjhfcHBndHRfdW5tYXBfcGFnZXMoc3RydWN0IGk5MTVfaHdfcHBndHQgKnBwZ3R0KQpA QCAtNjE1LDE5ICs2MjAsMjggQEAgc3RhdGljIHZvaWQgZ2VuOF9wcGd0dF91bm1hcF9wYWdlcyhz dHJ1Y3QgaTkxNV9od19wcGd0dCAqcHBndHQpCiAJCQljb250aW51ZTsKIAogCQlwY2lfdW5tYXBf cGFnZShod2RldiwgcHBndHQtPnBkcC5wYWdlX2RpcmVjdG9yeVtpXS0+ZGFkZHIsIFBBR0VfU0la RSwKLQkJCSAgICAgICBQQ0lfRE1BX0JJRElSRUNUSU9OQUwpOworCQkJCVBDSV9ETUFfQklESVJF Q1RJT05BTCk7CiAKIAkJZm9yIChqID0gMDsgaiA8IEdFTjhfUERFU19QRVJfUEFHRTsgaisrKSB7 CiAJCQlzdHJ1Y3QgaTkxNV9wYWdlX2RpcmVjdG9yeV9lbnRyeSAqcGQgPSBwcGd0dC0+cGRwLnBh Z2VfZGlyZWN0b3J5W2ldOwotCQkJc3RydWN0IGk5MTVfcGFnZV90YWJsZV9lbnRyeSAqcHQgPSAg cGQtPnBhZ2VfdGFibGVzW2pdOworCQkJc3RydWN0IGk5MTVfcGFnZV90YWJsZV9lbnRyeSAqcHQg PSBwZC0+cGFnZV90YWJsZXNbal07CiAJCQlkbWFfYWRkcl90IGFkZHIgPSBwdC0+ZGFkZHI7CiAJ CQlpZiAoYWRkcikKIAkJCQlwY2lfdW5tYXBfcGFnZShod2RldiwgYWRkciwgUEFHRV9TSVpFLAot CQkJCQkgICAgICAgUENJX0RNQV9CSURJUkVDVElPTkFMKTsKKwkJCQkJCVBDSV9ETUFfQklESVJF Q1RJT05BTCk7CiAJCX0KIAl9CiB9CiAKK3N0YXRpYyB2b2lkIGdlbjhfcHBndHRfZnJlZShzdHJ1 Y3QgaTkxNV9od19wcGd0dCAqcHBndHQpCit7CisJdHJhY2VfaTkxNV92YV90ZWFyZG93bigmcHBn dHQtPmJhc2UsCisJCQkgICAgICAgcHBndHQtPmJhc2Uuc3RhcnQsIHBwZ3R0LT5iYXNlLnRvdGFs LAorCQkJICAgICAgIFZNX1RPX1RSQUNFX05BTUUoJnBwZ3R0LT5iYXNlKSk7CisJZ2VuOF90ZWFy ZG93bl92YV9yYW5nZSgmcHBndHQtPmJhc2UsCisJCQkgICAgICAgcHBndHQtPmJhc2Uuc3RhcnQs IHBwZ3R0LT5iYXNlLnRvdGFsKTsKK30KKwogc3RhdGljIHZvaWQgZ2VuOF9wcGd0dF9jbGVhbnVw KHN0cnVjdCBpOTE1X2FkZHJlc3Nfc3BhY2UgKnZtKQogewogCXN0cnVjdCBpOTE1X2h3X3BwZ3R0 ICpwcGd0dCA9CkBAIC02NTIsNyArNjY2LDcgQEAgc3RhdGljIGludCBnZW44X3BwZ3R0X2FsbG9j YXRlX3BhZ2VfdGFibGVzKHN0cnVjdCBpOTE1X2h3X3BwZ3R0ICpwcGd0dCkKIAogdW53aW5kX291 dDoKIAl3aGlsZSAoaS0tKQotCQlnZW44X2ZyZWVfcGFnZV90YWJsZXMocHBndHQtPnBkcC5wYWdl X2RpcmVjdG9yeVtpXSwgcHBndHQtPmJhc2UuZGV2KTsKKwkJZ2VuOF9mcmVlX2Z1bGxfcGFnZV9k aXJlY3RvcnkocHBndHQsIGkpOwogCiAJcmV0dXJuIC1FTk9NRU07CiB9CmRpZmYgLS1naXQgYS9k cml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9ndHQuaCBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1 L2k5MTVfZ2VtX2d0dC5oCmluZGV4IDA3NGIzNjguLmM4MmEwMjkgMTAwNjQ0Ci0tLSBhL2RyaXZl cnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2d0dC5oCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1 L2k5MTVfZ2VtX2d0dC5oCkBAIC0zODUsNiArMzg1LDUyIEBAIHN0YXRpYyBpbmxpbmUgdWludDMy X3QgZ2VuNl9wZGVfaW5kZXgodWludDMyX3QgYWRkcikKIAlyZXR1cm4gaTkxNV9wZGVfaW5kZXgo YWRkciwgR0VONl9QREVfU0hJRlQpOwogfQogCisjZGVmaW5lIGdlbjhfZm9yX2VhY2hfcGRlKHB0 LCBwZCwgc3RhcnQsIGxlbmd0aCwgdGVtcCwgaXRlcikJCVwKKwlmb3IgKGl0ZXIgPSBnZW44X3Bk ZV9pbmRleChzdGFydCksIHB0ID0gKHBkKS0+cGFnZV90YWJsZXNbaXRlcl07IFwKKwkgICAgIGxl bmd0aCA+IDAgJiYgaXRlciA8IEdFTjhfUERFU19QRVJfUEFHRTsJCQlcCisJICAgICBwdCA9IChw ZCktPnBhZ2VfdGFibGVzWysraXRlcl0sCQkJCVwKKwkgICAgIHRlbXAgPSBBTElHTihzdGFydCsx LCAxIDw8IEdFTjhfUERFX1NISUZUKSAtIHN0YXJ0LAlcCisJICAgICB0ZW1wID0gbWluKHRlbXAs IGxlbmd0aCksCQkJCQlcCisJICAgICBzdGFydCArPSB0ZW1wLCBsZW5ndGggLT0gdGVtcCkKKwor I2RlZmluZSBnZW44X2Zvcl9lYWNoX3BkcGUocGQsIHBkcCwgc3RhcnQsIGxlbmd0aCwgdGVtcCwg aXRlcikJCVwKKwlmb3IgKGl0ZXIgPSBnZW44X3BkcGVfaW5kZXgoc3RhcnQpLCBwZCA9IChwZHAp LT5wYWdlX2RpcmVjdG9yeVtpdGVyXTsJXAorCSAgICAgbGVuZ3RoID4gMCAmJiBpdGVyIDwgR0VO OF9MRUdBQ1lfUERQRVM7CQkJXAorCSAgICAgcGQgPSAocGRwKS0+cGFnZV9kaXJlY3RvcnlbKytp dGVyXSwJCQkJXAorCSAgICAgdGVtcCA9IEFMSUdOKHN0YXJ0KzEsIDEgPDwgR0VOOF9QRFBFX1NI SUZUKSAtIHN0YXJ0LAlcCisJICAgICB0ZW1wID0gbWluKHRlbXAsIGxlbmd0aCksCQkJCQlcCisJ ICAgICBzdGFydCArPSB0ZW1wLCBsZW5ndGggLT0gdGVtcCkKKworLyogQ2xhbXAgbGVuZ3RoIHRv IHRoZSBuZXh0IHBhZ2VfZGlyZWN0b3J5IGJvdW5kYXJ5ICovCitzdGF0aWMgaW5saW5lIHVpbnQ2 NF90IGdlbjhfY2xhbXBfcGQodWludDY0X3Qgc3RhcnQsIHVpbnQ2NF90IGxlbmd0aCkKK3sKKwl1 aW50NjRfdCBuZXh0X3BkID0gQUxJR04oc3RhcnQgKyAxLCAxIDw8IEdFTjhfUERQRV9TSElGVCk7 CisJaWYgKG5leHRfcGQgPiAoc3RhcnQgKyBsZW5ndGgpKQorCQlyZXR1cm4gbGVuZ3RoOworCisJ cmV0dXJuIG5leHRfcGQgLSBzdGFydDsKK30KKworc3RhdGljIGlubGluZSB1aW50MzJfdCBnZW44 X3B0ZV9pbmRleCh1aW50NjRfdCBhZGRyZXNzKQoreworCXJldHVybiBpOTE1X3B0ZV9pbmRleChh ZGRyZXNzLCBHRU44X1BERV9TSElGVCk7Cit9CisKK3N0YXRpYyBpbmxpbmUgdWludDMyX3QgZ2Vu OF9wZGVfaW5kZXgodWludDY0X3QgYWRkcmVzcykKK3sKKwlyZXR1cm4gaTkxNV9wZGVfaW5kZXgo YWRkcmVzcywgR0VOOF9QREVfU0hJRlQpOworfQorCitzdGF0aWMgaW5saW5lIHVpbnQzMl90IGdl bjhfcGRwZV9pbmRleCh1aW50NjRfdCBhZGRyZXNzKQoreworCXJldHVybiAoYWRkcmVzcyA+PiBH RU44X1BEUEVfU0hJRlQpICYgR0VOOF9QRFBFX01BU0s7Cit9CisKK3N0YXRpYyBpbmxpbmUgdWlu dDMyX3QgZ2VuOF9wbWw0ZV9pbmRleCh1aW50NjRfdCBhZGRyZXNzKQoreworCUJVRygpOyAvKiBG b3IgNjRCICovCit9CisKIGludCBpOTE1X2dlbV9ndHRfaW5pdChzdHJ1Y3QgZHJtX2RldmljZSAq ZGV2KTsKIHZvaWQgaTkxNV9nZW1faW5pdF9nbG9iYWxfZ3R0KHN0cnVjdCBkcm1fZGV2aWNlICpk ZXYpOwogdm9pZCBpOTE1X2dsb2JhbF9ndHRfY2xlYW51cChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2 KTsKLS0gCjIuMS4xCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5v cmcKaHR0cDovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ludGVsLWdm eAo=