From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: From: Maarten Lankhorst Date: Wed, 15 Aug 2018 10:23:26 +0200 Message-Id: <20180815082327.14450-2-maarten.lankhorst@linux.intel.com> In-Reply-To: <20180815082327.14450-1-maarten.lankhorst@linux.intel.com> References: <20180815082327.14450-1-maarten.lankhorst@linux.intel.com> Subject: [igt-dev] [PATCH i-g-t 2/3] lib/kms: Remove special enum handling and replace with call to igt_plane_set_prop_enum List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Errors-To: igt-dev-bounces@lists.freedesktop.org Sender: "igt-dev" To: igt-dev@lists.freedesktop.org Cc: Lowry Li , Liviu Dudau , dri-devel@lists.freedesktop.org List-ID: V2Ugbm93IGhhdmUgaW5mcmFzdHJ1Y3R1cmUgZm9yIGdlbmVyaWMgZW51bSBoYW5kbGluZy4gVGhp cyB3aWxsIG1ha2UgaXQgZWFzaWVyCnRvIHdyaXRlIG5ldyB0ZXN0cyB3aXRob3V0IGRlZmluaW5n IGFsbCBlbnVtIGNvbnN0YW50cyBiZWZvcmVoYW5kLgoKU2lnbmVkLW9mZi1ieTogTWFhcnRlbiBM YW5raG9yc3QgPG1hYXJ0ZW4ubGFua2hvcnN0QGxpbnV4LmludGVsLmNvbT4KLS0tCiBsaWIvaWd0 X2NvbG9yX2VuY29kaW5nLmMgfCAxOSArKysrKysrKysrCiBsaWIvaWd0X2NvbG9yX2VuY29kaW5n LmggfCAgMyArKwogbGliL2lndF9rbXMuYyAgICAgICAgICAgIHwgNzcgKysrKystLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLQogMyBmaWxlcyBjaGFuZ2VkLCAzMSBpbnNlcnRpb25z KCspLCA2OCBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9saWIvaWd0X2NvbG9yX2VuY29kaW5n LmMgYi9saWIvaWd0X2NvbG9yX2VuY29kaW5nLmMKaW5kZXggZjQ0NWRiYmMwMjUwLi40NWI2NzJk NGMxMDAgMTAwNjQ0Ci0tLSBhL2xpYi9pZ3RfY29sb3JfZW5jb2RpbmcuYworKysgYi9saWIvaWd0 X2NvbG9yX2VuY29kaW5nLmMKQEAgLTE0MSwzICsxNDEsMjIgQEAgc3RydWN0IGlndF9tYXQ0IGln dF9yZ2JfdG9feWNiY3JfbWF0cml4KGVudW0gaWd0X2NvbG9yX2VuY29kaW5nIGNvbG9yX2VuY29k aW5nLAogCiAJcmV0dXJuIGlndF9tYXRyaXhfbXVsdGlwbHkoJnIsICZjKTsKIH0KKworY29uc3Qg Y2hhciAqaWd0X2NvbG9yX2VuY29kaW5nX3RvX3N0cihlbnVtIGlndF9jb2xvcl9lbmNvZGluZyBl bmNvZGluZykKK3sKKwlzd2l0Y2ggKGVuY29kaW5nKSB7CisJY2FzZSBJR1RfQ09MT1JfWUNCQ1Jf QlQ2MDE6IHJldHVybiAiSVRVLVIgQlQuNjAxIFlDYkNyIjsKKwljYXNlIElHVF9DT0xPUl9ZQ0JD Ul9CVDcwOTogcmV0dXJuICJJVFUtUiBCVC43MDkgWUNiQ3IiOworCWNhc2UgSUdUX0NPTE9SX1lD QkNSX0JUMjAyMDogcmV0dXJuICJJVFUtUiBCVC4yMDIwIFlDYkNyIjsKKwlkZWZhdWx0OiBpZ3Rf YXNzZXJ0KDApOyByZXR1cm4gTlVMTDsKKwl9Cit9CisKK2NvbnN0IGNoYXIgKmlndF9jb2xvcl9y YW5nZV90b19zdHIoZW51bSBpZ3RfY29sb3JfcmFuZ2UgcmFuZ2UpCit7CisJc3dpdGNoIChyYW5n ZSkgeworCWNhc2UgSUdUX0NPTE9SX1lDQkNSX0xJTUlURURfUkFOR0U6IHJldHVybiAiWUNiQ3Ig bGltaXRlZCByYW5nZSI7CisJY2FzZSBJR1RfQ09MT1JfWUNCQ1JfRlVMTF9SQU5HRTogcmV0dXJu ICJZQ2JDciBmdWxsIHJhbmdlIjsKKwlkZWZhdWx0OiBpZ3RfYXNzZXJ0KDApOyByZXR1cm4gTlVM TDsKKwl9Cit9CmRpZmYgLS1naXQgYS9saWIvaWd0X2NvbG9yX2VuY29kaW5nLmggYi9saWIvaWd0 X2NvbG9yX2VuY29kaW5nLmgKaW5kZXggMGQ4YzgxOTMyMmFmLi4zODg0ZTQ5MzlmNGMgMTAwNjQ0 Ci0tLSBhL2xpYi9pZ3RfY29sb3JfZW5jb2RpbmcuaAorKysgYi9saWIvaWd0X2NvbG9yX2VuY29k aW5nLmgKQEAgLTQxLDYgKzQxLDkgQEAgZW51bSBpZ3RfY29sb3JfcmFuZ2UgewogCUlHVF9OVU1f Q09MT1JfUkFOR0VTLAogfTsKIAorY29uc3QgY2hhciAqaWd0X2NvbG9yX2VuY29kaW5nX3RvX3N0 cihlbnVtIGlndF9jb2xvcl9lbmNvZGluZyBlbmNvZGluZyk7Citjb25zdCBjaGFyICppZ3RfY29s b3JfcmFuZ2VfdG9fc3RyKGVudW0gaWd0X2NvbG9yX3JhbmdlIHJhbmdlKTsKKwogc3RydWN0IGln dF9tYXQ0IGlndF95Y2Jjcl90b19yZ2JfbWF0cml4KGVudW0gaWd0X2NvbG9yX2VuY29kaW5nIGNv bG9yX2VuY29kaW5nLAogCQkJCQllbnVtIGlndF9jb2xvcl9yYW5nZSBjb2xvcl9yYW5nZSk7CiBz dHJ1Y3QgaWd0X21hdDQgaWd0X3JnYl90b195Y2Jjcl9tYXRyaXgoZW51bSBpZ3RfY29sb3JfZW5j b2RpbmcgY29sb3JfZW5jb2RpbmcsCmRpZmYgLS1naXQgYS9saWIvaWd0X2ttcy5jIGIvbGliL2ln dF9rbXMuYwppbmRleCBlNTI3MjEwM2UyNDMuLjYyZDg0Njg0MTVjNiAxMDA2NDQKLS0tIGEvbGli L2lndF9rbXMuYworKysgYi9saWIvaWd0X2ttcy5jCkBAIC0xOTYsNjEgKzE5Niw2IEBAIGNvbnN0 IGNoYXIgKiBjb25zdCBpZ3RfY29ubmVjdG9yX3Byb3BfbmFtZXNbSUdUX05VTV9DT05ORUNUT1Jf UFJPUFNdID0gewogCVtJR1RfQ09OTkVDVE9SX0JST0FEQ0FTVF9SR0JdID0gIkJyb2FkY2FzdCBS R0IiLAogfTsKIAotc3RhdGljIGNvbnN0IGNoYXIgKiBjb25zdCBpZ3RfY29sb3JfZW5jb2Rpbmdf bmFtZXNbSUdUX05VTV9DT0xPUl9FTkNPRElOR1NdID0gewotCVtJR1RfQ09MT1JfWUNCQ1JfQlQ2 MDFdID0gIklUVS1SIEJULjYwMSBZQ2JDciIsCi0JW0lHVF9DT0xPUl9ZQ0JDUl9CVDcwOV0gPSAi SVRVLVIgQlQuNzA5IFlDYkNyIiwKLQlbSUdUX0NPTE9SX1lDQkNSX0JUMjAyMF0gPSAiSVRVLVIg QlQuMjAyMCBZQ2JDciIsCi19OwotCi1zdGF0aWMgY29uc3QgY2hhciAqIGNvbnN0IGlndF9jb2xv cl9yYW5nZV9uYW1lc1tJR1RfTlVNX0NPTE9SX1JBTkdFU10gPSB7Ci0JW0lHVF9DT0xPUl9ZQ0JD Ul9GVUxMX1JBTkdFXSA9ICJZQ2JDciBmdWxsIHJhbmdlIiwKLQlbSUdUX0NPTE9SX1lDQkNSX0xJ TUlURURfUkFOR0VdID0gIllDYkNyIGxpbWl0ZWQgcmFuZ2UiLAotfTsKLQotc3RhdGljIHZvaWQg cGFyc2VfZW51bV9wcm9wKGRybU1vZGVQcm9wZXJ0eVB0ciBwcm9wLAotCQkJICAgIGludCBudW1f ZW51bXMsCi0JCQkgICAgdWludDY0X3QgdmFsdWVzW10sCi0JCQkgICAgY29uc3QgY2hhciAqIGNv bnN0IGVudW1fbmFtZXNbXSkKLXsKLQlpZ3RfYXNzZXJ0KChwcm9wLT5mbGFncyAmIH4oRFJNX01P REVfUFJPUF9JTU1VVEFCTEUgfAotCQkJCSAgICBEUk1fTU9ERV9QUk9QX0FUT01JQykpID09IERS TV9NT0RFX1BST1BfRU5VTSk7Ci0JaWd0X2Fzc2VydChwcm9wLT5jb3VudF9lbnVtcyA9PSBwcm9w LT5jb3VudF92YWx1ZXMpOwotCWlndF9hc3NlcnQocHJvcC0+Y291bnRfZW51bXMgPj0gMSk7Ci0J aWd0X2Fzc2VydCghIShwcm9wLT5mbGFncyAmIERSTV9NT0RFX1BST1BfSU1NVVRBQkxFKSA9PSAo cHJvcC0+Y291bnRfZW51bXMgPT0gMSkpOwotCi0JZm9yIChpbnQgaSA9IDA7IGkgPCBwcm9wLT5j b3VudF9lbnVtczsgaSsrKSB7Ci0JCWZvciAoaW50IGogPSAwOyBqIDwgbnVtX2VudW1zOyBqKysp IHsKLQkJCWlmIChzdHJjbXAocHJvcC0+ZW51bXNbaV0ubmFtZSwgZW51bV9uYW1lc1tqXSkpCi0J CQkJY29udGludWU7Ci0KLQkJCXZhbHVlc1tqXSA9IHByb3AtPmVudW1zW2ldLnZhbHVlOwotCQl9 Ci0JfQotfQotCi1zdGF0aWMgdm9pZAotcGFyc2VfY29sb3JfZW5jb2RpbmdfcHJvcChpZ3RfcGxh bmVfdCAqcGxhbmUsIGRybU1vZGVQcm9wZXJ0eVB0ciBwcm9wKQotewotCXBhcnNlX2VudW1fcHJv cChwcm9wLCBBUlJBWV9TSVpFKGlndF9jb2xvcl9lbmNvZGluZ19uYW1lcyksCi0JCQlwbGFuZS0+ Y29sb3JfZW5jb2RpbmcudmFsdWVzLAotCQkJaWd0X2NvbG9yX2VuY29kaW5nX25hbWVzKTsKLX0K LQotc3RhdGljIHZvaWQKLXBhcnNlX2NvbG9yX3JhbmdlX3Byb3AoaWd0X3BsYW5lX3QgKnBsYW5l LCBkcm1Nb2RlUHJvcGVydHlQdHIgcHJvcCkKLXsKLQlwYXJzZV9lbnVtX3Byb3AocHJvcCwgQVJS QVlfU0laRShpZ3RfY29sb3JfcmFuZ2VfbmFtZXMpLAotCQkJcGxhbmUtPmNvbG9yX3JhbmdlLnZh bHVlcywKLQkJCWlndF9jb2xvcl9yYW5nZV9uYW1lcyk7Ci19Ci0KLXR5cGVkZWYgdm9pZCAoKnBh cnNlX3BsYW5lX3Byb3BfdCkoaWd0X3BsYW5lX3QgKnBsYW5lLCBkcm1Nb2RlUHJvcGVydHlQdHIg cHJvcCk7Ci0KLXN0YXRpYyBjb25zdCBwYXJzZV9wbGFuZV9wcm9wX3QgaWd0X3BhcnNlX3BsYW5l X3Byb3BbSUdUX05VTV9QTEFORV9QUk9QU10gPSB7Ci0JW0lHVF9QTEFORV9DT0xPUl9FTkNPRElO R10gPSBwYXJzZV9jb2xvcl9lbmNvZGluZ19wcm9wLAotCVtJR1RfUExBTkVfQ09MT1JfUkFOR0Vd ID0gcGFyc2VfY29sb3JfcmFuZ2VfcHJvcCwKLX07Ci0KIC8qCiAgKiBSZXRyaWV2ZSBhbGwgdGhl IHByb3BlcmllcyBzcGVjaWZpZWQgaW4gcHJvcHNfbmFtZSBhbmQgc3RvcmUgdGhlbSBpbnRvCiAg KiBwbGFuZS0+cHJvcHMuCkBAIC0yNzUsOSArMjIwLDYgQEAgaWd0X2ZpbGxfcGxhbmVfcHJvcHMo aWd0X2Rpc3BsYXlfdCAqZGlzcGxheSwgaWd0X3BsYW5lX3QgKnBsYW5lLAogCQkJaWYgKHN0cmNt cChwcm9wLT5uYW1lLCBwcm9wX25hbWVzW2pdKSAhPSAwKQogCQkJCWNvbnRpbnVlOwogCi0JCQlp ZiAoaWd0X3BhcnNlX3BsYW5lX3Byb3Bbal0pCi0JCQkJaWd0X3BhcnNlX3BsYW5lX3Byb3Bbal0o cGxhbmUsIHByb3ApOwotCiAJCQlwbGFuZS0+cHJvcHNbal0gPSBwcm9wcy0+cHJvcHNbaV07CiAJ CQlicmVhazsKIAkJfQpAQCAtMTc5OSwxMSArMTc0MSwxMiBAQCBzdGF0aWMgdm9pZCBpZ3RfcGxh bmVfcmVzZXQoaWd0X3BsYW5lX3QgKnBsYW5lKQogCWlndF9wbGFuZV9zZXRfcHJvcF92YWx1ZShw bGFuZSwgSUdUX1BMQU5FX0NSVENfSUQsIDApOwogCiAJaWYgKGlndF9wbGFuZV9oYXNfcHJvcChw bGFuZSwgSUdUX1BMQU5FX0NPTE9SX0VOQ09ESU5HKSkKLQkJaWd0X3BsYW5lX3NldF9wcm9wX3Zh bHVlKHBsYW5lLCBJR1RfUExBTkVfQ09MT1JfRU5DT0RJTkcsCi0JCQkJCSBwbGFuZS0+Y29sb3Jf ZW5jb2RpbmcudmFsdWVzW0lHVF9DT0xPUl9ZQ0JDUl9CVDYwMV0pOworCQlpZ3RfcGxhbmVfc2V0 X3Byb3BfZW51bShwbGFuZSwgSUdUX1BMQU5FX0NPTE9SX0VOQ09ESU5HLAorCQkJaWd0X2NvbG9y X2VuY29kaW5nX3RvX3N0cihJR1RfQ09MT1JfWUNCQ1JfQlQ2MDEpKTsKKwogCWlmIChpZ3RfcGxh bmVfaGFzX3Byb3AocGxhbmUsIElHVF9QTEFORV9DT0xPUl9SQU5HRSkpCi0JCWlndF9wbGFuZV9z ZXRfcHJvcF92YWx1ZShwbGFuZSwgSUdUX1BMQU5FX0NPTE9SX1JBTkdFLAotCQkJCQkgcGxhbmUt PmNvbG9yX3JhbmdlLnZhbHVlc1tJR1RfQ09MT1JfWUNCQ1JfTElNSVRFRF9SQU5HRV0pOworCQlp Z3RfcGxhbmVfc2V0X3Byb3BfZW51bShwbGFuZSwgSUdUX1BMQU5FX0NPTE9SX1JBTkdFLAorCQkJ aWd0X2NvbG9yX3JhbmdlX3RvX3N0cihJR1RfQ09MT1JfWUNCQ1JfTElNSVRFRF9SQU5HRSkpOwog CiAJLyogVXNlIGRlZmF1bHQgcm90YXRpb24gKi8KIAlpZiAoaWd0X3BsYW5lX2hhc19wcm9wKHBs YW5lLCBJR1RfUExBTkVfUk9UQVRJT04pKQpAQCAtMzcyMiwxMyArMzY2NSwxMSBAQCB2b2lkIGln dF9wbGFuZV9zZXRfZmIoaWd0X3BsYW5lX3QgKnBsYW5lLCBzdHJ1Y3QgaWd0X2ZiICpmYikKIAkJ aWd0X2ZiX3NldF9zaXplKGZiLCBwbGFuZSwgZmItPndpZHRoLCBmYi0+aGVpZ2h0KTsKIAogCQlp ZiAoaWd0X3BsYW5lX2hhc19wcm9wKHBsYW5lLCBJR1RfUExBTkVfQ09MT1JfRU5DT0RJTkcpKQot CQkJaWd0X3BsYW5lX3NldF9wcm9wX3ZhbHVlKHBsYW5lLAotCQkJCQkJIElHVF9QTEFORV9DT0xP Ul9FTkNPRElORywKLQkJCQkJCSBwbGFuZS0+Y29sb3JfZW5jb2RpbmcudmFsdWVzW2ZiLT5jb2xv cl9lbmNvZGluZ10pOworCQkJaWd0X3BsYW5lX3NldF9wcm9wX2VudW0ocGxhbmUsIElHVF9QTEFO RV9DT0xPUl9FTkNPRElORywKKwkJCQlpZ3RfY29sb3JfZW5jb2RpbmdfdG9fc3RyKGZiLT5jb2xv cl9lbmNvZGluZykpOwogCQlpZiAoaWd0X3BsYW5lX2hhc19wcm9wKHBsYW5lLCBJR1RfUExBTkVf Q09MT1JfUkFOR0UpKQotCQkJaWd0X3BsYW5lX3NldF9wcm9wX3ZhbHVlKHBsYW5lLAotCQkJCQkJ IElHVF9QTEFORV9DT0xPUl9SQU5HRSwKLQkJCQkJCSBwbGFuZS0+Y29sb3JfcmFuZ2UudmFsdWVz W2ZiLT5jb2xvcl9yYW5nZV0pOworCQkJaWd0X3BsYW5lX3NldF9wcm9wX2VudW0ocGxhbmUsIElH VF9QTEFORV9DT0xPUl9SQU5HRSwKKwkJCQlpZ3RfY29sb3JfcmFuZ2VfdG9fc3RyKGZiLT5jb2xv cl9yYW5nZSkpOwogCX0gZWxzZSB7CiAJCWlndF9wbGFuZV9zZXRfc2l6ZShwbGFuZSwgMCwgMCk7 CiAKLS0gCjIuMTguMAoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX18KaWd0LWRldiBtYWlsaW5nIGxpc3QKaWd0LWRldkBsaXN0cy5mcmVlZGVza3RvcC5vcmcK aHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pZ3QtZGV2Cg==