From mboxrd@z Thu Jan 1 00:00:00 1970 From: Maarten Lankhorst Subject: [PATCH 13/15] drm/i915: Convert intel_dp_mst to use atomic state Date: Thu, 7 Jul 2016 13:55:55 +0200 Message-ID: <1467892557-24546-13-git-send-email-maarten.lankhorst@linux.intel.com> References: <1467892557-24546-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 [141.105.120.124]) by gabe.freedesktop.org (Postfix) with ESMTPS id 7A1266E7B6 for ; Thu, 7 Jul 2016 11:56:04 +0000 (UTC) In-Reply-To: <1467892557-24546-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 U2lnbmVkLW9mZi1ieTogTWFhcnRlbiBMYW5raG9yc3QgPG1hYXJ0ZW4ubGFua2hvcnN0QGxpbnV4 LmludGVsLmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcF9tc3QuYyB8IDQ4 ICsrKysrKysrKysrKysrLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0KIDEgZmlsZSBjaGFuZ2VkLCAx OCBpbnNlcnRpb25zKCspLCAzMCBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dw dS9kcm0vaTkxNS9pbnRlbF9kcF9tc3QuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rw X21zdC5jCmluZGV4IDJiNjY1NGEzOWRhYi4uZTY4MGQxYmZiOGNhIDEwMDY0NAotLS0gYS9kcml2 ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcF9tc3QuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkx NS9pbnRlbF9kcF9tc3QuYwpAQCAtODIsMTEgKzgyLDEzIEBAIHN0YXRpYyB2b2lkIGludGVsX21z dF9kaXNhYmxlX2RwKHN0cnVjdCBpbnRlbF9lbmNvZGVyICplbmNvZGVyLAogCXN0cnVjdCBpbnRl bF9kcF9tc3RfZW5jb2RlciAqaW50ZWxfbXN0ID0gZW5jX3RvX21zdCgmZW5jb2Rlci0+YmFzZSk7 CiAJc3RydWN0IGludGVsX2RpZ2l0YWxfcG9ydCAqaW50ZWxfZGlnX3BvcnQgPSBpbnRlbF9tc3Qt PnByaW1hcnk7CiAJc3RydWN0IGludGVsX2RwICppbnRlbF9kcCA9ICZpbnRlbF9kaWdfcG9ydC0+ ZHA7CisJc3RydWN0IGludGVsX2Nvbm5lY3RvciAqY29ubmVjdG9yID0KKwkJdG9faW50ZWxfY29u bmVjdG9yKG9sZF9jb25uX3N0YXRlLT5jb25uZWN0b3IpOwogCWludCByZXQ7CiAKIAlEUk1fREVC VUdfS01TKCIlZFxuIiwgaW50ZWxfZHAtPmFjdGl2ZV9tc3RfbGlua3MpOwogCi0JZHJtX2RwX21z dF9yZXNldF92Y3BpX3Nsb3RzKCZpbnRlbF9kcC0+bXN0X21nciwgaW50ZWxfbXN0LT5jb25uZWN0 b3ItPnBvcnQpOworCWRybV9kcF9tc3RfcmVzZXRfdmNwaV9zbG90cygmaW50ZWxfZHAtPm1zdF9t Z3IsIGNvbm5lY3Rvci0+cG9ydCk7CiAKIAlyZXQgPSBkcm1fZHBfdXBkYXRlX3BheWxvYWRfcGFy dDEoJmludGVsX2RwLT5tc3RfbWdyKTsKIAlpZiAocmV0KSB7CkBAIC0xMDEsNiArMTAzLDggQEAg c3RhdGljIHZvaWQgaW50ZWxfbXN0X3Bvc3RfZGlzYWJsZV9kcChzdHJ1Y3QgaW50ZWxfZW5jb2Rl ciAqZW5jb2RlciwKIAlzdHJ1Y3QgaW50ZWxfZHBfbXN0X2VuY29kZXIgKmludGVsX21zdCA9IGVu Y190b19tc3QoJmVuY29kZXItPmJhc2UpOwogCXN0cnVjdCBpbnRlbF9kaWdpdGFsX3BvcnQgKmlu dGVsX2RpZ19wb3J0ID0gaW50ZWxfbXN0LT5wcmltYXJ5OwogCXN0cnVjdCBpbnRlbF9kcCAqaW50 ZWxfZHAgPSAmaW50ZWxfZGlnX3BvcnQtPmRwOworCXN0cnVjdCBpbnRlbF9jb25uZWN0b3IgKmNv bm5lY3RvciA9CisJCXRvX2ludGVsX2Nvbm5lY3RvcihvbGRfY29ubl9zdGF0ZS0+Y29ubmVjdG9y KTsKIAogCURSTV9ERUJVR19LTVMoIiVkXG4iLCBpbnRlbF9kcC0+YWN0aXZlX21zdF9saW5rcyk7 CiAKQEAgLTEwOSw3ICsxMTMsNyBAQCBzdGF0aWMgdm9pZCBpbnRlbF9tc3RfcG9zdF9kaXNhYmxl X2RwKHN0cnVjdCBpbnRlbF9lbmNvZGVyICplbmNvZGVyLAogCS8qIGFuZCB0aGlzIGNhbiBhbHNv IGZhaWwgKi8KIAlkcm1fZHBfdXBkYXRlX3BheWxvYWRfcGFydDIoJmludGVsX2RwLT5tc3RfbWdy KTsKIAotCWRybV9kcF9tc3RfZGVhbGxvY2F0ZV92Y3BpKCZpbnRlbF9kcC0+bXN0X21nciwgaW50 ZWxfbXN0LT5jb25uZWN0b3ItPnBvcnQpOworCWRybV9kcF9tc3RfZGVhbGxvY2F0ZV92Y3BpKCZp bnRlbF9kcC0+bXN0X21nciwgY29ubmVjdG9yLT5wb3J0KTsKIAogCWludGVsX2RwLT5hY3RpdmVf bXN0X2xpbmtzLS07CiAKQEAgLTEyOSw0MyArMTMzLDI5IEBAIHN0YXRpYyB2b2lkIGludGVsX21z dF9wcmVfZW5hYmxlX2RwKHN0cnVjdCBpbnRlbF9lbmNvZGVyICplbmNvZGVyLAogCXN0cnVjdCBp bnRlbF9kcF9tc3RfZW5jb2RlciAqaW50ZWxfbXN0ID0gZW5jX3RvX21zdCgmZW5jb2Rlci0+YmFz ZSk7CiAJc3RydWN0IGludGVsX2RpZ2l0YWxfcG9ydCAqaW50ZWxfZGlnX3BvcnQgPSBpbnRlbF9t c3QtPnByaW1hcnk7CiAJc3RydWN0IGludGVsX2RwICppbnRlbF9kcCA9ICZpbnRlbF9kaWdfcG9y dC0+ZHA7Ci0Jc3RydWN0IGRybV9kZXZpY2UgKmRldiA9IGVuY29kZXItPmJhc2UuZGV2OwotCXN0 cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9IHRvX2k5MTUoZGV2KTsKKwlzdHJ1Y3Qg ZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSB0b19pOTE1KGVuY29kZXItPmJhc2UuZGV2KTsK IAllbnVtIHBvcnQgcG9ydCA9IGludGVsX2RpZ19wb3J0LT5wb3J0OworCXN0cnVjdCBpbnRlbF9j b25uZWN0b3IgKmNvbm5lY3RvciA9CisJCXRvX2ludGVsX2Nvbm5lY3Rvcihjb25uX3N0YXRlLT5j b25uZWN0b3IpOwogCWludCByZXQ7CiAJdWludDMyX3QgdGVtcDsKLQlzdHJ1Y3QgaW50ZWxfY29u bmVjdG9yICpmb3VuZCA9IE5VTEwsICpjb25uZWN0b3I7CiAJaW50IHNsb3RzOwotCXN0cnVjdCBk cm1fY3J0YyAqY3J0YyA9IGVuY29kZXItPmJhc2UuY3J0YzsKLQlzdHJ1Y3QgaW50ZWxfY3J0YyAq aW50ZWxfY3J0YyA9IHRvX2ludGVsX2NydGMoY3J0Yyk7Ci0KLQlmb3JfZWFjaF9pbnRlbF9jb25u ZWN0b3IoZGV2LCBjb25uZWN0b3IpIHsKLQkJaWYgKGNvbm5lY3Rvci0+YmFzZS5zdGF0ZS0+YmVz dF9lbmNvZGVyID09ICZlbmNvZGVyLT5iYXNlKSB7Ci0JCQlmb3VuZCA9IGNvbm5lY3RvcjsKLQkJ CWJyZWFrOwotCQl9Ci0JfQotCi0JaWYgKCFmb3VuZCkgewotCQlEUk1fRVJST1IoImNhbid0IGZp bmQgY29ubmVjdG9yXG4iKTsKLQkJcmV0dXJuOwotCX0KIAogCS8qIE1TVCBlbmNvZGVycyBhcmUg Ym91bmQgdG8gYSBjcnRjLCBub3QgdG8gYSBjb25uZWN0b3IsCiAJICogZm9yY2UgdGhlIG1hcHBp bmcgaGVyZSBmb3IgZ2V0X2h3X3N0YXRlLgogCSAqLwotCWZvdW5kLT5lbmNvZGVyID0gZW5jb2Rl cjsKKwljb25uZWN0b3ItPmVuY29kZXIgPSBlbmNvZGVyOwogCiAJRFJNX0RFQlVHX0tNUygiJWRc biIsIGludGVsX2RwLT5hY3RpdmVfbXN0X2xpbmtzKTsKIAotCWludGVsX21zdC0+Y29ubmVjdG9y ID0gZm91bmQ7CisJaW50ZWxfbXN0LT5jb25uZWN0b3IgPSBjb25uZWN0b3I7CiAKIAlpZiAoaW50 ZWxfZHAtPmFjdGl2ZV9tc3RfbGlua3MgPT0gMCkgewogCQlpbnRlbF9wcmVwYXJlX2RkaV9idWZm ZXIoJmludGVsX2RpZ19wb3J0LT5iYXNlKTsKIAotCQlpbnRlbF9kZGlfY2xrX3NlbGVjdCgmaW50 ZWxfZGlnX3BvcnQtPmJhc2UsIGludGVsX2NydGMtPmNvbmZpZyk7CisJCWludGVsX2RkaV9jbGtf c2VsZWN0KCZpbnRlbF9kaWdfcG9ydC0+YmFzZSwgcGlwZV9jb25maWcpOwogCi0JCWludGVsX2Rw X3NldF9saW5rX3BhcmFtcyhpbnRlbF9kcCwgaW50ZWxfY3J0Yy0+Y29uZmlnKTsKKwkJaW50ZWxf ZHBfc2V0X2xpbmtfcGFyYW1zKGludGVsX2RwLCBwaXBlX2NvbmZpZyk7CiAKIAkJaW50ZWxfZGRp X2luaXRfZHBfYnVmX3JlZygmaW50ZWxfZGlnX3BvcnQtPmJhc2UpOwogCkBAIC0xNzYsOCArMTY2 LDggQEAgc3RhdGljIHZvaWQgaW50ZWxfbXN0X3ByZV9lbmFibGVfZHAoc3RydWN0IGludGVsX2Vu Y29kZXIgKmVuY29kZXIsCiAJfQogCiAJcmV0ID0gZHJtX2RwX21zdF9hbGxvY2F0ZV92Y3BpKCZp bnRlbF9kcC0+bXN0X21nciwKLQkJCQkgICAgICAgaW50ZWxfbXN0LT5jb25uZWN0b3ItPnBvcnQs Ci0JCQkJICAgICAgIGludGVsX2NydGMtPmNvbmZpZy0+cGJuLCAmc2xvdHMpOworCQkJCSAgICAg ICBjb25uZWN0b3ItPnBvcnQsCisJCQkJICAgICAgIHBpcGVfY29uZmlnLT5wYm4sICZzbG90cyk7 CiAJaWYgKHJldCA9PSBmYWxzZSkgewogCQlEUk1fRVJST1IoImZhaWxlZCB0byBhbGxvY2F0ZSB2 Y3BpXG4iKTsKIAkJcmV0dXJuOwpAQCAtMTk4LDggKzE4OCw3IEBAIHN0YXRpYyB2b2lkIGludGVs X21zdF9lbmFibGVfZHAoc3RydWN0IGludGVsX2VuY29kZXIgKmVuY29kZXIsCiAJc3RydWN0IGlu dGVsX2RwX21zdF9lbmNvZGVyICppbnRlbF9tc3QgPSBlbmNfdG9fbXN0KCZlbmNvZGVyLT5iYXNl KTsKIAlzdHJ1Y3QgaW50ZWxfZGlnaXRhbF9wb3J0ICppbnRlbF9kaWdfcG9ydCA9IGludGVsX21z dC0+cHJpbWFyeTsKIAlzdHJ1Y3QgaW50ZWxfZHAgKmludGVsX2RwID0gJmludGVsX2RpZ19wb3J0 LT5kcDsKLQlzdHJ1Y3QgZHJtX2RldmljZSAqZGV2ID0gaW50ZWxfZGlnX3BvcnQtPmJhc2UuYmFz ZS5kZXY7Ci0Jc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0gdG9faTkxNShkZXYp OworCXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9IHRvX2k5MTUoZW5jb2Rlci0+ YmFzZS5kZXYpOwogCWVudW0gcG9ydCBwb3J0ID0gaW50ZWxfZGlnX3BvcnQtPnBvcnQ7CiAJaW50 IHJldDsKIApAQCAtMjMyLDkgKzIyMSw4IEBAIHN0YXRpYyB2b2lkIGludGVsX2RwX21zdF9lbmNf Z2V0X2NvbmZpZyhzdHJ1Y3QgaW50ZWxfZW5jb2RlciAqZW5jb2RlciwKIHsKIAlzdHJ1Y3QgaW50 ZWxfZHBfbXN0X2VuY29kZXIgKmludGVsX21zdCA9IGVuY190b19tc3QoJmVuY29kZXItPmJhc2Up OwogCXN0cnVjdCBpbnRlbF9kaWdpdGFsX3BvcnQgKmludGVsX2RpZ19wb3J0ID0gaW50ZWxfbXN0 LT5wcmltYXJ5OwotCXN0cnVjdCBpbnRlbF9jcnRjICpjcnRjID0gdG9faW50ZWxfY3J0YyhlbmNv ZGVyLT5iYXNlLmNydGMpOwotCXN0cnVjdCBkcm1fZGV2aWNlICpkZXYgPSBlbmNvZGVyLT5iYXNl LmRldjsKLQlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSB0b19pOTE1KGRldik7 CisJc3RydWN0IGludGVsX2NydGMgKmNydGMgPSB0b19pbnRlbF9jcnRjKHBpcGVfY29uZmlnLT5i YXNlLmNydGMpOworCXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9IHRvX2k5MTUo ZW5jb2Rlci0+YmFzZS5kZXYpOwogCWVudW0gdHJhbnNjb2RlciBjcHVfdHJhbnNjb2RlciA9IHBp cGVfY29uZmlnLT5jcHVfdHJhbnNjb2RlcjsKIAl1MzIgdGVtcCwgZmxhZ3MgPSAwOwogCi0tIAoy LjUuNQoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KSW50 ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBz Oi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4Cg==