From: ville.syrjala@linux.intel.com Subject: [PATCH v8 3/9] drm/i915: Make sprite updates atomic Date: Tue, 29 Apr 2014 13:35:46 +0300 Message-ID: <1398767752-619-4-git-send-email-ville.syrjala@linux.intel.com> References: <1398767752-619-1-git-send-email-ville.syrjala@linux.intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by gabe.freedesktop.org (Postfix) with ESMTP id C0B8C8A402 for ; Tue, 29 Apr 2014 03:36:39 -0700 (PDT) In-Reply-To: <1398767752-619-1-git-send-email-ville.syrjala@linux.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 RnJvbTogVmlsbGUgU3lyasOkbMOkIDx2aWxsZS5zeXJqYWxhQGxpbnV4LmludGVsLmNvbT4KCkFk ZCBhIG1lY2hhbmlzbSBieSB3aGljaCB3ZSBjYW4gZXZhZGUgdGhlIGxlYWRpbmcgZWRnZSBvZiB2 YmxhbmsuIFRoaXMKZ3VhcmFudGVlcyB0aGF0IG5vIHR3byBzcHJpdGUgcmVnaXN0ZXIgd3JpdGVz IHdpbGwgc3RyYWRkbGUgb24gZWl0aGVyCnNpZGUgb2YgdGhlIHZibGFuayBzdGFydCwgYW5kIHRo YXQgbWVhbnMgYWxsIHRoZSB3cml0ZXMgd2lsbCBiZSBsYXRjaGVkCnRvZ2V0aGVyIGluIG9uZSBh dG9taWMgb3BlcmF0aW9uLgoKV2UgZG8gdGhlIHZibGFuayBldmFkZSBieSBjaGVja2luZyB0aGUg c2NhbmxpbmUgY291bnRlciwgYW5kIGlmIGl0J3MgdG9vCmNsb3NlIHRvIHRoZSBzdGFydCBvZiB2 YmxhbmsgKHRvbyBjbG9zZSBoYXMgYmVlbiBoYXJkY29kZWQgdG8gMTAwdXNlYwpmb3Igbm93KSwg d2Ugd2lsbCB3YWl0IGZvciB0aGUgdmJsYW5rIHN0YXJ0IHRvIHBhc3MuIEluIG9yZGVyIHRvCmVs aW1pbmF0ZSByYW5kb20gZGVsYXllcyBmcm9tIHRoZSByZXN0IG9mIHRoZSBzeXN0ZW0sIHdlIG9w ZXJhdGUgd2l0aAppbnRlcnJ1cHRzIGRpc2FibGVkLCBleGNlcHQgd2hlbiB3YWl0aW5nIGZvciB0 aGUgdmJsYW5rIG9idmlvdXNseS4KCk5vdGUgdGhhdCB3ZSBub3cgZ28gZGlnZ2luZyB0aHJvdWdo IHBpcGVfdG9fY3J0Y19tYXBwaW5nW10gaW4gdGhlCnZibGFuayBpbnRlcnJ1cHQgaGFuZGxlciwg d2hpY2ggaXMgYSBiaXQgZGFuZ2Vyb3VzIHNpbmNlIHdlIHNldCB1cAppbnRlcnJ1cHRzIGJlZm9y ZSB0aGUgY3J0Y3MuIEhvd2V2ZXIgaW4gdGhpcyBjYXNlIHNpbmNlIGl0J3MgdGhlIHZibGFuawpp bnRlcnJ1cHQsIHdlIGRvbid0IGFjdHVhbGx5IHVubWFzayBpdCB1bnRpbCBzb21lIHBpZWNlIG9m IGNvZGUKcmVxdWVzdHMgaXQuCgp2MjogcHJlZW1wdF9jaGVja19yZXNjaGVkKCkgY2FsbHMgYWZ0 ZXIgbG9jYWxfaXJxX2VuYWJsZSgpIChKZXNzZSkKICAgIEhvb2sgdXAgdGhlIHZibGFuayBpcnEg c3R1ZmYgb24gQkRXIGFzIHdlbGwKdjM6IFBhc3MgaW50ZWxfY3J0YyBpbnN0ZWFkIG9mIGRybV9j cnRjIChEYW5pZWwpCiAgICBXYXJuIGlmIGNydGMubXV0ZXggaXNuJ3QgbG9ja2VkIChEYW5pZWwp CiAgICBBZGQgYW4gZXhwbGljaXQgY29tcGlsZXIgYmFycmllciBhbmQgZG9jdW1lbnQgdGhlIGJh cnJpZXJzIChEYW5pZWwpCiAgICBOb3RlIHRoZSBpcnEgdnMuIG1vZGVzZXQgc2V0dXAgbWFkbmVz cyBpbiB0aGUgY29tbWl0IG1lc3NhZ2UgKERhbmllbCkKdjQ6IFVzZSBwcmVwYXJlX3RvX3dhaXQo KSAmIGNvLiBkaXJlY3RseSBhbmQgZWxpbWluYXRlIHZibF9yZWNlaXZlZAp2NTogUmVmYWN0b3Ig aW50ZWxfcGlwZV9oYW5kbGVfdmJsYW5rKCkgdnMuIGRybV9oYW5kbGVfdmJsYW5rKCkgKENocmlz KQogICAgQ2hlY2sgZm9yIG1pbi9tYXggc2NhbmxpbmUgPD0gMCAoQ2hyaXMpCiAgICBEb24ndCBj YWxsIGludGVsX3BpcGVfdXBkYXRlX2VuZCgpIGlmIHN0YXJ0IGZhaWxlZCB0b3RhbGx5IChDaHJp cykKICAgIENoZWNrIHRoYXQgdGhlIHZibGFuayBjb3VudGVycyBtYXRjaCBvbiBib3RoIHNpZGVz IG9mIHRoZSBjcml0aWNhbAogICAgc2VjdGlvbiAoQ2hyaXMpCnY2OiBGaXggYXRvbWljIHVwZGF0 ZSBmb3IgaW50ZXJsYWNlZCBtb2Rlcwp2NzogUmVvcmRlciBjb2RlIGZvciBiZXR0ZXIgcmVhZGFi aWxpdHkgKENocmlzKQp2ODogRHJvcCBwcmVlbXB0X2NoZWNrX3Jlc2NoZWQoKS4gSXQncyBub3Qg YXZhaWxhYmxlIHRvIG1vZHVsZXMKICAgIGFueW1vcmUgYW5kIGlzbid0IGV2ZW4gbmVlZGVkIHVu bGVzcyB3ZSBvdXJzZWx2ZXMgY2F1c2UKICAgIGEgd2FrZXVwIG5lZWRpbmcgcmVzY2hlZHVsZSB3 aGlsZSBpbnRlcnJ1cHRzIGFyZSBvZmYKClJldmlld2VkLWJ5OiBKZXNzZSBCYXJuZXMgPGpiYXJu ZXNAdmlydHVvdXNnZWVrLm9yZz4KUmV2aWV3ZWQtYnk6IFNvdXJhYiBHdXB0YSA8c291cmFiZ3Vw dGFAZ21haWwuY29tPgpSZXZpZXdlZC1ieTogQWthc2ggR29lbCA8YWthc2guZ29lbHNAZ21haWwu Y29tPgpTaWduZWQtb2ZmLWJ5OiBWaWxsZSBTeXJqw6Rsw6QgPHZpbGxlLnN5cmphbGFAbGludXgu aW50ZWwuY29tPgotLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfaXJxLmMgICAgICB8ICAy NSArKysrKy0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMgfCAgIDIgKwog ZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHJ2LmggICAgIHwgICAyICsKIGRyaXZlcnMvZ3B1 L2RybS9pOTE1L2ludGVsX3Nwcml0ZS5jICB8IDEzMSArKysrKysrKysrKysrKysrKysrKysrKysr KysrKysrKysrKwogNCBmaWxlcyBjaGFuZ2VkLCAxNTQgaW5zZXJ0aW9ucygrKSwgNiBkZWxldGlv bnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2lycS5jIGIvZHJp dmVycy9ncHUvZHJtL2k5MTUvaTkxNV9pcnEuYwppbmRleCBlZDMwYTVlLi43ZTBkNTc3IDEwMDY0 NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2lycS5jCisrKyBiL2RyaXZlcnMvZ3B1 L2RybS9pOTE1L2k5MTVfaXJxLmMKQEAgLTE1NTYsNiArMTU1NiwxOSBAQCBzdGF0aWMgdm9pZCBn ZW42X3Jwc19pcnFfaGFuZGxlcihzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYsIHUz MiBwbV9paXIpCiAJfQogfQogCitzdGF0aWMgYm9vbCBpbnRlbF9waXBlX2hhbmRsZV92Ymxhbmso c3RydWN0IGRybV9kZXZpY2UgKmRldiwgZW51bSBwaXBlIHBpcGUpCit7CisJc3RydWN0IGludGVs X2NydGMgKmNydGM7CisKKwlpZiAoIWRybV9oYW5kbGVfdmJsYW5rKGRldiwgcGlwZSkpCisJCXJl dHVybiBmYWxzZTsKKworCWNydGMgPSB0b19pbnRlbF9jcnRjKGludGVsX2dldF9jcnRjX2Zvcl9w aXBlKGRldiwgcGlwZSkpOworCXdha2VfdXAoJmNydGMtPnZibF93YWl0KTsKKworCXJldHVybiB0 cnVlOworfQorCiBzdGF0aWMgdm9pZCB2YWxsZXl2aWV3X3BpcGVzdGF0X2lycV9oYW5kbGVyKHN0 cnVjdCBkcm1fZGV2aWNlICpkZXYsIHUzMiBpaXIpCiB7CiAJc3RydWN0IGRybV9pOTE1X3ByaXZh dGUgKmRldl9wcml2ID0gZGV2LT5kZXZfcHJpdmF0ZTsKQEAgLTE2MDcsNyArMTYyMCw3IEBAIHN0 YXRpYyB2b2lkIHZhbGxleXZpZXdfcGlwZXN0YXRfaXJxX2hhbmRsZXIoc3RydWN0IGRybV9kZXZp Y2UgKmRldiwgdTMyIGlpcikKIAogCWZvcl9lYWNoX3BpcGUocGlwZSkgewogCQlpZiAocGlwZV9z dGF0c1twaXBlXSAmIFBJUEVfU1RBUlRfVkJMQU5LX0lOVEVSUlVQVF9TVEFUVVMpCi0JCQlkcm1f aGFuZGxlX3ZibGFuayhkZXYsIHBpcGUpOworCQkJaW50ZWxfcGlwZV9oYW5kbGVfdmJsYW5rKGRl diwgcGlwZSk7CiAKIAkJaWYgKHBpcGVfc3RhdHNbcGlwZV0gJiBQTEFORV9GTElQX0RPTkVfSU5U X1NUQVRVU19WTFYpIHsKIAkJCWludGVsX3ByZXBhcmVfcGFnZV9mbGlwKGRldiwgcGlwZSk7CkBA IC0xODUwLDcgKzE4NjMsNyBAQCBzdGF0aWMgdm9pZCBpbGtfZGlzcGxheV9pcnFfaGFuZGxlcihz dHJ1Y3QgZHJtX2RldmljZSAqZGV2LCB1MzIgZGVfaWlyKQogCiAJZm9yX2VhY2hfcGlwZShwaXBl KSB7CiAJCWlmIChkZV9paXIgJiBERV9QSVBFX1ZCTEFOSyhwaXBlKSkKLQkJCWRybV9oYW5kbGVf dmJsYW5rKGRldiwgcGlwZSk7CisJCQlpbnRlbF9waXBlX2hhbmRsZV92YmxhbmsoZGV2LCBwaXBl KTsKIAogCQlpZiAoZGVfaWlyICYgREVfUElQRV9GSUZPX1VOREVSUlVOKHBpcGUpKQogCQkJaWYg KGludGVsX3NldF9jcHVfZmlmb191bmRlcnJ1bl9yZXBvcnRpbmcoZGV2LCBwaXBlLCBmYWxzZSkp CkBAIC0xOTAwLDcgKzE5MTMsNyBAQCBzdGF0aWMgdm9pZCBpdmJfZGlzcGxheV9pcnFfaGFuZGxl cihzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LCB1MzIgZGVfaWlyKQogCiAJZm9yX2VhY2hfcGlwZShw aXBlKSB7CiAJCWlmIChkZV9paXIgJiAoREVfUElQRV9WQkxBTktfSVZCKHBpcGUpKSkKLQkJCWRy bV9oYW5kbGVfdmJsYW5rKGRldiwgcGlwZSk7CisJCQlpbnRlbF9waXBlX2hhbmRsZV92Ymxhbmso ZGV2LCBwaXBlKTsKIAogCQkvKiBwbGFuZS9waXBlcyBtYXAgMToxIG9uIGlsaysgKi8KIAkJaWYg KGRlX2lpciAmIERFX1BMQU5FX0ZMSVBfRE9ORV9JVkIocGlwZSkpIHsKQEAgLTIwNDMsNyArMjA1 Niw3IEBAIHN0YXRpYyBpcnFyZXR1cm5fdCBnZW44X2lycV9oYW5kbGVyKGludCBpcnEsIHZvaWQg KmFyZykKIAogCQlwaXBlX2lpciA9IEk5MTVfUkVBRChHRU44X0RFX1BJUEVfSUlSKHBpcGUpKTsK IAkJaWYgKHBpcGVfaWlyICYgR0VOOF9QSVBFX1ZCTEFOSykKLQkJCWRybV9oYW5kbGVfdmJsYW5r KGRldiwgcGlwZSk7CisJCQlpbnRlbF9waXBlX2hhbmRsZV92YmxhbmsoZGV2LCBwaXBlKTsKIAog CQlpZiAocGlwZV9paXIgJiBHRU44X1BJUEVfUFJJTUFSWV9GTElQX0RPTkUpIHsKIAkJCWludGVs X3ByZXBhcmVfcGFnZV9mbGlwKGRldiwgcGlwZSk7CkBAIC0zMzkxLDcgKzM0MDQsNyBAQCBzdGF0 aWMgYm9vbCBpOHh4X2hhbmRsZV92Ymxhbmsoc3RydWN0IGRybV9kZXZpY2UgKmRldiwKIAlzdHJ1 Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSBkZXYtPmRldl9wcml2YXRlOwogCXUxNiBm bGlwX3BlbmRpbmcgPSBESVNQTEFZX1BMQU5FX0ZMSVBfUEVORElORyhwbGFuZSk7CiAKLQlpZiAo IWRybV9oYW5kbGVfdmJsYW5rKGRldiwgcGlwZSkpCisJaWYgKCFpbnRlbF9waXBlX2hhbmRsZV92 YmxhbmsoZGV2LCBwaXBlKSkKIAkJcmV0dXJuIGZhbHNlOwogCiAJaWYgKChpaXIgJiBmbGlwX3Bl bmRpbmcpID09IDApCkBAIC0zNTc2LDcgKzM1ODksNyBAQCBzdGF0aWMgYm9vbCBpOTE1X2hhbmRs ZV92Ymxhbmsoc3RydWN0IGRybV9kZXZpY2UgKmRldiwKIAlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0 ZSAqZGV2X3ByaXYgPSBkZXYtPmRldl9wcml2YXRlOwogCXUzMiBmbGlwX3BlbmRpbmcgPSBESVNQ TEFZX1BMQU5FX0ZMSVBfUEVORElORyhwbGFuZSk7CiAKLQlpZiAoIWRybV9oYW5kbGVfdmJsYW5r KGRldiwgcGlwZSkpCisJaWYgKCFpbnRlbF9waXBlX2hhbmRsZV92YmxhbmsoZGV2LCBwaXBlKSkK IAkJcmV0dXJuIGZhbHNlOwogCiAJaWYgKChpaXIgJiBmbGlwX3BlbmRpbmcpID09IDApCmRpZmYg LS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMgYi9kcml2ZXJzL2dw dS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMKaW5kZXggY2EzM2VmNS4uOTkzNTk3YiAxMDA2NDQK LS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jCisrKyBiL2RyaXZlcnMv Z3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYwpAQCAtMTA1NjYsNiArMTA1NjYsOCBAQCBzdGF0 aWMgdm9pZCBpbnRlbF9jcnRjX2luaXQoc3RydWN0IGRybV9kZXZpY2UgKmRldiwgaW50IHBpcGUp CiAJCWludGVsX2NydGMtPnBsYW5lID0gIXBpcGU7CiAJfQogCisJaW5pdF93YWl0cXVldWVfaGVh ZCgmaW50ZWxfY3J0Yy0+dmJsX3dhaXQpOworCiAJQlVHX09OKHBpcGUgPj0gQVJSQVlfU0laRShk ZXZfcHJpdi0+cGxhbmVfdG9fY3J0Y19tYXBwaW5nKSB8fAogCSAgICAgICBkZXZfcHJpdi0+cGxh bmVfdG9fY3J0Y19tYXBwaW5nW2ludGVsX2NydGMtPnBsYW5lXSAhPSBOVUxMKTsKIAlkZXZfcHJp di0+cGxhbmVfdG9fY3J0Y19tYXBwaW5nW2ludGVsX2NydGMtPnBsYW5lXSA9ICZpbnRlbF9jcnRj LT5iYXNlOwpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHJ2LmggYi9k cml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcnYuaAppbmRleCA5NmFlNzhkLi5kOGI1NDBiIDEw MDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcnYuaAorKysgYi9kcml2ZXJz L2dwdS9kcm0vaTkxNS9pbnRlbF9kcnYuaApAQCAtNDAxLDYgKzQwMSw4IEBAIHN0cnVjdCBpbnRl bF9jcnRjIHsKIAkJLyogd2F0ZXJtYXJrcyBjdXJyZW50bHkgYmVpbmcgdXNlZCAgKi8KIAkJc3Ry dWN0IGludGVsX3BpcGVfd20gYWN0aXZlOwogCX0gd207CisKKwl3YWl0X3F1ZXVlX2hlYWRfdCB2 Ymxfd2FpdDsKIH07CiAKIHN0cnVjdCBpbnRlbF9wbGFuZV93bV9wYXJhbWV0ZXJzIHsKZGlmZiAt LWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3Nwcml0ZS5jIGIvZHJpdmVycy9ncHUv ZHJtL2k5MTUvaW50ZWxfc3ByaXRlLmMKaW5kZXggMzM2YWU2Yy4uYTNlZDg0MCAxMDA2NDQKLS0t IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfc3ByaXRlLmMKKysrIGIvZHJpdmVycy9ncHUv ZHJtL2k5MTUvaW50ZWxfc3ByaXRlLmMKQEAgLTM3LDYgKzM3LDg5IEBACiAjaW5jbHVkZSA8ZHJt L2k5MTVfZHJtLmg+CiAjaW5jbHVkZSAiaTkxNV9kcnYuaCIKIAorc3RhdGljIGludCB1c2Vjc190 b19zY2FubGluZXMoY29uc3Qgc3RydWN0IGRybV9kaXNwbGF5X21vZGUgKm1vZGUsIGludCB1c2Vj cykKK3sKKwkvKiBwYXJhbm9pYSAqLworCWlmICghbW9kZS0+Y3J0Y19odG90YWwpCisJCXJldHVy biAxOworCisJcmV0dXJuIERJVl9ST1VORF9VUCh1c2VjcyAqIG1vZGUtPmNydGNfY2xvY2ssIDEw MDAgKiBtb2RlLT5jcnRjX2h0b3RhbCk7Cit9CisKK3N0YXRpYyBib29sIGludGVsX3BpcGVfdXBk YXRlX3N0YXJ0KHN0cnVjdCBpbnRlbF9jcnRjICpjcnRjLCB1aW50MzJfdCAqc3RhcnRfdmJsX2Nv dW50KQoreworCXN0cnVjdCBkcm1fZGV2aWNlICpkZXYgPSBjcnRjLT5iYXNlLmRldjsKKwljb25z dCBzdHJ1Y3QgZHJtX2Rpc3BsYXlfbW9kZSAqbW9kZSA9ICZjcnRjLT5jb25maWcuYWRqdXN0ZWRf bW9kZTsKKwllbnVtIHBpcGUgcGlwZSA9IGNydGMtPnBpcGU7CisJbG9uZyB0aW1lb3V0ID0gbXNl Y3NfdG9famlmZmllc190aW1lb3V0KDEpOworCWludCBzY2FubGluZSwgbWluLCBtYXgsIHZibGFu a19zdGFydDsKKwlERUZJTkVfV0FJVCh3YWl0KTsKKworCVdBUk5fT04oIW11dGV4X2lzX2xvY2tl ZCgmY3J0Yy0+YmFzZS5tdXRleCkpOworCisJdmJsYW5rX3N0YXJ0ID0gbW9kZS0+Y3J0Y192Ymxh bmtfc3RhcnQ7CisJaWYgKG1vZGUtPmZsYWdzICYgRFJNX01PREVfRkxBR19JTlRFUkxBQ0UpCisJ CXZibGFua19zdGFydCA9IERJVl9ST1VORF9VUCh2Ymxhbmtfc3RhcnQsIDIpOworCisJLyogRklY TUUgbmVlZHMgdG8gYmUgY2FsaWJyYXRlZCBzZW5zaWJseSAqLworCW1pbiA9IHZibGFua19zdGFy dCAtIHVzZWNzX3RvX3NjYW5saW5lcyhtb2RlLCAxMDApOworCW1heCA9IHZibGFua19zdGFydCAt IDE7CisKKwlpZiAobWluIDw9IDAgfHwgbWF4IDw9IDApCisJCXJldHVybiBmYWxzZTsKKworCWlm IChXQVJOX09OKGRybV92YmxhbmtfZ2V0KGRldiwgcGlwZSkpKQorCQlyZXR1cm4gZmFsc2U7CisK Kwlsb2NhbF9pcnFfZGlzYWJsZSgpOworCisJZm9yICg7OykgeworCQkvKgorCQkgKiBwcmVwYXJl X3RvX3dhaXQoKSBoYXMgYSBtZW1vcnkgYmFycmllciwgd2hpY2ggZ3VhcmFudGVlcworCQkgKiBv dGhlciBDUFVzIGNhbiBzZWUgdGhlIHRhc2sgc3RhdGUgdXBkYXRlIGJ5IHRoZSB0aW1lIHdlCisJ CSAqIHJlYWQgdGhlIHNjYW5saW5lLgorCQkgKi8KKwkJcHJlcGFyZV90b193YWl0KCZjcnRjLT52 Ymxfd2FpdCwgJndhaXQsIFRBU0tfVU5JTlRFUlJVUFRJQkxFKTsKKworCQlzY2FubGluZSA9IGlu dGVsX2dldF9jcnRjX3NjYW5saW5lKGNydGMpOworCQlpZiAoc2NhbmxpbmUgPCBtaW4gfHwgc2Nh bmxpbmUgPiBtYXgpCisJCQlicmVhazsKKworCQlpZiAodGltZW91dCA8PSAwKSB7CisJCQlEUk1f RVJST1IoIlBvdGVudGlhbCBhdG9taWMgdXBkYXRlIGZhaWx1cmUgb24gcGlwZSAlY1xuIiwKKwkJ CQkgIHBpcGVfbmFtZShjcnRjLT5waXBlKSk7CisJCQlicmVhazsKKwkJfQorCisJCWxvY2FsX2ly cV9lbmFibGUoKTsKKworCQl0aW1lb3V0ID0gc2NoZWR1bGVfdGltZW91dCh0aW1lb3V0KTsKKwor CQlsb2NhbF9pcnFfZGlzYWJsZSgpOworCX0KKworCWZpbmlzaF93YWl0KCZjcnRjLT52Ymxfd2Fp dCwgJndhaXQpOworCisJZHJtX3ZibGFua19wdXQoZGV2LCBwaXBlKTsKKworCSpzdGFydF92Ymxf Y291bnQgPSBkZXYtPmRyaXZlci0+Z2V0X3ZibGFua19jb3VudGVyKGRldiwgcGlwZSk7CisKKwly ZXR1cm4gdHJ1ZTsKK30KKworc3RhdGljIHZvaWQgaW50ZWxfcGlwZV91cGRhdGVfZW5kKHN0cnVj dCBpbnRlbF9jcnRjICpjcnRjLCB1MzIgc3RhcnRfdmJsX2NvdW50KQoreworCXN0cnVjdCBkcm1f ZGV2aWNlICpkZXYgPSBjcnRjLT5iYXNlLmRldjsKKwllbnVtIHBpcGUgcGlwZSA9IGNydGMtPnBp cGU7CisJdTMyIGVuZF92YmxfY291bnQgPSBkZXYtPmRyaXZlci0+Z2V0X3ZibGFua19jb3VudGVy KGRldiwgcGlwZSk7CisKKwlsb2NhbF9pcnFfZW5hYmxlKCk7CisKKwlpZiAoc3RhcnRfdmJsX2Nv dW50ICE9IGVuZF92YmxfY291bnQpCisJCURSTV9FUlJPUigiQXRvbWljIHVwZGF0ZSBmYWlsdXJl IG9uIHBpcGUgJWMgKHN0YXJ0PSV1IGVuZD0ldSlcbiIsCisJCQkgIHBpcGVfbmFtZShwaXBlKSwg c3RhcnRfdmJsX2NvdW50LCBlbmRfdmJsX2NvdW50KTsKK30KKwogc3RhdGljIHZvaWQKIHZsdl91 cGRhdGVfcGxhbmUoc3RydWN0IGRybV9wbGFuZSAqZHBsYW5lLCBzdHJ1Y3QgZHJtX2NydGMgKmNy dGMsCiAJCSBzdHJ1Y3QgZHJtX2ZyYW1lYnVmZmVyICpmYiwKQEAgLTQ4LDExICsxMzEsMTQgQEAg dmx2X3VwZGF0ZV9wbGFuZShzdHJ1Y3QgZHJtX3BsYW5lICpkcGxhbmUsIHN0cnVjdCBkcm1fY3J0 YyAqY3J0YywKIAlzdHJ1Y3QgZHJtX2RldmljZSAqZGV2ID0gZHBsYW5lLT5kZXY7CiAJc3RydWN0 IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0gZGV2LT5kZXZfcHJpdmF0ZTsKIAlzdHJ1Y3Qg aW50ZWxfcGxhbmUgKmludGVsX3BsYW5lID0gdG9faW50ZWxfcGxhbmUoZHBsYW5lKTsKKwlzdHJ1 Y3QgaW50ZWxfY3J0YyAqaW50ZWxfY3J0YyA9IHRvX2ludGVsX2NydGMoY3J0Yyk7CiAJaW50IHBp cGUgPSBpbnRlbF9wbGFuZS0+cGlwZTsKIAlpbnQgcGxhbmUgPSBpbnRlbF9wbGFuZS0+cGxhbmU7 CiAJdTMyIHNwcmN0bDsKIAl1bnNpZ25lZCBsb25nIHNwcnN1cmZfb2Zmc2V0LCBsaW5lYXJfb2Zm c2V0OwogCWludCBwaXhlbF9zaXplID0gZHJtX2Zvcm1hdF9wbGFuZV9jcHAoZmItPnBpeGVsX2Zv cm1hdCwgMCk7CisJdTMyIHN0YXJ0X3ZibF9jb3VudDsKKwlib29sIGF0b21pY191cGRhdGU7CiAK IAlzcHJjdGwgPSBJOTE1X1JFQUQoU1BDTlRSKHBpcGUsIHBsYW5lKSk7CiAKQEAgLTEzMSw2ICsy MTcsOCBAQCB2bHZfdXBkYXRlX3BsYW5lKHN0cnVjdCBkcm1fcGxhbmUgKmRwbGFuZSwgc3RydWN0 IGRybV9jcnRjICpjcnRjLAogCQkJCQkJCWZiLT5waXRjaGVzWzBdKTsKIAlsaW5lYXJfb2Zmc2V0 IC09IHNwcnN1cmZfb2Zmc2V0OwogCisJYXRvbWljX3VwZGF0ZSA9IGludGVsX3BpcGVfdXBkYXRl X3N0YXJ0KGludGVsX2NydGMsICZzdGFydF92YmxfY291bnQpOworCiAJSTkxNV9XUklURShTUFNU UklERShwaXBlLCBwbGFuZSksIGZiLT5waXRjaGVzWzBdKTsKIAlJOTE1X1dSSVRFKFNQUE9TKHBp cGUsIHBsYW5lKSwgKGNydGNfeSA8PCAxNikgfCBjcnRjX3gpOwogCkBAIC0xNDQsNiArMjMyLDkg QEAgdmx2X3VwZGF0ZV9wbGFuZShzdHJ1Y3QgZHJtX3BsYW5lICpkcGxhbmUsIHN0cnVjdCBkcm1f Y3J0YyAqY3J0YywKIAlJOTE1X1dSSVRFKFNQU1VSRihwaXBlLCBwbGFuZSksIGk5MTVfZ2VtX29i al9nZ3R0X29mZnNldChvYmopICsKIAkJICAgc3Byc3VyZl9vZmZzZXQpOwogCVBPU1RJTkdfUkVB RChTUFNVUkYocGlwZSwgcGxhbmUpKTsKKworCWlmIChhdG9taWNfdXBkYXRlKQorCQlpbnRlbF9w aXBlX3VwZGF0ZV9lbmQoaW50ZWxfY3J0Yywgc3RhcnRfdmJsX2NvdW50KTsKIH0KIAogc3RhdGlj IHZvaWQKQEAgLTE1Miw4ICsyNDMsMTMgQEAgdmx2X2Rpc2FibGVfcGxhbmUoc3RydWN0IGRybV9w bGFuZSAqZHBsYW5lLCBzdHJ1Y3QgZHJtX2NydGMgKmNydGMpCiAJc3RydWN0IGRybV9kZXZpY2Ug KmRldiA9IGRwbGFuZS0+ZGV2OwogCXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9 IGRldi0+ZGV2X3ByaXZhdGU7CiAJc3RydWN0IGludGVsX3BsYW5lICppbnRlbF9wbGFuZSA9IHRv X2ludGVsX3BsYW5lKGRwbGFuZSk7CisJc3RydWN0IGludGVsX2NydGMgKmludGVsX2NydGMgPSB0 b19pbnRlbF9jcnRjKGNydGMpOwogCWludCBwaXBlID0gaW50ZWxfcGxhbmUtPnBpcGU7CiAJaW50 IHBsYW5lID0gaW50ZWxfcGxhbmUtPnBsYW5lOworCXUzMiBzdGFydF92YmxfY291bnQ7CisJYm9v bCBhdG9taWNfdXBkYXRlOworCisJYXRvbWljX3VwZGF0ZSA9IGludGVsX3BpcGVfdXBkYXRlX3N0 YXJ0KGludGVsX2NydGMsICZzdGFydF92YmxfY291bnQpOwogCiAJSTkxNV9XUklURShTUENOVFIo cGlwZSwgcGxhbmUpLCBJOTE1X1JFQUQoU1BDTlRSKHBpcGUsIHBsYW5lKSkgJgogCQkgICB+U1Bf RU5BQkxFKTsKQEAgLTE2MSw2ICsyNTcsOSBAQCB2bHZfZGlzYWJsZV9wbGFuZShzdHJ1Y3QgZHJt X3BsYW5lICpkcGxhbmUsIHN0cnVjdCBkcm1fY3J0YyAqY3J0YykKIAlJOTE1X1dSSVRFKFNQU1VS RihwaXBlLCBwbGFuZSksIDApOwogCVBPU1RJTkdfUkVBRChTUFNVUkYocGlwZSwgcGxhbmUpKTsK IAorCWlmIChhdG9taWNfdXBkYXRlKQorCQlpbnRlbF9waXBlX3VwZGF0ZV9lbmQoaW50ZWxfY3J0 Yywgc3RhcnRfdmJsX2NvdW50KTsKKwogCWludGVsX3VwZGF0ZV9zcHJpdGVfd2F0ZXJtYXJrcyhk cGxhbmUsIGNydGMsIDAsIDAsIGZhbHNlLCBmYWxzZSk7CiB9CiAKQEAgLTIyNiwxMCArMzI1LDEz IEBAIGl2Yl91cGRhdGVfcGxhbmUoc3RydWN0IGRybV9wbGFuZSAqcGxhbmUsIHN0cnVjdCBkcm1f Y3J0YyAqY3J0YywKIAlzdHJ1Y3QgZHJtX2RldmljZSAqZGV2ID0gcGxhbmUtPmRldjsKIAlzdHJ1 Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSBkZXYtPmRldl9wcml2YXRlOwogCXN0cnVj dCBpbnRlbF9wbGFuZSAqaW50ZWxfcGxhbmUgPSB0b19pbnRlbF9wbGFuZShwbGFuZSk7CisJc3Ry dWN0IGludGVsX2NydGMgKmludGVsX2NydGMgPSB0b19pbnRlbF9jcnRjKGNydGMpOwogCWludCBw aXBlID0gaW50ZWxfcGxhbmUtPnBpcGU7CiAJdTMyIHNwcmN0bCwgc3Byc2NhbGUgPSAwOwogCXVu c2lnbmVkIGxvbmcgc3Byc3VyZl9vZmZzZXQsIGxpbmVhcl9vZmZzZXQ7CiAJaW50IHBpeGVsX3Np emUgPSBkcm1fZm9ybWF0X3BsYW5lX2NwcChmYi0+cGl4ZWxfZm9ybWF0LCAwKTsKKwl1MzIgc3Rh cnRfdmJsX2NvdW50OworCWJvb2wgYXRvbWljX3VwZGF0ZTsKIAogCXNwcmN0bCA9IEk5MTVfUkVB RChTUFJDVEwocGlwZSkpOwogCkBAIC0yOTksNiArNDAxLDggQEAgaXZiX3VwZGF0ZV9wbGFuZShz dHJ1Y3QgZHJtX3BsYW5lICpwbGFuZSwgc3RydWN0IGRybV9jcnRjICpjcnRjLAogCQkJCQkgICAg ICAgcGl4ZWxfc2l6ZSwgZmItPnBpdGNoZXNbMF0pOwogCWxpbmVhcl9vZmZzZXQgLT0gc3Byc3Vy Zl9vZmZzZXQ7CiAKKwlhdG9taWNfdXBkYXRlID0gaW50ZWxfcGlwZV91cGRhdGVfc3RhcnQoaW50 ZWxfY3J0YywgJnN0YXJ0X3ZibF9jb3VudCk7CisKIAlJOTE1X1dSSVRFKFNQUlNUUklERShwaXBl KSwgZmItPnBpdGNoZXNbMF0pOwogCUk5MTVfV1JJVEUoU1BSUE9TKHBpcGUpLCAoY3J0Y195IDw8 IDE2KSB8IGNydGNfeCk7CiAKQEAgLTMxOCw2ICs0MjIsOSBAQCBpdmJfdXBkYXRlX3BsYW5lKHN0 cnVjdCBkcm1fcGxhbmUgKnBsYW5lLCBzdHJ1Y3QgZHJtX2NydGMgKmNydGMsCiAJSTkxNV9XUklU RShTUFJTVVJGKHBpcGUpLAogCQkgICBpOTE1X2dlbV9vYmpfZ2d0dF9vZmZzZXQob2JqKSArIHNw cnN1cmZfb2Zmc2V0KTsKIAlQT1NUSU5HX1JFQUQoU1BSU1VSRihwaXBlKSk7CisKKwlpZiAoYXRv bWljX3VwZGF0ZSkKKwkJaW50ZWxfcGlwZV91cGRhdGVfZW5kKGludGVsX2NydGMsIHN0YXJ0X3Zi bF9jb3VudCk7CiB9CiAKIHN0YXRpYyB2b2lkCkBAIC0zMjYsNyArNDMzLDEyIEBAIGl2Yl9kaXNh YmxlX3BsYW5lKHN0cnVjdCBkcm1fcGxhbmUgKnBsYW5lLCBzdHJ1Y3QgZHJtX2NydGMgKmNydGMp CiAJc3RydWN0IGRybV9kZXZpY2UgKmRldiA9IHBsYW5lLT5kZXY7CiAJc3RydWN0IGRybV9pOTE1 X3ByaXZhdGUgKmRldl9wcml2ID0gZGV2LT5kZXZfcHJpdmF0ZTsKIAlzdHJ1Y3QgaW50ZWxfcGxh bmUgKmludGVsX3BsYW5lID0gdG9faW50ZWxfcGxhbmUocGxhbmUpOworCXN0cnVjdCBpbnRlbF9j cnRjICppbnRlbF9jcnRjID0gdG9faW50ZWxfY3J0YyhjcnRjKTsKIAlpbnQgcGlwZSA9IGludGVs X3BsYW5lLT5waXBlOworCXUzMiBzdGFydF92YmxfY291bnQ7CisJYm9vbCBhdG9taWNfdXBkYXRl OworCisJYXRvbWljX3VwZGF0ZSA9IGludGVsX3BpcGVfdXBkYXRlX3N0YXJ0KGludGVsX2NydGMs ICZzdGFydF92YmxfY291bnQpOwogCiAJSTkxNV9XUklURShTUFJDVEwocGlwZSksIEk5MTVfUkVB RChTUFJDVEwocGlwZSkpICYgflNQUklURV9FTkFCTEUpOwogCS8qIENhbid0IGxlYXZlIHRoZSBz Y2FsZXIgZW5hYmxlZC4uLiAqLwpAQCAtMzM2LDYgKzQ0OCw5IEBAIGl2Yl9kaXNhYmxlX3BsYW5l KHN0cnVjdCBkcm1fcGxhbmUgKnBsYW5lLCBzdHJ1Y3QgZHJtX2NydGMgKmNydGMpCiAJSTkxNV9X UklURShTUFJTVVJGKHBpcGUpLCAwKTsKIAlQT1NUSU5HX1JFQUQoU1BSU1VSRihwaXBlKSk7CiAK KwlpZiAoYXRvbWljX3VwZGF0ZSkKKwkJaW50ZWxfcGlwZV91cGRhdGVfZW5kKGludGVsX2NydGMs IHN0YXJ0X3ZibF9jb3VudCk7CisKIAkvKgogCSAqIEF2b2lkIHVuZGVycnVucyB3aGVuIGRpc2Fi bGluZyB0aGUgc3ByaXRlLgogCSAqIEZJWE1FIHJlbW92ZSBvbmNlIHdhdGVybWFyayB1cGRhdGVz IGFyZSBkb25lIHByb3Blcmx5LgpAQCAtNDEwLDEwICs1MjUsMTMgQEAgaWxrX3VwZGF0ZV9wbGFu ZShzdHJ1Y3QgZHJtX3BsYW5lICpwbGFuZSwgc3RydWN0IGRybV9jcnRjICpjcnRjLAogCXN0cnVj dCBkcm1fZGV2aWNlICpkZXYgPSBwbGFuZS0+ZGV2OwogCXN0cnVjdCBkcm1faTkxNV9wcml2YXRl ICpkZXZfcHJpdiA9IGRldi0+ZGV2X3ByaXZhdGU7CiAJc3RydWN0IGludGVsX3BsYW5lICppbnRl bF9wbGFuZSA9IHRvX2ludGVsX3BsYW5lKHBsYW5lKTsKKwlzdHJ1Y3QgaW50ZWxfY3J0YyAqaW50 ZWxfY3J0YyA9IHRvX2ludGVsX2NydGMoY3J0Yyk7CiAJaW50IHBpcGUgPSBpbnRlbF9wbGFuZS0+ cGlwZTsKIAl1bnNpZ25lZCBsb25nIGR2c3N1cmZfb2Zmc2V0LCBsaW5lYXJfb2Zmc2V0OwogCXUz MiBkdnNjbnRyLCBkdnNzY2FsZTsKIAlpbnQgcGl4ZWxfc2l6ZSA9IGRybV9mb3JtYXRfcGxhbmVf Y3BwKGZiLT5waXhlbF9mb3JtYXQsIDApOworCXUzMiBzdGFydF92YmxfY291bnQ7CisJYm9vbCBh dG9taWNfdXBkYXRlOwogCiAJZHZzY250ciA9IEk5MTVfUkVBRChEVlNDTlRSKHBpcGUpKTsKIApA QCAtNDc4LDYgKzU5Niw4IEBAIGlsa191cGRhdGVfcGxhbmUoc3RydWN0IGRybV9wbGFuZSAqcGxh bmUsIHN0cnVjdCBkcm1fY3J0YyAqY3J0YywKIAkJCQkJICAgICAgIHBpeGVsX3NpemUsIGZiLT5w aXRjaGVzWzBdKTsKIAlsaW5lYXJfb2Zmc2V0IC09IGR2c3N1cmZfb2Zmc2V0OwogCisJYXRvbWlj X3VwZGF0ZSA9IGludGVsX3BpcGVfdXBkYXRlX3N0YXJ0KGludGVsX2NydGMsICZzdGFydF92Ymxf Y291bnQpOworCiAJSTkxNV9XUklURShEVlNTVFJJREUocGlwZSksIGZiLT5waXRjaGVzWzBdKTsK IAlJOTE1X1dSSVRFKERWU1BPUyhwaXBlKSwgKGNydGNfeSA8PCAxNikgfCBjcnRjX3gpOwogCkBA IC00OTIsNiArNjEyLDkgQEAgaWxrX3VwZGF0ZV9wbGFuZShzdHJ1Y3QgZHJtX3BsYW5lICpwbGFu ZSwgc3RydWN0IGRybV9jcnRjICpjcnRjLAogCUk5MTVfV1JJVEUoRFZTU1VSRihwaXBlKSwKIAkJ ICAgaTkxNV9nZW1fb2JqX2dndHRfb2Zmc2V0KG9iaikgKyBkdnNzdXJmX29mZnNldCk7CiAJUE9T VElOR19SRUFEKERWU1NVUkYocGlwZSkpOworCisJaWYgKGF0b21pY191cGRhdGUpCisJCWludGVs X3BpcGVfdXBkYXRlX2VuZChpbnRlbF9jcnRjLCBzdGFydF92YmxfY291bnQpOwogfQogCiBzdGF0 aWMgdm9pZApAQCAtNTAwLDcgKzYyMywxMiBAQCBpbGtfZGlzYWJsZV9wbGFuZShzdHJ1Y3QgZHJt X3BsYW5lICpwbGFuZSwgc3RydWN0IGRybV9jcnRjICpjcnRjKQogCXN0cnVjdCBkcm1fZGV2aWNl ICpkZXYgPSBwbGFuZS0+ZGV2OwogCXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9 IGRldi0+ZGV2X3ByaXZhdGU7CiAJc3RydWN0IGludGVsX3BsYW5lICppbnRlbF9wbGFuZSA9IHRv X2ludGVsX3BsYW5lKHBsYW5lKTsKKwlzdHJ1Y3QgaW50ZWxfY3J0YyAqaW50ZWxfY3J0YyA9IHRv X2ludGVsX2NydGMoY3J0Yyk7CiAJaW50IHBpcGUgPSBpbnRlbF9wbGFuZS0+cGlwZTsKKwl1MzIg c3RhcnRfdmJsX2NvdW50OworCWJvb2wgYXRvbWljX3VwZGF0ZTsKKworCWF0b21pY191cGRhdGUg PSBpbnRlbF9waXBlX3VwZGF0ZV9zdGFydChpbnRlbF9jcnRjLCAmc3RhcnRfdmJsX2NvdW50KTsK IAogCUk5MTVfV1JJVEUoRFZTQ05UUihwaXBlKSwgSTkxNV9SRUFEKERWU0NOVFIocGlwZSkpICYg fkRWU19FTkFCTEUpOwogCS8qIERpc2FibGUgdGhlIHNjYWxlciAqLwpAQCAtNTA5LDYgKzYzNyw5 IEBAIGlsa19kaXNhYmxlX3BsYW5lKHN0cnVjdCBkcm1fcGxhbmUgKnBsYW5lLCBzdHJ1Y3QgZHJt X2NydGMgKmNydGMpCiAJSTkxNV9XUklURShEVlNTVVJGKHBpcGUpLCAwKTsKIAlQT1NUSU5HX1JF QUQoRFZTU1VSRihwaXBlKSk7CiAKKwlpZiAoYXRvbWljX3VwZGF0ZSkKKwkJaW50ZWxfcGlwZV91 cGRhdGVfZW5kKGludGVsX2NydGMsIHN0YXJ0X3ZibF9jb3VudCk7CisKIAkvKgogCSAqIEF2b2lk IHVuZGVycnVucyB3aGVuIGRpc2FibGluZyB0aGUgc3ByaXRlLgogCSAqIEZJWE1FIHJlbW92ZSBv bmNlIHdhdGVybWFyayB1cGRhdGVzIGFyZSBkb25lIHByb3Blcmx5LgotLSAKMS44LjMuMgoKX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4IG1h aWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHA6Ly9saXN0cy5m cmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK