From: Dhinakaran Pandiyan Subject: [PATCH 2/2] drm/i915: Reuse plane format modifier checks to verify addfb() arguments Date: Thu, 25 Oct 2018 18:32:56 -0700 Message-ID: <20181026013256.30808-2-dhinakaran.pandiyan@intel.com> References: <20181026013256.30808-1-dhinakaran.pandiyan@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by gabe.freedesktop.org (Postfix) with ESMTPS id 54D566E04A for ; Fri, 26 Oct 2018 01:36:56 +0000 (UTC) In-Reply-To: <20181026013256.30808-1-dhinakaran.pandiyan@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 Cc: Dhinakaran Pandiyan List-Id: intel-gfx@lists.freedesktop.org Q3VycmVudGx5IHRoZXJlIGlzIHNvbWUgZHVwbGljYXRpb24gb2YgcGl4ZWwgZm9ybWF0IGFuZCBt b2RpZmllcgp2YWxpZGF0aW9uIGNvZGUgYmV0d2VlbiB0aGUgZmIgY3JlYXRpb24gYW5kIHBsYW5l IGNoZWNrIHBhdGhzLiBXZSBjYW4KdW5pZnkgdGhlbSBieSBjaGVja2luZyBpZiBhbnkgcGxhbmUg c3VwcG9ydHMgYSBwaXhlbCBmb3JtYXQgYW5kIG1vZGlmaWVyCmNvbWJpbmF0aW9uIGR1cmluZyBm cmFtZWJ1ZmZlciBjcmVhdGlvbi4KClN1Z2dlc3RlZC1ieTogVmlsbGUgU3lyasOkbMOkIDx2aWxs ZS5zeXJqYWxhQGxpbnV4LmludGVsLmNvbT4KQ2M6IFZpbGxlIFN5cmrDpGzDpCA8dmlsbGUuc3ly amFsYUBsaW51eC5pbnRlbC5jb20+ClNpZ25lZC1vZmYtYnk6IERoaW5ha2FyYW4gUGFuZGl5YW4g PGRoaW5ha2FyYW4ucGFuZGl5YW5AaW50ZWwuY29tPgotLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1 L2ludGVsX2Rpc3BsYXkuYyB8IDExNiArKysrKystLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LQogMSBmaWxlIGNoYW5nZWQsIDE5IGluc2VydGlvbnMoKyksIDk3IGRlbGV0aW9ucygtKQoKZGlm ZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYyBiL2RyaXZlcnMv Z3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYwppbmRleCBmZTA0NWFiYjY0NzIuLjFiNWQ5MzZh OTNkMCAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jCisr KyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYwpAQCAtMTQzNjIsNiArMTQz NjIsMTkgQEAgdTMyIGludGVsX2ZiX3BpdGNoX2xpbWl0KHN0cnVjdCBkcm1faTkxNV9wcml2YXRl ICpkZXZfcHJpdiwKIAkJCQkgRFJNX01PREVfUk9UQVRFXzApOwogfQogCitzdGF0aWMgYm9vbCBh bnlfcGxhbmVfc3VwcG9ydHNfZm9ybWF0KHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJp diwKKwkJCQkJICAgICB1aW50NjRfdCBmYl9tb2RpZmllciwKKwkJCQkJICAgICB1aW50MzJfdCBw aXhlbF9mb3JtYXQpCit7CisJc3RydWN0IGRybV9wbGFuZSAqcGxhbmU7CisKKwlkcm1fZm9yX2Vh Y2hfcGxhbmUocGxhbmUsICZkZXZfcHJpdi0+ZHJtKQorCQlpZiAoIWRybV9wbGFuZV9jaGVja19w aXhlbF9mb3JtYXQocGxhbmUsIHBpeGVsX2Zvcm1hdCwKKwkJCQkJCSAgZmJfbW9kaWZpZXIpKQor CQkJcmV0dXJuIHRydWU7CisJcmV0dXJuIGZhbHNlOworfQorCiBzdGF0aWMgaW50IGludGVsX2Zy YW1lYnVmZmVyX2luaXQoc3RydWN0IGludGVsX2ZyYW1lYnVmZmVyICppbnRlbF9mYiwKIAkJCQkg IHN0cnVjdCBkcm1faTkxNV9nZW1fb2JqZWN0ICpvYmosCiAJCQkJICBzdHJ1Y3QgZHJtX21vZGVf ZmJfY21kMiAqbW9kZV9jbWQpCkBAIC0xNDM5OSw0MCArMTQ0MTIsMTIgQEAgc3RhdGljIGludCBp bnRlbF9mcmFtZWJ1ZmZlcl9pbml0KHN0cnVjdCBpbnRlbF9mcmFtZWJ1ZmZlciAqaW50ZWxfZmIs CiAJCX0KIAl9CiAKLQkvKiBQYXNzZWQgaW4gbW9kaWZpZXIgc2FuaXR5IGNoZWNraW5nLiAqLwot CXN3aXRjaCAobW9kZV9jbWQtPm1vZGlmaWVyWzBdKSB7Ci0JY2FzZSBJOTE1X0ZPUk1BVF9NT0Rf WV9USUxFRF9DQ1M6Ci0JY2FzZSBJOTE1X0ZPUk1BVF9NT0RfWWZfVElMRURfQ0NTOgotCQlzd2l0 Y2ggKG1vZGVfY21kLT5waXhlbF9mb3JtYXQpIHsKLQkJY2FzZSBEUk1fRk9STUFUX1hCR1I4ODg4 OgotCQljYXNlIERSTV9GT1JNQVRfQUJHUjg4ODg6Ci0JCWNhc2UgRFJNX0ZPUk1BVF9YUkdCODg4 ODoKLQkJY2FzZSBEUk1fRk9STUFUX0FSR0I4ODg4OgotCQkJYnJlYWs7Ci0JCWRlZmF1bHQ6Ci0J CQlEUk1fREVCVUdfS01TKCJSQyBzdXBwb3J0ZWQgb25seSB3aXRoIFJHQjg4ODggZm9ybWF0c1xu Iik7Ci0JCQlnb3RvIGVycjsKLQkJfQotCQkvKiBmYWxsIHRocm91Z2ggKi8KLQljYXNlIEk5MTVf Rk9STUFUX01PRF9ZZl9USUxFRDoKLQkJaWYgKG1vZGVfY21kLT5waXhlbF9mb3JtYXQgPT0gRFJN X0ZPUk1BVF9DOCkgewotCQkJRFJNX0RFQlVHX0tNUygiSW5kZXhlZCBmb3JtYXQgZG9lcyBub3Qg c3VwcG9ydCBZZiB0aWxpbmdcbiIpOwotCQkJZ290byBlcnI7Ci0JCX0KLQkJLyogZmFsbCB0aHJv dWdoICovCi0JY2FzZSBJOTE1X0ZPUk1BVF9NT0RfWV9USUxFRDoKLQkJaWYgKElOVEVMX0dFTihk ZXZfcHJpdikgPCA5KSB7Ci0JCQlEUk1fREVCVUdfS01TKCJVbnN1cHBvcnRlZCB0aWxpbmcgMHgl bGx4IVxuIiwKLQkJCQkgICAgICBtb2RlX2NtZC0+bW9kaWZpZXJbMF0pOwotCQkJZ290byBlcnI7 Ci0JCX0KLQkJYnJlYWs7Ci0JY2FzZSBEUk1fRk9STUFUX01PRF9MSU5FQVI6Ci0JY2FzZSBJOTE1 X0ZPUk1BVF9NT0RfWF9USUxFRDoKLQkJYnJlYWs7Ci0JZGVmYXVsdDoKLQkJRFJNX0RFQlVHX0tN UygiVW5zdXBwb3J0ZWQgZmIgbW9kaWZpZXIgMHglbGx4IVxuIiwKLQkJCSAgICAgIG1vZGVfY21k LT5tb2RpZmllclswXSk7CisJaWYgKCFhbnlfcGxhbmVfc3VwcG9ydHNfZm9ybWF0KGRldl9wcml2 LCBtb2RlX2NtZC0+bW9kaWZpZXJbMF0sCisJCQkJICAgICAgIG1vZGVfY21kLT5waXhlbF9mb3Jt YXQpKSB7CisJCURSTV9ERUJVR19LTVMoIlVuc3VwcG9ydGVkIHBpeGVsIGZvcm1hdCAlcyBvciBt b2RpZmllciAweCVsbHhcbiIsCisJCQkgICAgICAgZHJtX2dldF9mb3JtYXRfbmFtZShtb2RlX2Nt ZC0+cGl4ZWxfZm9ybWF0LAorCQkJCQkJICAgJmZvcm1hdF9uYW1lKSwKKwkJCSAgICAgICBtb2Rl X2NtZC0+bW9kaWZpZXJbMF0pOwogCQlnb3RvIGVycjsKIAl9CiAKQEAgLTE0NDY2LDY5ICsxNDQ1 MSw2IEBAIHN0YXRpYyBpbnQgaW50ZWxfZnJhbWVidWZmZXJfaW5pdChzdHJ1Y3QgaW50ZWxfZnJh bWVidWZmZXIgKmludGVsX2ZiLAogCQlnb3RvIGVycjsKIAl9CiAKLQkvKiBSZWplY3QgZm9ybWF0 cyBub3Qgc3VwcG9ydGVkIGJ5IGFueSBwbGFuZSBlYXJseS4gKi8KLQlzd2l0Y2ggKG1vZGVfY21k LT5waXhlbF9mb3JtYXQpIHsKLQljYXNlIERSTV9GT1JNQVRfQzg6Ci0JY2FzZSBEUk1fRk9STUFU X1JHQjU2NToKLQljYXNlIERSTV9GT1JNQVRfWFJHQjg4ODg6Ci0JY2FzZSBEUk1fRk9STUFUX0FS R0I4ODg4OgotCQlicmVhazsKLQljYXNlIERSTV9GT1JNQVRfWFJHQjE1NTU6Ci0JCWlmIChJTlRF TF9HRU4oZGV2X3ByaXYpID4gMykgewotCQkJRFJNX0RFQlVHX0tNUygidW5zdXBwb3J0ZWQgcGl4 ZWwgZm9ybWF0OiAlc1xuIiwKLQkJCQkgICAgICBkcm1fZ2V0X2Zvcm1hdF9uYW1lKG1vZGVfY21k LT5waXhlbF9mb3JtYXQsICZmb3JtYXRfbmFtZSkpOwotCQkJZ290byBlcnI7Ci0JCX0KLQkJYnJl YWs7Ci0JY2FzZSBEUk1fRk9STUFUX0FCR1I4ODg4OgotCQlpZiAoIUlTX1ZBTExFWVZJRVcoZGV2 X3ByaXYpICYmICFJU19DSEVSUllWSUVXKGRldl9wcml2KSAmJgotCQkgICAgSU5URUxfR0VOKGRl dl9wcml2KSA8IDkpIHsKLQkJCURSTV9ERUJVR19LTVMoInVuc3VwcG9ydGVkIHBpeGVsIGZvcm1h dDogJXNcbiIsCi0JCQkJICAgICAgZHJtX2dldF9mb3JtYXRfbmFtZShtb2RlX2NtZC0+cGl4ZWxf Zm9ybWF0LCAmZm9ybWF0X25hbWUpKTsKLQkJCWdvdG8gZXJyOwotCQl9Ci0JCWJyZWFrOwotCWNh c2UgRFJNX0ZPUk1BVF9YQkdSODg4ODoKLQljYXNlIERSTV9GT1JNQVRfWFJHQjIxMDEwMTA6Ci0J Y2FzZSBEUk1fRk9STUFUX1hCR1IyMTAxMDEwOgotCQlpZiAoSU5URUxfR0VOKGRldl9wcml2KSA8 IDQpIHsKLQkJCURSTV9ERUJVR19LTVMoInVuc3VwcG9ydGVkIHBpeGVsIGZvcm1hdDogJXNcbiIs Ci0JCQkJICAgICAgZHJtX2dldF9mb3JtYXRfbmFtZShtb2RlX2NtZC0+cGl4ZWxfZm9ybWF0LCAm Zm9ybWF0X25hbWUpKTsKLQkJCWdvdG8gZXJyOwotCQl9Ci0JCWJyZWFrOwotCWNhc2UgRFJNX0ZP Uk1BVF9BQkdSMjEwMTAxMDoKLQkJaWYgKCFJU19WQUxMRVlWSUVXKGRldl9wcml2KSAmJiAhSVNf Q0hFUlJZVklFVyhkZXZfcHJpdikpIHsKLQkJCURSTV9ERUJVR19LTVMoInVuc3VwcG9ydGVkIHBp eGVsIGZvcm1hdDogJXNcbiIsCi0JCQkJICAgICAgZHJtX2dldF9mb3JtYXRfbmFtZShtb2RlX2Nt ZC0+cGl4ZWxfZm9ybWF0LCAmZm9ybWF0X25hbWUpKTsKLQkJCWdvdG8gZXJyOwotCQl9Ci0JCWJy ZWFrOwotCWNhc2UgRFJNX0ZPUk1BVF9ZVVlWOgotCWNhc2UgRFJNX0ZPUk1BVF9VWVZZOgotCWNh c2UgRFJNX0ZPUk1BVF9ZVllVOgotCWNhc2UgRFJNX0ZPUk1BVF9WWVVZOgotCQlpZiAoSU5URUxf R0VOKGRldl9wcml2KSA8IDUgJiYgIUlTX0c0WChkZXZfcHJpdikpIHsKLQkJCURSTV9ERUJVR19L TVMoInVuc3VwcG9ydGVkIHBpeGVsIGZvcm1hdDogJXNcbiIsCi0JCQkJICAgICAgZHJtX2dldF9m b3JtYXRfbmFtZShtb2RlX2NtZC0+cGl4ZWxfZm9ybWF0LCAmZm9ybWF0X25hbWUpKTsKLQkJCWdv dG8gZXJyOwotCQl9Ci0JCWJyZWFrOwotCWNhc2UgRFJNX0ZPUk1BVF9OVjEyOgotCQlpZiAoSU5U RUxfR0VOKGRldl9wcml2KSA8IDkgfHwgSVNfU0tZTEFLRShkZXZfcHJpdikgfHwKLQkJICAgIElT X0JST1hUT04oZGV2X3ByaXYpKSB7Ci0JCQlEUk1fREVCVUdfS01TKCJ1bnN1cHBvcnRlZCBwaXhl bCBmb3JtYXQ6ICVzXG4iLAotCQkJCSAgICAgIGRybV9nZXRfZm9ybWF0X25hbWUobW9kZV9jbWQt PnBpeGVsX2Zvcm1hdCwKLQkJCQkJCQkgICZmb3JtYXRfbmFtZSkpOwotCQkJZ290byBlcnI7Ci0J CX0KLQkJYnJlYWs7Ci0JZGVmYXVsdDoKLQkJRFJNX0RFQlVHX0tNUygidW5zdXBwb3J0ZWQgcGl4 ZWwgZm9ybWF0OiAlc1xuIiwKLQkJCSAgICAgIGRybV9nZXRfZm9ybWF0X25hbWUobW9kZV9jbWQt PnBpeGVsX2Zvcm1hdCwgJmZvcm1hdF9uYW1lKSk7Ci0JCWdvdG8gZXJyOwotCX0KLQogCS8qIEZJ WE1FIG5lZWQgdG8gYWRqdXN0IExJTk9GRi9USUxFT0ZGIGFjY29yZGluZ2x5LiAqLwogCWlmICht b2RlX2NtZC0+b2Zmc2V0c1swXSAhPSAwKQogCQlnb3RvIGVycjsKLS0gCjIuMTQuMQoKX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4IG1haWxp bmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJl ZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4Cg==