From mboxrd@z Thu Jan 1 00:00:00 1970 From: Maarten Lankhorst Subject: Re: [PATCH] drm/i915: Don't WARN() when sprite watermark > 0 for disabled LP2/LP3 levels Date: Mon, 7 Mar 2016 11:52:18 +0100 Message-ID: <56DD5D62.2040703@linux.intel.com> References: <1457043489-12885-1-git-send-email-matthew.d.roper@intel.com> <20160304104538.GN10446@intel.com> <20160304173740.GA426@intel.com> <20160304174709.GU10446@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 13D2B6E334 for ; Mon, 7 Mar 2016 10:52:21 +0000 (UTC) In-Reply-To: <20160304174709.GU10446@intel.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" To: =?UTF-8?B?VmlsbGUgU3lyasOkbMOk?= , Matt Roper Cc: intel-gfx@lists.freedesktop.org, Paulo Zanoni List-Id: intel-gfx@lists.freedesktop.org T3AgMDQtMDMtMTYgb20gMTg6NDcgc2NocmVlZiBWaWxsZSBTeXJqw6Rsw6Q6Cj4gT24gRnJpLCBN YXIgMDQsIDIwMTYgYXQgMDk6Mzc6NDBBTSAtMDgwMCwgTWF0dCBSb3BlciB3cm90ZToKPj4gT24g RnJpLCBNYXIgMDQsIDIwMTYgYXQgMTI6NDU6MzhQTSArMDIwMCwgVmlsbGUgU3lyasOkbMOkIHdy b3RlOgo+Pj4gT24gVGh1LCBNYXIgMDMsIDIwMTYgYXQgMDI6MTg6MDlQTSAtMDgwMCwgTWF0dCBS b3BlciB3cm90ZToKPj4+PiBBcyBvZiBjb21taXQgZDgxZjA0YzVlZiAoImRybS9pOTE1OiBBbGxv dyBwcmVzZXJ2YXRpb24gb2Ygd2F0ZXJtYXJrcywgdjIuIikKPj4+PiBpdCdzIG5vdyBwb3NzaWJs ZSB0byBoYXZlIG5vbi16ZXJvIHZhbHVlcyBmb3Igd2F0ZXJtYXJrIGxldmVscyB0aGF0IGFyZQo+ Pj4+IGRpc2FibGVkIChlLmcuLCBpbiB0aGUgaGlnaGVyIExQIGxldmVscyB0aGF0IGNhbiBvbmx5 IGJlIHVzZWQgd2hlbiB0aGUgc3ByaXRlCj4+Pj4gaXMgZGlzYWJsZWQpLiAgU3RvcCBXQVJOKCkn aW5nIHdoZW4gd2Ugc2VlIHRoZXNlIG5vbi16ZXJvIHNwcml0ZSB2YWx1ZXMgaW4gTFAyCj4+Pj4g b3IgTFAzLgo+Pj4+Cj4+Pj4gRml4ZXMgdGhlIFNOQiB3YXJuaW5nOgo+Pj4+Cj4+Pj4gICAgV0FS TklORzogQ1BVOiAxIFBJRDogMjU0MDUgYXQgL2hvbWUvbWF0dHJvcGUvd29yay9rZXJuZWwvZ21z L2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3BtLmM6MjU4MCBpbGtfcHJvZ3JhbV93YXRlcm1h cmtzKzB4N2IyLzB4OWQwIFtpOTE1XSgpCj4+Pj4gICAgV0FSTl9PTih3bV9scCAhPSAxKQo+Pj4+ ICAgIE1vZHVsZXMgbGlua2VkIGluOiBpOTE1IGRybV9rbXNfaGVscGVyIGRybSBibHVldG9vdGgg ZnVzZSBpVENPX3dkdCBpVENPX3ZlbmRvcl9zdXBwb3J0IHN5c2NvcHlhcmVhIHN5c2ZpbGxyZWN0 IHN5c2ltZ2JsdCBmYl9zeXNfZm9wcyB0cG1fdGlzIG1laV9tZSBlMTAwMGUgc25kX2hkYV9jb2Rl Y19oZG1pIHBjc3BrciB0cG0gbWVpIGkyY19pODAxIGxwY19pY2ggc25kX2hkYV9jb2RlYyBzbmRf aGRhX2NvcmUgW2xhc3QgdW5sb2FkZWQ6IGRybV0KPj4+PiAgICBDUFU6IDEgUElEOiAyNTQwNSBD b21tOiBrbXNfdW5pdmVyc2FsX3AgVGFpbnRlZDogRyAgICAgVSAgVyAgICAgICA0LjUuMC1yYzZh cG9sbG9sYWtlKyAjNDYyCj4+Pj4gICAgSGFyZHdhcmUgbmFtZTogICAgICAgICAgICAgICAgICAv REg2N0dELCBCSU9TIEJMSDY3MTBILjg2QS4wMTYwLjIwMTIuMTIwNC4xMTU2IDEyLzA0LzIwMTIK Pj4+PiAgICAgMDAwMDAwMDAwMDAwMDAwMCBmZmZmODgwMDlkNDJiOTE4IGZmZmZmZmZmODE0M2Nm YWIgZmZmZjg4MDA5ZDQyYjk2MAo+Pj4+ICAgICBmZmZmZmZmZmEwMzYzNTgwIGZmZmY4ODAwOWQ0 MmI5NTAgZmZmZmZmZmY4MTA4Mjc0NiBmZmZmODgwMGI5YTI0OTI4Cj4+Pj4gICAgIGZmZmY4ODAw OWQ0MmJhMDAgZmZmZjg4MDA5ZDRhMDAwMCAwMDAwMDAwMDAwMDAwMDAwIGZmZmY4ODAwOWQ0MmJh NmMKPj4+PiAgICBDYWxsIFRyYWNlOgo+Pj4+ICAgICBbPGZmZmZmZmZmODE0M2NmYWI+XSBkdW1w X3N0YWNrKzB4NGQvMHg3Mgo+Pj4+ICAgICBbPGZmZmZmZmZmODEwODI3NDY+XSB3YXJuX3Nsb3dw YXRoX2NvbW1vbisweDg2LzB4YzAKPj4+PiAgICAgWzxmZmZmZmZmZjgxMDgyN2NjPl0gd2Fybl9z bG93cGF0aF9mbXQrMHg0Yy8weDUwCj4+Pj4gICAgIFs8ZmZmZmZmZmZhMDI5Mjg2Mj5dIGlsa19w cm9ncmFtX3dhdGVybWFya3MrMHg3YjIvMHg5ZDAgW2k5MTVdCj4+Pj4gICAgIFs8ZmZmZmZmZmZh MDI5MmNiNz5dIGlsa19pbml0aWFsX3dhdGVybWFya3MrMHgxMDcvMHgxMjAgW2k5MTVdCj4+Pj4g ICAgIFs8ZmZmZmZmZmZhMDJmZWZmYT5dIGludGVsX3ByZV9wbGFuZV91cGRhdGUrMHgxMmEvMHgx OTAgW2k5MTVdCj4+Pj4gICAgIFs8ZmZmZmZmZmZhMDJmZmIzNj5dIGludGVsX2F0b21pY19jb21t aXQrMHg1NDYvMHhkNTAgW2k5MTVdCj4+Pj4gICAgIFs8ZmZmZmZmZmZhMDEyYzllNz5dIGRybV9h dG9taWNfY29tbWl0KzB4MzcvMHg2MCBbZHJtXQo+Pj4+ICAgICBbPGZmZmZmZmZmYTAyMTczNjE+ XSBkcm1fYXRvbWljX2hlbHBlcl9kaXNhYmxlX3BsYW5lKzB4YjEvMHhmMCBbZHJtX2ttc19oZWxw ZXJdCj4+Pj4gICAgIFs8ZmZmZmZmZmZhMDExY2RiND5dIF9fc2V0cGxhbmVfaW50ZXJuYWwrMHgx ODQvMHgyODAgW2RybV0KPj4+PiAgICAgWzxmZmZmZmZmZmEwMTJiNTdhPl0gPyBkcm1fbW9kZXNl dF9sb2NrX2FsbF9jdHgrMHg5YS8weGIwIFtkcm1dCj4+Pj4gICAgIFs8ZmZmZmZmZmZhMDEyMDEw Zj5dIGRybV9tb2RlX3NldHBsYW5lKzB4MTNmLzB4MWMwIFtkcm1dCj4+Pj4gICAgIFs8ZmZmZmZm ZmZhMDExMWI1Mj5dIGRybV9pb2N0bCsweDE0Mi8weDU5MCBbZHJtXQo+Pj4+ICAgICBbPGZmZmZm ZmZmYTAxMWZmZDA+XSA/IGRybV9wbGFuZV9jaGVja19waXhlbF9mb3JtYXQrMHg1MC8weDUwIFtk cm1dCj4+Pj4gICAgIFs8ZmZmZmZmZmY4MTFmMjc0ND5dID8gbW50cHV0KzB4MjQvMHg0MAo+Pj4+ ICAgICBbPGZmZmZmZmZmODExZDI4ZDQ+XSA/IF9fZnB1dCsweDE5NC8weDIwMAo+Pj4+ICAgICBb PGZmZmZmZmZmYTAxMmRlYzM+XSBkcm1fY29tcGF0X2lvY3RsKzB4MzMvMHg0MCBbZHJtXQo+Pj4+ ICAgICBbPGZmZmZmZmZmYTAyOWUxYzI+XSBpOTE1X2NvbXBhdF9pb2N0bCsweDMyLzB4NDAgW2k5 MTVdCj4+Pj4gICAgIFs8ZmZmZmZmZmY4MTIyOGQ3Mj5dIGNvbXBhdF9TeVNfaW9jdGwrMHhjMi8w eDMzMAo+Pj4+ICAgICBbPGZmZmZmZmZmODEwMDIxZDU+XSA/IGV4aXRfdG9fdXNlcm1vZGVfbG9v cCsweDk1LzB4YjAKPj4+PiAgICAgWzxmZmZmZmZmZjgxMDAyZDJlPl0gZG9fZmFzdF9zeXNjYWxs XzMyKzB4OWUvMHgyMTAKPj4+PiAgICAgWzxmZmZmZmZmZjgxOTdmYWYyPl0gZW50cnlfU1lTRU5U RVJfY29tcGF0KzB4NTIvMHg3MAo+Pj4+Cj4+Pj4gQ2M6IE1hYXJ0ZW4gTGFua2hvcnN0IDxtYWFy dGVuLmxhbmtob3JzdEBsaW51eC5pbnRlbC5jb20+Cj4+Pj4gQ2M6IFBhdWxvIFphbm9uaSA8cGF1 bG8uci56YW5vbmlAaW50ZWwuY29tPgo+Pj4+IENjOiBWaWxsZSBTeXJqw6Rsw6QgPHZpbGxlLnN5 cmphbGFAbGludXguaW50ZWwuY29tPgo+Pj4+IFRlc3RjYXNlOiBrbXNfdW5pdmVyc2FsX3BsYW5l Cj4+Pj4gRml4ZXM6IGQ4MWYwNGM1ZWYgKCJkcm0vaTkxNTogQWxsb3cgcHJlc2VydmF0aW9uIG9m IHdhdGVybWFya3MsIHYyLiIpCj4+Pj4gU2lnbmVkLW9mZi1ieTogTWF0dCBSb3BlciA8bWF0dGhl dy5kLnJvcGVyQGludGVsLmNvbT4KPj4+PiAtLS0KPj4+PiBUaGUgY29tbWVudCBhYm92ZSB0aGlz IGJsb2NrIG9mIGNvZGUgaW5kaWNhdGVzIHRoYXQgd2UgbmVlZCB0byB0dXJuIG9uCj4+Pj4gV00x U19MUF9FTiwgZXZlbiBpZiB0aGUgTFAgbGV2ZWwgaXMgZGlzYWJsZWQsIHRvIGF2b2lkIHVuZGVy cnVucy4gIEl0J3Mgbm90Cj4+Pj4gY2xlYXIgdG8gbWUgZnJvbSB0aGUgYnNwZWMgd2h5IHRoaXMg aXMsIHNvIEknbSB0cnVzdGluZyB0aGF0IHRoZSBjb21tZW50Cj4+Pj4gaXMgc3RpbGwgYWNjdXJh dGUsIGV2ZW4gdGhvdWdoIHdlIHdpbmQgdXAgd2l0aCBub24temVybyB2YWx1ZXMgbW9yZSBvZnRl bgo+Pj4+IG5vdyB0aGFuIHdlIHByZXZpb3VzbHkgZGlkLgo+Pj4+Cj4+Pj4gIGRyaXZlcnMvZ3B1 L2RybS9pOTE1L2ludGVsX3BtLmMgfCA1ICsrLS0tCj4+Pj4gIDEgZmlsZSBjaGFuZ2VkLCAyIGlu c2VydGlvbnMoKyksIDMgZGVsZXRpb25zKC0pCj4+Pj4KPj4+PiBkaWZmIC0tZ2l0IGEvZHJpdmVy cy9ncHUvZHJtL2k5MTUvaW50ZWxfcG0uYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3Bt LmMKPj4+PiBpbmRleCA4MjM0MzdmLi45Njk4MzYwIDEwMDY0NAo+Pj4+IC0tLSBhL2RyaXZlcnMv Z3B1L2RybS9pOTE1L2ludGVsX3BtLmMKPj4+PiArKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9p bnRlbF9wbS5jCj4+Pj4gQEAgLTI1NzYsMTAgKzI1NzYsOSBAQCBzdGF0aWMgdm9pZCBpbGtfY29t cHV0ZV93bV9yZXN1bHRzKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsCj4+Pj4gIAkJICogQWx3YXlz IHNldCBXTTFTX0xQX0VOIHdoZW4gc3ByX3ZhbCAhPSAwLCBldmVuIGlmIHRoZQo+Pj4+ICAJCSAq IGxldmVsIGlzIGRpc2FibGVkLiBEb2luZyBvdGhlcndpc2UgY291bGQgY2F1c2UgdW5kZXJydW5z Lgo+Pj4+ICAJCSAqLwo+Pj4+IC0JCWlmIChJTlRFTF9JTkZPKGRldiktPmdlbiA8PSA2ICYmIHIt PnNwcl92YWwpIHsKPj4+PiAtCQkJV0FSTl9PTih3bV9scCAhPSAxKTsKPj4+IE5BSwo+Pj4KPj4+ IFRoZXJlIGFyZSBubyBMUDIrIHNwcml0ZSB3YXRlcm1hcmtzIG9uIGlsay9zbmIsIHNvIGlmIHNv bWV0aGluZyBpcwo+Pj4gY29tcHV0aW5nIGl0LCB0aGVuIHdlIGhhdmUgY2xlYXJseSBhIGJ1ZyBz b21ld2hlcmUgZWxzZS4KPj4gVGhhdCdzIHRoZSBwb2ludCBvZiB0aGlzIHBhdGNoLi4uaGF2aW5n IHRoZXNlIHZhbHVlcyBjb21wdXRlZCBpcwo+PiBpbnRlbnRpb25hbCBub3csIG5vdCBhIGJ1Zy4g IFRoZSBwYXRjaCBmcm9tIE1hYXJ0ZW4vUGFhdWxvIGNvbXB1dGVzIHRoZQo+PiB2YWx1ZXMgZm9y ICphbGwqIGxldmVscywgZXZlbiB0aGUgb25lcyB3ZSBrbm93IGFyZSBpbnZhbGlkLCBidXQgbWFy a3MKPj4gdGhlbSBhcyBkaXNhYmxlZC4KPiBUaGVuIEkgdGhpbmsgaXQgc2hvdWxkIGNvbXB1dGUg aXQgYXMgMCBzaW5jZSBzcHJpdGUgTFAyKyB3YXRlcm1hcmtzIHNpbXBseQo+IGRvbid0IGV4aXN0 Lgo+Cj4+IEdpdmVuIHRoYXQgY2hhbmdlIGluIGJlaGF2aW9yLCBpdCBubyBsb25nZXIgbWFrZXMg c2Vuc2UgdG8gd2FybiBvbgo+PiBub24temVybyB2YWx1ZXMgc2luY2UgdGhleSdyZSBleHBlY3Rl ZCBub3cgKGV2ZW4gdGhvdWdoIHRoZXknbGwgbmV2ZXIgYmUKPj4gdXNlZCkuICBNYXliZSBpbnN0 ZWFkIG9mIHJlbW92aW5nIHRoZSBXQVJOKCkgSSBzaG91bGQganVzdCBhZGQgYW4KPj4gIiYmIHIt PmVuYWJsZSIgdG8gdGhlIHdhcm4gY29uZGl0aW9uPwo+Pgo+Pgo+PiBNYXR0Cj4+Cj4+Pj4gKwkJ aWYgKElOVEVMX0lORk8oZGV2KS0+Z2VuIDw9IDYgJiYgci0+c3ByX3ZhbCkKPj4+PiAgCQkJcmVz dWx0cy0+d21fbHBfc3ByW3dtX2xwIC0gMV0gPSBXTTFTX0xQX0VOIHwgci0+c3ByX3ZhbDsKPj4+ PiAtCQl9IGVsc2UKPj4+PiArCQllbHNlCj4+Pj4gIAkJCXJlc3VsdHMtPndtX2xwX3Nwclt3bV9s cCAtIDFdID0gci0+c3ByX3ZhbDsKPj4+PiAgCX0KPj4+PiAgCj4+Pj4gLS0gCj4+Pj4gMi4xLjQK Pj4+IC0tIAo+Pj4gVmlsbGUgU3lyasOkbMOkCj4+PiBJbnRlbCBPVEMKPj4gLS0gCj4+IE1hdHQg Um9wZXIKPj4gR3JhcGhpY3MgU29mdHdhcmUgRW5naW5lZXIKPj4gSW9URyBQbGF0Zm9ybSBFbmFi bGluZyAmIERldmVsb3BtZW50Cj4+IEludGVsIENvcnBvcmF0aW9uCj4+ICg5MTYpIDM1Ni0yNzk1 CgpXb3VsZCB0aGUgZm9sbG93aW5nIHdvcms/CgppbGtfdmFsaWRhdGVfd21fbGV2ZWwgY2hlY2tz IGZvciAhd20tPmVuYWJsZSwgc28gaXQgZG9lcyB0aGUgcmlnaHQgdGhpbmcgaGVyZS4uCgpkaWZm IC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcG0uYyBiL2RyaXZlcnMvZ3B1L2Ry bS9pOTE1L2ludGVsX3BtLmMKaW5kZXggZjY1ZTg0MTM3MDYwLi44NjQwMTk5MDYxY2IgMTAwNjQ0 Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3BtLmMKKysrIGIvZHJpdmVycy9ncHUv ZHJtL2k5MTUvaW50ZWxfcG0uYwpAQCAtMTk3Niw4ICsxOTc2LDI0IEBAIHN0YXRpYyBib29sIGls a192YWxpZGF0ZV93bV9sZXZlbChpbnQgbGV2ZWwsCiAJcmV0dXJuIHJldDsKIH0KIAorc3RhdGlj IGJvb2wgaWxrX3ZhbGlkX3Nwcml0ZV9sZXZlbChjb25zdCBzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0 ZSAqZGV2X3ByaXYsCisJCQkJICAgY29uc3Qgc3RydWN0IGludGVsX3BpcGVfd20gKnBpcGVfd20s CisJCQkJICAgaW50IGxldmVsKQoreworCS8qIElMSy9TTkIvSVZCOiBMUDErIHdhdGVybWFya3Mg b25seSB3L28gc2NhbGluZyAqLworCWlmIChsZXZlbCAmJiBwaXBlX3dtLT5zcHJpdGVzX3NjYWxl ZCkKKwkJcmV0dXJuIGZhbHNlOworCisJLyogSUxLL1NOQjogTFAyKyB3YXRlcm1hcmtzIG9ubHkg dy9vIHNwcml0ZXMgKi8KKwlpZiAobGV2ZWwgPiAxICYmIElOVEVMX0lORk8oZGV2X3ByaXYpLT5n ZW4gPD0gNiAmJiBwaXBlX3dtLT5zcHJpdGVzX2VuYWJsZWQpCisJCXJldHVybiBmYWxzZTsKKwor CXJldHVybiB0cnVlOworfQorCiBzdGF0aWMgdm9pZCBpbGtfY29tcHV0ZV93bV9sZXZlbChjb25z dCBzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYsCiAJCQkJIGNvbnN0IHN0cnVjdCBp bnRlbF9jcnRjICppbnRlbF9jcnRjLAorCQkJCSBjb25zdCBzdHJ1Y3QgaW50ZWxfcGlwZV93bSAq cGlwZV93bSwKIAkJCQkgaW50IGxldmVsLAogCQkJCSBzdHJ1Y3QgaW50ZWxfY3J0Y19zdGF0ZSAq Y3N0YXRlLAogCQkJCSBzdHJ1Y3QgaW50ZWxfcGxhbmVfc3RhdGUgKnByaXN0YXRlLApAQCAtMTk4 OCw2ICsyMDA0LDcgQEAgc3RhdGljIHZvaWQgaWxrX2NvbXB1dGVfd21fbGV2ZWwoY29uc3Qgc3Ry dWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2LAogCXVpbnQxNl90IHByaV9sYXRlbmN5ID0g ZGV2X3ByaXYtPndtLnByaV9sYXRlbmN5W2xldmVsXTsKIAl1aW50MTZfdCBzcHJfbGF0ZW5jeSA9 IGRldl9wcml2LT53bS5zcHJfbGF0ZW5jeVtsZXZlbF07CiAJdWludDE2X3QgY3VyX2xhdGVuY3kg PSBkZXZfcHJpdi0+d20uY3VyX2xhdGVuY3lbbGV2ZWxdOworCWJvb2wgc3ByX3ZhbGlkID0gaWxr X3ZhbGlkX3Nwcml0ZV9sZXZlbChkZXZfcHJpdiwgcGlwZV93bSwgbGV2ZWwpOwogCiAJLyogV00x KyBsYXRlbmN5IHZhbHVlcyBzdG9yZWQgaW4gMC41dXMgdW5pdHMgKi8KIAlpZiAobGV2ZWwgPiAw KSB7CkBAIC0yMDAyLDEzICsyMDE5LDE5IEBAIHN0YXRpYyB2b2lkIGlsa19jb21wdXRlX3dtX2xl dmVsKGNvbnN0IHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiwKIAkJcmVzdWx0LT5m YmNfdmFsID0gaWxrX2NvbXB1dGVfZmJjX3dtKGNzdGF0ZSwgcHJpc3RhdGUsIHJlc3VsdC0+cHJp X3ZhbCk7CiAJfQogCi0JaWYgKHNwcnN0YXRlKQotCQlyZXN1bHQtPnNwcl92YWwgPSBpbGtfY29t cHV0ZV9zcHJfd20oY3N0YXRlLCBzcHJzdGF0ZSwgc3ByX2xhdGVuY3kpOworCWlmIChzcHJzdGF0 ZSAmJiBzcHJfdmFsaWQpCisJCXJlc3VsdC0+c3ByX3ZhbCA9IGlsa19jb21wdXRlX3Nwcl93bShj c3RhdGUsIHNwcnN0YXRlLAorCQkJCQkJICAgICBzcHJfbGF0ZW5jeSk7CisJZWxzZSBpZiAoc3By c3RhdGUpCisJCXJlc3VsdC0+c3ByX3ZhbCA9IDA7CiAKIAlpZiAoY3Vyc3RhdGUpCiAJCXJlc3Vs dC0+Y3VyX3ZhbCA9IGlsa19jb21wdXRlX2N1cl93bShjc3RhdGUsIGN1cnN0YXRlLCBjdXJfbGF0 ZW5jeSk7CiAKLQlyZXN1bHQtPmVuYWJsZSA9IHRydWU7CisJaWYgKGxldmVsICYmIHBpcGVfd20t PnNwcml0ZXNfZW5hYmxlZCAmJiAhc3ByX3ZhbGlkKQorCQlyZXN1bHQtPmVuYWJsZSA9IGZhbHNl OworCWVsc2UKKwkJcmVzdWx0LT5lbmFibGUgPSB0cnVlOwogfQogCiBzdGF0aWMgdWludDMyX3QK QEAgLTIzMDYsNyArMjMyOSw3IEBAIHN0YXRpYyBpbnQgaWxrX2NvbXB1dGVfcGlwZV93bShzdHJ1 Y3QgaW50ZWxfY3J0Y19zdGF0ZSAqY3N0YXRlKQogCXN0cnVjdCBpbnRlbF9wbGFuZV9zdGF0ZSAq cHJpc3RhdGUgPSBOVUxMOwogCXN0cnVjdCBpbnRlbF9wbGFuZV9zdGF0ZSAqc3Byc3RhdGUgPSBO VUxMOwogCXN0cnVjdCBpbnRlbF9wbGFuZV9zdGF0ZSAqY3Vyc3RhdGUgPSBOVUxMOwotCWludCBs ZXZlbCwgbWF4X2xldmVsID0gaWxrX3dtX21heF9sZXZlbChkZXYpLCB1c2FibGVfbGV2ZWw7CisJ aW50IGxldmVsLCBtYXhfbGV2ZWwgPSBpbGtfd21fbWF4X2xldmVsKGRldiksIHVzYWJsZV9sZXZl bCA9IG1heF9sZXZlbDsKIAlzdHJ1Y3QgaWxrX3dtX21heGltdW1zIG1heDsKIAogCXBpcGVfd20g PSAmY3N0YXRlLT53bS5vcHRpbWFsLmlsazsKQEAgLTIzMzUsMTggKzIzNTgsNyBAQCBzdGF0aWMg aW50IGlsa19jb21wdXRlX3BpcGVfd20oc3RydWN0IGludGVsX2NydGNfc3RhdGUgKmNzdGF0ZSkK IAkJCSBkcm1fcmVjdF9oZWlnaHQoJnNwcnN0YXRlLT5kc3QpICE9IGRybV9yZWN0X2hlaWdodCgm c3Byc3RhdGUtPnNyYykgPj4gMTYpOwogCX0KIAotCi0JdXNhYmxlX2xldmVsID0gbWF4X2xldmVs OwotCi0JLyogSUxLL1NOQjogTFAyKyB3YXRlcm1hcmtzIG9ubHkgdy9vIHNwcml0ZXMgKi8KLQlp ZiAoSU5URUxfSU5GTyhkZXYpLT5nZW4gPD0gNiAmJiBwaXBlX3dtLT5zcHJpdGVzX2VuYWJsZWQp Ci0JCXVzYWJsZV9sZXZlbCA9IDE7Ci0KLQkvKiBJTEsvU05CL0lWQjogTFAxKyB3YXRlcm1hcmtz IG9ubHkgdy9vIHNjYWxpbmcgKi8KLQlpZiAocGlwZV93bS0+c3ByaXRlc19zY2FsZWQpCi0JCXVz YWJsZV9sZXZlbCA9IDA7Ci0KLQlpbGtfY29tcHV0ZV93bV9sZXZlbChkZXZfcHJpdiwgaW50ZWxf Y3J0YywgMCwgY3N0YXRlLAorCWlsa19jb21wdXRlX3dtX2xldmVsKGRldl9wcml2LCBpbnRlbF9j cnRjLCBwaXBlX3dtLCAwLCBjc3RhdGUsCiAJCQkgICAgIHByaXN0YXRlLCBzcHJzdGF0ZSwgY3Vy c3RhdGUsICZwaXBlX3dtLT53bVswXSk7CiAKIAlpZiAoSVNfSEFTV0VMTChkZXYpIHx8IElTX0JS T0FEV0VMTChkZXYpKQpAQCAtMjM2MCw4ICsyMzcyLDkgQEAgc3RhdGljIGludCBpbGtfY29tcHV0 ZV9waXBlX3dtKHN0cnVjdCBpbnRlbF9jcnRjX3N0YXRlICpjc3RhdGUpCiAJZm9yIChsZXZlbCA9 IDE7IGxldmVsIDw9IG1heF9sZXZlbDsgbGV2ZWwrKykgewogCQlzdHJ1Y3QgaW50ZWxfd21fbGV2 ZWwgKndtID0gJnBpcGVfd20tPndtW2xldmVsXTsKIAotCQlpbGtfY29tcHV0ZV93bV9sZXZlbChk ZXZfcHJpdiwgaW50ZWxfY3J0YywgbGV2ZWwsIGNzdGF0ZSwKLQkJCQkgICAgIHByaXN0YXRlLCBz cHJzdGF0ZSwgY3Vyc3RhdGUsIHdtKTsKKwkJaWxrX2NvbXB1dGVfd21fbGV2ZWwoZGV2X3ByaXYs IGludGVsX2NydGMsIHBpcGVfd20sCisJCQkJICAgICBsZXZlbCwgY3N0YXRlLCBwcmlzdGF0ZSwg c3Byc3RhdGUsCisJCQkJICAgICBjdXJzdGF0ZSwgd20pOwogCiAJCS8qCiAJCSAqIERpc2FibGUg YW55IHdhdGVybWFyayBsZXZlbCB0aGF0IGV4Y2VlZHMgdGhlCgpfX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVs LWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcv bWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK