From mboxrd@z Thu Jan 1 00:00:00 1970 From: Tiago Vignatti Subject: [PATCH i-g-t 2/5] prime_mmap: Fix a few misc stuff Date: Tue, 11 Aug 2015 17:59:25 -0300 Message-ID: <1439326768-5611-7-git-send-email-tiago.vignatti@intel.com> References: <1439326768-5611-1-git-send-email-tiago.vignatti@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <1439326768-5611-1-git-send-email-tiago.vignatti@intel.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: dri-devel@lists.freedesktop.org Cc: daniel.vetter@ffwll.ch, intel-gfx@lists.freedesktop.org, daniel.thompson@linaro.org List-Id: intel-gfx@lists.freedesktop.org LSBSZW1vdmUgcGF0dGVybl9jaGVjaygpLCB3aGljaCB3YXMgd2Fsa2luZyB0aHJvdWdoIGEgdXNl bGVzcyBpdGVyYXRvcgotIFJlbW92ZSBzdXBlcmZsdW91cyBQUk9UX1dSSVRFIGZyb20gZ2VtX21t YXAsIGluIHRlc3RfY29ycmVjdCgpCi0gQWRkIGJpbmFyeSBmaWxlIHRvIC5naXRpZ25vcmUKClNp Z25lZC1vZmYtYnk6IFRpYWdvIFZpZ25hdHRpIDx0aWFnby52aWduYXR0aUBpbnRlbC5jb20+Ci0t LQogdGVzdHMvLmdpdGlnbm9yZSAgIHwgIDEgKwogdGVzdHMvcHJpbWVfbW1hcC5jIHwgMzcgKysr KysrKysrKysrLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLQogMiBmaWxlcyBjaGFuZ2VkLCAxMyBp bnNlcnRpb25zKCspLCAyNSBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS90ZXN0cy8uZ2l0aWdu b3JlIGIvdGVzdHMvLmdpdGlnbm9yZQppbmRleCAwYWYwODk5Li41YmM0YTU4IDEwMDY0NAotLS0g YS90ZXN0cy8uZ2l0aWdub3JlCisrKyBiL3Rlc3RzLy5naXRpZ25vcmUKQEAgLTE2Myw2ICsxNjMs NyBAQCBwbV9zc2V1CiBwcmltZV9udl9hcGkKIHByaW1lX252X3Bjb3B5CiBwcmltZV9udl90ZXN0 CitwcmltZV9tbWFwCiBwcmltZV9zZWxmX2ltcG9ydAogcHJpbWVfdWRsCiB0ZW1wbGF0ZQpkaWZm IC0tZ2l0IGEvdGVzdHMvcHJpbWVfbW1hcC5jIGIvdGVzdHMvcHJpbWVfbW1hcC5jCmluZGV4IDRk YzIwNTUuLmRjNTllOGYgMTAwNjQ0Ci0tLSBhL3Rlc3RzL3ByaW1lX21tYXAuYworKysgYi90ZXN0 cy9wcmltZV9tbWFwLmMKQEAgLTY1LDE5ICs2NSw2IEBAIGZpbGxfYm8odWludDMyX3QgaGFuZGxl LCBzaXplX3Qgc2l6ZSkKIAl9CiB9CiAKLXN0YXRpYyBpbnQKLXBhdHRlcm5fY2hlY2soY2hhciAq cHRyLCBzaXplX3Qgc2l6ZSkKLXsKLQlvZmZfdCBpOwotCWZvciAoaSA9IDA7IGkgPCBzaXplOyBp Kz1zaXplb2YocGF0dGVybikpCi0JewotCQlpZiAobWVtY21wKHB0ciwgcGF0dGVybiwgc2l6ZW9m KHBhdHRlcm4pKSAhPSAwKQotCQkJcmV0dXJuIDE7Ci0JfQotCi0JcmV0dXJuIDA7Ci19Ci0KIHN0 YXRpYyB2b2lkCiB0ZXN0X2NvcnJlY3Qodm9pZCkKIHsKQEAgLTkyLDE0ICs3OSwxNCBAQCB0ZXN0 X2NvcnJlY3Qodm9pZCkKIAlpZ3RfYXNzZXJ0KGVycm5vID09IDApOwogCiAJLyogQ2hlY2sgY29y cmVjdG5lc3MgdnMgR0VNX01NQVBfR1RUICovCi0JcHRyMSA9IGdlbV9tbWFwKGZkLCBoYW5kbGUs IEJPX1NJWkUsIFBST1RfUkVBRCB8IFBST1RfV1JJVEUpOworCXB0cjEgPSBnZW1fbW1hcChmZCwg aGFuZGxlLCBCT19TSVpFLCBQUk9UX1JFQUQpOwogCXB0cjIgPSBtbWFwKE5VTEwsIEJPX1NJWkUs IFBST1RfUkVBRCwgTUFQX1NIQVJFRCwgZG1hX2J1Zl9mZCwgMCk7CiAJaWd0X2Fzc2VydChwdHIx ICE9IE1BUF9GQUlMRUQpOwogCWlndF9hc3NlcnQocHRyMiAhPSBNQVBfRkFJTEVEKTsKIAlpZ3Rf YXNzZXJ0KG1lbWNtcChwdHIxLCBwdHIyLCBCT19TSVpFKSA9PSAwKTsKIAogCS8qIENoZWNrIHBh dHRlcm4gY29ycmVjdG5lc3MgKi8KLQlpZ3RfYXNzZXJ0KHBhdHRlcm5fY2hlY2socHRyMiwgQk9f U0laRSkgPT0gMCk7CisJaWd0X2Fzc2VydChtZW1jbXAocHRyMiwgcGF0dGVybiwgc2l6ZW9mKHBh dHRlcm4pKSA9PSAwKTsKIAogCW11bm1hcChwdHIxLCBCT19TSVpFKTsKIAltdW5tYXAocHRyMiwg Qk9fU0laRSk7CkBAIC0xMjIsMTMgKzEwOSwxMyBAQCB0ZXN0X21hcF91bm1hcCh2b2lkKQogCiAJ cHRyID0gbW1hcChOVUxMLCBCT19TSVpFLCBQUk9UX1JFQUQsIE1BUF9TSEFSRUQsIGRtYV9idWZf ZmQsIDApOwogCWlndF9hc3NlcnQocHRyICE9IE1BUF9GQUlMRUQpOwotCWlndF9hc3NlcnQocGF0 dGVybl9jaGVjayhwdHIsIEJPX1NJWkUpID09IDApOworCWlndF9hc3NlcnQobWVtY21wKHB0ciwg cGF0dGVybiwgc2l6ZW9mKHBhdHRlcm4pKSA9PSAwKTsKIAogCS8qIFVubWFwIGFuZCByZW1hcCAq LwogCW11bm1hcChwdHIsIEJPX1NJWkUpOwogCXB0ciA9IG1tYXAoTlVMTCwgQk9fU0laRSwgUFJP VF9SRUFELCBNQVBfU0hBUkVELCBkbWFfYnVmX2ZkLCAwKTsKIAlpZ3RfYXNzZXJ0KHB0ciAhPSBN QVBfRkFJTEVEKTsKLQlpZ3RfYXNzZXJ0KHBhdHRlcm5fY2hlY2socHRyLCBCT19TSVpFKSA9PSAw KTsKKwlpZ3RfYXNzZXJ0KG1lbWNtcChwdHIsIHBhdHRlcm4sIHNpemVvZihwYXR0ZXJuKSkgPT0g MCk7CiAKIAltdW5tYXAocHRyLCBCT19TSVpFKTsKIAljbG9zZShkbWFfYnVmX2ZkKTsKQEAgLTE1 MSwxNiArMTM4LDE2IEBAIHRlc3RfcmVwcmltZSh2b2lkKQogCiAJcHRyID0gbW1hcChOVUxMLCBC T19TSVpFLCBQUk9UX1JFQUQsIE1BUF9TSEFSRUQsIGRtYV9idWZfZmQsIDApOwogCWlndF9hc3Nl cnQocHRyICE9IE1BUF9GQUlMRUQpOwotCWlndF9hc3NlcnQocGF0dGVybl9jaGVjayhwdHIsIEJP X1NJWkUpID09IDApOworCWlndF9hc3NlcnQobWVtY21wKHB0ciwgcGF0dGVybiwgc2l6ZW9mKHBh dHRlcm4pKSA9PSAwKTsKIAogCWNsb3NlIChkbWFfYnVmX2ZkKTsKLQlpZ3RfYXNzZXJ0KHBhdHRl cm5fY2hlY2socHRyLCBCT19TSVpFKSA9PSAwKTsKKwlpZ3RfYXNzZXJ0KG1lbWNtcChwdHIsIHBh dHRlcm4sIHNpemVvZihwYXR0ZXJuKSkgPT0gMCk7CiAJbXVubWFwKHB0ciwgQk9fU0laRSk7CiAK IAlkbWFfYnVmX2ZkID0gcHJpbWVfaGFuZGxlX3RvX2ZkKGZkLCBoYW5kbGUpOwogCXB0ciA9IG1t YXAoTlVMTCwgQk9fU0laRSwgUFJPVF9SRUFELCBNQVBfU0hBUkVELCBkbWFfYnVmX2ZkLCAwKTsK IAlpZ3RfYXNzZXJ0KHB0ciAhPSBNQVBfRkFJTEVEKTsKLQlpZ3RfYXNzZXJ0KHBhdHRlcm5fY2hl Y2socHRyLCBCT19TSVpFKSA9PSAwKTsKKwlpZ3RfYXNzZXJ0KG1lbWNtcChwdHIsIHBhdHRlcm4s IHNpemVvZihwYXR0ZXJuKSkgPT0gMCk7CiAKIAltdW5tYXAocHRyLCBCT19TSVpFKTsKIAljbG9z ZShkbWFfYnVmX2ZkKTsKQEAgLTE4NCw3ICsxNzEsNyBAQCB0ZXN0X2ZvcmtlZCh2b2lkKQogCWln dF9mb3JrKGNoaWxkbm8sIDEpIHsKIAkJcHRyID0gbW1hcChOVUxMLCBCT19TSVpFLCBQUk9UX1JF QUQsIE1BUF9TSEFSRUQsIGRtYV9idWZfZmQsIDApOwogCQlpZ3RfYXNzZXJ0KHB0ciAhPSBNQVBf RkFJTEVEKTsKLQkJaWd0X2Fzc2VydChwYXR0ZXJuX2NoZWNrKHB0ciwgQk9fU0laRSkgPT0gMCk7 CisJCWlndF9hc3NlcnQobWVtY21wKHB0ciwgcGF0dGVybiwgc2l6ZW9mKHBhdHRlcm4pKSA9PSAw KTsKIAkJbXVubWFwKHB0ciwgQk9fU0laRSk7CiAJCWNsb3NlKGRtYV9idWZfZmQpOwogCX0KQEAg LTIxMCw3ICsxOTcsNyBAQCB0ZXN0X3JlZmNvdW50aW5nKHZvaWQpCiAKIAlwdHIgPSBtbWFwKE5V TEwsIEJPX1NJWkUsIFBST1RfUkVBRCwgTUFQX1NIQVJFRCwgZG1hX2J1Zl9mZCwgMCk7CiAJaWd0 X2Fzc2VydChwdHIgIT0gTUFQX0ZBSUxFRCk7Ci0JaWd0X2Fzc2VydChwYXR0ZXJuX2NoZWNrKHB0 ciwgQk9fU0laRSkgPT0gMCk7CisJaWd0X2Fzc2VydChtZW1jbXAocHRyLCBwYXR0ZXJuLCBzaXpl b2YocGF0dGVybikpID09IDApOwogCW11bm1hcChwdHIsIEJPX1NJWkUpOwogCWNsb3NlIChkbWFf YnVmX2ZkKTsKIH0KQEAgLTIzMSw3ICsyMTgsNyBAQCB0ZXN0X2R1cCh2b2lkKQogCiAJcHRyID0g bW1hcChOVUxMLCBCT19TSVpFLCBQUk9UX1JFQUQsIE1BUF9TSEFSRUQsIGRtYV9idWZfZmQsIDAp OwogCWlndF9hc3NlcnQocHRyICE9IE1BUF9GQUlMRUQpOwotCWlndF9hc3NlcnQocGF0dGVybl9j aGVjayhwdHIsIEJPX1NJWkUpID09IDApOworCWlndF9hc3NlcnQobWVtY21wKHB0ciwgcGF0dGVy biwgc2l6ZW9mKHBhdHRlcm4pKSA9PSAwKTsKIAltdW5tYXAocHRyLCBCT19TSVpFKTsKIAlnZW1f Y2xvc2UoZmQsIGhhbmRsZSk7CiAJY2xvc2UgKGRtYV9idWZfZmQpOwpAQCAtMzEwLDcgKzI5Nyw3 IEBAIHRlc3RfYXBlcnR1cmVfbGltaXQodm9pZCkKIAlpZ3RfYXNzZXJ0KGVycm5vID09IDApOwog CXB0cjEgPSBtbWFwKE5VTEwsIHNpemUxLCBQUk9UX1JFQUQsIE1BUF9TSEFSRUQsIGRtYV9idWZf ZmQxLCAwKTsKIAlpZ3RfYXNzZXJ0KHB0cjEgIT0gTUFQX0ZBSUxFRCk7Ci0JaWd0X2Fzc2VydChw YXR0ZXJuX2NoZWNrKHB0cjEsIEJPX1NJWkUpID09IDApOworCWlndF9hc3NlcnQobWVtY21wKHB0 cjEsIHBhdHRlcm4sIHNpemVvZihwYXR0ZXJuKSkgPT0gMCk7CiAKIAloYW5kbGUyID0gZ2VtX2Ny ZWF0ZShmZCwgc2l6ZTEpOwogCWZpbGxfYm8oaGFuZGxlMiwgQk9fU0laRSk7CkBAIC0zMTgsNyAr MzA1LDcgQEAgdGVzdF9hcGVydHVyZV9saW1pdCh2b2lkKQogCWlndF9hc3NlcnQoZXJybm8gPT0g MCk7CiAJcHRyMiA9IG1tYXAoTlVMTCwgc2l6ZTIsIFBST1RfUkVBRCwgTUFQX1NIQVJFRCwgZG1h X2J1Zl9mZDIsIDApOwogCWlndF9hc3NlcnQocHRyMiAhPSBNQVBfRkFJTEVEKTsKLQlpZ3RfYXNz ZXJ0KHBhdHRlcm5fY2hlY2socHRyMiwgQk9fU0laRSkgPT0gMCk7CisJaWd0X2Fzc2VydChtZW1j bXAocHRyMiwgcGF0dGVybiwgc2l6ZW9mKHBhdHRlcm4pKSA9PSAwKTsKIAogCWlndF9hc3NlcnQo bWVtY21wKHB0cjEsIHB0cjIsIEJPX1NJWkUpID09IDApOwogCi0tIAoyLjEuMAoKX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KZHJpLWRldmVsIG1haWxpbmcg bGlzdApkcmktZGV2ZWxAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHA6Ly9saXN0cy5mcmVlZGVz a3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9kcmktZGV2ZWwK