From mboxrd@z Thu Jan 1 00:00:00 1970 From: Maarten Lankhorst Subject: [PATCH 12/12] drm/i915: Rename async to nonblock. Date: Tue, 26 Apr 2016 16:11:45 +0200 Message-ID: <1461679905-30177-13-git-send-email-maarten.lankhorst@linux.intel.com> References: <1461679905-30177-1-git-send-email-maarten.lankhorst@linux.intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <1461679905-30177-1-git-send-email-maarten.lankhorst@linux.intel.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: dri-devel@lists.freedesktop.org Cc: intel-gfx@lists.freedesktop.org List-Id: dri-devel@lists.freedesktop.org VGhlIGFzeW5jIG5hbWUgaXMgZGVwcmVjYXRlZCBhbmQgc2hvdWxkIGJlIGNoYW5nZWQgdG8gbm9u YmxvY2tpbmcuCgpTaWduZWQtb2ZmLWJ5OiBNYWFydGVuIExhbmtob3JzdCA8bWFhcnRlbi5sYW5r aG9yc3RAbGludXguaW50ZWwuY29tPgotLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rp c3BsYXkuYyB8IDE2ICsrKysrKysrLS0tLS0tLS0KIDEgZmlsZSBjaGFuZ2VkLCA4IGluc2VydGlv bnMoKyksIDggZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUv aW50ZWxfZGlzcGxheS5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jCmlu ZGV4IDU1MTU0MWIzMDM4Yy4uNWQyOWI4MzhkOGQ3IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9k cm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxf ZGlzcGxheS5jCkBAIC0xMzM4Niw3ICsxMzM4Niw3IEBAIHN0YXRpYyBpbnQgaW50ZWxfYXRvbWlj X2NoZWNrKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsCiAKIHN0YXRpYyBpbnQgaW50ZWxfYXRvbWlj X3ByZXBhcmVfY29tbWl0KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsCiAJCQkJICAgICAgIHN0cnVj dCBkcm1fYXRvbWljX3N0YXRlICpzdGF0ZSwKLQkJCQkgICAgICAgYm9vbCBhc3luYykKKwkJCQkg ICAgICAgYm9vbCBub25ibG9jaykKIHsKIAlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3By aXYgPSBkZXYtPmRldl9wcml2YXRlOwogCXN0cnVjdCBkcm1fcGxhbmVfc3RhdGUgKnBsYW5lX3N0 YXRlOwpAQCAtMTMzOTUsOCArMTMzOTUsOCBAQCBzdGF0aWMgaW50IGludGVsX2F0b21pY19wcmVw YXJlX2NvbW1pdChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LAogCXN0cnVjdCBkcm1fY3J0YyAqY3J0 YzsKIAlpbnQgaSwgcmV0OwogCi0JaWYgKGFzeW5jKSB7Ci0JCURSTV9ERUJVR19LTVMoImk5MTUg ZG9lcyBub3QgeWV0IHN1cHBvcnQgYXN5bmMgY29tbWl0XG4iKTsKKwlpZiAobm9uYmxvY2spIHsK KwkJRFJNX0RFQlVHX0tNUygiaTkxNSBkb2VzIG5vdCB5ZXQgc3VwcG9ydCBub25ibG9ja2luZyBj b21taXRcbiIpOwogCQlyZXR1cm4gLUVJTlZBTDsKIAl9CiAKQEAgLTEzNDE0LDcgKzEzNDE0LDcg QEAgc3RhdGljIGludCBpbnRlbF9hdG9taWNfcHJlcGFyZV9jb21taXQoc3RydWN0IGRybV9kZXZp Y2UgKmRldiwKIAkJcmV0dXJuIHJldDsKIAogCXJldCA9IGRybV9hdG9taWNfaGVscGVyX3ByZXBh cmVfcGxhbmVzKGRldiwgc3RhdGUpOwotCWlmICghcmV0ICYmICFhc3luYyAmJiAhaTkxNV9yZXNl dF9pbl9wcm9ncmVzcygmZGV2X3ByaXYtPmdwdV9lcnJvcikpIHsKKwlpZiAoIXJldCAmJiAhbm9u YmxvY2sgJiYgIWk5MTVfcmVzZXRfaW5fcHJvZ3Jlc3MoJmRldl9wcml2LT5ncHVfZXJyb3IpKSB7 CiAJCXUzMiByZXNldF9jb3VudGVyOwogCiAJCXJlc2V0X2NvdW50ZXIgPSBhdG9taWNfcmVhZCgm ZGV2X3ByaXYtPmdwdV9lcnJvci5yZXNldF9jb3VudGVyKTsKQEAgLTEzNTE5LDIxICsxMzUxOSwy MSBAQCBzdGF0aWMgYm9vbCBuZWVkc192Ymxhbmtfd2FpdChzdHJ1Y3QgaW50ZWxfY3J0Y19zdGF0 ZSAqY3J0Y19zdGF0ZSkKICAqIGludGVsX2F0b21pY19jb21taXQgLSBjb21taXQgdmFsaWRhdGVk IHN0YXRlIG9iamVjdAogICogQGRldjogRFJNIGRldmljZQogICogQHN0YXRlOiB0aGUgdG9wLWxl dmVsIGRyaXZlciBzdGF0ZSBvYmplY3QKLSAqIEBhc3luYzogYXN5bmNocm9ub3VzIGNvbW1pdAor ICogQG5vbmJsb2NrOiBub25ibG9ja2luZyBjb21taXQKICAqCiAgKiBUaGlzIGZ1bmN0aW9uIGNv bW1pdHMgYSB0b3AtbGV2ZWwgc3RhdGUgb2JqZWN0IHRoYXQgaGFzIGJlZW4gdmFsaWRhdGVkCiAg KiB3aXRoIGRybV9hdG9taWNfaGVscGVyX2NoZWNrKCkuCiAgKgogICogRklYTUU6ICBBdG9taWMg bW9kZXNldCBzdXBwb3J0IGZvciBpOTE1IGlzIG5vdCB5ZXQgY29tcGxldGUuICBBdCB0aGUgbW9t ZW50CiAgKiB3ZSBjYW4gb25seSBoYW5kbGUgcGxhbmUtcmVsYXRlZCBvcGVyYXRpb25zIGFuZCBk byBub3QgeWV0IHN1cHBvcnQKLSAqIGFzeW5jaHJvbm91cyBjb21taXQuCisgKiBub25ibG9ja2lu ZyBjb21taXQuCiAgKgogICogUkVUVVJOUwogICogWmVybyBmb3Igc3VjY2VzcyBvciAtZXJybm8u CiAgKi8KIHN0YXRpYyBpbnQgaW50ZWxfYXRvbWljX2NvbW1pdChzdHJ1Y3QgZHJtX2RldmljZSAq ZGV2LAogCQkJICAgICAgIHN0cnVjdCBkcm1fYXRvbWljX3N0YXRlICpzdGF0ZSwKLQkJCSAgICAg ICBib29sIGFzeW5jKQorCQkJICAgICAgIGJvb2wgbm9uYmxvY2spCiB7CiAJc3RydWN0IGludGVs X2F0b21pY19zdGF0ZSAqaW50ZWxfc3RhdGUgPSB0b19pbnRlbF9hdG9taWNfc3RhdGUoc3RhdGUp OwogCXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9IGRldi0+ZGV2X3ByaXZhdGU7 CkBAIC0xMzU0NSw3ICsxMzU0NSw3IEBAIHN0YXRpYyBpbnQgaW50ZWxfYXRvbWljX2NvbW1pdChz dHJ1Y3QgZHJtX2RldmljZSAqZGV2LAogCXVuc2lnbmVkIGxvbmcgcHV0X2RvbWFpbnNbSTkxNV9N QVhfUElQRVNdID0ge307CiAJdW5zaWduZWQgY3J0Y192YmxhbmtfbWFzayA9IDA7CiAKLQlyZXQg PSBpbnRlbF9hdG9taWNfcHJlcGFyZV9jb21taXQoZGV2LCBzdGF0ZSwgYXN5bmMpOworCXJldCA9 IGludGVsX2F0b21pY19wcmVwYXJlX2NvbW1pdChkZXYsIHN0YXRlLCBub25ibG9jayk7CiAJaWYg KHJldCkgewogCQlEUk1fREVCVUdfQVRPTUlDKCJQcmVwYXJpbmcgc3RhdGUgZmFpbGVkIHdpdGgg JWlcbiIsIHJldCk7CiAJCXJldHVybiByZXQ7Ci0tIAoyLjUuNQoKX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX18KZHJpLWRldmVsIG1haWxpbmcgbGlzdApkcmkt ZGV2ZWxAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3Jn L21haWxtYW4vbGlzdGluZm8vZHJpLWRldmVsCg==