From: Tvrtko Ursulin Subject: [PATCH v2] drm/i915: Cleanup i915_gem_request_add_to_client Date: Wed, 28 Sep 2016 17:48:23 +0100 Message-ID: <1475081303-10821-1-git-send-email-tvrtko.ursulin@linux.intel.com> References: <0160927121915.GU28107@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-x244.google.com (mail-wm0-x244.google.com [IPv6:2a00:1450:400c:c09::244]) by gabe.freedesktop.org (Postfix) with ESMTPS id 08C476E7E0 for ; Wed, 28 Sep 2016 16:48:34 +0000 (UTC) Received: by mail-wm0-x244.google.com with SMTP id l132so6792091wmf.1 for ; Wed, 28 Sep 2016 09:48:33 -0700 (PDT) In-Reply-To: <0160927121915.GU28107@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 ZXNzIGFzc2VydHMuIChKb29uYXMgTGFodGluZW4pCgpTaWduZWQtb2ZmLWJ5OiBUdnJ0a28gVXJz dWxpbiA8dHZydGtvLnVyc3VsaW5AaW50ZWwuY29tPgpSZXZpZXdlZC1ieTogSm9vbmFzIExhaHRp bmVuIDxqb29uYXMubGFodGluZW5AbGludXguaW50ZWwuY29tPiAodjEpCi0tLQogZHJpdmVycy9n cHUvZHJtL2k5MTUvaTkxNV9nZW1fZXhlY2J1ZmZlci5jIHwgMjAgKysrKysrKysrKysrKysrLS0t LS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX3JlcXVlc3QuYyAgICB8IDI1IC0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX3JlcXVl c3QuaCAgICB8ICAyIC0tCiAzIGZpbGVzIGNoYW5nZWQsIDE1IGluc2VydGlvbnMoKyksIDMyIGRl bGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2V4 ZWNidWZmZXIuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2V4ZWNidWZmZXIuYwpp bmRleCAzM2M4NTIyNzY0M2QuLjIwZGM3ZDkwY2VjZiAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUv ZHJtL2k5MTUvaTkxNV9nZW1fZXhlY2J1ZmZlci5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1 L2k5MTVfZ2VtX2V4ZWNidWZmZXIuYwpAQCAtMTYxMiw2ICsxNjEyLDE5IEBAIGViX3NlbGVjdF9l bmdpbmUoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2LAogCXJldHVybiBlbmdpbmU7 CiB9CiAKK3N0YXRpYyB2b2lkIGk5MTVfZ2VtX3JlcXVlc3RfYWRkX3RvX2NsaWVudChzdHJ1Y3Qg ZHJtX2k5MTVfZ2VtX3JlcXVlc3QgKnJlcSwKKwkJCQkJICAgc3RydWN0IGRybV9maWxlICpmaWxl KQoreworCXN0cnVjdCBkcm1faTkxNV9maWxlX3ByaXZhdGUgKmZpbGVfcHJpdiA9IGZpbGUtPmRy aXZlcl9wcml2OworCisJR0VNX0JVR19PTihyZXEtPmZpbGVfcHJpdik7CisKKwlzcGluX2xvY2so JmZpbGVfcHJpdi0+bW0ubG9jayk7CisJcmVxLT5maWxlX3ByaXYgPSBmaWxlX3ByaXY7CisJbGlz dF9hZGRfdGFpbCgmcmVxLT5jbGllbnRfbGlzdCwgJmZpbGVfcHJpdi0+bW0ucmVxdWVzdF9saXN0 KTsKKwlzcGluX3VubG9jaygmZmlsZV9wcml2LT5tbS5sb2NrKTsKK30KKwogc3RhdGljIGludAog aTkxNV9nZW1fZG9fZXhlY2J1ZmZlcihzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LCB2b2lkICpkYXRh LAogCQkgICAgICAgc3RydWN0IGRybV9maWxlICpmaWxlLApAQCAtMTgyNCw5ICsxODM3LDcgQEAg aTkxNV9nZW1fZG9fZXhlY2J1ZmZlcihzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LCB2b2lkICpkYXRh LAogCSAqLwogCXBhcmFtcy0+cmVxdWVzdC0+YmF0Y2ggPSBwYXJhbXMtPmJhdGNoOwogCi0JcmV0 ID0gaTkxNV9nZW1fcmVxdWVzdF9hZGRfdG9fY2xpZW50KHBhcmFtcy0+cmVxdWVzdCwgZmlsZSk7 Ci0JaWYgKHJldCkKLQkJZ290byBlcnJfcmVxdWVzdDsKKwlpOTE1X2dlbV9yZXF1ZXN0X2FkZF90 b19jbGllbnQocGFyYW1zLT5yZXF1ZXN0LCBmaWxlKTsKIAogCS8qCiAJICogU2F2ZSBhc3NvcnRl ZCBzdHVmZiBhd2F5IHRvIHBhc3MgdGhyb3VnaCB0byAqX3N1Ym1pc3Npb24oKS4KQEAgLTE4NDEs OCArMTg1Miw3IEBAIGk5MTVfZ2VtX2RvX2V4ZWNidWZmZXIoc3RydWN0IGRybV9kZXZpY2UgKmRl diwgdm9pZCAqZGF0YSwKIAlwYXJhbXMtPmN0eCAgICAgICAgICAgICAgICAgICAgID0gY3R4Owog CiAJcmV0ID0gZXhlY2J1Zl9zdWJtaXQocGFyYW1zLCBhcmdzLCAmZWItPnZtYXMpOwotZXJyX3Jl cXVlc3Q6Ci0JX19pOTE1X2FkZF9yZXF1ZXN0KHBhcmFtcy0+cmVxdWVzdCwgcmV0ID09IDApOwor CV9faTkxNV9hZGRfcmVxdWVzdChwYXJhbXMtPnJlcXVlc3QsIHRydWUpOwogCiBlcnJfYmF0Y2hf dW5waW46CiAJLyoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX3Jl cXVlc3QuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX3JlcXVlc3QuYwppbmRleCA0 MDk3OGJjMTJjZWIuLjQ5MGQzYTQwMjcxYSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5 MTUvaTkxNV9nZW1fcmVxdWVzdC5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2Vt X3JlcXVlc3QuYwpAQCAtMTE1LDMxICsxMTUsNiBAQCBjb25zdCBzdHJ1Y3QgZmVuY2Vfb3BzIGk5 MTVfZmVuY2Vfb3BzID0gewogCS50aW1lbGluZV92YWx1ZV9zdHIgPSBpOTE1X2ZlbmNlX3RpbWVs aW5lX3ZhbHVlX3N0ciwKIH07CiAKLWludCBpOTE1X2dlbV9yZXF1ZXN0X2FkZF90b19jbGllbnQo c3RydWN0IGRybV9pOTE1X2dlbV9yZXF1ZXN0ICpyZXEsCi0JCQkJICAgc3RydWN0IGRybV9maWxl ICpmaWxlKQotewotCXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdmF0ZTsKLQlzdHJ1 Y3QgZHJtX2k5MTVfZmlsZV9wcml2YXRlICpmaWxlX3ByaXY7Ci0KLQlXQVJOX09OKCFyZXEgfHwg IWZpbGUgfHwgcmVxLT5maWxlX3ByaXYpOwotCi0JaWYgKCFyZXEgfHwgIWZpbGUpCi0JCXJldHVy biAtRUlOVkFMOwotCi0JaWYgKHJlcS0+ZmlsZV9wcml2KQotCQlyZXR1cm4gLUVJTlZBTDsKLQot CWRldl9wcml2YXRlID0gcmVxLT5pOTE1OwotCWZpbGVfcHJpdiA9IGZpbGUtPmRyaXZlcl9wcml2 OwotCi0Jc3Bpbl9sb2NrKCZmaWxlX3ByaXYtPm1tLmxvY2spOwotCXJlcS0+ZmlsZV9wcml2ID0g ZmlsZV9wcml2OwotCWxpc3RfYWRkX3RhaWwoJnJlcS0+Y2xpZW50X2xpc3QsICZmaWxlX3ByaXYt Pm1tLnJlcXVlc3RfbGlzdCk7Ci0Jc3Bpbl91bmxvY2soJmZpbGVfcHJpdi0+bW0ubG9jayk7Ci0K LQlyZXR1cm4gMDsKLX0KLQogc3RhdGljIGlubGluZSB2b2lkCiBpOTE1X2dlbV9yZXF1ZXN0X3Jl bW92ZV9mcm9tX2NsaWVudChzdHJ1Y3QgZHJtX2k5MTVfZ2VtX3JlcXVlc3QgKnJlcXVlc3QpCiB7 CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9yZXF1ZXN0LmggYi9k cml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9yZXF1ZXN0LmgKaW5kZXggOTc0YmQ3YmNjODAx Li5kZjFhNDFiYmY2NDUgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2Vt X3JlcXVlc3QuaAorKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9yZXF1ZXN0LmgK QEAgLTE1NSw4ICsxNTUsNiBAQCBzdGF0aWMgaW5saW5lIGJvb2wgZmVuY2VfaXNfaTkxNShzdHJ1 Y3QgZmVuY2UgKmZlbmNlKQogc3RydWN0IGRybV9pOTE1X2dlbV9yZXF1ZXN0ICogX19tdXN0X2No ZWNrCiBpOTE1X2dlbV9yZXF1ZXN0X2FsbG9jKHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKmVuZ2lu ZSwKIAkJICAgICAgIHN0cnVjdCBpOTE1X2dlbV9jb250ZXh0ICpjdHgpOwotaW50IGk5MTVfZ2Vt X3JlcXVlc3RfYWRkX3RvX2NsaWVudChzdHJ1Y3QgZHJtX2k5MTVfZ2VtX3JlcXVlc3QgKnJlcSwK LQkJCQkgICBzdHJ1Y3QgZHJtX2ZpbGUgKmZpbGUpOwogdm9pZCBpOTE1X2dlbV9yZXF1ZXN0X3Jl dGlyZV91cHRvKHN0cnVjdCBkcm1faTkxNV9nZW1fcmVxdWVzdCAqcmVxKTsKIAogc3RhdGljIGlu bGluZSB1MzIKLS0gCjIuNy40CgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVz a3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9p bnRlbC1nZngK