From: Ville Syrjala Subject: [PATCH 2/2] drm/i915: Don't advertise modes that exceed the max plane size Date: Thu, 5 Sep 2019 16:50:44 +0300 Message-ID: <20190905135044.2001-2-ville.syrjala@linux.intel.com> References: <20190905135044.2001-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 mga04.intel.com (mga04.intel.com [192.55.52.120]) by gabe.freedesktop.org (Postfix) with ESMTPS id 8EAAB6E0F6 for ; Thu, 5 Sep 2019 13:50:51 +0000 (UTC) In-Reply-To: <20190905135044.2001-1-ville.syrjala@linux.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: Leho Kraav List-Id: intel-gfx@lists.freedesktop.org RnJvbTogVmlsbGUgU3lyasOkbMOkIDx2aWxsZS5zeXJqYWxhQGxpbnV4LmludGVsLmNvbT4KCk1v ZGVybiBwbGF0Zm9ybXMgYWxsb3cgdGhlIHRyYW5zY29kZXJzIGhkaXNwbGF5L3ZkaXNwbGF5IHRv IGV4Y2VlZCB0aGUKcGxhbmVzJyBtYXggcmVzb2x1dGlvbi4gVGhpcyBoYXMgdGhlIG5hc3R5IGlt cGxpY2F0aW9uIHRoYXQgbW9kZXMgb24gdGhlCmNvbm5lY3RvcnMnIG1vZGUgbGlzdCBtYXkgbm90 IGJlIHVzYWJsZSB3aGVuIHRoZSB1c2VyIGFza3MgZm9yIGEKZnVsbHNjcmVlbiBwbGFuZS4gU2Vl aW5nIGFzIHRoYXQgaXMgdGhlIG1vc3QgY29tbW9uIHVzZSBjYXNlIGl0IHNlZW1zCnBydWRlbnQg dG8gZmlsdGVyIG91dCBtb2RlcyB0aGF0IGRvbid0IGFsbG93IGZvciBmdWxsc2NyZWVuIHBsYW5l cyB0bwpiZSBlbmFibGVkLgoKTGV0J3MgZG8gdGhhdCBpbiB0aGUgY29ubmV0b3IgLm1vZGVfdmFs aWQoKSBob29rIHNvIHRoYXQgbm9ybWFsbHkKc3VjaCBtb2RlcyBhcmUga2VwdCBoaWRkZW4gYnV0 IHRoZSB1c2VyIGlzIHN0aWxsIGFibGUgdG8gZm9yY2libHkKc3BlY2lmeSBzdWNoIGEgbW9kZSBp ZiB0aGV5IGtub3cgdGhleSBkb24ndCBuZWVkIGZ1bGxzY3JlZW4gcGxhbmVzLgoKVGhpcyBpcyBp biBsaW5lIHdpdGggZWFsaWVyIHBvbGljaWVzIHJlZ2FyZGluZyBjZXJ0YWluIGNsb2NrIGxpbWl0 cy4KVGhlIGlkZWEgaXMgdG8gcHJldmVudCB0aGUgY2FzdWFsIHVzZXIgZnJvbSBlbmNvdW50ZXJp bmcgYSBtb2RlIHRoYXQKd291bGQgZmFpbCB1bmRlciB0eXBpY2FsIGNvbmRpdGlvbnMsIGJ1dCBh bGxvdyB0aGUgZXhwZXJ0IHVzZXIgdG8KZm9yY2UgdGhpbmdzIGlmIHRoZXkgc28gd2lzaC4KCk1h eWJlIGluIHRoZSBmdXR1cmUgd2Ugc2hvdWxkIGNvbnNpZGVyIGF1dG9tYWdpY2FsbHkgdXNpbmcg dHdvCnBsYW5lcyB3aGVuIG9uZSBjYW4ndCBjb3ZlciB0aGUgZW50aXJlIHNjcmVlbj8gV291bGRu J3QgYmUgYQpncmVhdCBtYXRjaCBmb3IgdGhlIGN1cnJlbnQgdWFwaSB3aXRoIGV4cGxpY2l0IHBs YW5lcyB0aG91Z2gsCmJ1dCBJIGd1ZXNzIG5vIHdvcnNlIHRoYW4gdXNpbmcgdHdvIHBpcGVzICh3 aGljaCB3ZSBhcHBhcmVudGx5CmhhdmUgdG8gaW4gdGhlIGZ1dHVyZSBhbnl3YXkpLiBFaXRoZXIg dGhhdCBvciB3ZSdkIGhhdmUgdG8KdGVhY2ggdXNlcnNwYWNlIHRvIGRvIGl0IGZvciB1cy4KCkNj OiBMZWhvIEtyYWF2IDxsZWhvQGtyYWF2LmNvbT4KQ2M6IFNlYW4gUGF1bCA8c2VhbkBwb29ybHku cnVuPgpDYzogSm9zw6kgUm9iZXJ0byBkZSBTb3V6YSA8am9zZS5zb3V6YUBpbnRlbC5jb20+ClNp Z25lZC1vZmYtYnk6IFZpbGxlIFN5cmrDpGzDpCA8dmlsbGUuc3lyamFsYUBsaW51eC5pbnRlbC5j b20+Ci0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvZGlzcGxheS9pbnRlbF9kaXNwbGF5LmMgfCAz MSArKysrKysrKysrKysrKysrKysrKwogZHJpdmVycy9ncHUvZHJtL2k5MTUvZGlzcGxheS9pbnRl bF9kaXNwbGF5LmggfCAgNCArKysKIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2Rpc3BsYXkvaW50ZWxf ZHAuYyAgICAgIHwgIDIgKy0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2Rpc3BsYXkvaW50ZWxfZHNp LmMgICAgIHwgIDMgKy0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2Rpc3BsYXkvaW50ZWxfaGRtaS5j ICAgIHwgIDQgKystCiA1IGZpbGVzIGNoYW5nZWQsIDQxIGluc2VydGlvbnMoKyksIDMgZGVsZXRp b25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvZGlzcGxheS9pbnRlbF9k aXNwbGF5LmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9kaXNwbGF5L2ludGVsX2Rpc3BsYXkuYwpp bmRleCA0ZTYzMzQyZWE1OTcuLjk5NDY2YTI5YmYzNiAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUv ZHJtL2k5MTUvZGlzcGxheS9pbnRlbF9kaXNwbGF5LmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5 MTUvZGlzcGxheS9pbnRlbF9kaXNwbGF5LmMKQEAgLTE1ODQ2LDYgKzE1ODQ2LDcgQEAgaW50ZWxf bW9kZV92YWxpZChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LAogCQkJICAgRFJNX01PREVfRkxBR19D TEtESVYyKSkKIAkJcmV0dXJuIE1PREVfQkFEOwogCisJLyogVHJhbnNjb2RlciB0aW1pbmcgbGlt aXRzICovCiAJaWYgKElOVEVMX0dFTihkZXZfcHJpdikgPj0gOSB8fAogCSAgICBJU19CUk9BRFdF TEwoZGV2X3ByaXYpIHx8IElTX0hBU1dFTEwoZGV2X3ByaXYpKSB7CiAJCWhkaXNwbGF5X21heCA9 IDgxOTI7IC8qIEZESSBtYXggNDA5NiBoYW5kbGVkIGVsc2V3aGVyZSAqLwpAQCAtMTU4NzksNiAr MTU4ODAsMzYgQEAgaW50ZWxfbW9kZV92YWxpZChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LAogCXJl dHVybiBNT0RFX09LOwogfQogCitlbnVtIGRybV9tb2RlX3N0YXR1cworaW50ZWxfbW9kZV92YWxp ZF9tYXhfcGxhbmVfc2l6ZShzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYsCisJCQkJ Y29uc3Qgc3RydWN0IGRybV9kaXNwbGF5X21vZGUgKm1vZGUpCit7CisJaW50IHBsYW5lX3dpZHRo X21heCwgcGxhbmVfaGVpZ2h0X21heDsKKworCS8qCisJICogaW50ZWxfbW9kZV92YWxpZCgpIHNo b3VsZCBiZQorCSAqIHN1ZmZpY2llbnQgb24gb2xkZXIgcGxhdGZvcm1zLgorCSAqLworCWlmIChJ TlRFTF9HRU4oZGV2X3ByaXYpIDwgOSkKKwkJcmV0dXJuIE1PREVfT0s7CisKKwkvKgorCSAqIE1v c3QgcGVvcGxlIHdpbGwgcHJvYmFibHkgd2FudCBhIGZ1bGxzY3JlZW4KKwkgKiBwbGFuZSBzbyBs ZXQncyBub3QgYWR2ZXJ0aXplIG1vZGVzIHRoYXQgYXJlCisJICogdG9vIGJpZyBmb3IgdGhhdC4K KwkgKi8KKwlwbGFuZV93aWR0aF9tYXggPSA1MTIwOworCXBsYW5lX2hlaWdodF9tYXggPSA0MDk2 OworCisJaWYgKG1vZGUtPmhkaXNwbGF5ID4gcGxhbmVfd2lkdGhfbWF4KQorCQlyZXR1cm4gTU9E RV9IX0lMTEVHQUw7CisKKwlpZiAobW9kZS0+dmRpc3BsYXkgPiBwbGFuZV9oZWlnaHRfbWF4KQor CQlyZXR1cm4gTU9ERV9WX0lMTEVHQUw7CisKKwlyZXR1cm4gTU9ERV9PSzsKK30KKwogc3RhdGlj IGNvbnN0IHN0cnVjdCBkcm1fbW9kZV9jb25maWdfZnVuY3MgaW50ZWxfbW9kZV9mdW5jcyA9IHsK IAkuZmJfY3JlYXRlID0gaW50ZWxfdXNlcl9mcmFtZWJ1ZmZlcl9jcmVhdGUsCiAJLmdldF9mb3Jt YXRfaW5mbyA9IGludGVsX2dldF9mb3JtYXRfaW5mbywKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1 L2RybS9pOTE1L2Rpc3BsYXkvaW50ZWxfZGlzcGxheS5oIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUv ZGlzcGxheS9pbnRlbF9kaXNwbGF5LmgKaW5kZXggMzNmZDUyM2M0NjIyLi5lY2FiYjgyN2ViODcg MTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2Rpc3BsYXkvaW50ZWxfZGlzcGxheS5o CisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2Rpc3BsYXkvaW50ZWxfZGlzcGxheS5oCkBAIC0z Miw2ICszMiw3IEBAIGVudW0gbGlua19tX25fc2V0Owogc3RydWN0IGRwbGw7CiBzdHJ1Y3QgZHJt X2Nvbm5lY3RvcjsKIHN0cnVjdCBkcm1fZGV2aWNlOworc3RydWN0IGRybV9kaXNwbGF5X21vZGU7 CiBzdHJ1Y3QgZHJtX2VuY29kZXI7CiBzdHJ1Y3QgZHJtX2ZpbGU7CiBzdHJ1Y3QgZHJtX2ZyYW1l YnVmZmVyOwpAQCAtNDQ3LDYgKzQ0OCw5IEBAIHZvaWQgbHB0X2Rpc2FibGVfY2xrb3V0X2RwKHN0 cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdik7CiB1MzIgaW50ZWxfcGxhbmVfZmJfbWF4 X3N0cmlkZShzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYsCiAJCQkgICAgICB1MzIg cGl4ZWxfZm9ybWF0LCB1NjQgbW9kaWZpZXIpOwogYm9vbCBpbnRlbF9wbGFuZV9jYW5fcmVtYXAo Y29uc3Qgc3RydWN0IGludGVsX3BsYW5lX3N0YXRlICpwbGFuZV9zdGF0ZSk7CitlbnVtIGRybV9t b2RlX3N0YXR1cworaW50ZWxfbW9kZV92YWxpZF9tYXhfcGxhbmVfc2l6ZShzdHJ1Y3QgZHJtX2k5 MTVfcHJpdmF0ZSAqZGV2X3ByaXYsCisJCQkJY29uc3Qgc3RydWN0IGRybV9kaXNwbGF5X21vZGUg Km1vZGUpOwogZW51bSBwaHkgaW50ZWxfcG9ydF90b19waHkoc3RydWN0IGRybV9pOTE1X3ByaXZh dGUgKmk5MTUsIGVudW0gcG9ydCBwb3J0KTsKIAogdm9pZCBpbnRlbF9wbGFuZV9kZXN0cm95KHN0 cnVjdCBkcm1fcGxhbmUgKnBsYW5lKTsKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1 L2Rpc3BsYXkvaW50ZWxfZHAuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2Rpc3BsYXkvaW50ZWxf ZHAuYwppbmRleCBkMDkxMzNhOTU4ZTEuLmNjYWY5ZjAwYjc0NyAxMDA2NDQKLS0tIGEvZHJpdmVy cy9ncHUvZHJtL2k5MTUvZGlzcGxheS9pbnRlbF9kcC5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9p OTE1L2Rpc3BsYXkvaW50ZWxfZHAuYwpAQCAtNTYyLDcgKzU2Miw3IEBAIGludGVsX2RwX21vZGVf dmFsaWQoc3RydWN0IGRybV9jb25uZWN0b3IgKmNvbm5lY3RvciwKIAlpZiAobW9kZS0+ZmxhZ3Mg JiBEUk1fTU9ERV9GTEFHX0RCTENMSykKIAkJcmV0dXJuIE1PREVfSF9JTExFR0FMOwogCi0JcmV0 dXJuIE1PREVfT0s7CisJcmV0dXJuIGludGVsX21vZGVfdmFsaWRfbWF4X3BsYW5lX3NpemUoZGV2 X3ByaXYsIG1vZGUpOwogfQogCiB1MzIgaW50ZWxfZHBfcGFja19hdXgoY29uc3QgdTggKnNyYywg aW50IHNyY19ieXRlcykKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2Rpc3BsYXkv aW50ZWxfZHNpLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9kaXNwbGF5L2ludGVsX2RzaS5jCmlu ZGV4IDVmZWMwMmFjZWFlZC4uYTJhOTM3MTA5YTVhIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9k cm0vaTkxNS9kaXNwbGF5L2ludGVsX2RzaS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2Rp c3BsYXkvaW50ZWxfZHNpLmMKQEAgLTU1LDYgKzU1LDcgQEAgaW50IGludGVsX2RzaV9nZXRfbW9k ZXMoc3RydWN0IGRybV9jb25uZWN0b3IgKmNvbm5lY3RvcikKIGVudW0gZHJtX21vZGVfc3RhdHVz IGludGVsX2RzaV9tb2RlX3ZhbGlkKHN0cnVjdCBkcm1fY29ubmVjdG9yICpjb25uZWN0b3IsCiAJ CQkJCSAgc3RydWN0IGRybV9kaXNwbGF5X21vZGUgKm1vZGUpCiB7CisJc3RydWN0IGRybV9pOTE1 X3ByaXZhdGUgKmRldl9wcml2ID0gdG9faTkxNShjb25uZWN0b3ItPmRldik7CiAJc3RydWN0IGlu dGVsX2Nvbm5lY3RvciAqaW50ZWxfY29ubmVjdG9yID0gdG9faW50ZWxfY29ubmVjdG9yKGNvbm5l Y3Rvcik7CiAJY29uc3Qgc3RydWN0IGRybV9kaXNwbGF5X21vZGUgKmZpeGVkX21vZGUgPSBpbnRl bF9jb25uZWN0b3ItPnBhbmVsLmZpeGVkX21vZGU7CiAJaW50IG1heF9kb3RjbGsgPSB0b19pOTE1 KGNvbm5lY3Rvci0+ZGV2KS0+bWF4X2RvdGNsa19mcmVxOwpAQCAtNzMsNyArNzQsNyBAQCBlbnVt IGRybV9tb2RlX3N0YXR1cyBpbnRlbF9kc2lfbW9kZV92YWxpZChzdHJ1Y3QgZHJtX2Nvbm5lY3Rv ciAqY29ubmVjdG9yLAogCQkJcmV0dXJuIE1PREVfQ0xPQ0tfSElHSDsKIAl9CiAKLQlyZXR1cm4g TU9ERV9PSzsKKwlyZXR1cm4gaW50ZWxfbW9kZV92YWxpZF9tYXhfcGxhbmVfc2l6ZShkZXZfcHJp diwgbW9kZSk7CiB9CiAKIHN0cnVjdCBpbnRlbF9kc2lfaG9zdCAqaW50ZWxfZHNpX2hvc3RfaW5p dChzdHJ1Y3QgaW50ZWxfZHNpICppbnRlbF9kc2ksCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9k cm0vaTkxNS9kaXNwbGF5L2ludGVsX2hkbWkuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2Rpc3Bs YXkvaW50ZWxfaGRtaS5jCmluZGV4IGM1MDBmYzkxNTRjOC4uZGJjNjg2NTE1ZGNlIDEwMDY0NAot LS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9kaXNwbGF5L2ludGVsX2hkbWkuYworKysgYi9kcml2 ZXJzL2dwdS9kcm0vaTkxNS9kaXNwbGF5L2ludGVsX2hkbWkuYwpAQCAtMjE4OCw4ICsyMTg4LDEw IEBAIGludGVsX2hkbWlfbW9kZV92YWxpZChzdHJ1Y3QgZHJtX2Nvbm5lY3RvciAqY29ubmVjdG9y LAogCQkJc3RhdHVzID0gaGRtaV9wb3J0X2Nsb2NrX3ZhbGlkKGhkbWksIGNsb2NrICogNSAvIDQs CiAJCQkJCQkgICAgICAgdHJ1ZSwgZm9yY2VfZHZpKTsKIAl9CisJaWYgKHN0YXR1cyAhPSBNT0RF X09LKQorCQlyZXR1cm4gc3RhdHVzOwogCi0JcmV0dXJuIHN0YXR1czsKKwlyZXR1cm4gaW50ZWxf bW9kZV92YWxpZF9tYXhfcGxhbmVfc2l6ZShkZXZfcHJpdiwgbW9kZSk7CiB9CiAKIHN0YXRpYyBi b29sIGhkbWlfZGVlcF9jb2xvcl9wb3NzaWJsZShjb25zdCBzdHJ1Y3QgaW50ZWxfY3J0Y19zdGF0 ZSAqY3J0Y19zdGF0ZSwKLS0gCjIuMjEuMAoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMu ZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlz dGluZm8vaW50ZWwtZ2Z4