From mboxrd@z Thu Jan 1 00:00:00 1970 From: Michel Thierry Subject: [PATCH igt v3] lib: Update intel_require_memory to handle +4GB cases Date: Fri, 26 Jun 2015 17:46:01 +0100 Message-ID: <1435337161-31125-1-git-send-email-michel.thierry@intel.com> References: <1435153231-19606-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 884A86EE2C for ; Fri, 26 Jun 2015 09:46:04 -0700 (PDT) In-Reply-To: <1435153231-19606-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 Cc: Daniel Vetter List-Id: intel-gfx@lists.freedesktop.org Q2hhbmdlZCBzaXplIGZyb20gdTMyIHRvIHU2NCB0byBzdXBwb3J0ICs0R0IuCjQ4LWJpdCBQUEdU VCB0ZXN0IGNhc2VzIG1heSBuZWVkIGV4dHJhIG1lbW9yeSBhdmFpbGFibGUuCgp2MjogVXNlIHRo b3VzYW5kcyBzZXBhcmF0b3IgKENocmlzKQp2MzogTW92ZWQgaWd0X3NraXBfb25fc2ltdWxhdGlv bigpIHRvIHRoZSBzdGFydCAoQ2hyaXMpCiAgICBJbmNsdWRlIENocmlzJyB1c2FnZSBoaW50IGlu IHRoZSBndGstZG9jIHNlY3Rpb24gKERhbmllbCkKCkNjOiBEYW5pZWwgVmV0dGVyIDxkYW5pZWwu dmV0dGVyQGZmd2xsLmNoPgpSZXZpZXdlZC1ieTogQ2hyaXMgV2lsc29uIDxjaHJpc0BjaHJpcy13 aWxzb24uY28udWs+ICh2MikKU2lnbmVkLW9mZi1ieTogTWljaGVsIFRoaWVycnkgPG1pY2hlbC50 aGllcnJ5QGludGVsLmNvbT4KLS0tCiBsaWIvaWd0X2F1eC5oICB8ICAyICstCiBsaWIvaW50ZWxf b3MuYyB8IDM0ICsrKysrKysrKysrKysrKysrKysrKysrKysrKysrLS0tLS0KIDIgZmlsZXMgY2hh bmdlZCwgMzAgaW5zZXJ0aW9ucygrKSwgNiBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9saWIv aWd0X2F1eC5oIGIvbGliL2lndF9hdXguaAppbmRleCA5ZWE1MGRlLi4xMzllNWRhIDEwMDY0NAot LS0gYS9saWIvaWd0X2F1eC5oCisrKyBiL2xpYi9pZ3RfYXV4LmgKQEAgLTg2LDcgKzg2LDcgQEAg dWludDY0X3QgaW50ZWxfZ2V0X2F2YWlsX3JhbV9tYih2b2lkKTsKIHVpbnQ2NF90IGludGVsX2dl dF90b3RhbF9yYW1fbWIodm9pZCk7CiB1aW50NjRfdCBpbnRlbF9nZXRfdG90YWxfc3dhcF9tYih2 b2lkKTsKIAotdm9pZCBpbnRlbF9yZXF1aXJlX21lbW9yeSh1aW50MzJfdCBjb3VudCwgdWludDMy X3Qgc2l6ZSwgdW5zaWduZWQgbW9kZSk7Cit2b2lkIGludGVsX3JlcXVpcmVfbWVtb3J5KHVpbnQz Ml90IGNvdW50LCB1aW50NjRfdCBzaXplLCB1bnNpZ25lZCBtb2RlKTsKICNkZWZpbmUgQ0hFQ0tf UkFNIDB4MQogI2RlZmluZSBDSEVDS19TV0FQIDB4MgogCmRpZmYgLS1naXQgYS9saWIvaW50ZWxf b3MuYyBiL2xpYi9pbnRlbF9vcy5jCmluZGV4IGY4Mjg0N2YuLjNlM2I5ZWMgMTAwNjQ0Ci0tLSBh L2xpYi9pbnRlbF9vcy5jCisrKyBiL2xpYi9pbnRlbF9vcy5jCkBAIC0yMTQsMTkgKzIxNCw0NSBA QCBpbnRlbF9nZXRfdG90YWxfc3dhcF9tYih2b2lkKQogICogYWxzbyBjYXVzZXMgdGhlIHRlc3Qg dG8gYmUgc2tpcHBlZCBhdXRvbWF0aWNhbGx5IG9uIHNpbXVsYXRpb24gdW5kZXIgdGhlCiAgKiBh c3N1bXB0aW9uIHRoYXQgYW55IHRlc3QgdGhhdCBuZWVkcyB0byBjaGVjayBmb3IgbWVtb3J5IHJl cXVpcmVtZW50cyBpcyBhCiAgKiB0aHJhc2hpbmcgdGVzdCB1bnN1aXRhYmxlIGZvciBzbG93IHNp bXVsYXRlZCBzeXN0ZW1zLgorICoKKyAqIFdlIHVzZSBpbnRlbF9yZXF1aXJlX21lbW9yeSgpIHRv IGRldGVjdCB0ZXN0cyB0aGF0IGFyZSBkZXNpZ25lZCB0byBydW4gd2l0aAorICogbGFyZ2Ugd29y a2luZyBzZXRzIHRvIHN0cmVzcyBib3VuZGFyaWVzIHN1Y2ggYXMgYXBlcnR1cmUsIGFuZC9vciBt ZW1vcnkKKyAqIGV4aGF1c3Rpb24uIEZ1bmN0aW9uYWwgdGVzdHMgdGhhdCBhbHNvIHJlcXVpcmUg bGFyZ2Ugd29ya2luZyBzZXRzIHNob3VsZCBiZQorICogc3BsaXQgaW50byB0d28sIGEgc21hbGwg c3VidGVzdCB0byB2ZXJpZnkgdGhlIG9wZXJhdGlvbiB3aXRoIHRoZSBhYnNvbHV0ZQorICogbWlu aW11bSB3b3JraW5nIHNldCwgYW5kIHRoZSBmdWxsIHN1YnRlc3QgdG8gdmVyaWZ5IHRoZSBpbnRl cmVzdGluZyBjb3JuZXIKKyAqIGNhc2VzLiBUaGUgZm9ybWVyIHRlc3QgZG9lc24ndCByZXF1aXJl IHRoZSBtZW1vcnkgY2hlY2sgYW5kIHNvIGp1ZGljaW91cworICogdXNlIG9mIGludGVsX3JlcXVp cmVfbWVtb3J5KCkgaGVscHMgc2VncmVnYXRlIHN1Y2ggZnVuY3Rpb25hbCB0ZXN0cyBmcm9tCisg KiB0aGUgYnJvYWRlciB0ZXN0cywgdXNlZnVsIGZvciBzbG93IHZlcmlmaWNhdGlvbiBzeXN0ZW1z IHN1Y2ggYXMgdGhlCisgKiBzaW11bGF0b3IuCisgKgorICogVG8gcmVjYXAsIGxheSBvdXQgYmVo YXZpb3VyIHRlc3RzIGxpa2U6CisgKiB8WzwhLS0gbGFuZ3VhZ2U9IkMiIC0tPgorICogICAgaWd0 X3N1YnRlc3QoInNtYWxsIikgeworICogICAgICAgcnVuX3Rlc3Qoey5udW1fc3VyZmFjZXMgPSAy IH0pOworICogICAgfQorICogICAgaWd0X3N1YnRlc3QoImZ1bGwiKSB7CisgKiAgICAgIGludGVs X3JlcXVpcmVfbWVtb3J5KE5VTV9TVVJGQUNFUywgU1VSRkFDRV9TSVpFLCBDSEVDS19SQU0pOwor ICogICAgICBydW5fdGVzdCh7Lm51bV9zdXJmYWNlcyA9IE5VTV9TVVJGQUNFU30pOworICogICAg fQorICogXXwKKyAqIHNvIHRoYXQgd2UgaGF2ZSBhIHNpbXBsZSBjaGVjayB0aGF0IGlzIHJ1biBh bnl3aGVyZSBhbmQgZXZlcnl3aGVyZSwKKyAqIHVzZWZ1bCB0byBwcm92ZSB0aGUgdGVzdCBpdHNl bGYgd29ya3MgYXMgZXhwZWN0ZWQsIGFuZCB0aGUgZnVsbAorICogc2xvdyBjaGVjayB0aGF0IG5l ZWRzIHRvIGJlIHJ1biBvbiByZWFsIGhhcmR3YXJlLgogICovCi12b2lkIGludGVsX3JlcXVpcmVf bWVtb3J5KHVpbnQzMl90IGNvdW50LCB1aW50MzJfdCBzaXplLCB1bnNpZ25lZCBtb2RlKQordm9p ZCBpbnRlbF9yZXF1aXJlX21lbW9yeSh1aW50MzJfdCBjb3VudCwgdWludDY0X3Qgc2l6ZSwgdW5z aWduZWQgbW9kZSkKIHsKIC8qIHJvdWdoIGVzdGltYXRlIG9mIGhvdyBtYW55IGJ5dGVzIHRoZSBr ZXJuZWwgcmVxdWlyZXMgdG8gdHJhY2sgZWFjaCBvYmplY3QgKi8KICNkZWZpbmUgS0VSTkVMX0JP X09WRVJIRUFEIDUxMgogCXVpbnQ2NF90IHJlcXVpcmVkLCB0b3RhbDsKIAorCWlndF9za2lwX29u X3NpbXVsYXRpb24oKTsKKwogCXJlcXVpcmVkID0gY291bnQ7CiAJcmVxdWlyZWQgKj0gc2l6ZSAr IEtFUk5FTF9CT19PVkVSSEVBRDsKIAlyZXF1aXJlZCA9IEFMSUdOKHJlcXVpcmVkLCA0MDk2KTsK IAotCWlndF9kZWJ1ZygiQ2hlY2tpbmcgJXUgc3VyZmFjZXMgb2Ygc2l6ZSAldSBieXRlcyAodG90 YWwgJSdsbHUpIGFnYWluc3QgJXMlc1xuIiwKLQkJICBjb3VudCwgc2l6ZSwgKGxvbmcgbG9uZyly ZXF1aXJlZCwKKwlpZ3RfZGVidWcoIkNoZWNraW5nICV1IHN1cmZhY2VzIG9mIHNpemUgJSdsbHUg Ynl0ZXMgKHRvdGFsICUnbGx1KSBhZ2FpbnN0ICVzJXNcbiIsCisJCSAgY291bnQsIChsb25nIGxv bmcpc2l6ZSwgKGxvbmcgbG9uZylyZXF1aXJlZCwKIAkJICBtb2RlICYgKENIRUNLX1JBTSB8IENI RUNLX1NXQVApID8gIlJBTSIgOiAiIiwKIAkJICBtb2RlICYgQ0hFQ0tfU1dBUCA/ICIgKyBzd2Fw IjogIiIpOwogCkBAIC0yNDIsOCArMjY4LDYgQEAgdm9pZCBpbnRlbF9yZXF1aXJlX21lbW9yeSh1 aW50MzJfdCBjb3VudCwgdWludDMyX3Qgc2l6ZSwgdW5zaWduZWQgbW9kZSkKIAkJICAgICAgKGxv bmcgbG9uZylyZXF1aXJlZCwgKGxvbmcgbG9uZyl0b3RhbCwKIAkJICAgICAgbW9kZSAmIChDSEVD S19SQU0gfCBDSEVDS19TV0FQKSA/ICJSQU0iIDogIiIsCiAJCSAgICAgIG1vZGUgJiBDSEVDS19T V0FQID8gIiArIHN3YXAiOiAiIik7Ci0KLQlpZ3Rfc2tpcF9vbl9zaW11bGF0aW9uKCk7CiB9CiAK IHZvaWQKLS0gCjIuNC40CgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3Rv cC5vcmcKaHR0cDovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ludGVs LWdmeAo=