From: Thierry Reding Subject: [PATCH] drm/radeon: Update radeon_get_vblank_counter_kms() Date: Wed, 16 Dec 2015 15:31:47 +0100 Message-ID: <1450276307-13032-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-wm0-f52.google.com (mail-wm0-f52.google.com [74.125.82.52]) by gabe.freedesktop.org (Postfix) with ESMTPS id F342F6E8F5 for ; Wed, 16 Dec 2015 06:31:51 -0800 (PST) Received: by mail-wm0-f52.google.com with SMTP id p187so3813264wmp.1 for ; Wed, 16 Dec 2015 06:31:51 -0800 (PST) List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: Alex Deucher , =?UTF-8?q?Christian=20K=C3=B6nig?= Cc: dri-devel@lists.freedesktop.org List-Id: dri-devel@lists.freedesktop.org RnJvbTogVGhpZXJyeSBSZWRpbmcgPHRyZWRpbmdAbnZpZGlhLmNvbT4KCkNvbW1pdCA4OGU3Mjcx N2MyZGUgKCJkcm0vaXJxOiBVc2UgdW5zaWduZWQgaW50IHBpcGUgaW4gcHVibGljIEFQSSIpCnVw ZGF0ZWQgdGhlIHByb3RvdHlwZSBvZiB0aGlzIGZ1bmN0aW9uIGJ1dCBub3QgdGhlIGltcGxlbWVu dGF0aW9uLiBUaGlzCndhc24ndCBub3RpY2VkIGV2ZW4gdGhyb3VnaCBjb21waWxlIHRlc3RzIGJl Y2F1c2UgdGhlIHByb3RvdHlwZSBpcyBwYXJ0Cm9mIHRoZSBzb3VyY2UgZmlsZSB0aGF0IHVzZXMg aXQgYW5kIGhlbmNlIHRoZSBjb21waWxlciB3b24ndCBrbm93IHRoZQpwcm90b3R5cGUgd2hlbiBp dCBjb21waWxlcyB0aGUgaW1wbGVtZW50YXRpb24uCgpUaGUgcmlnaHQgdGhpbmcgd291bGQndmUg YmVlbiB0byBtb3ZlIHRoZSBwcm90b3R5cGUgdG8gYSBoZWFkZXIgdGhhdCdzCmluY2x1ZGVkIGlu IHJhZGVvbl9rbXMuYyBzbyB0aGF0IHRoZSBpbXBsZW1lbnRhdGlvbiBzaWduYXR1cmUgY291bGQg YmUKY2hlY2tlZCBhZ2FpbnN0IGl0LCBidXQgdGhlIGNsb3Nlc3QgdGhpbmcgd291bGQndmUgYmVl biByYWRlb25fZHJ2LmgKYW5kIGluY2x1ZGluZyB0aGF0IHJlc3VsdHMgaW4gYSBsb3Qgb2YgYnVp bGQgZXJyb3JzLCBzbyB3ZSdsbCBsZWF2ZSBpdAphcyBpcyBmb3Igbm93LgoKQ2M6IENocmlzdGlh biBLw7ZuaWcgPGNocmlzdGlhbi5rb2VuaWdAYW1kLmNvbT4KQ2M6IEFsZXggRGV1Y2hlciA8YWxl eGFuZGVyLmRldWNoZXJAYW1kLmNvbT4KU2lnbmVkLW9mZi1ieTogVGhpZXJyeSBSZWRpbmcgPHRy ZWRpbmdAbnZpZGlhLmNvbT4KLS0tCk5vdGUgdGhhdCB0aGlzIGRvZXNuJ3QgcmVhbGx5IG5lZWQg dG8gZ28gaW50byBzdGFibGUgYmVjYXVzZSB0aGUKZ2VuZXJhdGVkIGNvZGUgc2hvdWxkIGJlIHRo ZSBzYW1lLgoKIGRyaXZlcnMvZ3B1L2RybS9yYWRlb24vcmFkZW9uX2ttcy5jIHwgMjQgKysrKysr KysrKysrLS0tLS0tLS0tLS0tCiAxIGZpbGUgY2hhbmdlZCwgMTIgaW5zZXJ0aW9ucygrKSwgMTIg ZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL3JhZGVvbi9yYWRlb25f a21zLmMgYi9kcml2ZXJzL2dwdS9kcm0vcmFkZW9uL3JhZGVvbl9rbXMuYwppbmRleCBkMjkwYThh MDkwMzYuLjRmYWI0NGUwZjM2YiAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL3JhZGVvbi9y YWRlb25fa21zLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL3JhZGVvbi9yYWRlb25fa21zLmMKQEAg LTc0OCwxOSArNzQ4LDE5IEBAIHZvaWQgcmFkZW9uX2RyaXZlcl9wcmVjbG9zZV9rbXMoc3RydWN0 IGRybV9kZXZpY2UgKmRldiwKICAqIHJhZGVvbl9nZXRfdmJsYW5rX2NvdW50ZXJfa21zIC0gZ2V0 IGZyYW1lIGNvdW50CiAgKgogICogQGRldjogZHJtIGRldiBwb2ludGVyCi0gKiBAY3J0YzogY3J0 YyB0byBnZXQgdGhlIGZyYW1lIGNvdW50IGZyb20KKyAqIEBwaXBlOiBjcnRjIHRvIGdldCB0aGUg ZnJhbWUgY291bnQgZnJvbQogICoKICAqIEdldHMgdGhlIGZyYW1lIGNvdW50IG9uIHRoZSByZXF1 ZXN0ZWQgY3J0YyAoYWxsIGFzaWNzKS4KICAqIFJldHVybnMgZnJhbWUgY291bnQgb24gc3VjY2Vz cywgLUVJTlZBTCBvbiBmYWlsdXJlLgogICovCi11MzIgcmFkZW9uX2dldF92YmxhbmtfY291bnRl cl9rbXMoc3RydWN0IGRybV9kZXZpY2UgKmRldiwgaW50IGNydGMpCit1MzIgcmFkZW9uX2dldF92 YmxhbmtfY291bnRlcl9rbXMoc3RydWN0IGRybV9kZXZpY2UgKmRldiwgdW5zaWduZWQgaW50IHBp cGUpCiB7CiAJaW50IHZwb3MsIGhwb3MsIHN0YXQ7CiAJdTMyIGNvdW50OwogCXN0cnVjdCByYWRl b25fZGV2aWNlICpyZGV2ID0gZGV2LT5kZXZfcHJpdmF0ZTsKIAotCWlmIChjcnRjIDwgMCB8fCBj cnRjID49IHJkZXYtPm51bV9jcnRjKSB7Ci0JCURSTV9FUlJPUigiSW52YWxpZCBjcnRjICVkXG4i LCBjcnRjKTsKKwlpZiAocGlwZSA8IDAgfHwgcGlwZSA+PSByZGV2LT5udW1fY3J0YykgeworCQlE Uk1fRVJST1IoIkludmFsaWQgY3J0YyAldVxuIiwgcGlwZSk7CiAJCXJldHVybiAtRUlOVkFMOwog CX0KIApAQCAtNzcyLDI5ICs3NzIsMjkgQEAgdTMyIHJhZGVvbl9nZXRfdmJsYW5rX2NvdW50ZXJf a21zKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsIGludCBjcnRjKQogCSAqIGFuZCBzdGFydCBvZiB2 c3luYywgc28gdnBvcyA+PSAwIG1lYW5zIHRvIGJ1bXAgdGhlIGh3IGZyYW1lIGNvdW50ZXIKIAkg KiByZXN1bHQgYnkgMSB0byBnaXZlIHRoZSBwcm9wZXIgYXBwZWFyYW5jZSB0byBjYWxsZXIuCiAJ ICovCi0JaWYgKHJkZXYtPm1vZGVfaW5mby5jcnRjc1tjcnRjXSkgeworCWlmIChyZGV2LT5tb2Rl X2luZm8uY3J0Y3NbcGlwZV0pIHsKIAkJLyogUmVwZWF0IHJlYWRvdXQgaWYgbmVlZGVkIHRvIHBy b3ZpZGUgc3RhYmxlIHJlc3VsdCBpZgogCQkgKiB3ZSBjcm9zcyBzdGFydCBvZiB2c3luYyBkdXJp bmcgdGhlIHF1ZXJpZXMuCiAJCSAqLwogCQlkbyB7Ci0JCQljb3VudCA9IHJhZGVvbl9nZXRfdmJs YW5rX2NvdW50ZXIocmRldiwgY3J0Yyk7CisJCQljb3VudCA9IHJhZGVvbl9nZXRfdmJsYW5rX2Nv dW50ZXIocmRldiwgcGlwZSk7CiAJCQkvKiBBc2sgcmFkZW9uX2dldF9jcnRjX3NjYW5vdXRwb3Mg dG8gcmV0dXJuIHZwb3MgYXMKIAkJCSAqIGRpc3RhbmNlIHRvIHN0YXJ0IG9mIHZibGFuaywgaW5z dGVhZCBvZiByZWd1bGFyCiAJCQkgKiB2ZXJ0aWNhbCBzY2Fub3V0IHBvcy4KIAkJCSAqLwogCQkJ c3RhdCA9IHJhZGVvbl9nZXRfY3J0Y19zY2Fub3V0cG9zKAotCQkJCWRldiwgY3J0YywgR0VUX0RJ U1RBTkNFX1RPX1ZCTEFOS1NUQVJULAorCQkJCWRldiwgcGlwZSwgR0VUX0RJU1RBTkNFX1RPX1ZC TEFOS1NUQVJULAogCQkJCSZ2cG9zLCAmaHBvcywgTlVMTCwgTlVMTCwKLQkJCQkmcmRldi0+bW9k ZV9pbmZvLmNydGNzW2NydGNdLT5iYXNlLmh3bW9kZSk7Ci0JCX0gd2hpbGUgKGNvdW50ICE9IHJh ZGVvbl9nZXRfdmJsYW5rX2NvdW50ZXIocmRldiwgY3J0YykpOworCQkJCSZyZGV2LT5tb2RlX2lu Zm8uY3J0Y3NbcGlwZV0tPmJhc2UuaHdtb2RlKTsKKwkJfSB3aGlsZSAoY291bnQgIT0gcmFkZW9u X2dldF92YmxhbmtfY291bnRlcihyZGV2LCBwaXBlKSk7CiAKIAkJaWYgKCgoc3RhdCAmIChEUk1f U0NBTk9VVFBPU19WQUxJRCB8IERSTV9TQ0FOT1VUUE9TX0FDQ1VSQVRFKSkgIT0KIAkJICAgIChE Uk1fU0NBTk9VVFBPU19WQUxJRCB8IERSTV9TQ0FOT1VUUE9TX0FDQ1VSQVRFKSkpIHsKIAkJCURS TV9ERUJVR19WQkwoIlF1ZXJ5IGZhaWxlZCEgc3RhdCAlZFxuIiwgc3RhdCk7CiAJCX0KIAkJZWxz ZSB7Ci0JCQlEUk1fREVCVUdfVkJMKCJjcnRjICVkOiBkaXN0IGZyb20gdmJsYW5rIHN0YXJ0ICVk XG4iLAotCQkJCSAgICAgIGNydGMsIHZwb3MpOworCQkJRFJNX0RFQlVHX1ZCTCgiY3J0YyAldTog ZGlzdCBmcm9tIHZibGFuayBzdGFydCAlZFxuIiwKKwkJCQkgICAgICBwaXBlLCB2cG9zKTsKIAog CQkJLyogQnVtcCBjb3VudGVyIGlmIHdlIGFyZSBhdCA+PSBsZWFkaW5nIGVkZ2Ugb2YgdmJsYW5r LAogCQkJICogYnV0IGJlZm9yZSB2c3luYyB3aGVyZSB2cG9zIHdvdWxkIHR1cm4gbmVnYXRpdmUg YW5kCkBAIC04MDYsNyArODA2LDcgQEAgdTMyIHJhZGVvbl9nZXRfdmJsYW5rX2NvdW50ZXJfa21z KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsIGludCBjcnRjKQogCX0KIAllbHNlIHsKIAkgICAgLyog RmFsbGJhY2sgdG8gdXNlIHZhbHVlIGFzIGlzLiAqLwotCSAgICBjb3VudCA9IHJhZGVvbl9nZXRf dmJsYW5rX2NvdW50ZXIocmRldiwgY3J0Yyk7CisJICAgIGNvdW50ID0gcmFkZW9uX2dldF92Ymxh bmtfY291bnRlcihyZGV2LCBwaXBlKTsKIAkgICAgRFJNX0RFQlVHX1ZCTCgiTlVMTCBtb2RlIGlu Zm8hIFJldHVybmVkIGNvdW50IG1heSBiZSB3cm9uZy5cbiIpOwogCX0KIAotLSAKMi41LjAKCl9f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCmRyaS1kZXZlbCBt YWlsaW5nIGxpc3QKZHJpLWRldmVsQGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwOi8vbGlzdHMu ZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vZHJpLWRldmVsCg==