From: Tvrtko Ursulin Subject: [PATCH 02/10] drm/i915: Make GEM object create and create from data take dev_priv Date: Wed, 30 Nov 2016 11:35:32 +0000 Message-ID: <1480505740-1920-3-git-send-email-tvrtko.ursulin@linux.intel.com> References: <1480505740-1920-1-git-send-email-tvrtko.ursulin@linux.intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mail-wm0-x242.google.com (mail-wm0-x242.google.com [IPv6:2a00:1450:400c:c09::242]) by gabe.freedesktop.org (Postfix) with ESMTPS id 07C206E118 for ; Wed, 30 Nov 2016 11:35:51 +0000 (UTC) Received: by mail-wm0-x242.google.com with SMTP id a20so29029408wme.2 for ; Wed, 30 Nov 2016 03:35:50 -0800 (PST) In-Reply-To: <1480505740-1920-1-git-send-email-tvrtko.ursulin@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 RnJvbTogVHZydGtvIFVyc3VsaW4gPHR2cnRrby51cnN1bGluQGludGVsLmNvbT4KCk1ha2VzIGFs bCBHRU0gb2JqZWN0IGNvbnN0cnVjdG9ycyBjb25zaXN0ZW50LgoKU2lnbmVkLW9mZi1ieTogVHZy dGtvIFVyc3VsaW4gPHR2cnRrby51cnN1bGluQGludGVsLmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9k cm0vaTkxNS9pOTE1X2Rydi5oICAgICAgICAgICAgfCAgOSArKysrKy0tLS0KIGRyaXZlcnMvZ3B1 L2RybS9pOTE1L2k5MTVfZ2VtLmMgICAgICAgICAgICB8IDIwICsrKysrKysrKystLS0tLS0tLS0t CiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9jb250ZXh0LmMgICAgfCAgNSArKystLQog ZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9ndWNfc3VibWlzc2lvbi5jIHwgIDIgKy0KIGRyaXZl cnMvZ3B1L2RybS9pOTE1L2k5MTVfcGVyZi5jICAgICAgICAgICB8ICAyICstCiBkcml2ZXJzL2dw dS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMgICAgICAgfCAgMiArLQogZHJpdmVycy9ncHUvZHJt L2k5MTUvaW50ZWxfZmJkZXYuYyAgICAgICAgIHwgIDIgKy0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1 L2ludGVsX2d1Y19sb2FkZXIuYyAgICB8ICA1ICsrKy0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9p bnRlbF9scmMuYyAgICAgICAgICAgfCAgNCArKy0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRl bF9vdmVybGF5LmMgICAgICAgfCAgMiArLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcmlu Z2J1ZmZlci5jICAgIHwgIDQgKystLQogMTEgZmlsZXMgY2hhbmdlZCwgMzAgaW5zZXJ0aW9ucygr KSwgMjcgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkx NV9kcnYuaCBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmgKaW5kZXggNzIyYzY4NzY2 NTA0Li43NjlmNjQyMDJiNGMgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVf ZHJ2LmgKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuaApAQCAtMjk4OSwxMCAr Mjk4OSwxMSBAQCBzdGF0aWMgaW5saW5lIHZvaWQgaTkxNV9nZW1fb2JqZWN0X2ZyZWUoc3RydWN0 IGRybV9pOTE1X2dlbV9vYmplY3QgKm9iaikKIAogdm9pZCBpOTE1X2dlbV9vYmplY3RfaW5pdChz dHJ1Y3QgZHJtX2k5MTVfZ2VtX29iamVjdCAqb2JqLAogCQkJIGNvbnN0IHN0cnVjdCBkcm1faTkx NV9nZW1fb2JqZWN0X29wcyAqb3BzKTsKLXN0cnVjdCBkcm1faTkxNV9nZW1fb2JqZWN0ICppOTE1 X2dlbV9vYmplY3RfY3JlYXRlKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsCi0JCQkJCQkgICB1NjQg c2l6ZSk7Ci1zdHJ1Y3QgZHJtX2k5MTVfZ2VtX29iamVjdCAqaTkxNV9nZW1fb2JqZWN0X2NyZWF0 ZV9mcm9tX2RhdGEoCi0JCXN0cnVjdCBkcm1fZGV2aWNlICpkZXYsIGNvbnN0IHZvaWQgKmRhdGEs IHNpemVfdCBzaXplKTsKK3N0cnVjdCBkcm1faTkxNV9nZW1fb2JqZWN0ICoKK2k5MTVfZ2VtX29i amVjdF9jcmVhdGUoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2LCB1NjQgc2l6ZSk7 CitzdHJ1Y3QgZHJtX2k5MTVfZ2VtX29iamVjdCAqCitpOTE1X2dlbV9vYmplY3RfY3JlYXRlX2Zy b21fZGF0YShzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYsCisJCQkJIGNvbnN0IHZv aWQgKmRhdGEsIHNpemVfdCBzaXplKTsKIHZvaWQgaTkxNV9nZW1fY2xvc2Vfb2JqZWN0KHN0cnVj dCBkcm1fZ2VtX29iamVjdCAqZ2VtLCBzdHJ1Y3QgZHJtX2ZpbGUgKmZpbGUpOwogdm9pZCBpOTE1 X2dlbV9mcmVlX29iamVjdChzdHJ1Y3QgZHJtX2dlbV9vYmplY3QgKm9iaik7CiAKZGlmZiAtLWdp dCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkx NS9pOTE1X2dlbS5jCmluZGV4IDA0YWY0MmVmOWIwZS4uMWY4ZWFiM2EwMjFmIDEwMDY0NAotLS0g YS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9p OTE1L2k5MTVfZ2VtLmMKQEAgLTYyNCw3ICs2MjQsNyBAQCBpOTE1X2dlbV9waHlzX3B3cml0ZShz dHJ1Y3QgZHJtX2k5MTVfZ2VtX29iamVjdCAqb2JqLAogCiBzdGF0aWMgaW50CiBpOTE1X2dlbV9j cmVhdGUoc3RydWN0IGRybV9maWxlICpmaWxlLAotCQlzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LAor CQlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYsCiAJCXVpbnQ2NF90IHNpemUsCiAJ CXVpbnQzMl90ICpoYW5kbGVfcCkKIHsKQEAgLTYzNyw3ICs2MzcsNyBAQCBpOTE1X2dlbV9jcmVh dGUoc3RydWN0IGRybV9maWxlICpmaWxlLAogCQlyZXR1cm4gLUVJTlZBTDsKIAogCS8qIEFsbG9j YXRlIHRoZSBuZXcgb2JqZWN0ICovCi0Jb2JqID0gaTkxNV9nZW1fb2JqZWN0X2NyZWF0ZShkZXYs IHNpemUpOworCW9iaiA9IGk5MTVfZ2VtX29iamVjdF9jcmVhdGUoZGV2X3ByaXYsIHNpemUpOwog CWlmIChJU19FUlIob2JqKSkKIAkJcmV0dXJuIFBUUl9FUlIob2JqKTsKIApAQCAtNjU5LDcgKzY1 OSw3IEBAIGk5MTVfZ2VtX2R1bWJfY3JlYXRlKHN0cnVjdCBkcm1fZmlsZSAqZmlsZSwKIAkvKiBo YXZlIHRvIHdvcmsgb3V0IHNpemUvcGl0Y2ggYW5kIHJldHVybiB0aGVtICovCiAJYXJncy0+cGl0 Y2ggPSBBTElHTihhcmdzLT53aWR0aCAqIERJVl9ST1VORF9VUChhcmdzLT5icHAsIDgpLCA2NCk7 CiAJYXJncy0+c2l6ZSA9IGFyZ3MtPnBpdGNoICogYXJncy0+aGVpZ2h0OwotCXJldHVybiBpOTE1 X2dlbV9jcmVhdGUoZmlsZSwgZGV2LAorCXJldHVybiBpOTE1X2dlbV9jcmVhdGUoZmlsZSwgdG9f aTkxNShkZXYpLAogCQkJICAgICAgIGFyZ3MtPnNpemUsICZhcmdzLT5oYW5kbGUpOwogfQogCkBA IC02NzMsMTEgKzY3MywxMiBAQCBpbnQKIGk5MTVfZ2VtX2NyZWF0ZV9pb2N0bChzdHJ1Y3QgZHJt X2RldmljZSAqZGV2LCB2b2lkICpkYXRhLAogCQkgICAgICBzdHJ1Y3QgZHJtX2ZpbGUgKmZpbGUp CiB7CisJc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0gdG9faTkxNShkZXYpOwog CXN0cnVjdCBkcm1faTkxNV9nZW1fY3JlYXRlICphcmdzID0gZGF0YTsKIAotCWk5MTVfZ2VtX2Zs dXNoX2ZyZWVfb2JqZWN0cyh0b19pOTE1KGRldikpOworCWk5MTVfZ2VtX2ZsdXNoX2ZyZWVfb2Jq ZWN0cyhkZXZfcHJpdik7CiAKLQlyZXR1cm4gaTkxNV9nZW1fY3JlYXRlKGZpbGUsIGRldiwKKwly ZXR1cm4gaTkxNV9nZW1fY3JlYXRlKGZpbGUsIGRldl9wcml2LAogCQkJICAgICAgIGFyZ3MtPnNp emUsICZhcmdzLT5oYW5kbGUpOwogfQogCkBAIC0zOTU5LDkgKzM5NjAsOCBAQCBzdGF0aWMgY29u c3Qgc3RydWN0IGRybV9pOTE1X2dlbV9vYmplY3Rfb3BzIGk5MTVfZ2VtX29iamVjdF9vcHMgPSB7 CiAJKHNpemVvZih4KSA+IHNpemVvZihUKSAmJiAoeCkgPj4gKHNpemVvZihUKSAqIEJJVFNfUEVS X0JZVEUpKQogCiBzdHJ1Y3QgZHJtX2k5MTVfZ2VtX29iamVjdCAqCi1pOTE1X2dlbV9vYmplY3Rf Y3JlYXRlKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsIHU2NCBzaXplKQoraTkxNV9nZW1fb2JqZWN0 X2NyZWF0ZShzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYsIHU2NCBzaXplKQogewot CXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9IHRvX2k5MTUoZGV2KTsKIAlzdHJ1 Y3QgZHJtX2k5MTVfZ2VtX29iamVjdCAqb2JqOwogCXN0cnVjdCBhZGRyZXNzX3NwYWNlICptYXBw aW5nOwogCWdmcF90IG1hc2s7CkBAIC0zOTgyLDcgKzM5ODIsNyBAQCBpOTE1X2dlbV9vYmplY3Rf Y3JlYXRlKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsIHU2NCBzaXplKQogCWlmIChvYmogPT0gTlVM TCkKIAkJcmV0dXJuIEVSUl9QVFIoLUVOT01FTSk7CiAKLQlyZXQgPSBkcm1fZ2VtX29iamVjdF9p bml0KGRldiwgJm9iai0+YmFzZSwgc2l6ZSk7CisJcmV0ID0gZHJtX2dlbV9vYmplY3RfaW5pdCgm ZGV2X3ByaXYtPmRybSwgJm9iai0+YmFzZSwgc2l6ZSk7CiAJaWYgKHJldCkKIAkJZ290byBmYWls OwogCkBAIC00NzM4LDcgKzQ3MzgsNyBAQCB2b2lkIGk5MTVfZ2VtX3RyYWNrX2ZiKHN0cnVjdCBk cm1faTkxNV9nZW1fb2JqZWN0ICpvbGQsCiAKIC8qIEFsbG9jYXRlIGEgbmV3IEdFTSBvYmplY3Qg YW5kIGZpbGwgaXQgd2l0aCB0aGUgc3VwcGxpZWQgZGF0YSAqLwogc3RydWN0IGRybV9pOTE1X2dl bV9vYmplY3QgKgotaTkxNV9nZW1fb2JqZWN0X2NyZWF0ZV9mcm9tX2RhdGEoc3RydWN0IGRybV9k ZXZpY2UgKmRldiwKK2k5MTVfZ2VtX29iamVjdF9jcmVhdGVfZnJvbV9kYXRhKHN0cnVjdCBkcm1f aTkxNV9wcml2YXRlICpkZXZfcHJpdiwKIAkJCSAgICAgICAgIGNvbnN0IHZvaWQgKmRhdGEsIHNp emVfdCBzaXplKQogewogCXN0cnVjdCBkcm1faTkxNV9nZW1fb2JqZWN0ICpvYmo7CkBAIC00NzQ2 LDcgKzQ3NDYsNyBAQCBpOTE1X2dlbV9vYmplY3RfY3JlYXRlX2Zyb21fZGF0YShzdHJ1Y3QgZHJt X2RldmljZSAqZGV2LAogCXNpemVfdCBieXRlczsKIAlpbnQgcmV0OwogCi0Jb2JqID0gaTkxNV9n ZW1fb2JqZWN0X2NyZWF0ZShkZXYsIHJvdW5kX3VwKHNpemUsIFBBR0VfU0laRSkpOworCW9iaiA9 IGk5MTVfZ2VtX29iamVjdF9jcmVhdGUoZGV2X3ByaXYsIHJvdW5kX3VwKHNpemUsIFBBR0VfU0la RSkpOwogCWlmIChJU19FUlIob2JqKSkKIAkJcmV0dXJuIG9iajsKIApkaWZmIC0tZ2l0IGEvZHJp dmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fY29udGV4dC5jIGIvZHJpdmVycy9ncHUvZHJtL2k5 MTUvaTkxNV9nZW1fY29udGV4dC5jCmluZGV4IGE2YWRkMGMxNDA0NS4uNTI0MWI1MWRkOTg2IDEw MDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9jb250ZXh0LmMKKysrIGIv ZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fY29udGV4dC5jCkBAIC0xNjksMTIgKzE2OSwx MyBAQCB2b2lkIGk5MTVfZ2VtX2NvbnRleHRfZnJlZShzdHJ1Y3Qga3JlZiAqY3R4X3JlZikKIHN0 YXRpYyBzdHJ1Y3QgZHJtX2k5MTVfZ2VtX29iamVjdCAqCiBhbGxvY19jb250ZXh0X29iaihzdHJ1 Y3QgZHJtX2RldmljZSAqZGV2LCB1NjQgc2l6ZSkKIHsKKwlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0 ZSAqZGV2X3ByaXYgPSB0b19pOTE1KGRldik7CiAJc3RydWN0IGRybV9pOTE1X2dlbV9vYmplY3Qg Km9iajsKIAlpbnQgcmV0OwogCiAJbG9ja2RlcF9hc3NlcnRfaGVsZCgmZGV2LT5zdHJ1Y3RfbXV0 ZXgpOwogCi0Jb2JqID0gaTkxNV9nZW1fb2JqZWN0X2NyZWF0ZShkZXYsIHNpemUpOworCW9iaiA9 IGk5MTVfZ2VtX29iamVjdF9jcmVhdGUoZGV2X3ByaXYsIHNpemUpOwogCWlmIChJU19FUlIob2Jq KSkKIAkJcmV0dXJuIG9iajsKIApAQCAtMTkzLDcgKzE5NCw3IEBAIGFsbG9jX2NvbnRleHRfb2Jq KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsIHU2NCBzaXplKQogCSAqIFRoaXMgaXMgb25seSBhcHBs aWNhYmxlIGZvciBJdnkgQnJpZGdlIGRldmljZXMgc2luY2UKIAkgKiBsYXRlciBwbGF0Zm9ybXMg ZG9uJ3QgaGF2ZSBMMyBjb250cm9sIGJpdHMgaW4gdGhlIFBURS4KIAkgKi8KLQlpZiAoSVNfSVZZ QlJJREdFKHRvX2k5MTUoZGV2KSkpIHsKKwlpZiAoSVNfSVZZQlJJREdFKGRldl9wcml2KSkgewog CQlyZXQgPSBpOTE1X2dlbV9vYmplY3Rfc2V0X2NhY2hlX2xldmVsKG9iaiwgSTkxNV9DQUNIRV9M M19MTEMpOwogCQkvKiBGYWlsdXJlIHNob3VsZG4ndCBldmVyIGhhcHBlbiB0aGlzIGVhcmx5ICov CiAJCWlmIChXQVJOX09OKHJldCkpIHsKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1 L2k5MTVfZ3VjX3N1Ym1pc3Npb24uYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ3VjX3N1 Ym1pc3Npb24uYwppbmRleCA1ODQxMzgwM2JhM2MuLjEwMDNiNDQzMTEyYyAxMDA2NDQKLS0tIGEv ZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9ndWNfc3VibWlzc2lvbi5jCisrKyBiL2RyaXZlcnMv Z3B1L2RybS9pOTE1L2k5MTVfZ3VjX3N1Ym1pc3Npb24uYwpAQCAtNTc0LDcgKzU3NCw3IEBAIHN0 YXRpYyBzdHJ1Y3QgaTkxNV92bWEgKmd1Y19hbGxvY2F0ZV92bWEoc3RydWN0IGludGVsX2d1YyAq Z3VjLCB1MzIgc2l6ZSkKIAlzdHJ1Y3QgaTkxNV92bWEgKnZtYTsKIAlpbnQgcmV0OwogCi0Jb2Jq ID0gaTkxNV9nZW1fb2JqZWN0X2NyZWF0ZSgmZGV2X3ByaXYtPmRybSwgc2l6ZSk7CisJb2JqID0g aTkxNV9nZW1fb2JqZWN0X2NyZWF0ZShkZXZfcHJpdiwgc2l6ZSk7CiAJaWYgKElTX0VSUihvYmop KQogCQlyZXR1cm4gRVJSX0NBU1Qob2JqKTsKIApkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJt L2k5MTUvaTkxNV9wZXJmLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X3BlcmYuYwppbmRl eCAxNGRlOWE0ZWVlMjcuLjU2NjlmMDg2MjQ1OCAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJt L2k5MTUvaTkxNV9wZXJmLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9wZXJmLmMK QEAgLTc3Myw3ICs3NzMsNyBAQCBzdGF0aWMgaW50IGFsbG9jX29hX2J1ZmZlcihzdHJ1Y3QgZHJt X2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpCiAJQlVJTERfQlVHX09OX05PVF9QT1dFUl9PRl8yKE9B X0JVRkZFUl9TSVpFKTsKIAlCVUlMRF9CVUdfT04oT0FfQlVGRkVSX1NJWkUgPCBTWl8xMjhLIHx8 IE9BX0JVRkZFUl9TSVpFID4gU1pfMTZNKTsKIAotCWJvID0gaTkxNV9nZW1fb2JqZWN0X2NyZWF0 ZSgmZGV2X3ByaXYtPmRybSwgT0FfQlVGRkVSX1NJWkUpOworCWJvID0gaTkxNV9nZW1fb2JqZWN0 X2NyZWF0ZShkZXZfcHJpdiwgT0FfQlVGRkVSX1NJWkUpOwogCWlmIChJU19FUlIoYm8pKSB7CiAJ CURSTV9FUlJPUigiRmFpbGVkIHRvIGFsbG9jYXRlIE9BIGJ1ZmZlclxuIik7CiAJCXJldCA9IFBU Ul9FUlIoYm8pOwpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxh eS5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jCmluZGV4IDQ0NWU3ODUz OWRlYS4uMjc4NWM2MTlmYTU1IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRl bF9kaXNwbGF5LmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jCkBA IC0xMDk5OCw3ICsxMDk5OCw3IEBAIGludGVsX2ZyYW1lYnVmZmVyX2NyZWF0ZV9mb3JfbW9kZShz dHJ1Y3QgZHJtX2RldmljZSAqZGV2LAogCXN0cnVjdCBkcm1faTkxNV9nZW1fb2JqZWN0ICpvYmo7 CiAJc3RydWN0IGRybV9tb2RlX2ZiX2NtZDIgbW9kZV9jbWQgPSB7IDAgfTsKIAotCW9iaiA9IGk5 MTVfZ2VtX29iamVjdF9jcmVhdGUoZGV2LAorCW9iaiA9IGk5MTVfZ2VtX29iamVjdF9jcmVhdGUo dG9faTkxNShkZXYpLAogCQkJCSAgICBpbnRlbF9mcmFtZWJ1ZmZlcl9zaXplX2Zvcl9tb2RlKG1v ZGUsIGJwcCkpOwogCWlmIChJU19FUlIob2JqKSkKIAkJcmV0dXJuIEVSUl9DQVNUKG9iaik7CmRp ZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9mYmRldi5jIGIvZHJpdmVycy9n cHUvZHJtL2k5MTUvaW50ZWxfZmJkZXYuYwppbmRleCA3YzUxODNkOGUyOWUuLjIxNjNhYWFkNmEz NiAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZmJkZXYuYworKysgYi9k cml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9mYmRldi5jCkBAIC0xNDcsNyArMTQ3LDcgQEAgc3Rh dGljIGludCBpbnRlbGZiX2FsbG9jKHN0cnVjdCBkcm1fZmJfaGVscGVyICpoZWxwZXIsCiAJaWYg KHNpemUgKiAyIDwgZ2d0dC0+c3RvbGVuX3VzYWJsZV9zaXplKQogCQlvYmogPSBpOTE1X2dlbV9v YmplY3RfY3JlYXRlX3N0b2xlbihkZXZfcHJpdiwgc2l6ZSk7CiAJaWYgKG9iaiA9PSBOVUxMKQot CQlvYmogPSBpOTE1X2dlbV9vYmplY3RfY3JlYXRlKGRldiwgc2l6ZSk7CisJCW9iaiA9IGk5MTVf Z2VtX29iamVjdF9jcmVhdGUoZGV2X3ByaXYsIHNpemUpOwogCWlmIChJU19FUlIob2JqKSkgewog CQlEUk1fRVJST1IoImZhaWxlZCB0byBhbGxvY2F0ZSBmcmFtZWJ1ZmZlclxuIik7CiAJCXJldCA9 IFBUUl9FUlIob2JqKTsKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2d1 Y19sb2FkZXIuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2d1Y19sb2FkZXIuYwppbmRl eCBhMzMwZmE0OTkzODQuLjk5MjY3NDdkMTYwZiAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJt L2k5MTUvaW50ZWxfZ3VjX2xvYWRlci5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVs X2d1Y19sb2FkZXIuYwpAQCAtNTkwLDYgKzU5MCw3IEBAIGludCBpbnRlbF9ndWNfc2V0dXAoc3Ry dWN0IGRybV9kZXZpY2UgKmRldikKIAogc3RhdGljIHZvaWQgZ3VjX2Z3X2ZldGNoKHN0cnVjdCBk cm1fZGV2aWNlICpkZXYsIHN0cnVjdCBpbnRlbF9ndWNfZncgKmd1Y19mdykKIHsKKwlzdHJ1Y3Qg ZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSB0b19pOTE1KGRldik7CiAJc3RydWN0IHBjaV9k ZXYgKnBkZXYgPSBkZXYtPnBkZXY7CiAJc3RydWN0IGRybV9pOTE1X2dlbV9vYmplY3QgKm9iajsK IAljb25zdCBzdHJ1Y3QgZmlybXdhcmUgKmZ3ID0gTlVMTDsKQEAgLTY0OCw3ICs2NDksNyBAQCBz dGF0aWMgdm9pZCBndWNfZndfZmV0Y2goc3RydWN0IGRybV9kZXZpY2UgKmRldiwgc3RydWN0IGlu dGVsX2d1Y19mdyAqZ3VjX2Z3KQogCiAJLyogSGVhZGVyIGFuZCB1Q29kZSB3aWxsIGJlIGxvYWRl ZCB0byBXT1BDTS4gU2l6ZSBvZiB0aGUgdHdvLiAqLwogCXNpemUgPSBndWNfZnctPmhlYWRlcl9z aXplICsgZ3VjX2Z3LT51Y29kZV9zaXplOwotCWlmIChzaXplID4gZ3VjX3dvcGNtX3NpemUodG9f aTkxNShkZXYpKSkgeworCWlmIChzaXplID4gZ3VjX3dvcGNtX3NpemUoZGV2X3ByaXYpKSB7CiAJ CURSTV9OT1RFKCJGaXJtd2FyZSBpcyB0b28gbGFyZ2UgdG8gZml0IGluIFdPUENNXG4iKTsKIAkJ Z290byBmYWlsOwogCX0KQEAgLTY3Niw3ICs2NzcsNyBAQCBzdGF0aWMgdm9pZCBndWNfZndfZmV0 Y2goc3RydWN0IGRybV9kZXZpY2UgKmRldiwgc3RydWN0IGludGVsX2d1Y19mdyAqZ3VjX2Z3KQog CQkJZ3VjX2Z3LT5ndWNfZndfbWFqb3Jfd2FudGVkLCBndWNfZnctPmd1Y19md19taW5vcl93YW50 ZWQpOwogCiAJbXV0ZXhfbG9jaygmZGV2LT5zdHJ1Y3RfbXV0ZXgpOwotCW9iaiA9IGk5MTVfZ2Vt X29iamVjdF9jcmVhdGVfZnJvbV9kYXRhKGRldiwgZnctPmRhdGEsIGZ3LT5zaXplKTsKKwlvYmog PSBpOTE1X2dlbV9vYmplY3RfY3JlYXRlX2Zyb21fZGF0YShkZXZfcHJpdiwgZnctPmRhdGEsIGZ3 LT5zaXplKTsKIAltdXRleF91bmxvY2soJmRldi0+c3RydWN0X211dGV4KTsKIAlpZiAoSVNfRVJS X09SX05VTEwob2JqKSkgewogCQllcnIgPSBvYmogPyBQVFJfRVJSKG9iaikgOiAtRU5PTUVNOwpk aWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfbHJjLmMgYi9kcml2ZXJzL2dw dS9kcm0vaTkxNS9pbnRlbF9scmMuYwppbmRleCBiMmMwZDUwOWUxOTEuLjY3YWVjOGYzM2MxZCAx MDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfbHJjLmMKKysrIGIvZHJpdmVy cy9ncHUvZHJtL2k5MTUvaW50ZWxfbHJjLmMKQEAgLTEyNDMsNyArMTI0Myw3IEBAIHN0YXRpYyBp bnQgbHJjX3NldHVwX3dhX2N0eF9vYmooc3RydWN0IGludGVsX2VuZ2luZV9jcyAqZW5naW5lLCB1 MzIgc2l6ZSkKIAlzdHJ1Y3QgaTkxNV92bWEgKnZtYTsKIAlpbnQgZXJyOwogCi0Jb2JqID0gaTkx NV9nZW1fb2JqZWN0X2NyZWF0ZSgmZW5naW5lLT5pOTE1LT5kcm0sIFBBR0VfQUxJR04oc2l6ZSkp OworCW9iaiA9IGk5MTVfZ2VtX29iamVjdF9jcmVhdGUoZW5naW5lLT5pOTE1LCBQQUdFX0FMSUdO KHNpemUpKTsKIAlpZiAoSVNfRVJSKG9iaikpCiAJCXJldHVybiBQVFJfRVJSKG9iaik7CiAKQEAg LTIyNDIsNyArMjI0Miw3IEBAIHN0YXRpYyBpbnQgZXhlY2xpc3RzX2NvbnRleHRfZGVmZXJyZWRf YWxsb2Moc3RydWN0IGk5MTVfZ2VtX2NvbnRleHQgKmN0eCwKIAkvKiBPbmUgZXh0cmEgcGFnZSBh cyB0aGUgc2hhcmluZyBkYXRhIGJldHdlZW4gZHJpdmVyIGFuZCBHdUMgKi8KIAljb250ZXh0X3Np emUgKz0gUEFHRV9TSVpFICogTFJDX1BQSFdTUF9QTjsKIAotCWN0eF9vYmogPSBpOTE1X2dlbV9v YmplY3RfY3JlYXRlKCZjdHgtPmk5MTUtPmRybSwgY29udGV4dF9zaXplKTsKKwljdHhfb2JqID0g aTkxNV9nZW1fb2JqZWN0X2NyZWF0ZShjdHgtPmk5MTUsIGNvbnRleHRfc2l6ZSk7CiAJaWYgKElT X0VSUihjdHhfb2JqKSkgewogCQlEUk1fREVCVUdfRFJJVkVSKCJBbGxvYyBMUkMgYmFja2luZyBv YmogZmFpbGVkLlxuIik7CiAJCXJldHVybiBQVFJfRVJSKGN0eF9vYmopOwpkaWZmIC0tZ2l0IGEv ZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfb3ZlcmxheS5jIGIvZHJpdmVycy9ncHUvZHJtL2k5 MTUvaW50ZWxfb3ZlcmxheS5jCmluZGV4IDBhN2I4M2FhYTJiNC4uOTBkYTZhNzA3ZGU3IDEwMDY0 NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9vdmVybGF5LmMKKysrIGIvZHJpdmVy cy9ncHUvZHJtL2k5MTUvaW50ZWxfb3ZlcmxheS5jCkBAIC0xMzkzLDcgKzEzOTMsNyBAQCB2b2lk IGludGVsX3NldHVwX292ZXJsYXkoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KQog CWlmICghT1ZFUkxBWV9ORUVEU19QSFlTSUNBTChkZXZfcHJpdikpCiAJCXJlZ19ibyA9IGk5MTVf Z2VtX29iamVjdF9jcmVhdGVfc3RvbGVuKGRldl9wcml2LCBQQUdFX1NJWkUpOwogCWlmIChyZWdf Ym8gPT0gTlVMTCkKLQkJcmVnX2JvID0gaTkxNV9nZW1fb2JqZWN0X2NyZWF0ZSgmZGV2X3ByaXYt PmRybSwgUEFHRV9TSVpFKTsKKwkJcmVnX2JvID0gaTkxNV9nZW1fb2JqZWN0X2NyZWF0ZShkZXZf cHJpdiwgUEFHRV9TSVpFKTsKIAlpZiAoSVNfRVJSKHJlZ19ibykpCiAJCWdvdG8gb3V0X2ZyZWU7 CiAJb3ZlcmxheS0+cmVnX2JvID0gcmVnX2JvOwpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJt L2k5MTUvaW50ZWxfcmluZ2J1ZmZlci5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcmlu Z2J1ZmZlci5jCmluZGV4IGUxOTNlNTJmNjY5ZC4uYmMxOGE0ZjI2NDNkIDEwMDY0NAotLS0gYS9k cml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9yaW5nYnVmZmVyLmMKKysrIGIvZHJpdmVycy9ncHUv ZHJtL2k5MTUvaW50ZWxfcmluZ2J1ZmZlci5jCkBAIC0xODcxLDcgKzE4NzEsNyBAQCBpbnRlbF9y aW5nX2NyZWF0ZV92bWEoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2LCBpbnQgc2l6 ZSkKIAogCW9iaiA9IGk5MTVfZ2VtX29iamVjdF9jcmVhdGVfc3RvbGVuKGRldl9wcml2LCBzaXpl KTsKIAlpZiAoIW9iaikKLQkJb2JqID0gaTkxNV9nZW1fb2JqZWN0X2NyZWF0ZSgmZGV2X3ByaXYt PmRybSwgc2l6ZSk7CisJCW9iaiA9IGk5MTVfZ2VtX29iamVjdF9jcmVhdGUoZGV2X3ByaXYsIHNp emUpOwogCWlmIChJU19FUlIob2JqKSkKIAkJcmV0dXJuIEVSUl9DQVNUKG9iaik7CiAKQEAgLTI0 NTIsNyArMjQ1Miw3IEBAIHN0YXRpYyB2b2lkIGludGVsX3JpbmdfaW5pdF9zZW1hcGhvcmVzKHN0 cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiwKIAlpZiAoSU5URUxfR0VOKGRldl9wcml2 KSA+PSA4ICYmICFkZXZfcHJpdi0+c2VtYXBob3JlKSB7CiAJCXN0cnVjdCBpOTE1X3ZtYSAqdm1h OwogCi0JCW9iaiA9IGk5MTVfZ2VtX29iamVjdF9jcmVhdGUoJmRldl9wcml2LT5kcm0sIDQwOTYp OworCQlvYmogPSBpOTE1X2dlbV9vYmplY3RfY3JlYXRlKGRldl9wcml2LCA0MDk2KTsKIAkJaWYg KElTX0VSUihvYmopKQogCQkJZ290byBlcnI7CiAKLS0gCjIuNy40CgpfX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0Cklu dGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5v cmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK