From mboxrd@z Thu Jan  1 00:00:00 1970
From: Dave Airlie <airlied@gmail.com>
Subject: [PATCH] drm/plane: drop num_overlay_planes
Date: Fri, 13 Oct 2017 09:58:01 +1000
Message-ID: <20171012235801.1032-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: dri-devel@lists.freedesktop.org

RnJvbTogRGF2ZSBBaXJsaWUgPGFpcmxpZWRAcmVkaGF0LmNvbT4KCkluIG9yZGVyIHRvIGltcGxl
bWVudCBwbGFuZSBsZWFzaW5nIHdlIG5lZWQgdG8gY291bnQgdGhpbmdzLApqdXN0IG1ha2UgdGhl
IGNvZGUgY29uc2lzdGVudCB3aXRoIHRoZSBjb3VudGluZyBjb2RlIGN1cnJlbnRseQp1c2VkIGZv
ciBjb3VudGluZyBjcnRjcy9lbmNvZGVycy9jb25uZWN0b3JzIGFuZCBkcm9wIHRoZSBuZWVkCmZv
ciBudW1fb3ZlcmxheV9wbGFuZXMuCgpTaWduZWQtb2ZmLWJ5OiBEYXZlIEFpcmxpZSA8YWlybGll
ZEByZWRoYXQuY29tPgotLS0KIGRyaXZlcnMvZ3B1L2RybS9kcm1fbW9kZV9jb25maWcuYyB8ICAx
IC0KIGRyaXZlcnMvZ3B1L2RybS9kcm1fcGxhbmUuYyAgICAgICB8IDQ1ICsrKysrKysrKysrKyst
LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLQogaW5jbHVkZS9kcm0vZHJtX21vZGVfY29uZmlnLmgg
ICAgIHwgMTMgLS0tLS0tLS0tLS0KIDMgZmlsZXMgY2hhbmdlZCwgMTUgaW5zZXJ0aW9ucygrKSwg
NDQgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2RybV9tb2RlX2Nv
bmZpZy5jIGIvZHJpdmVycy9ncHUvZHJtL2RybV9tb2RlX2NvbmZpZy5jCmluZGV4IDc0ZjZmZjVk
ZjY1Ni4uOTE5ZTc4ZDQ1YWIwIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vZHJtX21vZGVf
Y29uZmlnLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2RybV9tb2RlX2NvbmZpZy5jCkBAIC0zODUs
NyArMzg1LDYgQEAgdm9pZCBkcm1fbW9kZV9jb25maWdfaW5pdChzdHJ1Y3QgZHJtX2RldmljZSAq
ZGV2KQogCWRldi0+bW9kZV9jb25maWcubnVtX2Nvbm5lY3RvciA9IDA7CiAJZGV2LT5tb2RlX2Nv
bmZpZy5udW1fY3J0YyA9IDA7CiAJZGV2LT5tb2RlX2NvbmZpZy5udW1fZW5jb2RlciA9IDA7Ci0J
ZGV2LT5tb2RlX2NvbmZpZy5udW1fb3ZlcmxheV9wbGFuZSA9IDA7CiAJZGV2LT5tb2RlX2NvbmZp
Zy5udW1fdG90YWxfcGxhbmUgPSAwOwogfQogRVhQT1JUX1NZTUJPTChkcm1fbW9kZV9jb25maWdf
aW5pdCk7CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vZHJtX3BsYW5lLmMgYi9kcml2ZXJz
L2dwdS9kcm0vZHJtX3BsYW5lLmMKaW5kZXggNmFmMDJjN2I1ZGEzLi5mYWEzNGFmYTcwOGEgMTAw
NjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9kcm1fcGxhbmUuYworKysgYi9kcml2ZXJzL2dwdS9k
cm0vZHJtX3BsYW5lLmMKQEAgLTI0MSw4ICsyNDEsNiBAQCBpbnQgZHJtX3VuaXZlcnNhbF9wbGFu
ZV9pbml0KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsIHN0cnVjdCBkcm1fcGxhbmUgKnBsYW5lLAog
CiAJbGlzdF9hZGRfdGFpbCgmcGxhbmUtPmhlYWQsICZjb25maWctPnBsYW5lX2xpc3QpOwogCXBs
YW5lLT5pbmRleCA9IGNvbmZpZy0+bnVtX3RvdGFsX3BsYW5lKys7Ci0JaWYgKHBsYW5lLT50eXBl
ID09IERSTV9QTEFORV9UWVBFX09WRVJMQVkpCi0JCWNvbmZpZy0+bnVtX292ZXJsYXlfcGxhbmUr
KzsKIAogCWRybV9vYmplY3RfYXR0YWNoX3Byb3BlcnR5KCZwbGFuZS0+YmFzZSwKIAkJCQkgICBj
b25maWctPnBsYW5lX3R5cGVfcHJvcGVydHksCkBAIC0zNTMsOCArMzUxLDYgQEAgdm9pZCBkcm1f
cGxhbmVfY2xlYW51cChzdHJ1Y3QgZHJtX3BsYW5lICpwbGFuZSkKIAogCWxpc3RfZGVsKCZwbGFu
ZS0+aGVhZCk7CiAJZGV2LT5tb2RlX2NvbmZpZy5udW1fdG90YWxfcGxhbmUtLTsKLQlpZiAocGxh
bmUtPnR5cGUgPT0gRFJNX1BMQU5FX1RZUEVfT1ZFUkxBWSkKLQkJZGV2LT5tb2RlX2NvbmZpZy5u
dW1fb3ZlcmxheV9wbGFuZS0tOwogCiAJV0FSTl9PTihwbGFuZS0+c3RhdGUgJiYgIXBsYW5lLT5m
dW5jcy0+YXRvbWljX2Rlc3Ryb3lfc3RhdGUpOwogCWlmIChwbGFuZS0+c3RhdGUgJiYgcGxhbmUt
PmZ1bmNzLT5hdG9taWNfZGVzdHJveV9zdGF0ZSkKQEAgLTQ2Miw0MyArNDU4LDMyIEBAIGludCBk
cm1fbW9kZV9nZXRwbGFuZV9yZXMoc3RydWN0IGRybV9kZXZpY2UgKmRldiwgdm9pZCAqZGF0YSwK
IAlzdHJ1Y3QgZHJtX21vZGVfY29uZmlnICpjb25maWc7CiAJc3RydWN0IGRybV9wbGFuZSAqcGxh
bmU7CiAJdWludDMyX3QgX191c2VyICpwbGFuZV9wdHI7Ci0JaW50IGNvcGllZCA9IDA7Ci0JdW5z
aWduZWQgbnVtX3BsYW5lczsKKwlpbnQgY291bnQgPSAwOwogCiAJaWYgKCFkcm1fY29yZV9jaGVj
a19mZWF0dXJlKGRldiwgRFJJVkVSX01PREVTRVQpKQogCQlyZXR1cm4gLUVJTlZBTDsKIAogCWNv
bmZpZyA9ICZkZXYtPm1vZGVfY29uZmlnOwogCi0JaWYgKGZpbGVfcHJpdi0+dW5pdmVyc2FsX3Bs
YW5lcykKLQkJbnVtX3BsYW5lcyA9IGNvbmZpZy0+bnVtX3RvdGFsX3BsYW5lOwotCWVsc2UKLQkJ
bnVtX3BsYW5lcyA9IGNvbmZpZy0+bnVtX292ZXJsYXlfcGxhbmU7Ci0KIAkvKgogCSAqIFRoaXMg
aW9jdGwgaXMgY2FsbGVkIHR3aWNlLCBvbmNlIHRvIGRldGVybWluZSBob3cgbXVjaCBzcGFjZSBp
cwogCSAqIG5lZWRlZCwgYW5kIHRoZSAybmQgdGltZSB0byBmaWxsIGl0LgogCSAqLwotCWlmIChu
dW1fcGxhbmVzICYmCi0JICAgIChwbGFuZV9yZXNwLT5jb3VudF9wbGFuZXMgPj0gbnVtX3BsYW5l
cykpIHsKLQkJcGxhbmVfcHRyID0gKHVpbnQzMl90IF9fdXNlciAqKSh1bnNpZ25lZCBsb25nKXBs
YW5lX3Jlc3AtPnBsYW5lX2lkX3B0cjsKLQotCQkvKiBQbGFuZSBsaXN0cyBhcmUgaW52YXJpYW50
LCBubyBsb2NraW5nIG5lZWRlZC4gKi8KLQkJZHJtX2Zvcl9lYWNoX3BsYW5lKHBsYW5lLCBkZXYp
IHsKLQkJCS8qCi0JCQkgKiBVbmxlc3MgdXNlcnNwYWNlIHNldCB0aGUgJ3VuaXZlcnNhbCBwbGFu
ZXMnCi0JCQkgKiBjYXBhYmlsaXR5IGJpdCwgb25seSBhZHZlcnRpc2Ugb3ZlcmxheXMuCi0JCQkg
Ki8KLQkJCWlmIChwbGFuZS0+dHlwZSAhPSBEUk1fUExBTkVfVFlQRV9PVkVSTEFZICYmCi0JCQkg
ICAgIWZpbGVfcHJpdi0+dW5pdmVyc2FsX3BsYW5lcykKLQkJCQljb250aW51ZTsKLQotCQkJaWYg
KHB1dF91c2VyKHBsYW5lLT5iYXNlLmlkLCBwbGFuZV9wdHIgKyBjb3BpZWQpKQotCQkJCXJldHVy
biAtRUZBVUxUOwotCQkJY29waWVkKys7Ci0JCX0KKwlkcm1fZm9yX2VhY2hfcGxhbmUocGxhbmUs
IGRldikgeworCQkvKgorCQkgKiBVbmxlc3MgdXNlcnNwYWNlIHNldCB0aGUgJ3VuaXZlcnNhbCBw
bGFuZXMnCisJCSAqIGNhcGFiaWxpdHkgYml0LCBvbmx5IGFkdmVydGlzZSBvdmVybGF5cy4KKwkJ
ICovCisJCWlmIChwbGFuZS0+dHlwZSAhPSBEUk1fUExBTkVfVFlQRV9PVkVSTEFZICYmCisJCSAg
ICAhZmlsZV9wcml2LT51bml2ZXJzYWxfcGxhbmVzKQorCQkJY29udGludWU7CisKKwkJaWYgKGNv
dW50IDwgY29uZmlnLT5udW1fdG90YWxfcGxhbmUgJiYKKwkJICAgIHB1dF91c2VyKHBsYW5lLT5i
YXNlLmlkLCBwbGFuZV9wdHIgKyBjb3VudCkpCisJCQlyZXR1cm4gLUVGQVVMVDsKKwkJY291bnQr
KzsKIAl9Ci0JcGxhbmVfcmVzcC0+Y291bnRfcGxhbmVzID0gbnVtX3BsYW5lczsKKwlwbGFuZV9y
ZXNwLT5jb3VudF9wbGFuZXMgPSBjb3VudDsKIAogCXJldHVybiAwOwogfQpkaWZmIC0tZ2l0IGEv
aW5jbHVkZS9kcm0vZHJtX21vZGVfY29uZmlnLmggYi9pbmNsdWRlL2RybS9kcm1fbW9kZV9jb25m
aWcuaAppbmRleCAxYjM3MzY4NDE2YzguLjBiNGFjMmViYzYxMCAxMDA2NDQKLS0tIGEvaW5jbHVk
ZS9kcm0vZHJtX21vZGVfY29uZmlnLmgKKysrIGIvaW5jbHVkZS9kcm0vZHJtX21vZGVfY29uZmln
LmgKQEAgLTQyOSwxOSArNDI5LDYgQEAgc3RydWN0IGRybV9tb2RlX2NvbmZpZyB7CiAJICovCiAJ
c3RydWN0IGxpc3RfaGVhZCBlbmNvZGVyX2xpc3Q7CiAKLQkvKioKLQkgKiBAbnVtX292ZXJsYXlf
cGxhbmU6Ci0JICoKLQkgKiBOdW1iZXIgb2Ygb3ZlcmxheSBwbGFuZXMgb24gdGhpcyBkZXZpY2Us
IGV4Y2x1ZGluZyBwcmltYXJ5IGFuZCBjdXJzb3IKLQkgKiBwbGFuZXMuCi0JICoKLQkgKiBUcmFj
ayBudW1iZXIgb2Ygb3ZlcmxheSBwbGFuZXMgc2VwYXJhdGVseSBmcm9tIG51bWJlciBvZiB0b3Rh
bAotCSAqIHBsYW5lcy4gIEJ5IGRlZmF1bHQgd2Ugb25seSBhZHZlcnRpc2Ugb3ZlcmxheSBwbGFu
ZXMgdG8gdXNlcnNwYWNlOyBpZgotCSAqIHVzZXJzcGFjZSBzZXRzIHRoZSAidW5pdmVyc2FsIHBs
YW5lIiBjYXBhYmlsaXR5IGJpdCwgd2UnbGwgZ28gYWhlYWQKLQkgKiBhbmQgZXhwb3NlIGFsbCBw
bGFuZXMuIFRoaXMgaXMgaW52YXJpYW50IG92ZXIgdGhlIGxpZmV0aW1lIG9mIGEKLQkgKiBkZXZp
Y2UgYW5kIGhlbmNlIGRvZXNuJ3QgbmVlZCBhbnkgbG9ja3MuCi0JICovCi0JaW50IG51bV9vdmVy
bGF5X3BsYW5lOwogCS8qKgogCSAqIEBudW1fdG90YWxfcGxhbmU6CiAJICoKLS0gCjIuMTQuMgoK
X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4
IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlz
dHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4Cg==