From mboxrd@z Thu Jan 1 00:00:00 1970 From: Maarten Lankhorst Subject: [PATCH v6 09/12] drm/i915: Convert intel_dp properties to atomic, v2. Date: Mon, 1 May 2017 15:38:01 +0200 Message-ID: <20170501133804.8116-10-maarten.lankhorst@linux.intel.com> References: <20170501133804.8116-1-maarten.lankhorst@linux.intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <20170501133804.8116-1-maarten.lankhorst@linux.intel.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: intel-gfx@lists.freedesktop.org Cc: dri-devel@lists.freedesktop.org List-Id: intel-gfx@lists.freedesktop.org aW50ZWxfZHAgc3VwcG9ydHMgMyBwcm9wZXJ0aWVzLCBzY2FsaW5nIG1vZGUsIGJyb2FkY2FzdCBy Z2IgYW5kCmZvcmNlX2F1ZGlvLiBpbnRlbF9kaWdpdGFsX2Nvbm5lY3RvciBoYW5kbGVzIHRoZSBw bHVtYmluZywKc28gd2Ugb25seSBoYXZlIHRvIGhvb2sgdGhpcyB1cCBpbiBjb21wdXRlX2NvbmZp ZyBhbmQgaW5pdC4KCkNoYW5nZXMgc2luY2UgdjE6Ci0gUmVtb3ZlIGxpbWl0ZWRfY29sb3JfcmFu Z2UgdG9vLCB1bnVzZWQuIChkYW52ZXQpCgpTaWduZWQtb2ZmLWJ5OiBNYWFydGVuIExhbmtob3Jz dCA8bWFhcnRlbi5sYW5raG9yc3RAbGludXguaW50ZWwuY29tPgpSZXZpZXdlZC1ieTogRGFuaWVs IFZldHRlciA8ZGFuaWVsLnZldHRlckBmZndsbC5jaD4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkx NS9pbnRlbF9kcC5jICB8IDEwNSArKysrLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rydi5oIHwgICAzIC0tCiAyIGZpbGVzIGNo YW5nZWQsIDExIGluc2VydGlvbnMoKyksIDk3IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2Ry aXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2RwLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRl bF9kcC5jCmluZGV4IDA5NjZiOTMxOTMzMi4uZDJhOWVhYWYxYWY2IDEwMDY0NAotLS0gYS9kcml2 ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcC5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2lu dGVsX2RwLmMKQEAgLTE2NDgsNiArMTY0OCw4IEBAIGludGVsX2RwX2NvbXB1dGVfY29uZmlnKHN0 cnVjdCBpbnRlbF9lbmNvZGVyICplbmNvZGVyLAogCWVudW0gcG9ydCBwb3J0ID0gZHBfdG9fZGln X3BvcnQoaW50ZWxfZHApLT5wb3J0OwogCXN0cnVjdCBpbnRlbF9jcnRjICppbnRlbF9jcnRjID0g dG9faW50ZWxfY3J0YyhwaXBlX2NvbmZpZy0+YmFzZS5jcnRjKTsKIAlzdHJ1Y3QgaW50ZWxfY29u bmVjdG9yICppbnRlbF9jb25uZWN0b3IgPSBpbnRlbF9kcC0+YXR0YWNoZWRfY29ubmVjdG9yOwor CXN0cnVjdCBpbnRlbF9kaWdpdGFsX2Nvbm5lY3Rvcl9zdGF0ZSAqaW50ZWxfY29ubl9zdGF0ZSA9 CisJCXRvX2ludGVsX2RpZ2l0YWxfY29ubmVjdG9yX3N0YXRlKGNvbm5fc3RhdGUpOwogCWludCBs YW5lX2NvdW50LCBjbG9jazsKIAlpbnQgbWluX2xhbmVfY291bnQgPSAxOwogCWludCBtYXhfbGFu ZV9jb3VudCA9IGludGVsX2RwX21heF9sYW5lX2NvdW50KGludGVsX2RwKTsKQEAgLTE2NzMsMTAg KzE2NzUsMTAgQEAgaW50ZWxfZHBfY29tcHV0ZV9jb25maWcoc3RydWN0IGludGVsX2VuY29kZXIg KmVuY29kZXIsCiAJcGlwZV9jb25maWctPmhhc19kcnJzID0gZmFsc2U7CiAJaWYgKHBvcnQgPT0g UE9SVF9BKQogCQlwaXBlX2NvbmZpZy0+aGFzX2F1ZGlvID0gZmFsc2U7Ci0JZWxzZSBpZiAoaW50 ZWxfZHAtPmZvcmNlX2F1ZGlvID09IEhETUlfQVVESU9fQVVUTykKKwllbHNlIGlmIChpbnRlbF9j b25uX3N0YXRlLT5mb3JjZV9hdWRpbyA9PSBIRE1JX0FVRElPX0FVVE8pCiAJCXBpcGVfY29uZmln LT5oYXNfYXVkaW8gPSBpbnRlbF9kcC0+aGFzX2F1ZGlvOwogCWVsc2UKLQkJcGlwZV9jb25maWct Pmhhc19hdWRpbyA9IGludGVsX2RwLT5mb3JjZV9hdWRpbyA9PSBIRE1JX0FVRElPX09OOworCQlw aXBlX2NvbmZpZy0+aGFzX2F1ZGlvID0gaW50ZWxfY29ubl9zdGF0ZS0+Zm9yY2VfYXVkaW8gPT0g SERNSV9BVURJT19PTjsKIAogCWlmIChpc19lZHAoaW50ZWxfZHApICYmIGludGVsX2Nvbm5lY3Rv ci0+cGFuZWwuZml4ZWRfbW9kZSkgewogCQlpbnRlbF9maXhlZF9wYW5lbF9tb2RlKGludGVsX2Nv bm5lY3Rvci0+cGFuZWwuZml4ZWRfbW9kZSwKQEAgLTE3NjMsNyArMTc2NSw3IEBAIGludGVsX2Rw X2NvbXB1dGVfY29uZmlnKHN0cnVjdCBpbnRlbF9lbmNvZGVyICplbmNvZGVyLAogCXJldHVybiBm YWxzZTsKIAogZm91bmQ6Ci0JaWYgKGludGVsX2RwLT5jb2xvcl9yYW5nZV9hdXRvKSB7CisJaWYg KGludGVsX2Nvbm5fc3RhdGUtPmJyb2FkY2FzdF9yZ2IgPT0gSU5URUxfQlJPQURDQVNUX1JHQl9B VVRPKSB7CiAJCS8qCiAJCSAqIFNlZToKIAkJICogQ0VBLTg2MS1FIC0gNS4xIERlZmF1bHQgRW5j b2RpbmcgUGFyYW1ldGVycwpAQCAtMTc3NSw3ICsxNzc3LDcgQEAgaW50ZWxfZHBfY29tcHV0ZV9j b25maWcoc3RydWN0IGludGVsX2VuY29kZXIgKmVuY29kZXIsCiAJCQlIRE1JX1FVQU5USVpBVElP Tl9SQU5HRV9MSU1JVEVEOwogCX0gZWxzZSB7CiAJCXBpcGVfY29uZmlnLT5saW1pdGVkX2NvbG9y X3JhbmdlID0KLQkJCWludGVsX2RwLT5saW1pdGVkX2NvbG9yX3JhbmdlOworCQkJaW50ZWxfY29u bl9zdGF0ZS0+YnJvYWRjYXN0X3JnYiA9PSBJTlRFTF9CUk9BRENBU1RfUkdCX0xJTUlURUQ7CiAJ fQogCiAJcGlwZV9jb25maWctPmxhbmVfY291bnQgPSBsYW5lX2NvdW50OwpAQCAtNDgxMiw5MiAr NDgxNCw2IEBAIHN0YXRpYyBpbnQgaW50ZWxfZHBfZ2V0X21vZGVzKHN0cnVjdCBkcm1fY29ubmVj dG9yICpjb25uZWN0b3IpCiB9CiAKIHN0YXRpYyBpbnQKLWludGVsX2RwX3NldF9wcm9wZXJ0eShz dHJ1Y3QgZHJtX2Nvbm5lY3RvciAqY29ubmVjdG9yLAotCQkgICAgICBzdHJ1Y3QgZHJtX3Byb3Bl cnR5ICpwcm9wZXJ0eSwKLQkJICAgICAgdWludDY0X3QgdmFsKQotewotCXN0cnVjdCBkcm1faTkx NV9wcml2YXRlICpkZXZfcHJpdiA9IHRvX2k5MTUoY29ubmVjdG9yLT5kZXYpOwotCXN0cnVjdCBp bnRlbF9lbmNvZGVyICppbnRlbF9lbmNvZGVyID0gaW50ZWxfYXR0YWNoZWRfZW5jb2Rlcihjb25u ZWN0b3IpOwotCXN0cnVjdCBpbnRlbF9kcCAqaW50ZWxfZHAgPSBlbmNfdG9faW50ZWxfZHAoJmlu dGVsX2VuY29kZXItPmJhc2UpOwotCWludCByZXQ7Ci0KLQlyZXQgPSBkcm1fb2JqZWN0X3Byb3Bl cnR5X3NldF92YWx1ZSgmY29ubmVjdG9yLT5iYXNlLCBwcm9wZXJ0eSwgdmFsKTsKLQlpZiAocmV0 KQotCQlyZXR1cm4gcmV0OwotCi0JaWYgKHByb3BlcnR5ID09IGRldl9wcml2LT5mb3JjZV9hdWRp b19wcm9wZXJ0eSkgewotCQlpbnQgaSA9IHZhbDsKLQkJYm9vbCBoYXNfYXVkaW8sIG9sZF9oYXNf YXVkaW87Ci0JCWludCBvbGRfZm9yY2VfYXVkaW8gPSBpbnRlbF9kcC0+Zm9yY2VfYXVkaW87Ci0K LQkJaWYgKGkgPT0gaW50ZWxfZHAtPmZvcmNlX2F1ZGlvKQotCQkJcmV0dXJuIDA7Ci0KLQkJaWYg KG9sZF9mb3JjZV9hdWRpbyA9PSBIRE1JX0FVRElPX0FVVE8pCi0JCQlvbGRfaGFzX2F1ZGlvID0g aW50ZWxfZHAtPmhhc19hdWRpbzsKLQkJZWxzZQotCQkJb2xkX2hhc19hdWRpbyA9IG9sZF9mb3Jj ZV9hdWRpbzsKLQotCQlpbnRlbF9kcC0+Zm9yY2VfYXVkaW8gPSBpOwotCi0JCWlmIChpID09IEhE TUlfQVVESU9fQVVUTykKLQkJCWhhc19hdWRpbyA9IGludGVsX2RwLT5oYXNfYXVkaW87Ci0JCWVs c2UKLQkJCWhhc19hdWRpbyA9IChpID09IEhETUlfQVVESU9fT04pOwotCi0JCWlmIChoYXNfYXVk aW8gPT0gb2xkX2hhc19hdWRpbykKLQkJCXJldHVybiAwOwotCi0JCWdvdG8gZG9uZTsKLQl9Ci0K LQlpZiAocHJvcGVydHkgPT0gZGV2X3ByaXYtPmJyb2FkY2FzdF9yZ2JfcHJvcGVydHkpIHsKLQkJ Ym9vbCBvbGRfYXV0byA9IGludGVsX2RwLT5jb2xvcl9yYW5nZV9hdXRvOwotCQlib29sIG9sZF9y YW5nZSA9IGludGVsX2RwLT5saW1pdGVkX2NvbG9yX3JhbmdlOwotCi0JCXN3aXRjaCAodmFsKSB7 Ci0JCWNhc2UgSU5URUxfQlJPQURDQVNUX1JHQl9BVVRPOgotCQkJaW50ZWxfZHAtPmNvbG9yX3Jh bmdlX2F1dG8gPSB0cnVlOwotCQkJYnJlYWs7Ci0JCWNhc2UgSU5URUxfQlJPQURDQVNUX1JHQl9G VUxMOgotCQkJaW50ZWxfZHAtPmNvbG9yX3JhbmdlX2F1dG8gPSBmYWxzZTsKLQkJCWludGVsX2Rw LT5saW1pdGVkX2NvbG9yX3JhbmdlID0gZmFsc2U7Ci0JCQlicmVhazsKLQkJY2FzZSBJTlRFTF9C Uk9BRENBU1RfUkdCX0xJTUlURUQ6Ci0JCQlpbnRlbF9kcC0+Y29sb3JfcmFuZ2VfYXV0byA9IGZh bHNlOwotCQkJaW50ZWxfZHAtPmxpbWl0ZWRfY29sb3JfcmFuZ2UgPSB0cnVlOwotCQkJYnJlYWs7 Ci0JCWRlZmF1bHQ6Ci0JCQlyZXR1cm4gLUVJTlZBTDsKLQkJfQotCi0JCWlmIChvbGRfYXV0byA9 PSBpbnRlbF9kcC0+Y29sb3JfcmFuZ2VfYXV0byAmJgotCQkgICAgb2xkX3JhbmdlID09IGludGVs X2RwLT5saW1pdGVkX2NvbG9yX3JhbmdlKQotCQkJcmV0dXJuIDA7Ci0KLQkJZ290byBkb25lOwot CX0KLQotCWlmIChwcm9wZXJ0eSA9PSBjb25uZWN0b3ItPnNjYWxpbmdfbW9kZV9wcm9wZXJ0eSkg ewotCQlpZiAoY29ubmVjdG9yLT5zdGF0ZS0+c2NhbGluZ19tb2RlID09IHZhbCkgewotCQkJLyog dGhlIGVEUCBzY2FsaW5nIHByb3BlcnR5IGlzIG5vdCBjaGFuZ2VkICovCi0JCQlyZXR1cm4gMDsK LQkJfQotCQljb25uZWN0b3ItPnN0YXRlLT5zY2FsaW5nX21vZGUgPSB2YWw7Ci0KLQkJZ290byBk b25lOwotCX0KLQotCXJldHVybiAtRUlOVkFMOwotCi1kb25lOgotCWlmIChpbnRlbF9lbmNvZGVy LT5iYXNlLmNydGMpCi0JCWludGVsX2NydGNfcmVzdG9yZV9tb2RlKGludGVsX2VuY29kZXItPmJh c2UuY3J0Yyk7Ci0KLQlyZXR1cm4gMDsKLX0KLQotc3RhdGljIGludAogaW50ZWxfZHBfY29ubmVj dG9yX3JlZ2lzdGVyKHN0cnVjdCBkcm1fY29ubmVjdG9yICpjb25uZWN0b3IpCiB7CiAJc3RydWN0 IGludGVsX2RwICppbnRlbF9kcCA9IGludGVsX2F0dGFjaGVkX2RwKGNvbm5lY3Rvcik7CkBAIC01 MDU1LDE5ICs0OTcxLDIxIEBAIHN0YXRpYyBjb25zdCBzdHJ1Y3QgZHJtX2Nvbm5lY3Rvcl9mdW5j cyBpbnRlbF9kcF9jb25uZWN0b3JfZnVuY3MgPSB7CiAJLmRwbXMgPSBkcm1fYXRvbWljX2hlbHBl cl9jb25uZWN0b3JfZHBtcywKIAkuZm9yY2UgPSBpbnRlbF9kcF9mb3JjZSwKIAkuZmlsbF9tb2Rl cyA9IGRybV9oZWxwZXJfcHJvYmVfc2luZ2xlX2Nvbm5lY3Rvcl9tb2RlcywKLQkuc2V0X3Byb3Bl cnR5ID0gaW50ZWxfZHBfc2V0X3Byb3BlcnR5LAotCS5hdG9taWNfZ2V0X3Byb3BlcnR5ID0gaW50 ZWxfY29ubmVjdG9yX2F0b21pY19nZXRfcHJvcGVydHksCisJLnNldF9wcm9wZXJ0eSA9IGRybV9h dG9taWNfaGVscGVyX2Nvbm5lY3Rvcl9zZXRfcHJvcGVydHksCisJLmF0b21pY19nZXRfcHJvcGVy dHkgPSBpbnRlbF9kaWdpdGFsX2Nvbm5lY3Rvcl9hdG9taWNfZ2V0X3Byb3BlcnR5LAorCS5hdG9t aWNfc2V0X3Byb3BlcnR5ID0gaW50ZWxfZGlnaXRhbF9jb25uZWN0b3JfYXRvbWljX3NldF9wcm9w ZXJ0eSwKIAkubGF0ZV9yZWdpc3RlciA9IGludGVsX2RwX2Nvbm5lY3Rvcl9yZWdpc3RlciwKIAku ZWFybHlfdW5yZWdpc3RlciA9IGludGVsX2RwX2Nvbm5lY3Rvcl91bnJlZ2lzdGVyLAogCS5kZXN0 cm95ID0gaW50ZWxfZHBfY29ubmVjdG9yX2Rlc3Ryb3ksCiAJLmF0b21pY19kZXN0cm95X3N0YXRl ID0gZHJtX2F0b21pY19oZWxwZXJfY29ubmVjdG9yX2Rlc3Ryb3lfc3RhdGUsCi0JLmF0b21pY19k dXBsaWNhdGVfc3RhdGUgPSBkcm1fYXRvbWljX2hlbHBlcl9jb25uZWN0b3JfZHVwbGljYXRlX3N0 YXRlLAorCS5hdG9taWNfZHVwbGljYXRlX3N0YXRlID0gaW50ZWxfZGlnaXRhbF9jb25uZWN0b3Jf ZHVwbGljYXRlX3N0YXRlLAogfTsKIAogc3RhdGljIGNvbnN0IHN0cnVjdCBkcm1fY29ubmVjdG9y X2hlbHBlcl9mdW5jcyBpbnRlbF9kcF9jb25uZWN0b3JfaGVscGVyX2Z1bmNzID0gewogCS5kZXRl Y3RfY3R4ID0gaW50ZWxfZHBfZGV0ZWN0LAogCS5nZXRfbW9kZXMgPSBpbnRlbF9kcF9nZXRfbW9k ZXMsCiAJLm1vZGVfdmFsaWQgPSBpbnRlbF9kcF9tb2RlX3ZhbGlkLAorCS5hdG9taWNfY2hlY2sg PSBpbnRlbF9kaWdpdGFsX2Nvbm5lY3Rvcl9hdG9taWNfY2hlY2ssCiB9OwogCiBzdGF0aWMgY29u c3Qgc3RydWN0IGRybV9lbmNvZGVyX2Z1bmNzIGludGVsX2RwX2VuY19mdW5jcyA9IHsKQEAgLTUx NjUsNyArNTA4Myw2IEBAIGludGVsX2RwX2FkZF9wcm9wZXJ0aWVzKHN0cnVjdCBpbnRlbF9kcCAq aW50ZWxfZHAsIHN0cnVjdCBkcm1fY29ubmVjdG9yICpjb25uZWN0CiAKIAlpbnRlbF9hdHRhY2hf Zm9yY2VfYXVkaW9fcHJvcGVydHkoY29ubmVjdG9yKTsKIAlpbnRlbF9hdHRhY2hfYnJvYWRjYXN0 X3JnYl9wcm9wZXJ0eShjb25uZWN0b3IpOwotCWludGVsX2RwLT5jb2xvcl9yYW5nZV9hdXRvID0g dHJ1ZTsKIAogCWlmIChpc19lZHAoaW50ZWxfZHApKSB7CiAJCXUzMiBhbGxvd2VkX3NjYWxlcnM7 CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcnYuaCBiL2RyaXZlcnMv Z3B1L2RybS9pOTE1L2ludGVsX2Rydi5oCmluZGV4IDRlNjNmMzk3YzRhMi4uYWFjZmE4NDk0NDkx IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcnYuaAorKysgYi9kcml2 ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcnYuaApAQCAtOTU3LDkgKzk1Nyw2IEBAIHN0cnVjdCBp bnRlbF9kcCB7CiAJYm9vbCBkZXRlY3RfZG9uZTsKIAlib29sIGNoYW5uZWxfZXFfc3RhdHVzOwog CWJvb2wgcmVzZXRfbGlua19wYXJhbXM7Ci0JZW51bSBoZG1pX2ZvcmNlX2F1ZGlvIGZvcmNlX2F1 ZGlvOwotCWJvb2wgbGltaXRlZF9jb2xvcl9yYW5nZTsKLQlib29sIGNvbG9yX3JhbmdlX2F1dG87 CiAJdWludDhfdCBkcGNkW0RQX1JFQ0VJVkVSX0NBUF9TSVpFXTsKIAl1aW50OF90IHBzcl9kcGNk W0VEUF9QU1JfUkVDRUlWRVJfQ0FQX1NJWkVdOwogCXVpbnQ4X3QgZG93bnN0cmVhbV9wb3J0c1tE UF9NQVhfRE9XTlNUUkVBTV9QT1JUU107Ci0tIAoyLjkuMwoKX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX18KZHJpLWRldmVsIG1haWxpbmcgbGlzdApkcmktZGV2 ZWxAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21h aWxtYW4vbGlzdGluZm8vZHJpLWRldmVsCg==