Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.8 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 7A314C83004 for ; Wed, 29 Apr 2020 10:10:50 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 562DB2074A for ; Wed, 29 Apr 2020 10:10:50 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 562DB2074A Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=linux.intel.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=intel-gfx-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 0280D6EA95; Wed, 29 Apr 2020 10:10:50 +0000 (UTC) Received: from mga04.intel.com (mga04.intel.com [192.55.52.120]) by gabe.freedesktop.org (Postfix) with ESMTPS id CB4746EA95 for ; Wed, 29 Apr 2020 10:10:46 +0000 (UTC) IronPort-SDR: n9ukBIyOrgCLN6gSgLwa7q+u5ZBoU/55cmTHXbiPX3+ekThkWXwRHxCTS5CVthwhUFJs6rt7kl fgY679eExFqA== X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga007.jf.intel.com ([10.7.209.58]) by fmsmga104.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 29 Apr 2020 03:10:46 -0700 IronPort-SDR: 4YE8v1C/6YPcvjQDT8ItIaQUdD5XXWeKibXpbxe07WHoWDupq9MTZcTIaPrKUD+TLkpX30MRkZ ELUsqsX9pwzw== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.73,331,1583222400"; d="scan'208";a="246806472" Received: from stinkbox.fi.intel.com (HELO stinkbox) ([10.237.72.174]) by orsmga007.jf.intel.com with SMTP; 29 Apr 2020 03:10:44 -0700 Received: by stinkbox (sSMTP sendmail emulation); Wed, 29 Apr 2020 13:10:43 +0300 From: Ville Syrjala To: intel-gfx@lists.freedesktop.org Date: Wed, 29 Apr 2020 13:10:25 +0300 Message-Id: <20200429101034.8208-4-ville.syrjala@linux.intel.com> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20200429101034.8208-1-ville.syrjala@linux.intel.com> References: <20200429101034.8208-1-ville.syrjala@linux.intel.com> MIME-Version: 1.0 Subject: [Intel-gfx] [PATCH 03/12] drm/i915/fbc: Fix fence_y_offset handling X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" RnJvbTogVmlsbGUgU3lyasOkbMOkIDx2aWxsZS5zeXJqYWxhQGxpbnV4LmludGVsLmNvbT4KClRo ZSBjdXJyZW50IGZlbmNlX3lfb2Zmc2V0IGNhbGN1bGF0aW9uIGlzIGJyb2tlbi4gSSB0aGluayBp dCBtb3JlIG9yCmxlc3MgdXNlZCB0byBkbyB0aGUgcmlnaHQgdGhpbmcsIGJ1dCB0aGVuIEkgY2hh bmdlZCB0aGUgcGxhbmUgY29kZQp0byBwdXQgdGhlIGZpbmFsIHgveSBzb3VyY2Ugb2Zmc2V0cyBi YWNrIGludG8gdGhlIHNyYyByZWN0YW5nbGUgc28Kbm93IGl0J3MganVzdCBzdWJ0cmFhY3Rpbmcg dGhlIHNhbWUgdmFsdWUgZnJvbSBpdHNlbGYuIFRoZSBjb2RlIHdvdWxkCm5ldmVyIGhhdmUgd29y a2VkIGlmIHdlIGFsbG93ZWQgdGhlIGZyYW1lYnVmZmVyIHRvIGhhdmUgYSBub24temVybwpvZmZz ZXQuCgpMZXQncyBkbyB0aGlzIGluIGEgYmV0dGVyIHdheSBieSBqdXN0IGNhbGN1bGF0aW5nIHRo ZSBmZW5jZV95X29mZnNldApmcm9tIHRoZSBmaW5hbCBwbGFuZSBzdXJmYWNlIG9mZnNldC4gTm90 ZSB0aGF0IHdlIGRvbid0IGFsaWduIHRoZQpwbGFuZSBzdXJmYWNlIGFkZHJlc3MgdG8gZmVuY2Ug cm93cyBzbyB3aXRoIGhvcml6b250YWwgcGFubmluZyB0aGVyZSdzCm9mdGVuIGEgaG9yaXpvbnRh bCBvZmZzZXQgZnJvbSB0aGUgZmVuY2Ugc3RhcnQgdG8gdGhlIHN1cmZhY2UgYWRkcmVzcwphcyB3 ZWxsLiBXZSBoYXZlIG5vIHdheSB0byB0ZWxsIHRoZSBoYXJkd2FyZSBhYm91dCB0aGF0IHNvIHdl IGp1c3QKaWdub3JlIGl0LiBCYXNlZCBvbiBzb21lIHF1aWNrIHRlc3RzIHRoZSBpbnZsaWRhdGlv biBzdGlsbCBoYXBwZW5zCmNvcnJlY3RseS4gSSBwcmVzdW1lIGR1ZSB0byB0aGUgaW52YWxpZGF0 aW9uIG51a2luZyBhdCBsZWFzdCB0aGUgZnVsbApsaW5lIChvciBhIHNlZ21lbnQgb2YgbXVsdGlw bGUgbGluZXMpLgoKRml4ZXM6IDU0ZDRkNzE5ZmExMSAoImRybS9pOTE1OiBPdmVyY29tZSBkaXNw bGF5IGVuZ2luZSBzdHJpZGUgbGltaXRzIHZpYSBHVFQgcmVtYXBwaW5nIikKU2lnbmVkLW9mZi1i eTogVmlsbGUgU3lyasOkbMOkIDx2aWxsZS5zeXJqYWxhQGxpbnV4LmludGVsLmNvbT4KLS0tCiBk cml2ZXJzL2dwdS9kcm0vaTkxNS9kaXNwbGF5L2ludGVsX2Rpc3BsYXkuYyB8IDExICsrKysrKysK IGRyaXZlcnMvZ3B1L2RybS9pOTE1L2Rpc3BsYXkvaW50ZWxfZGlzcGxheS5oIHwgIDEgKwogZHJp dmVycy9ncHUvZHJtL2k5MTUvZGlzcGxheS9pbnRlbF9mYmMuYyAgICAgfCAzMiArKysrKystLS0t LS0tLS0tLS0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuaCAgICAgICAgICAgICAg fCAgNiArKy0tCiA0IGZpbGVzIGNoYW5nZWQsIDI1IGluc2VydGlvbnMoKyksIDI1IGRlbGV0aW9u cygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2Rpc3BsYXkvaW50ZWxfZGlz cGxheS5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvZGlzcGxheS9pbnRlbF9kaXNwbGF5LmMKaW5k ZXggNmJiODc5NjU4MDFlLi5lNWZhNDkzMzc4ODMgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2Ry bS9pOTE1L2Rpc3BsYXkvaW50ZWxfZGlzcGxheS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1 L2Rpc3BsYXkvaW50ZWxfZGlzcGxheS5jCkBAIC0zODIyLDYgKzM4MjIsMTcgQEAgc2tsX2NoZWNr X21haW5fY2NzX2Nvb3JkaW5hdGVzKHN0cnVjdCBpbnRlbF9wbGFuZV9zdGF0ZSAqcGxhbmVfc3Rh dGUsCiAJcmV0dXJuIHRydWU7CiB9CiAKK3Vuc2lnbmVkIGludAoraW50ZWxfcGxhbmVfZmVuY2Vf eV9vZmZzZXQoY29uc3Qgc3RydWN0IGludGVsX3BsYW5lX3N0YXRlICpwbGFuZV9zdGF0ZSkKK3sK KwlpbnQgeCA9IDAsIHkgPSAwOworCisJaW50ZWxfcGxhbmVfYWRqdXN0X2FsaWduZWRfb2Zmc2V0 KCZ4LCAmeSwgcGxhbmVfc3RhdGUsIDAsCisJCQkJCSAgcGxhbmVfc3RhdGUtPmNvbG9yX3BsYW5l WzBdLm9mZnNldCwgMCk7CisKKwlyZXR1cm4geTsKK30KKwogc3RhdGljIGludCBza2xfY2hlY2tf bWFpbl9zdXJmYWNlKHN0cnVjdCBpbnRlbF9wbGFuZV9zdGF0ZSAqcGxhbmVfc3RhdGUpCiB7CiAJ c3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0gdG9faTkxNShwbGFuZV9zdGF0ZS0+ dWFwaS5wbGFuZS0+ZGV2KTsKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2Rpc3Bs YXkvaW50ZWxfZGlzcGxheS5oIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvZGlzcGxheS9pbnRlbF9k aXNwbGF5LmgKaW5kZXggZWZiNGRhMjA1ZWEyLi4zYTA2ZjcyYzk4NTkgMTAwNjQ0Ci0tLSBhL2Ry aXZlcnMvZ3B1L2RybS9pOTE1L2Rpc3BsYXkvaW50ZWxfZGlzcGxheS5oCisrKyBiL2RyaXZlcnMv Z3B1L2RybS9pOTE1L2Rpc3BsYXkvaW50ZWxfZGlzcGxheS5oCkBAIC02MDgsNiArNjA4LDcgQEAg dW5zaWduZWQgaW50IGk5eHhfcGxhbmVfbWF4X3N0cmlkZShzdHJ1Y3QgaW50ZWxfcGxhbmUgKnBs YW5lLAogCQkJCSAgIHUzMiBwaXhlbF9mb3JtYXQsIHU2NCBtb2RpZmllciwKIAkJCQkgICB1bnNp Z25lZCBpbnQgcm90YXRpb24pOwogaW50IGJkd19nZXRfcGlwZW1pc2NfYnBwKHN0cnVjdCBpbnRl bF9jcnRjICpjcnRjKTsKK3Vuc2lnbmVkIGludCBpbnRlbF9wbGFuZV9mZW5jZV95X29mZnNldChj b25zdCBzdHJ1Y3QgaW50ZWxfcGxhbmVfc3RhdGUgKnBsYW5lX3N0YXRlKTsKIAogc3RydWN0IGlu dGVsX2Rpc3BsYXlfZXJyb3Jfc3RhdGUgKgogaW50ZWxfZGlzcGxheV9jYXB0dXJlX2Vycm9yX3N0 YXRlKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdik7CmRpZmYgLS1naXQgYS9kcml2 ZXJzL2dwdS9kcm0vaTkxNS9kaXNwbGF5L2ludGVsX2ZiYy5jIGIvZHJpdmVycy9ncHUvZHJtL2k5 MTUvZGlzcGxheS9pbnRlbF9mYmMuYwppbmRleCAxOTJjNWZmMTQyZWUuLjYxM2FiNDk5ZDQyZSAx MDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvZGlzcGxheS9pbnRlbF9mYmMuYworKysg Yi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9kaXNwbGF5L2ludGVsX2ZiYy5jCkBAIC00NywxOSArNDcs NiBAQAogI2luY2x1ZGUgImludGVsX2ZiYy5oIgogI2luY2x1ZGUgImludGVsX2Zyb250YnVmZmVy LmgiCiAKLS8qCi0gKiBJbiBzb21lIHBsYXRmb3JtcyB3aGVyZSB0aGUgQ1JUQydzIHg6MC95OjAg Y29vcmRpbmF0ZXMgZG9lc24ndCBtYXRjaCB0aGUKLSAqIGZyb250YnVmZmVyJ3MgeDowL3k6MCBj b29yZGluYXRlcyB3ZSBsaWUgdG8gdGhlIGhhcmR3YXJlIGFib3V0IHRoZSBwbGFuZSdzCi0gKiBv cmlnaW4gc28gdGhlIHggYW5kIHkgb2Zmc2V0cyBjYW4gYWN0dWFsbHkgZml0IHRoZSByZWdpc3Rl cnMuIEFzIGEKLSAqIGNvbnNlcXVlbmNlLCB0aGUgZmVuY2UgZG9lc24ndCByZWFsbHkgc3RhcnQg ZXhhY3RseSBhdCB0aGUgZGlzcGxheSBwbGFuZQotICogYWRkcmVzcyB3ZSBwcm9ncmFtIGJlY2F1 c2UgaXQgc3RhcnRzIGF0IHRoZSByZWFsIHN0YXJ0IG9mIHRoZSBidWZmZXIsIHNvIHdlCi0gKiBo YXZlIHRvIHRha2UgdGhpcyBpbnRvIGNvbnNpZGVyYXRpb24gaGVyZS4KLSAqLwotc3RhdGljIHVu c2lnbmVkIGludCBnZXRfY3J0Y19mZW5jZV95X29mZnNldChzdHJ1Y3QgaW50ZWxfZmJjICpmYmMp Ci17Ci0JcmV0dXJuIGZiYy0+c3RhdGVfY2FjaGUucGxhbmUueSAtIGZiYy0+c3RhdGVfY2FjaGUu cGxhbmUuYWRqdXN0ZWRfeTsKLX0KLQogLyoKICAqIEZvciBTS0wrLCB0aGUgcGxhbmUgc291cmNl IHNpemUgdXNlZCBieSB0aGUgaGFyZHdhcmUgaXMgYmFzZWQgb24gdGhlIHZhbHVlIHdlCiAgKiB3 cml0ZSB0byB0aGUgUExBTkVfU0laRSByZWdpc3Rlci4gRm9yIEJEVy0sIHRoZSBoYXJkd2FyZSBs b29rcyBhdCB0aGUgdmFsdWUKQEAgLTE0MSw3ICsxMjgsNyBAQCBzdGF0aWMgdm9pZCBpOHh4X2Zi Y19hY3RpdmF0ZShzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpCiAJCQlmYmNfY3Rs MiB8PSBGQkNfQ1RMX0NQVV9GRU5DRTsKIAkJaW50ZWxfZGVfd3JpdGUoZGV2X3ByaXYsIEZCQ19D T05UUk9MMiwgZmJjX2N0bDIpOwogCQlpbnRlbF9kZV93cml0ZShkZXZfcHJpdiwgRkJDX0ZFTkNF X09GRiwKLQkJCSAgICAgICBwYXJhbXMtPmNydGMuZmVuY2VfeV9vZmZzZXQpOworCQkJICAgICAg IHBhcmFtcy0+ZmVuY2VfeV9vZmZzZXQpOwogCX0KIAogCS8qIGVuYWJsZSBpdC4uLiAqLwpAQCAt MTc1LDcgKzE2Miw3IEBAIHN0YXRpYyB2b2lkIGc0eF9mYmNfYWN0aXZhdGUoc3RydWN0IGRybV9p OTE1X3ByaXZhdGUgKmRldl9wcml2KQogCWlmIChwYXJhbXMtPmZlbmNlX2lkID49IDApIHsKIAkJ ZHBmY19jdGwgfD0gRFBGQ19DVExfRkVOQ0VfRU4gfCBwYXJhbXMtPmZlbmNlX2lkOwogCQlpbnRl bF9kZV93cml0ZShkZXZfcHJpdiwgRFBGQ19GRU5DRV9ZT0ZGLAotCQkJICAgICAgIHBhcmFtcy0+ Y3J0Yy5mZW5jZV95X29mZnNldCk7CisJCQkgICAgICAgcGFyYW1zLT5mZW5jZV95X29mZnNldCk7 CiAJfSBlbHNlIHsKIAkJaW50ZWxfZGVfd3JpdGUoZGV2X3ByaXYsIERQRkNfRkVOQ0VfWU9GRiwg MCk7CiAJfQpAQCAtMjQzLDcgKzIzMCw3IEBAIHN0YXRpYyB2b2lkIGlsa19mYmNfYWN0aXZhdGUo c3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KQogCQkJaW50ZWxfZGVfd3JpdGUoZGV2 X3ByaXYsIFNOQl9EUEZDX0NUTF9TQSwKIAkJCQkgICAgICAgU05CX0NQVV9GRU5DRV9FTkFCTEUg fCBwYXJhbXMtPmZlbmNlX2lkKTsKIAkJCWludGVsX2RlX3dyaXRlKGRldl9wcml2LCBEUEZDX0NQ VV9GRU5DRV9PRkZTRVQsCi0JCQkJICAgICAgIHBhcmFtcy0+Y3J0Yy5mZW5jZV95X29mZnNldCk7 CisJCQkJICAgICAgIHBhcmFtcy0+ZmVuY2VfeV9vZmZzZXQpOwogCQl9CiAJfSBlbHNlIHsKIAkJ aWYgKElTX0dFTihkZXZfcHJpdiwgNikpIHsKQEAgLTI1Myw3ICsyNDAsNyBAQCBzdGF0aWMgdm9p ZCBpbGtfZmJjX2FjdGl2YXRlKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdikKIAl9 CiAKIAlpbnRlbF9kZV93cml0ZShkZXZfcHJpdiwgSUxLX0RQRkNfRkVOQ0VfWU9GRiwKLQkJICAg ICAgIHBhcmFtcy0+Y3J0Yy5mZW5jZV95X29mZnNldCk7CisJCSAgICAgICBwYXJhbXMtPmZlbmNl X3lfb2Zmc2V0KTsKIAkvKiBlbmFibGUgaXQuLi4gKi8KIAlpbnRlbF9kZV93cml0ZShkZXZfcHJp diwgSUxLX0RQRkNfQ09OVFJPTCwgZHBmY19jdGwgfCBEUEZDX0NUTF9FTik7CiAKQEAgLTMyMCw3 ICszMDcsNyBAQCBzdGF0aWMgdm9pZCBnZW43X2ZiY19hY3RpdmF0ZShzdHJ1Y3QgZHJtX2k5MTVf cHJpdmF0ZSAqZGV2X3ByaXYpCiAJCWludGVsX2RlX3dyaXRlKGRldl9wcml2LCBTTkJfRFBGQ19D VExfU0EsCiAJCQkgICAgICAgU05CX0NQVV9GRU5DRV9FTkFCTEUgfCBwYXJhbXMtPmZlbmNlX2lk KTsKIAkJaW50ZWxfZGVfd3JpdGUoZGV2X3ByaXYsIERQRkNfQ1BVX0ZFTkNFX09GRlNFVCwKLQkJ CSAgICAgICBwYXJhbXMtPmNydGMuZmVuY2VfeV9vZmZzZXQpOworCQkJICAgICAgIHBhcmFtcy0+ ZmVuY2VfeV9vZmZzZXQpOwogCX0gZWxzZSBpZiAoZGV2X3ByaXYtPmdndHQubnVtX2ZlbmNlcykg ewogCQlpbnRlbF9kZV93cml0ZShkZXZfcHJpdiwgU05CX0RQRkNfQ1RMX1NBLCAwKTsKIAkJaW50 ZWxfZGVfd3JpdGUoZGV2X3ByaXYsIERQRkNfQ1BVX0ZFTkNFX09GRlNFVCwgMCk7CkBAIC02Mjgs OCArNjE1LDggQEAgc3RhdGljIGJvb2wgcm90YXRpb25faXNfdmFsaWQoc3RydWN0IGRybV9pOTE1 X3ByaXZhdGUgKmRldl9wcml2LAogLyoKICAqIEZvciBzb21lIHJlYXNvbiwgdGhlIGhhcmR3YXJl IHRyYWNraW5nIHN0YXJ0cyBsb29raW5nIGF0IHdoYXRldmVyIHdlCiAgKiBwcm9ncmFtbWVkIGFz IHRoZSBkaXNwbGF5IHBsYW5lIGJhc2UgYWRkcmVzcyByZWdpc3Rlci4gSXQgZG9lcyBub3QgbG9v ayBhdAotICogdGhlIFggYW5kIFkgb2Zmc2V0IHJlZ2lzdGVycy4gVGhhdCdzIHdoeSB3ZSBsb29r IGF0IHRoZSBjcnRjLT5hZGp1c3RlZHt4LHl9Ci0gKiB2YXJpYWJsZXMgaW5zdGVhZCBvZiBqdXN0 IGxvb2tpbmcgYXQgdGhlIHBpcGUvcGxhbmUgc2l6ZS4KKyAqIHRoZSBYIGFuZCBZIG9mZnNldCBy ZWdpc3RlcnMuIFRoYXQncyB3aHkgd2UgaW5jbHVkZSB0aGUgc3JjIHgveSBvZmZzZXRzCisgKiBp bnN0ZWFkIG9mIGp1c3QgbG9va2luZyBhdCB0aGUgcGxhbmUgc2l6ZS4KICAqLwogc3RhdGljIGJv b2wgaW50ZWxfZmJjX2h3X3RyYWNraW5nX2NvdmVyc19zY3JlZW4oc3RydWN0IGludGVsX2NydGMg KmNydGMpCiB7CkBAIC03MDIsNyArNjg5LDYgQEAgc3RhdGljIHZvaWQgaW50ZWxfZmJjX3VwZGF0 ZV9zdGF0ZV9jYWNoZShzdHJ1Y3QgaW50ZWxfY3J0YyAqY3J0YywKIAljYWNoZS0+cGxhbmUuc3Jj X2ggPSBkcm1fcmVjdF9oZWlnaHQoJnBsYW5lX3N0YXRlLT51YXBpLnNyYykgPj4gMTY7CiAJY2Fj aGUtPnBsYW5lLmFkanVzdGVkX3ggPSBwbGFuZV9zdGF0ZS0+Y29sb3JfcGxhbmVbMF0ueDsKIAlj YWNoZS0+cGxhbmUuYWRqdXN0ZWRfeSA9IHBsYW5lX3N0YXRlLT5jb2xvcl9wbGFuZVswXS55Owot CWNhY2hlLT5wbGFuZS55ID0gcGxhbmVfc3RhdGUtPnVhcGkuc3JjLnkxID4+IDE2OwogCiAJY2Fj aGUtPnBsYW5lLnBpeGVsX2JsZW5kX21vZGUgPSBwbGFuZV9zdGF0ZS0+aHcucGl4ZWxfYmxlbmRf bW9kZTsKIApAQCAtNzEwLDYgKzY5Niw4IEBAIHN0YXRpYyB2b2lkIGludGVsX2ZiY191cGRhdGVf c3RhdGVfY2FjaGUoc3RydWN0IGludGVsX2NydGMgKmNydGMsCiAJY2FjaGUtPmZiLm1vZGlmaWVy ID0gZmItPm1vZGlmaWVyOwogCWNhY2hlLT5mYi5zdHJpZGUgPSBwbGFuZV9zdGF0ZS0+Y29sb3Jf cGxhbmVbMF0uc3RyaWRlOwogCisJY2FjaGUtPmZlbmNlX3lfb2Zmc2V0ID0gaW50ZWxfcGxhbmVf ZmVuY2VfeV9vZmZzZXQocGxhbmVfc3RhdGUpOworCiAJZHJtX1dBUk5fT04oJmRldl9wcml2LT5k cm0sIHBsYW5lX3N0YXRlLT5mbGFncyAmIFBMQU5FX0hBU19GRU5DRSAmJgogCQkgICAgIXBsYW5l X3N0YXRlLT52bWEtPmZlbmNlKTsKIApAQCAtODgwLDEwICs4NjgsMTAgQEAgc3RhdGljIHZvaWQg aW50ZWxfZmJjX2dldF9yZWdfcGFyYW1zKHN0cnVjdCBpbnRlbF9jcnRjICpjcnRjLAogCW1lbXNl dChwYXJhbXMsIDAsIHNpemVvZigqcGFyYW1zKSk7CiAKIAlwYXJhbXMtPmZlbmNlX2lkID0gY2Fj aGUtPmZlbmNlX2lkOworCXBhcmFtcy0+ZmVuY2VfeV9vZmZzZXQgPSBjYWNoZS0+ZmVuY2VfeV9v ZmZzZXQ7CiAKIAlwYXJhbXMtPmNydGMucGlwZSA9IGNydGMtPnBpcGU7CiAJcGFyYW1zLT5jcnRj Lmk5eHhfcGxhbmUgPSB0b19pbnRlbF9wbGFuZShjcnRjLT5iYXNlLnByaW1hcnkpLT5pOXh4X3Bs YW5lOwotCXBhcmFtcy0+Y3J0Yy5mZW5jZV95X29mZnNldCA9IGdldF9jcnRjX2ZlbmNlX3lfb2Zm c2V0KGZiYyk7CiAKIAlwYXJhbXMtPmZiLmZvcm1hdCA9IGNhY2hlLT5mYi5mb3JtYXQ7CiAJcGFy YW1zLT5mYi5zdHJpZGUgPSBjYWNoZS0+ZmIuc3RyaWRlOwpkaWZmIC0tZ2l0IGEvZHJpdmVycy9n cHUvZHJtL2k5MTUvaTkxNV9kcnYuaCBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmgK aW5kZXggYjAwZjA4NDVjYmMzLi5hNjM0ZmQyMzMwYzMgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1 L2RybS9pOTE1L2k5MTVfZHJ2LmgKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYu aApAQCAtNDA4LDggKzQwOCw2IEBAIHN0cnVjdCBpbnRlbF9mYmMgewogCQkJaW50IGFkanVzdGVk X3g7CiAJCQlpbnQgYWRqdXN0ZWRfeTsKIAotCQkJaW50IHk7Ci0KIAkJCXUxNiBwaXhlbF9ibGVu ZF9tb2RlOwogCQl9IHBsYW5lOwogCkBAIC00MTgsNiArNDE2LDggQEAgc3RydWN0IGludGVsX2Zi YyB7CiAJCQl1bnNpZ25lZCBpbnQgc3RyaWRlOwogCQkJdTY0IG1vZGlmaWVyOwogCQl9IGZiOwor CisJCXVuc2lnbmVkIGludCBmZW5jZV95X29mZnNldDsKIAkJdTE2IGdlbjlfd2FfY2ZiX3N0cmlk ZTsKIAkJczggZmVuY2VfaWQ7CiAJfSBzdGF0ZV9jYWNoZTsKQEAgLTQzMyw3ICs0MzMsNiBAQCBz dHJ1Y3QgaW50ZWxfZmJjIHsKIAkJc3RydWN0IHsKIAkJCWVudW0gcGlwZSBwaXBlOwogCQkJZW51 bSBpOXh4X3BsYW5lX2lkIGk5eHhfcGxhbmU7Ci0JCQl1bnNpZ25lZCBpbnQgZmVuY2VfeV9vZmZz ZXQ7CiAJCX0gY3J0YzsKIAogCQlzdHJ1Y3QgewpAQCAtNDQyLDYgKzQ0MSw3IEBAIHN0cnVjdCBp bnRlbF9mYmMgewogCQl9IGZiOwogCiAJCWludCBjZmJfc2l6ZTsKKwkJdW5zaWduZWQgaW50IGZl bmNlX3lfb2Zmc2V0OwogCQl1MTYgZ2VuOV93YV9jZmJfc3RyaWRlOwogCQlzOCBmZW5jZV9pZDsK IAkJYm9vbCBwbGFuZV92aXNpYmxlOwotLSAKMi4yNC4xCgpfX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdm eEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFp bG1hbi9saXN0aW5mby9pbnRlbC1nZngK