From mboxrd@z Thu Jan 1 00:00:00 1970 From: Yunwei Zhang Subject: [PATCH v3 1/3] drm/i915/cnl: Implement WaProgramMgsrForCorrectSliceSpecificMmioReads Date: Fri, 18 May 2018 15:04:50 -0700 Message-ID: <1526681090-22483-1-git-send-email-yunwei.zhang@intel.com> References: <1526667152-9371-1-git-send-email-yunwei.zhang@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga04.intel.com (mga04.intel.com [192.55.52.120]) by gabe.freedesktop.org (Postfix) with ESMTPS id B230D6EF3E for ; Fri, 18 May 2018 22:13:53 +0000 (UTC) In-Reply-To: <1526667152-9371-1-git-send-email-yunwei.zhang@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 V2FQcm9ncmFtTWdzckZvckNvcnJlY3RTbGljZVNwZWNpZmljTW1pb1JlYWRzIGRpY3RhdGUgdGhh dCBiZWZvcmUgYW55IE1NSU8KcmVhZCBpbnRvIFNsaWNlL1N1YnNsaWNlIHNwZWNpZmljIHJlZ2lz dGVycywgTUNSIHBhY2tldCBjb250cm9sCnJlZ2lzdGVyKDB4RkRDKSBuZWVkcyB0byBiZSBwcm9n cmFtbWVkIHRvIHBvaW50IHRvIGFueSBlbmFibGVkCnNsaWNlL3N1YnNsaWNlIHBhaXIuIE90aGVy d2lzZSwgaW5jb3JyZWN0IHZhbHVlIHdpbGwgYmUgcmV0dXJuZWQuCgpIb3dldmVyLCB0aGF0IG1l YW5zIGVhY2ggc3Vic2VxdWVudCBNTUlPIHJlYWQgd2lsbCBiZSBmb3J3YXJkZWQgdG8gYQpzcGVj aWZpYyBzbGljZS9zdWJzbGljZSBjb21iaW5hdGlvbiBhcyByZWFkIGlzIHVuaWNhc3QuIFRoaXMg aXMgT0sgc2luY2UKc2xpY2Uvc3Vic2xpY2Ugc3BlY2lmaWMgcmVnaXN0ZXIgdmFsdWVzIGFyZSBj b25zaXN0ZW50IGluIGFsbW9zdCBhbGwgY2FzZXMKYWNyb3NzIHNsaWNlL3N1YnNsaWNlLiBUaGVy ZSBhcmUgcmFyZSBvY2Nhc2lvbnMgc3VjaCBhcyBJTlNURE9ORSB0aGF0IHRoaXMKdmFsdWUgd2ls bCBiZSBkZXBlbmRlbnQgb24gc2xpY2Uvc3Vic2xpY2UgY29tYm8sIGluIHN1Y2ggY2FzZXMsIHdl IG5lZWQgdG8KcHJvZ3JhbSAweEZEQyBhbmQgcmVjb3ZlciB0aGlzIGFmdGVyLiBUaGlzIGlzIGFs cmVhZHkgY292ZXJlZCBieQpyZWFkX3N1YnNsaWNlX3JlZy4KCkFsc28sIDB4RkRDIHdpbGwgbG9z ZSBpdHMgaW5mb3JtYXRpb24gYWZ0ZXIgVERSL2VuZ2luZSByZXNldC9wb3dlciBzdGF0ZQpjaGFu Z2UuCgpSZWZlcmVuY2VzOiBIU0QjMTQwNTU4Njg0MCwgQlNJRCMwNTc1Cgp2MjoKIC0gdXNlIGZs cygpIGluc3RlYWQgb2YgZmluZF9sYXN0X2JpdCgpIChDaHJpcykKIC0gYWRkZWQgSU5URUxfU1NF VSB0byBleHRyYWN0IHNzZXUgZnJvbSBkZXZpY2UgaW5mby4gKENocmlzKQp2MzoKIC0gcmViYXNl IG9uIGxhdGVzdCB0aXAKdjU6CiAtIEFkZGVkIHJlZmVyZW5jZXMgKE1pa2EpCiAtIENoYW5nZSB0 aGUgb3JkZXJlZCBvZiBwYXNzaW5nIGFyZ3VtZW50cyBhbmQgZXRjLiAoVXJzdWxpbikKdjc6CiAt IE1vdmVkIFdBIGV4cGxhbmF0aW9uIENvbW1lbnRzKE9zY2FyKQogLSBSZWJhc2VkLgp2ODoKIC0g UmVuYW1lZCBzYW5pdGl6ZV9tY3IgdG8gY2FsY3VsYXRlX3Nfc3Nfc2VsZWN0LiAoT3NjYXIpCiAt IGNhbGN1bGF0ZSBzL3NzIHNlbGVjdG9yIGluc3RlYWQgb2Ygd2hvbGUgbWNyLiAoT3NjYXIpCnY5 OgogLSBVcGRhdGVkIGZ1bmN0aW9uIG5hbWUgKE9zY2FyKQogLSBSZW1vdmUgcmVkdW5kYW50IHZh cmlhYmxlcyAoT3NjYXIpCgpDYzogT3NjYXIgTWF0ZW8gPG9zY2FyLm1hdGVvQGludGVsLmNvbT4K Q2M6IE1pY2hlbCBUaGllcnJ5IDxtaWNoZWwudGhpZXJyeUBpbnRlbC5jb20+CkNjOiBKb29uYXMg TGFodGluZW4gPGpvb25hcy5sYWh0aW5lbkBsaW51eC5pbnRlbC5jb20+CkNjOiBDaHJpcyBXaWxz b24gPGNocmlzQGNocmlzLXdpbHNvbi5jby51az4KQ2M6IE1pa2EgS3VvcHBhbGEgPG1pa2Eua3Vv cHBhbGFAbGludXguaW50ZWwuY29tPgpDYzogVHZydGtvIFVyc3VsaW4gPHR2cnRrby51cnN1bGlu QGxpbnV4LmludGVsLmNvbT4KU2lnbmVkLW9mZi1ieTogWXVud2VpIFpoYW5nIDx5dW53ZWkuemhh bmdAaW50ZWwuY29tPgotLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmggICAgICAg ICAgfCAgMiArKwogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZW5naW5lX2NzLmMgICB8IDMw ICsrKysrKysrKysrKysrKysrKysrKysrKystLS0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50 ZWxfd29ya2Fyb3VuZHMuYyB8IDMxICsrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysKIDMg ZmlsZXMgY2hhbmdlZCwgNTggaW5zZXJ0aW9ucygrKSwgNSBkZWxldGlvbnMoLSkKCmRpZmYgLS1n aXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5oIGIvZHJpdmVycy9ncHUvZHJtL2k5 MTUvaTkxNV9kcnYuaAppbmRleCBlMzNjMzgwLi4zYjhhMDQ3IDEwMDY0NAotLS0gYS9kcml2ZXJz L2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5oCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVf ZHJ2LmgKQEAgLTI3NDQsNiArMjc0NCw4IEBAIGludCB2bHZfZm9yY2VfZ2Z4X2Nsb2NrKHN0cnVj dCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiwgYm9vbCBvbik7CiBpbnQgaW50ZWxfZW5naW5l c19pbml0X21taW8oc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KTsKIGludCBpbnRl bF9lbmdpbmVzX2luaXQoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KTsKIAordTMy IGludGVsX2NhbGN1bGF0ZV9tY3Jfc19zc19zZWxlY3Qoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUg KmRldl9wcml2KTsKKwogLyogaW50ZWxfaG90cGx1Zy5jICovCiB2b2lkIGludGVsX2hwZF9pcnFf aGFuZGxlcihzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYsCiAJCQkgICB1MzIgcGlu X21hc2ssIHUzMiBsb25nX21hc2spOwpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUv aW50ZWxfZW5naW5lX2NzLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9lbmdpbmVfY3Mu YwppbmRleCAyNmY5ZjhhLi44MzI0MTllIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkx NS9pbnRlbF9lbmdpbmVfY3MuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9lbmdp bmVfY3MuYwpAQCAtODE5LDEyICs4MTksMjkgQEAgY29uc3QgY2hhciAqaTkxNV9jYWNoZV9sZXZl bF9zdHIoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmk5MTUsIGludCB0eXBlKQogCX0KIH0KIAor dTMyIGludGVsX2NhbGN1bGF0ZV9tY3Jfc19zc19zZWxlY3Qoc3RydWN0IGRybV9pOTE1X3ByaXZh dGUgKmRldl9wcml2KQoreworCWNvbnN0IHN0cnVjdCBzc2V1X2Rldl9pbmZvICpzc2V1ID0gJihJ TlRFTF9JTkZPKGRldl9wcml2KS0+c3NldSk7CisJdTMyIG1jcl9zX3NzX3NlbGVjdDsKKwl1MzIg c2xpY2UgPSBmbHMoc3NldS0+c2xpY2VfbWFzayk7CisJdTMyIHN1YnNsaWNlID0gZmxzKHNzZXUt PnN1YnNsaWNlX21hc2tbc2xpY2VdKTsKKworCWlmIChJTlRFTF9HRU4oZGV2X3ByaXYpID09IDEw KQorCQltY3Jfc19zc19zZWxlY3QgPSBHRU44X01DUl9TTElDRShzbGljZSkgfAorCQkJCSAgR0VO OF9NQ1JfU1VCU0xJQ0Uoc3Vic2xpY2UpOworCWVsc2UKKwkJbWNyX3Nfc3Nfc2VsZWN0ID0gMDsK KworCXJldHVybiBtY3Jfc19zc19zZWxlY3Q7Cit9CisKIHN0YXRpYyBpbmxpbmUgdWludDMyX3QK IHJlYWRfc3Vic2xpY2VfcmVnKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiwgaW50 IHNsaWNlLAogCQkgIGludCBzdWJzbGljZSwgaTkxNV9yZWdfdCByZWcpCiB7CiAJdWludDMyX3Qg bWNyX3NsaWNlX3N1YnNsaWNlX21hc2s7CiAJdWludDMyX3QgbWNyX3NsaWNlX3N1YnNsaWNlX3Nl bGVjdDsKKwl1aW50MzJfdCBkZWZhdWx0X21jcl9zX3NzX3NlbGVjdDsKIAl1aW50MzJfdCBtY3I7 CiAJdWludDMyX3QgcmV0OwogCWVudW0gZm9yY2V3YWtlX2RvbWFpbnMgZndfZG9tYWluczsKQEAg LTg0MSw2ICs4NTgsOCBAQCByZWFkX3N1YnNsaWNlX3JlZyhzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0 ZSAqZGV2X3ByaXYsIGludCBzbGljZSwKIAkJCQkJICAgIEdFTjhfTUNSX1NVQlNMSUNFKHN1YnNs aWNlKTsKIAl9CiAKKwlkZWZhdWx0X21jcl9zX3NzX3NlbGVjdCA9IGludGVsX2NhbGN1bGF0ZV9t Y3Jfc19zc19zZWxlY3QoZGV2X3ByaXYpOworCiAJZndfZG9tYWlucyA9IGludGVsX3VuY29yZV9m b3JjZXdha2VfZm9yX3JlZyhkZXZfcHJpdiwgcmVnLAogCQkJCQkJICAgIEZXX1JFR19SRUFEKTsK IAlmd19kb21haW5zIHw9IGludGVsX3VuY29yZV9mb3JjZXdha2VfZm9yX3JlZyhkZXZfcHJpdiwK QEAgLTg1MSwxMSArODcwLDEwIEBAIHJlYWRfc3Vic2xpY2VfcmVnKHN0cnVjdCBkcm1faTkxNV9w cml2YXRlICpkZXZfcHJpdiwgaW50IHNsaWNlLAogCWludGVsX3VuY29yZV9mb3JjZXdha2VfZ2V0 X19sb2NrZWQoZGV2X3ByaXYsIGZ3X2RvbWFpbnMpOwogCiAJbWNyID0gSTkxNV9SRUFEX0ZXKEdF TjhfTUNSX1NFTEVDVE9SKTsKLQkvKgotCSAqIFRoZSBIVyBleHBlY3RzIHRoZSBzbGljZSBhbmQg c3VibGljZSBzZWxlY3RvcnMgdG8gYmUgcmVzZXQgdG8gMAotCSAqIGFmdGVyIHJlYWRpbmcgb3V0 IHRoZSByZWdpc3RlcnMuCi0JICovCi0JV0FSTl9PTl9PTkNFKG1jciAmIG1jcl9zbGljZV9zdWJz bGljZV9tYXNrKTsKKworCVdBUk5fT05fT05DRSgobWNyICYgbWNyX3NsaWNlX3N1YnNsaWNlX21h c2spICE9CisJCSAgICAgZGVmYXVsdF9tY3Jfc19zc19zZWxlY3QpOworCiAJbWNyICY9IH5tY3Jf c2xpY2Vfc3Vic2xpY2VfbWFzazsKIAltY3IgfD0gbWNyX3NsaWNlX3N1YnNsaWNlX3NlbGVjdDsK IAlJOTE1X1dSSVRFX0ZXKEdFTjhfTUNSX1NFTEVDVE9SLCBtY3IpOwpAQCAtODYzLDYgKzg4MSw4 IEBAIHJlYWRfc3Vic2xpY2VfcmVnKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiwg aW50IHNsaWNlLAogCXJldCA9IEk5MTVfUkVBRF9GVyhyZWcpOwogCiAJbWNyICY9IH5tY3Jfc2xp Y2Vfc3Vic2xpY2VfbWFzazsKKwltY3IgfD0gZGVmYXVsdF9tY3Jfc19zc19zZWxlY3Q7CisKIAlJ OTE1X1dSSVRFX0ZXKEdFTjhfTUNSX1NFTEVDVE9SLCBtY3IpOwogCiAJaW50ZWxfdW5jb3JlX2Zv cmNld2FrZV9wdXRfX2xvY2tlZChkZXZfcHJpdiwgZndfZG9tYWlucyk7CmRpZmYgLS1naXQgYS9k cml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF93b3JrYXJvdW5kcy5jIGIvZHJpdmVycy9ncHUvZHJt L2k5MTUvaW50ZWxfd29ya2Fyb3VuZHMuYwppbmRleCAyZGYzNTM4Li40OTdiZjc1IDEwMDY0NAot LS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF93b3JrYXJvdW5kcy5jCisrKyBiL2RyaXZl cnMvZ3B1L2RybS9pOTE1L2ludGVsX3dvcmthcm91bmRzLmMKQEAgLTY3Miw4ICs2NzIsMzkgQEAg c3RhdGljIHZvaWQgY2ZsX2d0X3dvcmthcm91bmRzX2FwcGx5KHN0cnVjdCBkcm1faTkxNV9wcml2 YXRlICpkZXZfcHJpdikKIAkJICAgR0FNVF9FQ09fRU5BQkxFX0lOX1BMQUNFX0RFQ09NUFJFU1Mp OwogfQogCitzdGF0aWMgdm9pZCB3YV9pbml0X21jcihzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAq ZGV2X3ByaXYpCit7CisJdTMyIG1jcjsKKwl1MzIgbWNyX3NsaWNlX3N1YnNsaWNlX21hc2s7CisK KwltY3IgPSBJOTE1X1JFQUQoR0VOOF9NQ1JfU0VMRUNUT1IpOworCisJaWYgKElOVEVMX0dFTihk ZXZfcHJpdikgPj0gMTEpCisJCW1jcl9zbGljZV9zdWJzbGljZV9tYXNrID0gR0VOMTFfTUNSX1NM SUNFX01BU0sgfAorCQkJCQkgIEdFTjExX01DUl9TVUJTTElDRV9NQVNLOworCWVsc2UKKwkJbWNy X3NsaWNlX3N1YnNsaWNlX21hc2sgPSBHRU44X01DUl9TTElDRV9NQVNLIHwKKwkJCQkJICBHRU44 X01DUl9TVUJTTElDRV9NQVNLOworCS8qCisJICogV2FQcm9ncmFtTWdzckZvckNvcnJlY3RTbGlj ZVNwZWNpZmljTW1pb1JlYWRzOmNubAorCSAqIEJlZm9yZSBhbnkgTU1JTyByZWFkIGludG8gc2xp Y2Uvc3Vic2xpY2Ugc3BlY2lmaWMgcmVnaXN0ZXJzLCBNQ1IKKwkgKiBwYWNrZXQgY29udHJvbCBy ZWdpc3RlciBuZWVkcyB0byBiZSBwcm9ncmFtbWVkIHRvIHBvaW50IHRvIGFueQorCSAqIGVuYWJs ZWQgcy9zcyBwYWlyLiBPdGhlcndpc2UsIGluY29ycmVjdCB2YWx1ZXMgd2lsbCBiZSByZXR1cm5l ZC4KKwkgKiBUaGlzIG1lYW5zIGVhY2ggc3Vic2VxdWVudCBNTUlPIHJlYWQgd2lsbCBiZSBmb3J3 YXJkZWQgdG8gYW4KKwkgKiBzcGVjaWZpYyBzL3NzIGNvbWJpbmF0aW9uLCBidXQgdGhpcyBpcyBP SyBzaW5jZSB0aGVzZSByZWdpc3RlcnMKKwkgKiBhcmUgY29uc2lzdGVudCBhY3Jvc3Mgcy9zcyBp biBhbG1vc3QgYWxsIGNhc2VzLiBJbiB0aGUgcmFyZQorCSAqIG9jY2FzaW9ucywgc3VjaCBhcyBJ TlNURE9ORSwgd2hlcmUgdGhpcyB2YWx1ZSBpcyBkZXBlbmRlbnQKKwkgKiBvbiBzL3NzIGNvbWJv LCB0aGUgcmVhZCBzaG91bGQgYmUgZG9uZSB3aXRoIHJlYWRfc3Vic2xpY2VfcmVnLgorCSAqLwor CW1jciAmPSB+bWNyX3NsaWNlX3N1YnNsaWNlX21hc2s7CisJbWNyIHw9IGludGVsX2NhbGN1bGF0 ZV9tY3Jfc19zc19zZWxlY3QoZGV2X3ByaXYpOworCUk5MTVfV1JJVEUoR0VOOF9NQ1JfU0VMRUNU T1IsIG1jcik7Cit9CisKIHN0YXRpYyB2b2lkIGNubF9ndF93b3JrYXJvdW5kc19hcHBseShzdHJ1 Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpCiB7CisJd2FfaW5pdF9tY3IoZGV2X3ByaXYp OworCiAJLyogV2FEaXNhYmxlSTJtQ3ljbGVPbldSUG9ydDpjbmwgKHByZS1wcm9kKSAqLwogCWlm IChJU19DTkxfUkVWSUQoZGV2X3ByaXYsIENOTF9SRVZJRF9CMCwgQ05MX1JFVklEX0IwKSkKIAkJ STkxNV9XUklURShHQU1UX0NIS05fQklUX1JFRywKLS0gCjIuNy40CgpfX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0Cklu dGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5v cmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK