From: John.C.Harrison@Intel.com Subject: [PATCH 25/39] drm/i915: Add sync wait support to scheduler Date: Mon, 23 Nov 2015 11:39:20 +0000 Message-ID: <1448278774-31376-26-git-send-email-John.C.Harrison@Intel.com> References: <1448278774-31376-1-git-send-email-John.C.Harrison@Intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by gabe.freedesktop.org (Postfix) with ESMTP id EB4D6721FB for ; Mon, 23 Nov 2015 03:40:00 -0800 (PST) In-Reply-To: <1448278774-31376-1-git-send-email-John.C.Harrison@Intel.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 RnJvbTogSm9obiBIYXJyaXNvbiA8Sm9obi5DLkhhcnJpc29uQEludGVsLmNvbT4KClRoZXJlIGlz IGEgc3luYyBmcmFtZXdvcmsgdG8gYWxsb3cgd29yayBmb3IgbXVsdGlwbGUgaW5kZXBlbmRlbnQK c3lzdGVtcyB0byBiZSBzeW5jaHJvbmlzZWQgd2l0aCBlYWNoIG90aGVyIGJ1dCB3aXRob3V0IHN0 YWxsaW5nCnRoZSBDUFUgd2hldGhlciBpbiB0aGUgYXBwbGljYXRpb24gb3IgdGhlIGRyaXZlci4g VGhpcyBwYXRjaCBhZGRzCnN1cHBvcnQgZm9yIHRoaXMgZnJhbWV3b3JrIHRvIHRoZSBHUFUgc2No ZWR1bGVyLgoKQmF0Y2ggYnVmZmVycyBjYW4gbm93IGhhdmUgc3luYyBmcmFtZXdvcmsgZmVuY2Ug b2JqZWN0cyBhc3NvY2lhdGVkIHdpdGgKdGhlbS4gVGhlIHNjaGVkdWxlciB3aWxsIGxvb2sgYXQg dGhpcyBmZW5jZSB3aGVuIGRlY2lkaW5nIHdoYXQgdG8Kc3VibWl0IG5leHQgdG8gdGhlIGhhcmR3 YXJlLiBJZiB0aGUgZmVuY2UgaXMgb3V0c3RhbmRpbmcgdGhlbiB0aGF0CmJhdGNoIGJ1ZmZlciB3 aWxsIGJlIHBhc3NlZCBvdmVyIGluIHByZWZlcmVuY2Ugb2Ygb25lIHRoYXQgaXMgcmVhZHkgdG8K cnVuLiBJZiBubyBvdGhlciBiYXRjaGVzIGFyZSByZWFkeSB0aGVuIHRoZSBzY2hlZHVsZXIgd2ls bCBxdWV1ZSBhbgphc3luY2hyb25vdXMgY2FsbGJhY2sgdG8gYmUgd29rZW4gdXAgd2hlbiB0aGUg ZmVuY2UgaGFzIGJlZW4Kc2lnbmFsbGVkLiBUaGUgY2FsbGJhY2sgd2lsbCB3YWtlIHRoZSBzY2hl ZHVsZXIgYW5kIHN1Ym1pdCB0aGUgbm93CnJlYWR5IGJhdGNoIGJ1ZmZlci4KCnYyOiBVcGRhdGVk IHRvIHVzZSB0aGUgbmV3IHN5bmNfZmVuY2VfaXNfc2lnbmFsZWQoKSBBUEkgcmF0aGVyIHRoYW4K aGF2aW5nIHRvIGtub3cgYWJvdXQgdGhlIGludGVybmFscyBvZiBhIGZlbmNlIG9iamVjdC4KCkFs c28gcmVtb3ZlZCB0aGUgc3BpbiBsb2NrIGZyb20gdGhlIGZlbmNlIHdhaXQgY2FsbGJhY2sgZnVu Y3Rpb24uIFRoaXMKd2FzIHVzZWQgdG8gY2xlYXIgdGhlICd3YWl0aW5nJyBmbGFnLiBIb3dldmVy LCBpdCBjYXVzZXMgYSBwcm9ibGVtCndpdGggdGhlIFREUiBjb2RlLiBTcGVjaWZpY2FsbHksIHdo ZW4gY2FuY2VsbGluZyB3b3JrIHBhY2tldHMgZHVlIHRvIGEKVERSIHRoZXJlIGlzIGEgY29kZSBw YXRoIHdoZXJlIHRoZSBmZW5jZSBjYW4gYmUgc2lnbmFsbGVkIHdoaWxlIHRoZQpzcGlubG9jayBp cyBhbHJlYWR5IGhlbGQuIEl0IGlzIG5vdCByZWFsbHkgbmVjZXNzYXJ5IHRvIGNsZWFyIHRoZSBm bGFnCmFueXdheSBhcyBpdCdzIHB1cnBvc2UgaXMgc29sZWx5IHRvIHByZXZlbnQgbXVsdGlwbGUg d2FpdHMgYmVpbmcKaXNzdWVkLiBPbmNlIHRoZSBmZW5jZSBoYXMgYmVlbiBzaWduYWxsZWQsIG5v IGZ1cnRoZXIgd2FpdHMgd2lsbCBiZQphdHRlbXB0ZWQgc28gaXQgZG9lc24ndCBtYXR0ZXIgd2hl dGhlciB0aGUgZmVuY2UgaXMgbWFya2VkIGFzIGhhdmluZwphbiBvdXRzdGFuZGluZyB3YWl0IG9y IG5vdC4KCkZvcjogVklaLTE1ODcKU2lnbmVkLW9mZi1ieTogSm9obiBIYXJyaXNvbiA8Sm9obi5D LkhhcnJpc29uQEludGVsLmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5o ICAgICAgIHwgICAxICsKIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfc2NoZWR1bGVyLmMgfCAx NDQgKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKystLQogZHJpdmVycy9ncHUvZHJtL2k5 MTUvaTkxNV9zY2hlZHVsZXIuaCB8ICAgNiArKwogMyBmaWxlcyBjaGFuZ2VkLCAxNDYgaW5zZXJ0 aW9ucygrKSwgNSBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkx NS9pOTE1X2Rydi5oIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuaAppbmRleCAxNWRl ZTQxLi40MTg3ZTc1IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5o CisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmgKQEAgLTE2OTgsNiArMTY5OCw3 IEBAIHN0cnVjdCBpOTE1X2V4ZWNidWZmZXJfcGFyYW1zIHsKIAl1aW50NjRfdCAgICAgICAgICAg ICAgICAgICAgICAgIGJhdGNoX29ial92bV9vZmZzZXQ7CiAJc3RydWN0IGludGVsX2VuZ2luZV9j cyAgICAgICAgICAqcmluZzsKIAlzdHJ1Y3QgZHJtX2k5MTVfZ2VtX29iamVjdCAgICAgICpiYXRj aF9vYmo7CisJc3RydWN0IHN5bmNfZmVuY2UgICAgICAgICAgICAgICAqZmVuY2Vfd2FpdDsKIAlz dHJ1Y3QgZHJtX2NsaXBfcmVjdCAgICAgICAgICAgICpjbGlwcmVjdHM7CiAJdWludDMyX3QgICAg ICAgICAgICAgICAgICAgICAgICBpbnN0cF9tYXNrOwogCWludCAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgaW5zdHBfbW9kZTsKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5 MTVfc2NoZWR1bGVyLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X3NjaGVkdWxlci5jCmlu ZGV4IGQ0ZDI0NjYuLjkzOWRjMmIgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5 MTVfc2NoZWR1bGVyLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9zY2hlZHVsZXIu YwpAQCAtMjUsNiArMjUsNyBAQAogI2luY2x1ZGUgImk5MTVfZHJ2LmgiCiAjaW5jbHVkZSAiaW50 ZWxfZHJ2LmgiCiAjaW5jbHVkZSAiaTkxNV9zY2hlZHVsZXIuaCIKKyNpbmNsdWRlIDwuLi9kcml2 ZXJzL2FuZHJvaWQvc3luYy5oPgogCiBzdGF0aWMgaW50ICAgICAgICAgaTkxNV9zY2hlZHVsZXJf Zmx5X25vZGUoc3RydWN0IGk5MTVfc2NoZWR1bGVyX3F1ZXVlX2VudHJ5ICpub2RlKTsKIHN0YXRp YyBpbnQgICAgICAgICBpOTE1X3NjaGVkdWxlcl9yZW1vdmVfZGVwZW5kZW50KHN0cnVjdCBpOTE1 X3NjaGVkdWxlciAqc2NoZWR1bGVyLApAQCAtOTYsNiArOTcsOSBAQCBpbnQgaTkxNV9zY2hlZHVs ZXJfcXVldWVfZXhlY2J1ZmZlcihzdHJ1Y3QgaTkxNV9zY2hlZHVsZXJfcXVldWVfZW50cnkgKnFl KQogCWlmIChpOTE1LnNjaGVkdWxlcl9vdmVycmlkZSAmIGk5MTVfc29fZGlyZWN0X3N1Ym1pdCkg ewogCQlpbnQgcmV0OwogCisJCVdBUk5fT04ocWUtPnBhcmFtcy5mZW5jZV93YWl0ICYmCisJCQko IXN5bmNfZmVuY2VfaXNfc2lnbmFsZWQocWUtPnBhcmFtcy5mZW5jZV93YWl0KSkpOworCiAJCWlu dGVsX3JpbmdfcmVzZXJ2ZWRfc3BhY2VfY2FuY2VsKHFlLT5wYXJhbXMucmVxdWVzdC0+cmluZ2J1 Zik7CiAKIAkJc2NoZWR1bGVyLT5mbGFnc1txZS0+cGFyYW1zLnJpbmctPmlkXSB8PSBpOTE1X3Nm X3N1Ym1pdHRpbmc7CkBAIC0xMzAsNiArMTM0LDkgQEAgaW50IGk5MTVfc2NoZWR1bGVyX3F1ZXVl X2V4ZWNidWZmZXIoc3RydWN0IGk5MTVfc2NoZWR1bGVyX3F1ZXVlX2VudHJ5ICpxZSkKIAkJaWYg KHFlLT5wYXJhbXMuZGlzcGF0Y2hfZmxhZ3MgJiBJOTE1X0RJU1BBVENIX1NFQ1VSRSkKIAkJCWk5 MTVfZ2VtX2V4ZWNidWZmX3JlbGVhc2VfYmF0Y2hfb2JqKHFlLT5wYXJhbXMuYmF0Y2hfb2JqKTsK IAorCQlpZiAocWUtPnBhcmFtcy5mZW5jZV93YWl0KQorCQkJc3luY19mZW5jZV9wdXQocWUtPnBh cmFtcy5mZW5jZV93YWl0KTsKKwogCQlyZXR1cm4gMDsKIAl9CiAKQEAgLTUzMSw2ICs1MzgsOSBA QCBzdGF0aWMgaW50IGk5MTVfc2NoZWR1bGVyX3JlbW92ZShzdHJ1Y3QgaW50ZWxfZW5naW5lX2Nz ICpyaW5nKQogCQlub2RlID0gbGlzdF9maXJzdF9lbnRyeSgmcmVtb3ZlLCB0eXBlb2YoKm5vZGUp LCBsaW5rKTsKIAkJbGlzdF9kZWwoJm5vZGUtPmxpbmspOwogCisJCWlmIChub2RlLT5wYXJhbXMu ZmVuY2Vfd2FpdCkKKwkJCXN5bmNfZmVuY2VfcHV0KG5vZGUtPnBhcmFtcy5mZW5jZV93YWl0KTsK KwogCQkvKiBGcmVlIHVwIGFsbCB0aGUgRFJNIG9iamVjdCByZWZlcmVuY2VzICovCiAJCWk5MTVf Z2VtX3NjaGVkdWxlcl9jbGVhbl9ub2RlKG5vZGUpOwogCkBAIC03OTYsMTcgKzgwNiw5NCBAQCBz dGF0aWMgaW50IGk5MTVfc2NoZWR1bGVyX3N1Ym1pdF9tYXhfcHJpb3JpdHkoc3RydWN0IGludGVs X2VuZ2luZV9jcyAqcmluZywKIAlyZXR1cm4gY291bnQ7CiB9CiAKKy8qIFVzZSBhIHByaXZhdGUg c3RydWN0dXJlIGluIG9yZGVyIHRvIHBhc3MgdGhlICdkZXYnIHBvaW50ZXIgdGhyb3VnaCAqLwor c3RydWN0IGk5MTVfc3luY19mZW5jZV93YWl0ZXIgeworCXN0cnVjdCBzeW5jX2ZlbmNlX3dhaXRl ciBzZnc7CisJc3RydWN0IGRybV9kZXZpY2UJICpkZXY7CisJc3RydWN0IGk5MTVfc2NoZWR1bGVy X3F1ZXVlX2VudHJ5ICpub2RlOworfTsKKworLyoKKyAqIE5COiBUaGlzIGNhbGxiYWNrIGNhbiBi ZSBleGVjdXRlZCBhdCBpbnRlcnJ1cHQgdGltZS4gRnVydGhlciwgaXQgY2FuIGJlCisgKiBjYWxs ZWQgZnJvbSB3aXRoaW4gdGhlIFREUiByZXNldCBzZXF1ZW5jZSBkdXJpbmcgYSBzY2hlZHVsZXIg J2tpbGxfYWxsJworICogYW5kIHRodXMgYmUgY2FsbGVkIHdoaWxlIHRoZSBzY2hlZHVsZXIgc3Bp bmxvY2sgaXMgYWxyZWFkeSBoZWxkLiBUaHVzCisgKiBpdCBjYW4gZ3JhYiBuZWl0aGVyIHRoZSBk cml2ZXIgbXV0ZXggbm9yIHRoZSBzY2hlZHVsZXIgc3BpbmxvY2suCisgKi8KK3N0YXRpYyB2b2lk IGk5MTVfc2NoZWR1bGVyX3dhaXRfZmVuY2Vfc2lnbmFsZWQoc3RydWN0IHN5bmNfZmVuY2UgKmZl bmNlLAorCQkJCSAgICAgICBzdHJ1Y3Qgc3luY19mZW5jZV93YWl0ZXIgKndhaXRlcikKK3sKKwlz dHJ1Y3QgaTkxNV9zeW5jX2ZlbmNlX3dhaXRlciAqaTkxNV93YWl0ZXI7CisJc3RydWN0IGRybV9p OTE1X3ByaXZhdGUgKmRldl9wcml2ID0gTlVMTDsKKworCWk5MTVfd2FpdGVyID0gY29udGFpbmVy X29mKHdhaXRlciwgc3RydWN0IGk5MTVfc3luY19mZW5jZV93YWl0ZXIsIHNmdyk7CisJZGV2X3By aXYgICAgPSAoaTkxNV93YWl0ZXIgJiYgaTkxNV93YWl0ZXItPmRldikgPworCQkJCQkgICAgaTkx NV93YWl0ZXItPmRldi0+ZGV2X3ByaXZhdGUgOiBOVUxMOworCisJLyoKKwkgKiBOQjogVGhlIGNh bGxiYWNrIGlzIGV4ZWN1dGVkIGF0IGludGVycnVwdCB0aW1lLCB0aHVzIGl0IGNhbiBub3QKKwkg KiBjYWxsIF9zdWJtaXQoKSBkaXJlY3RseS4gSXQgbXVzdCBnbyB2aWEgdGhlIGRlbGF5ZWQgd29y ayBoYW5kbGVyLgorCSAqLworCWlmIChkZXZfcHJpdikKKwkJcXVldWVfd29yayhkZXZfcHJpdi0+ d3EsICZkZXZfcHJpdi0+bW0uc2NoZWR1bGVyX3dvcmspOworCisJa2ZyZWUod2FpdGVyKTsKK30K Kworc3RhdGljIGJvb2wgaTkxNV9zY2hlZHVsZXJfYXN5bmNfZmVuY2Vfd2FpdChzdHJ1Y3QgZHJt X2RldmljZSAqZGV2LAorCQkJCQkgICAgc3RydWN0IGk5MTVfc2NoZWR1bGVyX3F1ZXVlX2VudHJ5 ICpub2RlKQoreworCXN0cnVjdCBpOTE1X3N5bmNfZmVuY2Vfd2FpdGVyCSpmZW5jZV93YWl0ZXI7 CisJc3RydWN0IHN5bmNfZmVuY2UJCSpmZW5jZSA9IG5vZGUtPnBhcmFtcy5mZW5jZV93YWl0Owor CWludAkJCQlzaWduYWxlZDsKKwlib29sCQkJCXN1Y2Nlc3MgPSB0cnVlOworCisJaWYgKChub2Rl LT5mbGFncyAmIGk5MTVfcWVmX2ZlbmNlX3dhaXRpbmcpID09IDApCisJCW5vZGUtPmZsYWdzIHw9 IGk5MTVfcWVmX2ZlbmNlX3dhaXRpbmc7CisJZWxzZQorCQlyZXR1cm4gdHJ1ZTsKKworCWlmIChm ZW5jZSA9PSBOVUxMKQorCQlyZXR1cm4gZmFsc2U7CisKKwlzaWduYWxlZCA9IHN5bmNfZmVuY2Vf aXNfc2lnbmFsZWQoZmVuY2UpOworCWlmICghc2lnbmFsZWQpIHsKKwkJZmVuY2Vfd2FpdGVyID0g a21hbGxvYyhzaXplb2YoKmZlbmNlX3dhaXRlciksIEdGUF9LRVJORUwpOworCQlpZiAoIWZlbmNl X3dhaXRlcikgeworCQkJc3VjY2VzcyA9IGZhbHNlOworCQkJZ290byBlbmQ7CisJCX0KKworCQlz eW5jX2ZlbmNlX3dhaXRlcl9pbml0KCZmZW5jZV93YWl0ZXItPnNmdywKKwkJCQlpOTE1X3NjaGVk dWxlcl93YWl0X2ZlbmNlX3NpZ25hbGVkKTsKKwkJZmVuY2Vfd2FpdGVyLT5ub2RlID0gbm9kZTsK KwkJZmVuY2Vfd2FpdGVyLT5kZXYgPSBkZXY7CisKKwkJaWYgKHN5bmNfZmVuY2Vfd2FpdF9hc3lu YyhmZW5jZSwgJmZlbmNlX3dhaXRlci0+c2Z3KSkgeworCQkJLyogYW4gZXJyb3Igb2NjdXJyZWQs IHVzdWFsbHkgdGhpcyBpcyBiZWNhdXNlIHRoZQorCQkJICogZmVuY2Ugd2FzIHNpZ25hbGVkIGFs cmVhZHkgKi8KKwkJCXNpZ25hbGVkID0gc3luY19mZW5jZV9pc19zaWduYWxlZChmZW5jZSk7CisJ CQlpZiAoIXNpZ25hbGVkKSB7CisJCQkJc3VjY2VzcyA9IGZhbHNlOworCQkJCWdvdG8gZW5kOwor CQkJfQorCQl9CisJfQorZW5kOgorCXJldHVybiBzdWNjZXNzOworfQorCiBzdGF0aWMgaW50IGk5 MTVfc2NoZWR1bGVyX3BvcF9mcm9tX3F1ZXVlX2xvY2tlZChzdHJ1Y3QgaW50ZWxfZW5naW5lX2Nz ICpyaW5nLAogCQkJCSAgICBzdHJ1Y3QgaTkxNV9zY2hlZHVsZXJfcXVldWVfZW50cnkgKipwb3Bf bm9kZSwKIAkJCQkgICAgdW5zaWduZWQgbG9uZyAqZmxhZ3MpCiB7CiAJc3RydWN0IGRybV9pOTE1 X3ByaXZhdGUgICAgICAgICAgICAqZGV2X3ByaXYgPSByaW5nLT5kZXYtPmRldl9wcml2YXRlOwog CXN0cnVjdCBpOTE1X3NjaGVkdWxlciAgICAgICAgICAgICAgKnNjaGVkdWxlciA9IGRldl9wcml2 LT5zY2hlZHVsZXI7CisJc3RydWN0IGk5MTVfc2NoZWR1bGVyX3F1ZXVlX2VudHJ5ICAqYmVzdF93 YWl0LCAqZmVuY2Vfd2FpdCA9IE5VTEw7CiAJc3RydWN0IGk5MTVfc2NoZWR1bGVyX3F1ZXVlX2Vu dHJ5ICAqYmVzdDsKIAlzdHJ1Y3QgaTkxNV9zY2hlZHVsZXJfcXVldWVfZW50cnkgICpub2RlOwog CWludCAgICAgcmV0OwogCWludCAgICAgaTsKLQlib29sCWFueV9xdWV1ZWQ7CisJYm9vbAlzaWdu YWxsZWQsIGFueV9xdWV1ZWQ7CiAJYm9vbAloYXNfbG9jYWwsIGhhc19yZW1vdGUsIG9ubHlfcmVt b3RlOwogCiAJKnBvcF9ub2RlID0gTlVMTDsKQEAgLTgxNCwxMyArOTAxLDIwIEBAIHN0YXRpYyBp bnQgaTkxNV9zY2hlZHVsZXJfcG9wX2Zyb21fcXVldWVfbG9ja2VkKHN0cnVjdCBpbnRlbF9lbmdp bmVfY3MgKnJpbmcsCiAKIAlhbnlfcXVldWVkID0gZmFsc2U7CiAJb25seV9yZW1vdGUgPSBmYWxz ZTsKKwliZXN0X3dhaXQgPSBOVUxMOwogCWJlc3QgPSBOVUxMOworCXNpZ25hbGxlZCA9IHRydWU7 CiAKIAlsaXN0X2Zvcl9lYWNoX2VudHJ5KG5vZGUsICZzY2hlZHVsZXItPm5vZGVfcXVldWVbcmlu Zy0+aWRdLCBsaW5rKSB7CiAJCWlmICghSTkxNV9TUVNfSVNfUVVFVUVEKG5vZGUpKQogCQkJY29u dGludWU7CiAJCWFueV9xdWV1ZWQgPSB0cnVlOwogCisJCWlmIChub2RlLT5wYXJhbXMuZmVuY2Vf d2FpdCkKKwkJCXNpZ25hbGxlZCA9IHN5bmNfZmVuY2VfaXNfc2lnbmFsZWQobm9kZS0+cGFyYW1z LmZlbmNlX3dhaXQpOworCQllbHNlCisJCQlzaWduYWxsZWQgPSB0cnVlOworCiAJCWhhc19sb2Nh bCAgPSBmYWxzZTsKIAkJaGFzX3JlbW90ZSA9IGZhbHNlOwogCQlmb3IgKGkgPSAwOyBpIDwgbm9k ZS0+bnVtX2RlcHM7IGkrKykgewpAQCAtODM3LDkgKzkzMSwxNSBAQCBzdGF0aWMgaW50IGk5MTVf c2NoZWR1bGVyX3BvcF9mcm9tX3F1ZXVlX2xvY2tlZChzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICpy aW5nLAogCQkJb25seV9yZW1vdGUgPSB0cnVlOwogCiAJCWlmICghaGFzX2xvY2FsICYmICFoYXNf cmVtb3RlKSB7Ci0JCQlpZiAoIWJlc3QgfHwKLQkJCSAgICAobm9kZS0+cHJpb3JpdHkgPiBiZXN0 LT5wcmlvcml0eSkpCi0JCQkJYmVzdCA9IG5vZGU7CisJCQlpZiAoc2lnbmFsbGVkKSB7CisJCQkJ aWYgKCFiZXN0IHx8CisJCQkJICAgIChub2RlLT5wcmlvcml0eSA+IGJlc3QtPnByaW9yaXR5KSkK KwkJCQkJYmVzdCA9IG5vZGU7CisJCQl9IGVsc2UgeworCQkJCWlmICghYmVzdF93YWl0IHx8CisJ CQkJICAgIChub2RlLT5wcmlvcml0eSA+IGJlc3Rfd2FpdC0+cHJpb3JpdHkpKQorCQkJCQliZXN0 X3dhaXQgPSBub2RlOworCQkJfQogCQl9CiAJfQogCkBAIC04NTUsOCArOTU1LDM0IEBAIHN0YXRp YyBpbnQgaTkxNV9zY2hlZHVsZXJfcG9wX2Zyb21fcXVldWVfbG9ja2VkKHN0cnVjdCBpbnRlbF9l bmdpbmVfY3MgKnJpbmcsCiAJCSAqIChhKSB0aGVyZSBhcmUgbm8gYnVmZmVycyBpbiB0aGUgcXVl dWUKIAkJICogKGIpIGFsbCBxdWV1ZWQgYnVmZmVycyBhcmUgZGVwZW5kZW50IG9uIG90aGVyIGJ1 ZmZlcnMKIAkJICogICAgIGUuZy4gb24gYSBidWZmZXIgdGhhdCBpcyBpbiBmbGlnaHQgb24gYSBk aWZmZXJlbnQgcmluZworCQkgKiAoYykgYWxsIGluZGVwZW5kZW50IGJ1ZmZlcnMgYXJlIHdhaXRp bmcgb24gZmVuY2VzCiAJCSAqLwotCQlpZiAob25seV9yZW1vdGUpIHsKKwkJaWYgKGJlc3Rfd2Fp dCkgeworCQkJLyogTmVlZCB0byB3YWl0IGZvciBzb21ldGhpbmcgdG8gYmUgc2lnbmFsbGVkLgor CQkJICoKKwkJCSAqIE5COiBkbyBub3QgcmVhbGx5IHdhbnQgdG8gd2FpdCBvbiBvbmUgc3BlY2lm aWMgZmQKKwkJCSAqIGJlY2F1c2UgdGhlcmUgaXMgbm8gZ3VhcmFudGVlIGluIHRoZSBvcmRlciB0 aGF0CisJCQkgKiBibG9ja2VkIGJ1ZmZlcnMgd2lsbCBiZSBzaWduYWxsZWQuIE5lZWQgdG8gd2Fp dCBvbgorCQkJICogJ2FueXRoaW5nJyBhbmQgdGhlbiByZXNjYW4gZm9yIGJlc3QgYXZhaWxhYmxl LCBpZgorCQkJICogc3RpbGwgbm90aGluZyB0aGVuIHdhaXQgYWdhaW4uLi4KKwkJCSAqCisJCQkg KiBOQiAyOiBUaGUgd2FpdCBtdXN0IGFsc28gd2FrZSB1cCBpZiBzb21lb25lIGF0dGVtcHRzCisJ CQkgKiB0byBzdWJtaXQgYSBuZXcgYnVmZmVyLiBUaGUgbmV3IGJ1ZmZlciBtaWdodCBiZQorCQkJ ICogaW5kZXBlbmRlbnQgb2YgYWxsIG90aGVycyBhbmQgdGh1cyBjb3VsZCBqdW1wIHRoZQorCQkJ ICogcXVldWUgYW5kIHN0YXJ0IHJ1bm5pbmcgaW1tZWRpYXRlbHkuCisJCQkgKgorCQkJICogTkIg MzogTGFzdGx5LCBtdXN0IG5vdCB3YWl0IHdpdGggdGhlIHNwaW5sb2NrIGhlbGQhCisJCQkgKgor CQkJICogU28gcmF0aGVyIHRoYW4gd2FpdCBoZXJlLCBuZWVkIHRvIHF1ZXVlIGEgZGVmZXJyZWQK KwkJCSAqIHdhaXQgdGhyZWFkIGFuZCBqdXN0IHJldHVybiAnbm90aGluZyB0byBkbycuCisJCQkg KgorCQkJICogTkIgNDogQ2FuJ3QgYWN0dWFsbHkgZG8gdGhlIHdhaXQgaGVyZSBiZWNhdXNlIHRo ZQorCQkJICogc3BpbmxvY2sgaXMgc3RpbGwgaGVsZCBhbmQgdGhlIHdhaXQgcmVxdWlyZXMgZG9p bmcKKwkJCSAqIGEgbWVtb3J5IGFsbG9jYXRpb24uCisJCQkgKi8KKwkJCWZlbmNlX3dhaXQgPSBi ZXN0X3dhaXQ7CisJCQlyZXQgPSAtRUFHQUlOOworCQl9IGVsc2UgaWYgKG9ubHlfcmVtb3RlKSB7 CiAJCQkvKiBUaGUgb25seSBkZXBlbmRlbnQgYnVmZmVycyBhcmUgb24gYW5vdGhlciByaW5nLiAq LwogCQkJcmV0ID0gLUVBR0FJTjsKIAkJfSBlbHNlIGlmIChhbnlfcXVldWVkKSB7CkBAIC04Njgs NiArOTk0LDE0IEBAIHN0YXRpYyBpbnQgaTkxNV9zY2hlZHVsZXJfcG9wX2Zyb21fcXVldWVfbG9j a2VkKHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKnJpbmcsCiAKIAkvKiBpOTE1X3NjaGVkdWxlcl9k dW1wX3F1ZXVlX3BvcChyaW5nLCBiZXN0KTsgKi8KIAorCWlmIChmZW5jZV93YWl0KSB7CisJCS8q IEl0IHNob3VsZCBiZSBzYWZlIHRvIHNsZWVwIG5vdy4uLiAqLworCQkvKiBOQjogTmVlZCB0byBy ZWxlYXNlIGFuZCByZWFjcXVpcmUgdGhlIHNwaW5sb2NrIHRob3VnaCAqLworCQlzcGluX3VubG9j a19pcnFyZXN0b3JlKCZzY2hlZHVsZXItPmxvY2ssICpmbGFncyk7CisJCWk5MTVfc2NoZWR1bGVy X2FzeW5jX2ZlbmNlX3dhaXQocmluZy0+ZGV2LCBmZW5jZV93YWl0KTsKKwkJc3Bpbl9sb2NrX2ly cXNhdmUoJnNjaGVkdWxlci0+bG9jaywgKmZsYWdzKTsKKwl9CisKIAkqcG9wX25vZGUgPSBiZXN0 OwogCXJldHVybiByZXQ7CiB9CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1 X3NjaGVkdWxlci5oIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9zY2hlZHVsZXIuaAppbmRl eCBmYzU4ZDQ5Li5hZGZhMWUwIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1 X3NjaGVkdWxlci5oCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfc2NoZWR1bGVyLmgK QEAgLTUxLDYgKzUxLDExIEBAIHN0cnVjdCBpOTE1X3NjaGVkdWxlcl9vYmpfZW50cnkgewogCXN0 cnVjdCBkcm1faTkxNV9nZW1fb2JqZWN0ICAgICAgICAgICpvYmo7CiB9OwogCitlbnVtIGk5MTVf c2NoZWR1bGVyX3F1ZXVlX2VudHJ5X2ZsYWdzIHsKKwkvKiBGZW5jZSBpcyBiZWluZyB3YWl0ZWQg b24gKi8KKwlpOTE1X3FlZl9mZW5jZV93YWl0aW5nICAgICAgICAgICAgICA9ICgxIDw8IDApLAor fTsKKwogc3RydWN0IGk5MTVfc2NoZWR1bGVyX3F1ZXVlX2VudHJ5IHsKIAlzdHJ1Y3QgaTkxNV9l eGVjYnVmZmVyX3BhcmFtcyAgICAgICBwYXJhbXM7CiAJLyogLTEwMjMgPSBsb3dlc3QgcHJpb3Jp dHksIDAgPSBkZWZhdWx0LCAxMDIzID0gaGlnaGVzdCAqLwpAQCAtNjMsNiArNjgsNyBAQCBzdHJ1 Y3QgaTkxNV9zY2hlZHVsZXJfcXVldWVfZW50cnkgewogCWVudW0gaTkxNV9zY2hlZHVsZXJfcXVl dWVfc3RhdHVzICAgIHN0YXR1czsKIAl1bnNpZ25lZCBsb25nICAgICAgICAgICAgICAgICAgICAg ICBzdGFtcDsKIAlzdHJ1Y3QgbGlzdF9oZWFkICAgICAgICAgICAgICAgICAgICBsaW5rOworCXVp bnQzMl90ICAgICAgICAgICAgICAgICAgICAgICAgICAgIGZsYWdzOwogfTsKIAogc3RydWN0IGk5 MTVfc2NoZWR1bGVyIHsKLS0gCjEuOS4xCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5m cmVlZGVza3RvcC5vcmcKaHR0cDovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3Rp bmZvL2ludGVsLWdmeAo=