From mboxrd@z Thu Jan 1 00:00:00 1970 From: Eric Anholt Subject: [PATCH 2/2] drm/vc4: Squash commit for Mario's precise vblank timestamping. Date: Fri, 8 Jul 2016 11:44:58 -0700 Message-ID: <1468003498-2476-2-git-send-email-eric@anholt.net> References: <1466662670-9884-2-git-send-email-mario.kleiner.de@gmail.com> <1468003498-2476-1-git-send-email-eric@anholt.net> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from anholt.net (anholt.net [50.246.234.109]) by gabe.freedesktop.org (Postfix) with ESMTP id F36846E991 for ; Fri, 8 Jul 2016 18:45:00 +0000 (UTC) In-Reply-To: <1468003498-2476-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 UmVhZCBvdXQgdGhlIERJU1BCQVNFIHJlZ2lzdGVycyB0byBkZWNpZGUgb24gdGhlIEZJRk8gc2l6 ZS4KClNpZ25lZC1vZmYtYnk6IEVyaWMgQW5ob2x0IDxlcmljQGFuaG9sdC5uZXQ+Ci0tLQoKTWFy aW86IEhvdyBhYm91dCB0aGlzIGZvciBhIHNxdWFzaCBpbnRvIHlvdXIgY29tbWl0PyAgSGVyZSBh cmUgdGhlCnZhbHVlcyBJIGR1bXBlZCBmb3IgY29iX3NpemU6CgpbICAgIDIuMTQ4MzE0XSBbZHJt XSBTY2FsZXIgMCBzaXplIDUyMzIKWyAgICAyLjE2MjIzOV0gW2RybV0gU2NhbGVyIDIgc2l6ZSAy MDQ4ClsgICAgMi4xNzI5NTddIFtkcm1dIFNjYWxlciAxIHNpemUgMTM0NTYKCiBkcml2ZXJzL2dw dS9kcm0vdmM0L3ZjNF9jcnRjLmMgfCAyMyArKysrKysrKysrKysrKysrKysrKystLQogZHJpdmVy cy9ncHUvZHJtL3ZjNC92YzRfcmVncy5oIHwgMTggKysrKysrKysrKysrKysrKystCiAyIGZpbGVz IGNoYW5nZWQsIDM4IGluc2VydGlvbnMoKyksIDMgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEv ZHJpdmVycy9ncHUvZHJtL3ZjNC92YzRfY3J0Yy5jIGIvZHJpdmVycy9ncHUvZHJtL3ZjNC92YzRf Y3J0Yy5jCmluZGV4IGJhZjk2MmJjZTA2My4uM2I3ZGIxN2MzNTZkIDEwMDY0NAotLS0gYS9kcml2 ZXJzL2dwdS9kcm0vdmM0L3ZjNF9jcnRjLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL3ZjNC92YzRf Y3J0Yy5jCkBAIC01NSw2ICs1NSw4IEBAIHN0cnVjdCB2YzRfY3J0YyB7CiAJdTggbHV0X3JbMjU2 XTsKIAl1OCBsdXRfZ1syNTZdOwogCXU4IGx1dF9iWzI1Nl07CisJLyogU2l6ZSBpbiBwaXhlbHMg b2YgdGhlIENPQiBtZW1vcnkgYWxsb2NhdGVkIHRvIHRoaXMgQ1JUQy4gKi8KKwl1MzIgY29iX3Np emU7CiAKIAlzdHJ1Y3QgZHJtX3BlbmRpbmdfdmJsYW5rX2V2ZW50ICpldmVudDsKIH07CkBAIC0x OTUsOCArMTk3LDcgQEAgaW50IHZjNF9jcnRjX2dldF9zY2Fub3V0cG9zKHN0cnVjdCBkcm1fZGV2 aWNlICpkZXYsIHVuc2lnbmVkIGludCBjcnRjX2lkLAogCQkqaHBvcyA9IDA7CiAKIAkvKiBUaGlz IGlzIHRoZSBvZmZzZXQgd2UgbmVlZCBmb3IgdHJhbnNsYXRpbmcgaHZzIC0+IHB2IHNjYW5vdXQg cG9zLiAqLwotCS8qIFhYWCBGaW5kIHByb3BlciBmb3JtdWxhIGZyb20gaHcgZG9jcyBpbnN0ZWFk IG9mIGd1ZXNzdGltYXRpbmc/ICovCi0JZmlmb19saW5lcyA9IDIwNDggKiA3IC8gbW9kZS0+Y3J0 Y19oZGlzcGxheTsKKwlmaWZvX2xpbmVzID0gdmM0X2NydGMtPmNvYl9zaXplIC8gbW9kZS0+Y3J0 Y19oZGlzcGxheTsKIAogCWlmIChmaWZvX2xpbmVzID4gMCkKIAkJcmV0IHw9IERSTV9TQ0FOT1VU UE9TX1ZBTElEOwpAQCAtODczLDYgKzg3NCwyMiBAQCBzdGF0aWMgdm9pZCB2YzRfc2V0X2NydGNf cG9zc2libGVfbWFza3Moc3RydWN0IGRybV9kZXZpY2UgKmRybSwKIAl9CiB9CiAKK3N0YXRpYyB2 b2lkCit2YzRfY3J0Y19nZXRfY29iX2FsbG9jYXRpb24oc3RydWN0IHZjNF9jcnRjICp2YzRfY3J0 YykKK3sKKwlzdHJ1Y3QgZHJtX2RldmljZSAqZHJtID0gdmM0X2NydGMtPmJhc2UuZGV2OworCXN0 cnVjdCB2YzRfZGV2ICp2YzQgPSB0b192YzRfZGV2KGRybSk7CisJdTMyIGRpc3BiYXNlID0gSFZT X1JFQUQoU0NBTEVSX0RJU1BCQVNFWCh2YzRfY3J0Yy0+Y2hhbm5lbCkpOworCS8qIFRvcC9iYXNl IGFyZSBzdXBwb3NlZCB0byBiZSA0LXBpeGVsIGFsaWduZWQsIGJ1dCB0aGUKKwkgKiBSYXNwYmVy cnkgUGkgZmlybXdhcmUgZmlsbHMgdGhlIGxvdyBiaXRzICh3aGljaCBhcmUKKwkgKiBwcmVzdW1h Ymx5IGlnbm9yZWQpLgorCSAqLworCXUzMiB0b3AgPSBWQzRfR0VUX0ZJRUxEKGRpc3BiYXNlLCBT Q0FMRVJfRElTUEJBU0VYX1RPUCkgJiB+MzsKKwl1MzIgYmFzZSA9IFZDNF9HRVRfRklFTEQoZGlz cGJhc2UsIFNDQUxFUl9ESVNQQkFTRVhfQkFTRSkgJiB+MzsKKworCXZjNF9jcnRjLT5jb2Jfc2l6 ZSA9IHRvcCAtIGJhc2UgKyA0OworfQorCiBzdGF0aWMgaW50IHZjNF9jcnRjX2JpbmQoc3RydWN0 IGRldmljZSAqZGV2LCBzdHJ1Y3QgZGV2aWNlICptYXN0ZXIsIHZvaWQgKmRhdGEpCiB7CiAJc3Ry dWN0IHBsYXRmb3JtX2RldmljZSAqcGRldiA9IHRvX3BsYXRmb3JtX2RldmljZShkZXYpOwpAQCAt OTQ5LDYgKzk2Niw4IEBAIHN0YXRpYyBpbnQgdmM0X2NydGNfYmluZChzdHJ1Y3QgZGV2aWNlICpk ZXYsIHN0cnVjdCBkZXZpY2UgKm1hc3Rlciwgdm9pZCAqZGF0YSkKIAkJY3J0Yy0+Y3Vyc29yID0g Y3Vyc29yX3BsYW5lOwogCX0KIAorCXZjNF9jcnRjX2dldF9jb2JfYWxsb2NhdGlvbih2YzRfY3J0 Yyk7CisKIAlDUlRDX1dSSVRFKFBWX0lOVEVOLCAwKTsKIAlDUlRDX1dSSVRFKFBWX0lOVFNUQVQs IFBWX0lOVF9WRlBfU1RBUlQpOwogCXJldCA9IGRldm1fcmVxdWVzdF9pcnEoZGV2LCBwbGF0Zm9y bV9nZXRfaXJxKHBkZXYsIDApLApkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL3ZjNC92YzRf cmVncy5oIGIvZHJpdmVycy9ncHUvZHJtL3ZjNC92YzRfcmVncy5oCmluZGV4IDYzY2RjMjhmZjdi Yi4uMTYwOTQyYTkxODBlIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vdmM0L3ZjNF9yZWdz LmgKKysrIGIvZHJpdmVycy9ncHUvZHJtL3ZjNC92YzRfcmVncy5oCkBAIC0zNjYsNyArMzY2LDYg QEAKICMgZGVmaW5lIFNDQUxFUl9ESVNQQktHTkRfRklMTAkJCUJJVCgyNCkKIAogI2RlZmluZSBT Q0FMRVJfRElTUFNUQVQwICAgICAgICAgICAgICAgICAgICAgICAgMHgwMDAwMDA0OAotI2RlZmlu ZSBTQ0FMRVJfRElTUEJBU0UwICAgICAgICAgICAgICAgICAgICAgICAgMHgwMDAwMDA0YwogIyBk ZWZpbmUgU0NBTEVSX0RJU1BTVEFUWF9NT0RFX01BU0sJCVZDNF9NQVNLKDMxLCAzMCkKICMgZGVm aW5lIFNDQUxFUl9ESVNQU1RBVFhfTU9ERV9TSElGVAkJMzAKICMgZGVmaW5lIFNDQUxFUl9ESVNQ U1RBVFhfTU9ERV9ESVNBQkxFRAkJMApAQCAtMzc5LDYgKzM3OCwyMCBAQAogIyBkZWZpbmUgU0NB TEVSX0RJU1BTVEFUWF9GUkFNRV9DT1VOVF9TSElGVAkxMgogIyBkZWZpbmUgU0NBTEVSX0RJU1BT VEFUWF9MSU5FX01BU0sJCVZDNF9NQVNLKDExLCAwKQogIyBkZWZpbmUgU0NBTEVSX0RJU1BTVEFU WF9MSU5FX1NISUZUCQkwCisKKyNkZWZpbmUgU0NBTEVSX0RJU1BCQVNFMCAgICAgICAgICAgICAg ICAgICAgICAgIDB4MDAwMDAwNGMKKy8qIExhc3QgcGl4ZWwgaW4gdGhlIENPQiAoZGlzcGxheSBG SUZPIG1lbW9yeSkgYWxsb2NhdGVkIHRvIHRoaXMgSFZTCisgKiBjaGFubmVsLiAgTXVzdCBiZSA0 LXBpeGVsIGFsaWduZWQgKGFuZCB0aHVzIDQgcGl4ZWxzIGxlc3MgdGhhbiB0aGUKKyAqIG5leHQg Q09CIGJhc2UpLgorICovCisjIGRlZmluZSBTQ0FMRVJfRElTUEJBU0VYX1RPUF9NQVNLCQlWQzRf TUFTSygzMSwgMTYpCisjIGRlZmluZSBTQ0FMRVJfRElTUEJBU0VYX1RPUF9TSElGVAkJMTYKKy8q IEZpcnN0IHBpeGVsIGluIHRoZSBDT0IgKGRpc3BsYXkgRklGTyBtZW1vcnkpIGFsbG9jYXRlZCB0 byB0aGlzIEhWUworICogY2hhbm5lbC4gIE11c3QgYmUgNC1waXhlbCBhbGlnbmVkLgorICovCisj IGRlZmluZSBTQ0FMRVJfRElTUEJBU0VYX0JBU0VfTUFTSwkJVkM0X01BU0soMTUsIDApCisjIGRl ZmluZSBTQ0FMRVJfRElTUEJBU0VYX0JBU0VfU0hJRlQJCTAKKwogI2RlZmluZSBTQ0FMRVJfRElT UENUUkwxICAgICAgICAgICAgICAgICAgICAgICAgMHgwMDAwMDA1MAogI2RlZmluZSBTQ0FMRVJf RElTUEJLR05EMSAgICAgICAgICAgICAgICAgICAgICAgMHgwMDAwMDA1NAogI2RlZmluZSBTQ0FM RVJfRElTUEJLR05EWCh4KQkJCShTQ0FMRVJfRElTUEJLR05EMCArICAgICAgICBcCkBAIC0zODks NiArNDAyLDkgQEAKIAkJCQkJCSAoeCkgKiAoU0NBTEVSX0RJU1BTVEFUMSAtIFwKIAkJCQkJCQlT Q0FMRVJfRElTUFNUQVQwKSkKICNkZWZpbmUgU0NBTEVSX0RJU1BCQVNFMSAgICAgICAgICAgICAg ICAgICAgICAgIDB4MDAwMDAwNWMKKyNkZWZpbmUgU0NBTEVSX0RJU1BCQVNFWCh4KQkJCShTQ0FM RVJfRElTUEJBU0UwICsgICAgICAgIFwKKwkJCQkJCSAoeCkgKiAoU0NBTEVSX0RJU1BCQVNFMSAt IFwKKwkJCQkJCQlTQ0FMRVJfRElTUEJBU0UwKSkKICNkZWZpbmUgU0NBTEVSX0RJU1BDVFJMMiAg ICAgICAgICAgICAgICAgICAgICAgIDB4MDAwMDAwNjAKICNkZWZpbmUgU0NBTEVSX0RJU1BDVFJM WCh4KQkJCShTQ0FMRVJfRElTUENUUkwwICsgICAgICAgIFwKIAkJCQkJCSAoeCkgKiAoU0NBTEVS X0RJU1BDVFJMMSAtIFwKLS0gCjIuOC4xCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fXwpkcmktZGV2ZWwgbWFpbGluZyBsaXN0CmRyaS1kZXZlbEBsaXN0cy5m cmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0 aW5mby9kcmktZGV2ZWwK