From mboxrd@z Thu Jan 1 00:00:00 1970 From: ville.syrjala@linux.intel.com Subject: [PATCH v2 4/5] drm/i915: Perform primary enable/disable atomically with sprite updates Date: Thu, 13 Feb 2014 17:42:53 +0200 Message-ID: <1392306174-9148-5-git-send-email-ville.syrjala@linux.intel.com> References: <1392306174-9148-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 0D6A3FB32A for ; Thu, 13 Feb 2014 07:43:18 -0800 (PST) In-Reply-To: <1392306174-9148-1-git-send-email-ville.syrjala@linux.intel.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: intel-gfx-bounces@lists.freedesktop.org Errors-To: intel-gfx-bounces@lists.freedesktop.org To: intel-gfx@lists.freedesktop.org List-Id: intel-gfx@lists.freedesktop.org RnJvbTogVmlsbGUgU3lyasOkbMOkIDx2aWxsZS5zeXJqYWxhQGxpbnV4LmludGVsLmNvbT4KCk1v dmUgdGhlIHByaW1hcnkgcGxhbmUgZW5hYmxlL2Rpc2FibGUgdG8gb2NjdXIgYXRvbWljYWxseSB3 aXRoIHRoZQpzcHJpdGUgdXBkYXRlIHRoYXQgY2F1c2VkIHRoZSBwcmltYXJ5IHBsYW5lIHZpc2li aWxpdHkgdG8gY2hhbmdlLgoKRkJDIGFuZCBJUFMgZW5hYmxlL2Rpc2FibGUgaXMgbGVmdCB0byBo YXBwZW4gd2VsbCBiZWZvcmUgb3IgYWZ0ZXIKdGhlIHByaW1hcnkgcGxhbmUgY2hhbmdlLgoKdjI6 IFBhc3MgaW50ZWxfY3J0YyBpbnN0ZWFkIG9mIGRybV9jcnRjIChEYW5pZWwpCgpSZXZpZXdlZC1i eTogSmVzc2UgQmFybmVzIDxqYmFybmVzQHZpcnR1b3VzZ2Vlay5vcmc+ClNpZ25lZC1vZmYtYnk6 IFZpbGxlIFN5cmrDpGzDpCA8dmlsbGUuc3lyamFsYUBsaW51eC5pbnRlbC5jb20+Ci0tLQogZHJp dmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfc3ByaXRlLmMgfCA5NCArKysrKysrKysrKysrKysrKysr KysrLS0tLS0tLS0tLS0tLS0tCiAxIGZpbGUgY2hhbmdlZCwgNTUgaW5zZXJ0aW9ucygrKSwgMzkg ZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfc3By aXRlLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9zcHJpdGUuYwppbmRleCBmNDU1YTJl Li4xOTNhZWYxIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9zcHJpdGUu YworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9zcHJpdGUuYwpAQCAtMTAyLDYgKzEw MiwxNyBAQCBzdGF0aWMgdm9pZCBpbnRlbF9waXBlX3VwZGF0ZV9lbmQoc3RydWN0IGludGVsX2Ny dGMgKmNydGMpCiAJcHJlZW1wdF9jaGVja19yZXNjaGVkKCk7CiB9CiAKK3N0YXRpYyB2b2lkIGlu dGVsX3VwZGF0ZV9wcmltYXJ5X3BsYW5lKHN0cnVjdCBpbnRlbF9jcnRjICpjcnRjKQoreworCXN0 cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9IGNydGMtPmJhc2UuZGV2LT5kZXZfcHJp dmF0ZTsKKwlpbnQgcmVnID0gRFNQQ05UUihjcnRjLT5wbGFuZSk7CisKKwlpZiAoY3J0Yy0+cHJp bWFyeV9lbmFibGVkKQorCQlJOTE1X1dSSVRFKHJlZywgSTkxNV9SRUFEKHJlZykgfCBESVNQTEFZ X1BMQU5FX0VOQUJMRSk7CisJZWxzZQorCQlJOTE1X1dSSVRFKHJlZywgSTkxNV9SRUFEKHJlZykg JiB+RElTUExBWV9QTEFORV9FTkFCTEUpOworfQorCiBzdGF0aWMgdm9pZAogdmx2X3VwZGF0ZV9w bGFuZShzdHJ1Y3QgZHJtX3BsYW5lICpkcGxhbmUsIHN0cnVjdCBkcm1fY3J0YyAqY3J0YywKIAkJ IHN0cnVjdCBkcm1fZnJhbWVidWZmZXIgKmZiLApAQCAtMTk5LDYgKzIxMCw4IEBAIHZsdl91cGRh dGVfcGxhbmUoc3RydWN0IGRybV9wbGFuZSAqZHBsYW5lLCBzdHJ1Y3QgZHJtX2NydGMgKmNydGMs CiAKIAlpbnRlbF9waXBlX3VwZGF0ZV9zdGFydChpbnRlbF9jcnRjKTsKIAorCWludGVsX3VwZGF0 ZV9wcmltYXJ5X3BsYW5lKGludGVsX2NydGMpOworCiAJSTkxNV9XUklURShTUFNUUklERShwaXBl LCBwbGFuZSksIGZiLT5waXRjaGVzWzBdKTsKIAlJOTE1X1dSSVRFKFNQUE9TKHBpcGUsIHBsYW5l KSwgKGNydGNfeSA8PCAxNikgfCBjcnRjX3gpOwogCkBAIC0yMTEsNyArMjI0LDggQEAgdmx2X3Vw ZGF0ZV9wbGFuZShzdHJ1Y3QgZHJtX3BsYW5lICpkcGxhbmUsIHN0cnVjdCBkcm1fY3J0YyAqY3J0 YywKIAlJOTE1X1dSSVRFKFNQQ05UUihwaXBlLCBwbGFuZSksIHNwcmN0bCk7CiAJSTkxNV9XUklU RShTUFNVUkYocGlwZSwgcGxhbmUpLCBpOTE1X2dlbV9vYmpfZ2d0dF9vZmZzZXQob2JqKSArCiAJ CSAgIHNwcnN1cmZfb2Zmc2V0KTsKLQlQT1NUSU5HX1JFQUQoU1BTVVJGKHBpcGUsIHBsYW5lKSk7 CisKKwlpbnRlbF9mbHVzaF9wcmltYXJ5X3BsYW5lKGRldl9wcml2LCBpbnRlbF9jcnRjLT5wbGFu ZSk7CiAKIAlpbnRlbF9waXBlX3VwZGF0ZV9lbmQoaW50ZWxfY3J0Yyk7CiB9CkBAIC0yMjgsMTEg KzI0MiwxNCBAQCB2bHZfZGlzYWJsZV9wbGFuZShzdHJ1Y3QgZHJtX3BsYW5lICpkcGxhbmUsIHN0 cnVjdCBkcm1fY3J0YyAqY3J0YykKIAogCWludGVsX3BpcGVfdXBkYXRlX3N0YXJ0KGludGVsX2Ny dGMpOwogCisJaW50ZWxfdXBkYXRlX3ByaW1hcnlfcGxhbmUoaW50ZWxfY3J0Yyk7CisKIAlJOTE1 X1dSSVRFKFNQQ05UUihwaXBlLCBwbGFuZSksIEk5MTVfUkVBRChTUENOVFIocGlwZSwgcGxhbmUp KSAmCiAJCSAgIH5TUF9FTkFCTEUpOwogCS8qIEFjdGl2YXRlIGRvdWJsZSBidWZmZXJlZCByZWdp c3RlciB1cGRhdGUgKi8KIAlJOTE1X1dSSVRFKFNQU1VSRihwaXBlLCBwbGFuZSksIDApOwotCVBP U1RJTkdfUkVBRChTUFNVUkYocGlwZSwgcGxhbmUpKTsKKworCWludGVsX2ZsdXNoX3ByaW1hcnlf cGxhbmUoZGV2X3ByaXYsIGludGVsX2NydGMtPnBsYW5lKTsKIAogCWludGVsX3BpcGVfdXBkYXRl X2VuZChpbnRlbF9jcnRjKTsKIApAQCAtMzc3LDYgKzM5NCw4IEBAIGl2Yl91cGRhdGVfcGxhbmUo c3RydWN0IGRybV9wbGFuZSAqcGxhbmUsIHN0cnVjdCBkcm1fY3J0YyAqY3J0YywKIAogCWludGVs X3BpcGVfdXBkYXRlX3N0YXJ0KGludGVsX2NydGMpOwogCisJaW50ZWxfdXBkYXRlX3ByaW1hcnlf cGxhbmUoaW50ZWxfY3J0Yyk7CisKIAlJOTE1X1dSSVRFKFNQUlNUUklERShwaXBlKSwgZmItPnBp dGNoZXNbMF0pOwogCUk5MTVfV1JJVEUoU1BSUE9TKHBpcGUpLCAoY3J0Y195IDw8IDE2KSB8IGNy dGNfeCk7CiAKQEAgLTM5NSw3ICs0MTQsOCBAQCBpdmJfdXBkYXRlX3BsYW5lKHN0cnVjdCBkcm1f cGxhbmUgKnBsYW5lLCBzdHJ1Y3QgZHJtX2NydGMgKmNydGMsCiAJSTkxNV9XUklURShTUFJDVEwo cGlwZSksIHNwcmN0bCk7CiAJSTkxNV9XUklURShTUFJTVVJGKHBpcGUpLAogCQkgICBpOTE1X2dl bV9vYmpfZ2d0dF9vZmZzZXQob2JqKSArIHNwcnN1cmZfb2Zmc2V0KTsKLQlQT1NUSU5HX1JFQUQo U1BSU1VSRihwaXBlKSk7CisKKwlpbnRlbF9mbHVzaF9wcmltYXJ5X3BsYW5lKGRldl9wcml2LCBp bnRlbF9jcnRjLT5wbGFuZSk7CiAKIAlpbnRlbF9waXBlX3VwZGF0ZV9lbmQoaW50ZWxfY3J0Yyk7 CiB9CkBAIC00MTEsMTMgKzQzMSwxNiBAQCBpdmJfZGlzYWJsZV9wbGFuZShzdHJ1Y3QgZHJtX3Bs YW5lICpwbGFuZSwgc3RydWN0IGRybV9jcnRjICpjcnRjKQogCiAJaW50ZWxfcGlwZV91cGRhdGVf c3RhcnQoaW50ZWxfY3J0Yyk7CiAKKwlpbnRlbF91cGRhdGVfcHJpbWFyeV9wbGFuZShpbnRlbF9j cnRjKTsKKwogCUk5MTVfV1JJVEUoU1BSQ1RMKHBpcGUpLCBJOTE1X1JFQUQoU1BSQ1RMKHBpcGUp KSAmIH5TUFJJVEVfRU5BQkxFKTsKIAkvKiBDYW4ndCBsZWF2ZSB0aGUgc2NhbGVyIGVuYWJsZWQu Li4gKi8KIAlpZiAoaW50ZWxfcGxhbmUtPmNhbl9zY2FsZSkKIAkJSTkxNV9XUklURShTUFJTQ0FM RShwaXBlKSwgMCk7CiAJLyogQWN0aXZhdGUgZG91YmxlIGJ1ZmZlcmVkIHJlZ2lzdGVyIHVwZGF0 ZSAqLwogCUk5MTVfV1JJVEUoU1BSU1VSRihwaXBlKSwgMCk7Ci0JUE9TVElOR19SRUFEKFNQUlNV UkYocGlwZSkpOworCisJaW50ZWxfZmx1c2hfcHJpbWFyeV9wbGFuZShkZXZfcHJpdiwgaW50ZWxf Y3J0Yy0+cGxhbmUpOwogCiAJaW50ZWxfcGlwZV91cGRhdGVfZW5kKGludGVsX2NydGMpOwogCkBA IC01NjYsNiArNTg5LDggQEAgaWxrX3VwZGF0ZV9wbGFuZShzdHJ1Y3QgZHJtX3BsYW5lICpwbGFu ZSwgc3RydWN0IGRybV9jcnRjICpjcnRjLAogCiAJaW50ZWxfcGlwZV91cGRhdGVfc3RhcnQoaW50 ZWxfY3J0Yyk7CiAKKwlpbnRlbF91cGRhdGVfcHJpbWFyeV9wbGFuZShpbnRlbF9jcnRjKTsKKwog CUk5MTVfV1JJVEUoRFZTU1RSSURFKHBpcGUpLCBmYi0+cGl0Y2hlc1swXSk7CiAJSTkxNV9XUklU RShEVlNQT1MocGlwZSksIChjcnRjX3kgPDwgMTYpIHwgY3J0Y194KTsKIApAQCAtNTc5LDcgKzYw NCw4IEBAIGlsa191cGRhdGVfcGxhbmUoc3RydWN0IGRybV9wbGFuZSAqcGxhbmUsIHN0cnVjdCBk cm1fY3J0YyAqY3J0YywKIAlJOTE1X1dSSVRFKERWU0NOVFIocGlwZSksIGR2c2NudHIpOwogCUk5 MTVfV1JJVEUoRFZTU1VSRihwaXBlKSwKIAkJICAgaTkxNV9nZW1fb2JqX2dndHRfb2Zmc2V0KG9i aikgKyBkdnNzdXJmX29mZnNldCk7Ci0JUE9TVElOR19SRUFEKERWU1NVUkYocGlwZSkpOworCisJ aW50ZWxfZmx1c2hfcHJpbWFyeV9wbGFuZShkZXZfcHJpdiwgaW50ZWxfY3J0Yy0+cGxhbmUpOwog CiAJaW50ZWxfcGlwZV91cGRhdGVfZW5kKGludGVsX2NydGMpOwogfQpAQCAtNTk1LDEyICs2MjEs MTUgQEAgaWxrX2Rpc2FibGVfcGxhbmUoc3RydWN0IGRybV9wbGFuZSAqcGxhbmUsIHN0cnVjdCBk cm1fY3J0YyAqY3J0YykKIAogCWludGVsX3BpcGVfdXBkYXRlX3N0YXJ0KGludGVsX2NydGMpOwog CisJaW50ZWxfdXBkYXRlX3ByaW1hcnlfcGxhbmUoaW50ZWxfY3J0Yyk7CisKIAlJOTE1X1dSSVRF KERWU0NOVFIocGlwZSksIEk5MTVfUkVBRChEVlNDTlRSKHBpcGUpKSAmIH5EVlNfRU5BQkxFKTsK IAkvKiBEaXNhYmxlIHRoZSBzY2FsZXIgKi8KIAlJOTE1X1dSSVRFKERWU1NDQUxFKHBpcGUpLCAw KTsKIAkvKiBGbHVzaCBkb3VibGUgYnVmZmVyZWQgcmVnaXN0ZXIgdXBkYXRlcyAqLwogCUk5MTVf V1JJVEUoRFZTU1VSRihwaXBlKSwgMCk7Ci0JUE9TVElOR19SRUFEKERWU1NVUkYocGlwZSkpOwor CisJaW50ZWxfZmx1c2hfcHJpbWFyeV9wbGFuZShkZXZfcHJpdiwgaW50ZWxfY3J0Yy0+cGxhbmUp OwogCiAJaW50ZWxfcGlwZV91cGRhdGVfZW5kKGludGVsX2NydGMpOwogCkBAIC02MTQsMjAgKzY0 MywxMCBAQCBpbGtfZGlzYWJsZV9wbGFuZShzdHJ1Y3QgZHJtX3BsYW5lICpwbGFuZSwgc3RydWN0 IGRybV9jcnRjICpjcnRjKQogfQogCiBzdGF0aWMgdm9pZAotaW50ZWxfZW5hYmxlX3ByaW1hcnko c3RydWN0IGRybV9jcnRjICpjcnRjKQoraW50ZWxfcG9zdF9lbmFibGVfcHJpbWFyeShzdHJ1Y3Qg ZHJtX2NydGMgKmNydGMpCiB7CiAJc3RydWN0IGRybV9kZXZpY2UgKmRldiA9IGNydGMtPmRldjsK LQlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSBkZXYtPmRldl9wcml2YXRlOwog CXN0cnVjdCBpbnRlbF9jcnRjICppbnRlbF9jcnRjID0gdG9faW50ZWxfY3J0YyhjcnRjKTsKLQlp bnQgcmVnID0gRFNQQ05UUihpbnRlbF9jcnRjLT5wbGFuZSk7Ci0KLQlpZiAoaW50ZWxfY3J0Yy0+ cHJpbWFyeV9lbmFibGVkKQotCQlyZXR1cm47Ci0KLQlpbnRlbF9jcnRjLT5wcmltYXJ5X2VuYWJs ZWQgPSB0cnVlOwotCi0JSTkxNV9XUklURShyZWcsIEk5MTVfUkVBRChyZWcpIHwgRElTUExBWV9Q TEFORV9FTkFCTEUpOwotCWludGVsX2ZsdXNoX3ByaW1hcnlfcGxhbmUoZGV2X3ByaXYsIGludGVs X2NydGMtPnBsYW5lKTsKIAogCS8qCiAJICogRklYTUUgSVBTIHNob3VsZCBiZSBmaW5lIGFzIGxv bmcgYXMgb25lIHBsYW5lIGlzCkBAIC02NDYsMTcgKzY2NSwxMSBAQCBpbnRlbF9lbmFibGVfcHJp bWFyeShzdHJ1Y3QgZHJtX2NydGMgKmNydGMpCiB9CiAKIHN0YXRpYyB2b2lkCi1pbnRlbF9kaXNh YmxlX3ByaW1hcnkoc3RydWN0IGRybV9jcnRjICpjcnRjKQoraW50ZWxfcHJlX2Rpc2FibGVfcHJp bWFyeShzdHJ1Y3QgZHJtX2NydGMgKmNydGMpCiB7CiAJc3RydWN0IGRybV9kZXZpY2UgKmRldiA9 IGNydGMtPmRldjsKIAlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSBkZXYtPmRl dl9wcml2YXRlOwogCXN0cnVjdCBpbnRlbF9jcnRjICppbnRlbF9jcnRjID0gdG9faW50ZWxfY3J0 YyhjcnRjKTsKLQlpbnQgcmVnID0gRFNQQ05UUihpbnRlbF9jcnRjLT5wbGFuZSk7Ci0KLQlpZiAo IWludGVsX2NydGMtPnByaW1hcnlfZW5hYmxlZCkKLQkJcmV0dXJuOwotCi0JaW50ZWxfY3J0Yy0+ cHJpbWFyeV9lbmFibGVkID0gZmFsc2U7CiAKIAltdXRleF9sb2NrKCZkZXYtPnN0cnVjdF9tdXRl eCk7CiAJaWYgKGRldl9wcml2LT5mYmMucGxhbmUgPT0gaW50ZWxfY3J0Yy0+cGxhbmUpCkBAIC02 NzAsOSArNjgzLDYgQEAgaW50ZWxfZGlzYWJsZV9wcmltYXJ5KHN0cnVjdCBkcm1fY3J0YyAqY3J0 YykKIAkgKiB2ZXJzYS4KIAkgKi8KIAloc3dfZGlzYWJsZV9pcHMoaW50ZWxfY3J0Yyk7Ci0KLQlJ OTE1X1dSSVRFKHJlZywgSTkxNV9SRUFEKHJlZykgJiB+RElTUExBWV9QTEFORV9FTkFCTEUpOwot CWludGVsX2ZsdXNoX3ByaW1hcnlfcGxhbmUoZGV2X3ByaXYsIGludGVsX2NydGMtPnBsYW5lKTsK IH0KIAogc3RhdGljIGludApAQCAtNzY2LDcgKzc3Niw3IEBAIGludGVsX3VwZGF0ZV9wbGFuZShz dHJ1Y3QgZHJtX3BsYW5lICpwbGFuZSwgc3RydWN0IGRybV9jcnRjICpjcnRjLAogCXN0cnVjdCBk cm1faTkxNV9nZW1fb2JqZWN0ICpvYmogPSBpbnRlbF9mYi0+b2JqOwogCXN0cnVjdCBkcm1faTkx NV9nZW1fb2JqZWN0ICpvbGRfb2JqID0gaW50ZWxfcGxhbmUtPm9iajsKIAlpbnQgcmV0OwotCWJv b2wgZGlzYWJsZV9wcmltYXJ5ID0gZmFsc2U7CisJYm9vbCBwcmltYXJ5X2VuYWJsZWQ7CiAJYm9v bCB2aXNpYmxlOwogCWludCBoc2NhbGUsIHZzY2FsZTsKIAlpbnQgbWF4X3NjYWxlLCBtaW5fc2Nh bGU7CkBAIC05MzcsOCArOTQ3LDggQEAgaW50ZWxfdXBkYXRlX3BsYW5lKHN0cnVjdCBkcm1fcGxh bmUgKnBsYW5lLCBzdHJ1Y3QgZHJtX2NydGMgKmNydGMsCiAJICogSWYgdGhlIHNwcml0ZSBpcyBj b21wbGV0ZWx5IGNvdmVyaW5nIHRoZSBwcmltYXJ5IHBsYW5lLAogCSAqIHdlIGNhbiBkaXNhYmxl IHRoZSBwcmltYXJ5IGFuZCBzYXZlIHBvd2VyLgogCSAqLwotCWRpc2FibGVfcHJpbWFyeSA9IGRy bV9yZWN0X2VxdWFscygmZHN0LCAmY2xpcCkgJiYgIWNvbG9ya2V5X2VuYWJsZWQoaW50ZWxfcGxh bmUpOwotCVdBUk5fT04oZGlzYWJsZV9wcmltYXJ5ICYmICF2aXNpYmxlICYmIGludGVsX2NydGMt PmFjdGl2ZSk7CisJcHJpbWFyeV9lbmFibGVkID0gIWRybV9yZWN0X2VxdWFscygmZHN0LCAmY2xp cCkgfHwgY29sb3JrZXlfZW5hYmxlZChpbnRlbF9wbGFuZSk7CisJV0FSTl9PTighcHJpbWFyeV9l bmFibGVkICYmICF2aXNpYmxlICYmIGludGVsX2NydGMtPmFjdGl2ZSk7CiAKIAltdXRleF9sb2Nr KCZkZXYtPnN0cnVjdF9tdXRleCk7CiAKQEAgLTk2NSwxMiArOTc1LDEyIEBAIGludGVsX3VwZGF0 ZV9wbGFuZShzdHJ1Y3QgZHJtX3BsYW5lICpwbGFuZSwgc3RydWN0IGRybV9jcnRjICpjcnRjLAog CWludGVsX3BsYW5lLT5vYmogPSBvYmo7CiAKIAlpZiAoaW50ZWxfY3J0Yy0+YWN0aXZlKSB7Ci0J CS8qCi0JCSAqIEJlIHN1cmUgdG8gcmUtZW5hYmxlIHRoZSBwcmltYXJ5IGJlZm9yZSB0aGUgc3By aXRlIGlzIG5vIGxvbmdlcgotCQkgKiBjb3ZlcmluZyBpdCBmdWxseS4KLQkJICovCi0JCWlmICgh ZGlzYWJsZV9wcmltYXJ5KQotCQkJaW50ZWxfZW5hYmxlX3ByaW1hcnkoY3J0Yyk7CisJCWJvb2wg cHJpbWFyeV93YXNfZW5hYmxlZCA9IGludGVsX2NydGMtPnByaW1hcnlfZW5hYmxlZDsKKworCQlp bnRlbF9jcnRjLT5wcmltYXJ5X2VuYWJsZWQgPSBwcmltYXJ5X2VuYWJsZWQ7CisKKwkJaWYgKHBy aW1hcnlfd2FzX2VuYWJsZWQgJiYgIXByaW1hcnlfZW5hYmxlZCkKKwkJCWludGVsX3ByZV9kaXNh YmxlX3ByaW1hcnkoY3J0Yyk7CiAKIAkJaWYgKHZpc2libGUpCiAJCQlpbnRlbF9wbGFuZS0+dXBk YXRlX3BsYW5lKHBsYW5lLCBjcnRjLCBmYiwgb2JqLApAQCAtOTc5LDggKzk4OSw4IEBAIGludGVs X3VwZGF0ZV9wbGFuZShzdHJ1Y3QgZHJtX3BsYW5lICpwbGFuZSwgc3RydWN0IGRybV9jcnRjICpj cnRjLAogCQllbHNlCiAJCQlpbnRlbF9wbGFuZS0+ZGlzYWJsZV9wbGFuZShwbGFuZSwgY3J0Yyk7 CiAKLQkJaWYgKGRpc2FibGVfcHJpbWFyeSkKLQkJCWludGVsX2Rpc2FibGVfcHJpbWFyeShjcnRj KTsKKwkJaWYgKCFwcmltYXJ5X3dhc19lbmFibGVkICYmIHByaW1hcnlfZW5hYmxlZCkKKwkJCWlu dGVsX3Bvc3RfZW5hYmxlX3ByaW1hcnkoY3J0Yyk7CiAJfQogCiAJLyogVW5waW4gb2xkIG9iaiBh ZnRlciBuZXcgb25lIGlzIGFjdGl2ZSB0byBhdm9pZCB1Z2xpbmVzcyAqLwpAQCAtMTAxOCw4ICsx MDI4LDE0IEBAIGludGVsX2Rpc2FibGVfcGxhbmUoc3RydWN0IGRybV9wbGFuZSAqcGxhbmUpCiAJ aW50ZWxfY3J0YyA9IHRvX2ludGVsX2NydGMocGxhbmUtPmNydGMpOwogCiAJaWYgKGludGVsX2Ny dGMtPmFjdGl2ZSkgewotCQlpbnRlbF9lbmFibGVfcHJpbWFyeShwbGFuZS0+Y3J0Yyk7CisJCWJv b2wgcHJpbWFyeV93YXNfZW5hYmxlZCA9IGludGVsX2NydGMtPnByaW1hcnlfZW5hYmxlZDsKKwor CQlpbnRlbF9jcnRjLT5wcmltYXJ5X2VuYWJsZWQgPSB0cnVlOworCiAJCWludGVsX3BsYW5lLT5k aXNhYmxlX3BsYW5lKHBsYW5lLCBwbGFuZS0+Y3J0Yyk7CisKKwkJaWYgKCFwcmltYXJ5X3dhc19l bmFibGVkICYmIGludGVsX2NydGMtPnByaW1hcnlfZW5hYmxlZCkKKwkJCWludGVsX3Bvc3RfZW5h YmxlX3ByaW1hcnkocGxhbmUtPmNydGMpOwogCX0KIAogCWlmIChpbnRlbF9wbGFuZS0+b2JqKSB7 Ci0tIAoxLjguMy4yCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5v cmcKaHR0cDovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ludGVsLWdm eAo=