From mboxrd@z Thu Jan  1 00:00:00 1970
From: Dave Airlie <airlied@gmail.com>
Subject: [PATCH] drm/plane: drop num_overlay_planes (v3)
Date: Fri, 13 Oct 2017 16:20:02 +1000
Message-ID: <20171013062002.4058-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
dHIuIChrZWl0aHApCnYzOiB1c2UgY29ycmVjdCBib3VuZHMgY2hlY2ssIGZvdW5kIGJ5IGlndC4K
ClNpZ25lZC1vZmYtYnk6IERhdmUgQWlybGllIDxhaXJsaWVkQHJlZGhhdC5jb20+Ci0tLQogZHJp
dmVycy9ncHUvZHJtL2RybV9tb2RlX2NvbmZpZy5jIHwgIDEgLQogZHJpdmVycy9ncHUvZHJtL2Ry
bV9wbGFuZS5jICAgICAgIHwgNDYgKysrKysrKysrKysrKystLS0tLS0tLS0tLS0tLS0tLS0tLS0t
LS0tCiBpbmNsdWRlL2RybS9kcm1fbW9kZV9jb25maWcuaCAgICAgfCAxMyAtLS0tLS0tLS0tLQog
MyBmaWxlcyBjaGFuZ2VkLCAxNiBpbnNlcnRpb25zKCspLCA0NCBkZWxldGlvbnMoLSkKCmRpZmYg
LS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vZHJtX21vZGVfY29uZmlnLmMgYi9kcml2ZXJzL2dwdS9k
cm0vZHJtX21vZGVfY29uZmlnLmMKaW5kZXggNzRmNmZmNWRmNjU2Li45MTllNzhkNDVhYjAgMTAw
NjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9kcm1fbW9kZV9jb25maWcuYworKysgYi9kcml2ZXJz
L2dwdS9kcm0vZHJtX21vZGVfY29uZmlnLmMKQEAgLTM4NSw3ICszODUsNiBAQCB2b2lkIGRybV9t
b2RlX2NvbmZpZ19pbml0KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCiAJZGV2LT5tb2RlX2NvbmZp
Zy5udW1fY29ubmVjdG9yID0gMDsKIAlkZXYtPm1vZGVfY29uZmlnLm51bV9jcnRjID0gMDsKIAlk
ZXYtPm1vZGVfY29uZmlnLm51bV9lbmNvZGVyID0gMDsKLQlkZXYtPm1vZGVfY29uZmlnLm51bV9v
dmVybGF5X3BsYW5lID0gMDsKIAlkZXYtPm1vZGVfY29uZmlnLm51bV90b3RhbF9wbGFuZSA9IDA7
CiB9CiBFWFBPUlRfU1lNQk9MKGRybV9tb2RlX2NvbmZpZ19pbml0KTsKZGlmZiAtLWdpdCBhL2Ry
aXZlcnMvZ3B1L2RybS9kcm1fcGxhbmUuYyBiL2RyaXZlcnMvZ3B1L2RybS9kcm1fcGxhbmUuYwpp
bmRleCA1NzRmZDE0NzUyMTQuLjhkOTgyNDgwNGIwYyAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUv
ZHJtL2RybV9wbGFuZS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9kcm1fcGxhbmUuYwpAQCAtMjQx
LDggKzI0MSw2IEBAIGludCBkcm1fdW5pdmVyc2FsX3BsYW5lX2luaXQoc3RydWN0IGRybV9kZXZp
Y2UgKmRldiwgc3RydWN0IGRybV9wbGFuZSAqcGxhbmUsCiAKIAlsaXN0X2FkZF90YWlsKCZwbGFu
ZS0+aGVhZCwgJmNvbmZpZy0+cGxhbmVfbGlzdCk7CiAJcGxhbmUtPmluZGV4ID0gY29uZmlnLT5u
dW1fdG90YWxfcGxhbmUrKzsKLQlpZiAocGxhbmUtPnR5cGUgPT0gRFJNX1BMQU5FX1RZUEVfT1ZF
UkxBWSkKLQkJY29uZmlnLT5udW1fb3ZlcmxheV9wbGFuZSsrOwogCiAJZHJtX29iamVjdF9hdHRh
Y2hfcHJvcGVydHkoJnBsYW5lLT5iYXNlLAogCQkJCSAgIGNvbmZpZy0+cGxhbmVfdHlwZV9wcm9w
ZXJ0eSwKQEAgLTM1Myw4ICszNTEsNiBAQCB2b2lkIGRybV9wbGFuZV9jbGVhbnVwKHN0cnVjdCBk
cm1fcGxhbmUgKnBsYW5lKQogCiAJbGlzdF9kZWwoJnBsYW5lLT5oZWFkKTsKIAlkZXYtPm1vZGVf
Y29uZmlnLm51bV90b3RhbF9wbGFuZS0tOwotCWlmIChwbGFuZS0+dHlwZSA9PSBEUk1fUExBTkVf
VFlQRV9PVkVSTEFZKQotCQlkZXYtPm1vZGVfY29uZmlnLm51bV9vdmVybGF5X3BsYW5lLS07CiAK
IAlXQVJOX09OKHBsYW5lLT5zdGF0ZSAmJiAhcGxhbmUtPmZ1bmNzLT5hdG9taWNfZGVzdHJveV9z
dGF0ZSk7CiAJaWYgKHBsYW5lLT5zdGF0ZSAmJiBwbGFuZS0+ZnVuY3MtPmF0b21pY19kZXN0cm95
X3N0YXRlKQpAQCAtNDYyLDQzICs0NTgsMzMgQEAgaW50IGRybV9tb2RlX2dldHBsYW5lX3Jlcyhz
dHJ1Y3QgZHJtX2RldmljZSAqZGV2LCB2b2lkICpkYXRhLAogCXN0cnVjdCBkcm1fbW9kZV9jb25m
aWcgKmNvbmZpZzsKIAlzdHJ1Y3QgZHJtX3BsYW5lICpwbGFuZTsKIAl1aW50MzJfdCBfX3VzZXIg
KnBsYW5lX3B0cjsKLQlpbnQgY29waWVkID0gMDsKLQl1bnNpZ25lZCBudW1fcGxhbmVzOworCWlu
dCBjb3VudCA9IDA7CiAKIAlpZiAoIWRybV9jb3JlX2NoZWNrX2ZlYXR1cmUoZGV2LCBEUklWRVJf
TU9ERVNFVCkpCiAJCXJldHVybiAtRUlOVkFMOwogCiAJY29uZmlnID0gJmRldi0+bW9kZV9jb25m
aWc7Ci0KLQlpZiAoZmlsZV9wcml2LT51bml2ZXJzYWxfcGxhbmVzKQotCQludW1fcGxhbmVzID0g
Y29uZmlnLT5udW1fdG90YWxfcGxhbmU7Ci0JZWxzZQotCQludW1fcGxhbmVzID0gY29uZmlnLT5u
dW1fb3ZlcmxheV9wbGFuZTsKKwlwbGFuZV9wdHIgPSB1NjRfdG9fdXNlcl9wdHIocGxhbmVfcmVz
cC0+cGxhbmVfaWRfcHRyKTsKIAogCS8qCiAJICogVGhpcyBpb2N0bCBpcyBjYWxsZWQgdHdpY2Us
IG9uY2UgdG8gZGV0ZXJtaW5lIGhvdyBtdWNoIHNwYWNlIGlzCiAJICogbmVlZGVkLCBhbmQgdGhl
IDJuZCB0aW1lIHRvIGZpbGwgaXQuCiAJICovCi0JaWYgKG51bV9wbGFuZXMgJiYKLQkgICAgKHBs
YW5lX3Jlc3AtPmNvdW50X3BsYW5lcyA+PSBudW1fcGxhbmVzKSkgewotCQlwbGFuZV9wdHIgPSAo
dWludDMyX3QgX191c2VyICopKHVuc2lnbmVkIGxvbmcpcGxhbmVfcmVzcC0+cGxhbmVfaWRfcHRy
OwotCi0JCS8qIFBsYW5lIGxpc3RzIGFyZSBpbnZhcmlhbnQsIG5vIGxvY2tpbmcgbmVlZGVkLiAq
LwotCQlkcm1fZm9yX2VhY2hfcGxhbmUocGxhbmUsIGRldikgewotCQkJLyoKLQkJCSAqIFVubGVz
cyB1c2Vyc3BhY2Ugc2V0IHRoZSAndW5pdmVyc2FsIHBsYW5lcycKLQkJCSAqIGNhcGFiaWxpdHkg
Yml0LCBvbmx5IGFkdmVydGlzZSBvdmVybGF5cy4KLQkJCSAqLwotCQkJaWYgKHBsYW5lLT50eXBl
ICE9IERSTV9QTEFORV9UWVBFX09WRVJMQVkgJiYKLQkJCSAgICAhZmlsZV9wcml2LT51bml2ZXJz
YWxfcGxhbmVzKQotCQkJCWNvbnRpbnVlOwotCi0JCQlpZiAocHV0X3VzZXIocGxhbmUtPmJhc2Uu
aWQsIHBsYW5lX3B0ciArIGNvcGllZCkpCi0JCQkJcmV0dXJuIC1FRkFVTFQ7Ci0JCQljb3BpZWQr
KzsKLQkJfQorCWRybV9mb3JfZWFjaF9wbGFuZShwbGFuZSwgZGV2KSB7CisJCS8qCisJCSAqIFVu
bGVzcyB1c2Vyc3BhY2Ugc2V0IHRoZSAndW5pdmVyc2FsIHBsYW5lcycKKwkJICogY2FwYWJpbGl0
eSBiaXQsIG9ubHkgYWR2ZXJ0aXNlIG92ZXJsYXlzLgorCQkgKi8KKwkJaWYgKHBsYW5lLT50eXBl
ICE9IERSTV9QTEFORV9UWVBFX09WRVJMQVkgJiYKKwkJICAgICFmaWxlX3ByaXYtPnVuaXZlcnNh
bF9wbGFuZXMpCisJCQljb250aW51ZTsKKworCQlpZiAoY291bnQgPCBwbGFuZV9yZXNwLT5jb3Vu
dF9wbGFuZXMgJiYKKwkJICAgIHB1dF91c2VyKHBsYW5lLT5iYXNlLmlkLCBwbGFuZV9wdHIgKyBj
b3VudCkpCisJCQlyZXR1cm4gLUVGQVVMVDsKKwkJY291bnQrKzsKIAl9Ci0JcGxhbmVfcmVzcC0+
Y291bnRfcGxhbmVzID0gbnVtX3BsYW5lczsKKwlwbGFuZV9yZXNwLT5jb3VudF9wbGFuZXMgPSBj
b3VudDsKIAogCXJldHVybiAwOwogfQpkaWZmIC0tZ2l0IGEvaW5jbHVkZS9kcm0vZHJtX21vZGVf
Y29uZmlnLmggYi9pbmNsdWRlL2RybS9kcm1fbW9kZV9jb25maWcuaAppbmRleCAxYjM3MzY4NDE2
YzguLjBiNGFjMmViYzYxMCAxMDA2NDQKLS0tIGEvaW5jbHVkZS9kcm0vZHJtX21vZGVfY29uZmln
LmgKKysrIGIvaW5jbHVkZS9kcm0vZHJtX21vZGVfY29uZmlnLmgKQEAgLTQyOSwxOSArNDI5LDYg
QEAgc3RydWN0IGRybV9tb2RlX2NvbmZpZyB7CiAJICovCiAJc3RydWN0IGxpc3RfaGVhZCBlbmNv
ZGVyX2xpc3Q7CiAKLQkvKioKLQkgKiBAbnVtX292ZXJsYXlfcGxhbmU6Ci0JICoKLQkgKiBOdW1i
ZXIgb2Ygb3ZlcmxheSBwbGFuZXMgb24gdGhpcyBkZXZpY2UsIGV4Y2x1ZGluZyBwcmltYXJ5IGFu
ZCBjdXJzb3IKLQkgKiBwbGFuZXMuCi0JICoKLQkgKiBUcmFjayBudW1iZXIgb2Ygb3ZlcmxheSBw
bGFuZXMgc2VwYXJhdGVseSBmcm9tIG51bWJlciBvZiB0b3RhbAotCSAqIHBsYW5lcy4gIEJ5IGRl
ZmF1bHQgd2Ugb25seSBhZHZlcnRpc2Ugb3ZlcmxheSBwbGFuZXMgdG8gdXNlcnNwYWNlOyBpZgot
CSAqIHVzZXJzcGFjZSBzZXRzIHRoZSAidW5pdmVyc2FsIHBsYW5lIiBjYXBhYmlsaXR5IGJpdCwg
d2UnbGwgZ28gYWhlYWQKLQkgKiBhbmQgZXhwb3NlIGFsbCBwbGFuZXMuIFRoaXMgaXMgaW52YXJp
YW50IG92ZXIgdGhlIGxpZmV0aW1lIG9mIGEKLQkgKiBkZXZpY2UgYW5kIGhlbmNlIGRvZXNuJ3Qg
bmVlZCBhbnkgbG9ja3MuCi0JICovCi0JaW50IG51bV9vdmVybGF5X3BsYW5lOwogCS8qKgogCSAq
IEBudW1fdG90YWxfcGxhbmU6CiAJICoKLS0gCjIuMTQuMgoKX19fX19fX19fX19fX19fX19fX19f
X19fX19fX19fX19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1n
ZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21h
aWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4Cg==