From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ben Widawsky Subject: [PATCH 01/13] drm/i915: Move semaphore specific ring members to struct Date: Wed, 19 Feb 2014 22:19:14 -0800 Message-ID: <1392877166-9195-1-git-send-email-benjamin.widawsky@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) by gabe.freedesktop.org (Postfix) with ESMTP id 329C9FB0E1 for ; Wed, 19 Feb 2014 22:19:31 -0800 (PST) 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 Cc: Ben Widawsky , Ben Widawsky List-Id: intel-gfx@lists.freedesktop.org VGhpcyB3aWxsIGJlIGhlbHBmdWwgaW4gYWJzdHJhY3Rpbmcgc29tZSBvZiB0aGUgY29kZSBpbiBw cmVwYXJhdGlvbiBmb3IKZ2VuOCBzZW1hcGhvcmVzLgoKdjI6IE1vdmUgbWJveCBzdHVmZiB0byBh IHNlcGFyYXRlIHN0cnVjdAoKUmV2aWV3ZWQtYnk6IFZpbGxlIFN5cmrDpGzDpCA8dmlsbGUuc3ly amFsYUBsaW51eC5pbnRlbC5jb20+ICh2MSkKU2lnbmVkLW9mZi1ieTogQmVuIFdpZGF3c2t5IDxi ZW5AYndpZGF3c2submV0PgotLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtLmMgICAg ICAgICB8IDEwICsrLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ3B1X2Vycm9yLmMgICB8 ICA2ICstLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcmluZ2J1ZmZlci5jIHwgODcgKysr KysrKysrKysrKysrKy0tLS0tLS0tLS0tLS0tLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRl bF9yaW5nYnVmZmVyLmggfCAxOSArKysrLS0tCiA0IGZpbGVzIGNoYW5nZWQsIDYzIGluc2VydGlv bnMoKyksIDU5IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1 L2k5MTVfZ2VtLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbS5jCmluZGV4IDM2MThi YjAuLjI5ODE4MjYgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtLmMK KysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW0uYwpAQCAtMjA4OSw4ICsyMDg5LDgg QEAgaTkxNV9nZW1faW5pdF9zZXFubyhzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LCB1MzIgc2Vxbm8p CiAJZm9yX2VhY2hfcmluZyhyaW5nLCBkZXZfcHJpdiwgaSkgewogCQlpbnRlbF9yaW5nX2luaXRf c2Vxbm8ocmluZywgc2Vxbm8pOwogCi0JCWZvciAoaiA9IDA7IGogPCBBUlJBWV9TSVpFKHJpbmct PnN5bmNfc2Vxbm8pOyBqKyspCi0JCQlyaW5nLT5zeW5jX3NlcW5vW2pdID0gMDsKKwkJZm9yIChq ID0gMDsgaiA8IEFSUkFZX1NJWkUocmluZy0+c2VtYXBob3JlLnN5bmNfc2Vxbm8pOyBqKyspCisJ CQlyaW5nLT5zZW1hcGhvcmUuc3luY19zZXFub1tqXSA9IDA7CiAJfQogCiAJcmV0dXJuIDA7CkBA IC0yNjYxLDcgKzI2NjEsNyBAQCBpOTE1X2dlbV9vYmplY3Rfc3luYyhzdHJ1Y3QgZHJtX2k5MTVf Z2VtX29iamVjdCAqb2JqLAogCWlkeCA9IGludGVsX3Jpbmdfc3luY19pbmRleChmcm9tLCB0byk7 CiAKIAlzZXFubyA9IG9iai0+bGFzdF9yZWFkX3NlcW5vOwotCWlmIChzZXFubyA8PSBmcm9tLT5z eW5jX3NlcW5vW2lkeF0pCisJaWYgKHNlcW5vIDw9IGZyb20tPnNlbWFwaG9yZS5zeW5jX3NlcW5v W2lkeF0pCiAJCXJldHVybiAwOwogCiAJcmV0ID0gaTkxNV9nZW1fY2hlY2tfb2xyKG9iai0+cmlu Zywgc2Vxbm8pOwpAQCAtMjY2OSwxMyArMjY2OSwxMyBAQCBpOTE1X2dlbV9vYmplY3Rfc3luYyhz dHJ1Y3QgZHJtX2k5MTVfZ2VtX29iamVjdCAqb2JqLAogCQlyZXR1cm4gcmV0OwogCiAJdHJhY2Vf aTkxNV9nZW1fcmluZ19zeW5jX3RvKGZyb20sIHRvLCBzZXFubyk7Ci0JcmV0ID0gdG8tPnN5bmNf dG8odG8sIGZyb20sIHNlcW5vKTsKKwlyZXQgPSB0by0+c2VtYXBob3JlLnN5bmNfdG8odG8sIGZy b20sIHNlcW5vKTsKIAlpZiAoIXJldCkKIAkJLyogV2UgdXNlIGxhc3RfcmVhZF9zZXFubyBiZWNh dXNlIHN5bmNfdG8oKQogCQkgKiBtaWdodCBoYXZlIGp1c3QgY2F1c2VkIHNlcW5vIHdyYXAgdW5k ZXIKIAkJICogdGhlIHJhZGFyLgogCQkgKi8KLQkJZnJvbS0+c3luY19zZXFub1tpZHhdID0gb2Jq LT5sYXN0X3JlYWRfc2Vxbm87CisJCWZyb20tPnNlbWFwaG9yZS5zeW5jX3NlcW5vW2lkeF0gPSBv YmotPmxhc3RfcmVhZF9zZXFubzsKIAogCXJldHVybiByZXQ7CiB9CmRpZmYgLS1naXQgYS9kcml2 ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dwdV9lcnJvci5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUv aTkxNV9ncHVfZXJyb3IuYwppbmRleCAwMDBiMzY5Li5iY2FiMTE0IDEwMDY0NAotLS0gYS9kcml2 ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dwdV9lcnJvci5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9p OTE1L2k5MTVfZ3B1X2Vycm9yLmMKQEAgLTgxMCwxNCArODEwLDE0IEBAIHN0YXRpYyB2b2lkIGk5 MTVfcmVjb3JkX3Jpbmdfc3RhdGUoc3RydWN0IGRybV9kZXZpY2UgKmRldiwKIAkJCT0gSTkxNV9S RUFEKFJJTkdfU1lOQ18wKHJpbmctPm1taW9fYmFzZSkpOwogCQllcmluZy0+c2VtYXBob3JlX21i b3hlc1sxXQogCQkJPSBJOTE1X1JFQUQoUklOR19TWU5DXzEocmluZy0+bW1pb19iYXNlKSk7Ci0J CWVyaW5nLT5zZW1hcGhvcmVfc2Vxbm9bMF0gPSByaW5nLT5zeW5jX3NlcW5vWzBdOwotCQllcmlu Zy0+c2VtYXBob3JlX3NlcW5vWzFdID0gcmluZy0+c3luY19zZXFub1sxXTsKKwkJZXJpbmctPnNl bWFwaG9yZV9zZXFub1swXSA9IHJpbmctPnNlbWFwaG9yZS5zeW5jX3NlcW5vWzBdOworCQllcmlu Zy0+c2VtYXBob3JlX3NlcW5vWzFdID0gcmluZy0+c2VtYXBob3JlLnN5bmNfc2Vxbm9bMV07CiAJ fQogCiAJaWYgKEhBU19WRUJPWChkZXYpKSB7CiAJCWVyaW5nLT5zZW1hcGhvcmVfbWJveGVzWzJd ID0KIAkJCUk5MTVfUkVBRChSSU5HX1NZTkNfMihyaW5nLT5tbWlvX2Jhc2UpKTsKLQkJZXJpbmct PnNlbWFwaG9yZV9zZXFub1syXSA9IHJpbmctPnN5bmNfc2Vxbm9bMl07CisJCWVyaW5nLT5zZW1h cGhvcmVfc2Vxbm9bMl0gPSByaW5nLT5zZW1hcGhvcmUuc3luY19zZXFub1syXTsKIAl9CiAKIAlp ZiAoSU5URUxfSU5GTyhkZXYpLT5nZW4gPj0gNCkgewpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUv ZHJtL2k5MTUvaW50ZWxfcmluZ2J1ZmZlci5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxf cmluZ2J1ZmZlci5jCmluZGV4IGIzNDBjNzUuLjYyNjAxOWEgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMv Z3B1L2RybS9pOTE1L2ludGVsX3JpbmdidWZmZXIuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkx NS9pbnRlbF9yaW5nYnVmZmVyLmMKQEAgLTY3Nyw3ICs2NzcsNyBAQCBnZW42X2FkZF9yZXF1ZXN0 KHN0cnVjdCBpbnRlbF9yaW5nX2J1ZmZlciAqcmluZykKIAogCWlmIChpOTE1X3NlbWFwaG9yZV9p c19lbmFibGVkKGRldikpIHsKIAkJZm9yX2VhY2hfcmluZyh1c2VsZXNzLCBkZXZfcHJpdiwgaSkg ewotCQkJdTMyIG1ib3hfcmVnID0gcmluZy0+c2lnbmFsX21ib3hbaV07CisJCQl1MzIgbWJveF9y ZWcgPSByaW5nLT5zZW1hcGhvcmUubWJveC5zaWduYWxbaV07CiAJCQlpZiAobWJveF9yZWcgIT0g R0VONl9OT1NZTkMpCiAJCQkJdXBkYXRlX21ib3hlcyhyaW5nLCBtYm94X3JlZyk7CiAJCX0KQEAg LTcxMSwxMCArNzExLDExIEBAIGdlbjZfcmluZ19zeW5jKHN0cnVjdCBpbnRlbF9yaW5nX2J1ZmZl ciAqd2FpdGVyLAogCSAgICAgICBzdHJ1Y3QgaW50ZWxfcmluZ19idWZmZXIgKnNpZ25hbGxlciwK IAkgICAgICAgdTMyIHNlcW5vKQogewotCWludCByZXQ7CiAJdTMyIGR3MSA9IE1JX1NFTUFQSE9S RV9NQk9YIHwKIAkJICBNSV9TRU1BUEhPUkVfQ09NUEFSRSB8CiAJCSAgTUlfU0VNQVBIT1JFX1JF R0lTVEVSOworCXUzMiB3YWl0X21ib3ggPSBzaWduYWxsZXItPnNlbWFwaG9yZS5tYm94LndhaXRb d2FpdGVyLT5pZF07CisJaW50IHJldDsKIAogCS8qIFRocm91Z2hvdXQgYWxsIG9mIHRoZSBHRU0g Y29kZSwgc2Vxbm8gcGFzc2VkIGltcGxpZXMgb3VyIGN1cnJlbnQKIAkgKiBzZXFubyBpcyA+PSB0 aGUgbGFzdCBzZXFubyBleGVjdXRlZC4gSG93ZXZlciBmb3IgaGFyZHdhcmUgdGhlCkBAIC03MjIs OCArNzIzLDcgQEAgZ2VuNl9yaW5nX3N5bmMoc3RydWN0IGludGVsX3JpbmdfYnVmZmVyICp3YWl0 ZXIsCiAJICovCiAJc2Vxbm8gLT0gMTsKIAotCVdBUk5fT04oc2lnbmFsbGVyLT5zZW1hcGhvcmVf cmVnaXN0ZXJbd2FpdGVyLT5pZF0gPT0KLQkJTUlfU0VNQVBIT1JFX1NZTkNfSU5WQUxJRCk7CisJ V0FSTl9PTih3YWl0X21ib3ggPT0gTUlfU0VNQVBIT1JFX1NZTkNfSU5WQUxJRCk7CiAKIAlyZXQg PSBpbnRlbF9yaW5nX2JlZ2luKHdhaXRlciwgNCk7CiAJaWYgKHJldCkKQEAgLTczMSw5ICs3MzEs NyBAQCBnZW42X3Jpbmdfc3luYyhzdHJ1Y3QgaW50ZWxfcmluZ19idWZmZXIgKndhaXRlciwKIAog CS8qIElmIHNlcW5vIHdyYXAgaGFwcGVuZWQsIG9taXQgdGhlIHdhaXQgd2l0aCBuby1vcHMgKi8K IAlpZiAobGlrZWx5KCFpOTE1X2dlbV9oYXNfc2Vxbm9fd3JhcHBlZCh3YWl0ZXItPmRldiwgc2Vx bm8pKSkgewotCQlpbnRlbF9yaW5nX2VtaXQod2FpdGVyLAotCQkJCWR3MSB8Ci0JCQkJc2lnbmFs bGVyLT5zZW1hcGhvcmVfcmVnaXN0ZXJbd2FpdGVyLT5pZF0pOworCQlpbnRlbF9yaW5nX2VtaXQo d2FpdGVyLCBkdzEgfCB3YWl0X21ib3gpOwogCQlpbnRlbF9yaW5nX2VtaXQod2FpdGVyLCBzZXFu byk7CiAJCWludGVsX3JpbmdfZW1pdCh3YWl0ZXIsIDApOwogCQlpbnRlbF9yaW5nX2VtaXQod2Fp dGVyLCBNSV9OT09QKTsKQEAgLTEzMzEsNyArMTMyOSw4IEBAIHN0YXRpYyBpbnQgaW50ZWxfaW5p dF9yaW5nX2J1ZmZlcihzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LAogCUlOSVRfTElTVF9IRUFEKCZy aW5nLT5hY3RpdmVfbGlzdCk7CiAJSU5JVF9MSVNUX0hFQUQoJnJpbmctPnJlcXVlc3RfbGlzdCk7 CiAJcmluZy0+c2l6ZSA9IDMyICogUEFHRV9TSVpFOwotCW1lbXNldChyaW5nLT5zeW5jX3NlcW5v LCAwLCBzaXplb2YocmluZy0+c3luY19zZXFubykpOworCW1lbXNldChyaW5nLT5zZW1hcGhvcmUu c3luY19zZXFubywgMCwKKwkgICAgICAgc2l6ZW9mKHJpbmctPnNlbWFwaG9yZS5zeW5jX3NlcW5v KSk7CiAKIAlpbml0X3dhaXRxdWV1ZV9oZWFkKCZyaW5nLT5pcnFfcXVldWUpOwogCkBAIC0xODgx LDE1ICsxODgwLDE1IEBAIGludCBpbnRlbF9pbml0X3JlbmRlcl9yaW5nX2J1ZmZlcihzdHJ1Y3Qg ZHJtX2RldmljZSAqZGV2KQogCQlyaW5nLT5pcnFfZW5hYmxlX21hc2sgPSBHVF9SRU5ERVJfVVNF Ul9JTlRFUlJVUFQ7CiAJCXJpbmctPmdldF9zZXFubyA9IGdlbjZfcmluZ19nZXRfc2Vxbm87CiAJ CXJpbmctPnNldF9zZXFubyA9IHJpbmdfc2V0X3NlcW5vOwotCQlyaW5nLT5zeW5jX3RvID0gZ2Vu Nl9yaW5nX3N5bmM7Ci0JCXJpbmctPnNlbWFwaG9yZV9yZWdpc3RlcltSQ1NdID0gTUlfU0VNQVBI T1JFX1NZTkNfSU5WQUxJRDsKLQkJcmluZy0+c2VtYXBob3JlX3JlZ2lzdGVyW1ZDU10gPSBNSV9T RU1BUEhPUkVfU1lOQ19SVjsKLQkJcmluZy0+c2VtYXBob3JlX3JlZ2lzdGVyW0JDU10gPSBNSV9T RU1BUEhPUkVfU1lOQ19SQjsKLQkJcmluZy0+c2VtYXBob3JlX3JlZ2lzdGVyW1ZFQ1NdID0gTUlf U0VNQVBIT1JFX1NZTkNfUlZFOwotCQlyaW5nLT5zaWduYWxfbWJveFtSQ1NdID0gR0VONl9OT1NZ TkM7Ci0JCXJpbmctPnNpZ25hbF9tYm94W1ZDU10gPSBHRU42X1ZSU1lOQzsKLQkJcmluZy0+c2ln bmFsX21ib3hbQkNTXSA9IEdFTjZfQlJTWU5DOwotCQlyaW5nLT5zaWduYWxfbWJveFtWRUNTXSA9 IEdFTjZfVkVSU1lOQzsKKwkJcmluZy0+c2VtYXBob3JlLnN5bmNfdG8gPSBnZW42X3Jpbmdfc3lu YzsKKwkJcmluZy0+c2VtYXBob3JlLm1ib3gud2FpdFtSQ1NdID0gTUlfU0VNQVBIT1JFX1NZTkNf SU5WQUxJRDsKKwkJcmluZy0+c2VtYXBob3JlLm1ib3gud2FpdFtWQ1NdID0gTUlfU0VNQVBIT1JF X1NZTkNfUlY7CisJCXJpbmctPnNlbWFwaG9yZS5tYm94LndhaXRbQkNTXSA9IE1JX1NFTUFQSE9S RV9TWU5DX1JCOworCQlyaW5nLT5zZW1hcGhvcmUubWJveC53YWl0W1ZFQ1NdID0gTUlfU0VNQVBI T1JFX1NZTkNfUlZFOworCQlyaW5nLT5zZW1hcGhvcmUubWJveC5zaWduYWxbUkNTXSA9IEdFTjZf Tk9TWU5DOworCQlyaW5nLT5zZW1hcGhvcmUubWJveC5zaWduYWxbVkNTXSA9IEdFTjZfVlJTWU5D OworCQlyaW5nLT5zZW1hcGhvcmUubWJveC5zaWduYWxbQkNTXSA9IEdFTjZfQlJTWU5DOworCQly aW5nLT5zZW1hcGhvcmUubWJveC5zaWduYWxbVkVDU10gPSBHRU42X1ZFUlNZTkM7CiAJfSBlbHNl IGlmIChJU19HRU41KGRldikpIHsKIAkJcmluZy0+YWRkX3JlcXVlc3QgPSBwY19yZW5kZXJfYWRk X3JlcXVlc3Q7CiAJCXJpbmctPmZsdXNoID0gZ2VuNF9yZW5kZXJfcmluZ19mbHVzaDsKQEAgLTIw NTcsMTUgKzIwNTYsMTUgQEAgaW50IGludGVsX2luaXRfYnNkX3JpbmdfYnVmZmVyKHN0cnVjdCBk cm1fZGV2aWNlICpkZXYpCiAJCQlyaW5nLT5kaXNwYXRjaF9leGVjYnVmZmVyID0KIAkJCQlnZW42 X3JpbmdfZGlzcGF0Y2hfZXhlY2J1ZmZlcjsKIAkJfQotCQlyaW5nLT5zeW5jX3RvID0gZ2VuNl9y aW5nX3N5bmM7Ci0JCXJpbmctPnNlbWFwaG9yZV9yZWdpc3RlcltSQ1NdID0gTUlfU0VNQVBIT1JF X1NZTkNfVlI7Ci0JCXJpbmctPnNlbWFwaG9yZV9yZWdpc3RlcltWQ1NdID0gTUlfU0VNQVBIT1JF X1NZTkNfSU5WQUxJRDsKLQkJcmluZy0+c2VtYXBob3JlX3JlZ2lzdGVyW0JDU10gPSBNSV9TRU1B UEhPUkVfU1lOQ19WQjsKLQkJcmluZy0+c2VtYXBob3JlX3JlZ2lzdGVyW1ZFQ1NdID0gTUlfU0VN QVBIT1JFX1NZTkNfVlZFOwotCQlyaW5nLT5zaWduYWxfbWJveFtSQ1NdID0gR0VONl9SVlNZTkM7 Ci0JCXJpbmctPnNpZ25hbF9tYm94W1ZDU10gPSBHRU42X05PU1lOQzsKLQkJcmluZy0+c2lnbmFs X21ib3hbQkNTXSA9IEdFTjZfQlZTWU5DOwotCQlyaW5nLT5zaWduYWxfbWJveFtWRUNTXSA9IEdF TjZfVkVWU1lOQzsKKwkJcmluZy0+c2VtYXBob3JlLnN5bmNfdG8gPSBnZW42X3Jpbmdfc3luYzsK KwkJcmluZy0+c2VtYXBob3JlLm1ib3gud2FpdFtSQ1NdID0gTUlfU0VNQVBIT1JFX1NZTkNfVlI7 CisJCXJpbmctPnNlbWFwaG9yZS5tYm94LndhaXRbVkNTXSA9IE1JX1NFTUFQSE9SRV9TWU5DX0lO VkFMSUQ7CisJCXJpbmctPnNlbWFwaG9yZS5tYm94LndhaXRbQkNTXSA9IE1JX1NFTUFQSE9SRV9T WU5DX1ZCOworCQlyaW5nLT5zZW1hcGhvcmUubWJveC53YWl0W1ZFQ1NdID0gTUlfU0VNQVBIT1JF X1NZTkNfVlZFOworCQlyaW5nLT5zZW1hcGhvcmUubWJveC5zaWduYWxbUkNTXSA9IEdFTjZfUlZT WU5DOworCQlyaW5nLT5zZW1hcGhvcmUubWJveC5zaWduYWxbVkNTXSA9IEdFTjZfTk9TWU5DOwor CQlyaW5nLT5zZW1hcGhvcmUubWJveC5zaWduYWxbQkNTXSA9IEdFTjZfQlZTWU5DOworCQlyaW5n LT5zZW1hcGhvcmUubWJveC5zaWduYWxbVkVDU10gPSBHRU42X1ZFVlNZTkM7CiAJfSBlbHNlIHsK IAkJcmluZy0+bW1pb19iYXNlID0gQlNEX1JJTkdfQkFTRTsKIAkJcmluZy0+Zmx1c2ggPSBic2Rf cmluZ19mbHVzaDsKQEAgLTIxMTQsMTUgKzIxMTMsMTUgQEAgaW50IGludGVsX2luaXRfYmx0X3Jp bmdfYnVmZmVyKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCiAJCXJpbmctPmlycV9wdXQgPSBnZW42 X3JpbmdfcHV0X2lycTsKIAkJcmluZy0+ZGlzcGF0Y2hfZXhlY2J1ZmZlciA9IGdlbjZfcmluZ19k aXNwYXRjaF9leGVjYnVmZmVyOwogCX0KLQlyaW5nLT5zeW5jX3RvID0gZ2VuNl9yaW5nX3N5bmM7 Ci0JcmluZy0+c2VtYXBob3JlX3JlZ2lzdGVyW1JDU10gPSBNSV9TRU1BUEhPUkVfU1lOQ19CUjsK LQlyaW5nLT5zZW1hcGhvcmVfcmVnaXN0ZXJbVkNTXSA9IE1JX1NFTUFQSE9SRV9TWU5DX0JWOwot CXJpbmctPnNlbWFwaG9yZV9yZWdpc3RlcltCQ1NdID0gTUlfU0VNQVBIT1JFX1NZTkNfSU5WQUxJ RDsKLQlyaW5nLT5zZW1hcGhvcmVfcmVnaXN0ZXJbVkVDU10gPSBNSV9TRU1BUEhPUkVfU1lOQ19C VkU7Ci0JcmluZy0+c2lnbmFsX21ib3hbUkNTXSA9IEdFTjZfUkJTWU5DOwotCXJpbmctPnNpZ25h bF9tYm94W1ZDU10gPSBHRU42X1ZCU1lOQzsKLQlyaW5nLT5zaWduYWxfbWJveFtCQ1NdID0gR0VO Nl9OT1NZTkM7Ci0JcmluZy0+c2lnbmFsX21ib3hbVkVDU10gPSBHRU42X1ZFQlNZTkM7CisJcmlu Zy0+c2VtYXBob3JlLnN5bmNfdG8gPSBnZW42X3Jpbmdfc3luYzsKKwlyaW5nLT5zZW1hcGhvcmUu bWJveC53YWl0W1JDU10gPSBNSV9TRU1BUEhPUkVfU1lOQ19CUjsKKwlyaW5nLT5zZW1hcGhvcmUu bWJveC53YWl0W1ZDU10gPSBNSV9TRU1BUEhPUkVfU1lOQ19CVjsKKwlyaW5nLT5zZW1hcGhvcmUu bWJveC53YWl0W0JDU10gPSBNSV9TRU1BUEhPUkVfU1lOQ19JTlZBTElEOworCXJpbmctPnNlbWFw aG9yZS5tYm94LndhaXRbVkVDU10gPSBNSV9TRU1BUEhPUkVfU1lOQ19CVkU7CisJcmluZy0+c2Vt YXBob3JlLm1ib3guc2lnbmFsW1JDU10gPSBHRU42X1JCU1lOQzsKKwlyaW5nLT5zZW1hcGhvcmUu bWJveC5zaWduYWxbVkNTXSA9IEdFTjZfVkJTWU5DOworCXJpbmctPnNlbWFwaG9yZS5tYm94LnNp Z25hbFtCQ1NdID0gR0VONl9OT1NZTkM7CisJcmluZy0+c2VtYXBob3JlLm1ib3guc2lnbmFsW1ZF Q1NdID0gR0VONl9WRUJTWU5DOwogCXJpbmctPmluaXQgPSBpbml0X3JpbmdfY29tbW9uOwogCiAJ cmV0dXJuIGludGVsX2luaXRfcmluZ19idWZmZXIoZGV2LCByaW5nKTsKQEAgLTIxNTUsMTUgKzIx NTQsMTUgQEAgaW50IGludGVsX2luaXRfdmVib3hfcmluZ19idWZmZXIoc3RydWN0IGRybV9kZXZp Y2UgKmRldikKIAkJcmluZy0+aXJxX3B1dCA9IGhzd192ZWJveF9wdXRfaXJxOwogCQlyaW5nLT5k aXNwYXRjaF9leGVjYnVmZmVyID0gZ2VuNl9yaW5nX2Rpc3BhdGNoX2V4ZWNidWZmZXI7CiAJfQot CXJpbmctPnN5bmNfdG8gPSBnZW42X3Jpbmdfc3luYzsKLQlyaW5nLT5zZW1hcGhvcmVfcmVnaXN0 ZXJbUkNTXSA9IE1JX1NFTUFQSE9SRV9TWU5DX1ZFUjsKLQlyaW5nLT5zZW1hcGhvcmVfcmVnaXN0 ZXJbVkNTXSA9IE1JX1NFTUFQSE9SRV9TWU5DX1ZFVjsKLQlyaW5nLT5zZW1hcGhvcmVfcmVnaXN0 ZXJbQkNTXSA9IE1JX1NFTUFQSE9SRV9TWU5DX1ZFQjsKLQlyaW5nLT5zZW1hcGhvcmVfcmVnaXN0 ZXJbVkVDU10gPSBNSV9TRU1BUEhPUkVfU1lOQ19JTlZBTElEOwotCXJpbmctPnNpZ25hbF9tYm94 W1JDU10gPSBHRU42X1JWRVNZTkM7Ci0JcmluZy0+c2lnbmFsX21ib3hbVkNTXSA9IEdFTjZfVlZF U1lOQzsKLQlyaW5nLT5zaWduYWxfbWJveFtCQ1NdID0gR0VONl9CVkVTWU5DOwotCXJpbmctPnNp Z25hbF9tYm94W1ZFQ1NdID0gR0VONl9OT1NZTkM7CisJcmluZy0+c2VtYXBob3JlLnN5bmNfdG8g PSBnZW42X3Jpbmdfc3luYzsKKwlyaW5nLT5zZW1hcGhvcmUubWJveC53YWl0W1JDU10gPSBNSV9T RU1BUEhPUkVfU1lOQ19WRVI7CisJcmluZy0+c2VtYXBob3JlLm1ib3gud2FpdFtWQ1NdID0gTUlf U0VNQVBIT1JFX1NZTkNfVkVWOworCXJpbmctPnNlbWFwaG9yZS5tYm94LndhaXRbQkNTXSA9IE1J X1NFTUFQSE9SRV9TWU5DX1ZFQjsKKwlyaW5nLT5zZW1hcGhvcmUubWJveC53YWl0W1ZFQ1NdID0g TUlfU0VNQVBIT1JFX1NZTkNfSU5WQUxJRDsKKwlyaW5nLT5zZW1hcGhvcmUubWJveC5zaWduYWxb UkNTXSA9IEdFTjZfUlZFU1lOQzsKKwlyaW5nLT5zZW1hcGhvcmUubWJveC5zaWduYWxbVkNTXSA9 IEdFTjZfVlZFU1lOQzsKKwlyaW5nLT5zZW1hcGhvcmUubWJveC5zaWduYWxbQkNTXSA9IEdFTjZf QlZFU1lOQzsKKwlyaW5nLT5zZW1hcGhvcmUubWJveC5zaWduYWxbVkVDU10gPSBHRU42X05PU1lO QzsKIAlyaW5nLT5pbml0ID0gaW5pdF9yaW5nX2NvbW1vbjsKIAogCXJldHVybiBpbnRlbF9pbml0 X3JpbmdfYnVmZmVyKGRldiwgcmluZyk7CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkx NS9pbnRlbF9yaW5nYnVmZmVyLmggYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9yaW5nYnVm ZmVyLmgKaW5kZXggMDhiOTFjNi4uOGUwM2M0YyAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJt L2k5MTUvaW50ZWxfcmluZ2J1ZmZlci5oCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVs X3JpbmdidWZmZXIuaApAQCAtODUsNyArODUsNiBAQCBzdHJ1Y3QgIGludGVsX3JpbmdfYnVmZmVy IHsKIAl1bnNpZ25lZCBpcnFfcmVmY291bnQ7IC8qIHByb3RlY3RlZCBieSBkZXZfcHJpdi0+aXJx X2xvY2sgKi8KIAl1MzIJCWlycV9lbmFibGVfbWFzazsJLyogYml0bWFzayB0byBlbmFibGUgcmlu ZyBpbnRlcnJ1cHQgKi8KIAl1MzIJCXRyYWNlX2lycV9zZXFubzsKLQl1MzIJCXN5bmNfc2Vxbm9b STkxNV9OVU1fUklOR1MtMV07CiAJYm9vbCBfX211c3RfY2hlY2sgKCppcnFfZ2V0KShzdHJ1Y3Qg aW50ZWxfcmluZ19idWZmZXIgKnJpbmcpOwogCXZvaWQJCSgqaXJxX3B1dCkoc3RydWN0IGludGVs X3JpbmdfYnVmZmVyICpyaW5nKTsKIApAQCAtMTEzLDE0ICsxMTIsMjAgQEAgc3RydWN0ICBpbnRl bF9yaW5nX2J1ZmZlciB7CiAjZGVmaW5lIEk5MTVfRElTUEFUQ0hfU0VDVVJFIDB4MQogI2RlZmlu ZSBJOTE1X0RJU1BBVENIX1BJTk5FRCAweDIKIAl2b2lkCQkoKmNsZWFudXApKHN0cnVjdCBpbnRl bF9yaW5nX2J1ZmZlciAqcmluZyk7Ci0JaW50CQkoKnN5bmNfdG8pKHN0cnVjdCBpbnRlbF9yaW5n X2J1ZmZlciAqcmluZywKKworCXN0cnVjdCB7CisJCXUzMglzeW5jX3NlcW5vW0k5MTVfTlVNX1JJ TkdTLTFdOworCQkvKiBBS0Egd2FpdCgpICovCisJCWludAkoKnN5bmNfdG8pKHN0cnVjdCBpbnRl bF9yaW5nX2J1ZmZlciAqcmluZywKIAkJCQkgICBzdHJ1Y3QgaW50ZWxfcmluZ19idWZmZXIgKnRv LAogCQkJCSAgIHUzMiBzZXFubyk7Ci0KLQkvKiBvdXIgbWJveCB3cml0dGVuIGJ5IG90aGVycyAq LwotCXUzMgkJc2VtYXBob3JlX3JlZ2lzdGVyW0k5MTVfTlVNX1JJTkdTXTsKLQkvKiBtYm94ZXMg dGhpcyByaW5nIHNpZ25hbHMgdG8gKi8KLQl1MzIJCXNpZ25hbF9tYm94W0k5MTVfTlVNX1JJTkdT XTsKKwkJc3RydWN0IHsKKwkJCS8qIG91ciBtYm94IHdyaXR0ZW4gYnkgb3RoZXJzICovCisJCQl1 MzIJCXdhaXRbSTkxNV9OVU1fUklOR1NdOworCQkJLyogbWJveGVzIHRoaXMgcmluZyBzaWduYWxz IHRvICovCisJCQl1MzIJCXNpZ25hbFtJOTE1X05VTV9SSU5HU107CisJCX0gbWJveDsKKwl9IHNl bWFwaG9yZTsKIAogCS8qKgogCSAqIExpc3Qgb2Ygb2JqZWN0cyBjdXJyZW50bHkgaW52b2x2ZWQg aW4gcmVuZGVyaW5nIGZyb20gdGhlCi0tIAoxLjkuMAoKX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhA bGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHA6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1h bi9saXN0aW5mby9pbnRlbC1nZngK