From mboxrd@z Thu Jan  1 00:00:00 1970
From: Dave Airlie <airlied@gmail.com>
Subject: [PATCH] drm/plane: drop num_overlay_planes (v2)
Date: Fri, 13 Oct 2017 11:12:35 +1000
Message-ID: <20171013011235.1791-1-airlied@gmail.com>
Mime-Version: 1.0
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: base64
Return-path: <intel-gfx-bounces@lists.freedesktop.org>
List-Unsubscribe: <https://lists.freedesktop.org/mailman/options/intel-gfx>,
 <mailto:intel-gfx-request@lists.freedesktop.org?subject=unsubscribe>
List-Archive: <https://lists.freedesktop.org/archives/intel-gfx>
List-Post: <mailto:intel-gfx@lists.freedesktop.org>
List-Help: <mailto:intel-gfx-request@lists.freedesktop.org?subject=help>
List-Subscribe: <https://lists.freedesktop.org/mailman/listinfo/intel-gfx>,
 <mailto:intel-gfx-request@lists.freedesktop.org?subject=subscribe>
Errors-To: intel-gfx-bounces@lists.freedesktop.org
Sender: "Intel-gfx" <intel-gfx-bounces@lists.freedesktop.org>
To: dri-devel@lists.freedesktop.org
Cc: intel-gfx@lists.freedesktop.org
List-Id: intel-gfx@lists.freedesktop.org

