From mboxrd@z Thu Jan 1 00:00:00 1970 From: Chris Wilson Subject: [PATCH 09/41] drm/i915: Remove unused i915_gem_active_wait() in favour of _unlocked() Date: Fri, 14 Oct 2016 13:18:01 +0100 Message-ID: <20161014121833.439-10-chris@chris-wilson.co.uk> References: <20161014121833.439-1-chris@chris-wilson.co.uk> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mail-qk0-x243.google.com (mail-qk0-x243.google.com [IPv6:2607:f8b0:400d:c09::243]) by gabe.freedesktop.org (Postfix) with ESMTPS id 114186E098 for ; Fri, 14 Oct 2016 12:18:50 +0000 (UTC) Received: by mail-qk0-x243.google.com with SMTP id z190so8422451qkc.3 for ; Fri, 14 Oct 2016 05:18:50 -0700 (PDT) In-Reply-To: <20161014121833.439-1-chris@chris-wilson.co.uk> 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 U2luY2Ugd2Ugb25seSB1c2UgdGhlIG1vcmUgZ2VuZXJpYyB1bmxvY2tlZCB2YXJpYW50LCBqdXN0 IHJlbmFtZSBpdCBhcwp0aGUgbm9ybWFsIGk5MTVfZ2VtX2FjdGl2ZV93YWl0KCkuIFRoZSB0ZW1w b3JhcnkgY29zdCBpcyB0aGF0IHdlIG5lZWQgdG8KYWx3YXlzIGFjcXVpcmUgdGhlIHJlZmVyZW5j ZSBpbiBhIFJDVSBzYWZlIG1hbm5lciwgYnV0IHRoZSBiZW5lZml0IGlzCnRoYXQgd2Ugd2lsbCBj b21iaW5lIHRoZSBjb21tb24gcGF0aHMuCgpTaWduZWQtb2ZmLWJ5OiBDaHJpcyBXaWxzb24gPGNo cmlzQGNocmlzLXdpbHNvbi5jby51az4KUmV2aWV3ZWQtYnk6IEpvb25hcyBMYWh0aW5lbiA8am9v bmFzLmxhaHRpbmVuQGxpbnV4LmludGVsLmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9p OTE1X2dlbV9yZXF1ZXN0LmggfCAzNCArKystLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0K IGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3JpbmdidWZmZXIuaCB8ICAyICstCiAyIGZpbGVz IGNoYW5nZWQsIDQgaW5zZXJ0aW9ucygrKSwgMzIgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEv ZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fcmVxdWVzdC5oIGIvZHJpdmVycy9ncHUvZHJt L2k5MTUvaTkxNV9nZW1fcmVxdWVzdC5oCmluZGV4IGYxY2UzOTBjOTI0NC4uNDU5OThlZWRkYTJj IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9yZXF1ZXN0LmgKKysr IGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fcmVxdWVzdC5oCkBAIC01NjksNDAgKzU2 OSwxMyBAQCBpOTE1X2dlbV9hY3RpdmVfaXNfaWRsZShjb25zdCBzdHJ1Y3QgaTkxNV9nZW1fYWN0 aXZlICphY3RpdmUsCiB9CiAKIC8qKgotICogaTkxNV9nZW1fYWN0aXZlX3dhaXQgLSB3YWl0cyB1 bnRpbCB0aGUgcmVxdWVzdCBpcyBjb21wbGV0ZWQKLSAqIEBhY3RpdmUgLSB0aGUgYWN0aXZlIHJl cXVlc3Qgb24gd2hpY2ggdG8gd2FpdAotICoKLSAqIGk5MTVfZ2VtX2FjdGl2ZV93YWl0KCkgd2Fp dHMgdW50aWwgdGhlIHJlcXVlc3QgaXMgY29tcGxldGVkIGJlZm9yZQotICogcmV0dXJuaW5nLiBO b3RlIHRoYXQgaXQgZG9lcyBub3QgZ3VhcmFudGVlIHRoYXQgdGhlIHJlcXVlc3QgaXMKLSAqIHJl dGlyZWQgZmlyc3QsIHNlZSBpOTE1X2dlbV9hY3RpdmVfcmV0aXJlKCkuCi0gKgotICogaTkxNV9n ZW1fYWN0aXZlX3dhaXQoKSByZXR1cm5zIGltbWVkaWF0ZWx5IGlmIHRoZSBhY3RpdmUKLSAqIHJl cXVlc3QgaXMgYWxyZWFkeSBjb21wbGV0ZS4KLSAqLwotc3RhdGljIGlubGluZSBpbnQgX19tdXN0 X2NoZWNrCi1pOTE1X2dlbV9hY3RpdmVfd2FpdChjb25zdCBzdHJ1Y3QgaTkxNV9nZW1fYWN0aXZl ICphY3RpdmUsIHN0cnVjdCBtdXRleCAqbXV0ZXgpCi17Ci0Jc3RydWN0IGRybV9pOTE1X2dlbV9y ZXF1ZXN0ICpyZXF1ZXN0OwotCWxvbmcgcmV0OwotCi0JcmVxdWVzdCA9IGk5MTVfZ2VtX2FjdGl2 ZV9wZWVrKGFjdGl2ZSwgbXV0ZXgpOwotCWlmICghcmVxdWVzdCkKLQkJcmV0dXJuIDA7Ci0KLQly ZXQgPSBpOTE1X3dhaXRfcmVxdWVzdChyZXF1ZXN0LAotCQkJCUk5MTVfV0FJVF9JTlRFUlJVUFRJ QkxFIHwgSTkxNV9XQUlUX0xPQ0tFRCwKLQkJCQlNQVhfU0NIRURVTEVfVElNRU9VVCk7Ci0JcmV0 dXJuIHJldCA8IDAgPyByZXQgOiAwOwotfQotCi0vKioKLSAqIGk5MTVfZ2VtX2FjdGl2ZV93YWl0 X3VubG9ja2VkIC0gd2FpdHMgdW50aWwgdGhlIHJlcXVlc3QgaXMgY29tcGxldGVkCisgKiBpOTE1 X2dlbV9hY3RpdmVfd2FpdC0gd2FpdHMgdW50aWwgdGhlIHJlcXVlc3QgaXMgY29tcGxldGVkCiAg KiBAYWN0aXZlIC0gdGhlIGFjdGl2ZSByZXF1ZXN0IG9uIHdoaWNoIHRvIHdhaXQKICAqIEBmbGFn cyAtIGhvdyB0byB3YWl0CiAgKiBAdGltZW91dCAtIGhvdyBsb25nIHRvIHdhaXQgYXQgbW9zdAog ICogQHJwcyAtIHVzZXJzcGFjZSBjbGllbnQgdG8gY2hhcmdlIGZvciBhIHdhaXRib29zdAogICoK LSAqIGk5MTVfZ2VtX2FjdGl2ZV93YWl0X3VubG9ja2VkKCkgd2FpdHMgdW50aWwgdGhlIHJlcXVl c3QgaXMgY29tcGxldGVkIGJlZm9yZQorICogaTkxNV9nZW1fYWN0aXZlX3dhaXQoKSB3YWl0cyB1 bnRpbCB0aGUgcmVxdWVzdCBpcyBjb21wbGV0ZWQgYmVmb3JlCiAgKiByZXR1cm5pbmcsIHdpdGhv dXQgcmVxdWlyaW5nIGFueSBsb2NrcyB0byBiZSBoZWxkLiBOb3RlIHRoYXQgaXQgZG9lcyBub3QK ICAqIHJldGlyZSBhbnkgcmVxdWVzdHMgYmVmb3JlIHJldHVybmluZy4KICAqCkBAIC02MTgsOCAr NTkxLDcgQEAgaTkxNV9nZW1fYWN0aXZlX3dhaXQoY29uc3Qgc3RydWN0IGk5MTVfZ2VtX2FjdGl2 ZSAqYWN0aXZlLCBzdHJ1Y3QgbXV0ZXggKm11dGV4KQogICogUmV0dXJucyAwIGlmIHN1Y2Nlc3Nm dWwsIG9yIGEgbmVnYXRpdmUgZXJyb3IgY29kZS4KICAqLwogc3RhdGljIGlubGluZSBpbnQKLWk5 MTVfZ2VtX2FjdGl2ZV93YWl0X3VubG9ja2VkKGNvbnN0IHN0cnVjdCBpOTE1X2dlbV9hY3RpdmUg KmFjdGl2ZSwKLQkJCSAgICAgIHVuc2lnbmVkIGludCBmbGFncykKK2k5MTVfZ2VtX2FjdGl2ZV93 YWl0KGNvbnN0IHN0cnVjdCBpOTE1X2dlbV9hY3RpdmUgKmFjdGl2ZSwgdW5zaWduZWQgaW50IGZs YWdzKQogewogCXN0cnVjdCBkcm1faTkxNV9nZW1fcmVxdWVzdCAqcmVxdWVzdDsKIAlsb25nIHJl dCA9IDA7CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9yaW5nYnVmZmVy LmggYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9yaW5nYnVmZmVyLmgKaW5kZXggODg0YTVh ZTIyMjVkLi4wOWJiODljZmI3YzMgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2lu dGVsX3JpbmdidWZmZXIuaAorKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9yaW5nYnVm ZmVyLmgKQEAgLTUyNCw3ICs1MjQsNyBAQCBzdGF0aWMgaW5saW5lIGludCBpbnRlbF9lbmdpbmVf aWRsZShzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICplbmdpbmUsCiAJCQkJICAgIHVuc2lnbmVkIGlu dCBmbGFncykKIHsKIAkvKiBXYWl0IHVwb24gdGhlIGxhc3QgcmVxdWVzdCB0byBiZSBjb21wbGV0 ZWQgKi8KLQlyZXR1cm4gaTkxNV9nZW1fYWN0aXZlX3dhaXRfdW5sb2NrZWQoJmVuZ2luZS0+bGFz dF9yZXF1ZXN0LCBmbGFncyk7CisJcmV0dXJuIGk5MTVfZ2VtX2FjdGl2ZV93YWl0KCZlbmdpbmUt Pmxhc3RfcmVxdWVzdCwgZmxhZ3MpOwogfQogCiBpbnQgaW50ZWxfaW5pdF9yZW5kZXJfcmluZ19i dWZmZXIoc3RydWN0IGludGVsX2VuZ2luZV9jcyAqZW5naW5lKTsKLS0gCjIuOS4zCgpfX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpJbnRlbC1nZnggbWFpbGlu ZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVl ZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK