From: John.C.Harrison@Intel.com Subject: [PATCH v7 1/8] drm/i915: Convert requests to use struct fence Date: Wed, 20 Apr 2016 18:09:48 +0100 Message-ID: <1461172195-3959-2-git-send-email-John.C.Harrison@Intel.com> References: <1461172195-3959-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 mga04.intel.com (mga04.intel.com [192.55.52.120]) by gabe.freedesktop.org (Postfix) with ESMTP id ED5896E064 for ; Wed, 20 Apr 2016 17:09:57 +0000 (UTC) In-Reply-To: <1461172195-3959-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 IGEgY29uc3RydWN0IGluIHRoZSBsaW51eCBrZXJuZWwgY2FsbGVkICdzdHJ1Y3QgZmVuY2UnIHRo YXQgaXMKaW50ZW5kZWQgdG8ga2VlcCB0cmFjayBvZiB3b3JrIHRoYXQgaXMgZXhlY3V0ZWQgb24g aGFyZHdhcmUuIEkuZS4gaXQKc29sdmVzIHRoZSBiYXNpYyBwcm9ibGVtIHRoYXQgdGhlIGRyaXZl cnMgJ3N0cnVjdApkcm1faTkxNV9nZW1fcmVxdWVzdCcgaXMgdHJ5aW5nIHRvIGFkZHJlc3MuIFRo ZSByZXF1ZXN0IHN0cnVjdHVyZSBkb2VzCnF1aXRlIGEgbG90IG1vcmUgdGhhbiBzaW1wbHkgdHJh Y2sgdGhlIGV4ZWN1dGlvbiBwcm9ncmVzcyBzbyBpcyB2ZXJ5CmRlZmluaXRlbHkgc3RpbGwgcmVx dWlyZWQuIEhvd2V2ZXIsIHRoZSBiYXNpYyBjb21wbGV0aW9uIHN0YXR1cyBzaWRlCmNvdWxkIGJl IHVwZGF0ZWQgdG8gdXNlIHRoZSByZWFkeSBtYWRlIGZlbmNlIGltcGxlbWVudGF0aW9uIGFuZCBn YWluCmFsbCB0aGUgYWR2YW50YWdlcyB0aGF0IHByb3ZpZGVzLgoKVGhpcyBwYXRjaCBtYWtlcyB0 aGUgZmlyc3Qgc3RlcCBvZiBpbnRlZ3JhdGluZyBhIHN0cnVjdCBmZW5jZSBpbnRvIHRoZQpyZXF1 ZXN0LiBJdCByZXBsYWNlcyB0aGUgZXhwbGljaXQgcmVmZXJlbmNlIGNvdW50IHdpdGggdGhhdCBv ZiB0aGUKZmVuY2UuIEl0IGFsc28gcmVwbGFjZXMgdGhlICdpcyBjb21wbGV0ZWQnIHRlc3Qgd2l0 aCB0aGUgZmVuY2UncwplcXVpdmFsZW50LiBDdXJyZW50bHksIHRoYXQgc2ltcGx5IGNoYWlucyBv biB0byB0aGUgb3JpZ2luYWwgcmVxdWVzdAppbXBsZW1lbnRhdGlvbi4gQSBmdXR1cmUgcGF0Y2gg d2lsbCBpbXByb3ZlIHRoaXMuCgp2MzogVXBkYXRlZCBhZnRlciByZXZpZXcgY29tbWVudHMgYnkg VHZydGtvIFVyc3VsaW4uIEFkZGVkIGZlbmNlCmNvbnRleHQvc2Vxbm8gcGFpciB0byB0aGUgZGVi dWdmcyByZXF1ZXN0IGluZm8uIFJlbmFtZWQgZmVuY2UgJ2RyaXZlcgpuYW1lJyB0byBqdXN0ICdp OTE1Jy4gUmVtb3ZlZCBCVUdfT05zLgoKdjU6IENoYW5nZWQgc2Vxbm8gZm9ybWF0IGluIGRlYnVn ZnMgdG8gJXggcmF0aGVyIHRoYW4gJXUgYXMgdGhhdCBpcwphcHBhcmVudGx5IHRoZSBwcmVmZXJy ZWQgYXBwZWFyYW5jZS4gTGluZSB3cmFwcGVkIHNvbWUgbG9uZyBsaW5lcyB0bwprZWVwIHRoZSBz dHlsZSBjaGVja2VyIGhhcHB5LgoKdjY6IFVwZGF0ZWQgdG8gbmV3ZXIgbmlndGhseSBhbmQgcmVz b2x2ZWQgY29uZmxpY3RzLiBUaGUgYmlnZ2VzdCBpc3N1ZQp3YXMgd2l0aCB0aGUgcmUtd29ya2Vk IGJ1c3kgc3BpbiBwcmVjdXJzb3IgdG8gd2FpdGluZyBvbiBhIHJlcXVlc3QuIEluCnBhcnRpY3Vs YXIsIHRoZSBhZGRpdGlvbiBvZiBhICdyZXF1ZXN0X3N0YXJ0ZWQnIGhlbHBlciBmdW5jdGlvbi4g VGhpcwpoYXMgbm8gY29ycmVzcG9uZGluZyBjb25jZXB0IHdpdGhpbiB0aGUgZmVuY2UgZnJhbWV3 b3JrLiBIb3dldmVyLCBpdAppcyBvbmx5IGV2ZXIgdXNlZCBpbiBvbmUgcGxhY2UgYW5kIHRoZSB3 aG9sZSBwb2ludCBvZiB0aGF0IHBsYWNlIGlzIHRvCmFsd2F5cyBkaXJlY3RseSByZWFkIHRoZSBz ZXFubyBmb3IgYWJzb2x1dGVseSBsb3dlc3QgbGF0ZW5jeSBwb3NzaWJsZS4KU28gdGhlIHNpbXBs ZSBzb2x1dGlvbiBpcyB0byBqdXN0IG1ha2UgdGhlIHNlcW5vIHRlc3QgZXhwbGljaXQgYXQgdGhh dApwb2ludCBub3cgcmF0aGVyIHRoYW4gbGF0ZXIgaW4gdGhlIHNlcmllcyAoaXQgd2FzIHByZXZp b3VzbHkgYmVpbmcKZG9uZSBhbnl3YXkgd2hlbiBmZW5jZXMgYmVjb21lIGludGVycnVwdCBkcml2 ZW4pLgoKdjc6IFJlYmFzZWQgdG8gbmV3ZXIgbmlnaHRseSAtIGxvdHMgb2YgcmluZyAtPiBlbmdp bmUgcmVuYW1pbmcgYW5kCmludGVyZmFjZSBjaGFuZ2UgdG8gZ2V0X3NlcW5vKCkuCgpGb3I6IFZJ Wi01MTkwClNpZ25lZC1vZmYtYnk6IEpvaG4gSGFycmlzb24gPEpvaG4uQy5IYXJyaXNvbkBJbnRl bC5jb20+CkNjOiBUdnJ0a28gVXJzdWxpbiA8dHZydGtvLnVyc3VsaW5AaW50ZWwuY29tPgpSZXZp ZXdlZC1ieTogSmVzc2UgQmFybmVzIDxqYmFybmVzQHZpcnR1b3VzZ2Vlay5vcmc+Ci0tLQogZHJp dmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kZWJ1Z2ZzLmMgICAgIHwgIDUgKystCiBkcml2ZXJzL2dw dS9kcm0vaTkxNS9pOTE1X2Rydi5oICAgICAgICAgfCA1MSArKysrKysrKysrLS0tLS0tLS0tLS0t LQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW0uYyAgICAgICAgIHwgNzIgKysrKysrKysr KysrKysrKysrKysrKysrKysrKystLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9scmMu YyAgICAgICAgfCAgMSArCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9yaW5nYnVmZmVyLmMg fCAgMSArCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9yaW5nYnVmZmVyLmggfCAgMyArKwog NiBmaWxlcyBjaGFuZ2VkLCA5NCBpbnNlcnRpb25zKCspLCAzOSBkZWxldGlvbnMoLSkKCmRpZmYg LS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2RlYnVnZnMuYyBiL2RyaXZlcnMvZ3B1 L2RybS9pOTE1L2k5MTVfZGVidWdmcy5jCmluZGV4IDJkMTFiNDkuLjY5MTc1MTUgMTAwNjQ0Ci0t LSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZGVidWdmcy5jCisrKyBiL2RyaXZlcnMvZ3B1 L2RybS9pOTE1L2k5MTVfZGVidWdmcy5jCkBAIC03MDcsMTEgKzcwNywxMiBAQCBzdGF0aWMgaW50 IGk5MTVfZ2VtX3JlcXVlc3RfaW5mbyhzdHJ1Y3Qgc2VxX2ZpbGUgKm0sIHZvaWQgKmRhdGEpCiAJ CQl0YXNrID0gTlVMTDsKIAkJCWlmIChyZXEtPnBpZCkKIAkJCQl0YXNrID0gcGlkX3Rhc2socmVx LT5waWQsIFBJRFRZUEVfUElEKTsKLQkJCXNlcV9wcmludGYobSwgIiAgICAleCBAICVkOiAlcyBb JWRdXG4iLAorCQkJc2VxX3ByaW50ZihtLCAiICAgICV4IEAgJWQ6ICVzIFslZF0sIGZlbmNlID0g JXg6JXhcbiIsCiAJCQkJICAgcmVxLT5zZXFubywKIAkJCQkgICAoaW50KSAoamlmZmllcyAtIHJl cS0+ZW1pdHRlZF9qaWZmaWVzKSwKIAkJCQkgICB0YXNrID8gdGFzay0+Y29tbSA6ICI8dW5rbm93 bj4iLAotCQkJCSAgIHRhc2sgPyB0YXNrLT5waWQgOiAtMSk7CisJCQkJICAgdGFzayA/IHRhc2st PnBpZCA6IC0xLAorCQkJCSAgIHJlcS0+ZmVuY2UuY29udGV4dCwgcmVxLT5mZW5jZS5zZXFubyk7 CiAJCQlyY3VfcmVhZF91bmxvY2soKTsKIAkJfQogCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9k cm0vaTkxNS9pOTE1X2Rydi5oIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuaAppbmRl eCBkMWU2ZTU4Li5lNWY0OWYzIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1 X2Rydi5oCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmgKQEAgLTU0LDYgKzU0 LDcgQEAKICNpbmNsdWRlIDxsaW51eC9wbV9xb3MuaD4KICNpbmNsdWRlICJpbnRlbF9ndWMuaCIK ICNpbmNsdWRlICJpbnRlbF9kcGxsX21nci5oIgorI2luY2x1ZGUgPGxpbnV4L2ZlbmNlLmg+CiAK IC8qIEdlbmVyYWwgY3VzdG9taXphdGlvbjoKICAqLwpAQCAtMjI0Miw3ICsyMjQzLDE3IEBAIHZv aWQgaTkxNV9nZW1fdHJhY2tfZmIoc3RydWN0IGRybV9pOTE1X2dlbV9vYmplY3QgKm9sZCwKICAq IGluaXRpYWwgcmVmZXJlbmNlIHRha2VuIHVzaW5nIGtyZWZfaW5pdAogICovCiBzdHJ1Y3QgZHJt X2k5MTVfZ2VtX3JlcXVlc3QgewotCXN0cnVjdCBrcmVmIHJlZjsKKwkvKioKKwkgKiBVbmRlcmx5 aW5nIG9iamVjdCBmb3IgaW1wbGVtZW50aW5nIHRoZSBzaWduYWwvd2FpdCBzdHVmZi4KKwkgKiBO QjogTmV2ZXIgY2FsbCBmZW5jZV9sYXRlcigpIG9yIHJldHVybiB0aGlzIGZlbmNlIG9iamVjdCB0 byB1c2VyCisJICogbGFuZCEgRHVlIHRvIGxhenkgYWxsb2NhdGlvbiwgc2NoZWR1bGVyIHJlLW9y ZGVyaW5nLCBwcmUtZW1wdGlvbiwKKwkgKiBldGMuLCB0aGVyZSBpcyBubyBndWFyYW50ZWUgYXQg YWxsIGFib3V0IHRoZSB2YWxpZGl0eSBvcgorCSAqIHNlcXVlbnRpYWxpdHkgb2YgdGhlIGZlbmNl J3Mgc2Vxbm8hIEl0IGlzIGFsc28gdW5zYWZlIHRvIGxldAorCSAqIGFueXRoaW5nIG91dHNpZGUg b2YgdGhlIGk5MTUgZHJpdmVyIGdldCBob2xkIG9mIHRoZSBmZW5jZSBvYmplY3QKKwkgKiBhcyB0 aGUgY2xlYW4gdXAgd2hlbiBkZWNyZW1lbnRpbmcgdGhlIHJlZmVyZW5jZSBjb3VudCByZXF1aXJl cworCSAqIGhvbGRpbmcgdGhlIGRyaXZlciBtdXRleCBsb2NrLgorCSAqLworCXN0cnVjdCBmZW5j ZSBmZW5jZTsKIAogCS8qKiBPbiBXaGljaCByaW5nIHRoaXMgcmVxdWVzdCB3YXMgZ2VuZXJhdGVk ICovCiAJc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmk5MTU7CkBAIC0yMzI4LDcgKzIzMzksMTMg QEAgc3RydWN0IGRybV9pOTE1X2dlbV9yZXF1ZXN0ICogX19tdXN0X2NoZWNrCiBpOTE1X2dlbV9y ZXF1ZXN0X2FsbG9jKHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKmVuZ2luZSwKIAkJICAgICAgIHN0 cnVjdCBpbnRlbF9jb250ZXh0ICpjdHgpOwogdm9pZCBpOTE1X2dlbV9yZXF1ZXN0X2NhbmNlbChz dHJ1Y3QgZHJtX2k5MTVfZ2VtX3JlcXVlc3QgKnJlcSk7Ci12b2lkIGk5MTVfZ2VtX3JlcXVlc3Rf ZnJlZShzdHJ1Y3Qga3JlZiAqcmVxX3JlZik7CisKK3N0YXRpYyBpbmxpbmUgYm9vbCBpOTE1X2dl bV9yZXF1ZXN0X2NvbXBsZXRlZChzdHJ1Y3QgZHJtX2k5MTVfZ2VtX3JlcXVlc3QgKnJlcSwKKwkJ CQkJICAgICAgYm9vbCBsYXp5X2NvaGVyZW5jeSkKK3sKKwlyZXR1cm4gZmVuY2VfaXNfc2lnbmFs ZWQoJnJlcS0+ZmVuY2UpOworfQorCiBpbnQgaTkxNV9nZW1fcmVxdWVzdF9hZGRfdG9fY2xpZW50 KHN0cnVjdCBkcm1faTkxNV9nZW1fcmVxdWVzdCAqcmVxLAogCQkJCSAgIHN0cnVjdCBkcm1fZmls ZSAqZmlsZSk7CiAKQEAgLTIzNDgsNyArMjM2NSw3IEBAIHN0YXRpYyBpbmxpbmUgc3RydWN0IGRy bV9pOTE1X2dlbV9yZXF1ZXN0ICoKIGk5MTVfZ2VtX3JlcXVlc3RfcmVmZXJlbmNlKHN0cnVjdCBk cm1faTkxNV9nZW1fcmVxdWVzdCAqcmVxKQogewogCWlmIChyZXEpCi0JCWtyZWZfZ2V0KCZyZXEt PnJlZik7CisJCWZlbmNlX2dldCgmcmVxLT5mZW5jZSk7CiAJcmV0dXJuIHJlcTsKIH0KIApAQCAt MjM1Niw3ICsyMzczLDcgQEAgc3RhdGljIGlubGluZSB2b2lkCiBpOTE1X2dlbV9yZXF1ZXN0X3Vu cmVmZXJlbmNlKHN0cnVjdCBkcm1faTkxNV9nZW1fcmVxdWVzdCAqcmVxKQogewogCVdBUk5fT04o IW11dGV4X2lzX2xvY2tlZCgmcmVxLT5lbmdpbmUtPmRldi0+c3RydWN0X211dGV4KSk7Ci0Ja3Jl Zl9wdXQoJnJlcS0+cmVmLCBpOTE1X2dlbV9yZXF1ZXN0X2ZyZWUpOworCWZlbmNlX3B1dCgmcmVx LT5mZW5jZSk7CiB9CiAKIHN0YXRpYyBpbmxpbmUgdm9pZApAQCAtMjM2OCw3ICsyMzg1LDcgQEAg aTkxNV9nZW1fcmVxdWVzdF91bnJlZmVyZW5jZV9fdW5sb2NrZWQoc3RydWN0IGRybV9pOTE1X2dl bV9yZXF1ZXN0ICpyZXEpCiAJCXJldHVybjsKIAogCWRldiA9IHJlcS0+ZW5naW5lLT5kZXY7Ci0J aWYgKGtyZWZfcHV0X211dGV4KCZyZXEtPnJlZiwgaTkxNV9nZW1fcmVxdWVzdF9mcmVlLCAmZGV2 LT5zdHJ1Y3RfbXV0ZXgpKQorCWlmIChrcmVmX3B1dF9tdXRleCgmcmVxLT5mZW5jZS5yZWZjb3Vu dCwgZmVuY2VfcmVsZWFzZSwgJmRldi0+c3RydWN0X211dGV4KSkKIAkJbXV0ZXhfdW5sb2NrKCZk ZXYtPnN0cnVjdF9tdXRleCk7CiB9CiAKQEAgLTIzODUsMTIgKzI0MDIsNiBAQCBzdGF0aWMgaW5s aW5lIHZvaWQgaTkxNV9nZW1fcmVxdWVzdF9hc3NpZ24oc3RydWN0IGRybV9pOTE1X2dlbV9yZXF1 ZXN0ICoqcGRzdCwKIH0KIAogLyoKLSAqIFhYWDogaTkxNV9nZW1fcmVxdWVzdF9jb21wbGV0ZWQg c2hvdWxkIGJlIGhlcmUgYnV0IGN1cnJlbnRseSBuZWVkcyB0aGUKLSAqIGRlZmluaXRpb24gb2Yg aTkxNV9zZXFub19wYXNzZWQoKSB3aGljaCBpcyBiZWxvdy4gSXQgd2lsbCBiZSBtb3ZlZCBpbgot ICogYSBsYXRlciBwYXRjaCB3aGVuIHRoZSBjYWxsIHRvIGk5MTVfc2Vxbm9fcGFzc2VkKCkgaXMg b2Jzb2xldGVkLi4uCi0gKi8KLQotLyoKICAqIEEgY29tbWFuZCB0aGF0IHJlcXVpcmVzIHNwZWNp YWwgaGFuZGxpbmcgYnkgdGhlIGNvbW1hbmQgcGFyc2VyLgogICovCiBzdHJ1Y3QgZHJtX2k5MTVf Y21kX2Rlc2NyaXB0b3IgewpAQCAtMzA1NSwyNCArMzA2Niw2IEBAIGk5MTVfc2Vxbm9fcGFzc2Vk KHVpbnQzMl90IHNlcTEsIHVpbnQzMl90IHNlcTIpCiAJcmV0dXJuIChpbnQzMl90KShzZXExIC0g c2VxMikgPj0gMDsKIH0KIAotc3RhdGljIGlubGluZSBib29sIGk5MTVfZ2VtX3JlcXVlc3Rfc3Rh cnRlZChzdHJ1Y3QgZHJtX2k5MTVfZ2VtX3JlcXVlc3QgKnJlcSwKLQkJCQkJICAgYm9vbCBsYXp5 X2NvaGVyZW5jeSkKLXsKLQlpZiAoIWxhenlfY29oZXJlbmN5ICYmIHJlcS0+ZW5naW5lLT5pcnFf c2Vxbm9fYmFycmllcikKLQkJcmVxLT5lbmdpbmUtPmlycV9zZXFub19iYXJyaWVyKHJlcS0+ZW5n aW5lKTsKLQlyZXR1cm4gaTkxNV9zZXFub19wYXNzZWQocmVxLT5lbmdpbmUtPmdldF9zZXFubyhy ZXEtPmVuZ2luZSksCi0JCQkJIHJlcS0+cHJldmlvdXNfc2Vxbm8pOwotfQotCi1zdGF0aWMgaW5s aW5lIGJvb2wgaTkxNV9nZW1fcmVxdWVzdF9jb21wbGV0ZWQoc3RydWN0IGRybV9pOTE1X2dlbV9y ZXF1ZXN0ICpyZXEsCi0JCQkJCSAgICAgIGJvb2wgbGF6eV9jb2hlcmVuY3kpCi17Ci0JaWYgKCFs YXp5X2NvaGVyZW5jeSAmJiByZXEtPmVuZ2luZS0+aXJxX3NlcW5vX2JhcnJpZXIpCi0JCXJlcS0+ ZW5naW5lLT5pcnFfc2Vxbm9fYmFycmllcihyZXEtPmVuZ2luZSk7Ci0JcmV0dXJuIGk5MTVfc2Vx bm9fcGFzc2VkKHJlcS0+ZW5naW5lLT5nZXRfc2Vxbm8ocmVxLT5lbmdpbmUpLAotCQkJCSByZXEt PnNlcW5vKTsKLX0KLQogaW50IF9fbXVzdF9jaGVjayBpOTE1X2dlbV9nZXRfc2Vxbm8oc3RydWN0 IGRybV9kZXZpY2UgKmRldiwgdTMyICpzZXFubyk7CiBpbnQgX19tdXN0X2NoZWNrIGk5MTVfZ2Vt X3NldF9zZXFubyhzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LCB1MzIgc2Vxbm8pOwogCmRpZmYgLS1n aXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbS5jIGIvZHJpdmVycy9ncHUvZHJtL2k5 MTUvaTkxNV9nZW0uYwppbmRleCBlYmVmMDNiLi4xYWRkMjlhOSAxMDA2NDQKLS0tIGEvZHJpdmVy cy9ncHUvZHJtL2k5MTUvaTkxNV9nZW0uYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1 X2dlbS5jCkBAIC0xMTgzLDYgKzExODMsNyBAQCBzdGF0aWMgaW50IF9faTkxNV9zcGluX3JlcXVl c3Qoc3RydWN0IGRybV9pOTE1X2dlbV9yZXF1ZXN0ICpyZXEsIGludCBzdGF0ZSkKIHsKIAl1bnNp Z25lZCBsb25nIHRpbWVvdXQ7CiAJdW5zaWduZWQgY3B1OworCXVpbnQzMl90IHNlcW5vOwogCiAJ LyogV2hlbiB3YWl0aW5nIGZvciBoaWdoIGZyZXF1ZW5jeSByZXF1ZXN0cywgZS5nLiBkdXJpbmcg c3luY2hyb25vdXMKIAkgKiByZW5kZXJpbmcgc3BsaXQgYmV0d2VlbiB0aGUgQ1BVIGFuZCBHUFUs IHRoZSBmaW5pdGUgYW1vdW50IG9mIHRpbWUKQEAgLTExOTgsMTIgKzExOTksMTQgQEAgc3RhdGlj IGludCBfX2k5MTVfc3Bpbl9yZXF1ZXN0KHN0cnVjdCBkcm1faTkxNV9nZW1fcmVxdWVzdCAqcmVx LCBpbnQgc3RhdGUpCiAJCXJldHVybiAtRUJVU1k7CiAKIAkvKiBPbmx5IHNwaW4gaWYgd2Uga25v dyB0aGUgR1BVIGlzIHByb2Nlc3NpbmcgdGhpcyByZXF1ZXN0ICovCi0JaWYgKCFpOTE1X2dlbV9y ZXF1ZXN0X3N0YXJ0ZWQocmVxLCB0cnVlKSkKKwlzZXFubyA9IHJlcS0+ZW5naW5lLT5nZXRfc2Vx bm8ocmVxLT5lbmdpbmUpOworCWlmICghaTkxNV9zZXFub19wYXNzZWQoc2Vxbm8sIHJlcS0+cHJl dmlvdXNfc2Vxbm8pKQogCQlyZXR1cm4gLUVBR0FJTjsKIAogCXRpbWVvdXQgPSBsb2NhbF9jbG9j a191cygmY3B1KSArIDU7CiAJd2hpbGUgKCFuZWVkX3Jlc2NoZWQoKSkgewotCQlpZiAoaTkxNV9n ZW1fcmVxdWVzdF9jb21wbGV0ZWQocmVxLCB0cnVlKSkKKwkJc2Vxbm8gPSByZXEtPmVuZ2luZS0+ Z2V0X3NlcW5vKHJlcS0+ZW5naW5lKTsKKwkJaWYgKGk5MTVfc2Vxbm9fcGFzc2VkKHNlcW5vLCBy ZXEtPnNlcW5vKSkKIAkJCXJldHVybiAwOwogCiAJCWlmIChzaWduYWxfcGVuZGluZ19zdGF0ZShz dGF0ZSwgY3VycmVudCkpCkBAIC0xMjE1LDcgKzEyMTgsMTAgQEAgc3RhdGljIGludCBfX2k5MTVf c3Bpbl9yZXF1ZXN0KHN0cnVjdCBkcm1faTkxNV9nZW1fcmVxdWVzdCAqcmVxLCBpbnQgc3RhdGUp CiAJCWNwdV9yZWxheF9sb3dsYXRlbmN5KCk7CiAJfQogCi0JaWYgKGk5MTVfZ2VtX3JlcXVlc3Rf Y29tcGxldGVkKHJlcSwgZmFsc2UpKQorCWlmIChyZXEtPmVuZ2luZS0+aXJxX3NlcW5vX2JhcnJp ZXIpCisJCXJlcS0+ZW5naW5lLT5pcnFfc2Vxbm9fYmFycmllcihyZXEtPmVuZ2luZSk7CisJc2Vx bm8gPSByZXEtPmVuZ2luZS0+Z2V0X3NlcW5vKHJlcS0+ZW5naW5lKTsKKwlpZiAoaTkxNV9zZXFu b19wYXNzZWQoc2Vxbm8sIHJlcS0+c2Vxbm8pKQogCQlyZXR1cm4gMDsKIAogCXJldHVybiAtRUFH QUlOOwpAQCAtMjcyMSwxMiArMjcyNywxNCBAQCBzdGF0aWMgdm9pZCBpOTE1X3NldF9yZXNldF9z dGF0dXMoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2LAogCX0KIH0KIAotdm9pZCBp OTE1X2dlbV9yZXF1ZXN0X2ZyZWUoc3RydWN0IGtyZWYgKnJlcV9yZWYpCitzdGF0aWMgdm9pZCBp OTE1X2dlbV9yZXF1ZXN0X2ZyZWUoc3RydWN0IGZlbmNlICpyZXFfZmVuY2UpCiB7Ci0Jc3RydWN0 IGRybV9pOTE1X2dlbV9yZXF1ZXN0ICpyZXEgPSBjb250YWluZXJfb2YocmVxX3JlZiwKLQkJCQkJ CSB0eXBlb2YoKnJlcSksIHJlZik7CisJc3RydWN0IGRybV9pOTE1X2dlbV9yZXF1ZXN0ICpyZXEg PSBjb250YWluZXJfb2YocmVxX2ZlbmNlLAorCQkJCQkJIHR5cGVvZigqcmVxKSwgZmVuY2UpOwog CXN0cnVjdCBpbnRlbF9jb250ZXh0ICpjdHggPSByZXEtPmN0eDsKIAorCVdBUk5fT04oIW11dGV4 X2lzX2xvY2tlZCgmcmVxLT5lbmdpbmUtPmRldi0+c3RydWN0X211dGV4KSk7CisKIAlpZiAocmVx LT5maWxlX3ByaXYpCiAJCWk5MTVfZ2VtX3JlcXVlc3RfcmVtb3ZlX2Zyb21fY2xpZW50KHJlcSk7 CiAKQEAgLTI3NDAsNiArMjc0OCw0OCBAQCB2b2lkIGk5MTVfZ2VtX3JlcXVlc3RfZnJlZShzdHJ1 Y3Qga3JlZiAqcmVxX3JlZikKIAlrbWVtX2NhY2hlX2ZyZWUocmVxLT5pOTE1LT5yZXF1ZXN0cywg cmVxKTsKIH0KIAorc3RhdGljIGJvb2wgaTkxNV9nZW1fcmVxdWVzdF9lbmFibGVfc2lnbmFsaW5n KHN0cnVjdCBmZW5jZSAqcmVxX2ZlbmNlKQoreworCS8qIEludGVycnVwdCBkcml2ZW4gZmVuY2Vz IGFyZSBub3QgaW1wbGVtZW50ZWQgeWV0LiovCisJV0FSTih0cnVlLCAiVGhpcyBzaG91bGQgbm90 IGJlIGNhbGxlZCEiKTsKKwlyZXR1cm4gdHJ1ZTsKK30KKworc3RhdGljIGJvb2wgaTkxNV9nZW1f cmVxdWVzdF9pc19jb21wbGV0ZWQoc3RydWN0IGZlbmNlICpyZXFfZmVuY2UpCit7CisJc3RydWN0 IGRybV9pOTE1X2dlbV9yZXF1ZXN0ICpyZXEgPSBjb250YWluZXJfb2YocmVxX2ZlbmNlLAorCQkJ CQkJIHR5cGVvZigqcmVxKSwgZmVuY2UpOworCXUzMiBzZXFubzsKKworLyoJaWYgKCFsYXp5X2Nv aGVyZW5jeSAmJiByZXEtPmVuZ2luZS0+aXJxX3NlcW5vX2JhcnJpZXIpCisJCXJlcS0+ZW5naW5l LT5pcnFfc2Vxbm9fYmFycmllcihyZXEtPmVuZ2luZSk7Ki8KKworCXNlcW5vID0gcmVxLT5lbmdp bmUtPmdldF9zZXFubyhyZXEtPmVuZ2luZSk7CisKKwlyZXR1cm4gaTkxNV9zZXFub19wYXNzZWQo c2Vxbm8sIHJlcS0+c2Vxbm8pOworfQorCitzdGF0aWMgY29uc3QgY2hhciAqaTkxNV9nZW1fcmVx dWVzdF9nZXRfZHJpdmVyX25hbWUoc3RydWN0IGZlbmNlICpyZXFfZmVuY2UpCit7CisJcmV0dXJu ICJpOTE1IjsKK30KKworc3RhdGljIGNvbnN0IGNoYXIgKmk5MTVfZ2VtX3JlcXVlc3RfZ2V0X3Rp bWVsaW5lX25hbWUoc3RydWN0IGZlbmNlICpyZXFfZmVuY2UpCit7CisJc3RydWN0IGRybV9pOTE1 X2dlbV9yZXF1ZXN0ICpyZXEgPSBjb250YWluZXJfb2YocmVxX2ZlbmNlLAorCQkJCQkJIHR5cGVv ZigqcmVxKSwgZmVuY2UpOworCXJldHVybiByZXEtPmVuZ2luZS0+bmFtZTsKK30KKworc3RhdGlj IGNvbnN0IHN0cnVjdCBmZW5jZV9vcHMgaTkxNV9nZW1fcmVxdWVzdF9mb3BzID0geworCS5lbmFi bGVfc2lnbmFsaW5nCT0gaTkxNV9nZW1fcmVxdWVzdF9lbmFibGVfc2lnbmFsaW5nLAorCS5zaWdu YWxlZAkJPSBpOTE1X2dlbV9yZXF1ZXN0X2lzX2NvbXBsZXRlZCwKKwkud2FpdAkJCT0gZmVuY2Vf ZGVmYXVsdF93YWl0LAorCS5yZWxlYXNlCQk9IGk5MTVfZ2VtX3JlcXVlc3RfZnJlZSwKKwkuZ2V0 X2RyaXZlcl9uYW1lCT0gaTkxNV9nZW1fcmVxdWVzdF9nZXRfZHJpdmVyX25hbWUsCisJLmdldF90 aW1lbGluZV9uYW1lCT0gaTkxNV9nZW1fcmVxdWVzdF9nZXRfdGltZWxpbmVfbmFtZSwKK307CisK IHN0YXRpYyBpbmxpbmUgaW50CiBfX2k5MTVfZ2VtX3JlcXVlc3RfYWxsb2Moc3RydWN0IGludGVs X2VuZ2luZV9jcyAqZW5naW5lLAogCQkJIHN0cnVjdCBpbnRlbF9jb250ZXh0ICpjdHgsCkBAIC0y NzYyLDcgKzI4MTIsNiBAQCBfX2k5MTVfZ2VtX3JlcXVlc3RfYWxsb2Moc3RydWN0IGludGVsX2Vu Z2luZV9jcyAqZW5naW5lLAogCWlmIChyZXQpCiAJCWdvdG8gZXJyOwogCi0Ja3JlZl9pbml0KCZy ZXEtPnJlZik7CiAJcmVxLT5pOTE1ID0gZGV2X3ByaXY7CiAJcmVxLT5lbmdpbmUgPSBlbmdpbmU7 CiAJcmVxLT5jdHggID0gY3R4OwpAQCAtMjc3Nyw2ICsyODI2LDkgQEAgX19pOTE1X2dlbV9yZXF1 ZXN0X2FsbG9jKHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKmVuZ2luZSwKIAkJZ290byBlcnI7CiAJ fQogCisJZmVuY2VfaW5pdCgmcmVxLT5mZW5jZSwgJmk5MTVfZ2VtX3JlcXVlc3RfZm9wcywgJmVu Z2luZS0+ZmVuY2VfbG9jaywKKwkJICAgZW5naW5lLT5mZW5jZV9jb250ZXh0LCByZXEtPnNlcW5v KTsKKwogCS8qCiAJICogUmVzZXJ2ZSBzcGFjZSBpbiB0aGUgcmluZyBidWZmZXIgZm9yIGFsbCB0 aGUgY29tbWFuZHMgcmVxdWlyZWQgdG8KIAkgKiBldmVudHVhbGx5IGVtaXQgdGhpcyByZXF1ZXN0 LiBUaGlzIGlzIHRvIGd1YXJhbnRlZSB0aGF0IHRoZQpAQCAtNDg4Nyw3ICs0OTM5LDcgQEAgaTkx NV9nZW1faW5pdF9odyhzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KQogewogCXN0cnVjdCBkcm1faTkx NV9wcml2YXRlICpkZXZfcHJpdiA9IGRldi0+ZGV2X3ByaXZhdGU7CiAJc3RydWN0IGludGVsX2Vu Z2luZV9jcyAqZW5naW5lOwotCWludCByZXQsIGo7CisJaW50IHJldCwgaiwgZmVuY2VfYmFzZTsK IAogCWlmIChJTlRFTF9JTkZPKGRldiktPmdlbiA8IDYgJiYgIWludGVsX2VuYWJsZV9ndHQoKSkK IAkJcmV0dXJuIC1FSU87CkBAIC00OTU3LDEwICs1MDA5LDE0IEBAIGk5MTVfZ2VtX2luaXRfaHco c3RydWN0IGRybV9kZXZpY2UgKmRldikKIAlpZiAocmV0KQogCQlnb3RvIG91dDsKIAorCWZlbmNl X2Jhc2UgPSBmZW5jZV9jb250ZXh0X2FsbG9jKEk5MTVfTlVNX0VOR0lORVMpOworCiAJLyogTm93 IGl0IGlzIHNhZmUgdG8gZ28gYmFjayByb3VuZCBhbmQgZG8gZXZlcnl0aGluZyBlbHNlOiAqLwog CWZvcl9lYWNoX2VuZ2luZShlbmdpbmUsIGRldl9wcml2KSB7CiAJCXN0cnVjdCBkcm1faTkxNV9n ZW1fcmVxdWVzdCAqcmVxOwogCisJCWVuZ2luZS0+ZmVuY2VfY29udGV4dCA9IGZlbmNlX2Jhc2Ug KyBlbmdpbmUtPmlkOworCiAJCXJlcSA9IGk5MTVfZ2VtX3JlcXVlc3RfYWxsb2MoZW5naW5lLCBO VUxMKTsKIAkJaWYgKElTX0VSUihyZXEpKSB7CiAJCQlyZXQgPSBQVFJfRVJSKHJlcSk7CmRpZmYg LS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9scmMuYyBiL2RyaXZlcnMvZ3B1L2Ry bS9pOTE1L2ludGVsX2xyYy5jCmluZGV4IDVlMDhlYTUuLjI2OGUwMjQgMTAwNjQ0Ci0tLSBhL2Ry aXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2xyYy5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1 L2ludGVsX2xyYy5jCkBAIC0yMTMzLDYgKzIxMzMsNyBAQCBsb2dpY2FsX3JpbmdfaW5pdChzdHJ1 Y3QgZHJtX2RldmljZSAqZGV2LCBzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICplbmdpbmUpCiAJZW5n aW5lLT5kZXYgPSBkZXY7CiAJSU5JVF9MSVNUX0hFQUQoJmVuZ2luZS0+YWN0aXZlX2xpc3QpOwog CUlOSVRfTElTVF9IRUFEKCZlbmdpbmUtPnJlcXVlc3RfbGlzdCk7CisJc3Bpbl9sb2NrX2luaXQo JmVuZ2luZS0+ZmVuY2VfbG9jayk7CiAJaTkxNV9nZW1fYmF0Y2hfcG9vbF9pbml0KGRldiwgJmVu Z2luZS0+YmF0Y2hfcG9vbCk7CiAJaW5pdF93YWl0cXVldWVfaGVhZCgmZW5naW5lLT5pcnFfcXVl dWUpOwogCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9yaW5nYnVmZmVy LmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9yaW5nYnVmZmVyLmMKaW5kZXggMTllYmU3 Ny4uYTUyYjgxYyAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcmluZ2J1 ZmZlci5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3JpbmdidWZmZXIuYwpAQCAt MjIyOSw2ICsyMjI5LDcgQEAgc3RhdGljIGludCBpbnRlbF9pbml0X3JpbmdfYnVmZmVyKHN0cnVj dCBkcm1fZGV2aWNlICpkZXYsCiAJSU5JVF9MSVNUX0hFQUQoJmVuZ2luZS0+cmVxdWVzdF9saXN0 KTsKIAlJTklUX0xJU1RfSEVBRCgmZW5naW5lLT5leGVjbGlzdF9xdWV1ZSk7CiAJSU5JVF9MSVNU X0hFQUQoJmVuZ2luZS0+YnVmZmVycyk7CisJc3Bpbl9sb2NrX2luaXQoJmVuZ2luZS0+ZmVuY2Vf bG9jayk7CiAJaTkxNV9nZW1fYmF0Y2hfcG9vbF9pbml0KGRldiwgJmVuZ2luZS0+YmF0Y2hfcG9v bCk7CiAJbWVtc2V0KGVuZ2luZS0+c2VtYXBob3JlLnN5bmNfc2Vxbm8sIDAsCiAJICAgICAgIHNp emVvZihlbmdpbmUtPnNlbWFwaG9yZS5zeW5jX3NlcW5vKSk7CmRpZmYgLS1naXQgYS9kcml2ZXJz L2dwdS9kcm0vaTkxNS9pbnRlbF9yaW5nYnVmZmVyLmggYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9p bnRlbF9yaW5nYnVmZmVyLmgKaW5kZXggMmFkZTE5NC4uMmNkOWQyYyAxMDA2NDQKLS0tIGEvZHJp dmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcmluZ2J1ZmZlci5oCisrKyBiL2RyaXZlcnMvZ3B1L2Ry bS9pOTE1L2ludGVsX3JpbmdidWZmZXIuaApAQCAtMzQ4LDYgKzM0OCw5IEBAIHN0cnVjdCAgaW50 ZWxfZW5naW5lX2NzIHsKIAkgKiB0byBlbmNvZGUgdGhlIGNvbW1hbmQgbGVuZ3RoIGluIHRoZSBo ZWFkZXIpLgogCSAqLwogCXUzMiAoKmdldF9jbWRfbGVuZ3RoX21hc2spKHUzMiBjbWRfaGVhZGVy KTsKKworCXVuc2lnbmVkIGZlbmNlX2NvbnRleHQ7CisJc3BpbmxvY2tfdCBmZW5jZV9sb2NrOwog fTsKIAogc3RhdGljIGlubGluZSBib29sCi0tIAoxLjkuMQoKX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1n ZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21h aWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4Cg==