From: Michel Thierry Subject: [PATCH v4 15/24] drm/i915/bdw: Use dynamic allocation idioms on free Date: Thu, 22 Jan 2015 17:01:37 +0000 Message-ID: <1421946106-7921-16-git-send-email-michel.thierry@intel.com> References: <1418922621-25818-1-git-send-email-michel.thierry@intel.com> <1421946106-7921-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 6C6E7720A9 for ; Thu, 22 Jan 2015 09:01:40 -0800 (PST) In-Reply-To: <1421946106-7921-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 VXBkYXRlZCB0byB1c2UgdW5tYXBfYW5kX2ZyZWVfcHQuCnY1OiB0ZWFyZG93bl92YV9yYW5nZSBs b2dpYyBubyBsb25nZXIgbmVlZGVkLgoKU2lnbmVkLW9mZi1ieTogQmVuIFdpZGF3c2t5IDxiZW5A YndpZGF3c2submV0PgpTaWduZWQtb2ZmLWJ5OiBNaWNoZWwgVGhpZXJyeSA8bWljaGVsLnRoaWVy cnlAaW50ZWwuY29tPiAodjIrKQotLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2d0 dC5jIHwgMjYgKysrKysrKysrKy0tLS0tLS0tLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVf Z2VtX2d0dC5oIHwgNDcgKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKwogMiBm aWxlcyBjaGFuZ2VkLCA2MCBpbnNlcnRpb25zKCspLCAxMyBkZWxldGlvbnMoLSkKCmRpZmYgLS1n aXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9ndHQuYyBiL2RyaXZlcnMvZ3B1L2Ry bS9pOTE1L2k5MTVfZ2VtX2d0dC5jCmluZGV4IDM2ZTI0ODIuLjU2ZGIxMzIgMTAwNjQ0Ci0tLSBh L2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2d0dC5jCisrKyBiL2RyaXZlcnMvZ3B1L2Ry bS9pOTE1L2k5MTVfZ2VtX2d0dC5jCkBAIC02MDQsMTkgKzYwNCw2IEBAIHN0YXRpYyB2b2lkIGdl bjhfZnJlZV9wYWdlX3RhYmxlcyhzdHJ1Y3QgaTkxNV9wYWdlX2RpcmVjdG9yeV9lbnRyeSAqcGQs IHN0cnVjdCBkCiAJfQogfQogCi1zdGF0aWMgdm9pZCBnZW44X3BwZ3R0X2ZyZWUoc3RydWN0IGk5 MTVfaHdfcHBndHQgKnBwZ3R0KQotewotCWludCBpOwotCi0JZm9yIChpID0gMDsgaSA8IHBwZ3R0 LT5udW1fcGRfcGFnZXM7IGkrKykgewotCQlpZiAoV0FSTl9PTighcHBndHQtPnBkcC5wYWdlX2Rp cmVjdG9yeVtpXSkpCi0JCQljb250aW51ZTsKLQotCQlnZW44X2ZyZWVfcGFnZV90YWJsZXMocHBn dHQtPnBkcC5wYWdlX2RpcmVjdG9yeVtpXSwgcHBndHQtPmJhc2UuZGV2KTsKLQkJdW5tYXBfYW5k X2ZyZWVfcGQocHBndHQtPnBkcC5wYWdlX2RpcmVjdG9yeVtpXSk7Ci0JfQotfQotCiBzdGF0aWMg dm9pZCBnZW44X3BwZ3R0X3VubWFwX3BhZ2VzKHN0cnVjdCBpOTE1X2h3X3BwZ3R0ICpwcGd0dCkK IHsKIAlzdHJ1Y3QgcGNpX2RldiAqaHdkZXYgPSBwcGd0dC0+YmFzZS5kZXYtPnBkZXY7CkBAIC02 NDksNiArNjM2LDE5IEBAIHN0YXRpYyB2b2lkIGdlbjhfcHBndHRfdW5tYXBfcGFnZXMoc3RydWN0 IGk5MTVfaHdfcHBndHQgKnBwZ3R0KQogCX0KIH0KIAorc3RhdGljIHZvaWQgZ2VuOF9wcGd0dF9m cmVlKHN0cnVjdCBpOTE1X2h3X3BwZ3R0ICpwcGd0dCkKK3sKKwlpbnQgaTsKKworCWZvciAoaSA9 IDA7IGkgPCBwcGd0dC0+bnVtX3BkX3BhZ2VzOyBpKyspIHsKKwkJaWYgKFdBUk5fT04oIXBwZ3R0 LT5wZHAucGFnZV9kaXJlY3RvcnlbaV0pKQorCQkJY29udGludWU7CisKKwkJZ2VuOF9mcmVlX3Bh Z2VfdGFibGVzKHBwZ3R0LT5wZHAucGFnZV9kaXJlY3RvcnlbaV0sIHBwZ3R0LT5iYXNlLmRldik7 CisJCXVubWFwX2FuZF9mcmVlX3BkKHBwZ3R0LT5wZHAucGFnZV9kaXJlY3RvcnlbaV0pOworCX0K K30KKwogc3RhdGljIHZvaWQgZ2VuOF9wcGd0dF9jbGVhbnVwKHN0cnVjdCBpOTE1X2FkZHJlc3Nf c3BhY2UgKnZtKQogewogCXN0cnVjdCBpOTE1X2h3X3BwZ3R0ICpwcGd0dCA9CmRpZmYgLS1naXQg YS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9ndHQuaCBiL2RyaXZlcnMvZ3B1L2RybS9p OTE1L2k5MTVfZ2VtX2d0dC5oCmluZGV4IDQzYjVhZGYuLjcwY2U1MGQgMTAwNjQ0Ci0tLSBhL2Ry aXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2d0dC5oCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9p OTE1L2k5MTVfZ2VtX2d0dC5oCkBAIC0zODMsNiArMzgzLDUzIEBAIHN0YXRpYyBpbmxpbmUgdWlu dDMyX3QgZ2VuNl9wZGVfaW5kZXgodWludDMyX3QgYWRkcikKIAlyZXR1cm4gaTkxNV9wZGVfaW5k ZXgoYWRkciwgR0VONl9QREVfU0hJRlQpOwogfQogCisjZGVmaW5lIGdlbjhfZm9yX2VhY2hfcGRl KHB0LCBwZCwgc3RhcnQsIGxlbmd0aCwgdGVtcCwgaXRlcikJCVwKKwlmb3IgKGl0ZXIgPSBnZW44 X3BkZV9pbmRleChzdGFydCksIHB0ID0gKHBkKS0+cGFnZV90YWJsZXNbaXRlcl07IFwKKwkgICAg IGxlbmd0aCA+IDAgJiYgaXRlciA8IEdFTjhfUERFU19QRVJfUEFHRTsJCQlcCisJICAgICBwdCA9 IChwZCktPnBhZ2VfdGFibGVzWysraXRlcl0sCQkJCVwKKwkgICAgIHRlbXAgPSBBTElHTihzdGFy dCsxLCAxIDw8IEdFTjhfUERFX1NISUZUKSAtIHN0YXJ0LAlcCisJICAgICB0ZW1wID0gbWluKHRl bXAsIGxlbmd0aCksCQkJCQlcCisJICAgICBzdGFydCArPSB0ZW1wLCBsZW5ndGggLT0gdGVtcCkK KworI2RlZmluZSBnZW44X2Zvcl9lYWNoX3BkcGUocGQsIHBkcCwgc3RhcnQsIGxlbmd0aCwgdGVt cCwgaXRlcikJCVwKKwlmb3IgKGl0ZXIgPSBnZW44X3BkcGVfaW5kZXgoc3RhcnQpLCBwZCA9IChw ZHApLT5wYWdlX2RpcmVjdG9yeVtpdGVyXTsJXAorCSAgICAgbGVuZ3RoID4gMCAmJiBpdGVyIDwg R0VOOF9MRUdBQ1lfUERQRVM7CQkJXAorCSAgICAgcGQgPSAocGRwKS0+cGFnZV9kaXJlY3Rvcnlb KytpdGVyXSwJCQkJXAorCSAgICAgdGVtcCA9IEFMSUdOKHN0YXJ0KzEsIDEgPDwgR0VOOF9QRFBF X1NISUZUKSAtIHN0YXJ0LAlcCisJICAgICB0ZW1wID0gbWluKHRlbXAsIGxlbmd0aCksCQkJCQlc CisJICAgICBzdGFydCArPSB0ZW1wLCBsZW5ndGggLT0gdGVtcCkKKworLyogQ2xhbXAgbGVuZ3Ro IHRvIHRoZSBuZXh0IHBhZ2VfZGlyZWN0b3J5IGJvdW5kYXJ5ICovCitzdGF0aWMgaW5saW5lIHVp bnQ2NF90IGdlbjhfY2xhbXBfcGQodWludDY0X3Qgc3RhcnQsIHVpbnQ2NF90IGxlbmd0aCkKK3sK Kwl1aW50NjRfdCBuZXh0X3BkID0gQUxJR04oc3RhcnQgKyAxLCAxIDw8IEdFTjhfUERQRV9TSElG VCk7CisKKwlpZiAobmV4dF9wZCA+IChzdGFydCArIGxlbmd0aCkpCisJCXJldHVybiBsZW5ndGg7 CisKKwlyZXR1cm4gbmV4dF9wZCAtIHN0YXJ0OworfQorCitzdGF0aWMgaW5saW5lIHVpbnQzMl90 IGdlbjhfcHRlX2luZGV4KHVpbnQ2NF90IGFkZHJlc3MpCit7CisJcmV0dXJuIGk5MTVfcHRlX2lu ZGV4KGFkZHJlc3MsIEdFTjhfUERFX1NISUZUKTsKK30KKworc3RhdGljIGlubGluZSB1aW50MzJf dCBnZW44X3BkZV9pbmRleCh1aW50NjRfdCBhZGRyZXNzKQoreworCXJldHVybiBpOTE1X3BkZV9p bmRleChhZGRyZXNzLCBHRU44X1BERV9TSElGVCk7Cit9CisKK3N0YXRpYyBpbmxpbmUgdWludDMy X3QgZ2VuOF9wZHBlX2luZGV4KHVpbnQ2NF90IGFkZHJlc3MpCit7CisJcmV0dXJuIChhZGRyZXNz ID4+IEdFTjhfUERQRV9TSElGVCkgJiBHRU44X1BEUEVfTUFTSzsKK30KKworc3RhdGljIGlubGlu ZSB1aW50MzJfdCBnZW44X3BtbDRlX2luZGV4KHVpbnQ2NF90IGFkZHJlc3MpCit7CisJQlVHKCk7 IC8qIEZvciA2NEIgKi8KK30KKwogaW50IGk5MTVfZ2VtX2d0dF9pbml0KHN0cnVjdCBkcm1fZGV2 aWNlICpkZXYpOwogdm9pZCBpOTE1X2dlbV9pbml0X2dsb2JhbF9ndHQoc3RydWN0IGRybV9kZXZp Y2UgKmRldik7CiB2b2lkIGk5MTVfZ2xvYmFsX2d0dF9jbGVhbnVwKHN0cnVjdCBkcm1fZGV2aWNl ICpkZXYpOwotLSAKMi4xLjEKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fCkludGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNr dG9wLm9yZwpodHRwOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50 ZWwtZ2Z4Cg==