From mboxrd@z Thu Jan 1 00:00:00 1970 From: Maarten Lankhorst Subject: [PATCH v2 2/3] lib/kms: Remove special enum handling and replace with call to igt_plane_set_prop_enum, v2. Date: Wed, 15 Aug 2018 12:08:50 +0200 Message-ID: <20180815100851.22219-2-maarten.lankhorst@linux.intel.com> References: <20180815100851.22219-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: <20180815100851.22219-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: igt-dev@lists.freedesktop.org Cc: Lowry Li , Liviu Dudau , dri-devel@lists.freedesktop.org List-Id: dri-devel@lists.freedesktop.org V2Ugbm93IGhhdmUgaW5mcmFzdHJ1Y3R1cmUgZm9yIGdlbmVyaWMgZW51bSBoYW5kbGluZy4gVGhp cyB3aWxsIG1ha2UgaXQgZWFzaWVyCnRvIHdyaXRlIG5ldyB0ZXN0cyB3aXRob3V0IGRlZmluaW5n IGFsbCBlbnVtIGNvbnN0YW50cyBiZWZvcmVoYW5kLgoKQ2hhbmdlcyBzaW5jZSB2MToKLSBGaXgg Y29tcGlsZSBlcnJvciwgc2VudCBvbGQgdmVyc2lvbiBieSBhY2NpZGVudC4KClNpZ25lZC1vZmYt Ynk6IE1hYXJ0ZW4gTGFua2hvcnN0IDxtYWFydGVuLmxhbmtob3JzdEBsaW51eC5pbnRlbC5jb20+ Ci0tLQogbGliL2lndF9jb2xvcl9lbmNvZGluZy5jIHwgMjAgKysrKysrKysrKysKIGxpYi9pZ3Rf Y29sb3JfZW5jb2RpbmcuaCB8ICAzICsrCiBsaWIvaWd0X2ttcy5jICAgICAgICAgICAgfCA3NyAr KysrKy0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tCiAzIGZpbGVzIGNoYW5nZWQs IDMyIGluc2VydGlvbnMoKyksIDY4IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2xpYi9pZ3Rf Y29sb3JfZW5jb2RpbmcuYyBiL2xpYi9pZ3RfY29sb3JfZW5jb2RpbmcuYwppbmRleCBmNDQ1ZGJi YzAyNTAuLjAzZTE2ZTBjOTY1OCAxMDA2NDQKLS0tIGEvbGliL2lndF9jb2xvcl9lbmNvZGluZy5j CisrKyBiL2xpYi9pZ3RfY29sb3JfZW5jb2RpbmcuYwpAQCAtMjMsNiArMjMsNyBAQAogCiAjaW5j bHVkZSAiaWd0X2NvbG9yX2VuY29kaW5nLmgiCiAjaW5jbHVkZSAiaWd0X21hdHJpeC5oIgorI2lu Y2x1ZGUgImlndF9jb3JlLmgiCiAKIHN0cnVjdCBjb2xvcl9lbmNvZGluZyB7CiAJZmxvYXQga3Is IGtiOwpAQCAtMTQxLDMgKzE0MiwyMiBAQCBzdHJ1Y3QgaWd0X21hdDQgaWd0X3JnYl90b195Y2Jj cl9tYXRyaXgoZW51bSBpZ3RfY29sb3JfZW5jb2RpbmcgY29sb3JfZW5jb2RpbmcsCiAKIAlyZXR1 cm4gaWd0X21hdHJpeF9tdWx0aXBseSgmciwgJmMpOwogfQorCitjb25zdCBjaGFyICppZ3RfY29s b3JfZW5jb2RpbmdfdG9fc3RyKGVudW0gaWd0X2NvbG9yX2VuY29kaW5nIGVuY29kaW5nKQorewor CXN3aXRjaCAoZW5jb2RpbmcpIHsKKwljYXNlIElHVF9DT0xPUl9ZQ0JDUl9CVDYwMTogcmV0dXJu ICJJVFUtUiBCVC42MDEgWUNiQ3IiOworCWNhc2UgSUdUX0NPTE9SX1lDQkNSX0JUNzA5OiByZXR1 cm4gIklUVS1SIEJULjcwOSBZQ2JDciI7CisJY2FzZSBJR1RfQ09MT1JfWUNCQ1JfQlQyMDIwOiBy ZXR1cm4gIklUVS1SIEJULjIwMjAgWUNiQ3IiOworCWRlZmF1bHQ6IGlndF9hc3NlcnQoMCk7IHJl dHVybiBOVUxMOworCX0KK30KKworY29uc3QgY2hhciAqaWd0X2NvbG9yX3JhbmdlX3RvX3N0cihl bnVtIGlndF9jb2xvcl9yYW5nZSByYW5nZSkKK3sKKwlzd2l0Y2ggKHJhbmdlKSB7CisJY2FzZSBJ R1RfQ09MT1JfWUNCQ1JfTElNSVRFRF9SQU5HRTogcmV0dXJuICJZQ2JDciBsaW1pdGVkIHJhbmdl IjsKKwljYXNlIElHVF9DT0xPUl9ZQ0JDUl9GVUxMX1JBTkdFOiByZXR1cm4gIllDYkNyIGZ1bGwg cmFuZ2UiOworCWRlZmF1bHQ6IGlndF9hc3NlcnQoMCk7IHJldHVybiBOVUxMOworCX0KK30KZGlm ZiAtLWdpdCBhL2xpYi9pZ3RfY29sb3JfZW5jb2RpbmcuaCBiL2xpYi9pZ3RfY29sb3JfZW5jb2Rp bmcuaAppbmRleCAwZDhjODE5MzIyYWYuLjM4ODRlNDkzOWY0YyAxMDA2NDQKLS0tIGEvbGliL2ln dF9jb2xvcl9lbmNvZGluZy5oCisrKyBiL2xpYi9pZ3RfY29sb3JfZW5jb2RpbmcuaApAQCAtNDEs NiArNDEsOSBAQCBlbnVtIGlndF9jb2xvcl9yYW5nZSB7CiAJSUdUX05VTV9DT0xPUl9SQU5HRVMs CiB9OwogCitjb25zdCBjaGFyICppZ3RfY29sb3JfZW5jb2RpbmdfdG9fc3RyKGVudW0gaWd0X2Nv bG9yX2VuY29kaW5nIGVuY29kaW5nKTsKK2NvbnN0IGNoYXIgKmlndF9jb2xvcl9yYW5nZV90b19z dHIoZW51bSBpZ3RfY29sb3JfcmFuZ2UgcmFuZ2UpOworCiBzdHJ1Y3QgaWd0X21hdDQgaWd0X3lj YmNyX3RvX3JnYl9tYXRyaXgoZW51bSBpZ3RfY29sb3JfZW5jb2RpbmcgY29sb3JfZW5jb2Rpbmcs CiAJCQkJCWVudW0gaWd0X2NvbG9yX3JhbmdlIGNvbG9yX3JhbmdlKTsKIHN0cnVjdCBpZ3RfbWF0 NCBpZ3RfcmdiX3RvX3ljYmNyX21hdHJpeChlbnVtIGlndF9jb2xvcl9lbmNvZGluZyBjb2xvcl9l bmNvZGluZywKZGlmZiAtLWdpdCBhL2xpYi9pZ3Rfa21zLmMgYi9saWIvaWd0X2ttcy5jCmluZGV4 IGU1MjcyMTAzZTI0My4uNjJkODQ2ODQxNWM2IDEwMDY0NAotLS0gYS9saWIvaWd0X2ttcy5jCisr KyBiL2xpYi9pZ3Rfa21zLmMKQEAgLTE5Niw2MSArMTk2LDYgQEAgY29uc3QgY2hhciAqIGNvbnN0 IGlndF9jb25uZWN0b3JfcHJvcF9uYW1lc1tJR1RfTlVNX0NPTk5FQ1RPUl9QUk9QU10gPSB7CiAJ W0lHVF9DT05ORUNUT1JfQlJPQURDQVNUX1JHQl0gPSAiQnJvYWRjYXN0IFJHQiIsCiB9OwogCi1z dGF0aWMgY29uc3QgY2hhciAqIGNvbnN0IGlndF9jb2xvcl9lbmNvZGluZ19uYW1lc1tJR1RfTlVN X0NPTE9SX0VOQ09ESU5HU10gPSB7Ci0JW0lHVF9DT0xPUl9ZQ0JDUl9CVDYwMV0gPSAiSVRVLVIg QlQuNjAxIFlDYkNyIiwKLQlbSUdUX0NPTE9SX1lDQkNSX0JUNzA5XSA9ICJJVFUtUiBCVC43MDkg WUNiQ3IiLAotCVtJR1RfQ09MT1JfWUNCQ1JfQlQyMDIwXSA9ICJJVFUtUiBCVC4yMDIwIFlDYkNy IiwKLX07Ci0KLXN0YXRpYyBjb25zdCBjaGFyICogY29uc3QgaWd0X2NvbG9yX3JhbmdlX25hbWVz W0lHVF9OVU1fQ09MT1JfUkFOR0VTXSA9IHsKLQlbSUdUX0NPTE9SX1lDQkNSX0ZVTExfUkFOR0Vd ID0gIllDYkNyIGZ1bGwgcmFuZ2UiLAotCVtJR1RfQ09MT1JfWUNCQ1JfTElNSVRFRF9SQU5HRV0g PSAiWUNiQ3IgbGltaXRlZCByYW5nZSIsCi19OwotCi1zdGF0aWMgdm9pZCBwYXJzZV9lbnVtX3By b3AoZHJtTW9kZVByb3BlcnR5UHRyIHByb3AsCi0JCQkgICAgaW50IG51bV9lbnVtcywKLQkJCSAg ICB1aW50NjRfdCB2YWx1ZXNbXSwKLQkJCSAgICBjb25zdCBjaGFyICogY29uc3QgZW51bV9uYW1l c1tdKQotewotCWlndF9hc3NlcnQoKHByb3AtPmZsYWdzICYgfihEUk1fTU9ERV9QUk9QX0lNTVVU QUJMRSB8Ci0JCQkJICAgIERSTV9NT0RFX1BST1BfQVRPTUlDKSkgPT0gRFJNX01PREVfUFJPUF9F TlVNKTsKLQlpZ3RfYXNzZXJ0KHByb3AtPmNvdW50X2VudW1zID09IHByb3AtPmNvdW50X3ZhbHVl cyk7Ci0JaWd0X2Fzc2VydChwcm9wLT5jb3VudF9lbnVtcyA+PSAxKTsKLQlpZ3RfYXNzZXJ0KCEh KHByb3AtPmZsYWdzICYgRFJNX01PREVfUFJPUF9JTU1VVEFCTEUpID09IChwcm9wLT5jb3VudF9l bnVtcyA9PSAxKSk7Ci0KLQlmb3IgKGludCBpID0gMDsgaSA8IHByb3AtPmNvdW50X2VudW1zOyBp KyspIHsKLQkJZm9yIChpbnQgaiA9IDA7IGogPCBudW1fZW51bXM7IGorKykgewotCQkJaWYgKHN0 cmNtcChwcm9wLT5lbnVtc1tpXS5uYW1lLCBlbnVtX25hbWVzW2pdKSkKLQkJCQljb250aW51ZTsK LQotCQkJdmFsdWVzW2pdID0gcHJvcC0+ZW51bXNbaV0udmFsdWU7Ci0JCX0KLQl9Ci19Ci0KLXN0 YXRpYyB2b2lkCi1wYXJzZV9jb2xvcl9lbmNvZGluZ19wcm9wKGlndF9wbGFuZV90ICpwbGFuZSwg ZHJtTW9kZVByb3BlcnR5UHRyIHByb3ApCi17Ci0JcGFyc2VfZW51bV9wcm9wKHByb3AsIEFSUkFZ X1NJWkUoaWd0X2NvbG9yX2VuY29kaW5nX25hbWVzKSwKLQkJCXBsYW5lLT5jb2xvcl9lbmNvZGlu Zy52YWx1ZXMsCi0JCQlpZ3RfY29sb3JfZW5jb2RpbmdfbmFtZXMpOwotfQotCi1zdGF0aWMgdm9p ZAotcGFyc2VfY29sb3JfcmFuZ2VfcHJvcChpZ3RfcGxhbmVfdCAqcGxhbmUsIGRybU1vZGVQcm9w ZXJ0eVB0ciBwcm9wKQotewotCXBhcnNlX2VudW1fcHJvcChwcm9wLCBBUlJBWV9TSVpFKGlndF9j b2xvcl9yYW5nZV9uYW1lcyksCi0JCQlwbGFuZS0+Y29sb3JfcmFuZ2UudmFsdWVzLAotCQkJaWd0 X2NvbG9yX3JhbmdlX25hbWVzKTsKLX0KLQotdHlwZWRlZiB2b2lkICgqcGFyc2VfcGxhbmVfcHJv cF90KShpZ3RfcGxhbmVfdCAqcGxhbmUsIGRybU1vZGVQcm9wZXJ0eVB0ciBwcm9wKTsKLQotc3Rh dGljIGNvbnN0IHBhcnNlX3BsYW5lX3Byb3BfdCBpZ3RfcGFyc2VfcGxhbmVfcHJvcFtJR1RfTlVN X1BMQU5FX1BST1BTXSA9IHsKLQlbSUdUX1BMQU5FX0NPTE9SX0VOQ09ESU5HXSA9IHBhcnNlX2Nv bG9yX2VuY29kaW5nX3Byb3AsCi0JW0lHVF9QTEFORV9DT0xPUl9SQU5HRV0gPSBwYXJzZV9jb2xv cl9yYW5nZV9wcm9wLAotfTsKLQogLyoKICAqIFJldHJpZXZlIGFsbCB0aGUgcHJvcGVyaWVzIHNw ZWNpZmllZCBpbiBwcm9wc19uYW1lIGFuZCBzdG9yZSB0aGVtIGludG8KICAqIHBsYW5lLT5wcm9w cy4KQEAgLTI3NSw5ICsyMjAsNiBAQCBpZ3RfZmlsbF9wbGFuZV9wcm9wcyhpZ3RfZGlzcGxheV90 ICpkaXNwbGF5LCBpZ3RfcGxhbmVfdCAqcGxhbmUsCiAJCQlpZiAoc3RyY21wKHByb3AtPm5hbWUs IHByb3BfbmFtZXNbal0pICE9IDApCiAJCQkJY29udGludWU7CiAKLQkJCWlmIChpZ3RfcGFyc2Vf cGxhbmVfcHJvcFtqXSkKLQkJCQlpZ3RfcGFyc2VfcGxhbmVfcHJvcFtqXShwbGFuZSwgcHJvcCk7 Ci0KIAkJCXBsYW5lLT5wcm9wc1tqXSA9IHByb3BzLT5wcm9wc1tpXTsKIAkJCWJyZWFrOwogCQl9 CkBAIC0xNzk5LDExICsxNzQxLDEyIEBAIHN0YXRpYyB2b2lkIGlndF9wbGFuZV9yZXNldChpZ3Rf cGxhbmVfdCAqcGxhbmUpCiAJaWd0X3BsYW5lX3NldF9wcm9wX3ZhbHVlKHBsYW5lLCBJR1RfUExB TkVfQ1JUQ19JRCwgMCk7CiAKIAlpZiAoaWd0X3BsYW5lX2hhc19wcm9wKHBsYW5lLCBJR1RfUExB TkVfQ09MT1JfRU5DT0RJTkcpKQotCQlpZ3RfcGxhbmVfc2V0X3Byb3BfdmFsdWUocGxhbmUsIElH VF9QTEFORV9DT0xPUl9FTkNPRElORywKLQkJCQkJIHBsYW5lLT5jb2xvcl9lbmNvZGluZy52YWx1 ZXNbSUdUX0NPTE9SX1lDQkNSX0JUNjAxXSk7CisJCWlndF9wbGFuZV9zZXRfcHJvcF9lbnVtKHBs YW5lLCBJR1RfUExBTkVfQ09MT1JfRU5DT0RJTkcsCisJCQlpZ3RfY29sb3JfZW5jb2RpbmdfdG9f c3RyKElHVF9DT0xPUl9ZQ0JDUl9CVDYwMSkpOworCiAJaWYgKGlndF9wbGFuZV9oYXNfcHJvcChw bGFuZSwgSUdUX1BMQU5FX0NPTE9SX1JBTkdFKSkKLQkJaWd0X3BsYW5lX3NldF9wcm9wX3ZhbHVl KHBsYW5lLCBJR1RfUExBTkVfQ09MT1JfUkFOR0UsCi0JCQkJCSBwbGFuZS0+Y29sb3JfcmFuZ2Uu dmFsdWVzW0lHVF9DT0xPUl9ZQ0JDUl9MSU1JVEVEX1JBTkdFXSk7CisJCWlndF9wbGFuZV9zZXRf cHJvcF9lbnVtKHBsYW5lLCBJR1RfUExBTkVfQ09MT1JfUkFOR0UsCisJCQlpZ3RfY29sb3JfcmFu Z2VfdG9fc3RyKElHVF9DT0xPUl9ZQ0JDUl9MSU1JVEVEX1JBTkdFKSk7CiAKIAkvKiBVc2UgZGVm YXVsdCByb3RhdGlvbiAqLwogCWlmIChpZ3RfcGxhbmVfaGFzX3Byb3AocGxhbmUsIElHVF9QTEFO RV9ST1RBVElPTikpCkBAIC0zNzIyLDEzICszNjY1LDExIEBAIHZvaWQgaWd0X3BsYW5lX3NldF9m YihpZ3RfcGxhbmVfdCAqcGxhbmUsIHN0cnVjdCBpZ3RfZmIgKmZiKQogCQlpZ3RfZmJfc2V0X3Np emUoZmIsIHBsYW5lLCBmYi0+d2lkdGgsIGZiLT5oZWlnaHQpOwogCiAJCWlmIChpZ3RfcGxhbmVf aGFzX3Byb3AocGxhbmUsIElHVF9QTEFORV9DT0xPUl9FTkNPRElORykpCi0JCQlpZ3RfcGxhbmVf c2V0X3Byb3BfdmFsdWUocGxhbmUsCi0JCQkJCQkgSUdUX1BMQU5FX0NPTE9SX0VOQ09ESU5HLAot CQkJCQkJIHBsYW5lLT5jb2xvcl9lbmNvZGluZy52YWx1ZXNbZmItPmNvbG9yX2VuY29kaW5nXSk7 CisJCQlpZ3RfcGxhbmVfc2V0X3Byb3BfZW51bShwbGFuZSwgSUdUX1BMQU5FX0NPTE9SX0VOQ09E SU5HLAorCQkJCWlndF9jb2xvcl9lbmNvZGluZ190b19zdHIoZmItPmNvbG9yX2VuY29kaW5nKSk7 CiAJCWlmIChpZ3RfcGxhbmVfaGFzX3Byb3AocGxhbmUsIElHVF9QTEFORV9DT0xPUl9SQU5HRSkp Ci0JCQlpZ3RfcGxhbmVfc2V0X3Byb3BfdmFsdWUocGxhbmUsCi0JCQkJCQkgSUdUX1BMQU5FX0NP TE9SX1JBTkdFLAotCQkJCQkJIHBsYW5lLT5jb2xvcl9yYW5nZS52YWx1ZXNbZmItPmNvbG9yX3Jh bmdlXSk7CisJCQlpZ3RfcGxhbmVfc2V0X3Byb3BfZW51bShwbGFuZSwgSUdUX1BMQU5FX0NPTE9S X1JBTkdFLAorCQkJCWlndF9jb2xvcl9yYW5nZV90b19zdHIoZmItPmNvbG9yX3JhbmdlKSk7CiAJ fSBlbHNlIHsKIAkJaWd0X3BsYW5lX3NldF9zaXplKHBsYW5lLCAwLCAwKTsKIAotLSAKMi4xOC4w CgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpkcmktZGV2 ZWwgbWFpbGluZyBsaXN0CmRyaS1kZXZlbEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9s aXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9kcmktZGV2ZWwK