From mboxrd@z Thu Jan 1 00:00:00 1970 From: Chris Wilson Subject: [PATCH 2/6] drm/i915/guc: Don't make assumptions while getting the lrca offset Date: Wed, 13 Sep 2017 09:56:01 +0100 Message-ID: <20170913085605.18299-2-chris@chris-wilson.co.uk> References: <20170913085605.18299-1-chris@chris-wilson.co.uk> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from fireflyinternet.com (mail.fireflyinternet.com [109.228.58.192]) by gabe.freedesktop.org (Postfix) with ESMTPS id DC8316E7D5 for ; Wed, 13 Sep 2017 08:57:37 +0000 (UTC) In-Reply-To: <20170913085605.18299-1-chris@chris-wilson.co.uk> 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 RnJvbTogTWljaGVsIFRoaWVycnkgPG1pY2hlbC50aGllcnJ5QGludGVsLmNvbT4KClVzaW5nIHRo ZSBIV1NQIGdndHRfb2Zmc2V0IHRvIGdldCB0aGUgbHJjYSBvZmZzZXQgaXMgb25seSBjb3JyZWN0 IGlmIHRoZQpIV1NQIGhhcHBlbnMgdG8gYmUgYmVmb3JlIGl0ICh3aGVuIHdlIHJldXNlIHRoZSBQ UEhXU1Agb2YgdGhlIGtlcm5lbApjb250ZXh0IGFzIHRoZSBlbmdpbmUgSFdTUCkuIEluc3RlYWQg b2YgbWFraW5nIHRoaXMgYXNzdW1wdGlvbiwgZ2V0IHRoZQpscmNhIG9mZnNldCBmcm9tIHRoZSBr ZXJuZWxfY29udGV4dCBlbmdpbmUgc3RhdGUuCgpBbmQgd2hpbGUgbG9va2luZyBhdCB0aGlzIHBh cnQgb2YgdGhlIEd1QyBpbnRlcmFjdGlvbiwgaXQgd2FzIGFsc28Kbm90aWNlZCB0aGF0IHRoZSBm aXJtd2FyZSBleHBlY3RzIHRoZSBzaXplIG9mIG9ubHkgdGhlIGVuZ2luZSBjb250ZXh0Cihjb250 ZXh0IG1pbnVzIHRoZSBleGVjbGlzdCBwYXJ0LCBpLmUuIGRvbid0IGluY2x1ZGUgdGhlIGZpcnN0 IDgwCmR3b3JkcyksIHNvIHBhc3MgdGhlIHJpZ2h0IHNpemUuCgp2MjogVXNlIHRoZSBuZXcgbWFj cm9zIHRvIHByZXZlbnQgYWJ1c2l2ZSBvdmVydXNlIG9mIHRoZSBvbGQgb25lcyAoQ2hyaXMpLgoK UmVwb3J0ZWQtYnk6IERhbmllbGUgQ2VyYW9sbyBTcHVyaW8gPGRhbmllbGUuY2VyYW9sb3NwdXJp b0BpbnRlbC5jb20+ClNpZ25lZC1vZmYtYnk6IE1pY2hlbCBUaGllcnJ5IDxtaWNoZWwudGhpZXJy eUBpbnRlbC5jb20+CkNjOiBDaHJpcyBXaWxzb24gPGNocmlzQGNocmlzLXdpbHNvbi5jby51az4K Q2M6IERhbmllbGUgQ2VyYW9sbyBTcHVyaW8gPGRhbmllbGUuY2VyYW9sb3NwdXJpb0BpbnRlbC5j b20+CkNjOiBNaWNoYWwgV2FqZGVjemtvIDxtaWNoYWwud2FqZGVjemtvQGludGVsLmNvbT4KQ2M6 IE9zY2FyIE1hdGVvIDxvc2Nhci5tYXRlb0BpbnRlbC5jb20+Ckxpbms6IGh0dHA6Ly9wYXRjaHdv cmsuZnJlZWRlc2t0b3Aub3JnL3BhdGNoL21zZ2lkLzIwMTcwNzEyMTkzMDMyLjI3MDgwLTItbWlj aGVsLnRoaWVycnlAaW50ZWwuY29tClJldmlld2VkLWJ5OiBDaHJpcyBXaWxzb24gPGNocmlzQGNo cmlzLXdpbHNvbi5jby51az4KQWNrZWQtYnk6IERhbmllbGUgQ2VyYW9sbyBTcHVyaW8gPGRhbmll bGUuY2VyYW9sb3NwdXJpb0BpbnRlbC5jb20+ClNpZ25lZC1vZmYtYnk6IENocmlzIFdpbHNvbiA8 Y2hyaXNAY2hyaXMtd2lsc29uLmNvLnVrPgotLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVf Z3VjX3N1Ym1pc3Npb24uYyB8IDIxICsrKysrKysrKysrKysrKysrKy0tLQogMSBmaWxlIGNoYW5n ZWQsIDE4IGluc2VydGlvbnMoKyksIDMgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVy cy9ncHUvZHJtL2k5MTUvaTkxNV9ndWNfc3VibWlzc2lvbi5jIGIvZHJpdmVycy9ncHUvZHJtL2k5 MTUvaTkxNV9ndWNfc3VibWlzc2lvbi5jCmluZGV4IGI3Y2ExMzg2MDY3Ny4uOGI5NjkzNWNmOTZh IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2d1Y19zdWJtaXNzaW9uLmMK KysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9ndWNfc3VibWlzc2lvbi5jCkBAIC0xMDE4 LDYgKzEwMTgsMTIgQEAgc3RhdGljIHZvaWQgZ3VjX3BvbGljaWVzX2luaXQoc3RydWN0IGd1Y19w b2xpY2llcyAqcG9saWNpZXMpCiAJcG9saWNpZXMtPmlzX3ZhbGlkID0gMTsKIH0KIAorLyoKKyAq IFRoZSBmaXJzdCA4MCBkd29yZHMgb2YgdGhlIHJlZ2lzdGVyIHN0YXRlIGNvbnRleHQsIGNvbnRh aW5pbmcgdGhlCisgKiBleGVjbGlzdHMgYW5kIHBwZ3R0IHJlZ2lzdGVycy4KKyAqLworI2RlZmlu ZSBMUl9IV19DT05URVhUX1NJWkUJKDgwICogc2l6ZW9mKHUzMikpCisKIHN0YXRpYyBpbnQgZ3Vj X2Fkc19jcmVhdGUoc3RydWN0IGludGVsX2d1YyAqZ3VjKQogewogCXN0cnVjdCBkcm1faTkxNV9w cml2YXRlICpkZXZfcHJpdiA9IGd1Y190b19pOTE1KGd1Yyk7CkBAIC0xMDMyLDYgKzEwMzgsOCBA QCBzdGF0aWMgaW50IGd1Y19hZHNfY3JlYXRlKHN0cnVjdCBpbnRlbF9ndWMgKmd1YykKIAl9IF9f cGFja2VkICpibG9iOwogCXN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKmVuZ2luZTsKIAllbnVtIGlu dGVsX2VuZ2luZV9pZCBpZDsKKwljb25zdCB1MzIgc2tpcHBlZF9vZmZzZXQgPSBMUkNfSEVBREVS X1BBR0VTICogUEFHRV9TSVpFOworCWNvbnN0IHUzMiBza2lwcGVkX3NpemUgPSBMUkNfUFBIV1NQ X1NaICogUEFHRV9TSVpFICsgTFJfSFdfQ09OVEVYVF9TSVpFOwogCXUzMiBiYXNlOwogCiAJR0VN X0JVR19PTihndWMtPmFkc192bWEpOwpAQCAtMTA2MiwxMyArMTA3MCwyMCBAQCBzdGF0aWMgaW50 IGd1Y19hZHNfY3JlYXRlKHN0cnVjdCBpbnRlbF9ndWMgKmd1YykKIAkgKiBlbmdpbmVzIGFmdGVy IGEgcmVzZXQuIEhlcmUgd2UgdXNlIHRoZSBSZW5kZXIgcmluZyBkZWZhdWx0CiAJICogY29udGV4 dCwgd2hpY2ggbXVzdCBhbHJlYWR5IGV4aXN0IGFuZCBiZSBwaW5uZWQgaW4gdGhlIEdHVFQsCiAJ ICogc28gaXRzIGFkZHJlc3Mgd29uJ3QgY2hhbmdlIGFmdGVyIHdlJ3ZlIHRvbGQgdGhlIEd1QyB3 aGVyZQotCSAqIHRvIGZpbmQgaXQuCisJICogdG8gZmluZCBpdC4gTm90ZSB0aGF0IHdlIGhhdmUg dG8gc2tpcCBvdXIgaGVhZGVyICgxIHBhZ2UpLAorCSAqIGJlY2F1c2Ugb3VyIEd1QyBzaGFyZWQg ZGF0YSBpcyB0aGVyZS4KIAkgKi8KIAlibG9iLT5hZHMuZ29sZGVuX2NvbnRleHRfbHJjYSA9Ci0J CWRldl9wcml2LT5lbmdpbmVbUkNTXS0+c3RhdHVzX3BhZ2UuZ2d0dF9vZmZzZXQ7CisJCWd1Y19n Z3R0X29mZnNldChkZXZfcHJpdi0+a2VybmVsX2NvbnRleHQtPmVuZ2luZVtSQ1NdLnN0YXRlKSAr IHNraXBwZWRfb2Zmc2V0OwogCisJLyoKKwkgKiBUaGUgR3VDIGV4cGVjdHMgdXMgdG8gZXhjbHVk ZSB0aGUgcG9ydGlvbiBvZiB0aGUgY29udGV4dCBpbWFnZSB0aGF0CisJICogaXQgc2tpcHMgZnJv bSB0aGUgc2l6ZSBpdCBpcyB0byByZWFkLiBJdCBzdGFydHMgcmVhZGluZyBmcm9tIGFmdGVyCisJ ICogdGhlIGV4ZWNsaXN0IGNvbnRleHQgKHNvIHNraXBwaW5nIHRoZSBmaXJzdCBwYWdlIFtQUEhX U1BdIGFuZCA4MAorCSAqIGR3b3JkcykuIFdlaXJkIGd1YyBpcyB3ZWlyZC4KKwkgKi8KIAlmb3Jf ZWFjaF9lbmdpbmUoZW5naW5lLCBkZXZfcHJpdiwgaWQpCi0JCWJsb2ItPmFkcy5lbmdfc3RhdGVf c2l6ZVtlbmdpbmUtPmd1Y19pZF0gPSBlbmdpbmUtPmNvbnRleHRfc2l6ZTsKKwkJYmxvYi0+YWRz LmVuZ19zdGF0ZV9zaXplW2VuZ2luZS0+Z3VjX2lkXSA9IGVuZ2luZS0+Y29udGV4dF9zaXplIC0g c2tpcHBlZF9zaXplOwogCiAJYmFzZSA9IGd1Y19nZ3R0X29mZnNldCh2bWEpOwogCWJsb2ItPmFk cy5zY2hlZHVsZXJfcG9saWNpZXMgPSBiYXNlICsgcHRyX29mZnNldChibG9iLCBwb2xpY2llcyk7 Ci0tIAoyLjE0LjEKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fCkludGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9y ZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ludGVsLWdm eAo=