From mboxrd@z Thu Jan 1 00:00:00 1970 From: ville.syrjala@linux.intel.com Subject: [PATCH 4/9] drm: Move drm_update_vblank_count() Date: Mon, 26 May 2014 14:46:27 +0300 Message-ID: <1401104792-26560-5-git-send-email-ville.syrjala@linux.intel.com> References: <1401104792-26560-1-git-send-email-ville.syrjala@linux.intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <1401104792-26560-1-git-send-email-ville.syrjala@linux.intel.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" To: dri-devel@lists.freedesktop.org Cc: intel-gfx@lists.freedesktop.org List-Id: intel-gfx@lists.freedesktop.org RnJvbTogVmlsbGUgU3lyasOkbMOkIDx2aWxsZS5zeXJqYWxhQGxpbnV4LmludGVsLmNvbT4KCk1v dmUgZHJtX3VwZGF0ZV92YmxhbmtfY291bnQoKSB0byBhdm9pZCBmb3J3YXJkIGEgZGVjbGFyYXRp b24uCk5vIGZ1bmN0aW9uYWwgY2hhbmdlLgoKU2lnbmVkLW9mZi1ieTogVmlsbGUgU3lyasOkbMOk IDx2aWxsZS5zeXJqYWxhQGxpbnV4LmludGVsLmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vZHJt X2lycS5jIHwgMTI4ICsrKysrKysrKysrKysrKysrKysrKysrLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0KIDEgZmlsZSBjaGFuZ2VkLCA2NCBpbnNlcnRpb25zKCspLCA2NCBkZWxldGlvbnMoLSkKCmRp ZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vZHJtX2lycS5jIGIvZHJpdmVycy9ncHUvZHJtL2Ry bV9pcnEuYwppbmRleCA2ZmE3NDc0Li5lMTJjZjY5IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9k cm0vZHJtX2lycS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9kcm1faXJxLmMKQEAgLTU1LDYgKzU1 LDcwIEBACiAgKi8KICNkZWZpbmUgRFJNX1JFRFVOREFOVF9WQkxJUlFfVEhSRVNIX05TIDEwMDAw MDAKIAorLyoqCisgKiBkcm1fdXBkYXRlX3ZibGFua19jb3VudCAtIHVwZGF0ZSB0aGUgbWFzdGVy IHZibGFuayBjb3VudGVyCisgKiBAZGV2OiBEUk0gZGV2aWNlCisgKiBAY3J0YzogY291bnRlciB0 byB1cGRhdGUKKyAqCisgKiBDYWxsIGJhY2sgaW50byB0aGUgZHJpdmVyIHRvIHVwZGF0ZSB0aGUg YXBwcm9wcmlhdGUgdmJsYW5rIGNvdW50ZXIKKyAqIChzcGVjaWZpZWQgYnkgQGNydGMpLiAgRGVh bCB3aXRoIHdyYXBhcm91bmQsIGlmIGl0IG9jY3VycmVkLCBhbmQKKyAqIHVwZGF0ZSB0aGUgbGFz dCByZWFkIHZhbHVlIHNvIHdlIGNhbiBkZWFsIHdpdGggd3JhcGFyb3VuZCBvbiB0aGUgbmV4dAor ICogY2FsbCBpZiBuZWNlc3NhcnkuCisgKgorICogT25seSBuZWNlc3Nhcnkgd2hlbiBnb2luZyBm cm9tIG9mZi0+b24sIHRvIGFjY291bnQgZm9yIGZyYW1lcyB3ZQorICogZGlkbid0IGdldCBhbiBp bnRlcnJ1cHQgZm9yLgorICoKKyAqIE5vdGU6IGNhbGxlciBtdXN0IGhvbGQgZGV2LT52YmxfbG9j ayBzaW5jZSB0aGlzIHJlYWRzICYgd3JpdGVzCisgKiBkZXZpY2UgdmJsYW5rIGZpZWxkcy4KKyAq Lworc3RhdGljIHZvaWQgZHJtX3VwZGF0ZV92YmxhbmtfY291bnQoc3RydWN0IGRybV9kZXZpY2Ug KmRldiwgaW50IGNydGMpCit7CisJdTMyIGN1cl92YmxhbmssIGRpZmYsIHRzbG90LCByYzsKKwlz dHJ1Y3QgdGltZXZhbCB0X3ZibGFuazsKKworCS8qCisJICogSW50ZXJydXB0cyB3ZXJlIGRpc2Fi bGVkIHByaW9yIHRvIHRoaXMgY2FsbCwgc28gZGVhbCB3aXRoIGNvdW50ZXIKKwkgKiB3cmFwIGlm IG5lZWRlZC4KKwkgKiBOT1RFISAgSXQncyBwb3NzaWJsZSB3ZSBsb3N0IGEgZnVsbCBkZXYtPm1h eF92YmxhbmtfY291bnQgZXZlbnRzCisJICogaGVyZSBpZiB0aGUgcmVnaXN0ZXIgaXMgc21hbGwg b3Igd2UgaGFkIHZibGFuayBpbnRlcnJ1cHRzIG9mZiBmb3IKKwkgKiBhIGxvbmcgdGltZS4KKwkg KgorCSAqIFdlIHJlcGVhdCB0aGUgaGFyZHdhcmUgdmJsYW5rIGNvdW50ZXIgJiB0aW1lc3RhbXAg cXVlcnkgdW50aWwKKwkgKiB3ZSBnZXQgY29uc2lzdGVudCByZXN1bHRzLiBUaGlzIHRvIHByZXZl bnQgcmFjZXMgYmV0d2VlbiBncHUKKwkgKiB1cGRhdGluZyBpdHMgaGFyZHdhcmUgY291bnRlciB3 aGlsZSB3ZSBhcmUgcmV0cmlldmluZyB0aGUKKwkgKiBjb3JyZXNwb25kaW5nIHZibGFuayB0aW1l c3RhbXAuCisJICovCisJZG8geworCQljdXJfdmJsYW5rID0gZGV2LT5kcml2ZXItPmdldF92Ymxh bmtfY291bnRlcihkZXYsIGNydGMpOworCQlyYyA9IGRybV9nZXRfbGFzdF92Ymx0aW1lc3RhbXAo ZGV2LCBjcnRjLCAmdF92YmxhbmssIDApOworCX0gd2hpbGUgKGN1cl92YmxhbmsgIT0gZGV2LT5k cml2ZXItPmdldF92YmxhbmtfY291bnRlcihkZXYsIGNydGMpKTsKKworCS8qIERlYWwgd2l0aCBj b3VudGVyIHdyYXAgKi8KKwlkaWZmID0gY3VyX3ZibGFuayAtIGRldi0+dmJsYW5rW2NydGNdLmxh c3Q7CisJaWYgKGN1cl92YmxhbmsgPCBkZXYtPnZibGFua1tjcnRjXS5sYXN0KSB7CisJCWRpZmYg Kz0gZGV2LT5tYXhfdmJsYW5rX2NvdW50OworCisJCURSTV9ERUJVRygibGFzdF92YmxhbmtbJWRd PTB4JXgsIGN1cl92Ymxhbms9MHgleCA9PiBkaWZmPTB4JXhcbiIsCisJCQkgIGNydGMsIGRldi0+ dmJsYW5rW2NydGNdLmxhc3QsIGN1cl92YmxhbmssIGRpZmYpOworCX0KKworCURSTV9ERUJVRygi ZW5hYmxpbmcgdmJsYW5rIGludGVycnVwdHMgb24gY3J0YyAlZCwgbWlzc2VkICVkXG4iLAorCQkg IGNydGMsIGRpZmYpOworCisJLyogUmVpbml0aWFsaXplIGNvcnJlc3BvbmRpbmcgdmJsYW5rIHRp bWVzdGFtcCBpZiBoaWdoLXByZWNpc2lvbiBxdWVyeQorCSAqIGF2YWlsYWJsZS4gU2tpcCB0aGlz IHN0ZXAgaWYgcXVlcnkgdW5zdXBwb3J0ZWQgb3IgZmFpbGVkLiBXaWxsCisJICogcmVpbml0aWFs aXplIGRlbGF5ZWQgYXQgbmV4dCB2YmxhbmsgaW50ZXJydXB0IGluIHRoYXQgY2FzZS4KKwkgKi8K KwlpZiAocmMpIHsKKwkJdHNsb3QgPSBhdG9taWNfcmVhZCgmZGV2LT52YmxhbmtbY3J0Y10uY291 bnQpICsgZGlmZjsKKwkJdmJsYW5rdGltZXN0YW1wKGRldiwgY3J0YywgdHNsb3QpID0gdF92Ymxh bms7CisJfQorCisJc21wX21iX19iZWZvcmVfYXRvbWljX2luYygpOworCWF0b21pY19hZGQoZGlm ZiwgJmRldi0+dmJsYW5rW2NydGNdLmNvdW50KTsKKwlzbXBfbWJfX2FmdGVyX2F0b21pY19pbmMo KTsKK30KKwogLyoKICAqIERpc2FibGUgdmJsYW5rIGlycSdzIG9uIGNydGMsIG1ha2Ugc3VyZSB0 aGF0IGxhc3QgdmJsYW5rIGNvdW50CiAgKiBvZiBoYXJkd2FyZSBhbmQgY29ycmVzcG9uZGluZyBj b25zaXN0ZW50IHNvZnR3YXJlIHZibGFuayBjb3VudGVyCkBAIC03OTksNzAgKzg2Myw2IEBAIHZv aWQgZHJtX3NlbmRfdmJsYW5rX2V2ZW50KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsIGludCBjcnRj LAogRVhQT1JUX1NZTUJPTChkcm1fc2VuZF92YmxhbmtfZXZlbnQpOwogCiAvKioKLSAqIGRybV91 cGRhdGVfdmJsYW5rX2NvdW50IC0gdXBkYXRlIHRoZSBtYXN0ZXIgdmJsYW5rIGNvdW50ZXIKLSAq IEBkZXY6IERSTSBkZXZpY2UKLSAqIEBjcnRjOiBjb3VudGVyIHRvIHVwZGF0ZQotICoKLSAqIENh bGwgYmFjayBpbnRvIHRoZSBkcml2ZXIgdG8gdXBkYXRlIHRoZSBhcHByb3ByaWF0ZSB2Ymxhbmsg Y291bnRlcgotICogKHNwZWNpZmllZCBieSBAY3J0YykuICBEZWFsIHdpdGggd3JhcGFyb3VuZCwg aWYgaXQgb2NjdXJyZWQsIGFuZAotICogdXBkYXRlIHRoZSBsYXN0IHJlYWQgdmFsdWUgc28gd2Ug Y2FuIGRlYWwgd2l0aCB3cmFwYXJvdW5kIG9uIHRoZSBuZXh0Ci0gKiBjYWxsIGlmIG5lY2Vzc2Fy eS4KLSAqCi0gKiBPbmx5IG5lY2Vzc2FyeSB3aGVuIGdvaW5nIGZyb20gb2ZmLT5vbiwgdG8gYWNj b3VudCBmb3IgZnJhbWVzIHdlCi0gKiBkaWRuJ3QgZ2V0IGFuIGludGVycnVwdCBmb3IuCi0gKgot ICogTm90ZTogY2FsbGVyIG11c3QgaG9sZCBkZXYtPnZibF9sb2NrIHNpbmNlIHRoaXMgcmVhZHMg JiB3cml0ZXMKLSAqIGRldmljZSB2YmxhbmsgZmllbGRzLgotICovCi1zdGF0aWMgdm9pZCBkcm1f dXBkYXRlX3ZibGFua19jb3VudChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LCBpbnQgY3J0YykKLXsK LQl1MzIgY3VyX3ZibGFuaywgZGlmZiwgdHNsb3QsIHJjOwotCXN0cnVjdCB0aW1ldmFsIHRfdmJs YW5rOwotCi0JLyoKLQkgKiBJbnRlcnJ1cHRzIHdlcmUgZGlzYWJsZWQgcHJpb3IgdG8gdGhpcyBj YWxsLCBzbyBkZWFsIHdpdGggY291bnRlcgotCSAqIHdyYXAgaWYgbmVlZGVkLgotCSAqIE5PVEUh ICBJdCdzIHBvc3NpYmxlIHdlIGxvc3QgYSBmdWxsIGRldi0+bWF4X3ZibGFua19jb3VudCBldmVu dHMKLQkgKiBoZXJlIGlmIHRoZSByZWdpc3RlciBpcyBzbWFsbCBvciB3ZSBoYWQgdmJsYW5rIGlu dGVycnVwdHMgb2ZmIGZvcgotCSAqIGEgbG9uZyB0aW1lLgotCSAqCi0JICogV2UgcmVwZWF0IHRo ZSBoYXJkd2FyZSB2YmxhbmsgY291bnRlciAmIHRpbWVzdGFtcCBxdWVyeSB1bnRpbAotCSAqIHdl IGdldCBjb25zaXN0ZW50IHJlc3VsdHMuIFRoaXMgdG8gcHJldmVudCByYWNlcyBiZXR3ZWVuIGdw dQotCSAqIHVwZGF0aW5nIGl0cyBoYXJkd2FyZSBjb3VudGVyIHdoaWxlIHdlIGFyZSByZXRyaWV2 aW5nIHRoZQotCSAqIGNvcnJlc3BvbmRpbmcgdmJsYW5rIHRpbWVzdGFtcC4KLQkgKi8KLQlkbyB7 Ci0JCWN1cl92YmxhbmsgPSBkZXYtPmRyaXZlci0+Z2V0X3ZibGFua19jb3VudGVyKGRldiwgY3J0 Yyk7Ci0JCXJjID0gZHJtX2dldF9sYXN0X3ZibHRpbWVzdGFtcChkZXYsIGNydGMsICZ0X3ZibGFu aywgMCk7Ci0JfSB3aGlsZSAoY3VyX3ZibGFuayAhPSBkZXYtPmRyaXZlci0+Z2V0X3ZibGFua19j b3VudGVyKGRldiwgY3J0YykpOwotCi0JLyogRGVhbCB3aXRoIGNvdW50ZXIgd3JhcCAqLwotCWRp ZmYgPSBjdXJfdmJsYW5rIC0gZGV2LT52YmxhbmtbY3J0Y10ubGFzdDsKLQlpZiAoY3VyX3ZibGFu ayA8IGRldi0+dmJsYW5rW2NydGNdLmxhc3QpIHsKLQkJZGlmZiArPSBkZXYtPm1heF92Ymxhbmtf Y291bnQ7Ci0KLQkJRFJNX0RFQlVHKCJsYXN0X3ZibGFua1slZF09MHgleCwgY3VyX3ZibGFuaz0w eCV4ID0+IGRpZmY9MHgleFxuIiwKLQkJCSAgY3J0YywgZGV2LT52YmxhbmtbY3J0Y10ubGFzdCwg Y3VyX3ZibGFuaywgZGlmZik7Ci0JfQotCi0JRFJNX0RFQlVHKCJlbmFibGluZyB2YmxhbmsgaW50 ZXJydXB0cyBvbiBjcnRjICVkLCBtaXNzZWQgJWRcbiIsCi0JCSAgY3J0YywgZGlmZik7Ci0KLQkv KiBSZWluaXRpYWxpemUgY29ycmVzcG9uZGluZyB2YmxhbmsgdGltZXN0YW1wIGlmIGhpZ2gtcHJl Y2lzaW9uIHF1ZXJ5Ci0JICogYXZhaWxhYmxlLiBTa2lwIHRoaXMgc3RlcCBpZiBxdWVyeSB1bnN1 cHBvcnRlZCBvciBmYWlsZWQuIFdpbGwKLQkgKiByZWluaXRpYWxpemUgZGVsYXllZCBhdCBuZXh0 IHZibGFuayBpbnRlcnJ1cHQgaW4gdGhhdCBjYXNlLgotCSAqLwotCWlmIChyYykgewotCQl0c2xv dCA9IGF0b21pY19yZWFkKCZkZXYtPnZibGFua1tjcnRjXS5jb3VudCkgKyBkaWZmOwotCQl2Ymxh bmt0aW1lc3RhbXAoZGV2LCBjcnRjLCB0c2xvdCkgPSB0X3ZibGFuazsKLQl9Ci0KLQlzbXBfbWJf X2JlZm9yZV9hdG9taWNfaW5jKCk7Ci0JYXRvbWljX2FkZChkaWZmLCAmZGV2LT52YmxhbmtbY3J0 Y10uY291bnQpOwotCXNtcF9tYl9fYWZ0ZXJfYXRvbWljX2luYygpOwotfQotCi0vKioKICAqIGRy bV92YmxhbmtfZW5hYmxlIC0gZW5hYmxlIHRoZSB2YmxhbmsgaW50ZXJydXB0IG9uIGEgQ1JUQwog ICogQGRldjogRFJNIGRldmljZQogICogQGNydGM6IENSVEMgaW4gcXVlc3Rpb24KLS0gCjEuOC41 LjUKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCkludGVs LWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwOi8v bGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4Cg==