From: ville.syrjala@linux.intel.com Subject: [PATCH 9/9] drm/i915: Fix gen2 and hsw scanline counter Date: Tue, 29 Apr 2014 13:35:52 +0300 Message-ID: <1398767752-619-10-git-send-email-ville.syrjala@linux.intel.com> References: <1398767752-619-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: Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) by gabe.freedesktop.org (Postfix) with ESMTP id C33EF8A414 for ; Tue, 29 Apr 2014 03:36:24 -0700 (PDT) In-Reply-To: <1398767752-619-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: intel-gfx@lists.freedesktop.org List-Id: intel-gfx@lists.freedesktop.org RnJvbTogVmlsbGUgU3lyasOkbMOkIDx2aWxsZS5zeXJqYWxhQGxpbnV4LmludGVsLmNvbT4KCk9u IGdlbjIgdGhlIHNjYW5saW5lIGNvdW50ZXIgYmVoYXZlcyBhIGJpdCBkaWZmZXJlbnRseSBmcm9t IHRoZQpsYXRlciBnZW5lcmF0aW9ucy4gSW5zdGVhZCBvZiBhZGRpbmcgb25lIHRvIHRoZSByYXcg c2NhbmxpbmUKY291bnRlciB2YWx1ZSwgd2UgbXVzdCBzdWJ0cmFjdCBvbmUuCgpPbiBIU1cgdGhl IHNjYW5saW5lIGNvdW50ZXIgYXBwYXJlbnRseSByZXF1aXJlcyBhICsyIGFkanVzdG1lbnQKb24g SERNSSBvdXRwdXRzLiBlRFAgb24gcG9ydCBBIGhvd2V2ZXIgd2FudHMgdGhlICsxIGFkanVzdG1l bnQuClNvIGZhciBubyBvbmUgaGFzIHRlc3RlZCBEUC9lRFAgb24gcG9ydCAhPSBBLCBhbmQgYWxz byBCRFcKYmVoYXZpb3VyIGlzIHN0aWxsIGEgbXlzdGVyeS4KCkFzIHRoZSBmaXh1cCB3ZSBtdXN0 IGFwcGx5IHRvIHRoZSBoYXJkd2FyZSBzY2FubGluZSBjb3VudGVyCmRlcGVuZHMgb24gc2V2ZXJh bCBmYWN0b3JzLCBjb21wdXRlIHRoZSBkZXNpcmVkIG9mZnNldCBhdCBtb2Rlc2V0CnRpbWUgYW5k IHR1Y2sgaXQgYXdheSBmb3Igd2hlbiBpdCdzIG5lZWRlZC4KClNpZ25lZC1vZmYtYnk6IFZpbGxl IFN5cmrDpGzDpCA8dmlsbGUuc3lyamFsYUBsaW51eC5pbnRlbC5jb20+Ci0tLQogZHJpdmVycy9n cHUvZHJtL2k5MTUvaTkxNV9pcnEuYyAgICAgIHwgMTQgKysrKy0tLS0tLS0KIGRyaXZlcnMvZ3B1 L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYyB8IDQ4ICsrKysrKysrKysrKysrKysrKysrKysrKysr KysrKysrKysrLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHJ2LmggICAgIHwgIDIgKysK IDMgZmlsZXMgY2hhbmdlZCwgNTQgaW5zZXJ0aW9ucygrKSwgMTAgZGVsZXRpb25zKC0pCgpkaWZm IC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9pcnEuYyBiL2RyaXZlcnMvZ3B1L2Ry bS9pOTE1L2k5MTVfaXJxLmMKaW5kZXggYmM0NTg1Yi4uOGUxYjEwNCAxMDA2NDQKLS0tIGEvZHJp dmVycy9ncHUvZHJtL2k5MTUvaTkxNV9pcnEuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9p OTE1X2lycS5jCkBAIC04MTcsOSArODE3LDkgQEAgc3RhdGljIGludCBfX2ludGVsX2dldF9jcnRj X3NjYW5saW5lKHN0cnVjdCBpbnRlbF9jcnRjICpjcnRjKQogCXN0cnVjdCBkcm1faTkxNV9wcml2 YXRlICpkZXZfcHJpdiA9IGRldi0+ZGV2X3ByaXZhdGU7CiAJY29uc3Qgc3RydWN0IGRybV9kaXNw bGF5X21vZGUgKm1vZGUgPSAmY3J0Yy0+Y29uZmlnLmFkanVzdGVkX21vZGU7CiAJZW51bSBwaXBl IHBpcGUgPSBjcnRjLT5waXBlOwotCWludCB2dG90YWwgPSBtb2RlLT5jcnRjX3Z0b3RhbDsKLQlp bnQgcG9zaXRpb247CisJaW50IHBvc2l0aW9uLCB2dG90YWw7CiAKKwl2dG90YWwgPSBtb2RlLT5j cnRjX3Z0b3RhbDsKIAlpZiAobW9kZS0+ZmxhZ3MgJiBEUk1fTU9ERV9GTEFHX0lOVEVSTEFDRSkK IAkJdnRvdGFsIC89IDI7CiAKQEAgLTgyOSwxNCArODI5LDEwIEBAIHN0YXRpYyBpbnQgX19pbnRl bF9nZXRfY3J0Y19zY2FubGluZShzdHJ1Y3QgaW50ZWxfY3J0YyAqY3J0YykKIAkJcG9zaXRpb24g PSBfX3Jhd19pOTE1X3JlYWQzMihkZXZfcHJpdiwgUElQRURTTChwaXBlKSkgJiBEU0xfTElORU1B U0tfR0VOMzsKIAogCS8qCi0JICogU2NhbmxpbmUgY291bnRlciBpbmNyZW1lbnRzIGF0IGxlYWRp bmcgZWRnZSBvZiBoc3luYywgYW5kCi0JICogaXQgc3RhcnRzIGNvdW50aW5nIGZyb20gdnRvdGFs LTEgb24gdGhlIGZpcnN0IGFjdGl2ZSBsaW5lLgotCSAqIFRoYXQgbWVhbnMgdGhlIHNjYW5saW5l IGNvdW50ZXIgdmFsdWUgaXMgYWx3YXlzIG9uZSBsZXNzCi0JICogdGhhbiB3aGF0IHdlIHdvdWxk IGV4cGVjdC4gSWUuIGp1c3QgYWZ0ZXIgc3RhcnQgb2YgdmJsYW5rLAotCSAqIHdoaWNoIGFsc28g b2NjdXJzIGF0IHN0YXJ0IG9mIGhzeW5jIChvbiB0aGUgbGFzdCBhY3RpdmUgbGluZSksCi0JICog dGhlIHNjYW5saW5lIGNvdW50ZXIgd2lsbCByZWFkIHZibGFua19zdGFydC0xLgorCSAqIFNlZSB1 cGRhdGVfc2NhbmxpbmVfb2Zmc2V0KCkgZm9yIHRoZSBkZXRhaWxzIG9uIHRoZQorCSAqIHNjYW5s aW5lX29mZnNldCBhZGp1c3RtZW50LgogCSAqLwotCXJldHVybiAocG9zaXRpb24gKyAxKSAlIHZ0 b3RhbDsKKwlyZXR1cm4gKHBvc2l0aW9uICsgY3J0Yy0+c2NhbmxpbmVfb2Zmc2V0KSAlIHZ0b3Rh bDsKIH0KIAogc3RhdGljIGludCBpOTE1X2dldF9jcnRjX3NjYW5vdXRwb3Moc3RydWN0IGRybV9k ZXZpY2UgKmRldiwgaW50IHBpcGUsCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9p bnRlbF9kaXNwbGF5LmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMKaW5k ZXggOTkzNTk3Yi4uOTNlZjA2YiAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50 ZWxfZGlzcGxheS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYwpA QCAtOTg4Niw2ICs5ODg2LDQ3IEBAIHZvaWQgaXJvbmxha2VfY2hlY2tfZW5jb2Rlcl9kb3RjbG9j ayhjb25zdCBzdHJ1Y3QgaW50ZWxfY3J0Y19jb25maWcgKnBpcGVfY29uZmlnCiAJICAgICBwaXBl X2NvbmZpZy0+YWRqdXN0ZWRfbW9kZS5jcnRjX2Nsb2NrLCBkb3RjbG9jayk7CiB9CiAKK3N0YXRp YyB2b2lkIHVwZGF0ZV9zY2FubGluZV9vZmZzZXQoc3RydWN0IGludGVsX2NydGMgKmNydGMpCit7 CisJc3RydWN0IGRybV9kZXZpY2UgKmRldiA9IGNydGMtPmJhc2UuZGV2OworCisJLyoKKwkgKiBU aGUgc2NhbmxpbmUgY291bnRlciBpbmNyZW1lbnRzIGF0IHRoZSBsZWFkaW5nIGVkZ2Ugb2YgaHN5 bmMuCisJICoKKwkgKiBPbiBtb3N0IHBsYXRmb3JtcyBpdCBzdGFydHMgY291bnRpbmcgZnJvbSB2 dG90YWwtMSBvbiB0aGUKKwkgKiBmaXJzdCBhY3RpdmUgbGluZS4gVGhhdCBtZWFucyB0aGUgc2Nh bmxpbmUgY291bnRlciB2YWx1ZSBpcworCSAqIGFsd2F5cyBvbmUgbGVzcyB0aGFuIHdoYXQgd2Ug d291bGQgZXhwZWN0LiBJZS4ganVzdCBhZnRlcgorCSAqIHN0YXJ0IG9mIHZibGFuaywgd2hpY2gg YWxzbyBvY2N1cnMgYXQgc3RhcnQgb2YgaHN5bmMgKG9uIHRoZQorCSAqIGxhc3QgYWN0aXZlIGxp bmUpLCB0aGUgc2NhbmxpbmUgY291bnRlciB3aWxsIHJlYWQgdmJsYW5rX3N0YXJ0LTEuCisJICoK KwkgKiBPbiBnZW4yIHRoZSBzY2FubGluZSBjb3VudGVyIHN0YXJ0cyBjb3VudGluZyBmcm9tIDEg aW5zdGVhZAorCSAqIG9mIHZ0b3RhbC0xLCBzbyB3ZSBoYXZlIHRvIHN1YnRyYWN0IG9uZSAob3Ig cmF0aGVyIGFkZCB2dG90YWwtMQorCSAqIHRvIGtlZXAgdGhlIHZhbHVlIHBvc2l0aXZlKSwgaW5z dGVhZCBvZiBhZGRpbmcgb25lLgorCSAqCisJICogT24gSFNXIHRoZSBiZWhhdmlvdXIgb2YgdGhl IHNjYW5saW5lIGNvdW50ZXIgZGVwZW5kcyBlaXRoZXIgb24KKwkgKiB0aGUgb3V0cHV0IHR5cGUs IG9yIHRoZSBEREkgcG9ydCB1c2VkIChzbyBmYXIgaXQncyB1bmNsZWFyIHdoaWNoKS4KKwkgKiBJ biBjZXJ0YWluIGNhc2VzIHdlIG5lZWQgdG8gYWRkIDIgaW5zdGVhZCBvZiAxIHRvIHRoZSByZXBv cnRlZAorCSAqIHNjYW5saW5lIGNvdW50ZXIgdmFsdWUuCisJICogRklYTUU6ICsyIHNlZW1zIHRv IGJlIGNvcnJlY3QgZm9yIEhETUksIGJ1dCBlRFAgb24gcG9ydCBBIHdhbnRzICsxCisJICogaW5z dGVhZC4gTm90IHN1cmUgaG93IERQIG9uIG90aGVyIHBvcnRzIGJlaGF2ZXMuCisJICogRklYTUU6 IEhvdyBkb2VzIEJEVyBiZWhhdmU/CisJICovCisJaWYgKElTX0dFTjIoZGV2KSkgeworCQljb25z dCBzdHJ1Y3QgZHJtX2Rpc3BsYXlfbW9kZSAqbW9kZSA9ICZjcnRjLT5jb25maWcuYWRqdXN0ZWRf bW9kZTsKKwkJaW50IHZ0b3RhbDsKKworCQl2dG90YWwgPSBtb2RlLT5jcnRjX3Z0b3RhbDsKKwkJ aWYgKG1vZGUtPmZsYWdzICYgRFJNX01PREVfRkxBR19JTlRFUkxBQ0UpCisJCQl2dG90YWwgLz0g MjsKKworCQljcnRjLT5zY2FubGluZV9vZmZzZXQgPSB2dG90YWwgLSAxOworCX0gZWxzZSBpZiAo SEFTX0RESShkZXYpICYmCisJCSAgIGludGVsX3BpcGVfaGFzX3R5cGUoJmNydGMtPmJhc2UsIElO VEVMX09VVFBVVF9IRE1JKSkgeworCQljcnRjLT5zY2FubGluZV9vZmZzZXQgPSAyOworCX0gZWxz ZQorCQljcnRjLT5zY2FubGluZV9vZmZzZXQgPSAxOworfQorCiBzdGF0aWMgaW50IF9faW50ZWxf c2V0X21vZGUoc3RydWN0IGRybV9jcnRjICpjcnRjLAogCQkJICAgIHN0cnVjdCBkcm1fZGlzcGxh eV9tb2RlICptb2RlLAogCQkJICAgIGludCB4LCBpbnQgeSwgc3RydWN0IGRybV9mcmFtZWJ1ZmZl ciAqZmIpCkBAIC05OTg0LDggKzEwMDI1LDExIEBAIHN0YXRpYyBpbnQgX19pbnRlbF9zZXRfbW9k ZShzdHJ1Y3QgZHJtX2NydGMgKmNydGMsCiAJfQogCiAJLyogTm93IGVuYWJsZSB0aGUgY2xvY2tz LCBwbGFuZSwgcGlwZSwgYW5kIGNvbm5lY3RvcnMgdGhhdCB3ZSBzZXQgdXAuICovCi0JZm9yX2Vh Y2hfaW50ZWxfY3J0Y19tYXNrZWQoZGV2LCBwcmVwYXJlX3BpcGVzLCBpbnRlbF9jcnRjKQorCWZv cl9lYWNoX2ludGVsX2NydGNfbWFza2VkKGRldiwgcHJlcGFyZV9waXBlcywgaW50ZWxfY3J0Yykg eworCQl1cGRhdGVfc2NhbmxpbmVfb2Zmc2V0KGludGVsX2NydGMpOworCiAJCWRldl9wcml2LT5k aXNwbGF5LmNydGNfZW5hYmxlKCZpbnRlbF9jcnRjLT5iYXNlKTsKKwl9CiAKIAkvKiBGSVhNRTog YWRkIHN1YnBpeGVsIG9yZGVyICovCiBkb25lOgpAQCAtMTE1MTEsNiArMTE1NTUsOCBAQCBzdGF0 aWMgdm9pZCBpbnRlbF9zYW5pdGl6ZV9jcnRjKHN0cnVjdCBpbnRlbF9jcnRjICpjcnRjKQogCQkg Ki8KIAkJY3J0Yy0+Y3B1X2ZpZm9fdW5kZXJydW5fZGlzYWJsZWQgPSB0cnVlOwogCQljcnRjLT5w Y2hfZmlmb191bmRlcnJ1bl9kaXNhYmxlZCA9IHRydWU7CisKKwkJdXBkYXRlX3NjYW5saW5lX29m ZnNldChjcnRjKTsKIAl9CiB9CiAKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2lu dGVsX2Rydi5oIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHJ2LmgKaW5kZXggZDhiNTQw Yi4uNTQyMDM2OCAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHJ2LmgK KysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHJ2LmgKQEAgLTQwMyw2ICs0MDMsOCBA QCBzdHJ1Y3QgaW50ZWxfY3J0YyB7CiAJfSB3bTsKIAogCXdhaXRfcXVldWVfaGVhZF90IHZibF93 YWl0OworCisJaW50IHNjYW5saW5lX29mZnNldDsKIH07CiAKIHN0cnVjdCBpbnRlbF9wbGFuZV93 bV9wYXJhbWV0ZXJzIHsKLS0gCjEuOC4zLjIKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fCkludGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwtZ2Z4QGxpc3Rz LmZyZWVkZXNrdG9wLm9yZwpodHRwOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlz dGluZm8vaW50ZWwtZ2Z4Cg==