RnJvbTogRGF2ZSBBaXJsaWUgPGFpcmxpZWRAcmVkaGF0LmNvbT4KCkluIG9yZGVyIHRvIGltcGxl
bWVudCBwbGFuZSBsZWFzaW5nIHdlIG5lZWQgdG8gY291bnQgdGhpbmdzLApqdXN0IG1ha2UgdGhl
IGNvZGUgY29uc2lzdGVudCB3aXRoIHRoZSBjb3VudGluZyBjb2RlIGN1cnJlbnRseQp1c2VkIGZv
ciBjb3VudGluZyBjcnRjcy9lbmNvZGVycy9jb25uZWN0b3JzIGFuZCBkcm9wIHRoZSBuZWVkCmZv
ciBudW1fb3ZlcmxheV9wbGFuZXMuCgp2MjogZG9uJ3QgZm9yZ2V0IHRvIGFzc2lnbiBwbGFuZV9w
dHIuIChrZWl0aHApCgpTaWduZWQtb2ZmLWJ5OiBEYXZlIEFpcmxpZSA8YWlybGllZEByZWRoYXQu
Y29tPgotLS0KIGRyaXZlcnMvZ3B1L2RybS9kcm1fbW9kZV9jb25maWcuYyB8ICAxIC0KIGRyaXZl
cnMvZ3B1L2RybS9kcm1fcGxhbmUuYyAgICAgICB8IDQ2ICsrKysrKysrKysrKysrLS0tLS0tLS0t
LS0tLS0tLS0tLS0tLS0tLQogaW5jbHVkZS9kcm0vZHJtX21vZGVfY29uZmlnLmggICAgIHwgMTMg
LS0tLS0tLS0tLS0KIDMgZmlsZXMgY2hhbmdlZCwgMTYgaW5zZXJ0aW9ucygrKSwgNDQgZGVsZXRp
b25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2RybV9tb2RlX2NvbmZpZy5jIGIv
ZHJpdmVycy9ncHUvZHJtL2RybV9tb2RlX2NvbmZpZy5jCmluZGV4IGZhZDY2NDZiMzhkMy4uMGU2
YzhhZTMwOWIwIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vZHJtX21vZGVfY29uZmlnLmMK
KysrIGIvZHJpdmVycy9ncHUvZHJtL2RybV9tb2RlX2NvbmZpZy5jCkBAIC0zOTEsNyArMzkxLDYg
QEAgdm9pZCBkcm1fbW9kZV9jb25maWdfaW5pdChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KQogCWRl
di0+bW9kZV9jb25maWcubnVtX2Nvbm5lY3RvciA9IDA7CiAJZGV2LT5tb2RlX2NvbmZpZy5udW1f
Y3J0YyA9IDA7CiAJZGV2LT5tb2RlX2NvbmZpZy5udW1fZW5jb2RlciA9IDA7Ci0JZGV2LT5tb2Rl
X2NvbmZpZy5udW1fb3ZlcmxheV9wbGFuZSA9IDA7CiAJZGV2LT5tb2RlX2NvbmZpZy5udW1fdG90
YWxfcGxhbmUgPSAwOwogfQogRVhQT1JUX1NZTUJPTChkcm1fbW9kZV9jb25maWdfaW5pdCk7CmRp
ZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vZHJtX3BsYW5lLmMgYi9kcml2ZXJzL2dwdS9kcm0v
ZHJtX3BsYW5lLmMKaW5kZXggZTBiYjE0YWQwMzEyLi42NjVlNGY4N2FhMGMgMTAwNjQ0Ci0tLSBh
L2RyaXZlcnMvZ3B1L2RybS9kcm1fcGxhbmUuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vZHJtX3Bs
YW5lLmMKQEAgLTI0MSw4ICsyNDEsNiBAQCBpbnQgZHJtX3VuaXZlcnNhbF9wbGFuZV9pbml0KHN0
cnVjdCBkcm1fZGV2aWNlICpkZXYsIHN0cnVjdCBkcm1fcGxhbmUgKnBsYW5lLAogCiAJbGlzdF9h
ZGRfdGFpbCgmcGxhbmUtPmhlYWQsICZjb25maWctPnBsYW5lX2xpc3QpOwogCXBsYW5lLT5pbmRl
eCA9IGNvbmZpZy0+bnVtX3RvdGFsX3BsYW5lKys7Ci0JaWYgKHBsYW5lLT50eXBlID09IERSTV9Q
TEFORV9UWVBFX09WRVJMQVkpCi0JCWNvbmZpZy0+bnVtX292ZXJsYXlfcGxhbmUrKzsKIAogCWRy
bV9vYmplY3RfYXR0YWNoX3Byb3BlcnR5KCZwbGFuZS0+YmFzZSwKIAkJCQkgICBjb25maWctPnBs
YW5lX3R5cGVfcHJvcGVydHksCkBAIC0zNTMsOCArMzUxLDYgQEAgdm9pZCBkcm1fcGxhbmVfY2xl
YW51cChzdHJ1Y3QgZHJtX3BsYW5lICpwbGFuZSkKIAogCWxpc3RfZGVsKCZwbGFuZS0+aGVhZCk7
CiAJZGV2LT5tb2RlX2NvbmZpZy5udW1fdG90YWxfcGxhbmUtLTsKLQlpZiAocGxhbmUtPnR5cGUg
PT0gRFJNX1BMQU5FX1RZUEVfT1ZFUkxBWSkKLQkJZGV2LT5tb2RlX2NvbmZpZy5udW1fb3Zlcmxh
eV9wbGFuZS0tOwogCiAJV0FSTl9PTihwbGFuZS0+c3RhdGUgJiYgIXBsYW5lLT5mdW5jcy0+YXRv
bWljX2Rlc3Ryb3lfc3RhdGUpOwogCWlmIChwbGFuZS0+c3RhdGUgJiYgcGxhbmUtPmZ1bmNzLT5h
dG9taWNfZGVzdHJveV9zdGF0ZSkKQEAgLTQ2Miw0MyArNDU4LDMzIEBAIGludCBkcm1fbW9kZV9n
ZXRwbGFuZV9yZXMoc3RydWN0IGRybV9kZXZpY2UgKmRldiwgdm9pZCAqZGF0YSwKIAlzdHJ1Y3Qg
ZHJtX21vZGVfY29uZmlnICpjb25maWc7CiAJc3RydWN0IGRybV9wbGFuZSAqcGxhbmU7CiAJdWlu
dDMyX3QgX191c2VyICpwbGFuZV9wdHI7Ci0JaW50IGNvcGllZCA9IDA7Ci0JdW5zaWduZWQgbnVt
X3BsYW5lczsKKwlpbnQgY291bnQgPSAwOwogCiAJaWYgKCFkcm1fY29yZV9jaGVja19mZWF0dXJl
KGRldiwgRFJJVkVSX01PREVTRVQpKQogCQlyZXR1cm4gLUVJTlZBTDsKIAogCWNvbmZpZyA9ICZk
ZXYtPm1vZGVfY29uZmlnOwotCi0JaWYgKGZpbGVfcHJpdi0+dW5pdmVyc2FsX3BsYW5lcykKLQkJ
bnVtX3BsYW5lcyA9IGNvbmZpZy0+bnVtX3RvdGFsX3BsYW5lOwotCWVsc2UKLQkJbnVtX3BsYW5l
cyA9IGNvbmZpZy0+bnVtX292ZXJsYXlfcGxhbmU7CisJcGxhbmVfcHRyID0gdTY0X3RvX3VzZXJf
cHRyKHBsYW5lX3Jlc3AtPnBsYW5lX2lkX3B0cik7CiAKIAkvKgogCSAqIFRoaXMgaW9jdGwgaXMg
Y2FsbGVkIHR3aWNlLCBvbmNlIHRvIGRldGVybWluZSBob3cgbXVjaCBzcGFjZSBpcwogCSAqIG5l
ZWRlZCwgYW5kIHRoZSAybmQgdGltZSB0byBmaWxsIGl0LgogCSAqLwotCWlmIChudW1fcGxhbmVz
ICYmCi0JICAgIChwbGFuZV9yZXNwLT5jb3VudF9wbGFuZXMgPj0gbnVtX3BsYW5lcykpIHsKLQkJ
cGxhbmVfcHRyID0gKHVpbnQzMl90IF9fdXNlciAqKSh1bnNpZ25lZCBsb25nKXBsYW5lX3Jlc3At
PnBsYW5lX2lkX3B0cjsKLQotCQkvKiBQbGFuZSBsaXN0cyBhcmUgaW52YXJpYW50LCBubyBsb2Nr
aW5nIG5lZWRlZC4gKi8KLQkJZHJtX2Zvcl9lYWNoX3BsYW5lKHBsYW5lLCBkZXYpIHsKLQkJCS8q
Ci0JCQkgKiBVbmxlc3MgdXNlcnNwYWNlIHNldCB0aGUgJ3VuaXZlcnNhbCBwbGFuZXMnCi0JCQkg
KiBjYXBhYmlsaXR5IGJpdCwgb25seSBhZHZlcnRpc2Ugb3ZlcmxheXMuCi0JCQkgKi8KLQkJCWlm
IChwbGFuZS0+dHlwZSAhPSBEUk1fUExBTkVfVFlQRV9PVkVSTEFZICYmCi0JCQkgICAgIWZpbGVf
cHJpdi0+dW5pdmVyc2FsX3BsYW5lcykKLQkJCQljb250aW51ZTsKLQotCQkJaWYgKHB1dF91c2Vy
KHBsYW5lLT5iYXNlLmlkLCBwbGFuZV9wdHIgKyBjb3BpZWQpKQotCQkJCXJldHVybiAtRUZBVUxU
OwotCQkJY29waWVkKys7Ci0JCX0KKwlkcm1fZm9yX2VhY2hfcGxhbmUocGxhbmUsIGRldikgewor
CQkvKgorCQkgKiBVbmxlc3MgdXNlcnNwYWNlIHNldCB0aGUgJ3VuaXZlcnNhbCBwbGFuZXMnCisJ
CSAqIGNhcGFiaWxpdHkgYml0LCBvbmx5IGFkdmVydGlzZSBvdmVybGF5cy4KKwkJICovCisJCWlm
IChwbGFuZS0+dHlwZSAhPSBEUk1fUExBTkVfVFlQRV9PVkVSTEFZICYmCisJCSAgICAhZmlsZV9w
cml2LT51bml2ZXJzYWxfcGxhbmVzKQorCQkJY29udGludWU7CisKKwkJaWYgKGNvdW50IDwgY29u
ZmlnLT5udW1fdG90YWxfcGxhbmUgJiYKKwkJICAgIHB1dF91c2VyKHBsYW5lLT5iYXNlLmlkLCBw
bGFuZV9wdHIgKyBjb3VudCkpCisJCQlyZXR1cm4gLUVGQVVMVDsKKwkJY291bnQrKzsKIAl9Ci0J
cGxhbmVfcmVzcC0+Y291bnRfcGxhbmVzID0gbnVtX3BsYW5lczsKKwlwbGFuZV9yZXNwLT5jb3Vu
dF9wbGFuZXMgPSBjb3VudDsKIAogCXJldHVybiAwOwogfQpkaWZmIC0tZ2l0IGEvaW5jbHVkZS9k
cm0vZHJtX21vZGVfY29uZmlnLmggYi9pbmNsdWRlL2RybS9kcm1fbW9kZV9jb25maWcuaAppbmRl
eCAxYjM3MzY4NDE2YzguLjBiNGFjMmViYzYxMCAxMDA2NDQKLS0tIGEvaW5jbHVkZS9kcm0vZHJt
X21vZGVfY29uZmlnLmgKKysrIGIvaW5jbHVkZS9kcm0vZHJtX21vZGVfY29uZmlnLmgKQEAgLTQy
OSwxOSArNDI5LDYgQEAgc3RydWN0IGRybV9tb2RlX2NvbmZpZyB7CiAJICovCiAJc3RydWN0IGxp
c3RfaGVhZCBlbmNvZGVyX2xpc3Q7CiAKLQkvKioKLQkgKiBAbnVtX292ZXJsYXlfcGxhbmU6Ci0J
ICoKLQkgKiBOdW1iZXIgb2Ygb3ZlcmxheSBwbGFuZXMgb24gdGhpcyBkZXZpY2UsIGV4Y2x1ZGlu
ZyBwcmltYXJ5IGFuZCBjdXJzb3IKLQkgKiBwbGFuZXMuCi0JICoKLQkgKiBUcmFjayBudW1iZXIg
b2Ygb3ZlcmxheSBwbGFuZXMgc2VwYXJhdGVseSBmcm9tIG51bWJlciBvZiB0b3RhbAotCSAqIHBs
YW5lcy4gIEJ5IGRlZmF1bHQgd2Ugb25seSBhZHZlcnRpc2Ugb3ZlcmxheSBwbGFuZXMgdG8gdXNl
cnNwYWNlOyBpZgotCSAqIHVzZXJzcGFjZSBzZXRzIHRoZSAidW5pdmVyc2FsIHBsYW5lIiBjYXBh
YmlsaXR5IGJpdCwgd2UnbGwgZ28gYWhlYWQKLQkgKiBhbmQgZXhwb3NlIGFsbCBwbGFuZXMuIFRo
aXMgaXMgaW52YXJpYW50IG92ZXIgdGhlIGxpZmV0aW1lIG9mIGEKLQkgKiBkZXZpY2UgYW5kIGhl
bmNlIGRvZXNuJ3QgbmVlZCBhbnkgbG9ja3MuCi0JICovCi0JaW50IG51bV9vdmVybGF5X3BsYW5l
OwogCS8qKgogCSAqIEBudW1fdG90YWxfcGxhbmU6CiAJICoKLS0gCjIuMTQuMgoKX19fX19fX19f
X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4IG1haWxpbmcg
bGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRl
c2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4Cg==