From mboxrd@z Thu Jan  1 00:00:00 1970
From: ville.syrjala@linux.intel.com
Subject: [PATCH] drm/i915: Fix pre-CTG vblank counter
Date: Wed, 25 Sep 2013 19:55:26 +0300
Message-ID: <1380128126-4457-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: <intel-gfx-bounces+gcfxdi-intel-gfx=m.gmane.org@lists.freedesktop.org>
Received: from mga14.intel.com (mga14.intel.com [143.182.124.37])
	by gabe.freedesktop.org (Postfix) with ESMTP id 20865E7C92
	for <intel-gfx@lists.freedesktop.org>;
	Wed, 25 Sep 2013 09:55:48 -0700 (PDT)
List-Unsubscribe: <http://lists.freedesktop.org/mailman/options/intel-gfx>,
	<mailto:intel-gfx-request@lists.freedesktop.org?subject=unsubscribe>
List-Archive: <http://lists.freedesktop.org/archives/intel-gfx>
List-Post: <mailto:intel-gfx@lists.freedesktop.org>
List-Help: <mailto:intel-gfx-request@lists.freedesktop.org?subject=help>
List-Subscribe: <http://lists.freedesktop.org/mailman/listinfo/intel-gfx>,
	<mailto:intel-gfx-request@lists.freedesktop.org?subject=subscribe>
Sender: intel-gfx-bounces+gcfxdi-intel-gfx=m.gmane.org@lists.freedesktop.org
Errors-To: intel-gfx-bounces+gcfxdi-intel-gfx=m.gmane.org@lists.freedesktop.org
To: intel-gfx@lists.freedesktop.org
Cc: Mario Kleiner <mario.kleiner@tuebingen.mpg.de>
List-Id: intel-gfx@lists.freedesktop.org

