From: Thierry Reding Subject: [PATCH 1/2] fixup! drm: Stop using linedur_ns and pixeldur_ns for vblank timestamps Date: Thu, 24 Sep 2015 12:23:27 +0200 Message-ID: <1443090208-15977-2-git-send-email-thierry.reding@gmail.com> References: <1443090208-15977-1-git-send-email-thierry.reding@gmail.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mail-pa0-f41.google.com (mail-pa0-f41.google.com [209.85.220.41]) by gabe.freedesktop.org (Postfix) with ESMTPS id 565EF6E7C9 for ; Thu, 24 Sep 2015 03:23:36 -0700 (PDT) Received: by pacgz1 with SMTP id gz1so2869237pac.3 for ; Thu, 24 Sep 2015 03:23:36 -0700 (PDT) In-Reply-To: <1443090208-15977-1-git-send-email-thierry.reding@gmail.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: Daniel Vetter Cc: dri-devel@lists.freedesktop.org List-Id: dri-devel@lists.freedesktop.org RnJvbTogVGhpZXJyeSBSZWRpbmcgPHRyZWRpbmdAbnZpZGlhLmNvbT4KCi0tLQogZHJpdmVycy9n cHUvZHJtL2FtZC9hbWRncHUvYW1kZ3B1X2Rpc3BsYXkuYyB8IDExICsrKysrKy0tLS0tCiBkcml2 ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9hbWRncHVfbW9kZS5oICAgIHwgIDMgKystCiAyIGZpbGVz IGNoYW5nZWQsIDggaW5zZXJ0aW9ucygrKSwgNiBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9k cml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9hbWRncHVfZGlzcGxheS5jIGIvZHJpdmVycy9ncHUv ZHJtL2FtZC9hbWRncHUvYW1kZ3B1X2Rpc3BsYXkuYwppbmRleCBlM2Q3MDc3MmI1MzEuLjliMzRh MzQxMGMzMiAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvYW1kZ3B1X2Rp c3BsYXkuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9hbWRncHVfZGlzcGxheS5j CkBAIC03NDUsNyArNzQ1LDggQEAgYm9vbCBhbWRncHVfY3J0Y19zY2FsaW5nX21vZGVfZml4dXAo c3RydWN0IGRybV9jcnRjICpjcnRjLAogICoKICAqLwogaW50IGFtZGdwdV9nZXRfY3J0Y19zY2Fu b3V0cG9zKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsIGludCBjcnRjLCB1bnNpZ25lZCBpbnQgZmxh Z3MsCi0JCQkgICAgICAgaW50ICp2cG9zLCBpbnQgKmhwb3MsIGt0aW1lX3QgKnN0aW1lLCBrdGlt ZV90ICpldGltZSkKKwkJCSAgICAgICBpbnQgKnZwb3MsIGludCAqaHBvcywga3RpbWVfdCAqc3Rp bWUsIGt0aW1lX3QgKmV0aW1lLAorCQkJICAgICAgIGNvbnN0IHN0cnVjdCBkcm1fZGlzcGxheV9t b2RlICptb2RlKQogewogCXUzMiB2YmwgPSAwLCBwb3NpdGlvbiA9IDA7CiAJaW50IHZibF9zdGFy dCwgdmJsX2VuZCwgdnRvdGFsLCByZXQgPSAwOwpAQCAtNzgxLDcgKzc4Miw3IEBAIGludCBhbWRn cHVfZ2V0X2NydGNfc2Nhbm91dHBvcyhzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LCBpbnQgY3J0Yywg dW5zaWduZWQgaW50IGZsCiAJfQogCWVsc2UgewogCQkvKiBObzogRmFrZSBzb21ldGhpbmcgcmVh c29uYWJsZSB3aGljaCBnaXZlcyBhdCBsZWFzdCBvayByZXN1bHRzLiAqLwotCQl2Ymxfc3RhcnQg PSBhZGV2LT5tb2RlX2luZm8uY3J0Y3NbY3J0Y10tPmJhc2UuaHdtb2RlLmNydGNfdmRpc3BsYXk7 CisJCXZibF9zdGFydCA9IG1vZGUtPmNydGNfdmRpc3BsYXk7CiAJCXZibF9lbmQgPSAwOwogCX0K IApAQCAtNzk3LDcgKzc5OCw3IEBAIGludCBhbWRncHVfZ2V0X2NydGNfc2Nhbm91dHBvcyhzdHJ1 Y3QgZHJtX2RldmljZSAqZGV2LCBpbnQgY3J0YywgdW5zaWduZWQgaW50IGZsCiAKIAkvKiBJbnNp ZGUgInVwcGVyIHBhcnQiIG9mIHZibGFuayBhcmVhPyBBcHBseSBjb3JyZWN0aXZlIG9mZnNldCBp ZiBzbzogKi8KIAlpZiAoaW5fdmJsICYmICgqdnBvcyA+PSB2Ymxfc3RhcnQpKSB7Ci0JCXZ0b3Rh bCA9IGFkZXYtPm1vZGVfaW5mby5jcnRjc1tjcnRjXS0+YmFzZS5od21vZGUuY3J0Y192dG90YWw7 CisJCXZ0b3RhbCA9IG1vZGUtPmNydGNfdnRvdGFsOwogCQkqdnBvcyA9ICp2cG9zIC0gdnRvdGFs OwogCX0KIApAQCAtODE5LDggKzgyMCw4IEBAIGludCBhbWRncHVfZ2V0X2NydGNfc2Nhbm91dHBv cyhzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LCBpbnQgY3J0YywgdW5zaWduZWQgaW50IGZsCiAJICog V2Ugb25seSBkbyB0aGlzIGlmIERSTV9DQUxMRURfRlJPTV9WQkxJUlEuCiAJICovCiAJaWYgKChm bGFncyAmIERSTV9DQUxMRURfRlJPTV9WQkxJUlEpICYmICFpbl92YmwpIHsKLQkJdmJsX3N0YXJ0 ID0gYWRldi0+bW9kZV9pbmZvLmNydGNzW2NydGNdLT5iYXNlLmh3bW9kZS5jcnRjX3ZkaXNwbGF5 OwotCQl2dG90YWwgPSBhZGV2LT5tb2RlX2luZm8uY3J0Y3NbY3J0Y10tPmJhc2UuaHdtb2RlLmNy dGNfdnRvdGFsOworCQl2Ymxfc3RhcnQgPSBtb2RlLT5jcnRjX3ZkaXNwbGF5OworCQl2dG90YWwg PSBtb2RlLT5jcnRjX3Z0b3RhbDsKIAogCQlpZiAodmJsX3N0YXJ0IC0gKnZwb3MgPCB2dG90YWwg LyAxMDApIHsKIAkJCSp2cG9zIC09IHZ0b3RhbDsKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2Ry bS9hbWQvYW1kZ3B1L2FtZGdwdV9tb2RlLmggYi9kcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9h bWRncHVfbW9kZS5oCmluZGV4IDY0ZWZlNWI1MmU2NS4uMmIwMzQyNWY5NzQwIDEwMDY0NAotLS0g YS9kcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9hbWRncHVfbW9kZS5oCisrKyBiL2RyaXZlcnMv Z3B1L2RybS9hbWQvYW1kZ3B1L2FtZGdwdV9tb2RlLmgKQEAgLTU0Myw3ICs1NDMsOCBAQCB2b2lk IGFtZGdwdV9lbmNvZGVyX3NldF9hY3RpdmVfZGV2aWNlKHN0cnVjdCBkcm1fZW5jb2RlciAqZW5j b2Rlcik7CiBpbnQgYW1kZ3B1X2dldF9jcnRjX3NjYW5vdXRwb3Moc3RydWN0IGRybV9kZXZpY2Ug KmRldiwgaW50IGNydGMsCiAJCQkJICAgICAgdW5zaWduZWQgaW50IGZsYWdzLAogCQkJCSAgICAg IGludCAqdnBvcywgaW50ICpocG9zLCBrdGltZV90ICpzdGltZSwKLQkJCQkgICAgICBrdGltZV90 ICpldGltZSk7CisJCQkJICAgICAga3RpbWVfdCAqZXRpbWUsCisJCQkJICAgICAgY29uc3Qgc3Ry dWN0IGRybV9kaXNwbGF5X21vZGUgKm1vZGUpOwogCiBpbnQgYW1kZ3B1X2ZyYW1lYnVmZmVyX2lu aXQoc3RydWN0IGRybV9kZXZpY2UgKmRldiwKIAkJCSAgICAgc3RydWN0IGFtZGdwdV9mcmFtZWJ1 ZmZlciAqcmZiLAotLSAKMi41LjAKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fCmRyaS1kZXZlbCBtYWlsaW5nIGxpc3QKZHJpLWRldmVsQGxpc3RzLmZyZWVk ZXNrdG9wLm9yZwpodHRwOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8v ZHJpLWRldmVsCg==