From: Maarten Lankhorst Subject: [PATCH 1/6] drm/i915: Convert intel_hdmi to use atomic state Date: Wed, 7 Sep 2016 11:06:28 +0200 Message-ID: <1473239193-3720-2-git-send-email-maarten.lankhorst@linux.intel.com> References: <1473239193-3720-1-git-send-email-maarten.lankhorst@linux.intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mblankhorst.nl (mblankhorst.nl [IPv6:2a02:2308::216:3eff:fe92:dfa3]) by gabe.freedesktop.org (Postfix) with ESMTPS id B6A8A6E950 for ; Wed, 7 Sep 2016 09:06:36 +0000 (UTC) In-Reply-To: <1473239193-3720-1-git-send-email-maarten.lankhorst@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 List-Id: intel-gfx@lists.freedesktop.org VGhpcyBpcyB0aGUgbGFzdCBjb25uZWN0b3Igc3RpbGwgbG9va2luZyBhdCBjcnRjLT5jb25maWcu IEZpeCB0aGlzLgoKU2lnbmVkLW9mZi1ieTogTWFhcnRlbiBMYW5raG9yc3QgPG1hYXJ0ZW4ubGFu a2hvcnN0QGxpbnV4LmludGVsLmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9o ZG1pLmMgfCA0OCArKysrKysrKysrKysrKysrKy0tLS0tLS0tLS0tLS0tLS0tLS0tLS0KIDEgZmls ZSBjaGFuZ2VkLCAyMSBpbnNlcnRpb25zKCspLCAyNyBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQg YS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9oZG1pLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkx NS9pbnRlbF9oZG1pLmMKaW5kZXggMWExMTZhNmExODE3Li40MGY2ZTFiNDdlYjMgMTAwNjQ0Ci0t LSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2hkbWkuYworKysgYi9kcml2ZXJzL2dwdS9k cm0vaTkxNS9pbnRlbF9oZG1pLmMKQEAgLTk3NSw3ICs5NzUsOSBAQCBzdGF0aWMgdm9pZCBpbnRl bF9oZG1pX2dldF9jb25maWcoc3RydWN0IGludGVsX2VuY29kZXIgKmVuY29kZXIsCiAJcGlwZV9j b25maWctPmxhbmVfY291bnQgPSA0OwogfQogCi1zdGF0aWMgdm9pZCBpbnRlbF9lbmFibGVfaGRt aV9hdWRpbyhzdHJ1Y3QgaW50ZWxfZW5jb2RlciAqZW5jb2RlcikKK3N0YXRpYyB2b2lkIGludGVs X2VuYWJsZV9oZG1pX2F1ZGlvKHN0cnVjdCBpbnRlbF9lbmNvZGVyICplbmNvZGVyLAorCQkJCSAg ICBzdHJ1Y3QgaW50ZWxfY3J0Y19zdGF0ZSAqcGlwZV9jb25maWcsCisJCQkJICAgIHN0cnVjdCBk cm1fY29ubmVjdG9yX3N0YXRlICpjb25uX3N0YXRlKQogewogCXN0cnVjdCBpbnRlbF9jcnRjICpj cnRjID0gdG9faW50ZWxfY3J0YyhlbmNvZGVyLT5iYXNlLmNydGMpOwogCkBAIC05OTEsMjEgKzk5 MywyMCBAQCBzdGF0aWMgdm9pZCBnNHhfZW5hYmxlX2hkbWkoc3RydWN0IGludGVsX2VuY29kZXIg KmVuY29kZXIsCiB7CiAJc3RydWN0IGRybV9kZXZpY2UgKmRldiA9IGVuY29kZXItPmJhc2UuZGV2 OwogCXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9IHRvX2k5MTUoZGV2KTsKLQlz dHJ1Y3QgaW50ZWxfY3J0YyAqY3J0YyA9IHRvX2ludGVsX2NydGMoZW5jb2Rlci0+YmFzZS5jcnRj KTsKIAlzdHJ1Y3QgaW50ZWxfaGRtaSAqaW50ZWxfaGRtaSA9IGVuY190b19pbnRlbF9oZG1pKCZl bmNvZGVyLT5iYXNlKTsKIAl1MzIgdGVtcDsKIAogCXRlbXAgPSBJOTE1X1JFQUQoaW50ZWxfaGRt aS0+aGRtaV9yZWcpOwogCiAJdGVtcCB8PSBTRFZPX0VOQUJMRTsKLQlpZiAoY3J0Yy0+Y29uZmln LT5oYXNfYXVkaW8pCisJaWYgKHBpcGVfY29uZmlnLT5oYXNfYXVkaW8pCiAJCXRlbXAgfD0gU0RW T19BVURJT19FTkFCTEU7CiAKIAlJOTE1X1dSSVRFKGludGVsX2hkbWktPmhkbWlfcmVnLCB0ZW1w KTsKIAlQT1NUSU5HX1JFQUQoaW50ZWxfaGRtaS0+aGRtaV9yZWcpOwogCi0JaWYgKGNydGMtPmNv bmZpZy0+aGFzX2F1ZGlvKQotCQlpbnRlbF9lbmFibGVfaGRtaV9hdWRpbyhlbmNvZGVyKTsKKwlp ZiAocGlwZV9jb25maWctPmhhc19hdWRpbykKKwkJaW50ZWxfZW5hYmxlX2hkbWlfYXVkaW8oZW5j b2RlciwgcGlwZV9jb25maWcsIGNvbm5fc3RhdGUpOwogfQogCiBzdGF0aWMgdm9pZCBpYnhfZW5h YmxlX2hkbWkoc3RydWN0IGludGVsX2VuY29kZXIgKmVuY29kZXIsCkBAIC0xMDQwLDggKzEwNDEs OCBAQCBzdGF0aWMgdm9pZCBpYnhfZW5hYmxlX2hkbWkoc3RydWN0IGludGVsX2VuY29kZXIgKmVu Y29kZXIsCiAJICogRklYTUU6IEJTcGVjIHNheXMgdGhpcyBzaG91bGQgYmUgZG9uZSBhdCB0aGUg ZW5kIG9mCiAJICogb2YgdGhlIG1vZGVzZXQgc2VxdWVuY2UsIHNvIG5vdCBzdXJlIGlmIHRoaXMg aXNuJ3QgdG9vIHNvb24uCiAJICovCi0JaWYgKGNydGMtPmNvbmZpZy0+cGlwZV9icHAgPiAyNCAm JgotCSAgICBjcnRjLT5jb25maWctPnBpeGVsX211bHRpcGxpZXIgPiAxKSB7CisJaWYgKHBpcGVf Y29uZmlnLT5waXBlX2JwcCA+IDI0ICYmCisJICAgIHBpcGVfY29uZmlnLT5waXhlbF9tdWx0aXBs aWVyID4gMSkgewogCQlJOTE1X1dSSVRFKGludGVsX2hkbWktPmhkbWlfcmVnLCB0ZW1wICYgflNE Vk9fRU5BQkxFKTsKIAkJUE9TVElOR19SRUFEKGludGVsX2hkbWktPmhkbWlfcmVnKTsKIApAQCAt MTA1NSw4ICsxMDU2LDggQEAgc3RhdGljIHZvaWQgaWJ4X2VuYWJsZV9oZG1pKHN0cnVjdCBpbnRl bF9lbmNvZGVyICplbmNvZGVyLAogCQlQT1NUSU5HX1JFQUQoaW50ZWxfaGRtaS0+aGRtaV9yZWcp OwogCX0KIAotCWlmIChjcnRjLT5jb25maWctPmhhc19hdWRpbykKLQkJaW50ZWxfZW5hYmxlX2hk bWlfYXVkaW8oZW5jb2Rlcik7CisJaWYgKHBpcGVfY29uZmlnLT5oYXNfYXVkaW8pCisJCWludGVs X2VuYWJsZV9oZG1pX2F1ZGlvKGVuY29kZXIsIHBpcGVfY29uZmlnLCBjb25uX3N0YXRlKTsKIH0K IAogc3RhdGljIHZvaWQgY3B0X2VuYWJsZV9oZG1pKHN0cnVjdCBpbnRlbF9lbmNvZGVyICplbmNv ZGVyLApAQCAtMTA3Myw3ICsxMDc0LDcgQEAgc3RhdGljIHZvaWQgY3B0X2VuYWJsZV9oZG1pKHN0 cnVjdCBpbnRlbF9lbmNvZGVyICplbmNvZGVyLAogCXRlbXAgPSBJOTE1X1JFQUQoaW50ZWxfaGRt aS0+aGRtaV9yZWcpOwogCiAJdGVtcCB8PSBTRFZPX0VOQUJMRTsKLQlpZiAoY3J0Yy0+Y29uZmln LT5oYXNfYXVkaW8pCisJaWYgKHBpcGVfY29uZmlnLT5oYXNfYXVkaW8pCiAJCXRlbXAgfD0gU0RW T19BVURJT19FTkFCTEU7CiAKIAkvKgpAQCAtMTA4Niw3ICsxMDg3LDcgQEAgc3RhdGljIHZvaWQg Y3B0X2VuYWJsZV9oZG1pKHN0cnVjdCBpbnRlbF9lbmNvZGVyICplbmNvZGVyLAogCSAqIDQuIGVu YWJsZSBIRE1JIGNsb2NrIGdhdGluZwogCSAqLwogCi0JaWYgKGNydGMtPmNvbmZpZy0+cGlwZV9i cHAgPiAyNCkgeworCWlmIChwaXBlX2NvbmZpZy0+cGlwZV9icHAgPiAyNCkgewogCQlJOTE1X1dS SVRFKFRSQU5TX0NISUNLRU4xKHBpcGUpLAogCQkJICAgSTkxNV9SRUFEKFRSQU5TX0NISUNLRU4x KHBpcGUpKSB8CiAJCQkgICBUUkFOU19DSElDS0VOMV9IRE1JVU5JVF9HQ19ESVNBQkxFKTsKQEAg LTEwOTgsNyArMTA5OSw3IEBAIHN0YXRpYyB2b2lkIGNwdF9lbmFibGVfaGRtaShzdHJ1Y3QgaW50 ZWxfZW5jb2RlciAqZW5jb2RlciwKIAlJOTE1X1dSSVRFKGludGVsX2hkbWktPmhkbWlfcmVnLCB0 ZW1wKTsKIAlQT1NUSU5HX1JFQUQoaW50ZWxfaGRtaS0+aGRtaV9yZWcpOwogCi0JaWYgKGNydGMt PmNvbmZpZy0+cGlwZV9icHAgPiAyNCkgeworCWlmIChwaXBlX2NvbmZpZy0+cGlwZV9icHAgPiAy NCkgewogCQl0ZW1wICY9IH5TRFZPX0NPTE9SX0ZPUk1BVF9NQVNLOwogCQl0ZW1wIHw9IEhETUlf Q09MT1JfRk9STUFUXzEyYnBjOwogCkBAIC0xMTEwLDggKzExMTEsOCBAQCBzdGF0aWMgdm9pZCBj cHRfZW5hYmxlX2hkbWkoc3RydWN0IGludGVsX2VuY29kZXIgKmVuY29kZXIsCiAJCQkgICB+VFJB TlNfQ0hJQ0tFTjFfSERNSVVOSVRfR0NfRElTQUJMRSk7CiAJfQogCi0JaWYgKGNydGMtPmNvbmZp Zy0+aGFzX2F1ZGlvKQotCQlpbnRlbF9lbmFibGVfaGRtaV9hdWRpbyhlbmNvZGVyKTsKKwlpZiAo cGlwZV9jb25maWctPmhhc19hdWRpbykKKwkJaW50ZWxfZW5hYmxlX2hkbWlfYXVkaW8oZW5jb2Rl ciwgcGlwZV9jb25maWcsIGNvbm5fc3RhdGUpOwogfQogCiBzdGF0aWMgdm9pZCB2bHZfZW5hYmxl X2hkbWkoc3RydWN0IGludGVsX2VuY29kZXIgKmVuY29kZXIsCkBAIC0xMTc4LDkgKzExNzksNyBA QCBzdGF0aWMgdm9pZCBnNHhfZGlzYWJsZV9oZG1pKHN0cnVjdCBpbnRlbF9lbmNvZGVyICplbmNv ZGVyLAogCQkJICAgICBzdHJ1Y3QgaW50ZWxfY3J0Y19zdGF0ZSAqb2xkX2NydGNfc3RhdGUsCiAJ CQkgICAgIHN0cnVjdCBkcm1fY29ubmVjdG9yX3N0YXRlICpvbGRfY29ubl9zdGF0ZSkKIHsKLQlz dHJ1Y3QgaW50ZWxfY3J0YyAqY3J0YyA9IHRvX2ludGVsX2NydGMoZW5jb2Rlci0+YmFzZS5jcnRj KTsKLQotCWlmIChjcnRjLT5jb25maWctPmhhc19hdWRpbykKKwlpZiAob2xkX2NydGNfc3RhdGUt Pmhhc19hdWRpbykKIAkJaW50ZWxfYXVkaW9fY29kZWNfZGlzYWJsZShlbmNvZGVyKTsKIAogCWlu dGVsX2Rpc2FibGVfaGRtaShlbmNvZGVyLCBvbGRfY3J0Y19zdGF0ZSwgb2xkX2Nvbm5fc3RhdGUp OwpAQCAtMTE5MCw5ICsxMTg5LDcgQEAgc3RhdGljIHZvaWQgcGNoX2Rpc2FibGVfaGRtaShzdHJ1 Y3QgaW50ZWxfZW5jb2RlciAqZW5jb2RlciwKIAkJCSAgICAgc3RydWN0IGludGVsX2NydGNfc3Rh dGUgKm9sZF9jcnRjX3N0YXRlLAogCQkJICAgICBzdHJ1Y3QgZHJtX2Nvbm5lY3Rvcl9zdGF0ZSAq b2xkX2Nvbm5fc3RhdGUpCiB7Ci0Jc3RydWN0IGludGVsX2NydGMgKmNydGMgPSB0b19pbnRlbF9j cnRjKGVuY29kZXItPmJhc2UuY3J0Yyk7Ci0KLQlpZiAoY3J0Yy0+Y29uZmlnLT5oYXNfYXVkaW8p CisJaWYgKG9sZF9jcnRjX3N0YXRlLT5oYXNfYXVkaW8pCiAJCWludGVsX2F1ZGlvX2NvZGVjX2Rp c2FibGUoZW5jb2Rlcik7CiB9CiAKQEAgLTE2NjAsMTMgKzE2NTcsMTIgQEAgc3RhdGljIHZvaWQg aW50ZWxfaGRtaV9wcmVfZW5hYmxlKHN0cnVjdCBpbnRlbF9lbmNvZGVyICplbmNvZGVyLAogCQkJ CSAgc3RydWN0IGRybV9jb25uZWN0b3Jfc3RhdGUgKmNvbm5fc3RhdGUpCiB7CiAJc3RydWN0IGlu dGVsX2hkbWkgKmludGVsX2hkbWkgPSBlbmNfdG9faW50ZWxfaGRtaSgmZW5jb2Rlci0+YmFzZSk7 Ci0Jc3RydWN0IGludGVsX2NydGMgKmludGVsX2NydGMgPSB0b19pbnRlbF9jcnRjKGVuY29kZXIt PmJhc2UuY3J0Yyk7Ci0JY29uc3Qgc3RydWN0IGRybV9kaXNwbGF5X21vZGUgKmFkanVzdGVkX21v ZGUgPSAmaW50ZWxfY3J0Yy0+Y29uZmlnLT5iYXNlLmFkanVzdGVkX21vZGU7CisJY29uc3Qgc3Ry dWN0IGRybV9kaXNwbGF5X21vZGUgKmFkanVzdGVkX21vZGUgPSAmcGlwZV9jb25maWctPmJhc2Uu YWRqdXN0ZWRfbW9kZTsKIAogCWludGVsX2hkbWlfcHJlcGFyZShlbmNvZGVyKTsKIAogCWludGVs X2hkbWktPnNldF9pbmZvZnJhbWVzKCZlbmNvZGVyLT5iYXNlLAotCQkJCSAgIGludGVsX2NydGMt PmNvbmZpZy0+aGFzX2hkbWlfc2luaywKKwkJCQkgICBwaXBlX2NvbmZpZy0+aGFzX2hkbWlfc2lu aywKIAkJCQkgICBhZGp1c3RlZF9tb2RlKTsKIH0KIApAQCAtMTY3OCw5ICsxNjc0LDcgQEAgc3Rh dGljIHZvaWQgdmx2X2hkbWlfcHJlX2VuYWJsZShzdHJ1Y3QgaW50ZWxfZW5jb2RlciAqZW5jb2Rl ciwKIAlzdHJ1Y3QgaW50ZWxfaGRtaSAqaW50ZWxfaGRtaSA9ICZkcG9ydC0+aGRtaTsKIAlzdHJ1 Y3QgZHJtX2RldmljZSAqZGV2ID0gZW5jb2Rlci0+YmFzZS5kZXY7CiAJc3RydWN0IGRybV9pOTE1 X3ByaXZhdGUgKmRldl9wcml2ID0gdG9faTkxNShkZXYpOwotCXN0cnVjdCBpbnRlbF9jcnRjICpp bnRlbF9jcnRjID0KLQkJdG9faW50ZWxfY3J0YyhlbmNvZGVyLT5iYXNlLmNydGMpOwotCWNvbnN0 IHN0cnVjdCBkcm1fZGlzcGxheV9tb2RlICphZGp1c3RlZF9tb2RlID0gJmludGVsX2NydGMtPmNv bmZpZy0+YmFzZS5hZGp1c3RlZF9tb2RlOworCWNvbnN0IHN0cnVjdCBkcm1fZGlzcGxheV9tb2Rl ICphZGp1c3RlZF9tb2RlID0gJnBpcGVfY29uZmlnLT5iYXNlLmFkanVzdGVkX21vZGU7CiAKIAl2 bHZfcGh5X3ByZV9lbmNvZGVyX2VuYWJsZShlbmNvZGVyKTsKIApAQCAtMTY4OSw3ICsxNjgzLDcg QEAgc3RhdGljIHZvaWQgdmx2X2hkbWlfcHJlX2VuYWJsZShzdHJ1Y3QgaW50ZWxfZW5jb2RlciAq ZW5jb2RlciwKIAkJCQkgMHgyYjI0Nzg3OCk7CiAKIAlpbnRlbF9oZG1pLT5zZXRfaW5mb2ZyYW1l cygmZW5jb2Rlci0+YmFzZSwKLQkJCQkgICBpbnRlbF9jcnRjLT5jb25maWctPmhhc19oZG1pX3Np bmssCisJCQkJICAgcGlwZV9jb25maWctPmhhc19oZG1pX3NpbmssCiAJCQkJICAgYWRqdXN0ZWRf bW9kZSk7CiAKIAlnNHhfZW5hYmxlX2hkbWkoZW5jb2RlciwgcGlwZV9jb25maWcsIGNvbm5fc3Rh dGUpOwotLSAKMi43LjQKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fCkludGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9w Lm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ludGVs LWdmeAo=