From: ville.syrjala@linux.intel.com Subject: [PATCH i-g-t 3/7] Remove gem_mmap__{cpu, gtt, wc} return value MAP_FAILED asserts Date: Fri, 9 Oct 2015 19:19:12 +0300 Message-ID: <1444407556-26575-3-git-send-email-ville.syrjala@linux.intel.com> References: <1444407556-26575-1-git-send-email-ville.syrjala@linux.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 65C476EEA6 for ; Fri, 9 Oct 2015 09:19:26 -0700 (PDT) In-Reply-To: <1444407556-26575-1-git-send-email-ville.syrjala@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 List-Id: intel-gfx@lists.freedesktop.org RnJvbTogVmlsbGUgU3lyasOkbMOkIDx2aWxsZS5zeXJqYWxhQGxpbnV4LmludGVsLmNvbT4KCmdl bV9tbWFwX197Y3B1LGd0dCx3Y30gbmV2ZXIgcmV0dXJuIE1BUF9GQUlMRUQsIGl0IGdldHMgY29u dmVydGVkIHRvCk5VTEwgaW50ZXJuYWxseS4gU28gZG9uJ3QgZ28gYXNzZXJ0aW5nIHRoYXQgdGhl IHJldHVybmVkIHZhbHVlIGlzCm5vdCBNQVBfRkFJTEVELgoKRG9uZSB3aXRoIGNvY2NpbmVsbGU6 CkBACnR5cGUgVDsKaWRlbnRpZmllciBJOwpAQAooCiBJID0gZ2VtX21tYXBfX2d0dCguLi4pOwp8 CiBJID0gZ2VtX21tYXBfX2NwdSguLi4pOwp8CiBJID0gZ2VtX21tYXBfX3djKC4uLik7CikKIC4u LgooCi0gaWd0X2Fzc2VydChJICE9IE1BUF9GQUlMRUQpOworIGlndF9hc3NlcnQoSSk7CnwKLSBp Z3RfYXNzZXJ0KEkgJiYgSSAhPSBNQVBfRkFJTEVEKTsKKyBpZ3RfYXNzZXJ0KEkpOwp8Ci0gaWd0 X2Fzc2VydChJICE9IChUICopIE1BUF9GQUlMRUQpOworIGlndF9hc3NlcnQoSSk7CnwKLSBpZ3Rf YXNzZXJ0KEkgIT0gTlVMTCk7CisgaWd0X2Fzc2VydChJKTsKKQoKU2lnbmVkLW9mZi1ieTogVmls bGUgU3lyasOkbMOkIDx2aWxsZS5zeXJqYWxhQGxpbnV4LmludGVsLmNvbT4KLS0tCiB0ZXN0cy9k cnZfc3VzcGVuZC5jICAgICAgICB8ICA2ICsrKy0tLQogdGVzdHMvZ2VtX2NvbmN1cnJlbnRfYWxs LmMgfCAxMiArKysrKystLS0tLS0KIHRlc3RzL2dlbV9tYWR2aXNlLmMgICAgICAgIHwgIDIgKy0K IHRlc3RzL2dlbV9tbWFwX2d0dC5jICAgICAgIHwgMTIgKysrKysrLS0tLS0tCiB0ZXN0cy9nZW1f bW1hcF93Yy5jICAgICAgICB8IDE0ICsrKysrKystLS0tLS0tCiB0ZXN0cy9nZW1fdXNlcnB0cl9i bGl0cy5jICB8ICAyICstCiA2IGZpbGVzIGNoYW5nZWQsIDI0IGluc2VydGlvbnMoKyksIDI0IGRl bGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL3Rlc3RzL2Rydl9zdXNwZW5kLmMgYi90ZXN0cy9kcnZf c3VzcGVuZC5jCmluZGV4IDQwMTQyNDEuLjRlODRkMWMgMTAwNjQ0Ci0tLSBhL3Rlc3RzL2Rydl9z dXNwZW5kLmMKKysrIGIvdGVzdHMvZHJ2X3N1c3BlbmQuYwpAQCAtNTcsMTkgKzU3LDE5IEBAIHRl c3RfZmVuY2VfcmVzdG9yZShpbnQgZmQsIGJvb2wgdGlsZWQydW50aWxlZCwgYm9vbCBoaWJlcm5h dGUpCiAKIAkvKiBBY2Nlc3MgdGhlIGJ1ZmZlciBvYmplY3RzIGluIHRoZSBvcmRlciB3ZSB3YW50 IHRvIGhhdmUgdGhlIGxhaWQgb3V0LiAqLwogCXB0cjEgPSBnZW1fbW1hcF9fZ3R0KGZkLCBoYW5k bGUxLCBPQkpFQ1RfU0laRSwgUFJPVF9SRUFEIHwgUFJPVF9XUklURSk7Ci0JaWd0X2Fzc2VydChw dHIxICE9IE1BUF9GQUlMRUQpOworCWlndF9hc3NlcnQocHRyMSk7CiAJZm9yIChpID0gMDsgaSA8 IE9CSkVDVF9TSVpFL3NpemVvZih1aW50MzJfdCk7IGkrKykKIAkJcHRyMVtpXSA9IGk7CiAKIAlw dHJfdGlsZWQgPSBnZW1fbW1hcF9fZ3R0KGZkLCBoYW5kbGVfdGlsZWQsIE9CSkVDVF9TSVpFLCBQ Uk9UX1JFQUQgfCBQUk9UX1dSSVRFKTsKLQlpZ3RfYXNzZXJ0KHB0cl90aWxlZCAhPSBNQVBfRkFJ TEVEKTsKKwlpZ3RfYXNzZXJ0KHB0cl90aWxlZCk7CiAJaWYgKHRpbGVkMnVudGlsZWQpCiAJCWdl bV9zZXRfdGlsaW5nKGZkLCBoYW5kbGVfdGlsZWQsIEk5MTVfVElMSU5HX1gsIDIwNDgpOwogCWZv ciAoaSA9IDA7IGkgPCBPQkpFQ1RfU0laRS9zaXplb2YodWludDMyX3QpOyBpKyspCiAJCXB0cl90 aWxlZFtpXSA9IGk7CiAKIAlwdHIyID0gZ2VtX21tYXBfX2d0dChmZCwgaGFuZGxlMiwgT0JKRUNU X1NJWkUsIFBST1RfUkVBRCB8IFBST1RfV1JJVEUpOwotCWlndF9hc3NlcnQocHRyMiAhPSBNQVBf RkFJTEVEKTsKKwlpZ3RfYXNzZXJ0KHB0cjIpOwogCWZvciAoaSA9IDA7IGkgPCBPQkpFQ1RfU0la RS9zaXplb2YodWludDMyX3QpOyBpKyspCiAJCXB0cjJbaV0gPSBpOwogCmRpZmYgLS1naXQgYS90 ZXN0cy9nZW1fY29uY3VycmVudF9hbGwuYyBiL3Rlc3RzL2dlbV9jb25jdXJyZW50X2FsbC5jCmlu ZGV4IDE2N2YzODMuLjZlZmI5NzcgMTAwNjQ0Ci0tLSBhL3Rlc3RzL2dlbV9jb25jdXJyZW50X2Fs bC5jCisrKyBiL3Rlc3RzL2dlbV9jb25jdXJyZW50X2FsbC5jCkBAIC00NzIsOSArNDcyLDkgQEAg c3RhdGljIHZvaWQgY3B1X2NvcHlfYm8oZHJtX2ludGVsX2JvICpkc3QsIGRybV9pbnRlbF9ibyAq c3JjKQogCWdlbV9zZXRfZG9tYWluKGZkLCBzcmMtPmhhbmRsZSwgSTkxNV9HRU1fRE9NQUlOX0NQ VSwgMCk7CiAJZ2VtX3NldF9kb21haW4oZmQsIGRzdC0+aGFuZGxlLCBJOTE1X0dFTV9ET01BSU5f Q1BVLCBJOTE1X0dFTV9ET01BSU5fQ1BVKTsKIAlzID0gZ2VtX21tYXBfX2NwdShmZCwgc3JjLT5o YW5kbGUsIDAsIHNpemUsIFBST1RfUkVBRCk7Ci0JaWd0X2Fzc2VydChzICE9IE5VTEwpOworCWln dF9hc3NlcnQocyk7CiAJZCA9IGdlbV9tbWFwX19jcHUoZmQsIGRzdC0+aGFuZGxlLCAwLCBzaXpl LCBQUk9UX1dSSVRFKTsKLQlpZ3RfYXNzZXJ0KGQgIT0gTlVMTCk7CisJaWd0X2Fzc2VydChkKTsK IAogCW1lbWNweShkLCBzLCBzaXplKTsKIApAQCAtNDkxLDkgKzQ5MSw5IEBAIHN0YXRpYyB2b2lk IGd0dF9jb3B5X2JvKGRybV9pbnRlbF9ibyAqZHN0LCBkcm1faW50ZWxfYm8gKnNyYykKIAlnZW1f c2V0X2RvbWFpbihmZCwgZHN0LT5oYW5kbGUsIEk5MTVfR0VNX0RPTUFJTl9HVFQsIEk5MTVfR0VN X0RPTUFJTl9HVFQpOwogCiAJcyA9IGdlbV9tbWFwX19ndHQoZmQsIHNyYy0+aGFuZGxlLCBzaXpl LCBQUk9UX1JFQUQpOwotCWlndF9hc3NlcnQocyAhPSBOVUxMKTsKKwlpZ3RfYXNzZXJ0KHMpOwog CWQgPSBnZW1fbW1hcF9fZ3R0KGZkLCBkc3QtPmhhbmRsZSwgc2l6ZSwgUFJPVF9XUklURSk7Ci0J aWd0X2Fzc2VydChkICE9IE5VTEwpOworCWlndF9hc3NlcnQoZCk7CiAKIAltZW1jcHkoZCwgcywg c2l6ZSk7CiAKQEAgLTUxMCw5ICs1MTAsOSBAQCBzdGF0aWMgdm9pZCB3Y19jb3B5X2JvKGRybV9p bnRlbF9ibyAqZHN0LCBkcm1faW50ZWxfYm8gKnNyYykKIAlnZW1fc2V0X2RvbWFpbihmZCwgZHN0 LT5oYW5kbGUsIEk5MTVfR0VNX0RPTUFJTl9HVFQsIEk5MTVfR0VNX0RPTUFJTl9HVFQpOwogCiAJ cyA9IGdlbV9tbWFwX193YyhmZCwgc3JjLT5oYW5kbGUsIDAsIHNpemUsIFBST1RfUkVBRCk7Ci0J aWd0X2Fzc2VydChzICE9IE5VTEwpOworCWlndF9hc3NlcnQocyk7CiAJZCA9IGdlbV9tbWFwX193 YyhmZCwgZHN0LT5oYW5kbGUsIDAsIHNpemUsIFBST1RfV1JJVEUpOwotCWlndF9hc3NlcnQoZCAh PSBOVUxMKTsKKwlpZ3RfYXNzZXJ0KGQpOwogCiAJbWVtY3B5KGQsIHMsIHNpemUpOwogCmRpZmYg LS1naXQgYS90ZXN0cy9nZW1fbWFkdmlzZS5jIGIvdGVzdHMvZ2VtX21hZHZpc2UuYwppbmRleCAz NTlmNDkwLi5kMGYzNzhlIDEwMDY0NAotLS0gYS90ZXN0cy9nZW1fbWFkdmlzZS5jCisrKyBiL3Rl c3RzL2dlbV9tYWR2aXNlLmMKQEAgLTc4LDcgKzc4LDcgQEAgZG9udG5lZWRfYWZ0ZXJfbW1hcCh2 b2lkKQogCiAJaGFuZGxlID0gZ2VtX2NyZWF0ZShmZCwgT0JKRUNUX1NJWkUpOwogCXB0ciA9IGdl bV9tbWFwX19ndHQoZmQsIGhhbmRsZSwgT0JKRUNUX1NJWkUsIFBST1RfUkVBRCB8IFBST1RfV1JJ VEUpOwotCWlndF9hc3NlcnQocHRyICE9IE5VTEwpOworCWlndF9hc3NlcnQocHRyKTsKIAlnZW1f bWFkdmlzZShmZCwgaGFuZGxlLCBJOTE1X01BRFZfRE9OVE5FRUQpOwogCWNsb3NlKGZkKTsKIApk aWZmIC0tZ2l0IGEvdGVzdHMvZ2VtX21tYXBfZ3R0LmMgYi90ZXN0cy9nZW1fbW1hcF9ndHQuYwpp bmRleCAxNjI0YTZiLi41Yjc4MmM5IDEwMDY0NAotLS0gYS90ZXN0cy9nZW1fbW1hcF9ndHQuYwor KysgYi90ZXN0cy9nZW1fbW1hcF9ndHQuYwpAQCAtNTcsNyArNTcsNyBAQCBtbWFwX2JvKGludCBm ZCwgdWludDMyX3QgaGFuZGxlKQogCXZvaWQgKnB0cjsKIAogCXB0ciA9IGdlbV9tbWFwX19ndHQo ZmQsIGhhbmRsZSwgT0JKRUNUX1NJWkUsIFBST1RfUkVBRCB8IFBST1RfV1JJVEUpOwotCWlndF9h c3NlcnQocHRyICE9IE1BUF9GQUlMRUQpOworCWlndF9hc3NlcnQocHRyKTsKIAogCXJldHVybiBw dHI7CiB9CkBAIC0xODAsNyArMTgwLDcgQEAgdGVzdF9yZWFkX3dyaXRlKGludCBmZCwgZW51bSB0 ZXN0X3JlYWRfd3JpdGUgb3JkZXIpCiAJaGFuZGxlID0gZ2VtX2NyZWF0ZShmZCwgT0JKRUNUX1NJ WkUpOwogCiAJcHRyID0gZ2VtX21tYXBfX2d0dChmZCwgaGFuZGxlLCBPQkpFQ1RfU0laRSwgUFJP VF9SRUFEIHwgUFJPVF9XUklURSk7Ci0JaWd0X2Fzc2VydChwdHIgIT0gTUFQX0ZBSUxFRCk7CisJ aWd0X2Fzc2VydChwdHIpOwogCiAJaWYgKG9yZGVyID09IFJFQURfQkVGT1JFX1dSSVRFKSB7CiAJ CXZhbCA9ICoodWludDMyX3QgKilwdHI7CkBAIC0yMDQsMTAgKzIwNCwxMCBAQCB0ZXN0X3JlYWRf d3JpdGUyKGludCBmZCwgZW51bSB0ZXN0X3JlYWRfd3JpdGUgb3JkZXIpCiAJaGFuZGxlID0gZ2Vt X2NyZWF0ZShmZCwgT0JKRUNUX1NJWkUpOwogCiAJciA9IGdlbV9tbWFwX19ndHQoZmQsIGhhbmRs ZSwgT0JKRUNUX1NJWkUsIFBST1RfUkVBRCk7Ci0JaWd0X2Fzc2VydChyICE9IE1BUF9GQUlMRUQp OworCWlndF9hc3NlcnQocik7CiAKIAl3ID0gZ2VtX21tYXBfX2d0dChmZCwgaGFuZGxlLCBPQkpF Q1RfU0laRSwgUFJPVF9SRUFEIHwgUFJPVF9XUklURSk7Ci0JaWd0X2Fzc2VydCh3ICE9IE1BUF9G QUlMRUQpOworCWlndF9hc3NlcnQodyk7CiAKIAlpZiAob3JkZXIgPT0gUkVBRF9CRUZPUkVfV1JJ VEUpIHsKIAkJdmFsID0gKih1aW50MzJfdCAqKXI7CkBAIC00NDEsMTAgKzQ0MSwxMCBAQCB0ZXN0 X3dyaXRlX2NwdV9yZWFkX2d0dChpbnQgZmQpCiAJaGFuZGxlID0gZ2VtX2NyZWF0ZShmZCwgT0JK RUNUX1NJWkUpOwogCiAJZHN0ID0gZ2VtX21tYXBfX2d0dChmZCwgaGFuZGxlLCBPQkpFQ1RfU0la RSwgUFJPVF9SRUFEKTsKLQlpZ3RfYXNzZXJ0KGRzdCAhPSAodWludDMyX3QgKilNQVBfRkFJTEVE KTsKKwlpZ3RfYXNzZXJ0KGRzdCk7CiAKIAlzcmMgPSBnZW1fbW1hcF9fY3B1KGZkLCBoYW5kbGUs IDAsIE9CSkVDVF9TSVpFLCBQUk9UX1dSSVRFKTsKLQlpZ3RfYXNzZXJ0KHNyYyAhPSAodWludDMy X3QgKilNQVBfRkFJTEVEKTsKKwlpZ3RfYXNzZXJ0KHNyYyk7CiAKIAlnZW1fY2xvc2UoZmQsIGhh bmRsZSk7CiAKZGlmZiAtLWdpdCBhL3Rlc3RzL2dlbV9tbWFwX3djLmMgYi90ZXN0cy9nZW1fbW1h cF93Yy5jCmluZGV4IGUzMTI4MDUuLjExNDYzY2EgMTAwNjQ0Ci0tLSBhL3Rlc3RzL2dlbV9tbWFw X3djLmMKKysrIGIvdGVzdHMvZ2VtX21tYXBfd2MuYwpAQCAtNjMsNyArNjMsNyBAQCBtbWFwX2Jv KGludCBmZCwgdWludDMyX3QgaGFuZGxlKQogCXZvaWQgKnB0cjsKIAogCXB0ciA9IGdlbV9tbWFw X193YyhmZCwgaGFuZGxlLCAwLCBPQkpFQ1RfU0laRSwgUFJPVF9SRUFEIHwgUFJPVF9XUklURSk7 Ci0JaWd0X2Fzc2VydChwdHIgJiYgcHRyICE9IE1BUF9GQUlMRUQpOworCWlndF9hc3NlcnQocHRy KTsKIAogCXJldHVybiBwdHI7CiB9CkBAIC0xODQsMTAgKzE4NCwxMCBAQCB0ZXN0X3JlYWRfd3Jp dGUyKGludCBmZCwgZW51bSB0ZXN0X3JlYWRfd3JpdGUgb3JkZXIpCiAJc2V0X2RvbWFpbihmZCwg aGFuZGxlKTsKIAogCXIgPSBnZW1fbW1hcF9fd2MoZmQsIGhhbmRsZSwgMCwgT0JKRUNUX1NJWkUs IFBST1RfUkVBRCk7Ci0JaWd0X2Fzc2VydChyICE9IE1BUF9GQUlMRUQpOworCWlndF9hc3NlcnQo cik7CiAKIAl3ID0gZ2VtX21tYXBfX3djKGZkLCBoYW5kbGUsIDAsIE9CSkVDVF9TSVpFLCBQUk9U X1JFQUQgfCBQUk9UX1dSSVRFKTsKLQlpZ3RfYXNzZXJ0KHcgIT0gTUFQX0ZBSUxFRCk7CisJaWd0 X2Fzc2VydCh3KTsKIAogCWlmIChvcmRlciA9PSBSRUFEX0JFRk9SRV9XUklURSkgewogCQl2YWwg PSAqKHVpbnQzMl90ICopcjsKQEAgLTI4OSwxMCArMjg5LDEwIEBAIHRlc3Rfd3JpdGVfY3B1X3Jl YWRfd2MoaW50IGZkLCBpbnQgZm9yY2VfZG9tYWluKQogCWhhbmRsZSA9IGdlbV9jcmVhdGUoZmQs IE9CSkVDVF9TSVpFKTsKIAogCWRzdCA9IGdlbV9tbWFwX193YyhmZCwgaGFuZGxlLCAwLCBPQkpF Q1RfU0laRSwgUFJPVF9SRUFEKTsKLQlpZ3RfYXNzZXJ0KGRzdCAhPSAodWludDMyX3QgKilNQVBf RkFJTEVEKTsKKwlpZ3RfYXNzZXJ0KGRzdCk7CiAKIAlzcmMgPSBnZW1fbW1hcF9fY3B1KGZkLCBo YW5kbGUsIDAsIE9CSkVDVF9TSVpFLCBQUk9UX1dSSVRFKTsKLQlpZ3RfYXNzZXJ0KHNyYyAhPSAo dWludDMyX3QgKilNQVBfRkFJTEVEKTsKKwlpZ3RfYXNzZXJ0KHNyYyk7CiAKIAltZW1zZXQoc3Jj LCAweGFhLCBPQkpFQ1RfU0laRSk7CiAJaWYgKGZvcmNlX2RvbWFpbikKQEAgLTMxNiwxMCArMzE2 LDEwIEBAIHRlc3Rfd3JpdGVfZ3R0X3JlYWRfd2MoaW50IGZkKQogCXNldF9kb21haW4oZmQsIGhh bmRsZSk7CiAKIAlkc3QgPSBnZW1fbW1hcF9fd2MoZmQsIGhhbmRsZSwgMCwgT0JKRUNUX1NJWkUs IFBST1RfUkVBRCk7Ci0JaWd0X2Fzc2VydChkc3QgIT0gKHVpbnQzMl90ICopTUFQX0ZBSUxFRCk7 CisJaWd0X2Fzc2VydChkc3QpOwogCiAJc3JjID0gZ2VtX21tYXBfX2d0dChmZCwgaGFuZGxlLCBP QkpFQ1RfU0laRSwgUFJPVF9XUklURSk7Ci0JaWd0X2Fzc2VydChzcmMgIT0gKHVpbnQzMl90ICop TUFQX0ZBSUxFRCk7CisJaWd0X2Fzc2VydChzcmMpOwogCiAJbWVtc2V0KHNyYywgMHhhYSwgT0JK RUNUX1NJWkUpOwogCWlndF9hc3NlcnQobWVtY21wKGRzdCwgc3JjLCBPQkpFQ1RfU0laRSkgPT0g MCk7CmRpZmYgLS1naXQgYS90ZXN0cy9nZW1fdXNlcnB0cl9ibGl0cy5jIGIvdGVzdHMvZ2VtX3Vz ZXJwdHJfYmxpdHMuYwppbmRleCBkMTYxYjZjLi42ZmZmM2E5IDEwMDY0NAotLS0gYS90ZXN0cy9n ZW1fdXNlcnB0cl9ibGl0cy5jCisrKyBiL3Rlc3RzL2dlbV91c2VycHRyX2JsaXRzLmMKQEAgLTU0 Niw3ICs1NDYsNyBAQCBzdGF0aWMgaW50IHRlc3RfaW52YWxpZF9ndHRfbWFwcGluZyhpbnQgZmQp CiAJaGFuZGxlID0gY3JlYXRlX2JvKGZkLCAwKTsKIAlwdHIgPSBnZW1fbW1hcF9fZ3R0KGZkLCBo YW5kbGUsIHNpemVvZihsaW5lYXIpLCBQUk9UX1JFQUQgfCBQUk9UX1dSSVRFKTsKIAlnZW1fY2xv c2UoZmQsIGhhbmRsZSk7Ci0JaWd0X2Fzc2VydChwdHIgIT0gTlVMTCk7CisJaWd0X2Fzc2VydChw dHIpOwogCWlndF9hc3NlcnQoKCh1bnNpZ25lZCBsb25nKXB0ciAmIChQQUdFX1NJWkUgLSAxKSkg PT0gMCk7CiAJaWd0X2Fzc2VydCgoc2l6ZW9mKGxpbmVhcikgJiAoUEFHRV9TSVpFIC0gMSkpID09 IDApOwogCi0tIAoyLjQuOQoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0 b3Aub3JnCmh0dHA6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRl bC1nZngK