From: Michel Thierry Subject: [PATCH 2/2] drm/i915/guc: Don't make assumptions while getting the lrca offset Date: Wed, 12 Jul 2017 12:30:32 -0700 Message-ID: <20170712193032.27080-2-michel.thierry@intel.com> References: <20170712193032.27080-1-michel.thierry@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) by gabe.freedesktop.org (Postfix) with ESMTPS id B51EF6E4D3 for ; Wed, 12 Jul 2017 19:31:13 +0000 (UTC) In-Reply-To: <20170712193032.27080-1-michel.thierry@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 VXNpbmcgdGhlIEhXU1AgZ2d0dF9vZmZzZXQgdG8gZ2V0IHRoZSBscmNhIG9mZnNldCBpcyBvbmx5 IGNvcnJlY3QgaWYgdGhlCkhXU1AgaGFwcGVucyB0byBiZSBiZWZvcmUgaXQgKHdoZW4gd2UgcmV1 c2UgdGhlIFBQSFdTUCBvZiB0aGUga2VybmVsCmNvbnRleHQgYXMgdGhlIGVuZ2luZSBIV1NQKS4g SW5zdGVhZCBvZiBtYWtpbmcgdGhpcyBhc3N1bXB0aW9uLCBnZXQgdGhlCmxyY2Egb2Zmc2V0IGZy b20gdGhlIGtlcm5lbF9jb250ZXh0IGVuZ2luZSBzdGF0ZS4KCkFuZCB3aGlsZSBsb29raW5nIGF0 IHRoaXMgcGFydCBvZiB0aGUgR3VDIGludGVyYWN0aW9uLCBpdCB3YXMgYWxzbwpub3RpY2VkIHRo YXQgdGhlIGZpcm13YXJlIGV4cGVjdHMgdGhlIHNpemUgb2Ygb25seSB0aGUgZW5naW5lIGNvbnRl eHQKKGNvbnRleHQgbWludXMgdGhlIGV4ZWNsaXN0IHBhcnQsIGkuZS4gZG9uJ3QgaW5jbHVkZSB0 aGUgZmlyc3QgODAKZHdvcmRzKSwgc28gcGFzcyB0aGUgcmlnaHQgc2l6ZS4KCnYyOiBVc2UgdGhl IG5ldyBtYWNyb3MgdG8gcHJldmVudCBhYnVzaXZlIG92ZXJ1c2Ugb2YgdGhlIG9sZCBvbmVzIChD aHJpcykuCgpSZXBvcnRlZC1ieTogRGFuaWVsZSBDZXJhb2xvIFNwdXJpbyA8ZGFuaWVsZS5jZXJh b2xvc3B1cmlvQGludGVsLmNvbT4KU2lnbmVkLW9mZi1ieTogTWljaGVsIFRoaWVycnkgPG1pY2hl bC50aGllcnJ5QGludGVsLmNvbT4KQ2M6IENocmlzIFdpbHNvbiA8Y2hyaXNAY2hyaXMtd2lsc29u LmNvLnVrPgpDYzogRGFuaWVsZSBDZXJhb2xvIFNwdXJpbyA8ZGFuaWVsZS5jZXJhb2xvc3B1cmlv QGludGVsLmNvbT4KQ2M6IE1pY2hhbCBXYWpkZWN6a28gPG1pY2hhbC53YWpkZWN6a29AaW50ZWwu Y29tPgpDYzogT3NjYXIgTWF0ZW8gPG9zY2FyLm1hdGVvQGludGVsLmNvbT4KLS0tCiBkcml2ZXJz L2dwdS9kcm0vaTkxNS9pOTE1X2d1Y19zdWJtaXNzaW9uLmMgfCAyMSArKysrKysrKysrKysrKysr KystLS0KIDEgZmlsZSBjaGFuZ2VkLCAxOCBpbnNlcnRpb25zKCspLCAzIGRlbGV0aW9ucygtKQoK ZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ3VjX3N1Ym1pc3Npb24uYyBi L2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ3VjX3N1Ym1pc3Npb24uYwppbmRleCBiN2NhMTM4 NjA2NzcuLjhiOTY5MzVjZjk2YSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkx NV9ndWNfc3VibWlzc2lvbi5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ3VjX3N1 Ym1pc3Npb24uYwpAQCAtMTAxOCw2ICsxMDE4LDEyIEBAIHN0YXRpYyB2b2lkIGd1Y19wb2xpY2ll c19pbml0KHN0cnVjdCBndWNfcG9saWNpZXMgKnBvbGljaWVzKQogCXBvbGljaWVzLT5pc192YWxp ZCA9IDE7CiB9CiAKKy8qCisgKiBUaGUgZmlyc3QgODAgZHdvcmRzIG9mIHRoZSByZWdpc3RlciBz dGF0ZSBjb250ZXh0LCBjb250YWluaW5nIHRoZQorICogZXhlY2xpc3RzIGFuZCBwcGd0dCByZWdp c3RlcnMuCisgKi8KKyNkZWZpbmUgTFJfSFdfQ09OVEVYVF9TSVpFCSg4MCAqIHNpemVvZih1MzIp KQorCiBzdGF0aWMgaW50IGd1Y19hZHNfY3JlYXRlKHN0cnVjdCBpbnRlbF9ndWMgKmd1YykKIHsK IAlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSBndWNfdG9faTkxNShndWMpOwpA QCAtMTAzMiw2ICsxMDM4LDggQEAgc3RhdGljIGludCBndWNfYWRzX2NyZWF0ZShzdHJ1Y3QgaW50 ZWxfZ3VjICpndWMpCiAJfSBfX3BhY2tlZCAqYmxvYjsKIAlzdHJ1Y3QgaW50ZWxfZW5naW5lX2Nz ICplbmdpbmU7CiAJZW51bSBpbnRlbF9lbmdpbmVfaWQgaWQ7CisJY29uc3QgdTMyIHNraXBwZWRf b2Zmc2V0ID0gTFJDX0hFQURFUl9QQUdFUyAqIFBBR0VfU0laRTsKKwljb25zdCB1MzIgc2tpcHBl ZF9zaXplID0gTFJDX1BQSFdTUF9TWiAqIFBBR0VfU0laRSArIExSX0hXX0NPTlRFWFRfU0laRTsK IAl1MzIgYmFzZTsKIAogCUdFTV9CVUdfT04oZ3VjLT5hZHNfdm1hKTsKQEAgLTEwNjIsMTMgKzEw NzAsMjAgQEAgc3RhdGljIGludCBndWNfYWRzX2NyZWF0ZShzdHJ1Y3QgaW50ZWxfZ3VjICpndWMp CiAJICogZW5naW5lcyBhZnRlciBhIHJlc2V0LiBIZXJlIHdlIHVzZSB0aGUgUmVuZGVyIHJpbmcg ZGVmYXVsdAogCSAqIGNvbnRleHQsIHdoaWNoIG11c3QgYWxyZWFkeSBleGlzdCBhbmQgYmUgcGlu bmVkIGluIHRoZSBHR1RULAogCSAqIHNvIGl0cyBhZGRyZXNzIHdvbid0IGNoYW5nZSBhZnRlciB3 ZSd2ZSB0b2xkIHRoZSBHdUMgd2hlcmUKLQkgKiB0byBmaW5kIGl0LgorCSAqIHRvIGZpbmQgaXQu IE5vdGUgdGhhdCB3ZSBoYXZlIHRvIHNraXAgb3VyIGhlYWRlciAoMSBwYWdlKSwKKwkgKiBiZWNh dXNlIG91ciBHdUMgc2hhcmVkIGRhdGEgaXMgdGhlcmUuCiAJICovCiAJYmxvYi0+YWRzLmdvbGRl bl9jb250ZXh0X2xyY2EgPQotCQlkZXZfcHJpdi0+ZW5naW5lW1JDU10tPnN0YXR1c19wYWdlLmdn dHRfb2Zmc2V0OworCQlndWNfZ2d0dF9vZmZzZXQoZGV2X3ByaXYtPmtlcm5lbF9jb250ZXh0LT5l bmdpbmVbUkNTXS5zdGF0ZSkgKyBza2lwcGVkX29mZnNldDsKIAorCS8qCisJICogVGhlIEd1QyBl eHBlY3RzIHVzIHRvIGV4Y2x1ZGUgdGhlIHBvcnRpb24gb2YgdGhlIGNvbnRleHQgaW1hZ2UgdGhh dAorCSAqIGl0IHNraXBzIGZyb20gdGhlIHNpemUgaXQgaXMgdG8gcmVhZC4gSXQgc3RhcnRzIHJl YWRpbmcgZnJvbSBhZnRlcgorCSAqIHRoZSBleGVjbGlzdCBjb250ZXh0IChzbyBza2lwcGluZyB0 aGUgZmlyc3QgcGFnZSBbUFBIV1NQXSBhbmQgODAKKwkgKiBkd29yZHMpLiBXZWlyZCBndWMgaXMg d2VpcmQuCisJICovCiAJZm9yX2VhY2hfZW5naW5lKGVuZ2luZSwgZGV2X3ByaXYsIGlkKQotCQli bG9iLT5hZHMuZW5nX3N0YXRlX3NpemVbZW5naW5lLT5ndWNfaWRdID0gZW5naW5lLT5jb250ZXh0 X3NpemU7CisJCWJsb2ItPmFkcy5lbmdfc3RhdGVfc2l6ZVtlbmdpbmUtPmd1Y19pZF0gPSBlbmdp bmUtPmNvbnRleHRfc2l6ZSAtIHNraXBwZWRfc2l6ZTsKIAogCWJhc2UgPSBndWNfZ2d0dF9vZmZz ZXQodm1hKTsKIAlibG9iLT5hZHMuc2NoZWR1bGVyX3BvbGljaWVzID0gYmFzZSArIHB0cl9vZmZz ZXQoYmxvYiwgcG9saWNpZXMpOwotLSAKMi4xMy4wCgpfX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBs aXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1h bi9saXN0aW5mby9pbnRlbC1nZngK