From: Tvrtko Ursulin Subject: [PATCH] drm/i915: Cleanup i915_gem_request_add_to_client Date: Tue, 27 Sep 2016 10:44:04 +0100 Message-ID: <1474969444-6640-1-git-send-email-tvrtko.ursulin@linux.intel.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 4A4B86E63F for ; Tue, 27 Sep 2016 09:44:23 +0000 (UTC) Received: by mail-wm0-x241.google.com with SMTP id b184so246804wma.3 for ; Tue, 27 Sep 2016 02:44:23 -0700 (PDT) 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 aW5jZSB0aGVyZSBpcyBubyBlcnJvciBoYW5kbGluZyBhbnkKICAgbG9uZ2VyLgoKU2lnbmVkLW9m Zi1ieTogVHZydGtvIFVyc3VsaW4gPHR2cnRrby51cnN1bGluQGludGVsLmNvbT4KLS0tCiBkcml2 ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9leGVjYnVmZmVyLmMgfCAgNyArKy0tLS0tCiBkcml2 ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9yZXF1ZXN0LmMgICAgfCAxNiArKystLS0tLS0tLS0t LS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9yZXF1ZXN0LmggICAgfCAgNCArKy0t CiAzIGZpbGVzIGNoYW5nZWQsIDcgaW5zZXJ0aW9ucygrKSwgMjAgZGVsZXRpb25zKC0pCgpkaWZm IC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fZXhlY2J1ZmZlci5jIGIvZHJp dmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fZXhlY2J1ZmZlci5jCmluZGV4IDMzYzg1MjI3NjQz ZC4uNjdmOWZiZWIyOWQwIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dl bV9leGVjYnVmZmVyLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fZXhlY2J1 ZmZlci5jCkBAIC0xODI0LDkgKzE4MjQsNyBAQCBpOTE1X2dlbV9kb19leGVjYnVmZmVyKHN0cnVj dCBkcm1fZGV2aWNlICpkZXYsIHZvaWQgKmRhdGEsCiAJICovCiAJcGFyYW1zLT5yZXF1ZXN0LT5i YXRjaCA9IHBhcmFtcy0+YmF0Y2g7CiAKLQlyZXQgPSBpOTE1X2dlbV9yZXF1ZXN0X2FkZF90b19j bGllbnQocGFyYW1zLT5yZXF1ZXN0LCBmaWxlKTsKLQlpZiAocmV0KQotCQlnb3RvIGVycl9yZXF1 ZXN0OworCWk5MTVfZ2VtX3JlcXVlc3RfYWRkX3RvX2NsaWVudChwYXJhbXMtPnJlcXVlc3QsIGZp bGUpOwogCiAJLyoKIAkgKiBTYXZlIGFzc29ydGVkIHN0dWZmIGF3YXkgdG8gcGFzcyB0aHJvdWdo IHRvICpfc3VibWlzc2lvbigpLgpAQCAtMTg0MSw4ICsxODM5LDcgQEAgaTkxNV9nZW1fZG9fZXhl Y2J1ZmZlcihzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LCB2b2lkICpkYXRhLAogCXBhcmFtcy0+Y3R4 ICAgICAgICAgICAgICAgICAgICAgPSBjdHg7CiAKIAlyZXQgPSBleGVjYnVmX3N1Ym1pdChwYXJh bXMsIGFyZ3MsICZlYi0+dm1hcyk7Ci1lcnJfcmVxdWVzdDoKLQlfX2k5MTVfYWRkX3JlcXVlc3Qo cGFyYW1zLT5yZXF1ZXN0LCByZXQgPT0gMCk7CisJX19pOTE1X2FkZF9yZXF1ZXN0KHBhcmFtcy0+ cmVxdWVzdCwgdHJ1ZSk7CiAKIGVycl9iYXRjaF91bnBpbjoKIAkvKgpkaWZmIC0tZ2l0IGEvZHJp dmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fcmVxdWVzdC5jIGIvZHJpdmVycy9ncHUvZHJtL2k5 MTUvaTkxNV9nZW1fcmVxdWVzdC5jCmluZGV4IDQwOTc4YmMxMmNlYi4uYjAzZjA5NTY3ZGEyIDEw MDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9yZXF1ZXN0LmMKKysrIGIv ZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fcmVxdWVzdC5jCkBAIC0xMTUsMjkgKzExNSwx OSBAQCBjb25zdCBzdHJ1Y3QgZmVuY2Vfb3BzIGk5MTVfZmVuY2Vfb3BzID0gewogCS50aW1lbGlu ZV92YWx1ZV9zdHIgPSBpOTE1X2ZlbmNlX3RpbWVsaW5lX3ZhbHVlX3N0ciwKIH07CiAKLWludCBp OTE1X2dlbV9yZXF1ZXN0X2FkZF90b19jbGllbnQoc3RydWN0IGRybV9pOTE1X2dlbV9yZXF1ZXN0 ICpyZXEsCi0JCQkJICAgc3RydWN0IGRybV9maWxlICpmaWxlKQordm9pZCBpOTE1X2dlbV9yZXF1 ZXN0X2FkZF90b19jbGllbnQoc3RydWN0IGRybV9pOTE1X2dlbV9yZXF1ZXN0ICpyZXEsCisJCQkJ ICAgIHN0cnVjdCBkcm1fZmlsZSAqZmlsZSkKIHsKLQlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAq ZGV2X3ByaXZhdGU7CiAJc3RydWN0IGRybV9pOTE1X2ZpbGVfcHJpdmF0ZSAqZmlsZV9wcml2Owog Ci0JV0FSTl9PTighcmVxIHx8ICFmaWxlIHx8IHJlcS0+ZmlsZV9wcml2KTsKKwlHRU1fQlVHX09O KCFyZXEgfHwgIWZpbGUgfHwgcmVxLT5maWxlX3ByaXYpOwogCi0JaWYgKCFyZXEgfHwgIWZpbGUp Ci0JCXJldHVybiAtRUlOVkFMOwotCi0JaWYgKHJlcS0+ZmlsZV9wcml2KQotCQlyZXR1cm4gLUVJ TlZBTDsKLQotCWRldl9wcml2YXRlID0gcmVxLT5pOTE1OwogCWZpbGVfcHJpdiA9IGZpbGUtPmRy aXZlcl9wcml2OwogCiAJc3Bpbl9sb2NrKCZmaWxlX3ByaXYtPm1tLmxvY2spOwogCXJlcS0+Zmls ZV9wcml2ID0gZmlsZV9wcml2OwogCWxpc3RfYWRkX3RhaWwoJnJlcS0+Y2xpZW50X2xpc3QsICZm aWxlX3ByaXYtPm1tLnJlcXVlc3RfbGlzdCk7CiAJc3Bpbl91bmxvY2soJmZpbGVfcHJpdi0+bW0u bG9jayk7Ci0KLQlyZXR1cm4gMDsKIH0KIAogc3RhdGljIGlubGluZSB2b2lkCmRpZmYgLS1naXQg YS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9yZXF1ZXN0LmggYi9kcml2ZXJzL2dwdS9k cm0vaTkxNS9pOTE1X2dlbV9yZXF1ZXN0LmgKaW5kZXggOTc0YmQ3YmNjODAxLi43ZmEyMGYzNDJh Y2YgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX3JlcXVlc3QuaAor KysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9yZXF1ZXN0LmgKQEAgLTE1NSw4ICsx NTUsOCBAQCBzdGF0aWMgaW5saW5lIGJvb2wgZmVuY2VfaXNfaTkxNShzdHJ1Y3QgZmVuY2UgKmZl bmNlKQogc3RydWN0IGRybV9pOTE1X2dlbV9yZXF1ZXN0ICogX19tdXN0X2NoZWNrCiBpOTE1X2dl bV9yZXF1ZXN0X2FsbG9jKHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKmVuZ2luZSwKIAkJICAgICAg IHN0cnVjdCBpOTE1X2dlbV9jb250ZXh0ICpjdHgpOwotaW50IGk5MTVfZ2VtX3JlcXVlc3RfYWRk X3RvX2NsaWVudChzdHJ1Y3QgZHJtX2k5MTVfZ2VtX3JlcXVlc3QgKnJlcSwKLQkJCQkgICBzdHJ1 Y3QgZHJtX2ZpbGUgKmZpbGUpOwordm9pZCBpOTE1X2dlbV9yZXF1ZXN0X2FkZF90b19jbGllbnQo c3RydWN0IGRybV9pOTE1X2dlbV9yZXF1ZXN0ICpyZXEsCisJCQkJICAgIHN0cnVjdCBkcm1fZmls ZSAqZmlsZSk7CiB2b2lkIGk5MTVfZ2VtX3JlcXVlc3RfcmV0aXJlX3VwdG8oc3RydWN0IGRybV9p OTE1X2dlbV9yZXF1ZXN0ICpyZXEpOwogCiBzdGF0aWMgaW5saW5lIHUzMgotLSAKMi43LjQKCl9f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCkludGVsLWdmeCBt YWlsaW5nIGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3Rz LmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeAo=