From mboxrd@z Thu Jan 1 00:00:00 1970 From: Chris Wilson Subject: [PATCH 04/18] drm/i915: Remove unused i915_gem_active_wait() in favour of _unlocked() Date: Wed, 14 Sep 2016 07:52:36 +0100 Message-ID: <20160914065250.15482-5-chris@chris-wilson.co.uk> References: <20160914065250.15482-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-wm0-x241.google.com (mail-wm0-x241.google.com [IPv6:2a00:1450:400c:c09::241]) by gabe.freedesktop.org (Postfix) with ESMTPS id 378856E65E for ; Wed, 14 Sep 2016 06:53:05 +0000 (UTC) Received: by mail-wm0-x241.google.com with SMTP id g141so1018267wmd.1 for ; Tue, 13 Sep 2016 23:53:05 -0700 (PDT) In-Reply-To: <20160914065250.15482-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 cmlzQGNocmlzLXdpbHNvbi5jby51az4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dl bV9yZXF1ZXN0LmggfCAzNCArKystLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0KIGRyaXZl cnMvZ3B1L2RybS9pOTE1L2ludGVsX3JpbmdidWZmZXIuaCB8ICAyICstCiAyIGZpbGVzIGNoYW5n ZWQsIDQgaW5zZXJ0aW9ucygrKSwgMzIgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVy cy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fcmVxdWVzdC5oIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUv aTkxNV9nZW1fcmVxdWVzdC5oCmluZGV4IGYxY2UzOTBjOTI0NC4uNDU5OThlZWRkYTJjIDEwMDY0 NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9yZXF1ZXN0LmgKKysrIGIvZHJp dmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fcmVxdWVzdC5oCkBAIC01NjksNDAgKzU2OSwxMyBA QCBpOTE1X2dlbV9hY3RpdmVfaXNfaWRsZShjb25zdCBzdHJ1Y3QgaTkxNV9nZW1fYWN0aXZlICph Y3RpdmUsCiB9CiAKIC8qKgotICogaTkxNV9nZW1fYWN0aXZlX3dhaXQgLSB3YWl0cyB1bnRpbCB0 aGUgcmVxdWVzdCBpcyBjb21wbGV0ZWQKLSAqIEBhY3RpdmUgLSB0aGUgYWN0aXZlIHJlcXVlc3Qg b24gd2hpY2ggdG8gd2FpdAotICoKLSAqIGk5MTVfZ2VtX2FjdGl2ZV93YWl0KCkgd2FpdHMgdW50 aWwgdGhlIHJlcXVlc3QgaXMgY29tcGxldGVkIGJlZm9yZQotICogcmV0dXJuaW5nLiBOb3RlIHRo YXQgaXQgZG9lcyBub3QgZ3VhcmFudGVlIHRoYXQgdGhlIHJlcXVlc3QgaXMKLSAqIHJldGlyZWQg Zmlyc3QsIHNlZSBpOTE1X2dlbV9hY3RpdmVfcmV0aXJlKCkuCi0gKgotICogaTkxNV9nZW1fYWN0 aXZlX3dhaXQoKSByZXR1cm5zIGltbWVkaWF0ZWx5IGlmIHRoZSBhY3RpdmUKLSAqIHJlcXVlc3Qg aXMgYWxyZWFkeSBjb21wbGV0ZS4KLSAqLwotc3RhdGljIGlubGluZSBpbnQgX19tdXN0X2NoZWNr Ci1pOTE1X2dlbV9hY3RpdmVfd2FpdChjb25zdCBzdHJ1Y3QgaTkxNV9nZW1fYWN0aXZlICphY3Rp dmUsIHN0cnVjdCBtdXRleCAqbXV0ZXgpCi17Ci0Jc3RydWN0IGRybV9pOTE1X2dlbV9yZXF1ZXN0 ICpyZXF1ZXN0OwotCWxvbmcgcmV0OwotCi0JcmVxdWVzdCA9IGk5MTVfZ2VtX2FjdGl2ZV9wZWVr KGFjdGl2ZSwgbXV0ZXgpOwotCWlmICghcmVxdWVzdCkKLQkJcmV0dXJuIDA7Ci0KLQlyZXQgPSBp OTE1X3dhaXRfcmVxdWVzdChyZXF1ZXN0LAotCQkJCUk5MTVfV0FJVF9JTlRFUlJVUFRJQkxFIHwg STkxNV9XQUlUX0xPQ0tFRCwKLQkJCQlNQVhfU0NIRURVTEVfVElNRU9VVCk7Ci0JcmV0dXJuIHJl dCA8IDAgPyByZXQgOiAwOwotfQotCi0vKioKLSAqIGk5MTVfZ2VtX2FjdGl2ZV93YWl0X3VubG9j a2VkIC0gd2FpdHMgdW50aWwgdGhlIHJlcXVlc3QgaXMgY29tcGxldGVkCisgKiBpOTE1X2dlbV9h Y3RpdmVfd2FpdC0gd2FpdHMgdW50aWwgdGhlIHJlcXVlc3QgaXMgY29tcGxldGVkCiAgKiBAYWN0 aXZlIC0gdGhlIGFjdGl2ZSByZXF1ZXN0IG9uIHdoaWNoIHRvIHdhaXQKICAqIEBmbGFncyAtIGhv dyB0byB3YWl0CiAgKiBAdGltZW91dCAtIGhvdyBsb25nIHRvIHdhaXQgYXQgbW9zdAogICogQHJw cyAtIHVzZXJzcGFjZSBjbGllbnQgdG8gY2hhcmdlIGZvciBhIHdhaXRib29zdAogICoKLSAqIGk5 MTVfZ2VtX2FjdGl2ZV93YWl0X3VubG9ja2VkKCkgd2FpdHMgdW50aWwgdGhlIHJlcXVlc3QgaXMg Y29tcGxldGVkIGJlZm9yZQorICogaTkxNV9nZW1fYWN0aXZlX3dhaXQoKSB3YWl0cyB1bnRpbCB0 aGUgcmVxdWVzdCBpcyBjb21wbGV0ZWQgYmVmb3JlCiAgKiByZXR1cm5pbmcsIHdpdGhvdXQgcmVx dWlyaW5nIGFueSBsb2NrcyB0byBiZSBoZWxkLiBOb3RlIHRoYXQgaXQgZG9lcyBub3QKICAqIHJl dGlyZSBhbnkgcmVxdWVzdHMgYmVmb3JlIHJldHVybmluZy4KICAqCkBAIC02MTgsOCArNTkxLDcg QEAgaTkxNV9nZW1fYWN0aXZlX3dhaXQoY29uc3Qgc3RydWN0IGk5MTVfZ2VtX2FjdGl2ZSAqYWN0 aXZlLCBzdHJ1Y3QgbXV0ZXggKm11dGV4KQogICogUmV0dXJucyAwIGlmIHN1Y2Nlc3NmdWwsIG9y IGEgbmVnYXRpdmUgZXJyb3IgY29kZS4KICAqLwogc3RhdGljIGlubGluZSBpbnQKLWk5MTVfZ2Vt X2FjdGl2ZV93YWl0X3VubG9ja2VkKGNvbnN0IHN0cnVjdCBpOTE1X2dlbV9hY3RpdmUgKmFjdGl2 ZSwKLQkJCSAgICAgIHVuc2lnbmVkIGludCBmbGFncykKK2k5MTVfZ2VtX2FjdGl2ZV93YWl0KGNv bnN0IHN0cnVjdCBpOTE1X2dlbV9hY3RpdmUgKmFjdGl2ZSwgdW5zaWduZWQgaW50IGZsYWdzKQog ewogCXN0cnVjdCBkcm1faTkxNV9nZW1fcmVxdWVzdCAqcmVxdWVzdDsKIAlsb25nIHJldCA9IDA7 CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9yaW5nYnVmZmVyLmggYi9k cml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9yaW5nYnVmZmVyLmgKaW5kZXggODhlZDIxZjExMzVi Li44MGYyZGIzZDYzZDkgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3Jp bmdidWZmZXIuaAorKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9yaW5nYnVmZmVyLmgK QEAgLTUwMyw3ICs1MDMsNyBAQCBzdGF0aWMgaW5saW5lIGludCBpbnRlbF9lbmdpbmVfaWRsZShz dHJ1Y3QgaW50ZWxfZW5naW5lX2NzICplbmdpbmUsCiAJCQkJICAgIHVuc2lnbmVkIGludCBmbGFn cykKIHsKIAkvKiBXYWl0IHVwb24gdGhlIGxhc3QgcmVxdWVzdCB0byBiZSBjb21wbGV0ZWQgKi8K LQlyZXR1cm4gaTkxNV9nZW1fYWN0aXZlX3dhaXRfdW5sb2NrZWQoJmVuZ2luZS0+bGFzdF9yZXF1 ZXN0LCBmbGFncyk7CisJcmV0dXJuIGk5MTVfZ2VtX2FjdGl2ZV93YWl0KCZlbmdpbmUtPmxhc3Rf cmVxdWVzdCwgZmxhZ3MpOwogfQogCiBpbnQgaW50ZWxfaW5pdF9yZW5kZXJfcmluZ19idWZmZXIo c3RydWN0IGludGVsX2VuZ2luZV9jcyAqZW5naW5lKTsKLS0gCjIuOS4zCgpfX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0 CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3Rv cC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK