From: Ville Syrjala Subject: [PATCH v2 09/10] drm/i915: Check infoframe state in intel_pipe_config_compare() Date: Mon, 17 Dec 2018 17:54:57 +0200 Message-ID: <20181217155458.5503-10-ville.syrjala@linux.intel.com> References: <20181217155458.5503-1-ville.syrjala@linux.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 ESMTPS id 114B56E556 for ; Mon, 17 Dec 2018 15:55:31 +0000 (UTC) In-Reply-To: <20181217155458.5503-1-ville.syrjala@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 Cc: Hans de Goede List-Id: intel-gfx@lists.freedesktop.org RnJvbTogVmlsbGUgU3lyasOkbMOkIDx2aWxsZS5zeXJqYWxhQGxpbnV4LmludGVsLmNvbT4KCkNo ZWNrIHRoZSBpbmZvZnJhbWVzIGFuZCBpbmZvZnJhbWUgZW5hYmxlIHN0YXRlIHdoZW4gY29tcGFy aW5nIHR3bwpjcnRjIHN0YXRlcy4KCldlJ2xsIHVzZSB0aGUgaW5mb2ZyYW1lIGxvZ2dpbmcgZnVu Y3Rpb25zIGZyb20gdmlkZW8vaGRtaS5jIHRvCnNob3cgdGhlIGluZm9mcmFtZXMgYXMgcGFydCBv ZiB0aGUgc3RhdGUgZHVtcC4KClRPRE86IFRyeSB0byBiZXR0ZXIgaW50ZWdyYXRlIHRoZSBpbmZv ZnJhbWUgZHVtcHMgd2l0aAogICAgICBkcm0gc3RhdGUgZHVtcHMKCnYyOiBkcm1fcHJpbnRrKCkg aXMgbm8gbW9yZQoKU2lnbmVkLW9mZi1ieTogVmlsbGUgU3lyasOkbMOkIDx2aWxsZS5zeXJqYWxh QGxpbnV4LmludGVsLmNvbT4KUmV2aWV3ZWQtYnk6IERhbmllbCBWZXR0ZXIgPGRhbmllbC52ZXR0 ZXJAZmZ3bGwuY2g+Ci0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jIHwg NDkgKysrKysrKysrKysrKysrKysrKysrKysrKysrLQogMSBmaWxlIGNoYW5nZWQsIDQ4IGluc2Vy dGlvbnMoKyksIDEgZGVsZXRpb24oLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkx NS9pbnRlbF9kaXNwbGF5LmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMK aW5kZXggMmMzZjNmNjhkNTA2Li42MzNhNDI3MGE1NTQgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1 L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRl bF9kaXNwbGF5LmMKQEAgLTExNjIyLDYgKzExNjIyLDM3IEBAIGludGVsX2NvbXBhcmVfbGlua19t X24oY29uc3Qgc3RydWN0IGludGVsX2xpbmtfbV9uICptX24sCiAJcmV0dXJuIGZhbHNlOwogfQog CitzdGF0aWMgYm9vbAoraW50ZWxfY29tcGFyZV9pbmZvZnJhbWUoY29uc3QgdW5pb24gaGRtaV9p bmZvZnJhbWUgKmEsCisJCQljb25zdCB1bmlvbiBoZG1pX2luZm9mcmFtZSAqYikKK3sKKwlyZXR1 cm4gbWVtY21wKGEsIGIsIHNpemVvZigqYSkpID09IDA7Cit9CisKK3N0YXRpYyB2b2lkCitwaXBl X2NvbmZpZ19pbmZvZnJhbWVfZXJyKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiwK KwkJCSAgYm9vbCBhZGp1c3QsIGNvbnN0IGNoYXIgKm5hbWUsCisJCQkgIGNvbnN0IHVuaW9uIGhk bWlfaW5mb2ZyYW1lICphLAorCQkJICBjb25zdCB1bmlvbiBoZG1pX2luZm9mcmFtZSAqYikKK3sK KwlpZiAoYWRqdXN0KSB7CisJCWlmICgoZHJtX2RlYnVnICYgRFJNX1VUX0tNUykgPT0gMCkKKwkJ CXJldHVybjsKKworCQlkcm1fZGJnKERSTV9VVF9LTVMsICJtaXNtYXRjaCBpbiAlcyBpbmZvZnJh bWUiLCBuYW1lKTsKKwkJZHJtX2RiZyhEUk1fVVRfS01TLCAiZXhwZWN0ZWQ6Iik7CisJCWhkbWlf aW5mb2ZyYW1lX2xvZyhLRVJOX0RFQlVHLCBkZXZfcHJpdi0+ZHJtLmRldiwgYSk7CisJCWRybV9k YmcoRFJNX1VUX0tNUywgImZvdW5kIik7CisJCWhkbWlfaW5mb2ZyYW1lX2xvZyhLRVJOX0RFQlVH LCBkZXZfcHJpdi0+ZHJtLmRldiwgYik7CisJfSBlbHNlIHsKKwkJZHJtX2VycigibWlzbWF0Y2gg aW4gJXMgaW5mb2ZyYW1lIiwgbmFtZSk7CisJCWRybV9lcnIoImV4cGVjdGVkOiIpOworCQloZG1p X2luZm9mcmFtZV9sb2coS0VSTl9FUlIsIGRldl9wcml2LT5kcm0uZGV2LCBhKTsKKwkJZHJtX2Vy cigiZm91bmQiKTsKKwkJaGRtaV9pbmZvZnJhbWVfbG9nKEtFUk5fRVJSLCBkZXZfcHJpdi0+ZHJt LmRldiwgYik7CisJfQorfQorCiBzdGF0aWMgdm9pZCBfX3ByaW50ZigzLCA0KQogcGlwZV9jb25m aWdfZXJyKGJvb2wgYWRqdXN0LCBjb25zdCBjaGFyICpuYW1lLCBjb25zdCBjaGFyICpmb3JtYXQs IC4uLikKIHsKQEAgLTExNzgzLDcgKzExODE0LDE3IEBAIGludGVsX3BpcGVfY29uZmlnX2NvbXBh cmUoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2LAogCX0gXAogfSB3aGlsZSAoMCkK IAotI2RlZmluZSBQSVBFX0NPTkZfUVVJUksocXVpcmspCVwKKyNkZWZpbmUgUElQRV9DT05GX0NI RUNLX0lORk9GUkFNRShuYW1lKSBkbyB7IFwKKwlpZiAoIWludGVsX2NvbXBhcmVfaW5mb2ZyYW1l KCZjdXJyZW50X2NvbmZpZy0+aW5mb2ZyYW1lcy5uYW1lLCBcCisJCQkJICAgICAmcGlwZV9jb25m aWctPmluZm9mcmFtZXMubmFtZSkpIHsgXAorCQlwaXBlX2NvbmZpZ19pbmZvZnJhbWVfZXJyKGRl dl9wcml2LCBhZGp1c3QsIF9fc3RyaW5naWZ5KG5hbWUpLCBcCisJCQkJCSAgJmN1cnJlbnRfY29u ZmlnLT5pbmZvZnJhbWVzLm5hbWUsIFwKKwkJCQkJICAmcGlwZV9jb25maWctPmluZm9mcmFtZXMu bmFtZSk7IFwKKwkJcmV0ID0gZmFsc2U7IFwKKwl9IFwKK30gd2hpbGUgKDApCisKKyNkZWZpbmUg UElQRV9DT05GX1FVSVJLKHF1aXJrKSBcCiAJKChjdXJyZW50X2NvbmZpZy0+cXVpcmtzIHwgcGlw ZV9jb25maWctPnF1aXJrcykgJiAocXVpcmspKQogCiAJUElQRV9DT05GX0NIRUNLX0koY3B1X3Ry YW5zY29kZXIpOwpAQCAtMTE5MTIsNiArMTE5NTMsMTIgQEAgaW50ZWxfcGlwZV9jb25maWdfY29t cGFyZShzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYsCiAKIAlQSVBFX0NPTkZfQ0hF Q0tfSShtaW5fdm9sdGFnZV9sZXZlbCk7CiAKKwlQSVBFX0NPTkZfQ0hFQ0tfWChpbmZvZnJhbWVz LmVuYWJsZSk7CisJUElQRV9DT05GX0NIRUNLX1goaW5mb2ZyYW1lcy5nY3ApOworCVBJUEVfQ09O Rl9DSEVDS19JTkZPRlJBTUUoYXZpKTsKKwlQSVBFX0NPTkZfQ0hFQ0tfSU5GT0ZSQU1FKHNwZCk7 CisJUElQRV9DT05GX0NIRUNLX0lORk9GUkFNRShoZG1pKTsKKwogI3VuZGVmIFBJUEVfQ09ORl9D SEVDS19YCiAjdW5kZWYgUElQRV9DT05GX0NIRUNLX0kKICN1bmRlZiBQSVBFX0NPTkZfQ0hFQ0tf Qk9PTAotLSAKMi4xOC4xCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3Rv cC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRl bC1nZngK