From mboxrd@z Thu Jan 1 00:00:00 1970 From: Chris Wilson Subject: [PATCH 35/73] drm/i915: Remove obsolete i915_gem_object_flush_active() Date: Mon, 1 Aug 2016 10:10:43 +0100 Message-ID: <1470042681-25318-36-git-send-email-chris@chris-wilson.co.uk> References: <1470042681-25318-1-git-send-email-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-x244.google.com (mail-wm0-x244.google.com [IPv6:2a00:1450:400c:c09::244]) by gabe.freedesktop.org (Postfix) with ESMTPS id 270676E25E for ; Mon, 1 Aug 2016 09:12:22 +0000 (UTC) Received: by mail-wm0-x244.google.com with SMTP id o80so25249940wme.0 for ; Mon, 01 Aug 2016 02:12:22 -0700 (PDT) In-Reply-To: <1470042681-25318-1-git-send-email-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 U2luY2Ugd2UgdHJhY2sgcmVxdWVzdHMsIGFuZCByZXF1ZXN0cyBhcmUgYWx3YXlzIGFkZGVkIHRv IHRoZSBHUFUgZnVsbHkKZm9ybWVkLCB3ZSBuZXZlciBoYXZlIHRvIGZsdXNoIHRoZSBpbmNvbXBs ZXRlIHJlcXVlc3QgYW5kIGtub3cgdGhhdCB0aGUKZ2l2ZW4gcmVxdWVzdCB3aWxsIGV2ZW50dWFs bHkgY29tcGxldGUgd2l0aG91dCBhbnkgZnVydGhlciBhY3Rpb24gb24gb3VyCnBhcnQuCgpTaWdu ZWQtb2ZmLWJ5OiBDaHJpcyBXaWxzb24gPGNocmlzQGNocmlzLXdpbHNvbi5jby51az4KUmV2aWV3 ZWQtYnk6IEpvb25hcyBMYWh0aW5lbiA8am9vbmFzLmxhaHRpbmVuQGxpbnV4LmludGVsLmNvbT4K LS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbS5jIHwgNTkgKysrLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0KIDEgZmlsZSBjaGFuZ2VkLCAzIGluc2VydGlvbnMo KyksIDU2IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5 MTVfZ2VtLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbS5jCmluZGV4IDI1OWY5N2Nj YmU0Ni4uMzIwYThlNDBkMjFiIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1 X2dlbS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtLmMKQEAgLTI3NDYsMzUg KzI3NDYsNiBAQCBvdXRfcmVhcm06CiB9CiAKIC8qKgotICogRW5zdXJlcyB0aGF0IGFuIG9iamVj dCB3aWxsIGV2ZW50dWFsbHkgZ2V0IG5vbi1idXN5IGJ5IGZsdXNoaW5nIGFueSByZXF1aXJlZAot ICogd3JpdGUgZG9tYWlucywgZW1pdHRpbmcgYW55IG91dHN0YW5kaW5nIGxhenkgcmVxdWVzdCBh bmQgcmV0aXJpbmcgYW5kCi0gKiBjb21wbGV0ZWQgcmVxdWVzdHMuCi0gKiBAb2JqOiBvYmplY3Qg dG8gZmx1c2gKLSAqLwotc3RhdGljIGludAotaTkxNV9nZW1fb2JqZWN0X2ZsdXNoX2FjdGl2ZShz dHJ1Y3QgZHJtX2k5MTVfZ2VtX29iamVjdCAqb2JqKQotewotCWludCBpOwotCi0JaWYgKCFvYmot PmFjdGl2ZSkKLQkJcmV0dXJuIDA7Ci0KLQlmb3IgKGkgPSAwOyBpIDwgSTkxNV9OVU1fRU5HSU5F UzsgaSsrKSB7Ci0JCXN0cnVjdCBkcm1faTkxNV9nZW1fcmVxdWVzdCAqcmVxOwotCi0JCXJlcSA9 IGk5MTVfZ2VtX2FjdGl2ZV9wZWVrKCZvYmotPmxhc3RfcmVhZFtpXSwKLQkJCQkJICAgJm9iai0+ YmFzZS5kZXYtPnN0cnVjdF9tdXRleCk7Ci0JCWlmIChyZXEgPT0gTlVMTCkKLQkJCWNvbnRpbnVl OwotCi0JCWlmIChpOTE1X2dlbV9yZXF1ZXN0X2NvbXBsZXRlZChyZXEpKQotCQkJaTkxNV9nZW1f b2JqZWN0X3JldGlyZV9fcmVhZChvYmosIGkpOwotCX0KLQotCXJldHVybiAwOwotfQotCi0vKioK ICAqIGk5MTVfZ2VtX3dhaXRfaW9jdGwgLSBpbXBsZW1lbnRzIERSTV9JT0NUTF9JOTE1X0dFTV9X QUlUCiAgKiBAZGV2OiBkcm0gZGV2aWNlIHBvaW50ZXIKICAqIEBkYXRhOiBpb2N0bCBkYXRhIGJs b2IKQEAgLTI4MjAsMjQgKzI3OTEsOSBAQCBpOTE1X2dlbV93YWl0X2lvY3RsKHN0cnVjdCBkcm1f ZGV2aWNlICpkZXYsIHZvaWQgKmRhdGEsIHN0cnVjdCBkcm1fZmlsZSAqZmlsZSkKIAkJcmV0dXJu IC1FTk9FTlQ7CiAJfQogCi0JLyogTmVlZCB0byBtYWtlIHN1cmUgdGhlIG9iamVjdCBnZXRzIGlu YWN0aXZlIGV2ZW50dWFsbHkuICovCi0JcmV0ID0gaTkxNV9nZW1fb2JqZWN0X2ZsdXNoX2FjdGl2 ZShvYmopOwotCWlmIChyZXQpCi0JCWdvdG8gb3V0OwotCiAJaWYgKCFvYmotPmFjdGl2ZSkKIAkJ Z290byBvdXQ7CiAKLQkvKiBEbyB0aGlzIGFmdGVyIE9MUiBjaGVjayB0byBtYWtlIHN1cmUgd2Ug bWFrZSBmb3J3YXJkIHByb2dyZXNzIHBvbGxpbmcKLQkgKiBvbiB0aGlzIElPQ1RMIHdpdGggYSB0 aW1lb3V0ID09IDAgKGxpa2UgYnVzeSBpb2N0bCkKLQkgKi8KLQlpZiAoYXJncy0+dGltZW91dF9u cyA9PSAwKSB7Ci0JCXJldCA9IC1FVElNRTsKLQkJZ290byBvdXQ7Ci0JfQotCi0JaTkxNV9nZW1f b2JqZWN0X3B1dChvYmopOwotCiAJZm9yIChpID0gMDsgaSA8IEk5MTVfTlVNX0VOR0lORVM7IGkr KykgewogCQlzdHJ1Y3QgZHJtX2k5MTVfZ2VtX3JlcXVlc3QgKnJlcTsKIApAQCAtMjg0Nyw2ICsy ODAzLDggQEAgaTkxNV9nZW1fd2FpdF9pb2N0bChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LCB2b2lk ICpkYXRhLCBzdHJ1Y3QgZHJtX2ZpbGUgKmZpbGUpCiAJCQlyZXF1ZXN0c1tuKytdID0gcmVxOwog CX0KIAorb3V0OgorCWk5MTVfZ2VtX29iamVjdF9wdXQob2JqKTsKIAltdXRleF91bmxvY2soJmRl di0+c3RydWN0X211dGV4KTsKIAogCWZvciAoaSA9IDA7IGkgPCBuOyBpKyspIHsKQEAgLTI4NTcs MTEgKzI4MTUsNiBAQCBpOTE1X2dlbV93YWl0X2lvY3RsKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYs IHZvaWQgKmRhdGEsIHN0cnVjdCBkcm1fZmlsZSAqZmlsZSkKIAkJaTkxNV9nZW1fcmVxdWVzdF9w dXQocmVxdWVzdHNbaV0pOwogCX0KIAlyZXR1cm4gcmV0OwotCi1vdXQ6Ci0JaTkxNV9nZW1fb2Jq ZWN0X3B1dChvYmopOwotCW11dGV4X3VubG9jaygmZGV2LT5zdHJ1Y3RfbXV0ZXgpOwotCXJldHVy biByZXQ7CiB9CiAKIHN0YXRpYyBpbnQKQEAgLTQwMzIsMTMgKzM5ODUsOCBAQCBpOTE1X2dlbV9i dXN5X2lvY3RsKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsIHZvaWQgKmRhdGEsCiAKIAkvKiBDb3Vu dCBhbGwgYWN0aXZlIG9iamVjdHMgYXMgYnVzeSwgZXZlbiBpZiB0aGV5IGFyZSBjdXJyZW50bHkg bm90IHVzZWQKIAkgKiBieSB0aGUgZ3B1LiBVc2VycyBvZiB0aGlzIGludGVyZmFjZSBleHBlY3Qg b2JqZWN0cyB0byBldmVudHVhbGx5Ci0JICogYmVjb21lIG5vbi1idXN5IHdpdGhvdXQgYW55IGZ1 cnRoZXIgYWN0aW9ucywgdGhlcmVmb3JlIGVtaXQgYW55Ci0JICogbmVjZXNzYXJ5IGZsdXNoZXMg aGVyZS4KKwkgKiBiZWNvbWUgbm9uLWJ1c3kgd2l0aG91dCBhbnkgZnVydGhlciBhY3Rpb25zLgog CSAqLwotCXJldCA9IGk5MTVfZ2VtX29iamVjdF9mbHVzaF9hY3RpdmUob2JqKTsKLQlpZiAocmV0 KQotCQlnb3RvIHVucmVmOwotCiAJYXJncy0+YnVzeSA9IDA7CiAJaWYgKG9iai0+YWN0aXZlKSB7 CiAJCXN0cnVjdCBkcm1faTkxNV9nZW1fcmVxdWVzdCAqcmVxOwpAQCAtNDA1Niw3ICs0MDA0LDYg QEAgaTkxNV9nZW1fYnVzeV9pb2N0bChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LCB2b2lkICpkYXRh LAogCQkJYXJncy0+YnVzeSB8PSByZXEtPmVuZ2luZS0+ZXhlY19pZDsKIAl9CiAKLXVucmVmOgog CWk5MTVfZ2VtX29iamVjdF9wdXQob2JqKTsKIHVubG9jazoKIAltdXRleF91bmxvY2soJmRldi0+ c3RydWN0X211dGV4KTsKLS0gCjIuOC4xCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5m cmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0 aW5mby9pbnRlbC1nZngK