From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ville Syrjala Subject: [PATCH] drm/i915: Check fb stride against plane max stride Date: Tue, 18 Sep 2018 17:02:43 +0300 Message-ID: <20180918140243.12207-1-ville.syrjala@linux.intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga18.intel.com (mga18.intel.com [134.134.136.126]) by gabe.freedesktop.org (Postfix) with ESMTPS id 936566E404 for ; Tue, 18 Sep 2018 14:04:30 +0000 (UTC) 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 RnJvbTogVmlsbGUgU3lyasOkbMOkIDx2aWxsZS5zeXJqYWxhQGxpbnV4LmludGVsLmNvbT4KCmNv bW1pdCA0ZTBiODNhNTY3ZTIgKCJkcm0vaTkxNTogRXh0cmFjdCBwZXItcGxhdGZvcm0gcGxhbmUt PmNoZWNrKCkKZnVuY3Rpb25zIikgcmVtb3ZlZCB0aGUgcGxhbmUgbWF4IHN0cmlkZSBjaGVjayBm b3Igc3ByaXRlIHBsYW5lcy4KSSB3YXMgZ29pbmcgdG8gYWRkIGl0IGJhY2sgd2hlbiBpbnRyb2R1 Y2luZyBHVFQgcmVtYXBwaW5nIGZvciB0aGUKZGlzcGxheSwgYnV0IGFmdGVyIGZ1cnRoZXIgdGhv dWdodCBpdCBzZWVtcyBiZXR0ZXIgdG8gcmUtaW50cm9kdWNlCml0IHNlcGFyYXRlbHkuCgpTbyBs ZXQncyBhZGQgdGhlIG1heCBzdHJpZGUgY2hlY2sgYmFjay4gQW5kIGxldCdzIGRvIGl0IGluIGEg bmljZXIKZm9ybSB0aGFuIHdoYXQgd2UgaGFkIGJlZm9yZSBhbmQgZG8gaXQgZm9yIGFsbCBwbGFu ZSB0eXBlcyAoZWFzeQpub3cgdGhhdCB3ZSBoYXZlIHRoZSAtPm1heF9zdHJpZGUoKSBwbGFuZSB2 ZnVuYykuCgpPbmx5IHNwcml0ZSBwbGFuZXMgcmVhbGx5IG5lZWQgdGhpcyBmb3Igbm93IHNpbmNl IHByaW1hcnkgcGxhbmVzCmFyZSBjYXBhYmxlIG9mIHNjYW5uaW5nIG91dCB0aGUgY3VycmVudCBt YXggZmIgc2l6ZSB3ZSBhbGxvdywgYW5kCmN1cnNvcnMgaGF2ZSBtb3JlIHN0cmluZ2VudCBzdHJp ZGUgY2hlY2tzIGVsc2V3aGVyZS4KCkNjOiBKb3PDqSBSb2JlcnRvIGRlIFNvdXphIDxqb3NlLnNv dXphQGludGVsLmNvbT4KRml4ZXM6IDRlMGI4M2E1NjdlMiAoImRybS9pOTE1OiBFeHRyYWN0IHBl ci1wbGF0Zm9ybSBwbGFuZS0+Y2hlY2soKSBmdW5jdGlvbnMiKQpTaWduZWQtb2ZmLWJ5OiBWaWxs ZSBTeXJqw6Rsw6QgPHZpbGxlLnN5cmphbGFAbGludXguaW50ZWwuY29tPgotLS0KIGRyaXZlcnMv Z3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYyB8IDE0ICsrKysrKysrKysrKysrCiBkcml2ZXJz L2dwdS9kcm0vaTkxNS9pbnRlbF9kcnYuaCAgICAgfCAgMSArCiBkcml2ZXJzL2dwdS9kcm0vaTkx NS9pbnRlbF9zcHJpdGUuYyAgfCAyMiArKysrKysrKysrKysrKysrKysrKysrCiAzIGZpbGVzIGNo YW5nZWQsIDM3IGluc2VydGlvbnMoKykKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkx NS9pbnRlbF9kaXNwbGF5LmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMK aW5kZXggZWIyNTAzN2Q3YjM4Li4xZWI5OWQ1ZWMyMjEgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1 L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRl bF9kaXNwbGF5LmMKQEAgLTMxNTEsNiArMzE1MSwxMCBAQCBpbnQgc2tsX2NoZWNrX3BsYW5lX3N1 cmZhY2Uoc3RydWN0IGludGVsX3BsYW5lX3N0YXRlICpwbGFuZV9zdGF0ZSkKIAlwbGFuZV9zdGF0 ZS0+Y29sb3JfcGxhbmVbMF0uc3RyaWRlID0gaW50ZWxfZmJfcGl0Y2goZmIsIDAsIHJvdGF0aW9u KTsKIAlwbGFuZV9zdGF0ZS0+Y29sb3JfcGxhbmVbMV0uc3RyaWRlID0gaW50ZWxfZmJfcGl0Y2go ZmIsIDEsIHJvdGF0aW9uKTsKIAorCXJldCA9IGludGVsX3BsYW5lX2NoZWNrX3N0cmlkZShwbGFu ZV9zdGF0ZSk7CisJaWYgKHJldCkKKwkJcmV0dXJuIHJldDsKKwogCWlmICghcGxhbmVfc3RhdGUt PmJhc2UudmlzaWJsZSkKIAkJcmV0dXJuIDA7CiAKQEAgLTMyODYsMTAgKzMyOTAsMTUgQEAgaW50 IGk5eHhfY2hlY2tfcGxhbmVfc3VyZmFjZShzdHJ1Y3QgaW50ZWxfcGxhbmVfc3RhdGUgKnBsYW5l X3N0YXRlKQogCWludCBzcmNfeCA9IHBsYW5lX3N0YXRlLT5iYXNlLnNyYy54MSA+PiAxNjsKIAlp bnQgc3JjX3kgPSBwbGFuZV9zdGF0ZS0+YmFzZS5zcmMueTEgPj4gMTY7CiAJdTMyIG9mZnNldDsK KwlpbnQgcmV0OwogCiAJaW50ZWxfZmlsbF9mYl9nZ3R0X3ZpZXcoJnBsYW5lX3N0YXRlLT52aWV3 LCBmYiwgcm90YXRpb24pOwogCXBsYW5lX3N0YXRlLT5jb2xvcl9wbGFuZVswXS5zdHJpZGUgPSBp bnRlbF9mYl9waXRjaChmYiwgMCwgcm90YXRpb24pOwogCisJcmV0ID0gaW50ZWxfcGxhbmVfY2hl Y2tfc3RyaWRlKHBsYW5lX3N0YXRlKTsKKwlpZiAocmV0KQorCQlyZXR1cm4gcmV0OworCiAJaW50 ZWxfYWRkX2ZiX29mZnNldHMoJnNyY194LCAmc3JjX3ksIHBsYW5lX3N0YXRlLCAwKTsKIAogCWlm IChJTlRFTF9HRU4oZGV2X3ByaXYpID49IDQpCkBAIC05Njg1LDEwICs5Njk0LDE1IEBAIHN0YXRp YyBpbnQgaW50ZWxfY3Vyc29yX2NoZWNrX3N1cmZhY2Uoc3RydWN0IGludGVsX3BsYW5lX3N0YXRl ICpwbGFuZV9zdGF0ZSkKIAl1bnNpZ25lZCBpbnQgcm90YXRpb24gPSBwbGFuZV9zdGF0ZS0+YmFz ZS5yb3RhdGlvbjsKIAlpbnQgc3JjX3gsIHNyY195OwogCXUzMiBvZmZzZXQ7CisJaW50IHJldDsK IAogCWludGVsX2ZpbGxfZmJfZ2d0dF92aWV3KCZwbGFuZV9zdGF0ZS0+dmlldywgZmIsIHJvdGF0 aW9uKTsKIAlwbGFuZV9zdGF0ZS0+Y29sb3JfcGxhbmVbMF0uc3RyaWRlID0gaW50ZWxfZmJfcGl0 Y2goZmIsIDAsIHJvdGF0aW9uKTsKIAorCXJldCA9IGludGVsX3BsYW5lX2NoZWNrX3N0cmlkZShw bGFuZV9zdGF0ZSk7CisJaWYgKHJldCkKKwkJcmV0dXJuIHJldDsKKwogCXNyY194ID0gcGxhbmVf c3RhdGUtPmJhc2Uuc3JjX3ggPj4gMTY7CiAJc3JjX3kgPSBwbGFuZV9zdGF0ZS0+YmFzZS5zcmNf eSA+PiAxNjsKIApkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHJ2Lmgg Yi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcnYuaAppbmRleCBiZjFjMzg3MjhhNTkuLmEz NGMyZjFmOTE1OSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHJ2LmgK KysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHJ2LmgKQEAgLTIxNDAsNiArMjE0MCw3 IEBAIHVuc2lnbmVkIGludCBza2xfcGxhbmVfbWF4X3N0cmlkZShzdHJ1Y3QgaW50ZWxfcGxhbmUg KnBsYW5lLAogCQkJCSAgdW5zaWduZWQgaW50IHJvdGF0aW9uKTsKIGludCBza2xfcGxhbmVfY2hl Y2soc3RydWN0IGludGVsX2NydGNfc3RhdGUgKmNydGNfc3RhdGUsCiAJCSAgICBzdHJ1Y3QgaW50 ZWxfcGxhbmVfc3RhdGUgKnBsYW5lX3N0YXRlKTsKK2ludCBpbnRlbF9wbGFuZV9jaGVja19zdHJp ZGUoY29uc3Qgc3RydWN0IGludGVsX3BsYW5lX3N0YXRlICpwbGFuZV9zdGF0ZSk7CiBpbnQgaW50 ZWxfcGxhbmVfY2hlY2tfc3JjX2Nvb3JkaW5hdGVzKHN0cnVjdCBpbnRlbF9wbGFuZV9zdGF0ZSAq cGxhbmVfc3RhdGUpOwogaW50IGNodl9wbGFuZV9jaGVja19yb3RhdGlvbihjb25zdCBzdHJ1Y3Qg aW50ZWxfcGxhbmVfc3RhdGUgKnBsYW5lX3N0YXRlKTsKIApkaWZmIC0tZ2l0IGEvZHJpdmVycy9n cHUvZHJtL2k5MTUvaW50ZWxfc3ByaXRlLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9z cHJpdGUuYwppbmRleCBkNGM4ZTEwZmM5MGIuLjVmZDJmN2JmMzkyNyAxMDA2NDQKLS0tIGEvZHJp dmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfc3ByaXRlLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5 MTUvaW50ZWxfc3ByaXRlLmMKQEAgLTIzMCw2ICsyMzAsMjggQEAgdm9pZCBpbnRlbF9waXBlX3Vw ZGF0ZV9lbmQoc3RydWN0IGludGVsX2NydGNfc3RhdGUgKm5ld19jcnRjX3N0YXRlKQogI2VuZGlm CiB9CiAKK2ludCBpbnRlbF9wbGFuZV9jaGVja19zdHJpZGUoY29uc3Qgc3RydWN0IGludGVsX3Bs YW5lX3N0YXRlICpwbGFuZV9zdGF0ZSkKK3sKKwlzdHJ1Y3QgaW50ZWxfcGxhbmUgKnBsYW5lID0g dG9faW50ZWxfcGxhbmUocGxhbmVfc3RhdGUtPmJhc2UucGxhbmUpOworCWNvbnN0IHN0cnVjdCBk cm1fZnJhbWVidWZmZXIgKmZiID0gcGxhbmVfc3RhdGUtPmJhc2UuZmI7CisJdW5zaWduZWQgaW50 IHJvdGF0aW9uID0gcGxhbmVfc3RhdGUtPmJhc2Uucm90YXRpb247CisJdTMyIHN0cmlkZSwgbWF4 X3N0cmlkZTsKKworCS8qIEZJWE1FIG90aGVyIGNvbG9yIHBsYW5lcz8gKi8KKwlzdHJpZGUgPSBw bGFuZV9zdGF0ZS0+Y29sb3JfcGxhbmVbMF0uc3RyaWRlOworCW1heF9zdHJpZGUgPSBwbGFuZS0+ bWF4X3N0cmlkZShwbGFuZSwgZmItPmZvcm1hdC0+Zm9ybWF0LAorCQkJCSAgICAgICBmYi0+bW9k aWZpZXIsIHJvdGF0aW9uKTsKKworCWlmIChzdHJpZGUgPiBtYXhfc3RyaWRlKSB7CisJCURSTV9E RUJVR19LTVMoIltGQjolZF0gc3RyaWRlICglZCkgZXhjZWVkcyBbUExBTkU6JWQ6JXNdIG1heCBz dHJpZGUgKCVkKVxuIiwKKwkJCSAgICAgIGZiLT5iYXNlLmlkLCBzdHJpZGUsCisJCQkgICAgICBw bGFuZS0+YmFzZS5iYXNlLmlkLCBwbGFuZS0+YmFzZS5uYW1lLCBtYXhfc3RyaWRlKTsKKwkJcmV0 dXJuIC1FSU5WQUw7CisJfQorCisJcmV0dXJuIDA7Cit9CisKIGludCBpbnRlbF9wbGFuZV9jaGVj a19zcmNfY29vcmRpbmF0ZXMoc3RydWN0IGludGVsX3BsYW5lX3N0YXRlICpwbGFuZV9zdGF0ZSkK IHsKIAljb25zdCBzdHJ1Y3QgZHJtX2ZyYW1lYnVmZmVyICpmYiA9IHBsYW5lX3N0YXRlLT5iYXNl LmZiOwotLSAKMi4xNi40CgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3Rv cC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRl bC1nZngK