From: Jon Bloomfield Subject: [PATCH] drm/i915: Serialize GTT Updates on BXT Date: Mon, 22 May 2017 11:07:25 -0700 Message-ID: <1495476445-23324-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 mga07.intel.com (mga07.intel.com [134.134.136.100]) by gabe.freedesktop.org (Postfix) with ESMTPS id 9FB7989E0C for ; Mon, 22 May 2017 18:07:53 +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 List-Id: intel-gfx@lists.freedesktop.org QlhUIHJlcXVpcmVzIGFjY2Vzc2VzIHRvIHRoZSBHVFQgKGkuZS4gUFRFIHVwZGF0ZXMpIHRvIGJl IHNlcmlhbGl6ZWQKd2hlbiBJT01NVSBpcyBlbmFibGVkLiBUaGlzIHBhdGNoIGd1YXJhbnRlZXMg dGhpcyBieSB3cmFwcGluZyBhbGwKdXBkYXRlcyBpbiBzdG9wX21hY2hpbmUgYW5kIHVzaW5nIGEg Zmx1c2hpbmcgcmVhZCB0byBndWFyYW50ZWUgdGhhdAp0aGUgR1RUIHdyaXRlcyBoYXZlIHJlYWNo ZWQgdGhlaXIgZGVzdGluYXRpb24gYmVmb3JlIHJlc3RhcnRpbmcuCgpTaWduZWQtb2ZmLWJ5OiBK b24gQmxvb21maWVsZCA8am9uLmJsb29tZmllbGRAaW50ZWwuY29tPgpTaWduZWQtb2ZmLWJ5OiBK b2huIEhhcnJpc29uIDxqb2huLkMuSGFycmlzb25AaW50ZWwuY29tPgotLS0KIGRyaXZlcnMvZ3B1 L2RybS9pOTE1L2k5MTVfZ2VtX2d0dC5jIHwgMTA2ICsrKysrKysrKysrKysrKysrKysrKysrKysr KysrKysrKysrKwogMSBmaWxlIGNoYW5nZWQsIDEwNiBpbnNlcnRpb25zKCspCgpkaWZmIC0tZ2l0 IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fZ3R0LmMgYi9kcml2ZXJzL2dwdS9kcm0v aTkxNS9pOTE1X2dlbV9ndHQuYwppbmRleCA3Yzc2OWQ3Li42MzYwZDkyIDEwMDY0NAotLS0gYS9k cml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9ndHQuYworKysgYi9kcml2ZXJzL2dwdS9kcm0v aTkxNS9pOTE1X2dlbV9ndHQuYwpAQCAtMjE5MSw2ICsyMTkxLDEwMCBAQCBzdGF0aWMgdm9pZCBn ZW44X2dndHRfY2xlYXJfcmFuZ2Uoc3RydWN0IGk5MTVfYWRkcmVzc19zcGFjZSAqdm0sCiAJCWdl bjhfc2V0X3B0ZSgmZ3R0X2Jhc2VbaV0sIHNjcmF0Y2hfcHRlKTsKIH0KIAorI2lmZGVmIENPTkZJ R19JTlRFTF9JT01NVQorc3RydWN0IGluc2VydF9wYWdlIHsKKwlzdHJ1Y3QgaTkxNV9hZGRyZXNz X3NwYWNlICp2bTsKKwlkbWFfYWRkcl90IGFkZHI7CisJdTY0IG9mZnNldDsKKwllbnVtIGk5MTVf Y2FjaGVfbGV2ZWwgbGV2ZWw7Cit9OworCitzdGF0aWMgaW50IGdlbjhfZ2d0dF9pbnNlcnRfcGFn ZV9fY2Iodm9pZCAqX2FyZykKK3sKKwlzdHJ1Y3QgaW5zZXJ0X3BhZ2UgKmFyZyA9IF9hcmc7CisK KwlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSBhcmctPnZtLT5pOTE1OworCisJ Z2VuOF9nZ3R0X2luc2VydF9wYWdlKGFyZy0+dm0sIGFyZy0+YWRkciwKKwkJCQlhcmctPm9mZnNl dCwgYXJnLT5sZXZlbCwgMCk7CisKKwlQT1NUSU5HX1JFQUQoR0ZYX0ZMU0hfQ05UTF9HRU42KTsK KworCXJldHVybiAwOworfQorCitzdGF0aWMgdm9pZCBnZW44X2dndHRfaW5zZXJ0X3BhZ2VfX0JL TChzdHJ1Y3QgaTkxNV9hZGRyZXNzX3NwYWNlICp2bSwKKwkJCQkgICAgICAgZG1hX2FkZHJfdCBh ZGRyLAorCQkJCSAgICAgICB1NjQgb2Zmc2V0LAorCQkJCSAgICAgICBlbnVtIGk5MTVfY2FjaGVf bGV2ZWwgbGV2ZWwsCisJCQkJICAgICAgIHUzMiB1bnVzZWQpCit7CisJc3RydWN0IGluc2VydF9w YWdlIGFyZyA9IHsgdm0sIGFkZHIsIG9mZnNldCwgbGV2ZWwgfTsKKworCXN0b3BfbWFjaGluZShn ZW44X2dndHRfaW5zZXJ0X3BhZ2VfX2NiLCAmYXJnLCBOVUxMKTsKK30KKworCitzdHJ1Y3QgaW5z ZXJ0X2VudHJpZXMgeworCXN0cnVjdCBpOTE1X2FkZHJlc3Nfc3BhY2UgKnZtOworCXN0cnVjdCBz Z190YWJsZSAqc3Q7CisJdTY0IHN0YXJ0OworCWVudW0gaTkxNV9jYWNoZV9sZXZlbCBsZXZlbDsK K307CisKK3N0YXRpYyBpbnQgZ2VuOF9nZ3R0X2luc2VydF9lbnRyaWVzX19jYih2b2lkICpfYXJn KQoreworCXN0cnVjdCBpbnNlcnRfZW50cmllcyAqYXJnID0gX2FyZzsKKworCXN0cnVjdCBkcm1f aTkxNV9wcml2YXRlICpkZXZfcHJpdiA9IGFyZy0+dm0tPmk5MTU7CisKKwlnZW44X2dndHRfaW5z ZXJ0X2VudHJpZXMoYXJnLT52bSwgYXJnLT5zdCwKKwkJCQkJYXJnLT5zdGFydCwgYXJnLT5sZXZl bCwgMCk7CisKKwlQT1NUSU5HX1JFQUQoR0ZYX0ZMU0hfQ05UTF9HRU42KTsKKworCXJldHVybiAw OworfQorCitzdGF0aWMgdm9pZCBnZW44X2dndHRfaW5zZXJ0X2VudHJpZXNfX0JLTChzdHJ1Y3Qg aTkxNV9hZGRyZXNzX3NwYWNlICp2bSwKKwkJCQkJICBzdHJ1Y3Qgc2dfdGFibGUgKnN0LAorCQkJ CQkgIHU2NCBzdGFydCwKKwkJCQkJICBlbnVtIGk5MTVfY2FjaGVfbGV2ZWwgbGV2ZWwsCisJCQkJ CSAgdTMyIHVudXNlZCkKK3sKKwlzdHJ1Y3QgaW5zZXJ0X2VudHJpZXMgYXJnID0geyB2bSwgc3Qs IHN0YXJ0LCBsZXZlbCB9OworCisJc3RvcF9tYWNoaW5lKGdlbjhfZ2d0dF9pbnNlcnRfZW50cmll c19fY2IsICZhcmcsIE5VTEwpOworfQorCitzdHJ1Y3QgY2xlYXJfcmFuZ2UgeworCXN0cnVjdCBp OTE1X2FkZHJlc3Nfc3BhY2UgKnZtOworCXU2NCBzdGFydDsKKwl1NjQgbGVuZ3RoOworfTsKKwor c3RhdGljIGludCBnZW44X2dndHRfY2xlYXJfcmFuZ2VfX2NiKHZvaWQgKl9hcmcpCit7CisJc3Ry dWN0IGNsZWFyX3JhbmdlICphcmcgPSBfYXJnOworCisJc3RydWN0IGRybV9pOTE1X3ByaXZhdGUg KmRldl9wcml2ID0gYXJnLT52bS0+aTkxNTsKKworCWdlbjhfZ2d0dF9jbGVhcl9yYW5nZShhcmct PnZtLCBhcmctPnN0YXJ0LCBhcmctPmxlbmd0aCk7CisKKwlQT1NUSU5HX1JFQUQoR0ZYX0ZMU0hf Q05UTF9HRU42KTsKKworCXJldHVybiAwOworfQorCitzdGF0aWMgdm9pZCBnZW44X2dndHRfY2xl YXJfcmFuZ2VfX0JLTChzdHJ1Y3QgaTkxNV9hZGRyZXNzX3NwYWNlICp2bSwKKyAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgIHU2NCBzdGFydCwKKyAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgIHU2NCBsZW5ndGgpCit7CisJc3RydWN0IGNsZWFyX3Jhbmdl IGFyZyA9IHsgdm0sIHN0YXJ0LCBsZW5ndGggfTsKKwlzdG9wX21hY2hpbmUoZ2VuOF9nZ3R0X2Ns ZWFyX3JhbmdlX19jYiwgJmFyZywgTlVMTCk7Cit9CisjZW5kaWYKKwogc3RhdGljIHZvaWQgZ2Vu Nl9nZ3R0X2NsZWFyX3JhbmdlKHN0cnVjdCBpOTE1X2FkZHJlc3Nfc3BhY2UgKnZtLAogCQkJCSAg dTY0IHN0YXJ0LCB1NjQgbGVuZ3RoKQogewpAQCAtMjc4OSw2ICsyODgzLDE4IEBAIHN0YXRpYyBp bnQgZ2VuOF9nbWNoX3Byb2JlKHN0cnVjdCBpOTE1X2dndHQgKmdndHQpCiAKIAlnZ3R0LT5iYXNl Lmluc2VydF9lbnRyaWVzID0gZ2VuOF9nZ3R0X2luc2VydF9lbnRyaWVzOwogCisjaWZkZWYgQ09O RklHX0lOVEVMX0lPTU1VCisJLyogU2VyaWFsaXplIEdUVCB1cGRhdGVzIG9uIEJYVCBpZiBWVC1k IGlzIG9uLiAqLworCWlmIChJU19CUk9YVE9OKGRldl9wcml2KSAmJiBpbnRlbF9pb21tdV9nZnhf bWFwcGVkKSB7CisJCWdndHQtPmJhc2UuaW5zZXJ0X2VudHJpZXMgPSBnZW44X2dndHRfaW5zZXJ0 X2VudHJpZXNfX0JLTDsKKwkJZ2d0dC0+YmFzZS5pbnNlcnRfcGFnZSAgICA9IGdlbjhfZ2d0dF9p bnNlcnRfcGFnZV9fQktMOworCQlpZiAoIVVTRVNfRlVMTF9QUEdUVChkZXZfcHJpdikgfHwKKwkJ ICAgIGludGVsX3NjYW5vdXRfbmVlZHNfdnRkX3dhKGRldl9wcml2KSkgeworCQkJZ2d0dC0+YmFz ZS5jbGVhcl9yYW5nZSA9IGdlbjhfZ2d0dF9jbGVhcl9yYW5nZV9fQktMOworCQl9CisJfQorI2Vu ZGlmCisKIAlnZ3R0LT5pbnZhbGlkYXRlID0gZ2VuNl9nZ3R0X2ludmFsaWRhdGU7CiAKIAlyZXR1 cm4gZ2d0dF9wcm9iZV9jb21tb24oZ2d0dCwgc2l6ZSk7Ci0tIAoyLjcuNAoKX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlz dApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0 b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4Cg==