From: Eric Anholt Subject: [PATCH 06/10] drm/vc4: Add more display planes to each CRTC. Date: Thu, 4 Feb 2016 12:26:36 -0800 Message-ID: <1454617600-12099-7-git-send-email-eric@anholt.net> References: <1454617600-12099-1-git-send-email-eric@anholt.net> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <1454617600-12099-1-git-send-email-eric@anholt.net> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: dri-devel@lists.freedesktop.org Cc: linux-kernel@vger.kernel.org List-Id: dri-devel@lists.freedesktop.org UHJldmlvdXNseSB3ZSBvbmx5IGRpZCB0aGUgcHJpbWFyeSBhbmQgY3Vyc29yIHBsYW5lLCBidXQg b3ZlcmxheQpwbGFuZXMgYXJlIHVzZWZ1bCBhbmQganVzdCByZXF1aXJlIHRoaXMgc2V0dXAgdG8g YWRkLCBzaW5jZSBhbGwgcGxhbmVzCmdvIGludG8gdGhlIEhWUyBkaXNwbGF5IGxpc3QgaW4gdGhl IHNhbWUgd2F5LgoKU2lnbmVkLW9mZi1ieTogRXJpYyBBbmhvbHQgPGVyaWNAYW5ob2x0Lm5ldD4K LS0tCiBkcml2ZXJzL2dwdS9kcm0vdmM0L3ZjNF9jcnRjLmMgfCA1NiArKysrKysrKysrKysrKysr KysrKysrKysrKysrKystLS0tLS0tLS0tLS0KIDEgZmlsZSBjaGFuZ2VkLCA0MCBpbnNlcnRpb25z KCspLCAxNiBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vdmM0L3Zj NF9jcnRjLmMgYi9kcml2ZXJzL2dwdS9kcm0vdmM0L3ZjNF9jcnRjLmMKaW5kZXggMTJhNjFkNS4u NjgyMjdjYyAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL3ZjNC92YzRfY3J0Yy5jCisrKyBi L2RyaXZlcnMvZ3B1L2RybS92YzQvdmM0X2NydGMuYwpAQCAtNjc3LDkgKzY3Nyw5IEBAIHN0YXRp YyBpbnQgdmM0X2NydGNfYmluZChzdHJ1Y3QgZGV2aWNlICpkZXYsIHN0cnVjdCBkZXZpY2UgKm1h c3Rlciwgdm9pZCAqZGF0YSkKIAlzdHJ1Y3QgdmM0X2RldiAqdmM0ID0gdG9fdmM0X2Rldihkcm0p OwogCXN0cnVjdCB2YzRfY3J0YyAqdmM0X2NydGM7CiAJc3RydWN0IGRybV9jcnRjICpjcnRjOwot CXN0cnVjdCBkcm1fcGxhbmUgKnByaW1hcnlfcGxhbmUsICpjdXJzb3JfcGxhbmU7CisJc3RydWN0 IGRybV9wbGFuZSAqcHJpbWFyeV9wbGFuZSwgKmN1cnNvcl9wbGFuZSwgKmRlc3Ryb3lfcGxhbmUs ICp0ZW1wOwogCWNvbnN0IHN0cnVjdCBvZl9kZXZpY2VfaWQgKm1hdGNoOwotCWludCByZXQ7CisJ aW50IHJldCwgaTsKIAogCXZjNF9jcnRjID0gZGV2bV9remFsbG9jKGRldiwgc2l6ZW9mKCp2YzRf Y3J0YyksIEdGUF9LRVJORUwpOwogCWlmICghdmM0X2NydGMpCkBAIC03MDgsMjcgKzcwOCw0OSBA QCBzdGF0aWMgaW50IHZjNF9jcnRjX2JpbmQoc3RydWN0IGRldmljZSAqZGV2LCBzdHJ1Y3QgZGV2 aWNlICptYXN0ZXIsIHZvaWQgKmRhdGEpCiAJCWdvdG8gZXJyOwogCX0KIAotCWN1cnNvcl9wbGFu ZSA9IHZjNF9wbGFuZV9pbml0KGRybSwgRFJNX1BMQU5FX1RZUEVfQ1VSU09SKTsKLQlpZiAoSVNf RVJSKGN1cnNvcl9wbGFuZSkpIHsKLQkJZGV2X2VycihkZXYsICJmYWlsZWQgdG8gY29uc3RydWN0 IGN1cnNvciBwbGFuZVxuIik7Ci0JCXJldCA9IFBUUl9FUlIoY3Vyc29yX3BsYW5lKTsKLQkJZ290 byBlcnJfcHJpbWFyeTsKLQl9Ci0KLQlkcm1fY3J0Y19pbml0X3dpdGhfcGxhbmVzKGRybSwgY3J0 YywgcHJpbWFyeV9wbGFuZSwgY3Vyc29yX3BsYW5lLAorCWRybV9jcnRjX2luaXRfd2l0aF9wbGFu ZXMoZHJtLCBjcnRjLCBwcmltYXJ5X3BsYW5lLCBOVUxMLAogCQkJCSAgJnZjNF9jcnRjX2Z1bmNz LCBOVUxMKTsKIAlkcm1fY3J0Y19oZWxwZXJfYWRkKGNydGMsICZ2YzRfY3J0Y19oZWxwZXJfZnVu Y3MpOwogCXByaW1hcnlfcGxhbmUtPmNydGMgPSBjcnRjOwotCWN1cnNvcl9wbGFuZS0+Y3J0YyA9 IGNydGM7CiAJdmM0LT5jcnRjW2RybV9jcnRjX2luZGV4KGNydGMpXSA9IHZjNF9jcnRjOwogCXZj NF9jcnRjLT5jaGFubmVsID0gdmM0X2NydGMtPmRhdGEtPmh2c19jaGFubmVsOwogCisJLyogU2V0 IHVwIHNvbWUgYXJiaXRyYXJ5IG51bWJlciBvZiBwbGFuZXMuICBXZSdyZSBub3QgbGltaXRlZAor CSAqIGJ5IGEgc2V0IG51bWJlciBvZiBwaHlzaWNhbCByZWdpc3RlcnMsIGp1c3QgdGhlIHNwYWNl IGluCisJICogdGhlIEhWUyAoMTZrKSBhbmQgaG93IHNtYWxsIGFuIHBsYW5lIGNhbiBiZSAoMjgg Ynl0ZXMpLgorCSAqIEhvd2V2ZXIsIGVhY2ggcGxhbmUgd2Ugc2V0IHVwIHRha2VzIHVwIHNvbWUg bWVtb3J5LCBhbmQKKwkgKiBpbmNyZWFzZXMgdGhlIGNvc3Qgb2YgbG9vcGluZyBvdmVyIHBsYW5l cywgd2hpY2ggYXRvbWljCisJICogbW9kZXNldHRpbmcgZG9lcyBxdWl0ZSBhIGJpdC4gIEFzIGEg cmVzdWx0LCB3ZSBwaWNrIGEKKwkgKiBtb2Rlc3QgbnVtYmVyIG9mIHBsYW5lcyB0byBleHBvc2Us IHRoYXQgc2hvdWxkIGhvcGVmdWxseQorCSAqIHN0aWxsIGNvdmVyIGFueSBzYW5lIHVzZWNhc2Uu CisJICovCisJZm9yIChpID0gMDsgaSA8IDg7IGkrKykgeworCQlzdHJ1Y3QgZHJtX3BsYW5lICpw bGFuZSA9CisJCQl2YzRfcGxhbmVfaW5pdChkcm0sIERSTV9QTEFORV9UWVBFX09WRVJMQVkpOwor CisJCWlmIChJU19FUlIocGxhbmUpKQorCQkJY29udGludWU7CisKKwkJcGxhbmUtPnBvc3NpYmxl X2NydGNzID0gMSA8PCBkcm1fY3J0Y19pbmRleChjcnRjKTsKKwl9CisKKwkvKiBTZXQgdXAgdGhl IGxlZ2FjeSBjdXJzb3IgYWZ0ZXIgb3ZlcmxheSBpbml0aWFsaXphdGlvbiwKKwkgKiBzaW5jZSB3 ZSBvdmVybGF5IHBsYW5lcyBvbiB0aGUgQ1JUQyBpbiB0aGUgb3JkZXIgdGhleSB3ZXJlCisJICog aW5pdGlhbGl6ZWQuCisJICovCisJY3Vyc29yX3BsYW5lID0gdmM0X3BsYW5lX2luaXQoZHJtLCBE Uk1fUExBTkVfVFlQRV9DVVJTT1IpOworCWlmICghSVNfRVJSKGN1cnNvcl9wbGFuZSkpIHsKKwkJ Y3Vyc29yX3BsYW5lLT5wb3NzaWJsZV9jcnRjcyA9IDEgPDwgZHJtX2NydGNfaW5kZXgoY3J0Yyk7 CisJCWN1cnNvcl9wbGFuZS0+Y3J0YyA9IGNydGM7CisJCWNydGMtPmN1cnNvciA9IGN1cnNvcl9w bGFuZTsKKwl9CisKIAlDUlRDX1dSSVRFKFBWX0lOVEVOLCAwKTsKIAlDUlRDX1dSSVRFKFBWX0lO VFNUQVQsIFBWX0lOVF9WRlBfU1RBUlQpOwogCXJldCA9IGRldm1fcmVxdWVzdF9pcnEoZGV2LCBw bGF0Zm9ybV9nZXRfaXJxKHBkZXYsIDApLAogCQkJICAgICAgIHZjNF9jcnRjX2lycV9oYW5kbGVy LCAwLCAidmM0IGNydGMiLCB2YzRfY3J0Yyk7CiAJaWYgKHJldCkKLQkJZ290byBlcnJfY3Vyc29y OworCQlnb3RvIGVycl9kZXN0cm95X3BsYW5lczsKIAogCXZjNF9zZXRfY3J0Y19wb3NzaWJsZV9t YXNrcyhkcm0sIGNydGMpOwogCkBAIC03MzYsMTAgKzc1OCwxMiBAQCBzdGF0aWMgaW50IHZjNF9j cnRjX2JpbmQoc3RydWN0IGRldmljZSAqZGV2LCBzdHJ1Y3QgZGV2aWNlICptYXN0ZXIsIHZvaWQg KmRhdGEpCiAKIAlyZXR1cm4gMDsKIAotZXJyX2N1cnNvcjoKLQljdXJzb3JfcGxhbmUtPmZ1bmNz LT5kZXN0cm95KGN1cnNvcl9wbGFuZSk7Ci1lcnJfcHJpbWFyeToKLQlwcmltYXJ5X3BsYW5lLT5m dW5jcy0+ZGVzdHJveShwcmltYXJ5X3BsYW5lKTsKK2Vycl9kZXN0cm95X3BsYW5lczoKKwlsaXN0 X2Zvcl9lYWNoX2VudHJ5X3NhZmUoZGVzdHJveV9wbGFuZSwgdGVtcCwKKwkJCQkgJmRybS0+bW9k ZV9jb25maWcucGxhbmVfbGlzdCwgaGVhZCkgeworCQlpZiAoZGVzdHJveV9wbGFuZS0+cG9zc2li bGVfY3J0Y3MgPT0gMSA8PCBkcm1fY3J0Y19pbmRleChjcnRjKSkKKwkJICAgIGRlc3Ryb3lfcGxh bmUtPmZ1bmNzLT5kZXN0cm95KGRlc3Ryb3lfcGxhbmUpOworCX0KIGVycjoKIAlyZXR1cm4gcmV0 OwogfQotLSAKMi43LjAKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fCmRyaS1kZXZlbCBtYWlsaW5nIGxpc3QKZHJpLWRldmVsQGxpc3RzLmZyZWVkZXNrdG9w Lm9yZwpodHRwOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vZHJpLWRl dmVsCg==