From: Michel Thierry Subject: [PATCH v2 17/18] drm/i915: Wa32bitGeneralStateOffset & Wa32bitInstructionBaseOffset Date: Wed, 10 Jun 2015 17:46:54 +0100 Message-ID: <1433954816-13787-18-git-send-email-michel.thierry@intel.com> References: <1433954816-13787-1-git-send-email-michel.thierry@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 CEE7C7A104 for ; Wed, 10 Jun 2015 09:47:27 -0700 (PDT) In-Reply-To: <1433954816-13787-1-git-send-email-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 VGhlcmUgYXJlIHNvbWUgYWxsb2NhdGlvbnMgdGhhdCBtdXN0IGJlIG9ubHkgcmVmZXJlbmNlZCBi eSAzMmJpdApvZmZzZXRzLiBUbyBsaW1pdCB0aGUgY2hhbmNlcyBvZiBoYXZpbmcgdGhlIGZpcnN0 IDRHQiBhbHJlYWR5IGZ1bGwsCm9iamVjdHMgbm90IHJlcXVpcmluZyB0aGlzIHdvcmthcm91bmQg dXNlIERSTV9NTV9TRUFSQ0hfQkVMT1cvCkRSTV9NTV9DUkVBVEVfVE9QIGZsYWdzCgpVc2VyIG11 c3QgcGFzcyBJOTE1X0VYRUNfU1VQUE9SVFNfNDhCQUREUkVTUyBmbGFnIHRvIGluZGljYXRlIGl0 IGNhbgpiZSBhbGxvY2F0ZWQgYWJvdmUgdGhlIDMyYiBhZGRyZXNzIHJhbmdlLgoKVGhlIGZsYWcg aXMgaWdub3JlZCBpbiAzMmIgUFBHVFQuCgp2MjogQ2hhbmdlZCBmbGFnIGxvZ2ljIGZyb20gbmVl ZWRzXzMyYiwgdG8gc3VwcG9ydHNfNDhiLgoKU2lnbmVkLW9mZi1ieTogTWljaGVsIFRoaWVycnkg PG1pY2hlbC50aGllcnJ5QGludGVsLmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1 X2Rydi5oICAgICAgICAgICAgfCAgMSArCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbS5j ICAgICAgICAgICAgfCAxOSArKysrKysrKysrKysrKy0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9p OTE1X2dlbV9leGVjYnVmZmVyLmMgfCAzNiArKysrKysrKysrKysrKysrKysrKystLS0tLS0tLS0K IGluY2x1ZGUvdWFwaS9kcm0vaTkxNV9kcm0uaCAgICAgICAgICAgICAgICB8ICA0ICsrKy0KIDQg ZmlsZXMgY2hhbmdlZCwgNDcgaW5zZXJ0aW9ucygrKSwgMTMgZGVsZXRpb25zKC0pCgpkaWZmIC0t Z2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuaCBiL2RyaXZlcnMvZ3B1L2RybS9p OTE1L2k5MTVfZHJ2LmgKaW5kZXggOTVmNTlkMy4uZDczZGRkYiAxMDA2NDQKLS0tIGEvZHJpdmVy cy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuaAorKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1 X2Rydi5oCkBAIC0yNzE0LDYgKzI3MTQsNyBAQCB2b2lkIGk5MTVfZ2VtX3ZtYV9kZXN0cm95KHN0 cnVjdCBpOTE1X3ZtYSAqdm1hKTsKICNkZWZpbmUgUElOX09GRlNFVF9CSUFTCSgxPDwzKQogI2Rl ZmluZSBQSU5fVVNFUgkoMTw8NCkKICNkZWZpbmUgUElOX1VQREFURQkoMTw8NSkKKyNkZWZpbmUg UElOX0ZVTExfUkFOR0UJKDE8PDYpCiAjZGVmaW5lIFBJTl9PRkZTRVRfTUFTSyAofjQwOTUpCiBp bnQgX19tdXN0X2NoZWNrCiBpOTE1X2dlbV9vYmplY3RfcGluKHN0cnVjdCBkcm1faTkxNV9nZW1f b2JqZWN0ICpvYmosCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbS5j IGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW0uYwppbmRleCAzNTY5MGVmLi5lNjMyNWE0 YSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW0uYworKysgYi9kcml2 ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbS5jCkBAIC0zNjcyLDYgKzM2NzIsOCBAQCBpOTE1X2dl bV9vYmplY3RfYmluZF90b192bShzdHJ1Y3QgZHJtX2k5MTVfZ2VtX29iamVjdCAqb2JqLAogCXN0 cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9IGRldi0+ZGV2X3ByaXZhdGU7CiAJdTMy IGZlbmNlX2FsaWdubWVudCwgdW5mZW5jZWRfYWxpZ25tZW50OwogCXU2NCBzaXplLCBmZW5jZV9z aXplOworCXUzMiBzZWFyY2hfZmxhZyA9IERSTV9NTV9TRUFSQ0hfREVGQVVMVDsKKwl1MzIgYWxs b2NfZmxhZyA9IERSTV9NTV9DUkVBVEVfREVGQVVMVDsKIAl1NjQgc3RhcnQgPQogCQlmbGFncyAm IFBJTl9PRkZTRVRfQklBUyA/IGZsYWdzICYgUElOX09GRlNFVF9NQVNLIDogMDsKIAl1NjQgZW5k ID0KQEAgLTM3MTMsNiArMzcxNSwxOSBAQCBpOTE1X2dlbV9vYmplY3RfYmluZF90b192bShzdHJ1 Y3QgZHJtX2k5MTVfZ2VtX29iamVjdCAqb2JqLAogCQkJCQkJICAgb2JqLT50aWxpbmdfbW9kZSwK IAkJCQkJCSAgIGZhbHNlKTsKIAkJc2l6ZSA9IGZsYWdzICYgUElOX01BUFBBQkxFID8gZmVuY2Vf c2l6ZSA6IG9iai0+YmFzZS5zaXplOworCisJCS8qIFdhMzJiaXRHZW5lcmFsU3RhdGVPZmZzZXQg JiBXYTMyYml0SW5zdHJ1Y3Rpb25CYXNlT2Zmc2V0LAorCQkgKiBsaW1pdCBhZGRyZXNzIHRvIDRH Qi0xIGZvciBvYmplY3RzIHJlcXVpcmluZyB0aGlzIHdhOyBmb3IKKwkJICogb3RoZXJzLCBzZXQg YWxsb2MgZmxhZyB0byBUT1AuCisJCSAqLworCQlpZiAoVVNFU19GVUxMXzQ4QklUX1BQR1RUKGRl dikpIHsKKwkJCWlmIChmbGFncyAmIFBJTl9GVUxMX1JBTkdFKSB7CisJCQkJc2VhcmNoX2ZsYWcg PSBEUk1fTU1fU0VBUkNIX0JFTE9XOworCQkJCWFsbG9jX2ZsYWcgPSBEUk1fTU1fQ1JFQVRFX1RP UDsKKwkJCX0gZWxzZSB7CisJCQkJZW5kID0gKCg0VUxMIDw8IEdFTjhfUERQRV9TSElGVCkgLSAx KTsKKwkJCX0KKwkJfQogCX0KIAogCWlmIChhbGlnbm1lbnQgPT0gMCkKQEAgLTM3NTUsOCArMzc3 MCw4IEBAIHNlYXJjaF9mcmVlOgogCQkJCQkJICBzaXplLCBhbGlnbm1lbnQsCiAJCQkJCQkgIG9i ai0+Y2FjaGVfbGV2ZWwsCiAJCQkJCQkgIHN0YXJ0LCBlbmQsCi0JCQkJCQkgIERSTV9NTV9TRUFS Q0hfREVGQVVMVCwKLQkJCQkJCSAgRFJNX01NX0NSRUFURV9ERUZBVUxUKTsKKwkJCQkJCSAgc2Vh cmNoX2ZsYWcsCisJCQkJCQkgIGFsbG9jX2ZsYWcpOwogCWlmIChyZXQpIHsKIAkJcmV0ID0gaTkx NV9nZW1fZXZpY3Rfc29tZXRoaW5nKGRldiwgdm0sIHNpemUsIGFsaWdubWVudCwKIAkJCQkJICAg ICAgIG9iai0+Y2FjaGVfbGV2ZWwsCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9p OTE1X2dlbV9leGVjYnVmZmVyLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9leGVj YnVmZmVyLmMKaW5kZXggYmQwZTRiZC4uMDRhZjYyYiAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUv ZHJtL2k5MTUvaTkxNV9nZW1fZXhlY2J1ZmZlci5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1 L2k5MTVfZ2VtX2V4ZWNidWZmZXIuYwpAQCAtNTc3LDcgKzU3Nyw4IEBAIHN0YXRpYyBib29sIG9u bHlfbWFwcGFibGVfZm9yX3JlbG9jKHVuc2lnbmVkIGludCBmbGFncykKIHN0YXRpYyBpbnQKIGk5 MTVfZ2VtX2V4ZWNidWZmZXJfcmVzZXJ2ZV92bWEoc3RydWN0IGk5MTVfdm1hICp2bWEsCiAJCQkJ c3RydWN0IGludGVsX2VuZ2luZV9jcyAqcmluZywKLQkJCQlib29sICpuZWVkX3JlbG9jKQorCQkJ CWJvb2wgKm5lZWRfcmVsb2MsCisJCQkJYm9vbCBzdXBwb3J0XzQ4YmFkZHIpCiB7CiAJc3RydWN0 IGRybV9pOTE1X2dlbV9vYmplY3QgKm9iaiA9IHZtYS0+b2JqOwogCXN0cnVjdCBkcm1faTkxNV9n ZW1fZXhlY19vYmplY3QyICplbnRyeSA9IHZtYS0+ZXhlY19lbnRyeTsKQEAgLTU4OCw2ICs1ODks OSBAQCBpOTE1X2dlbV9leGVjYnVmZmVyX3Jlc2VydmVfdm1hKHN0cnVjdCBpOTE1X3ZtYSAqdm1h LAogCWlmIChlbnRyeS0+ZmxhZ3MgJiBFWEVDX09CSkVDVF9ORUVEU19HVFQpCiAJCWZsYWdzIHw9 IFBJTl9HTE9CQUw7CiAKKwlpZiAoc3VwcG9ydF80OGJhZGRyKQorCQlmbGFncyB8PSBQSU5fRlVM TF9SQU5HRTsKKwogCWlmICghZHJtX21tX25vZGVfYWxsb2NhdGVkKCZ2bWEtPm5vZGUpKSB7CiAJ CWlmIChlbnRyeS0+ZmxhZ3MgJiBfX0VYRUNfT0JKRUNUX05FRURTX01BUCkKIAkJCWZsYWdzIHw9 IFBJTl9HTE9CQUwgfCBQSU5fTUFQUEFCTEU7CkBAIC02NTAsNyArNjU0LDcgQEAgbmVlZF9yZWxv Y19tYXBwYWJsZShzdHJ1Y3QgaTkxNV92bWEgKnZtYSkKIH0KIAogc3RhdGljIGJvb2wKLWViX3Zt YV9taXNwbGFjZWQoc3RydWN0IGk5MTVfdm1hICp2bWEpCitlYl92bWFfbWlzcGxhY2VkKHN0cnVj dCBpOTE1X3ZtYSAqdm1hLCBib29sIHN1cHBvcnRfNDhiYWRkcikKIHsKIAlzdHJ1Y3QgZHJtX2k5 MTVfZ2VtX2V4ZWNfb2JqZWN0MiAqZW50cnkgPSB2bWEtPmV4ZWNfZW50cnk7CiAJc3RydWN0IGRy bV9pOTE1X2dlbV9vYmplY3QgKm9iaiA9IHZtYS0+b2JqOwpAQCAtNjcwLDEzICs2NzQsMTggQEAg ZWJfdm1hX21pc3BsYWNlZChzdHJ1Y3QgaTkxNV92bWEgKnZtYSkKIAlpZiAoZW50cnktPmZsYWdz ICYgX19FWEVDX09CSkVDVF9ORUVEU19NQVAgJiYgIW9iai0+bWFwX2FuZF9mZW5jZWFibGUpCiAJ CXJldHVybiAhb25seV9tYXBwYWJsZV9mb3JfcmVsb2MoZW50cnktPmZsYWdzKTsKIAorCWlmICgh c3VwcG9ydF80OGJhZGRyICYmCisJICAgIHZtYS0+bm9kZS5zdGFydCA+PSAoMVVMTCA8PCAzMikp CisJCXJldHVybiB0cnVlOworCiAJcmV0dXJuIGZhbHNlOwogfQogCiBzdGF0aWMgaW50CiBpOTE1 X2dlbV9leGVjYnVmZmVyX3Jlc2VydmUoc3RydWN0IGludGVsX2VuZ2luZV9jcyAqcmluZywKIAkJ CSAgICBzdHJ1Y3QgbGlzdF9oZWFkICp2bWFzLAotCQkJICAgIGJvb2wgKm5lZWRfcmVsb2NzKQor CQkJICAgIGJvb2wgKm5lZWRfcmVsb2NzLAorCQkJICAgIGJvb2wgc3VwcG9ydF80OGJhZGRyKQog ewogCXN0cnVjdCBkcm1faTkxNV9nZW1fb2JqZWN0ICpvYmo7CiAJc3RydWN0IGk5MTVfdm1hICp2 bWE7CkBAIC03MzcsMTAgKzc0NiwxMSBAQCBpOTE1X2dlbV9leGVjYnVmZmVyX3Jlc2VydmUoc3Ry dWN0IGludGVsX2VuZ2luZV9jcyAqcmluZywKIAkJCWlmICghZHJtX21tX25vZGVfYWxsb2NhdGVk KCZ2bWEtPm5vZGUpKQogCQkJCWNvbnRpbnVlOwogCi0JCQlpZiAoZWJfdm1hX21pc3BsYWNlZCh2 bWEpKQorCQkJaWYgKGViX3ZtYV9taXNwbGFjZWQodm1hLCBzdXBwb3J0XzQ4YmFkZHIpKQogCQkJ CXJldCA9IGk5MTVfdm1hX3VuYmluZCh2bWEpOwogCQkJZWxzZQotCQkJCXJldCA9IGk5MTVfZ2Vt X2V4ZWNidWZmZXJfcmVzZXJ2ZV92bWEodm1hLCByaW5nLCBuZWVkX3JlbG9jcyk7CisJCQkJcmV0 ID0gaTkxNV9nZW1fZXhlY2J1ZmZlcl9yZXNlcnZlX3ZtYSh2bWEsIHJpbmcsIG5lZWRfcmVsb2Nz LAorCQkJCQkJCQkgICAgICBzdXBwb3J0XzQ4YmFkZHIpOwogCQkJaWYgKHJldCkKIAkJCQlnb3Rv IGVycjsKIAkJfQpAQCAtNzUwLDcgKzc2MCw5IEBAIGk5MTVfZ2VtX2V4ZWNidWZmZXJfcmVzZXJ2 ZShzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICpyaW5nLAogCQkJaWYgKGRybV9tbV9ub2RlX2FsbG9j YXRlZCgmdm1hLT5ub2RlKSkKIAkJCQljb250aW51ZTsKIAotCQkJcmV0ID0gaTkxNV9nZW1fZXhl Y2J1ZmZlcl9yZXNlcnZlX3ZtYSh2bWEsIHJpbmcsIG5lZWRfcmVsb2NzKTsKKwkJCXJldCA9IGk5 MTVfZ2VtX2V4ZWNidWZmZXJfcmVzZXJ2ZV92bWEodm1hLCByaW5nLAorCQkJCQkJCSAgICAgIG5l ZWRfcmVsb2NzLAorCQkJCQkJCSAgICAgIHN1cHBvcnRfNDhiYWRkcik7CiAJCQlpZiAocmV0KQog CQkJCWdvdG8gZXJyOwogCQl9CkBAIC03ODAsNyArNzkyLDcgQEAgaTkxNV9nZW1fZXhlY2J1ZmZl cl9yZWxvY2F0ZV9zbG93KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsCiAJc3RydWN0IGRybV9pOTE1 X2dlbV9yZWxvY2F0aW9uX2VudHJ5ICpyZWxvYzsKIAlzdHJ1Y3QgaTkxNV9hZGRyZXNzX3NwYWNl ICp2bTsKIAlzdHJ1Y3QgaTkxNV92bWEgKnZtYTsKLQlib29sIG5lZWRfcmVsb2NzOworCWJvb2wg bmVlZF9yZWxvY3MsIHN1cHBvcnRfNDhiYWRkcjsKIAlpbnQgKnJlbG9jX29mZnNldDsKIAlpbnQg aSwgdG90YWwsIHJldDsKIAl1bnNpZ25lZCBjb3VudCA9IGFyZ3MtPmJ1ZmZlcl9jb3VudDsKQEAg LTg2MSw3ICs4NzMsOSBAQCBpOTE1X2dlbV9leGVjYnVmZmVyX3JlbG9jYXRlX3Nsb3coc3RydWN0 IGRybV9kZXZpY2UgKmRldiwKIAkJZ290byBlcnI7CiAKIAluZWVkX3JlbG9jcyA9IChhcmdzLT5m bGFncyAmIEk5MTVfRVhFQ19OT19SRUxPQykgPT0gMDsKLQlyZXQgPSBpOTE1X2dlbV9leGVjYnVm ZmVyX3Jlc2VydmUocmluZywgJmViLT52bWFzLCAmbmVlZF9yZWxvY3MpOworCXN1cHBvcnRfNDhi YWRkciA9IChhcmdzLT5mbGFncyAmIEk5MTVfRVhFQ19TVVBQT1JUXzQ4QkFERFJFU1MpOworCXJl dCA9IGk5MTVfZ2VtX2V4ZWNidWZmZXJfcmVzZXJ2ZShyaW5nLCAmZWItPnZtYXMsICZuZWVkX3Jl bG9jcywKKwkJCQkJICBzdXBwb3J0XzQ4YmFkZHIpOwogCWlmIChyZXQpCiAJCWdvdG8gZXJyOwog CkBAIC0xNDExLDcgKzE0MjUsNyBAQCBpOTE1X2dlbV9kb19leGVjYnVmZmVyKHN0cnVjdCBkcm1f ZGV2aWNlICpkZXYsIHZvaWQgKmRhdGEsCiAJdTY0IGV4ZWNfc3RhcnQgPSBhcmdzLT5iYXRjaF9z dGFydF9vZmZzZXQ7CiAJdTMyIGRpc3BhdGNoX2ZsYWdzOwogCWludCByZXQ7Ci0JYm9vbCBuZWVk X3JlbG9jczsKKwlib29sIG5lZWRfcmVsb2NzLCBzdXBwb3J0XzQ4YmFkZHI7CiAKIAlpZiAoIWk5 MTVfZ2VtX2NoZWNrX2V4ZWNidWZmZXIoYXJncykpCiAJCXJldHVybiAtRUlOVkFMOwpAQCAtMTUx OSw3ICsxNTMzLDkgQEAgaTkxNV9nZW1fZG9fZXhlY2J1ZmZlcihzdHJ1Y3QgZHJtX2RldmljZSAq ZGV2LCB2b2lkICpkYXRhLAogCiAJLyogTW92ZSB0aGUgb2JqZWN0cyBlbi1tYXNzZSBpbnRvIHRo ZSBHVFQsIGV2aWN0aW5nIGlmIG5lY2Vzc2FyeS4gKi8KIAluZWVkX3JlbG9jcyA9IChhcmdzLT5m bGFncyAmIEk5MTVfRVhFQ19OT19SRUxPQykgPT0gMDsKLQlyZXQgPSBpOTE1X2dlbV9leGVjYnVm ZmVyX3Jlc2VydmUocmluZywgJmViLT52bWFzLCAmbmVlZF9yZWxvY3MpOworCXN1cHBvcnRfNDhi YWRkciA9IChhcmdzLT5mbGFncyAmIEk5MTVfRVhFQ19TVVBQT1JUXzQ4QkFERFJFU1MpOworCXJl dCA9IGk5MTVfZ2VtX2V4ZWNidWZmZXJfcmVzZXJ2ZShyaW5nLCAmZWItPnZtYXMsICZuZWVkX3Jl bG9jcywKKwkJCQkJICBzdXBwb3J0XzQ4YmFkZHIpOwogCWlmIChyZXQpCiAJCWdvdG8gZXJyOwog CmRpZmYgLS1naXQgYS9pbmNsdWRlL3VhcGkvZHJtL2k5MTVfZHJtLmggYi9pbmNsdWRlL3VhcGkv ZHJtL2k5MTVfZHJtLmgKaW5kZXggNDg1MWQ2Ni4uMThkZjM0YSAxMDA2NDQKLS0tIGEvaW5jbHVk ZS91YXBpL2RybS9pOTE1X2RybS5oCisrKyBiL2luY2x1ZGUvdWFwaS9kcm0vaTkxNV9kcm0uaApA QCAtNzYwLDcgKzc2MCw5IEBAIHN0cnVjdCBkcm1faTkxNV9nZW1fZXhlY2J1ZmZlcjIgewogI2Rl ZmluZSBJOTE1X0VYRUNfQlNEX1JJTkcxCQkoMTw8MTMpCiAjZGVmaW5lIEk5MTVfRVhFQ19CU0Rf UklORzIJCSgyPDwxMykKIAotI2RlZmluZSBfX0k5MTVfRVhFQ19VTktOT1dOX0ZMQUdTIC0oMTw8 MTUpCisjZGVmaW5lIEk5MTVfRVhFQ19TVVBQT1JUXzQ4QkFERFJFU1MJKDE8PDE1KQorCisjZGVm aW5lIF9fSTkxNV9FWEVDX1VOS05PV05fRkxBR1MgLSgxPDwxNikKIAogI2RlZmluZSBJOTE1X0VY RUNfQ09OVEVYVF9JRF9NQVNLCSgweGZmZmZmZmZmKQogI2RlZmluZSBpOTE1X2V4ZWNidWZmZXIy X3NldF9jb250ZXh0X2lkKGViMiwgY29udGV4dCkgXAotLSAKMi40LjAKCl9fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCkludGVsLWdmeCBtYWlsaW5nIGxpc3QK SW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwOi8vbGlzdHMuZnJlZWRlc2t0b3Au b3JnL21haWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4Cg==