From: ville.syrjala@linux.intel.com Subject: [PATCH v2 4/9] drm/i915: Perform primary enable/disable atomically with sprite updates Date: Tue, 29 Apr 2014 13:35:47 +0300 Message-ID: <1398767752-619-5-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 AD2FE8A3E8 for ; Tue, 29 Apr 2014 03:36:08 -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 RnJvbTogVmlsbGUgU3lyasOkbMOkIDx2aWxsZS5zeXJqYWxhQGxpbnV4LmludGVsLmNvbT4KCk1v dmUgdGhlIHByaW1hcnkgcGxhbmUgZW5hYmxlL2Rpc2FibGUgdG8gb2NjdXIgYXRvbWljYWxseSB3 aXRoIHRoZQpzcHJpdGUgdXBkYXRlIHRoYXQgY2F1c2VkIHRoZSBwcmltYXJ5IHBsYW5lIHZpc2li aWxpdHkgdG8gY2hhbmdlLgoKRkJDIGFuZCBJUFMgZW5hYmxlL2Rpc2FibGUgaXMgbGVmdCB0byBo YXBwZW4gd2VsbCBiZWZvcmUgb3IgYWZ0ZXIKdGhlIHByaW1hcnkgcGxhbmUgY2hhbmdlLgoKdjI6 IFBhc3MgaW50ZWxfY3J0YyBpbnN0ZWFkIG9mIGRybV9jcnRjIChEYW5pZWwpCgpSZXZpZXdlZC1i eTogSmVzc2UgQmFybmVzIDxqYmFybmVzQHZpcnR1b3VzZ2Vlay5vcmc+ClJldmlld2VkLWJ5OiBT b3VyYWIgR3VwdGEgPHNvdXJhYmd1cHRhQGdtYWlsLmNvbT4KUmV2aWV3ZWQtYnk6IEFrYXNoIEdv ZWwgPGFrYXNoLmdvZWxzQGdtYWlsLmNvbT4KU2lnbmVkLW9mZi1ieTogVmlsbGUgU3lyasOkbMOk IDx2aWxsZS5zeXJqYWxhQGxpbnV4LmludGVsLmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkx NS9pbnRlbF9zcHJpdGUuYyB8IDk0ICsrKysrKysrKysrKysrKysrKysrKystLS0tLS0tLS0tLS0t LS0KIDEgZmlsZSBjaGFuZ2VkLCA1NSBpbnNlcnRpb25zKCspLCAzOSBkZWxldGlvbnMoLSkKCmRp ZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9zcHJpdGUuYyBiL2RyaXZlcnMv Z3B1L2RybS9pOTE1L2ludGVsX3Nwcml0ZS5jCmluZGV4IGEzZWQ4NDAuLjYxOTJlNTggMTAwNjQ0 Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3Nwcml0ZS5jCisrKyBiL2RyaXZlcnMv Z3B1L2RybS9pOTE1L2ludGVsX3Nwcml0ZS5jCkBAIC0xMjAsNiArMTIwLDE3IEBAIHN0YXRpYyB2 b2lkIGludGVsX3BpcGVfdXBkYXRlX2VuZChzdHJ1Y3QgaW50ZWxfY3J0YyAqY3J0YywgdTMyIHN0 YXJ0X3ZibF9jb3VudCkKIAkJCSAgcGlwZV9uYW1lKHBpcGUpLCBzdGFydF92YmxfY291bnQsIGVu ZF92YmxfY291bnQpOwogfQogCitzdGF0aWMgdm9pZCBpbnRlbF91cGRhdGVfcHJpbWFyeV9wbGFu ZShzdHJ1Y3QgaW50ZWxfY3J0YyAqY3J0YykKK3sKKwlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAq ZGV2X3ByaXYgPSBjcnRjLT5iYXNlLmRldi0+ZGV2X3ByaXZhdGU7CisJaW50IHJlZyA9IERTUENO VFIoY3J0Yy0+cGxhbmUpOworCisJaWYgKGNydGMtPnByaW1hcnlfZW5hYmxlZCkKKwkJSTkxNV9X UklURShyZWcsIEk5MTVfUkVBRChyZWcpIHwgRElTUExBWV9QTEFORV9FTkFCTEUpOworCWVsc2UK KwkJSTkxNV9XUklURShyZWcsIEk5MTVfUkVBRChyZWcpICYgfkRJU1BMQVlfUExBTkVfRU5BQkxF KTsKK30KKwogc3RhdGljIHZvaWQKIHZsdl91cGRhdGVfcGxhbmUoc3RydWN0IGRybV9wbGFuZSAq ZHBsYW5lLCBzdHJ1Y3QgZHJtX2NydGMgKmNydGMsCiAJCSBzdHJ1Y3QgZHJtX2ZyYW1lYnVmZmVy ICpmYiwKQEAgLTIxOSw2ICsyMzAsOCBAQCB2bHZfdXBkYXRlX3BsYW5lKHN0cnVjdCBkcm1fcGxh bmUgKmRwbGFuZSwgc3RydWN0IGRybV9jcnRjICpjcnRjLAogCiAJYXRvbWljX3VwZGF0ZSA9IGlu dGVsX3BpcGVfdXBkYXRlX3N0YXJ0KGludGVsX2NydGMsICZzdGFydF92YmxfY291bnQpOwogCisJ aW50ZWxfdXBkYXRlX3ByaW1hcnlfcGxhbmUoaW50ZWxfY3J0Yyk7CisKIAlJOTE1X1dSSVRFKFNQ U1RSSURFKHBpcGUsIHBsYW5lKSwgZmItPnBpdGNoZXNbMF0pOwogCUk5MTVfV1JJVEUoU1BQT1Mo cGlwZSwgcGxhbmUpLCAoY3J0Y195IDw8IDE2KSB8IGNydGNfeCk7CiAKQEAgLTIzMSw3ICsyNDQs OCBAQCB2bHZfdXBkYXRlX3BsYW5lKHN0cnVjdCBkcm1fcGxhbmUgKmRwbGFuZSwgc3RydWN0IGRy bV9jcnRjICpjcnRjLAogCUk5MTVfV1JJVEUoU1BDTlRSKHBpcGUsIHBsYW5lKSwgc3ByY3RsKTsK IAlJOTE1X1dSSVRFKFNQU1VSRihwaXBlLCBwbGFuZSksIGk5MTVfZ2VtX29ial9nZ3R0X29mZnNl dChvYmopICsKIAkJICAgc3Byc3VyZl9vZmZzZXQpOwotCVBPU1RJTkdfUkVBRChTUFNVUkYocGlw ZSwgcGxhbmUpKTsKKworCWludGVsX2ZsdXNoX3ByaW1hcnlfcGxhbmUoZGV2X3ByaXYsIGludGVs X2NydGMtPnBsYW5lKTsKIAogCWlmIChhdG9taWNfdXBkYXRlKQogCQlpbnRlbF9waXBlX3VwZGF0 ZV9lbmQoaW50ZWxfY3J0Yywgc3RhcnRfdmJsX2NvdW50KTsKQEAgLTI1MSwxMSArMjY1LDE0IEBA IHZsdl9kaXNhYmxlX3BsYW5lKHN0cnVjdCBkcm1fcGxhbmUgKmRwbGFuZSwgc3RydWN0IGRybV9j cnRjICpjcnRjKQogCiAJYXRvbWljX3VwZGF0ZSA9IGludGVsX3BpcGVfdXBkYXRlX3N0YXJ0KGlu dGVsX2NydGMsICZzdGFydF92YmxfY291bnQpOwogCisJaW50ZWxfdXBkYXRlX3ByaW1hcnlfcGxh bmUoaW50ZWxfY3J0Yyk7CisKIAlJOTE1X1dSSVRFKFNQQ05UUihwaXBlLCBwbGFuZSksIEk5MTVf UkVBRChTUENOVFIocGlwZSwgcGxhbmUpKSAmCiAJCSAgIH5TUF9FTkFCTEUpOwogCS8qIEFjdGl2 YXRlIGRvdWJsZSBidWZmZXJlZCByZWdpc3RlciB1cGRhdGUgKi8KIAlJOTE1X1dSSVRFKFNQU1VS RihwaXBlLCBwbGFuZSksIDApOwotCVBPU1RJTkdfUkVBRChTUFNVUkYocGlwZSwgcGxhbmUpKTsK KworCWludGVsX2ZsdXNoX3ByaW1hcnlfcGxhbmUoZGV2X3ByaXYsIGludGVsX2NydGMtPnBsYW5l KTsKIAogCWlmIChhdG9taWNfdXBkYXRlKQogCQlpbnRlbF9waXBlX3VwZGF0ZV9lbmQoaW50ZWxf Y3J0Yywgc3RhcnRfdmJsX2NvdW50KTsKQEAgLTQwMyw2ICs0MjAsOCBAQCBpdmJfdXBkYXRlX3Bs YW5lKHN0cnVjdCBkcm1fcGxhbmUgKnBsYW5lLCBzdHJ1Y3QgZHJtX2NydGMgKmNydGMsCiAKIAlh dG9taWNfdXBkYXRlID0gaW50ZWxfcGlwZV91cGRhdGVfc3RhcnQoaW50ZWxfY3J0YywgJnN0YXJ0 X3ZibF9jb3VudCk7CiAKKwlpbnRlbF91cGRhdGVfcHJpbWFyeV9wbGFuZShpbnRlbF9jcnRjKTsK KwogCUk5MTVfV1JJVEUoU1BSU1RSSURFKHBpcGUpLCBmYi0+cGl0Y2hlc1swXSk7CiAJSTkxNV9X UklURShTUFJQT1MocGlwZSksIChjcnRjX3kgPDwgMTYpIHwgY3J0Y194KTsKIApAQCAtNDIxLDcg KzQ0MCw4IEBAIGl2Yl91cGRhdGVfcGxhbmUoc3RydWN0IGRybV9wbGFuZSAqcGxhbmUsIHN0cnVj dCBkcm1fY3J0YyAqY3J0YywKIAlJOTE1X1dSSVRFKFNQUkNUTChwaXBlKSwgc3ByY3RsKTsKIAlJ OTE1X1dSSVRFKFNQUlNVUkYocGlwZSksCiAJCSAgIGk5MTVfZ2VtX29ial9nZ3R0X29mZnNldChv YmopICsgc3Byc3VyZl9vZmZzZXQpOwotCVBPU1RJTkdfUkVBRChTUFJTVVJGKHBpcGUpKTsKKwor CWludGVsX2ZsdXNoX3ByaW1hcnlfcGxhbmUoZGV2X3ByaXYsIGludGVsX2NydGMtPnBsYW5lKTsK IAogCWlmIChhdG9taWNfdXBkYXRlKQogCQlpbnRlbF9waXBlX3VwZGF0ZV9lbmQoaW50ZWxfY3J0 Yywgc3RhcnRfdmJsX2NvdW50KTsKQEAgLTQ0MCwxMyArNDYwLDE2IEBAIGl2Yl9kaXNhYmxlX3Bs YW5lKHN0cnVjdCBkcm1fcGxhbmUgKnBsYW5lLCBzdHJ1Y3QgZHJtX2NydGMgKmNydGMpCiAKIAlh dG9taWNfdXBkYXRlID0gaW50ZWxfcGlwZV91cGRhdGVfc3RhcnQoaW50ZWxfY3J0YywgJnN0YXJ0 X3ZibF9jb3VudCk7CiAKKwlpbnRlbF91cGRhdGVfcHJpbWFyeV9wbGFuZShpbnRlbF9jcnRjKTsK KwogCUk5MTVfV1JJVEUoU1BSQ1RMKHBpcGUpLCBJOTE1X1JFQUQoU1BSQ1RMKHBpcGUpKSAmIH5T UFJJVEVfRU5BQkxFKTsKIAkvKiBDYW4ndCBsZWF2ZSB0aGUgc2NhbGVyIGVuYWJsZWQuLi4gKi8K IAlpZiAoaW50ZWxfcGxhbmUtPmNhbl9zY2FsZSkKIAkJSTkxNV9XUklURShTUFJTQ0FMRShwaXBl KSwgMCk7CiAJLyogQWN0aXZhdGUgZG91YmxlIGJ1ZmZlcmVkIHJlZ2lzdGVyIHVwZGF0ZSAqLwog CUk5MTVfV1JJVEUoU1BSU1VSRihwaXBlKSwgMCk7Ci0JUE9TVElOR19SRUFEKFNQUlNVUkYocGlw ZSkpOworCisJaW50ZWxfZmx1c2hfcHJpbWFyeV9wbGFuZShkZXZfcHJpdiwgaW50ZWxfY3J0Yy0+ cGxhbmUpOwogCiAJaWYgKGF0b21pY191cGRhdGUpCiAJCWludGVsX3BpcGVfdXBkYXRlX2VuZChp bnRlbF9jcnRjLCBzdGFydF92YmxfY291bnQpOwpAQCAtNTk4LDYgKzYyMSw4IEBAIGlsa191cGRh dGVfcGxhbmUoc3RydWN0IGRybV9wbGFuZSAqcGxhbmUsIHN0cnVjdCBkcm1fY3J0YyAqY3J0YywK IAogCWF0b21pY191cGRhdGUgPSBpbnRlbF9waXBlX3VwZGF0ZV9zdGFydChpbnRlbF9jcnRjLCAm c3RhcnRfdmJsX2NvdW50KTsKIAorCWludGVsX3VwZGF0ZV9wcmltYXJ5X3BsYW5lKGludGVsX2Ny dGMpOworCiAJSTkxNV9XUklURShEVlNTVFJJREUocGlwZSksIGZiLT5waXRjaGVzWzBdKTsKIAlJ OTE1X1dSSVRFKERWU1BPUyhwaXBlKSwgKGNydGNfeSA8PCAxNikgfCBjcnRjX3gpOwogCkBAIC02 MTEsNyArNjM2LDggQEAgaWxrX3VwZGF0ZV9wbGFuZShzdHJ1Y3QgZHJtX3BsYW5lICpwbGFuZSwg c3RydWN0IGRybV9jcnRjICpjcnRjLAogCUk5MTVfV1JJVEUoRFZTQ05UUihwaXBlKSwgZHZzY250 cik7CiAJSTkxNV9XUklURShEVlNTVVJGKHBpcGUpLAogCQkgICBpOTE1X2dlbV9vYmpfZ2d0dF9v ZmZzZXQob2JqKSArIGR2c3N1cmZfb2Zmc2V0KTsKLQlQT1NUSU5HX1JFQUQoRFZTU1VSRihwaXBl KSk7CisKKwlpbnRlbF9mbHVzaF9wcmltYXJ5X3BsYW5lKGRldl9wcml2LCBpbnRlbF9jcnRjLT5w bGFuZSk7CiAKIAlpZiAoYXRvbWljX3VwZGF0ZSkKIAkJaW50ZWxfcGlwZV91cGRhdGVfZW5kKGlu dGVsX2NydGMsIHN0YXJ0X3ZibF9jb3VudCk7CkBAIC02MzAsMTIgKzY1NiwxNSBAQCBpbGtfZGlz YWJsZV9wbGFuZShzdHJ1Y3QgZHJtX3BsYW5lICpwbGFuZSwgc3RydWN0IGRybV9jcnRjICpjcnRj KQogCiAJYXRvbWljX3VwZGF0ZSA9IGludGVsX3BpcGVfdXBkYXRlX3N0YXJ0KGludGVsX2NydGMs ICZzdGFydF92YmxfY291bnQpOwogCisJaW50ZWxfdXBkYXRlX3ByaW1hcnlfcGxhbmUoaW50ZWxf Y3J0Yyk7CisKIAlJOTE1X1dSSVRFKERWU0NOVFIocGlwZSksIEk5MTVfUkVBRChEVlNDTlRSKHBp cGUpKSAmIH5EVlNfRU5BQkxFKTsKIAkvKiBEaXNhYmxlIHRoZSBzY2FsZXIgKi8KIAlJOTE1X1dS SVRFKERWU1NDQUxFKHBpcGUpLCAwKTsKIAkvKiBGbHVzaCBkb3VibGUgYnVmZmVyZWQgcmVnaXN0 ZXIgdXBkYXRlcyAqLwogCUk5MTVfV1JJVEUoRFZTU1VSRihwaXBlKSwgMCk7Ci0JUE9TVElOR19S RUFEKERWU1NVUkYocGlwZSkpOworCisJaW50ZWxfZmx1c2hfcHJpbWFyeV9wbGFuZShkZXZfcHJp diwgaW50ZWxfY3J0Yy0+cGxhbmUpOwogCiAJaWYgKGF0b21pY191cGRhdGUpCiAJCWludGVsX3Bp cGVfdXBkYXRlX2VuZChpbnRlbF9jcnRjLCBzdGFydF92YmxfY291bnQpOwpAQCAtNjUwLDIwICs2 NzksMTAgQEAgaWxrX2Rpc2FibGVfcGxhbmUoc3RydWN0IGRybV9wbGFuZSAqcGxhbmUsIHN0cnVj dCBkcm1fY3J0YyAqY3J0YykKIH0KIAogc3RhdGljIHZvaWQKLWludGVsX2VuYWJsZV9wcmltYXJ5 KHN0cnVjdCBkcm1fY3J0YyAqY3J0YykKK2ludGVsX3Bvc3RfZW5hYmxlX3ByaW1hcnkoc3RydWN0 IGRybV9jcnRjICpjcnRjKQogewogCXN0cnVjdCBkcm1fZGV2aWNlICpkZXYgPSBjcnRjLT5kZXY7 Ci0Jc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0gZGV2LT5kZXZfcHJpdmF0ZTsK IAlzdHJ1Y3QgaW50ZWxfY3J0YyAqaW50ZWxfY3J0YyA9IHRvX2ludGVsX2NydGMoY3J0Yyk7Ci0J aW50IHJlZyA9IERTUENOVFIoaW50ZWxfY3J0Yy0+cGxhbmUpOwotCi0JaWYgKGludGVsX2NydGMt PnByaW1hcnlfZW5hYmxlZCkKLQkJcmV0dXJuOwotCi0JaW50ZWxfY3J0Yy0+cHJpbWFyeV9lbmFi bGVkID0gdHJ1ZTsKLQotCUk5MTVfV1JJVEUocmVnLCBJOTE1X1JFQUQocmVnKSB8IERJU1BMQVlf UExBTkVfRU5BQkxFKTsKLQlpbnRlbF9mbHVzaF9wcmltYXJ5X3BsYW5lKGRldl9wcml2LCBpbnRl bF9jcnRjLT5wbGFuZSk7CiAKIAkvKgogCSAqIEZJWE1FIElQUyBzaG91bGQgYmUgZmluZSBhcyBs b25nIGFzIG9uZSBwbGFuZSBpcwpAQCAtNjgyLDE3ICs3MDEsMTEgQEAgaW50ZWxfZW5hYmxlX3By aW1hcnkoc3RydWN0IGRybV9jcnRjICpjcnRjKQogfQogCiBzdGF0aWMgdm9pZAotaW50ZWxfZGlz YWJsZV9wcmltYXJ5KHN0cnVjdCBkcm1fY3J0YyAqY3J0YykKK2ludGVsX3ByZV9kaXNhYmxlX3By aW1hcnkoc3RydWN0IGRybV9jcnRjICpjcnRjKQogewogCXN0cnVjdCBkcm1fZGV2aWNlICpkZXYg PSBjcnRjLT5kZXY7CiAJc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0gZGV2LT5k ZXZfcHJpdmF0ZTsKIAlzdHJ1Y3QgaW50ZWxfY3J0YyAqaW50ZWxfY3J0YyA9IHRvX2ludGVsX2Ny dGMoY3J0Yyk7Ci0JaW50IHJlZyA9IERTUENOVFIoaW50ZWxfY3J0Yy0+cGxhbmUpOwotCi0JaWYg KCFpbnRlbF9jcnRjLT5wcmltYXJ5X2VuYWJsZWQpCi0JCXJldHVybjsKLQotCWludGVsX2NydGMt PnByaW1hcnlfZW5hYmxlZCA9IGZhbHNlOwogCiAJbXV0ZXhfbG9jaygmZGV2LT5zdHJ1Y3RfbXV0 ZXgpOwogCWlmIChkZXZfcHJpdi0+ZmJjLnBsYW5lID09IGludGVsX2NydGMtPnBsYW5lKQpAQCAt NzA2LDkgKzcxOSw2IEBAIGludGVsX2Rpc2FibGVfcHJpbWFyeShzdHJ1Y3QgZHJtX2NydGMgKmNy dGMpCiAJICogdmVyc2EuCiAJICovCiAJaHN3X2Rpc2FibGVfaXBzKGludGVsX2NydGMpOwotCi0J STkxNV9XUklURShyZWcsIEk5MTVfUkVBRChyZWcpICYgfkRJU1BMQVlfUExBTkVfRU5BQkxFKTsK LQlpbnRlbF9mbHVzaF9wcmltYXJ5X3BsYW5lKGRldl9wcml2LCBpbnRlbF9jcnRjLT5wbGFuZSk7 CiB9CiAKIHN0YXRpYyBpbnQKQEAgLTgwMiw3ICs4MTIsNyBAQCBpbnRlbF91cGRhdGVfcGxhbmUo c3RydWN0IGRybV9wbGFuZSAqcGxhbmUsIHN0cnVjdCBkcm1fY3J0YyAqY3J0YywKIAlzdHJ1Y3Qg ZHJtX2k5MTVfZ2VtX29iamVjdCAqb2JqID0gaW50ZWxfZmItPm9iajsKIAlzdHJ1Y3QgZHJtX2k5 MTVfZ2VtX29iamVjdCAqb2xkX29iaiA9IGludGVsX3BsYW5lLT5vYmo7CiAJaW50IHJldDsKLQli b29sIGRpc2FibGVfcHJpbWFyeSA9IGZhbHNlOworCWJvb2wgcHJpbWFyeV9lbmFibGVkOwogCWJv b2wgdmlzaWJsZTsKIAlpbnQgaHNjYWxlLCB2c2NhbGU7CiAJaW50IG1heF9zY2FsZSwgbWluX3Nj YWxlOwpAQCAtOTczLDggKzk4Myw4IEBAIGludGVsX3VwZGF0ZV9wbGFuZShzdHJ1Y3QgZHJtX3Bs YW5lICpwbGFuZSwgc3RydWN0IGRybV9jcnRjICpjcnRjLAogCSAqIElmIHRoZSBzcHJpdGUgaXMg Y29tcGxldGVseSBjb3ZlcmluZyB0aGUgcHJpbWFyeSBwbGFuZSwKIAkgKiB3ZSBjYW4gZGlzYWJs ZSB0aGUgcHJpbWFyeSBhbmQgc2F2ZSBwb3dlci4KIAkgKi8KLQlkaXNhYmxlX3ByaW1hcnkgPSBk cm1fcmVjdF9lcXVhbHMoJmRzdCwgJmNsaXApICYmICFjb2xvcmtleV9lbmFibGVkKGludGVsX3Bs YW5lKTsKLQlXQVJOX09OKGRpc2FibGVfcHJpbWFyeSAmJiAhdmlzaWJsZSAmJiBpbnRlbF9jcnRj LT5hY3RpdmUpOworCXByaW1hcnlfZW5hYmxlZCA9ICFkcm1fcmVjdF9lcXVhbHMoJmRzdCwgJmNs aXApIHx8IGNvbG9ya2V5X2VuYWJsZWQoaW50ZWxfcGxhbmUpOworCVdBUk5fT04oIXByaW1hcnlf ZW5hYmxlZCAmJiAhdmlzaWJsZSAmJiBpbnRlbF9jcnRjLT5hY3RpdmUpOwogCiAJbXV0ZXhfbG9j aygmZGV2LT5zdHJ1Y3RfbXV0ZXgpOwogCkBAIC0xMDAxLDEyICsxMDExLDEyIEBAIGludGVsX3Vw ZGF0ZV9wbGFuZShzdHJ1Y3QgZHJtX3BsYW5lICpwbGFuZSwgc3RydWN0IGRybV9jcnRjICpjcnRj LAogCWludGVsX3BsYW5lLT5vYmogPSBvYmo7CiAKIAlpZiAoaW50ZWxfY3J0Yy0+YWN0aXZlKSB7 Ci0JCS8qCi0JCSAqIEJlIHN1cmUgdG8gcmUtZW5hYmxlIHRoZSBwcmltYXJ5IGJlZm9yZSB0aGUg c3ByaXRlIGlzIG5vIGxvbmdlcgotCQkgKiBjb3ZlcmluZyBpdCBmdWxseS4KLQkJICovCi0JCWlm ICghZGlzYWJsZV9wcmltYXJ5KQotCQkJaW50ZWxfZW5hYmxlX3ByaW1hcnkoY3J0Yyk7CisJCWJv b2wgcHJpbWFyeV93YXNfZW5hYmxlZCA9IGludGVsX2NydGMtPnByaW1hcnlfZW5hYmxlZDsKKwor CQlpbnRlbF9jcnRjLT5wcmltYXJ5X2VuYWJsZWQgPSBwcmltYXJ5X2VuYWJsZWQ7CisKKwkJaWYg KHByaW1hcnlfd2FzX2VuYWJsZWQgJiYgIXByaW1hcnlfZW5hYmxlZCkKKwkJCWludGVsX3ByZV9k aXNhYmxlX3ByaW1hcnkoY3J0Yyk7CiAKIAkJaWYgKHZpc2libGUpCiAJCQlpbnRlbF9wbGFuZS0+ dXBkYXRlX3BsYW5lKHBsYW5lLCBjcnRjLCBmYiwgb2JqLApAQCAtMTAxNSw4ICsxMDI1LDggQEAg aW50ZWxfdXBkYXRlX3BsYW5lKHN0cnVjdCBkcm1fcGxhbmUgKnBsYW5lLCBzdHJ1Y3QgZHJtX2Ny dGMgKmNydGMsCiAJCWVsc2UKIAkJCWludGVsX3BsYW5lLT5kaXNhYmxlX3BsYW5lKHBsYW5lLCBj cnRjKTsKIAotCQlpZiAoZGlzYWJsZV9wcmltYXJ5KQotCQkJaW50ZWxfZGlzYWJsZV9wcmltYXJ5 KGNydGMpOworCQlpZiAoIXByaW1hcnlfd2FzX2VuYWJsZWQgJiYgcHJpbWFyeV9lbmFibGVkKQor CQkJaW50ZWxfcG9zdF9lbmFibGVfcHJpbWFyeShjcnRjKTsKIAl9CiAKIAkvKiBVbnBpbiBvbGQg b2JqIGFmdGVyIG5ldyBvbmUgaXMgYWN0aXZlIHRvIGF2b2lkIHVnbGluZXNzICovCkBAIC0xMDU0 LDggKzEwNjQsMTQgQEAgaW50ZWxfZGlzYWJsZV9wbGFuZShzdHJ1Y3QgZHJtX3BsYW5lICpwbGFu ZSkKIAlpbnRlbF9jcnRjID0gdG9faW50ZWxfY3J0YyhwbGFuZS0+Y3J0Yyk7CiAKIAlpZiAoaW50 ZWxfY3J0Yy0+YWN0aXZlKSB7Ci0JCWludGVsX2VuYWJsZV9wcmltYXJ5KHBsYW5lLT5jcnRjKTsK KwkJYm9vbCBwcmltYXJ5X3dhc19lbmFibGVkID0gaW50ZWxfY3J0Yy0+cHJpbWFyeV9lbmFibGVk OworCisJCWludGVsX2NydGMtPnByaW1hcnlfZW5hYmxlZCA9IHRydWU7CisKIAkJaW50ZWxfcGxh bmUtPmRpc2FibGVfcGxhbmUocGxhbmUsIHBsYW5lLT5jcnRjKTsKKworCQlpZiAoIXByaW1hcnlf d2FzX2VuYWJsZWQgJiYgaW50ZWxfY3J0Yy0+cHJpbWFyeV9lbmFibGVkKQorCQkJaW50ZWxfcG9z dF9lbmFibGVfcHJpbWFyeShwbGFuZS0+Y3J0Yyk7CiAJfQogCiAJaWYgKGludGVsX3BsYW5lLT5v YmopIHsKLS0gCjEuOC4zLjIKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fCkludGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNr dG9wLm9yZwpodHRwOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50 ZWwtZ2Z4Cg==