From mboxrd@z Thu Jan 1 00:00:00 1970 From: John.C.Harrison@Intel.com Subject: [PATCH 54/55] drm/i915: Remove the now obsolete 'i915_gem_check_olr()' Date: Fri, 29 May 2015 17:44:15 +0100 Message-ID: <1432917856-12261-55-git-send-email-John.C.Harrison@Intel.com> References: <1432917856-12261-1-git-send-email-John.C.Harrison@Intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) by gabe.freedesktop.org (Postfix) with ESMTP id 616487214D for ; Fri, 29 May 2015 09:45:16 -0700 (PDT) In-Reply-To: <1432917856-12261-1-git-send-email-John.C.Harrison@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 RnJvbTogSm9obiBIYXJyaXNvbiA8Sm9obi5DLkhhcnJpc29uQEludGVsLmNvbT4KCkFzIHRoZXJl IGlzIG5vIE9MUiB0byBjaGVjaywgdGhlIGNoZWNrX29scigpIGZ1bmN0aW9uIGlzIG5vdyBhIG5v LW9wIGFuZCBjYW4gYmUKcmVtb3ZlZC4KCkZvcjogVklaLTUxMTUKU2lnbmVkLW9mZi1ieTogSm9o biBIYXJyaXNvbiA8Sm9obi5DLkhhcnJpc29uQEludGVsLmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9k cm0vaTkxNS9pOTE1X2Rydi5oICAgICAgfCAgICAxIC0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5 MTVfZ2VtLmMgICAgICB8ICAgMzQgKy0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLQog ZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jIHwgICAgNiAtLS0tLS0KIDMgZmls ZXMgY2hhbmdlZCwgMSBpbnNlcnRpb24oKyksIDQwIGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBh L2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmggYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9p OTE1X2Rydi5oCmluZGV4IDE4YmZjODQuLmNiNWJiNGEgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1 L2RybS9pOTE1L2k5MTVfZHJ2LmgKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYu aApAQCAtMjgyNSw3ICsyODI1LDYgQEAgYm9vbCBpOTE1X2dlbV9yZXRpcmVfcmVxdWVzdHMoc3Ry dWN0IGRybV9kZXZpY2UgKmRldik7CiB2b2lkIGk5MTVfZ2VtX3JldGlyZV9yZXF1ZXN0c19yaW5n KHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKnJpbmcpOwogaW50IF9fbXVzdF9jaGVjayBpOTE1X2dl bV9jaGVja193ZWRnZShzdHJ1Y3QgaTkxNV9ncHVfZXJyb3IgKmVycm9yLAogCQkJCSAgICAgIGJv b2wgaW50ZXJydXB0aWJsZSk7Ci1pbnQgX19tdXN0X2NoZWNrIGk5MTVfZ2VtX2NoZWNrX29scihz dHJ1Y3QgZHJtX2k5MTVfZ2VtX3JlcXVlc3QgKnJlcSk7CiAKIHN0YXRpYyBpbmxpbmUgYm9vbCBp OTE1X3Jlc2V0X2luX3Byb2dyZXNzKHN0cnVjdCBpOTE1X2dwdV9lcnJvciAqZXJyb3IpCiB7CmRp ZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbS5jIGIvZHJpdmVycy9ncHUv ZHJtL2k5MTUvaTkxNV9nZW0uYwppbmRleCBiOGZlOTMxLi5mODI1OTQyIDEwMDY0NAotLS0gYS9k cml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1 L2k5MTVfZ2VtLmMKQEAgLTExNDksMTcgKzExNDksNiBAQCBpOTE1X2dlbV9jaGVja193ZWRnZShz dHJ1Y3QgaTkxNV9ncHVfZXJyb3IgKmVycm9yLAogCXJldHVybiAwOwogfQogCi0vKgotICogQ29t cGFyZSBhcmJpdHJhcnkgcmVxdWVzdCBhZ2FpbnN0IG91dHN0YW5kaW5nIGxhenkgcmVxdWVzdC4g RW1pdCBvbiBtYXRjaC4KLSAqLwotaW50Ci1pOTE1X2dlbV9jaGVja19vbHIoc3RydWN0IGRybV9p OTE1X2dlbV9yZXF1ZXN0ICpyZXEpCi17Ci0JV0FSTl9PTighbXV0ZXhfaXNfbG9ja2VkKCZyZXEt PnJpbmctPmRldi0+c3RydWN0X211dGV4KSk7Ci0KLQlyZXR1cm4gMDsKLX0KLQogc3RhdGljIHZv aWQgZmFrZV9pcnEodW5zaWduZWQgbG9uZyBkYXRhKQogewogCXdha2VfdXBfcHJvY2Vzcygoc3Ry dWN0IHRhc2tfc3RydWN0ICopZGF0YSk7CkBAIC0xNDQwLDEwICsxNDI5LDYgQEAgaTkxNV93YWl0 X3JlcXVlc3Qoc3RydWN0IGRybV9pOTE1X2dlbV9yZXF1ZXN0ICpyZXEpCiAJaWYgKHJldCkKIAkJ cmV0dXJuIHJldDsKIAotCXJldCA9IGk5MTVfZ2VtX2NoZWNrX29scihyZXEpOwotCWlmIChyZXQp Ci0JCXJldHVybiByZXQ7Ci0KIAlyZXQgPSBfX2k5MTVfd2FpdF9yZXF1ZXN0KHJlcSwKIAkJCQkg IGF0b21pY19yZWFkKCZkZXZfcHJpdi0+Z3B1X2Vycm9yLnJlc2V0X2NvdW50ZXIpLAogCQkJCSAg aW50ZXJydXB0aWJsZSwgTlVMTCwgTlVMTCk7CkBAIC0xNTQzLDEwICsxNTI4LDYgQEAgaTkxNV9n ZW1fb2JqZWN0X3dhaXRfcmVuZGVyaW5nX19ub25ibG9ja2luZyhzdHJ1Y3QgZHJtX2k5MTVfZ2Vt X29iamVjdCAqb2JqLAogCQlpZiAocmVxID09IE5VTEwpCiAJCQlyZXR1cm4gMDsKIAotCQlyZXQg PSBpOTE1X2dlbV9jaGVja19vbHIocmVxKTsKLQkJaWYgKHJldCkKLQkJCWdvdG8gZXJyOwotCiAJ CXJlcXVlc3RzW24rK10gPSBpOTE1X2dlbV9yZXF1ZXN0X3JlZmVyZW5jZShyZXEpOwogCX0gZWxz ZSB7CiAJCWZvciAoaSA9IDA7IGkgPCBJOTE1X05VTV9SSU5HUzsgaSsrKSB7CkBAIC0xNTU2LDEw ICsxNTM3LDYgQEAgaTkxNV9nZW1fb2JqZWN0X3dhaXRfcmVuZGVyaW5nX19ub25ibG9ja2luZyhz dHJ1Y3QgZHJtX2k5MTVfZ2VtX29iamVjdCAqb2JqLAogCQkJaWYgKHJlcSA9PSBOVUxMKQogCQkJ CWNvbnRpbnVlOwogCi0JCQlyZXQgPSBpOTE1X2dlbV9jaGVja19vbHIocmVxKTsKLQkJCWlmIChy ZXQpCi0JCQkJZ290byBlcnI7Ci0KIAkJCXJlcXVlc3RzW24rK10gPSBpOTE1X2dlbV9yZXF1ZXN0 X3JlZmVyZW5jZShyZXEpOwogCQl9CiAJfQpAQCAtMTU3MCw3ICsxNTQ3LDYgQEAgaTkxNV9nZW1f b2JqZWN0X3dhaXRfcmVuZGVyaW5nX19ub25ibG9ja2luZyhzdHJ1Y3QgZHJtX2k5MTVfZ2VtX29i amVjdCAqb2JqLAogCQkJCQkgIE5VTEwsIHJwcyk7CiAJbXV0ZXhfbG9jaygmZGV2LT5zdHJ1Y3Rf bXV0ZXgpOwogCi1lcnI6CiAJZm9yIChpID0gMDsgaSA8IG47IGkrKykgewogCQlpZiAocmV0ID09 IDApCiAJCQlpOTE1X2dlbV9vYmplY3RfcmV0aXJlX3JlcXVlc3Qob2JqLCByZXF1ZXN0c1tpXSk7 CkBAIC0yOTg3LDcgKzI5NjMsNyBAQCBpOTE1X2dlbV9pZGxlX3dvcmtfaGFuZGxlcihzdHJ1Y3Qg d29ya19zdHJ1Y3QgKndvcmspCiBzdGF0aWMgaW50CiBpOTE1X2dlbV9vYmplY3RfZmx1c2hfYWN0 aXZlKHN0cnVjdCBkcm1faTkxNV9nZW1fb2JqZWN0ICpvYmopCiB7Ci0JaW50IHJldCwgaTsKKwlp bnQgaTsKIAogCWlmICghb2JqLT5hY3RpdmUpCiAJCXJldHVybiAwOwpAQCAtMzAwMiwxMCArMjk3 OCw2IEBAIGk5MTVfZ2VtX29iamVjdF9mbHVzaF9hY3RpdmUoc3RydWN0IGRybV9pOTE1X2dlbV9v YmplY3QgKm9iaikKIAkJaWYgKGxpc3RfZW1wdHkoJnJlcS0+bGlzdCkpCiAJCQlnb3RvIHJldGly ZTsKIAotCQlyZXQgPSBpOTE1X2dlbV9jaGVja19vbHIocmVxKTsKLQkJaWYgKHJldCkKLQkJCXJl dHVybiByZXQ7Ci0KIAkJaWYgKGk5MTVfZ2VtX3JlcXVlc3RfY29tcGxldGVkKHJlcSwgdHJ1ZSkp IHsKIAkJCV9faTkxNV9nZW1fcmVxdWVzdF9yZXRpcmVfX3VwdG8ocmVxKTsKIHJldGlyZToKQEAg LTMxMjEsMTAgKzMwOTMsNiBAQCBfX2k5MTVfZ2VtX29iamVjdF9zeW5jKHN0cnVjdCBkcm1faTkx NV9nZW1fb2JqZWN0ICpvYmosCiAJaWYgKGk5MTVfZ2VtX3JlcXVlc3RfY29tcGxldGVkKGZyb21f cmVxLCB0cnVlKSkKIAkJcmV0dXJuIDA7CiAKLQlyZXQgPSBpOTE1X2dlbV9jaGVja19vbHIoZnJv bV9yZXEpOwotCWlmIChyZXQpCi0JCXJldHVybiByZXQ7Ci0KIAlpZiAoIWk5MTVfc2VtYXBob3Jl X2lzX2VuYWJsZWQob2JqLT5iYXNlLmRldikpIHsKIAkJc3RydWN0IGRybV9pOTE1X3ByaXZhdGUg Kmk5MTUgPSB0b19pOTE1KG9iai0+YmFzZS5kZXYpOwogCQlyZXQgPSBfX2k5MTVfd2FpdF9yZXF1 ZXN0KGZyb21fcmVxLApkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlz cGxheS5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jCmluZGV4IDkxZTE5 ZDAuLmFjYTIyMTUgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3Bs YXkuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMKQEAgLTExMjQz LDEyICsxMTI0Myw2IEBAIHN0YXRpYyBpbnQgaW50ZWxfY3J0Y19wYWdlX2ZsaXAoc3RydWN0IGRy bV9jcnRjICpjcnRjLAogCQlpOTE1X2dlbV9yZXF1ZXN0X2Fzc2lnbigmd29yay0+ZmxpcF9xdWV1 ZWRfcmVxLAogCQkJCQlvYmotPmxhc3Rfd3JpdGVfcmVxKTsKIAl9IGVsc2UgewotCQlpZiAob2Jq LT5sYXN0X3dyaXRlX3JlcSkgewotCQkJcmV0ID0gaTkxNV9nZW1fY2hlY2tfb2xyKG9iai0+bGFz dF93cml0ZV9yZXEpOwotCQkJaWYgKHJldCkKLQkJCQlnb3RvIGNsZWFudXBfdW5waW47Ci0JCX0K LQogCQlpZiAoIXJlcXVlc3QpIHsKIAkJCXJldCA9IGk5MTVfZ2VtX3JlcXVlc3RfYWxsb2Mocmlu ZywgcmluZy0+ZGVmYXVsdF9jb250ZXh0LCAmcmVxdWVzdCk7CiAJCQlpZiAocmV0KQotLSAKMS43 LjkuNQoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KSW50 ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHA6 Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK