From: Jon Bloomfield Subject: [PATCH] drm/i915: Serialize GTT/Aperture accesses on BXT Date: Wed, 24 May 2017 08:54:11 -0700 Message-ID: <1495641251-30022-1-git-send-email-jon.bloomfield@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga05.intel.com (mga05.intel.com [192.55.52.43]) by gabe.freedesktop.org (Postfix) with ESMTPS id 258D26E7E4 for ; Wed, 24 May 2017 15:54:31 +0000 (UTC) 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 Cc: Daniel Vetter List-Id: intel-gfx@lists.freedesktop.org QlhUIGhhcyBhIEgvVyBpc3N1ZSB3aXRoIElPTU1VIHdoaWNoIGNhbiBsZWFkIHRvIHN5c3RlbSBo YW5ncyB3aGVuCkFwZXJ0dXJlIGFjY2Vzc2VzIGFyZSBxdWV1ZWQgd2l0aGluIHRoZSBHQU0gYmVo aW5kIEdUVCBBY2Nlc3Nlcy4KClRoaXMgcGF0Y2ggYXZvaWRzIHRoZSBjb25kaXRpb24gYnkgd3Jh cHBpbmcgYWxsIEdUVCB1cGRhdGVzIGluIHN0b3BfbWFjaGluZQphbmQgdXNpbmcgYSBmbHVzaGlu ZyByZWFkIHByaW9yIHRvIHJlc3RhcnRpbmcgdGhlIG1hY2hpbmUuCgpUaGUgc3RvcF9tYWNoaW5l IGd1YXJhbnRlZXMgbm8gbmV3IEFwZXJ0dXJlIGFjY2Vzc2VzIGNhbiBiZWdpbiB3aGlsZQp0aGUg UFRFIHdyaXRlcyBhcmUgYmVpbmcgZW1taXR0ZWQuIFRoZSBmbHVzaGluZyByZWFkIGVuc3VyZXMg dGhhdAphbnkgZm9sbG93aW5nIEFwZXJ0dXJlIGFjY2Vzc2VzIGNhbm5vdCBiZWdpbiB1bnRpbCB0 aGUgUFRFIHdyaXRlcwpoYXZlIGJlZW4gY2xlYXJlZCBvdXQgb2YgdGhlIEdBTSdzIGZpZm8uCgpP bmx5IEZPTExPV0lORyBBcGVydHVyZSBhY2Nlc3NlcyBuZWVkIHRvIGJlIHNlcGFyYXRlZCBmcm9t IGluIGZsaWdodApQVEUgdXBkYXRlcy4gUFRFIFdyaXRlcyBtYXkgZm9sbG93IHRpZ2h0bHkgYmVo aW5kIGFscmVhZHkgaW4gZmxpZ2h0CkFwZXJ0dXJlIGFjY2Vzc2VzLCBzbyBubyBmbHVzaGluZyBy ZWFkIGlzIHJlcXVpcmVkIGF0IHRoZSBzdGFydCBvZgphIFBURSB1cGRhdGUgc2VxdWVuY2UuCgpU aGlzIGlzc3VlIHdhcyByZXByb2R1Y2VkIGJ5IHJ1bm5pbmcKCWlndC9nZW1fcmVhZHdyaXRlIGFu ZAoJaWd0L2dlbV9yZW5kZXJfY29weQpzaW11bHRhbmVvdXNseSBmcm9tIGRpZmZlcmVudCBwcm9j ZXNzZXMsIGVhY2ggaW4gYSB0aWdodCBsb29wLAp3aXRoIElOVEVMX0lPTU1VIGVuYWJsZWQuCgpU aGlzIHBhdGNoIHdhcyBvcmlnaW5hbGx5IHB1Ymxpc2hlZCBhczoKCWRybS9pOTE1OiBTZXJpYWxp emUgR1RUIFVwZGF0ZXMgb24gQlhUCgp2MjogTW92ZSBieHQvaW9tbXUgZGV0ZWN0aW9uIGludG8g c3RhdGljIGZ1bmN0aW9uCiAgICBSZW1vdmUgI2lmZGVmIENPTkZJR19JTlRFTF9JT01NVSBwcm90 ZWN0aW9uCiAgICBNYWtlIGZ1bmN0aW9uIG5hbWVzIG1vcmUgcmVmbGVjdGl2ZSBvZiBwdXJwb3Nl CiAgICBNb3ZlIGZsdXNoaW5nIHJlYWQgaW50byBzdGF0aWMgZnVuY3Rpb24KClNpZ25lZC1vZmYt Ynk6IEpvbiBCbG9vbWZpZWxkIDxqb24uYmxvb21maWVsZEBpbnRlbC5jb20+CkNjOiBKb2huIEhh cnJpc29uIDxqb2huLkMuSGFycmlzb25AaW50ZWwuY29tPgpDYzogQ2hyaXMgV2lsc29uIDxjaHJp c0BjaHJpcy13aWxzb24uY28udWs+CkNjOiBEYW5pZWwgVmV0dGVyIDxkYW5pZWwudmV0dGVyQGlu dGVsLmNvbT4KQ2M6IFR2cnRrbyBVcnN1bGluIDx0dnJ0a28udXJzdWxpbkBpbnRlbC5jb20+Ci0t LQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuaCAgICAgfCAgIDkgKysrCiBkcml2ZXJz L2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9ndHQuYyB8IDExNCArKysrKysrKysrKysrKysrKysrKysr KysrKysrKysrKysrKysKIDIgZmlsZXMgY2hhbmdlZCwgMTIzIGluc2VydGlvbnMoKykKCmRpZmYg LS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5oIGIvZHJpdmVycy9ncHUvZHJt L2k5MTUvaTkxNV9kcnYuaAppbmRleCAxNzg4M2E4Li5iMjc4M2IyIDEwMDY0NAotLS0gYS9kcml2 ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5oCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5 MTVfZHJ2LmgKQEAgLTMwMDYsNiArMzAwNiwxNSBAQCBzdGF0aWMgaW5saW5lIGJvb2wgaW50ZWxf c2Nhbm91dF9uZWVkc192dGRfd2Eoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KQog CXJldHVybiBmYWxzZTsKIH0KIAorc3RhdGljIGlubGluZSBib29sIGludGVsX2d0dF91cGRhdGVf bmVlZHNfdnRkX3dhKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdikKK3sKKyNpZmRl ZiBDT05GSUdfSU5URUxfSU9NTVUKKwlpZiAoSVNfQlJPWFRPTihkZXZfcHJpdikgJiYgaW50ZWxf aW9tbXVfZ2Z4X21hcHBlZCkKKwkJcmV0dXJuIHRydWU7CisjZW5kaWYKKwlyZXR1cm4gZmFsc2U7 Cit9CisKIGludCBpbnRlbF9zYW5pdGl6ZV9lbmFibGVfcHBndHQoc3RydWN0IGRybV9pOTE1X3By aXZhdGUgKmRldl9wcml2LAogCQkJCWludCBlbmFibGVfcHBndHQpOwogCmRpZmYgLS1naXQgYS9k cml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9ndHQuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1 L2k5MTVfZ2VtX2d0dC5jCmluZGV4IDdjNzY5ZDcuLmFiOTExNzggMTAwNjQ0Ci0tLSBhL2RyaXZl cnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2d0dC5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1 L2k5MTVfZ2VtX2d0dC5jCkBAIC0yMTkxLDYgKzIxOTEsMTEwIEBAIHN0YXRpYyB2b2lkIGdlbjhf Z2d0dF9jbGVhcl9yYW5nZShzdHJ1Y3QgaTkxNV9hZGRyZXNzX3NwYWNlICp2bSwKIAkJZ2VuOF9z ZXRfcHRlKCZndHRfYmFzZVtpXSwgc2NyYXRjaF9wdGUpOwogfQogCitzdGF0aWMgdm9pZCBieHRf dnRkX2d0dF93YShzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpCit7CisJLyoKKwkg KiBNYWtlIHN1cmUgdGhlIGludGVybmFsIEdBTSBmaWZvIGhhcyBiZWVuIGNsZWFyZWQgb2YgYWxs IEdUVAorCSAqIFdyaXRlcyBiZWZvcmUgZXhpdGluZyBzdG9wX21hY2hpbmUoKS4gVGhpcyBndWFy YW50ZWVzIHRoYXQKKwkgKiBhbnkgQXBlcnR1cmUgYWNjZXNzZXMgd2FpdGluZyB0byBzdGFydCBp biBhbm90aGVyIHByb2Nlc3MKKwkgKiBjYW5ub3QgYmFja3VwIGJlaGluZCB0aGUgR1RUIFdyaXRl cyBjYXVzaW5nIGEgaGFuZy4KKwkgKiBUaGUgcmVnaXN0ZXIgY2FuIGJlIGFueSBhcmJpdHJhcnkg R0FNIHJlZ2lzdGVyLgorCSAqLworCVBPU1RJTkdfUkVBRChHRlhfRkxTSF9DTlRMX0dFTjYpOwor fQorCitzdHJ1Y3QgaW5zZXJ0X3BhZ2UgeworCXN0cnVjdCBpOTE1X2FkZHJlc3Nfc3BhY2UgKnZt OworCWRtYV9hZGRyX3QgYWRkcjsKKwl1NjQgb2Zmc2V0OworCWVudW0gaTkxNV9jYWNoZV9sZXZl bCBsZXZlbDsKK307CisKK3N0YXRpYyBpbnQgYnh0X3Z0ZF9nZ3R0X2luc2VydF9wYWdlX19jYih2 b2lkICpfYXJnKQoreworCXN0cnVjdCBpbnNlcnRfcGFnZSAqYXJnID0gX2FyZzsKKworCXN0cnVj dCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9IGFyZy0+dm0tPmk5MTU7CisKKwlnZW44X2dn dHRfaW5zZXJ0X3BhZ2UoYXJnLT52bSwgYXJnLT5hZGRyLAorCQkJCWFyZy0+b2Zmc2V0LCBhcmct PmxldmVsLCAwKTsKKworCWJ4dF92dGRfZ3R0X3dhKGRldl9wcml2KTsKKworCXJldHVybiAwOwor fQorCitzdGF0aWMgdm9pZCBieHRfdnRkX2dndHRfaW5zZXJ0X3BhZ2VfX0JLTChzdHJ1Y3QgaTkx NV9hZGRyZXNzX3NwYWNlICp2bSwKKwkJCQkJICBkbWFfYWRkcl90IGFkZHIsCisJCQkJCSAgdTY0 IG9mZnNldCwKKwkJCQkJICBlbnVtIGk5MTVfY2FjaGVfbGV2ZWwgbGV2ZWwsCisJCQkJCSAgdTMy IHVudXNlZCkKK3sKKwlzdHJ1Y3QgaW5zZXJ0X3BhZ2UgYXJnID0geyB2bSwgYWRkciwgb2Zmc2V0 LCBsZXZlbCB9OworCisJc3RvcF9tYWNoaW5lKGJ4dF92dGRfZ2d0dF9pbnNlcnRfcGFnZV9fY2Is ICZhcmcsIE5VTEwpOworfQorCisKK3N0cnVjdCBpbnNlcnRfZW50cmllcyB7CisJc3RydWN0IGk5 MTVfYWRkcmVzc19zcGFjZSAqdm07CisJc3RydWN0IHNnX3RhYmxlICpzdDsKKwl1NjQgc3RhcnQ7 CisJZW51bSBpOTE1X2NhY2hlX2xldmVsIGxldmVsOworfTsKKworc3RhdGljIGludCBieHRfdnRk X2dndHRfaW5zZXJ0X2VudHJpZXNfX2NiKHZvaWQgKl9hcmcpCit7CisJc3RydWN0IGluc2VydF9l bnRyaWVzICphcmcgPSBfYXJnOworCisJc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2 ID0gYXJnLT52bS0+aTkxNTsKKworCWdlbjhfZ2d0dF9pbnNlcnRfZW50cmllcyhhcmctPnZtLCBh cmctPnN0LAorCQkJCQlhcmctPnN0YXJ0LCBhcmctPmxldmVsLCAwKTsKKworCWJ4dF92dGRfZ3R0 X3dhKGRldl9wcml2KTsKKworCXJldHVybiAwOworfQorCitzdGF0aWMgdm9pZCBieHRfdnRkX2dn dHRfaW5zZXJ0X2VudHJpZXNfX0JLTChzdHJ1Y3QgaTkxNV9hZGRyZXNzX3NwYWNlICp2bSwKKwkJ CQkJICAgICBzdHJ1Y3Qgc2dfdGFibGUgKnN0LAorCQkJCQkgICAgIHU2NCBzdGFydCwKKwkJCQkJ ICAgICBlbnVtIGk5MTVfY2FjaGVfbGV2ZWwgbGV2ZWwsCisJCQkJCSAgICAgdTMyIHVudXNlZCkK K3sKKwlzdHJ1Y3QgaW5zZXJ0X2VudHJpZXMgYXJnID0geyB2bSwgc3QsIHN0YXJ0LCBsZXZlbCB9 OworCisJc3RvcF9tYWNoaW5lKGJ4dF92dGRfZ2d0dF9pbnNlcnRfZW50cmllc19fY2IsICZhcmcs IE5VTEwpOworfQorCitzdHJ1Y3QgY2xlYXJfcmFuZ2UgeworCXN0cnVjdCBpOTE1X2FkZHJlc3Nf c3BhY2UgKnZtOworCXU2NCBzdGFydDsKKwl1NjQgbGVuZ3RoOworfTsKKworc3RhdGljIGludCBi eHRfdnRkX2dndHRfY2xlYXJfcmFuZ2VfX2NiKHZvaWQgKl9hcmcpCit7CisJc3RydWN0IGNsZWFy X3JhbmdlICphcmcgPSBfYXJnOworCisJc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2 ID0gYXJnLT52bS0+aTkxNTsKKworCWdlbjhfZ2d0dF9jbGVhcl9yYW5nZShhcmctPnZtLCBhcmct PnN0YXJ0LCBhcmctPmxlbmd0aCk7CisKKwlieHRfdnRkX2d0dF93YShkZXZfcHJpdik7CisKKwly ZXR1cm4gMDsKK30KKworc3RhdGljIHZvaWQgYnh0X3Z0ZF9nZ3R0X2NsZWFyX3JhbmdlX19CS0wo c3RydWN0IGk5MTVfYWRkcmVzc19zcGFjZSAqdm0sCisJCQkJCSAgdTY0IHN0YXJ0LAorCQkJCQkg IHU2NCBsZW5ndGgpCit7CisJc3RydWN0IGNsZWFyX3JhbmdlIGFyZyA9IHsgdm0sIHN0YXJ0LCBs ZW5ndGggfTsKKwlzdG9wX21hY2hpbmUoYnh0X3Z0ZF9nZ3R0X2NsZWFyX3JhbmdlX19jYiwgJmFy ZywgTlVMTCk7Cit9CisKIHN0YXRpYyB2b2lkIGdlbjZfZ2d0dF9jbGVhcl9yYW5nZShzdHJ1Y3Qg aTkxNV9hZGRyZXNzX3NwYWNlICp2bSwKIAkJCQkgIHU2NCBzdGFydCwgdTY0IGxlbmd0aCkKIHsK QEAgLTI3ODksNiArMjg5MywxNiBAQCBzdGF0aWMgaW50IGdlbjhfZ21jaF9wcm9iZShzdHJ1Y3Qg aTkxNV9nZ3R0ICpnZ3R0KQogCiAJZ2d0dC0+YmFzZS5pbnNlcnRfZW50cmllcyA9IGdlbjhfZ2d0 dF9pbnNlcnRfZW50cmllczsKIAorCS8qIFNlcmlhbGl6ZSBHVFQgdXBkYXRlcyB3aXRoIEFwZXJ0 dXJlIG9uIEJYVCBpZiBWVC1kIGlzIG9uLiAqLworCWlmIChpbnRlbF9ndHRfdXBkYXRlX25lZWRz X3Z0ZF93YShkZXZfcHJpdikpIHsKKwkJZ2d0dC0+YmFzZS5pbnNlcnRfZW50cmllcyA9IGJ4dF92 dGRfZ2d0dF9pbnNlcnRfZW50cmllc19fQktMOworCQlnZ3R0LT5iYXNlLmluc2VydF9wYWdlICAg ID0gYnh0X3Z0ZF9nZ3R0X2luc2VydF9wYWdlX19CS0w7CisJCWlmICghVVNFU19GVUxMX1BQR1RU KGRldl9wcml2KSB8fAorCQkgICAgaW50ZWxfc2Nhbm91dF9uZWVkc192dGRfd2EoZGV2X3ByaXYp KSB7CisJCQlnZ3R0LT5iYXNlLmNsZWFyX3JhbmdlID0gYnh0X3Z0ZF9nZ3R0X2NsZWFyX3Jhbmdl X19CS0w7CisJCX0KKwl9CisKIAlnZ3R0LT5pbnZhbGlkYXRlID0gZ2VuNl9nZ3R0X2ludmFsaWRh dGU7CiAKIAlyZXR1cm4gZ2d0dF9wcm9iZV9jb21tb24oZ2d0dCwgc2l6ZSk7Ci0tIAoyLjcuNAoK X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4 IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlz dHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4Cg==