From mboxrd@z Thu Jan 1 00:00:00 1970 From: John.C.Harrison@Intel.com Subject: [PATCH 52/53] drm/i915: Remove the now obsolete 'outstanding_lazy_request' Date: Thu, 19 Feb 2015 17:18:04 +0000 Message-ID: <1424366285-29232-53-git-send-email-John.C.Harrison@Intel.com> References: <1423828140-10653-1-git-send-email-John.C.Harrison@Intel.com> <1424366285-29232-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 mga03.intel.com (mga03.intel.com [134.134.136.65]) by gabe.freedesktop.org (Postfix) with ESMTP id 24798720B8 for ; Thu, 19 Feb 2015 09:19:03 -0800 (PST) In-Reply-To: <1424366285-29232-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 RnJvbTogSm9obiBIYXJyaXNvbiA8Sm9obi5DLkhhcnJpc29uQEludGVsLmNvbT4KClRoZSBvdXRz dGFuZGluZ19sYXp5X3JlcXVlc3QgaXMgbm8gbG9uZ2VyIHVzZWQgYW55d2hlcmUgaW4gdGhlIGRy aXZlci4KRXZlcnl0aGluZyB0aGF0IHdhcyBsb29raW5nIGF0IGl0IG5vdyBoYXMgYSByZXF1ZXN0 IGV4cGxpY2l0bHkgcGFzc2VkIGluIGZyb20gb24KaGlnaC4gRXZlcnl0aGluZyB0aGF0IHdhcyBy ZWx5aW5nIHVwb24gYmVoaW5kIHRoZSBzY2VuZXMgaXMgbm93IGV4cGxpY2l0bHkKY3JlYXRpbmcv cGFzc2luZy9zdWJtaXR0aW5nIGl0J3Mgb3duIHByaXZhdGUgcmVxdWVzdC4gVGh1cyB0aGUgT0xS IGNhbiBiZQpyZW1vdmVkLgoKRm9yOiBWSVotNTExNQpTaWduZWQtb2ZmLWJ5OiBKb2huIEhhcnJp c29uIDxKb2huLkMuSGFycmlzb25ASW50ZWwuY29tPgotLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1 L2k5MTVfZ2VtLmMgICAgICAgICAgICB8ICAgMTYgKy0tLS0tLS0tLS0tLS0tLQogZHJpdmVycy9n cHUvZHJtL2k5MTUvaTkxNV9nZW1fZXhlY2J1ZmZlci5jIHwgICAgNCArLS0tCiBkcml2ZXJzL2dw dS9kcm0vaTkxNS9pbnRlbF9scmMuYyAgICAgICAgICAgfCAgICA2ICsrLS0tLQogZHJpdmVycy9n cHUvZHJtL2k5MTUvaW50ZWxfcmluZ2J1ZmZlci5jICAgIHwgICAxNyArKy0tLS0tLS0tLS0tLS0t LQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcmluZ2J1ZmZlci5oICAgIHwgICAgNCAtLS0t CiA1IGZpbGVzIGNoYW5nZWQsIDYgaW5zZXJ0aW9ucygrKSwgNDEgZGVsZXRpb25zKC0pCgpkaWZm IC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW0uYyBiL2RyaXZlcnMvZ3B1L2Ry bS9pOTE1L2k5MTVfZ2VtLmMKaW5kZXggNjBmNjY3MS4uOGU3NDE4YiAxMDA2NDQKLS0tIGEvZHJp dmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW0uYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9p OTE1X2dlbS5jCkBAIC0xMTU2LDE1ICsxMTU2LDkgQEAgaTkxNV9nZW1fY2hlY2tfd2VkZ2Uoc3Ry dWN0IGk5MTVfZ3B1X2Vycm9yICplcnJvciwKIGludAogaTkxNV9nZW1fY2hlY2tfb2xyKHN0cnVj dCBkcm1faTkxNV9nZW1fcmVxdWVzdCAqcmVxKQogewotCWludCByZXQ7Ci0KIAlXQVJOX09OKCFt dXRleF9pc19sb2NrZWQoJnJlcS0+cmluZy0+ZGV2LT5zdHJ1Y3RfbXV0ZXgpKTsKIAotCXJldCA9 IDA7Ci0JaWYgKHJlcSA9PSByZXEtPnJpbmctPm91dHN0YW5kaW5nX2xhenlfcmVxdWVzdCkKLQkJ cmV0ID0gaTkxNV9hZGRfcmVxdWVzdChyZXEpOwotCi0JcmV0dXJuIHJldDsKKwlyZXR1cm4gMDsK IH0KIAogc3RhdGljIHZvaWQgZmFrZV9pcnEodW5zaWduZWQgbG9uZyBkYXRhKQpAQCAtMjQyNCw4 ICsyNDE4LDYgQEAgaW50IF9faTkxNV9hZGRfcmVxdWVzdChzdHJ1Y3QgZHJtX2k5MTVfZ2VtX3Jl cXVlc3QgKnJlcXVlc3QsCiAJZGV2X3ByaXYgPSByaW5nLT5kZXYtPmRldl9wcml2YXRlOwogCXJp bmdidWYgPSByZXF1ZXN0LT5yaW5nYnVmOwogCi0JV0FSTl9PTihyZXF1ZXN0ICE9IHJpbmctPm91 dHN0YW5kaW5nX2xhenlfcmVxdWVzdCk7Ci0KIAlyZXF1ZXN0X3N0YXJ0ID0gaW50ZWxfcmluZ19n ZXRfdGFpbChyaW5nYnVmKTsKIAkvKgogCSAqIEVtaXQgYW55IG91dHN0YW5kaW5nIGZsdXNoZXMg LSBleGVjYnVmIGNhbiBmYWlsIHRvIGVtaXQgdGhlIGZsdXNoCkBAIC0yNDg2LDcgKzI0NzgsNiBA QCBpbnQgX19pOTE1X2FkZF9yZXF1ZXN0KHN0cnVjdCBkcm1faTkxNV9nZW1fcmVxdWVzdCAqcmVx dWVzdCwKIAl9CiAKIAl0cmFjZV9pOTE1X2dlbV9yZXF1ZXN0X2FkZChyZXF1ZXN0KTsKLQlyaW5n LT5vdXRzdGFuZGluZ19sYXp5X3JlcXVlc3QgPSBOVUxMOwogCiAJaTkxNV9xdWV1ZV9oYW5nY2hl Y2socmluZy0+ZGV2KTsKIApAQCAtMjY3Miw5ICsyNjYzLDYgQEAgc3RhdGljIHZvaWQgaTkxNV9n ZW1fcmVzZXRfcmluZ19jbGVhbnVwKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiwK IAogCQlpOTE1X2dlbV9mcmVlX3JlcXVlc3QocmVxdWVzdCk7CiAJfQotCi0JLyogVGhpcyBtYXkg bm90IGhhdmUgYmVlbiBmbHVzaGVkIGJlZm9yZSB0aGUgcmVzZXQsIHNvIGNsZWFuIGl0IG5vdyAq LwotCWk5MTVfZ2VtX3JlcXVlc3RfYXNzaWduKCZyaW5nLT5vdXRzdGFuZGluZ19sYXp5X3JlcXVl c3QsIE5VTEwpOwogfQogCiB2b2lkIGk5MTVfZ2VtX3Jlc3RvcmVfZmVuY2VzKHN0cnVjdCBkcm1f ZGV2aWNlICpkZXYpCkBAIC0zMTI0LDggKzMxMTIsNiBAQCBpbnQgaTkxNV9ncHVfaWRsZShzdHJ1 Y3QgZHJtX2RldmljZSAqZGV2KQogCQkJfQogCQl9CiAKLQkJV0FSTl9PTihyaW5nLT5vdXRzdGFu ZGluZ19sYXp5X3JlcXVlc3QpOwotCiAJCXJldCA9IGludGVsX3JpbmdfaWRsZShyaW5nKTsKIAkJ aWYgKHJldCkKIAkJCXJldHVybiByZXQ7CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkx NS9pOTE1X2dlbV9leGVjYnVmZmVyLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9l eGVjYnVmZmVyLmMKaW5kZXggNmE3MDNlNi4uMGVhZTU5MiAxMDA2NDQKLS0tIGEvZHJpdmVycy9n cHUvZHJtL2k5MTUvaTkxNV9nZW1fZXhlY2J1ZmZlci5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9p OTE1L2k5MTVfZ2VtX2V4ZWNidWZmZXIuYwpAQCAtMTU3MSwxMCArMTU3MSw4IEBAIGVycjoKIAkg KiBtdXN0IGJlIGZyZWVkIGFnYWluLiBJZiBpdCB3YXMgc3VibWl0dGVkIHRoZW4gaXQgaXMgYmVp bmcgdHJhY2tlZAogCSAqIG9uIHRoZSBhY3RpdmUgcmVxdWVzdCBsaXN0IGFuZCBubyBjbGVhbiB1 cCBpcyByZXF1aXJlZCBoZXJlLgogCSAqLwotCWlmIChyZXQgJiYgcGFyYW1zLT5yZXF1ZXN0KSB7 CisJaWYgKHJldCAmJiBwYXJhbXMtPnJlcXVlc3QpCiAJCWk5MTVfZ2VtX3JlcXVlc3RfdW5yZWZl cmVuY2UocGFyYW1zLT5yZXF1ZXN0KTsKLQkJcmluZy0+b3V0c3RhbmRpbmdfbGF6eV9yZXF1ZXN0 ID0gTlVMTDsKLQl9CiAKIAltdXRleF91bmxvY2soJmRldi0+c3RydWN0X211dGV4KTsKIApkaWZm IC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfbHJjLmMgYi9kcml2ZXJzL2dwdS9k cm0vaTkxNS9pbnRlbF9scmMuYwppbmRleCAyOTExY2Y2Li5kYjYzZWEwIDEwMDY0NAotLS0gYS9k cml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9scmMuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkx NS9pbnRlbF9scmMuYwpAQCAtMTAzMiw4ICsxMDMyLDcgQEAgaW50IGludGVsX2xvZ2ljYWxfcmlu Z19hbGxvY19yZXF1ZXN0KHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKnJpbmcsCiAJaWYgKCFyZXFf b3V0KQogCQlyZXR1cm4gLUVJTlZBTDsKIAotCWlmICgoKnJlcV9vdXQgPSByaW5nLT5vdXRzdGFu ZGluZ19sYXp5X3JlcXVlc3QpICE9IE5VTEwpCi0JCXJldHVybiAwOworCSpyZXFfb3V0ID0gTlVM TDsKIAogCXJlcXVlc3QgPSBremFsbG9jKHNpemVvZigqcmVxdWVzdCksIEdGUF9LRVJORUwpOwog CWlmIChyZXF1ZXN0ID09IE5VTEwpCkBAIC0xMDY3LDcgKzEwNjYsNyBAQCBpbnQgaW50ZWxfbG9n aWNhbF9yaW5nX2FsbG9jX3JlcXVlc3Qoc3RydWN0IGludGVsX2VuZ2luZV9jcyAqcmluZywKIAlp OTE1X2dlbV9jb250ZXh0X3JlZmVyZW5jZShyZXF1ZXN0LT5jdHgpOwogCXJlcXVlc3QtPnJpbmdi dWYgPSBjdHgtPmVuZ2luZVtyaW5nLT5pZF0ucmluZ2J1ZjsKIAotCSpyZXFfb3V0ID0gcmluZy0+ b3V0c3RhbmRpbmdfbGF6eV9yZXF1ZXN0ID0gcmVxdWVzdDsKKwkqcmVxX291dCA9IHJlcXVlc3Q7 CiAJcmV0dXJuIDA7CiB9CiAKQEAgLTEzOTMsNyArMTM5Miw2IEBAIHZvaWQgaW50ZWxfbG9naWNh bF9yaW5nX2NsZWFudXAoc3RydWN0IGludGVsX2VuZ2luZV9jcyAqcmluZykKIAogCWludGVsX2xv Z2ljYWxfcmluZ19zdG9wKHJpbmcpOwogCVdBUk5fT04oKEk5MTVfUkVBRF9NT0RFKHJpbmcpICYg TU9ERV9JRExFKSA9PSAwKTsKLQlpOTE1X2dlbV9yZXF1ZXN0X2Fzc2lnbigmcmluZy0+b3V0c3Rh bmRpbmdfbGF6eV9yZXF1ZXN0LCBOVUxMKTsKIAogCWlmIChyaW5nLT5jbGVhbnVwKQogCQlyaW5n LT5jbGVhbnVwKHJpbmcpOwpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxf cmluZ2J1ZmZlci5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcmluZ2J1ZmZlci5jCmlu ZGV4IDVlZWYwMmUuLjg1ZGFhMTggMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2lu dGVsX3JpbmdidWZmZXIuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9yaW5nYnVm ZmVyLmMKQEAgLTIwMzQsNyArMjAzNCw2IEBAIHZvaWQgaW50ZWxfY2xlYW51cF9yaW5nX2J1ZmZl cihzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICpyaW5nKQogCiAJaW50ZWxfdW5waW5fcmluZ2J1ZmZl cl9vYmoocmluZ2J1Zik7CiAJaW50ZWxfZGVzdHJveV9yaW5nYnVmZmVyX29iaihyaW5nYnVmKTsK LQlpOTE1X2dlbV9yZXF1ZXN0X2Fzc2lnbigmcmluZy0+b3V0c3RhbmRpbmdfbGF6eV9yZXF1ZXN0 LCBOVUxMKTsKIAogCWlmIChyaW5nLT5jbGVhbnVwKQogCQlyaW5nLT5jbGVhbnVwKHJpbmcpOwpA QCAtMjE1MywxNSArMjE1Miw2IEBAIHN0YXRpYyBpbnQgaW50ZWxfd3JhcF9yaW5nX2J1ZmZlcihz dHJ1Y3QgaW50ZWxfZW5naW5lX2NzICpyaW5nKQogaW50IGludGVsX3JpbmdfaWRsZShzdHJ1Y3Qg aW50ZWxfZW5naW5lX2NzICpyaW5nKQogewogCXN0cnVjdCBkcm1faTkxNV9nZW1fcmVxdWVzdCAq cmVxOwotCWludCByZXQ7Ci0KLQkvKiBXZSBuZWVkIHRvIGFkZCBhbnkgcmVxdWVzdHMgcmVxdWly ZWQgdG8gZmx1c2ggdGhlIG9iamVjdHMgYW5kIHJpbmcgKi8KLQlXQVJOX09OKHJpbmctPm91dHN0 YW5kaW5nX2xhenlfcmVxdWVzdCk7Ci0JaWYgKHJpbmctPm91dHN0YW5kaW5nX2xhenlfcmVxdWVz dCkgewotCQlyZXQgPSBpOTE1X2FkZF9yZXF1ZXN0KHJpbmctPm91dHN0YW5kaW5nX2xhenlfcmVx dWVzdCk7Ci0JCWlmIChyZXQpCi0JCQlyZXR1cm4gcmV0OwotCX0KIAogCS8qIFdhaXQgdXBvbiB0 aGUgbGFzdCByZXF1ZXN0IHRvIGJlIGNvbXBsZXRlZCAqLwogCWlmIChsaXN0X2VtcHR5KCZyaW5n LT5yZXF1ZXN0X2xpc3QpKQpAQCAtMjE4Niw4ICsyMTc2LDcgQEAgaW50ZWxfcmluZ19hbGxvY19y ZXF1ZXN0KHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKnJpbmcsCiAJaWYgKCFyZXFfb3V0KQogCQly ZXR1cm4gLUVJTlZBTDsKIAotCWlmICgoKnJlcV9vdXQgPSByaW5nLT5vdXRzdGFuZGluZ19sYXp5 X3JlcXVlc3QpICE9IE5VTEwpCi0JCXJldHVybiAwOworCSpyZXFfb3V0ID0gTlVMTDsKIAogCXJl cXVlc3QgPSBremFsbG9jKHNpemVvZigqcmVxdWVzdCksIEdGUF9LRVJORUwpOwogCWlmIChyZXF1 ZXN0ID09IE5VTEwpCkBAIC0yMjA2LDcgKzIxOTUsNyBAQCBpbnRlbF9yaW5nX2FsbG9jX3JlcXVl c3Qoc3RydWN0IGludGVsX2VuZ2luZV9jcyAqcmluZywKIAkJcmV0dXJuIHJldDsKIAl9CiAKLQkq cmVxX291dCA9IHJpbmctPm91dHN0YW5kaW5nX2xhenlfcmVxdWVzdCA9IHJlcXVlc3Q7CisJKnJl cV9vdXQgPSByZXF1ZXN0OwogCXJldHVybiAwOwogfQogCkBAIC0yMjgxLDggKzIyNzAsNiBAQCB2 b2lkIGludGVsX3JpbmdfaW5pdF9zZXFubyhzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICpyaW5nLCB1 MzIgc2Vxbm8pCiAJc3RydWN0IGRybV9kZXZpY2UgKmRldiA9IHJpbmctPmRldjsKIAlzdHJ1Y3Qg ZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSBkZXYtPmRldl9wcml2YXRlOwogCi0JQlVHX09O KHJpbmctPm91dHN0YW5kaW5nX2xhenlfcmVxdWVzdCk7Ci0KIAlpZiAoSU5URUxfSU5GTyhkZXYp LT5nZW4gPT0gNiB8fCBJTlRFTF9JTkZPKGRldiktPmdlbiA9PSA3KSB7CiAJCUk5MTVfV1JJVEUo UklOR19TWU5DXzAocmluZy0+bW1pb19iYXNlKSwgMCk7CiAJCUk5MTVfV1JJVEUoUklOR19TWU5D XzEocmluZy0+bW1pb19iYXNlKSwgMCk7CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkx NS9pbnRlbF9yaW5nYnVmZmVyLmggYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9yaW5nYnVm ZmVyLmgKaW5kZXggM2IwMjYxZi4uZDJjNjQyNyAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJt L2k5MTUvaW50ZWxfcmluZ2J1ZmZlci5oCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVs X3JpbmdidWZmZXIuaApAQCAtMjU4LDEwICsyNTgsNiBAQCBzdHJ1Y3QgIGludGVsX2VuZ2luZV9j cyB7CiAJICovCiAJc3RydWN0IGxpc3RfaGVhZCByZXF1ZXN0X2xpc3Q7CiAKLQkvKioKLQkgKiBE byB3ZSBoYXZlIHNvbWUgbm90IHlldCBlbWl0dGVkIHJlcXVlc3RzIG91dHN0YW5kaW5nPwotCSAq LwotCXN0cnVjdCBkcm1faTkxNV9nZW1fcmVxdWVzdCAqb3V0c3RhbmRpbmdfbGF6eV9yZXF1ZXN0 OwogCWJvb2wgZ3B1X2NhY2hlc19kaXJ0eTsKIAlib29sIGZiY19kaXJ0eTsKIAotLSAKMS43Ljku NQoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KSW50ZWwt Z2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHA6Ly9s aXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK