From: Maarten Lankhorst Subject: [PATCH v2 06/11] drm/i915/skl+: Clean up minimum allocations, v2. Date: Wed, 26 Oct 2016 15:41:34 +0200 Message-ID: <1477489299-25777-7-git-send-email-maarten.lankhorst@linux.intel.com> References: <1477489299-25777-1-git-send-email-maarten.lankhorst@linux.intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mblankhorst.nl (mblankhorst.nl [IPv6:2a02:2308::216:3eff:fe92:dfa3]) by gabe.freedesktop.org (Postfix) with ESMTPS id 64EAC6E876 for ; Wed, 26 Oct 2016 13:42:00 +0000 (UTC) In-Reply-To: <1477489299-25777-1-git-send-email-maarten.lankhorst@linux.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 Cc: Paulo Zanoni List-Id: intel-gfx@lists.freedesktop.org TW92ZSBjYWxjdWxhdGluZyBtaW5pbXVtIGFsbG9jYXRpb25zIHRvIGEgaGVscGVyLCB3aGljaCBj bGVhbnMgdXAgdGhlCmNvZGUgc29tZSBtb3JlLiBUaGUgY3Vyc29yIGlzIHN0aWxsIGFsbG9jYXRl ZCBpbiBhZHZhbmNlIGJlY2F1c2UgaXQKZG9lc24ndCBjb3VudCB0b3dhcmRzIGRhdGEgcmF0ZSBh bmQgc2hvdWxkIGFsd2F5cyBiZSByZXNlcnZlZC4KCmNoYW5nZXMgc2luY2UgdjE6Ci0gQ2hhbmdl IGNvbW1lbnQgdG8gaGF2ZSBhIGV4dHJhIG9wZW5pbmcgbGluZS4gKE1hdHQpCi0gUmViYXNlIHRv IHJlbW92ZSB1bnVzZWQgcGxhbmUtPnBpcGUgPT0gcGlwZSwgaGFuZGxlZCBieSB0aGUgaXRlcmF0 b3IKICBub3cuIChQYXVsbykKClJldmlld2VkLWJ5OiBNYXR0IFJvcGVyIDxtYXR0aGV3LmQucm9w ZXJAaW50ZWwuY29tPgpTaWduZWQtb2ZmLWJ5OiBNYWFydGVuIExhbmtob3JzdCA8bWFhcnRlbi5s YW5raG9yc3RAbGludXguaW50ZWwuY29tPgpDYzogUGF1bG8gWmFub25pIDxwYXVsby5yLnphbm9u aUBpbnRlbC5jb20+Ci0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcG0uYyB8IDYyICsr KysrKysrKysrKysrKysrKysrKysrKystLS0tLS0tLS0tLS0tLS0tCiAxIGZpbGUgY2hhbmdlZCwg MzggaW5zZXJ0aW9ucygrKSwgMjQgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9n cHUvZHJtL2k5MTUvaW50ZWxfcG0uYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3BtLmMK aW5kZXggYzJiOTY1ZDM2ZWFkLi40MTk1M2NjNDE4MDkgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1 L2RybS9pOTE1L2ludGVsX3BtLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcG0u YwpAQCAtMzM2NCw2ICszMzY0LDMwIEBAIHNrbF9kZGJfbWluX2FsbG9jKGNvbnN0IHN0cnVjdCBk cm1fcGxhbmVfc3RhdGUgKnBzdGF0ZSwKIAlyZXR1cm4gRElWX1JPVU5EX1VQKCg0ICogc3JjX3cg KiBwbGFuZV9icHApLCA1MTIpICogbWluX3NjYW5saW5lcy80ICsgMzsKIH0KIAorc3RhdGljIHZv aWQKK3NrbF9kZGJfY2FsY19taW4oY29uc3Qgc3RydWN0IGludGVsX2NydGNfc3RhdGUgKmNzdGF0 ZSwgaW50IG51bV9hY3RpdmUsCisJCSB1aW50MTZfdCAqbWluaW11bSwgdWludDE2X3QgKnlfbWlu aW11bSkKK3sKKwljb25zdCBzdHJ1Y3QgZHJtX3BsYW5lX3N0YXRlICpwc3RhdGU7CisJc3RydWN0 IGRybV9wbGFuZSAqcGxhbmU7CisKKwlkcm1fYXRvbWljX2NydGNfc3RhdGVfZm9yX2VhY2hfcGxh bmVfc3RhdGUocGxhbmUsIHBzdGF0ZSwgJmNzdGF0ZS0+YmFzZSkgeworCQlzdHJ1Y3QgaW50ZWxf cGxhbmUgKmludGVsX3BsYW5lID0gdG9faW50ZWxfcGxhbmUocGxhbmUpOworCQlpbnQgaWQgPSBz a2xfd21fcGxhbmVfaWQoaW50ZWxfcGxhbmUpOworCisJCWlmIChpZCA9PSBQTEFORV9DVVJTT1Ip CisJCQljb250aW51ZTsKKworCQlpZiAoIXBzdGF0ZS0+dmlzaWJsZSkKKwkJCWNvbnRpbnVlOwor CisJCW1pbmltdW1baWRdID0gc2tsX2RkYl9taW5fYWxsb2MocHN0YXRlLCAwKTsKKwkJeV9taW5p bXVtW2lkXSA9IHNrbF9kZGJfbWluX2FsbG9jKHBzdGF0ZSwgMSk7CisJfQorCisJbWluaW11bVtQ TEFORV9DVVJTT1JdID0gc2tsX2N1cnNvcl9hbGxvY2F0aW9uKG51bV9hY3RpdmUpOworfQorCiBz dGF0aWMgaW50CiBza2xfYWxsb2NhdGVfcGlwZV9kZGIoc3RydWN0IGludGVsX2NydGNfc3RhdGUg KmNzdGF0ZSwKIAkJICAgICAgc3RydWN0IHNrbF9kZGJfYWxsb2NhdGlvbiAqZGRiIC8qIG91dCAq LykKQEAgLTMzNzIsMTIgKzMzOTYsOSBAQCBza2xfYWxsb2NhdGVfcGlwZV9kZGIoc3RydWN0IGlu dGVsX2NydGNfc3RhdGUgKmNzdGF0ZSwKIAlzdHJ1Y3QgZHJtX2NydGMgKmNydGMgPSBjc3RhdGUt PmJhc2UuY3J0YzsKIAlzdHJ1Y3QgZHJtX2RldmljZSAqZGV2ID0gY3J0Yy0+ZGV2OwogCXN0cnVj dCBpbnRlbF9jcnRjICppbnRlbF9jcnRjID0gdG9faW50ZWxfY3J0YyhjcnRjKTsKLQlzdHJ1Y3Qg aW50ZWxfcGxhbmUgKmludGVsX3BsYW5lOwotCXN0cnVjdCBkcm1fcGxhbmUgKnBsYW5lOwotCWNv bnN0IHN0cnVjdCBkcm1fcGxhbmVfc3RhdGUgKnBzdGF0ZTsKIAllbnVtIHBpcGUgcGlwZSA9IGlu dGVsX2NydGMtPnBpcGU7CiAJc3RydWN0IHNrbF9kZGJfZW50cnkgKmFsbG9jID0gJmNzdGF0ZS0+ d20uc2tsLmRkYjsKLQl1aW50MTZfdCBhbGxvY19zaXplLCBzdGFydCwgY3Vyc29yX2Jsb2NrczsK Kwl1aW50MTZfdCBhbGxvY19zaXplLCBzdGFydDsKIAl1aW50MTZfdCBtaW5pbXVtW0k5MTVfTUFY X1BMQU5FU10gPSB7fTsKIAl1aW50MTZfdCB5X21pbmltdW1bSTkxNV9NQVhfUExBTkVTXSA9IHt9 OwogCXVuc2lnbmVkIGludCB0b3RhbF9kYXRhX3JhdGU7CkBAIC0zNDA1LDMyICszNDI2LDIyIEBA IHNrbF9hbGxvY2F0ZV9waXBlX2RkYihzdHJ1Y3QgaW50ZWxfY3J0Y19zdGF0ZSAqY3N0YXRlLAog CQlyZXR1cm4gMDsKIAl9CiAKLQljdXJzb3JfYmxvY2tzID0gc2tsX2N1cnNvcl9hbGxvY2F0aW9u KG51bV9hY3RpdmUpOwotCWRkYi0+cGxhbmVbcGlwZV1bUExBTkVfQ1VSU09SXS5zdGFydCA9IGFs bG9jLT5lbmQgLSBjdXJzb3JfYmxvY2tzOwotCWRkYi0+cGxhbmVbcGlwZV1bUExBTkVfQ1VSU09S XS5lbmQgPSBhbGxvYy0+ZW5kOwotCi0JYWxsb2Nfc2l6ZSAtPSBjdXJzb3JfYmxvY2tzOwotCi0J LyogMS4gQWxsb2NhdGUgdGhlIG1pbmludW0gcmVxdWlyZWQgYmxvY2tzIGZvciBlYWNoIGFjdGl2 ZSBwbGFuZSAqLwotCWRybV9hdG9taWNfY3J0Y19zdGF0ZV9mb3JfZWFjaF9wbGFuZV9zdGF0ZShw bGFuZSwgcHN0YXRlLCAmY3N0YXRlLT5iYXNlKSB7Ci0JCWludGVsX3BsYW5lID0gdG9faW50ZWxf cGxhbmUocGxhbmUpOwotCQlpZCA9IHNrbF93bV9wbGFuZV9pZChpbnRlbF9wbGFuZSk7Ci0KLQkJ aWYgKCFwc3RhdGUtPnZpc2libGUpCi0JCQljb250aW51ZTsKLQotCQlpZiAocGxhbmUtPnR5cGUg PT0gRFJNX1BMQU5FX1RZUEVfQ1VSU09SKQotCQkJY29udGludWU7CisJc2tsX2RkYl9jYWxjX21p bihjc3RhdGUsIG51bV9hY3RpdmUsIG1pbmltdW0sIHlfbWluaW11bSk7CiAKLQkJbWluaW11bVtp ZF0gPSBza2xfZGRiX21pbl9hbGxvYyhwc3RhdGUsIDApOwotCQl5X21pbmltdW1baWRdID0gc2ts X2RkYl9taW5fYWxsb2MocHN0YXRlLCAxKTsKLQl9CisJLyoKKwkgKiAxLiBBbGxvY2F0ZSB0aGUg bWluaW51bSByZXF1aXJlZCBibG9ja3MgZm9yIGVhY2ggYWN0aXZlIHBsYW5lCisJICogYW5kIGFs bG9jYXRlIHRoZSBjdXJzb3IsIGl0IGRvZXNuJ3QgcmVxdWlyZSBleHRyYSBhbGxvY2F0aW9uCisJ ICogcHJvcG9ydGlvbmFsIHRvIHRoZSBkYXRhIHJhdGUuCisJICovCiAKLQlmb3IgKGkgPSAwOyBp IDwgUExBTkVfQ1VSU09SOyBpKyspIHsKKwlmb3IgKGkgPSAwOyBpIDwgSTkxNV9NQVhfUExBTkVT OyBpKyspIHsKIAkJYWxsb2Nfc2l6ZSAtPSBtaW5pbXVtW2ldOwogCQlhbGxvY19zaXplIC09IHlf bWluaW11bVtpXTsKIAl9CiAKKwlkZGItPnBsYW5lW3BpcGVdW1BMQU5FX0NVUlNPUl0uc3RhcnQg PSBhbGxvYy0+ZW5kIC0gbWluaW11bVtQTEFORV9DVVJTT1JdOworCWRkYi0+cGxhbmVbcGlwZV1b UExBTkVfQ1VSU09SXS5lbmQgPSBhbGxvYy0+ZW5kOworCiAJLyoKIAkgKiAyLiBEaXN0cmlidXRl IHRoZSByZW1haW5pbmcgc3BhY2UgaW4gcHJvcG9ydGlvbiB0byB0aGUgYW1vdW50IG9mCiAJICog ZGF0YSBlYWNoIHBsYW5lIG5lZWRzIHRvIGZldGNoIGZyb20gbWVtb3J5LgpAQCAtMzQ0OCw2ICsz NDU5LDkgQEAgc2tsX2FsbG9jYXRlX3BpcGVfZGRiKHN0cnVjdCBpbnRlbF9jcnRjX3N0YXRlICpj c3RhdGUsCiAJCXVuc2lnbmVkIGludCBkYXRhX3JhdGUsIHlfZGF0YV9yYXRlOwogCQl1aW50MTZf dCBwbGFuZV9ibG9ja3MsIHlfcGxhbmVfYmxvY2tzID0gMDsKIAorCQlpZiAoaWQgPT0gUExBTkVf Q1VSU09SKQorCQkJY29udGludWU7CisKIAkJZGF0YV9yYXRlID0gcGxhbmVfZGF0YV9yYXRlW2lk XTsKIAogCQkvKgotLSAKMi43LjQKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fCkludGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVk ZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZv L2ludGVsLWdmeAo=