RnJvbTogVmlsbGUgU3lyasOkbMOkIDx2aWxsZS5zeXJqYWxhQGxpbnV4LmludGVsLmNvbT4KClRo
ZSBvbGQgc3R5bGUgZnJhbWUgY291bnRlciBpbmNyZW1lbnRzIGF0IHRoZSBzdGFydCBvZiBhY3Rp
dmUgdmlkZW8uCkhvd2V2ZXIgZm9yIGk5MTVfZ2V0X3ZibGFua19jb3VudGVyKCkgd2Ugd2FudCBh
IGNvdW50ZXIgdGhhdCBpbmNyZW1lbnRzCmF0IHRoZSBzdGFydCBvZiB2YmxhbmsuCgpGb3J0dW5h
dGVseSB0aGUgbG93IGZyYW1lIGNvdW50ZXIgcmVnaXN0ZXIgYWxzbyBjb250YWlucyB0aGUgcGl4
ZWwKY291bnRlciBmb3IgdGhlIGN1cnJlbnQgZnJhbWUuIFdlIGNhbiBjYW4gY29tcGFyZSB0aGF0
IGFnYWluc3QgdGhlCnZibGFuayBzdGFydCBwaXhlbCBjb3VudCB0byBkZXRlcm1pbmUgaWYgd2Ug
bmVlZCB0byBpbmNyZW1lbnQgdGhlCmZyYW1lIGNvdW50ZXIgYnkgMSB0byBnZXQgdGhlIGNvcnJl
Y3QgYW5zd2VyLgoKQWxzbyByZW9yZ2FuaXplIHRoZSBmdW5jdGlvbiBwb2ludGVyIGFzc2lnbm1l
bnRzIGluIGludGVsX2lycV9pbml0KCkgYQpiaXQgdG8gYXZvaWQgY29uZnVzaW5nIHBlb3BsZS4K
CkNjOiBNYXJpbyBLbGVpbmVyIDxtYXJpby5rbGVpbmVyQHR1ZWJpbmdlbi5tcGcuZGU+ClNpZ25l
ZC1vZmYtYnk6IFZpbGxlIFN5cmrDpGzDpCA8dmlsbGUuc3lyamFsYUBsaW51eC5pbnRlbC5jb20+
Ci0tLQoKSnVzdCBhbm90aGVyIHNtYWxsIHZibGFuayByZWxhdGVkIGdlbSBJIGZvcmdvdCB0byBw
b2xpc2ggdXAgYW5kIHNlbmQKb3V0IHVudGlsIEltcmUgc3RhcnRlZCBhc2tpbmcgbWUgcXVlc3Rp
b25zIGFib3V0IHRoZSB2YmxhbmsgY291bnRlcgpmdW5jdGlvbnMuCgogZHJpdmVycy9ncHUvZHJt
L2k5MTUvaTkxNV9pcnEuYyB8IDM2ICsrKysrKysrKysrKysrKysrKysrKysrKysrKysrKystLS0t
LQogMSBmaWxlIGNoYW5nZWQsIDMxIGluc2VydGlvbnMoKyksIDUgZGVsZXRpb25zKC0pCgpkaWZm
IC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9pcnEuYyBiL2RyaXZlcnMvZ3B1L2Ry
bS9pOTE1L2k5MTVfaXJxLmMKaW5kZXggNGI1MTljOC4uOGE1ZWI5ZCAxMDA2NDQKLS0tIGEvZHJp
dmVycy9ncHUvZHJtL2k5MTUvaTkxNV9pcnEuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9p
OTE1X2lycS5jCkBAIC01MjYsNyArNTI2LDcgQEAgc3RhdGljIHUzMiBpOTE1X2dldF92Ymxhbmtf
Y291bnRlcihzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LCBpbnQgcGlwZSkKIAlkcm1faTkxNV9wcml2
YXRlX3QgKmRldl9wcml2ID0gKGRybV9pOTE1X3ByaXZhdGVfdCAqKSBkZXYtPmRldl9wcml2YXRl
OwogCXVuc2lnbmVkIGxvbmcgaGlnaF9mcmFtZTsKIAl1bnNpZ25lZCBsb25nIGxvd19mcmFtZTsK
LQl1MzIgaGlnaDEsIGhpZ2gyLCBsb3c7CisJdTMyIGhpZ2gxLCBoaWdoMiwgbG93LCBwaXhlbCwg
dmJsX3N0YXJ0OwogCiAJaWYgKCFpOTE1X3BpcGVfZW5hYmxlZChkZXYsIHBpcGUpKSB7CiAJCURS
TV9ERUJVR19EUklWRVIoInRyeWluZyB0byBnZXQgdmJsYW5rIGNvdW50IGZvciBkaXNhYmxlZCAi
CkBAIC01MzQsNiArNTM0LDI0IEBAIHN0YXRpYyB1MzIgaTkxNV9nZXRfdmJsYW5rX2NvdW50ZXIo
c3RydWN0IGRybV9kZXZpY2UgKmRldiwgaW50IHBpcGUpCiAJCXJldHVybiAwOwogCX0KIAorCWlm
IChkcm1fY29yZV9jaGVja19mZWF0dXJlKGRldiwgRFJJVkVSX01PREVTRVQpKSB7CisJCXN0cnVj
dCBpbnRlbF9jcnRjICppbnRlbF9jcnRjID0KKwkJCXRvX2ludGVsX2NydGMoZGV2X3ByaXYtPnBp
cGVfdG9fY3J0Y19tYXBwaW5nW3BpcGVdKTsKKwkJY29uc3Qgc3RydWN0IGRybV9kaXNwbGF5X21v
ZGUgKm1vZGUgPQorCQkJJmludGVsX2NydGMtPmNvbmZpZy5hZGp1c3RlZF9tb2RlOworCisJCXZi
bF9zdGFydCA9IG1vZGUtPmNydGNfdmJsYW5rX3N0YXJ0ICogbW9kZS0+Y3J0Y19odG90YWw7CisJ
fSBlbHNlIHsKKwkJZW51bSB0cmFuc2NvZGVyIGNwdV90cmFuc2NvZGVyID0KKwkJCWludGVsX3Bp
cGVfdG9fY3B1X3RyYW5zY29kZXIoZGV2X3ByaXYsIHBpcGUpOworCQl1MzIgaHRvdGFsOworCisJ
CWh0b3RhbCA9ICgoSTkxNV9SRUFEKEhUT1RBTChjcHVfdHJhbnNjb2RlcikpID4+IDE2KSAmIDB4
MWZmZikgKyAxOworCQl2Ymxfc3RhcnQgPSAoSTkxNV9SRUFEKFZCTEFOSyhjcHVfdHJhbnNjb2Rl
cikpICYgMHgxZmZmKSArIDE7CisKKwkJdmJsX3N0YXJ0ICo9IGh0b3RhbDsKKwl9CisKIAloaWdo
X2ZyYW1lID0gUElQRUZSQU1FKHBpcGUpOwogCWxvd19mcmFtZSA9IFBJUEVGUkFNRVBJWEVMKHBp
cGUpOwogCkBAIC01NDQsMTMgKzU2MiwyMCBAQCBzdGF0aWMgdTMyIGk5MTVfZ2V0X3ZibGFua19j
b3VudGVyKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsIGludCBwaXBlKQogCSAqLwogCWRvIHsKIAkJ
aGlnaDEgPSBJOTE1X1JFQUQoaGlnaF9mcmFtZSkgJiBQSVBFX0ZSQU1FX0hJR0hfTUFTSzsKLQkJ
bG93ICAgPSBJOTE1X1JFQUQobG93X2ZyYW1lKSAgJiBQSVBFX0ZSQU1FX0xPV19NQVNLOworCQls
b3cgICA9IEk5MTVfUkVBRChsb3dfZnJhbWUpOwogCQloaWdoMiA9IEk5MTVfUkVBRChoaWdoX2Zy
YW1lKSAmIFBJUEVfRlJBTUVfSElHSF9NQVNLOwogCX0gd2hpbGUgKGhpZ2gxICE9IGhpZ2gyKTsK
IAogCWhpZ2gxID4+PSBQSVBFX0ZSQU1FX0hJR0hfU0hJRlQ7CisJcGl4ZWwgPSBsb3cgJiBQSVBF
X1BJWEVMX01BU0s7CiAJbG93ID4+PSBQSVBFX0ZSQU1FX0xPV19TSElGVDsKLQlyZXR1cm4gKGhp
Z2gxIDw8IDgpIHwgbG93OworCisJLyoKKwkgKiBUaGUgZnJhbWUgY291bnRlciBpbmNyZW1lbnRz
IGF0IGJlZ2lubmluZyBvZiBhY3RpdmUuCisJICogQ29vayB1cCBhIHZibGFuayBjb3VudGVyIGJ5
IGFsc28gY2hlY2tpbmcgdGhlIHBpeGVsCisJICogY291bnRlciBhZ2FpbnN0IHZibGFuayBzdGFy
dC4KKwkgKi8KKwlyZXR1cm4gKChoaWdoMSA8PCA4KSB8IGxvdykgKyAocGl4ZWwgPj0gdmJsX3N0
YXJ0KTsKIH0KIAogc3RhdGljIHUzMiBnbTQ1X2dldF92YmxhbmtfY291bnRlcihzdHJ1Y3QgZHJt
X2RldmljZSAqZGV2LCBpbnQgcGlwZSkKQEAgLTMxOTcsMTEgKzMyMjIsMTIgQEAgdm9pZCBpbnRl
bF9pcnFfaW5pdChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KQogCiAJcG1fcW9zX2FkZF9yZXF1ZXN0
KCZkZXZfcHJpdi0+cG1fcW9zLCBQTV9RT1NfQ1BVX0RNQV9MQVRFTkNZLCBQTV9RT1NfREVGQVVM
VF9WQUxVRSk7CiAKLQlkZXYtPmRyaXZlci0+Z2V0X3ZibGFua19jb3VudGVyID0gaTkxNV9nZXRf
dmJsYW5rX2NvdW50ZXI7Ci0JZGV2LT5tYXhfdmJsYW5rX2NvdW50ID0gMHhmZmZmZmY7IC8qIG9u
bHkgMjQgYml0cyBvZiBmcmFtZSBjb3VudCAqLwogCWlmIChJU19HNFgoZGV2KSB8fCBJTlRFTF9J
TkZPKGRldiktPmdlbiA+PSA1KSB7CiAJCWRldi0+bWF4X3ZibGFua19jb3VudCA9IDB4ZmZmZmZm
ZmY7IC8qIGZ1bGwgMzIgYml0IGNvdW50ZXIgKi8KIAkJZGV2LT5kcml2ZXItPmdldF92Ymxhbmtf
Y291bnRlciA9IGdtNDVfZ2V0X3ZibGFua19jb3VudGVyOworCX0gZWxzZSB7CisJCWRldi0+ZHJp
dmVyLT5nZXRfdmJsYW5rX2NvdW50ZXIgPSBpOTE1X2dldF92YmxhbmtfY291bnRlcjsKKwkJZGV2
LT5tYXhfdmJsYW5rX2NvdW50ID0gMHhmZmZmZmY7IC8qIG9ubHkgMjQgYml0cyBvZiBmcmFtZSBj
b3VudCAqLwogCX0KIAogCWlmIChkcm1fY29yZV9jaGVja19mZWF0dXJlKGRldiwgRFJJVkVSX01P
REVTRVQpKSB7Ci0tIAoxLjguMS41CgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f
X19fX19fX19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVl
ZGVza3RvcC5vcmcKaHR0cDovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZv
L2ludGVsLWdmeAo=