From: "Nautiyal, Ankit K" Subject: [PATCH v9 08/11] drm: Handle aspect ratio info in legacy and atomic modeset paths Date: Thu, 22 Mar 2018 13:48:50 +0530 Message-ID: <1521706733-678-9-git-send-email-ankit.k.nautiyal@intel.com> References: <1521706733-678-1-git-send-email-ankit.k.nautiyal@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga07.intel.com (mga07.intel.com [134.134.136.100]) by gabe.freedesktop.org (Postfix) with ESMTPS id CE73D6EBB1 for ; Thu, 22 Mar 2018 08:25:38 +0000 (UTC) In-Reply-To: <1521706733-678-1-git-send-email-ankit.k.nautiyal@intel.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: dri-devel@lists.freedesktop.org List-Id: dri-devel@lists.freedesktop.org RnJvbTogQW5raXQgTmF1dGl5YWwgPGFua2l0LmsubmF1dGl5YWxAaW50ZWwuY29tPgoKSWYgdGhl IHVzZXItc3BhY2UgZG9lcyBub3Qgc3VwcG9ydCBhc3BlY3QtcmF0aW8sIGFuZCByZXF1ZXN0cyBm b3IgYQptb2Rlc2V0IHdpdGggbW9kZSBoYXZpbmcgYXNwZWN0IHJhdGlvIGJpdHMgc2V0LCB0aGVu IHRoZSBnaXZlbgp1c2VyLW1vZGUgbXVzdCBiZSByZWplY3RlZC4gU2Vjb25kbHksIHdoaWxlIHBy ZXBhcmluZyBhIHVzZXItbW9kZSBmcm9tCmtlcm5lbCBtb2RlLCB0aGUgYXNwZWN0LXJhdGlvIGlu Zm8gbXVzdCBub3QgYmUgZ2l2ZW4sIGlmIGFzcGVjdC1yYXRpbwppcyBub3Qgc3VwcG9ydGVkIGJ5 IHRoZSB1c2VyLgoKVGhpcyBwYXRjaDoKMS4gcGFzc2VzIHRoZSBmaWxlX3ByaXYgc3RydWN0dXJl IGZyb20gdGhlIGRybV9tb2RlX2F0b21pY19pb2N0bCB0aWxsCiAgIHRoZSBkcm1fbW9kZV9jcnRj X3NldF9tb2RlX3Byb3AsIHRvIGdldCB0aGUgdXNlciBjYXBhYmlsaXR5LgoyLiByZWplY3RzIHRo ZSBtb2RlcyB3aXRoIGFzcGVjdC1yYXRpbyBpbmZvLCBkdXJpbmcgbW9kZXNldCwgaWYgdGhlCiAg IHVzZXIgZG9lcyBub3Qgc3VwcG9ydCBhc3BlY3QgcmF0aW8uCjMuIGRvZXMgbm90IGxvYWQgdGhl IGFzcGVjdC1yYXRpbyBpbmZvIGluIHVzZXItbW9kZSBzdHJ1Y3R1cmUsIGlmCiAgIGFzcGVjdCBy YXRpbyBpcyBub3Qgc3VwcG9ydGVkLgoKU2lnbmVkLW9mZi1ieTogQW5raXQgTmF1dGl5YWwgPGFu a2l0LmsubmF1dGl5YWxAaW50ZWwuY29tPgoKVjM6IEFkZHJlc3NlZCByZXZpZXcgY29tbWVudHMg ZnJvbSBWaWxsZToKICAgIERvIG5vdCBjb3JydXB0IHRoZSBjdXJyZW50IGNydGMgc3RhdGUgYnkg dXBkYXRpbmcgYXNwZWN0LXJhdGlvIG9uCiAgICB0aGUgZmx5LgpWNDogcmViYXNlClY1OiBBcyBz dWdnZXN0ZWQgYnkgVmlsbGUsIHJlamVjdGVkIHRoZSBtb2Rlc2V0IGNhbGxzIGZvciBtb2RlcyB3 aXRoCiAgICBhc3BlY3QgcmF0aW8sIGlmIHRoZSB1c2VyIGRvZXMgbm90IHNldCBhc3BlY3QtcmF0 aW8gY2FwLgpWNjogVXNlZCB0aGUgaGVscGVyIGZ1bmN0aW9ucyBmb3IgZGV0ZXJtaW5pbmcgaWYg YXNwZWN0LXJhdGlvIGlzCiAgICBleHBlY3RlZCBpbiB0aGUgdXNlci1tb2RlLgpWNzogcmViYXNl ClY4OiByZWJhc2UKVjk6IHJlYmFzZQotLS0KIGRyaXZlcnMvZ3B1L2RybS9kcm1fYXRvbWljLmMg ICAgICAgIHwgMzQgKysrKysrKysrKysrKysrKysrKysrKysrKy0tLS0tLS0tLQogZHJpdmVycy9n cHUvZHJtL2RybV9hdG9taWNfaGVscGVyLmMgfCAgNiArKystLS0KIGRyaXZlcnMvZ3B1L2RybS9k cm1fY3J0Yy5jICAgICAgICAgIHwgIDggKysrKysrKysKIGRyaXZlcnMvZ3B1L2RybS9kcm1fY3J0 Y19pbnRlcm5hbC5oIHwgIDMgKystCiBkcml2ZXJzL2dwdS9kcm0vZHJtX21vZGVfb2JqZWN0LmMg ICB8ICA5ICsrKysrKy0tLQogaW5jbHVkZS9kcm0vZHJtX2F0b21pYy5oICAgICAgICAgICAgfCAg NSArKystLQogNiBmaWxlcyBjaGFuZ2VkLCA0NyBpbnNlcnRpb25zKCspLCAxOCBkZWxldGlvbnMo LSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vZHJtX2F0b21pYy5jIGIvZHJpdmVycy9n cHUvZHJtL2RybV9hdG9taWMuYwppbmRleCAxOGRjMzg0Li41MzA5NzEzIDEwMDY0NAotLS0gYS9k cml2ZXJzL2dwdS9kcm0vZHJtX2F0b21pYy5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9kcm1fYXRv bWljLmMKQEAgLTM2OCw2ICszNjgsNyBAQCBFWFBPUlRfU1lNQk9MKGRybV9hdG9taWNfc2V0X21v ZGVfZm9yX2NydGMpOwogICogZHJtX2F0b21pY19zZXRfbW9kZV9wcm9wX2Zvcl9jcnRjIC0gc2V0 IG1vZGUgZm9yIENSVEMKICAqIEBzdGF0ZTogdGhlIENSVEMgd2hvc2UgaW5jb21pbmcgc3RhdGUg dG8gdXBkYXRlCiAgKiBAYmxvYjogcG9pbnRlciB0byBibG9iIHByb3BlcnR5IHRvIHVzZSBmb3Ig bW9kZQorICogQGZpbGVfcHJpdjogZmlsZSBwcml2IHN0cnVjdHVyZSwgdG8gZ2V0IHRoZSB1c2Vy c3BhY2UgY2FwYWJpbGl0aWVzCiAgKgogICogU2V0IGEgbW9kZSAob3JpZ2luYXRpbmcgZnJvbSBh IGJsb2IgcHJvcGVydHkpIG9uIHRoZSBkZXNpcmVkIENSVEMgc3RhdGUuCiAgKiBUaGlzIGZ1bmN0 aW9uIHdpbGwgdGFrZSBhIHJlZmVyZW5jZSBvbiB0aGUgYmxvYiBwcm9wZXJ0eSBmb3IgdGhlIENS VEMgc3RhdGUsCkBAIC0zNzgsNyArMzc5LDggQEAgRVhQT1JUX1NZTUJPTChkcm1fYXRvbWljX3Nl dF9tb2RlX2Zvcl9jcnRjKTsKICAqIFplcm8gb24gc3VjY2VzcywgZXJyb3IgY29kZSBvbiBmYWls dXJlLiBDYW5ub3QgcmV0dXJuIC1FREVBRExLLgogICovCiBpbnQgZHJtX2F0b21pY19zZXRfbW9k ZV9wcm9wX2Zvcl9jcnRjKHN0cnVjdCBkcm1fY3J0Y19zdGF0ZSAqc3RhdGUsCi0gICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgIHN0cnVjdCBkcm1fcHJvcGVydHlfYmxvYiAqYmxv YikKKwkJCQkgICAgICBzdHJ1Y3QgZHJtX3Byb3BlcnR5X2Jsb2IgKmJsb2IsCisJCQkJICAgICAg c3RydWN0IGRybV9maWxlICpmaWxlX3ByaXYpCiB7CiAJaWYgKGJsb2IgPT0gc3RhdGUtPm1vZGVf YmxvYikKIAkJcmV0dXJuIDA7CkBAIC0zODksOSArMzkxLDIxIEBAIGludCBkcm1fYXRvbWljX3Nl dF9tb2RlX3Byb3BfZm9yX2NydGMoc3RydWN0IGRybV9jcnRjX3N0YXRlICpzdGF0ZSwKIAltZW1z ZXQoJnN0YXRlLT5tb2RlLCAwLCBzaXplb2Yoc3RhdGUtPm1vZGUpKTsKIAogCWlmIChibG9iKSB7 Ci0JCWlmIChibG9iLT5sZW5ndGggIT0gc2l6ZW9mKHN0cnVjdCBkcm1fbW9kZV9tb2RlaW5mbykg fHwKLQkJICAgIGRybV9tb2RlX2NvbnZlcnRfdW1vZGUoc3RhdGUtPmNydGMtPmRldiwgJnN0YXRl LT5tb2RlLAotCQkJCQkgICBibG9iLT5kYXRhKSkKKwkJc3RydWN0IGRybV9tb2RlX21vZGVpbmZv ICp1X21vZGU7CisKKwkJaWYgKGJsb2ItPmxlbmd0aCAhPSBzaXplb2Yoc3RydWN0IGRybV9tb2Rl X21vZGVpbmZvKSkKKwkJCXJldHVybiAtRUlOVkFMOworCisJCXVfbW9kZSA9IChzdHJ1Y3QgZHJt X21vZGVfbW9kZWluZm8gKikgYmxvYi0+ZGF0YTsKKwkJaWYgKCFkcm1fbW9kZV9hc3BlY3RfcmF0 aW9fYWxsb3dlZChmaWxlX3ByaXYsCisJCQkJCQkgICB1X21vZGUpKSB7CisJCQlEUk1fREVCVUdf QVRPTUlDKCJVbmV4cGVjdGVkIGFzcGVjdC1yYXRpbyBmbGFnIGJpdHNcbiIpOworCQkJcmV0dXJu IC1FSU5WQUw7CisJCX0KKworCQlpZiAoZHJtX21vZGVfY29udmVydF91bW9kZShzdGF0ZS0+Y3J0 Yy0+ZGV2LCAmc3RhdGUtPm1vZGUsCisJCQkJCSAgIChjb25zdCBzdHJ1Y3QgZHJtX21vZGVfbW9k ZWluZm8gKikKKwkJCQkJICAgdV9tb2RlKSkKIAkJCXJldHVybiAtRUlOVkFMOwogCiAJCXN0YXRl LT5tb2RlX2Jsb2IgPSBkcm1fcHJvcGVydHlfYmxvYl9nZXQoYmxvYik7CkBAIC00NzEsNiArNDg1 LDcgQEAgZHJtX2F0b21pY19yZXBsYWNlX3Byb3BlcnR5X2Jsb2JfZnJvbV9pZChzdHJ1Y3QgZHJt X2RldmljZSAqZGV2LAogICogQHN0YXRlOiB0aGUgc3RhdGUgb2JqZWN0IHRvIHVwZGF0ZSB3aXRo IHRoZSBuZXcgcHJvcGVydHkgdmFsdWUKICAqIEBwcm9wZXJ0eTogdGhlIHByb3BlcnR5IHRvIHNl dAogICogQHZhbDogdGhlIG5ldyBwcm9wZXJ0eSB2YWx1ZQorICogQGZpbGVfcHJpdjogdGhlIGZp bGUgcHJpdmF0ZSBzdHJ1Y3R1cmUsIHRvIGdldCB0aGUgdXNlciBjYXBhYmlsaXRpZXMKICAqCiAg KiBUaGlzIGZ1bmN0aW9uIGhhbmRsZXMgZ2VuZXJpYy9jb3JlIHByb3BlcnRpZXMgYW5kIGNhbGxz IG91dCB0byBkcml2ZXIncwogICogJmRybV9jcnRjX2Z1bmNzLmF0b21pY19zZXRfcHJvcGVydHkg Zm9yIGRyaXZlciBwcm9wZXJ0aWVzLiBUbyBlbnN1cmUKQEAgLTQ4Miw3ICs0OTcsNyBAQCBkcm1f YXRvbWljX3JlcGxhY2VfcHJvcGVydHlfYmxvYl9mcm9tX2lkKHN0cnVjdCBkcm1fZGV2aWNlICpk ZXYsCiAgKi8KIGludCBkcm1fYXRvbWljX2NydGNfc2V0X3Byb3BlcnR5KHN0cnVjdCBkcm1fY3J0 YyAqY3J0YywKIAkJc3RydWN0IGRybV9jcnRjX3N0YXRlICpzdGF0ZSwgc3RydWN0IGRybV9wcm9w ZXJ0eSAqcHJvcGVydHksCi0JCXVpbnQ2NF90IHZhbCkKKwkJdWludDY0X3QgdmFsLCBzdHJ1Y3Qg ZHJtX2ZpbGUgKmZpbGVfcHJpdikKIHsKIAlzdHJ1Y3QgZHJtX2RldmljZSAqZGV2ID0gY3J0Yy0+ ZGV2OwogCXN0cnVjdCBkcm1fbW9kZV9jb25maWcgKmNvbmZpZyA9ICZkZXYtPm1vZGVfY29uZmln OwpAQCAtNDk5LDcgKzUxNCw3IEBAIGludCBkcm1fYXRvbWljX2NydGNfc2V0X3Byb3BlcnR5KHN0 cnVjdCBkcm1fY3J0YyAqY3J0YywKIAkJZWxzZQogCQkJRFJNX0RFQlVHX0FUT01JQygiW0NSVEM6 JWQ6JXNdIEJsb2Igbm90IGZvdW5kLlxuIiwKIAkJCQkJIGNydGMtPmJhc2UuaWQsIGNydGMtPm5h bWUpOwotCQlyZXQgPSBkcm1fYXRvbWljX3NldF9tb2RlX3Byb3BfZm9yX2NydGMoc3RhdGUsIG1v ZGUpOworCQlyZXQgPSBkcm1fYXRvbWljX3NldF9tb2RlX3Byb3BfZm9yX2NydGMoc3RhdGUsIG1v ZGUsIGZpbGVfcHJpdik7CiAJCWRybV9wcm9wZXJ0eV9ibG9iX3B1dChtb2RlKTsKIAkJcmV0dXJu IHJldDsKIAl9IGVsc2UgaWYgKHByb3BlcnR5ID09IGNvbmZpZy0+ZGVnYW1tYV9sdXRfcHJvcGVy dHkpIHsKQEAgLTE5NjYsNyArMTk4MSw4IEBAIGludCBkcm1fYXRvbWljX2Nvbm5lY3Rvcl9jb21t aXRfZHBtcyhzdHJ1Y3QgZHJtX2F0b21pY19zdGF0ZSAqc3RhdGUsCiBpbnQgZHJtX2F0b21pY19z ZXRfcHJvcGVydHkoc3RydWN0IGRybV9hdG9taWNfc3RhdGUgKnN0YXRlLAogCQkJICAgIHN0cnVj dCBkcm1fbW9kZV9vYmplY3QgKm9iaiwKIAkJCSAgICBzdHJ1Y3QgZHJtX3Byb3BlcnR5ICpwcm9w LAotCQkJICAgIHVpbnQ2NF90IHByb3BfdmFsdWUpCisJCQkgICAgdWludDY0X3QgcHJvcF92YWx1 ZSwKKwkJCSAgICBzdHJ1Y3QgZHJtX2ZpbGUgKmZpbGVfcHJpdikKIHsKIAlzdHJ1Y3QgZHJtX21v ZGVfb2JqZWN0ICpyZWY7CiAJaW50IHJldDsKQEAgLTIwMDAsNyArMjAxNiw3IEBAIGludCBkcm1f YXRvbWljX3NldF9wcm9wZXJ0eShzdHJ1Y3QgZHJtX2F0b21pY19zdGF0ZSAqc3RhdGUsCiAJCX0K IAogCQlyZXQgPSBkcm1fYXRvbWljX2NydGNfc2V0X3Byb3BlcnR5KGNydGMsCi0JCQkJY3J0Y19z dGF0ZSwgcHJvcCwgcHJvcF92YWx1ZSk7CisJCQkJY3J0Y19zdGF0ZSwgcHJvcCwgcHJvcF92YWx1 ZSwgZmlsZV9wcml2KTsKIAkJYnJlYWs7CiAJfQogCWNhc2UgRFJNX01PREVfT0JKRUNUX1BMQU5F OiB7CkBAIC0yMzg5LDcgKzI0MDUsNyBAQCBpbnQgZHJtX21vZGVfYXRvbWljX2lvY3RsKHN0cnVj dCBkcm1fZGV2aWNlICpkZXYsCiAJCQl9CiAKIAkJCXJldCA9IGRybV9hdG9taWNfc2V0X3Byb3Bl cnR5KHN0YXRlLCBvYmosIHByb3AsCi0JCQkJCQkgICAgICBwcm9wX3ZhbHVlKTsKKwkJCQkJCSAg ICAgIHByb3BfdmFsdWUsIGZpbGVfcHJpdik7CiAJCQlpZiAocmV0KSB7CiAJCQkJZHJtX21vZGVf b2JqZWN0X3B1dChvYmopOwogCQkJCWdvdG8gb3V0OwpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUv ZHJtL2RybV9hdG9taWNfaGVscGVyLmMgYi9kcml2ZXJzL2dwdS9kcm0vZHJtX2F0b21pY19oZWxw ZXIuYwppbmRleCBjMzU2NTQ1Li45ZjIwNzkyIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0v ZHJtX2F0b21pY19oZWxwZXIuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vZHJtX2F0b21pY19oZWxw ZXIuYwpAQCAtMTg2LDcgKzE4Niw3IEBAIHN0YXRpYyBpbnQgaGFuZGxlX2NvbmZsaWN0aW5nX2Vu Y29kZXJzKHN0cnVjdCBkcm1fYXRvbWljX3N0YXRlICpzdGF0ZSwKIAogCQlpZiAoIWNydGNfc3Rh dGUtPmNvbm5lY3Rvcl9tYXNrKSB7CiAJCQlyZXQgPSBkcm1fYXRvbWljX3NldF9tb2RlX3Byb3Bf Zm9yX2NydGMoY3J0Y19zdGF0ZSwKLQkJCQkJCQkJTlVMTCk7CisJCQkJCQkJCU5VTEwsIE5VTEwp OwogCQkJaWYgKHJldCA8IDApCiAJCQkJZ290byBvdXQ7CiAKQEAgLTI3NTEsNyArMjc1MSw3IEBA IHN0YXRpYyBpbnQgdXBkYXRlX291dHB1dF9zdGF0ZShzdHJ1Y3QgZHJtX2F0b21pY19zdGF0ZSAq c3RhdGUsCiAKIAkJaWYgKCFuZXdfY3J0Y19zdGF0ZS0+Y29ubmVjdG9yX21hc2spIHsKIAkJCXJl dCA9IGRybV9hdG9taWNfc2V0X21vZGVfcHJvcF9mb3JfY3J0YyhuZXdfY3J0Y19zdGF0ZSwKLQkJ CQkJCQkJTlVMTCk7CisJCQkJCQkJCU5VTEwsIE5VTEwpOwogCQkJaWYgKHJldCA8IDApCiAJCQkJ cmV0dXJuIHJldDsKIApAQCAtMjkzMiw3ICsyOTMyLDcgQEAgaW50IGRybV9hdG9taWNfaGVscGVy X2Rpc2FibGVfYWxsKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsCiAKIAkJY3J0Y19zdGF0ZS0+YWN0 aXZlID0gZmFsc2U7CiAKLQkJcmV0ID0gZHJtX2F0b21pY19zZXRfbW9kZV9wcm9wX2Zvcl9jcnRj KGNydGNfc3RhdGUsIE5VTEwpOworCQlyZXQgPSBkcm1fYXRvbWljX3NldF9tb2RlX3Byb3BfZm9y X2NydGMoY3J0Y19zdGF0ZSwgTlVMTCwgTlVMTCk7CiAJCWlmIChyZXQgPCAwKQogCQkJZ290byBm cmVlOwogCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vZHJtX2NydGMuYyBiL2RyaXZlcnMv Z3B1L2RybS9kcm1fY3J0Yy5jCmluZGV4IDAzNTgzODguLmMzNTU2MWUgMTAwNjQ0Ci0tLSBhL2Ry aXZlcnMvZ3B1L2RybS9kcm1fY3J0Yy5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9kcm1fY3J0Yy5j CkBAIC00NDYsNiArNDQ2LDcgQEAgaW50IGRybV9tb2RlX2dldGNydGMoc3RydWN0IGRybV9kZXZp Y2UgKmRldiwKIAkJCWNydGNfcmVzcC0+bW9kZV92YWxpZCA9IDA7CiAJCX0KIAl9CisJZHJtX21v ZGVfZmlsdGVyX2FzcGVjdF9yYXRpb19mbGFncyhmaWxlX3ByaXYsICZjcnRjX3Jlc3AtPm1vZGUp OwogCWRybV9tb2Rlc2V0X3VubG9jaygmY3J0Yy0+bXV0ZXgpOwogCiAJcmV0dXJuIDA7CkBAIC02 MTMsNiArNjE0LDEzIEBAIGludCBkcm1fbW9kZV9zZXRjcnRjKHN0cnVjdCBkcm1fZGV2aWNlICpk ZXYsIHZvaWQgKmRhdGEsCiAJCQlyZXQgPSAtRU5PTUVNOwogCQkJZ290byBvdXQ7CiAJCX0KKwkJ aWYgKCFkcm1fbW9kZV9hc3BlY3RfcmF0aW9fYWxsb3dlZChmaWxlX3ByaXYsCisJCQkJCQkgICAm Y3J0Y19yZXEtPm1vZGUpKSB7CisJCQlEUk1fREVCVUdfS01TKCJVbmV4cGVjdGVkIGFzcGVjdC1y YXRpbyBmbGFnIGJpdHNcbiIpOworCQkJcmV0ID0gLUVJTlZBTDsKKwkJCWdvdG8gb3V0OworCQl9 CisKIAogCQlyZXQgPSBkcm1fbW9kZV9jb252ZXJ0X3Vtb2RlKGRldiwgbW9kZSwgJmNydGNfcmVx LT5tb2RlKTsKIAkJaWYgKHJldCkgewpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2RybV9j cnRjX2ludGVybmFsLmggYi9kcml2ZXJzL2dwdS9kcm0vZHJtX2NydGNfaW50ZXJuYWwuaAppbmRl eCAzYzJiODI4Li43ZTlmOGY4IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vZHJtX2NydGNf aW50ZXJuYWwuaAorKysgYi9kcml2ZXJzL2dwdS9kcm0vZHJtX2NydGNfaW50ZXJuYWwuaApAQCAt MTg4LDcgKzE4OCw4IEBAIGludCBkcm1fYXRvbWljX2Nvbm5lY3Rvcl9jb21taXRfZHBtcyhzdHJ1 Y3QgZHJtX2F0b21pY19zdGF0ZSAqc3RhdGUsCiBpbnQgZHJtX2F0b21pY19zZXRfcHJvcGVydHko c3RydWN0IGRybV9hdG9taWNfc3RhdGUgKnN0YXRlLAogCQkJICAgIHN0cnVjdCBkcm1fbW9kZV9v YmplY3QgKm9iaiwKIAkJCSAgICBzdHJ1Y3QgZHJtX3Byb3BlcnR5ICpwcm9wLAotCQkJICAgIHVp bnQ2NF90IHByb3BfdmFsdWUpOworCQkJICAgIHVpbnQ2NF90IHByb3BfdmFsdWUsCisJCQkgICAg c3RydWN0IGRybV9maWxlICpmaWxlX3ByaXYpOwogaW50IGRybV9hdG9taWNfZ2V0X3Byb3BlcnR5 KHN0cnVjdCBkcm1fbW9kZV9vYmplY3QgKm9iaiwKIAkJCSAgICBzdHJ1Y3QgZHJtX3Byb3BlcnR5 ICpwcm9wZXJ0eSwgdWludDY0X3QgKnZhbCk7CiBpbnQgZHJtX21vZGVfYXRvbWljX2lvY3RsKHN0 cnVjdCBkcm1fZGV2aWNlICpkZXYsCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vZHJtX21v ZGVfb2JqZWN0LmMgYi9kcml2ZXJzL2dwdS9kcm0vZHJtX21vZGVfb2JqZWN0LmMKaW5kZXggY2U0 ZDJmYi4uMWMzZDQ5OCAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2RybV9tb2RlX29iamVj dC5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9kcm1fbW9kZV9vYmplY3QuYwpAQCAtNDUyLDcgKzQ1 Miw4IEBAIHN0YXRpYyBpbnQgc2V0X3Byb3BlcnR5X2xlZ2FjeShzdHJ1Y3QgZHJtX21vZGVfb2Jq ZWN0ICpvYmosCiAKIHN0YXRpYyBpbnQgc2V0X3Byb3BlcnR5X2F0b21pYyhzdHJ1Y3QgZHJtX21v ZGVfb2JqZWN0ICpvYmosCiAJCQkgICAgICAgc3RydWN0IGRybV9wcm9wZXJ0eSAqcHJvcCwKLQkJ CSAgICAgICB1aW50NjRfdCBwcm9wX3ZhbHVlKQorCQkJICAgICAgIHVpbnQ2NF90IHByb3BfdmFs dWUsCisJCQkgICAgICAgc3RydWN0IGRybV9maWxlICpmaWxlX3ByaXYpCiB7CiAJc3RydWN0IGRy bV9kZXZpY2UgKmRldiA9IHByb3AtPmRldjsKIAlzdHJ1Y3QgZHJtX2F0b21pY19zdGF0ZSAqc3Rh dGU7CkBAIC00NzYsNyArNDc3LDggQEAgc3RhdGljIGludCBzZXRfcHJvcGVydHlfYXRvbWljKHN0 cnVjdCBkcm1fbW9kZV9vYmplY3QgKm9iaiwKIAkJCQkJCSAgICAgICBvYmpfdG9fY29ubmVjdG9y KG9iaiksCiAJCQkJCQkgICAgICAgcHJvcF92YWx1ZSk7CiAJfSBlbHNlIHsKLQkJcmV0ID0gZHJt X2F0b21pY19zZXRfcHJvcGVydHkoc3RhdGUsIG9iaiwgcHJvcCwgcHJvcF92YWx1ZSk7CisJCXJl dCA9IGRybV9hdG9taWNfc2V0X3Byb3BlcnR5KHN0YXRlLCBvYmosIHByb3AsIHByb3BfdmFsdWUs CisJCQkJCSAgICAgIGZpbGVfcHJpdik7CiAJCWlmIChyZXQpCiAJCQlnb3RvIG91dDsKIAkJcmV0 ID0gZHJtX2F0b21pY19jb21taXQoc3RhdGUpOwpAQCAtNTE5LDcgKzUyMSw4IEBAIGludCBkcm1f bW9kZV9vYmpfc2V0X3Byb3BlcnR5X2lvY3RsKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsIHZvaWQg KmRhdGEsCiAJCWdvdG8gb3V0X3VucmVmOwogCiAJaWYgKGRybV9kcnZfdXNlc19hdG9taWNfbW9k ZXNldChwcm9wZXJ0eS0+ZGV2KSkKLQkJcmV0ID0gc2V0X3Byb3BlcnR5X2F0b21pYyhhcmdfb2Jq LCBwcm9wZXJ0eSwgYXJnLT52YWx1ZSk7CisJCXJldCA9IHNldF9wcm9wZXJ0eV9hdG9taWMoYXJn X29iaiwgcHJvcGVydHksIGFyZy0+dmFsdWUsCisJCQkJCSAgZmlsZV9wcml2KTsKIAllbHNlCiAJ CXJldCA9IHNldF9wcm9wZXJ0eV9sZWdhY3koYXJnX29iaiwgcHJvcGVydHksIGFyZy0+dmFsdWUp OwogCmRpZmYgLS1naXQgYS9pbmNsdWRlL2RybS9kcm1fYXRvbWljLmggYi9pbmNsdWRlL2RybS9k cm1fYXRvbWljLmgKaW5kZXggYTU3YThhYS4uYjcxMDZmNyAxMDA2NDQKLS0tIGEvaW5jbHVkZS9k cm0vZHJtX2F0b21pYy5oCisrKyBiL2luY2x1ZGUvZHJtL2RybV9hdG9taWMuaApAQCAtMzY3LDcg KzM2Nyw3IEBAIGRybV9hdG9taWNfZ2V0X2NydGNfc3RhdGUoc3RydWN0IGRybV9hdG9taWNfc3Rh dGUgKnN0YXRlLAogCQkJICBzdHJ1Y3QgZHJtX2NydGMgKmNydGMpOwogaW50IGRybV9hdG9taWNf Y3J0Y19zZXRfcHJvcGVydHkoc3RydWN0IGRybV9jcnRjICpjcnRjLAogCQlzdHJ1Y3QgZHJtX2Ny dGNfc3RhdGUgKnN0YXRlLCBzdHJ1Y3QgZHJtX3Byb3BlcnR5ICpwcm9wZXJ0eSwKLQkJdWludDY0 X3QgdmFsKTsKKwkJdWludDY0X3QgdmFsLCBzdHJ1Y3QgZHJtX2ZpbGUgKmZpbGVfcHJpdik7CiBz dHJ1Y3QgZHJtX3BsYW5lX3N0YXRlICogX19tdXN0X2NoZWNrCiBkcm1fYXRvbWljX2dldF9wbGFu ZV9zdGF0ZShzdHJ1Y3QgZHJtX2F0b21pY19zdGF0ZSAqc3RhdGUsCiAJCQkgICBzdHJ1Y3QgZHJt X3BsYW5lICpwbGFuZSk7CkBAIC01ODMsNyArNTgzLDggQEAgZHJtX2F0b21pY19zZXRfbW9kZV9m b3JfY3J0YyhzdHJ1Y3QgZHJtX2NydGNfc3RhdGUgKnN0YXRlLAogCQkJICAgICBjb25zdCBzdHJ1 Y3QgZHJtX2Rpc3BsYXlfbW9kZSAqbW9kZSk7CiBpbnQgX19tdXN0X2NoZWNrCiBkcm1fYXRvbWlj X3NldF9tb2RlX3Byb3BfZm9yX2NydGMoc3RydWN0IGRybV9jcnRjX3N0YXRlICpzdGF0ZSwKLQkJ CQkgIHN0cnVjdCBkcm1fcHJvcGVydHlfYmxvYiAqYmxvYik7CisJCQkJICBzdHJ1Y3QgZHJtX3By b3BlcnR5X2Jsb2IgKmJsb2IsCisJCQkJICBzdHJ1Y3QgZHJtX2ZpbGUgKmZpbGVfcHJpdik7CiBp bnQgX19tdXN0X2NoZWNrCiBkcm1fYXRvbWljX3NldF9jcnRjX2Zvcl9wbGFuZShzdHJ1Y3QgZHJt X3BsYW5lX3N0YXRlICpwbGFuZV9zdGF0ZSwKIAkJCSAgICAgIHN0cnVjdCBkcm1fY3J0YyAqY3J0 Yyk7Ci0tIAoyLjcuNAoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX18KZHJpLWRldmVsIG1haWxpbmcgbGlzdApkcmktZGV2ZWxAbGlzdHMuZnJlZWRlc2t0b3Au b3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vZHJpLWRl dmVsCg==