From: Tvrtko Ursulin Subject: [PATCH v3] drm/i915: Cleanup i915_gem_request_add_to_client Date: Thu, 29 Sep 2016 08:53:31 +0100 Message-ID: <1475135611-18548-1-git-send-email-tvrtko.ursulin@linux.intel.com> References: <20160928170930.GA28107@nuc-i3427.alporthouse.com> 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 133906E1C1 for ; Thu, 29 Sep 2016 07:53:45 +0000 (UTC) Received: by mail-wm0-x241.google.com with SMTP id w84so9362952wmg.0 for ; Thu, 29 Sep 2016 00:53:44 -0700 (PDT) In-Reply-To: <20160928170930.GA28107@nuc-i3427.alporthouse.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 RnJvbTogVHZydGtvIFVyc3VsaW4gPHR2cnRrby51cnN1bGluQGludGVsLmNvbT4KClNldmVyYWwg dGhpbmdzIHdlIGNhbiBjbGVhbiB1cCBpbiB0aGlzIGZ1bmN0aW9uOgoKICogUmVxdWVzdCBhbmQg ZmlsZSBwYXNzZWQgaW4gY2Fubm90IGJlIE5VTEwuIFRoZXJlIGlzCiAgIGEgc2luZ2xlIGNhbGxl ciB3aGljaCBtYWtlcyBpdCBpbXBvc3NpYmxlIHNvIGNoYW5nZQogICB0aGF0IGNvbmRpdGlvbiB0 byBhIEdFTV9CVUdfT04gaW5zdGVhZCBvZiBhIFdBUk4KICAgd2l0aCBhIHJldHVybiBjb2RlLgoK ICogU2FtZSBpcyB0cnVlIGZvciByZXEtPmZpbGVfcHJpdiB3aGljaCBpcyBhbHdheXMKICAgemVy b2VkIGJlZm9yZSB0aGlzIGZ1bmN0aW9uIGlzIGNhbGxlZC4KCiAqIFdpdGggdGhlIGFib3ZlIHdl IGNhbiByZW1vdmUgdGhlIGVycm9yIHJldHVybgogICBmcm9tIHRoZSBmdW5jdGlvbiBtYWtpbmcg aXQgdm9pZC4KCiAqIGRldl9wcml2YXRlIGxvY2FsIHZhcmlhYmxlIHdhcyB1bnVzZWQuCgogKiBD YWxsIHNpdGUgaW4gaTkxNV9nZW1fZG9fZXhlY2J1ZmZlciBjYW4gYmUKICAgc2ltcGxpZmllZCBz aW5jZSB0aGVyZSBpcyBubyBlcnJvciBoYW5kbGluZyBhbnkKICAgbG9uZ2VyLgoKdjI6CiAqIE1v dmUgbmV4dCB0byB0aGUgb25seSBjYWxsZXIuIChDaHJpcyBXaWxzb24pCiAqIFJlbW92ZSB1c2Vs ZXNzIGFzc2VydHMuIChKb29uYXMgTGFodGluZW4pCgp2MzoKICogU2hvcnRlbiBuYW1lLCByZW1v dmUgbGFzdCBzdGFuZGluZyBhc3NlcnQgYW5kCiAgIGZpeCBmbHVzaGluZyBhZnRlciBmYWlsZWQg c3VibWl0LiAoQ2hyaXMgV2lsc29uKQoKU2lnbmVkLW9mZi1ieTogVHZydGtvIFVyc3VsaW4gPHR2 cnRrby51cnN1bGluQGludGVsLmNvbT4KUmV2aWV3ZWQtYnk6IEpvb25hcyBMYWh0aW5lbiA8am9v bmFzLmxhaHRpbmVuQGxpbnV4LmludGVsLmNvbT4gKHYxKQotLS0KIGRyaXZlcnMvZ3B1L2RybS9p OTE1L2k5MTVfZ2VtX2V4ZWNidWZmZXIuYyB8IDE2ICsrKysrKysrKysrKy0tLS0KIGRyaXZlcnMv Z3B1L2RybS9pOTE1L2k5MTVfZ2VtX3JlcXVlc3QuYyAgICB8IDI1IC0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX3JlcXVlc3QuaCAgICB8ICAy IC0tCiAzIGZpbGVzIGNoYW5nZWQsIDEyIGluc2VydGlvbnMoKyksIDMxIGRlbGV0aW9ucygtKQoK ZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2V4ZWNidWZmZXIuYyBi L2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2V4ZWNidWZmZXIuYwppbmRleCAzM2M4NTIy NzY0M2QuLmY3Yjk2MzkxZmY2NiAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkx NV9nZW1fZXhlY2J1ZmZlci5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2V4 ZWNidWZmZXIuYwpAQCAtMTYxMiw2ICsxNjEyLDE3IEBAIGViX3NlbGVjdF9lbmdpbmUoc3RydWN0 IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2LAogCXJldHVybiBlbmdpbmU7CiB9CiAKK3N0YXRp YyB2b2lkCithZGRfdG9fY2xpZW50KHN0cnVjdCBkcm1faTkxNV9nZW1fcmVxdWVzdCAqcmVxLCBz dHJ1Y3QgZHJtX2ZpbGUgKmZpbGUpCit7CisJc3RydWN0IGRybV9pOTE1X2ZpbGVfcHJpdmF0ZSAq ZmlsZV9wcml2ID0gZmlsZS0+ZHJpdmVyX3ByaXY7CisKKwlzcGluX2xvY2soJmZpbGVfcHJpdi0+ bW0ubG9jayk7CisJcmVxLT5maWxlX3ByaXYgPSBmaWxlX3ByaXY7CisJbGlzdF9hZGRfdGFpbCgm cmVxLT5jbGllbnRfbGlzdCwgJmZpbGVfcHJpdi0+bW0ucmVxdWVzdF9saXN0KTsKKwlzcGluX3Vu bG9jaygmZmlsZV9wcml2LT5tbS5sb2NrKTsKK30KKwogc3RhdGljIGludAogaTkxNV9nZW1fZG9f ZXhlY2J1ZmZlcihzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LCB2b2lkICpkYXRhLAogCQkgICAgICAg c3RydWN0IGRybV9maWxlICpmaWxlLApAQCAtMTgyNCw5ICsxODM1LDcgQEAgaTkxNV9nZW1fZG9f ZXhlY2J1ZmZlcihzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LCB2b2lkICpkYXRhLAogCSAqLwogCXBh cmFtcy0+cmVxdWVzdC0+YmF0Y2ggPSBwYXJhbXMtPmJhdGNoOwogCi0JcmV0ID0gaTkxNV9nZW1f cmVxdWVzdF9hZGRfdG9fY2xpZW50KHBhcmFtcy0+cmVxdWVzdCwgZmlsZSk7Ci0JaWYgKHJldCkK LQkJZ290byBlcnJfcmVxdWVzdDsKKwlhZGRfdG9fY2xpZW50KHBhcmFtcy0+cmVxdWVzdCwgZmls ZSk7CiAKIAkvKgogCSAqIFNhdmUgYXNzb3J0ZWQgc3R1ZmYgYXdheSB0byBwYXNzIHRocm91Z2gg dG8gKl9zdWJtaXNzaW9uKCkuCkBAIC0xODQxLDcgKzE4NTAsNiBAQCBpOTE1X2dlbV9kb19leGVj YnVmZmVyKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsIHZvaWQgKmRhdGEsCiAJcGFyYW1zLT5jdHgg ICAgICAgICAgICAgICAgICAgICA9IGN0eDsKIAogCXJldCA9IGV4ZWNidWZfc3VibWl0KHBhcmFt cywgYXJncywgJmViLT52bWFzKTsKLWVycl9yZXF1ZXN0OgogCV9faTkxNV9hZGRfcmVxdWVzdChw YXJhbXMtPnJlcXVlc3QsIHJldCA9PSAwKTsKIAogZXJyX2JhdGNoX3VucGluOgpkaWZmIC0tZ2l0 IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fcmVxdWVzdC5jIGIvZHJpdmVycy9ncHUv ZHJtL2k5MTUvaTkxNV9nZW1fcmVxdWVzdC5jCmluZGV4IDQwOTc4YmMxMmNlYi4uNDkwZDNhNDAy NzFhIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9yZXF1ZXN0LmMK KysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fcmVxdWVzdC5jCkBAIC0xMTUsMzEg KzExNSw2IEBAIGNvbnN0IHN0cnVjdCBmZW5jZV9vcHMgaTkxNV9mZW5jZV9vcHMgPSB7CiAJLnRp bWVsaW5lX3ZhbHVlX3N0ciA9IGk5MTVfZmVuY2VfdGltZWxpbmVfdmFsdWVfc3RyLAogfTsKIAot aW50IGk5MTVfZ2VtX3JlcXVlc3RfYWRkX3RvX2NsaWVudChzdHJ1Y3QgZHJtX2k5MTVfZ2VtX3Jl cXVlc3QgKnJlcSwKLQkJCQkgICBzdHJ1Y3QgZHJtX2ZpbGUgKmZpbGUpCi17Ci0Jc3RydWN0IGRy bV9pOTE1X3ByaXZhdGUgKmRldl9wcml2YXRlOwotCXN0cnVjdCBkcm1faTkxNV9maWxlX3ByaXZh dGUgKmZpbGVfcHJpdjsKLQotCVdBUk5fT04oIXJlcSB8fCAhZmlsZSB8fCByZXEtPmZpbGVfcHJp dik7Ci0KLQlpZiAoIXJlcSB8fCAhZmlsZSkKLQkJcmV0dXJuIC1FSU5WQUw7Ci0KLQlpZiAocmVx LT5maWxlX3ByaXYpCi0JCXJldHVybiAtRUlOVkFMOwotCi0JZGV2X3ByaXZhdGUgPSByZXEtPmk5 MTU7Ci0JZmlsZV9wcml2ID0gZmlsZS0+ZHJpdmVyX3ByaXY7Ci0KLQlzcGluX2xvY2soJmZpbGVf cHJpdi0+bW0ubG9jayk7Ci0JcmVxLT5maWxlX3ByaXYgPSBmaWxlX3ByaXY7Ci0JbGlzdF9hZGRf dGFpbCgmcmVxLT5jbGllbnRfbGlzdCwgJmZpbGVfcHJpdi0+bW0ucmVxdWVzdF9saXN0KTsKLQlz cGluX3VubG9jaygmZmlsZV9wcml2LT5tbS5sb2NrKTsKLQotCXJldHVybiAwOwotfQotCiBzdGF0 aWMgaW5saW5lIHZvaWQKIGk5MTVfZ2VtX3JlcXVlc3RfcmVtb3ZlX2Zyb21fY2xpZW50KHN0cnVj dCBkcm1faTkxNV9nZW1fcmVxdWVzdCAqcmVxdWVzdCkKIHsKZGlmZiAtLWdpdCBhL2RyaXZlcnMv Z3B1L2RybS9pOTE1L2k5MTVfZ2VtX3JlcXVlc3QuaCBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5 MTVfZ2VtX3JlcXVlc3QuaAppbmRleCA5NzRiZDdiY2M4MDEuLmRmMWE0MWJiZjY0NSAxMDA2NDQK LS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fcmVxdWVzdC5oCisrKyBiL2RyaXZl cnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX3JlcXVlc3QuaApAQCAtMTU1LDggKzE1NSw2IEBAIHN0 YXRpYyBpbmxpbmUgYm9vbCBmZW5jZV9pc19pOTE1KHN0cnVjdCBmZW5jZSAqZmVuY2UpCiBzdHJ1 Y3QgZHJtX2k5MTVfZ2VtX3JlcXVlc3QgKiBfX211c3RfY2hlY2sKIGk5MTVfZ2VtX3JlcXVlc3Rf YWxsb2Moc3RydWN0IGludGVsX2VuZ2luZV9jcyAqZW5naW5lLAogCQkgICAgICAgc3RydWN0IGk5 MTVfZ2VtX2NvbnRleHQgKmN0eCk7Ci1pbnQgaTkxNV9nZW1fcmVxdWVzdF9hZGRfdG9fY2xpZW50 KHN0cnVjdCBkcm1faTkxNV9nZW1fcmVxdWVzdCAqcmVxLAotCQkJCSAgIHN0cnVjdCBkcm1fZmls ZSAqZmlsZSk7CiB2b2lkIGk5MTVfZ2VtX3JlcXVlc3RfcmV0aXJlX3VwdG8oc3RydWN0IGRybV9p OTE1X2dlbV9yZXF1ZXN0ICpyZXEpOwogCiBzdGF0aWMgaW5saW5lIHUzMgotLSAKMi43LjQKCl9f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCkludGVsLWdmeCBt YWlsaW5nIGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3Rz LmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeAo=