From mboxrd@z Thu Jan 1 00:00:00 1970 From: Arun Siluvery Subject: [PATCH v2 3/7] drm/i915/gen8: Enable WA batch buffers during ctx save/restore Date: Fri, 29 May 2015 19:03:21 +0100 Message-ID: <1432922605-5893-4-git-send-email-arun.siluvery@linux.intel.com> References: <1432922605-5893-1-git-send-email-arun.siluvery@linux.intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by gabe.freedesktop.org (Postfix) with ESMTP id 2E10D88861 for ; Fri, 29 May 2015 11:03:59 -0700 (PDT) In-Reply-To: <1432922605-5893-1-git-send-email-arun.siluvery@linux.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 UG9wdWxhdGUgQ3R4IG9mZnNldCBwb2ludGVyIHJlZ2lzdGVycyB3aXRoIFdBIGJhdGNoIGJ1ZmZl ciBhZGRyZXNzOwpMZXQgdGhlIEhXIGtub3cgYWJvdXQgdGhlc2UgYmF0Y2ggYnVmZmVycyBzbyB0 aGF0IGl0IGNhbiBleGVjdXRlIHRoZW0KZHVyaW5nIGN0eCBzYXZlL3Jlc3RvcmUuCgpTaWduZWQt b2ZmLWJ5OiBSYWZhZWwgQmFyYmFsaG8gPHJhZmFlbC5iYXJiYWxob0BpbnRlbC5jb20+ClNpZ25l ZC1vZmYtYnk6IEFydW4gU2lsdXZlcnkgPGFydW4uc2lsdXZlcnlAbGludXguaW50ZWwuY29tPgot LS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2xyYy5jICAgICAgICB8IDc0ICsrKysrKysr KysrKysrKysrKysrKysrKysrKysrLS0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcmlu Z2J1ZmZlci5oIHwgIDMgKysKIDIgZmlsZXMgY2hhbmdlZCwgNzAgaW5zZXJ0aW9ucygrKSwgNyBk ZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9scmMu YyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2xyYy5jCmluZGV4IGQxMjQ2MzYuLmVlOTY4 ZTEgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2xyYy5jCisrKyBiL2Ry aXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2xyYy5jCkBAIC0yMTEsNiArMjExLDcgQEAgZW51bSB7 CiAJRkFVTFRfQU5EX0NPTlRJTlVFIC8qIFVuc3VwcG9ydGVkICovCiB9OwogI2RlZmluZSBHRU44 X0NUWF9JRF9TSElGVCAzMgorI2RlZmluZSBDVFhfUkNTX0lORElSRUNUX0NUWF9PRkZTRVRfREVG QVVMVCAgMHgxNwogCiBzdGF0aWMgaW50IGludGVsX2xyX2NvbnRleHRfcGluKHN0cnVjdCBpbnRl bF9lbmdpbmVfY3MgKnJpbmcsCiAJCXN0cnVjdCBpbnRlbF9jb250ZXh0ICpjdHgpOwpAQCAtMTE3 Myw3ICsxMTc0LDE4IEBAIHN0YXRpYyBpbnQgaW50ZWxfaW5pdF93b3JrYXJvdW5kX2JiKHN0cnVj dCBpbnRlbF9lbmdpbmVfY3MgKnJpbmcsCiAJaWYgKFdBUk5fT04ocmluZy0+aWQgIT0gUkNTKSkK IAkJcmV0dXJuIC1FSU5WQUw7CiAKLQkvKiBGSVhNRTogQWRkIEdlbiBzcGVjaWZpYyBpbml0IGZ1 bmN0aW9ucyAqLworCWlmIChJU19HRU44KGRldikpIHsKKwkJcmV0ID0gZ2VuOF9pbml0X2luZGly ZWN0Y3R4X2JiKHJpbmcsIGN0eCk7CisJCWlmIChyZXQpCisJCQlyZXR1cm4gcmV0OworCisJCXJl dCA9IGdlbjhfaW5pdF9wZXJjdHhfYmIocmluZywgY3R4KTsKKwkJaWYgKHJldCkKKwkJCXJldHVy biByZXQ7CisJfSBlbHNlIHsKKwkJV0FSTl9PTkNFKElOVEVMX0lORk8oZGV2KS0+Z2VuID4gOCwK KwkJCSAgIldBIGJhdGNoIGJ1ZmZlcnMgYXJlIG5vdCBpbml0aWFsaXplZFxuIik7CisJfQogCiAJ cmV0dXJuIDA7CiB9CkBAIC0xNTYxLDYgKzE1NzMsNyBAQCBzdGF0aWMgaW50IGxvZ2ljYWxfcmVu ZGVyX3JpbmdfaW5pdChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KQogCWVsc2UKIAkJcmluZy0+aW5p dF9odyA9IGdlbjhfaW5pdF9yZW5kZXJfcmluZzsKIAlyaW5nLT5pbml0X2NvbnRleHQgPSBnZW44 X2luaXRfcmNzX2NvbnRleHQ7CisJcmluZy0+aW5pdF9jb250ZXh0X2JiID0gaW50ZWxfaW5pdF93 b3JrYXJvdW5kX2JiOwogCXJpbmctPmNsZWFudXAgPSBpbnRlbF9maW5pX3BpcGVfY29udHJvbDsK IAlyaW5nLT5nZXRfc2Vxbm8gPSBnZW44X2dldF9zZXFubzsKIAlyaW5nLT5zZXRfc2Vxbm8gPSBn ZW44X3NldF9zZXFubzsKQEAgLTE4NjAsMTUgKzE4NzMsMjkgQEAgcG9wdWxhdGVfbHJfY29udGV4 dChzdHJ1Y3QgaW50ZWxfY29udGV4dCAqY3R4LCBzdHJ1Y3QgZHJtX2k5MTVfZ2VtX29iamVjdCAq Y3R4X28KIAlyZWdfc3RhdGVbQ1RYX1NFQ09ORF9CQl9TVEFURV0gPSByaW5nLT5tbWlvX2Jhc2Ug KyAweDExODsKIAlyZWdfc3RhdGVbQ1RYX1NFQ09ORF9CQl9TVEFURSsxXSA9IDA7CiAJaWYgKHJp bmctPmlkID09IFJDUykgewotCQkvKiBUT0RPOiBhY2NvcmRpbmcgdG8gQlNwZWMsIHRoZSByZWdp c3RlciBzdGF0ZSBjb250ZXh0Ci0JCSAqIGZvciBDSFYgZG9lcyBub3QgaGF2ZSB0aGVzZS4gT1RP SCwgdGhlc2UgcmVnaXN0ZXJzIGRvCi0JCSAqIGV4aXN0IGluIENIVi4gSSdtIHdhaXRpbmcgZm9y IGEgY2xhcmlmaWNhdGlvbiAqLwogCQlyZWdfc3RhdGVbQ1RYX0JCX1BFUl9DVFhfUFRSXSA9IHJp bmctPm1taW9fYmFzZSArIDB4MWMwOwotCQlyZWdfc3RhdGVbQ1RYX0JCX1BFUl9DVFhfUFRSKzFd ID0gMDsKKworCQlpZiAoY3R4LT5wZXJfY3R4X3dhX2JiKQorCQkJcmVnX3N0YXRlW0NUWF9CQl9Q RVJfQ1RYX1BUUiArIDFdID0KKwkJCQlpOTE1X2dlbV9vYmpfZ2d0dF9vZmZzZXQoCisJCQkJCWN0 eC0+cGVyX2N0eF93YV9iYi0+b2JqKSB8IDB4MDE7CisJCWVsc2UKKwkJCXJlZ19zdGF0ZVtDVFhf QkJfUEVSX0NUWF9QVFIrMV0gPSAwOworCiAJCXJlZ19zdGF0ZVtDVFhfUkNTX0lORElSRUNUX0NU WF0gPSByaW5nLT5tbWlvX2Jhc2UgKyAweDFjNDsKLQkJcmVnX3N0YXRlW0NUWF9SQ1NfSU5ESVJF Q1RfQ1RYKzFdID0gMDsKIAkJcmVnX3N0YXRlW0NUWF9SQ1NfSU5ESVJFQ1RfQ1RYX09GRlNFVF0g PSByaW5nLT5tbWlvX2Jhc2UgKyAweDFjODsKLQkJcmVnX3N0YXRlW0NUWF9SQ1NfSU5ESVJFQ1Rf Q1RYX09GRlNFVCsxXSA9IDA7CisKKwkJaWYgKGN0eC0+aW5kaXJlY3RfY3R4X3dhX2JiKSB7CisJ CQlyZWdfc3RhdGVbQ1RYX1JDU19JTkRJUkVDVF9DVFggKyAxXSA9CisJCQkJaTkxNV9nZW1fb2Jq X2dndHRfb2Zmc2V0KAorCQkJCWN0eC0+aW5kaXJlY3RfY3R4X3dhX2JiLT5vYmopIHwgMHgwMTsK KworCQkJcmVnX3N0YXRlW0NUWF9SQ1NfSU5ESVJFQ1RfQ1RYX09GRlNFVCArIDFdID0KKwkJCQlD VFhfUkNTX0lORElSRUNUX0NUWF9PRkZTRVRfREVGQVVMVCA8PCA2OworCQl9IGVsc2UgeworCQkJ cmVnX3N0YXRlW0NUWF9SQ1NfSU5ESVJFQ1RfQ1RYKzFdID0gMDsKKwkJCXJlZ19zdGF0ZVtDVFhf UkNTX0lORElSRUNUX0NUWF9PRkZTRVQrMV0gPSAwOworCQl9CiAJfQogCXJlZ19zdGF0ZVtDVFhf TFJJX0hFQURFUl8xXSA9IE1JX0xPQURfUkVHSVNURVJfSU1NKDkpOwogCXJlZ19zdGF0ZVtDVFhf TFJJX0hFQURFUl8xXSB8PSBNSV9MUklfRk9SQ0VfUE9TVEVEOwpAQCAtMTkzNSw2ICsxOTYyLDE4 IEBAIHZvaWQgaW50ZWxfbHJfY29udGV4dF9mcmVlKHN0cnVjdCBpbnRlbF9jb250ZXh0ICpjdHgp CiAJCQlkcm1fZ2VtX29iamVjdF91bnJlZmVyZW5jZSgmY3R4X29iai0+YmFzZSk7CiAJCX0KIAl9 CisKKwlpZiAoY3R4LT5pbmRpcmVjdF9jdHhfd2FfYmIpIHsKKwkJaW50ZWxfdW5waW5fcmluZ2J1 ZmZlcl9vYmooY3R4LT5pbmRpcmVjdF9jdHhfd2FfYmIpOworCQlpbnRlbF9kZXN0cm95X3Jpbmdi dWZmZXJfb2JqKGN0eC0+aW5kaXJlY3RfY3R4X3dhX2JiKTsKKwkJa2ZyZWUoY3R4LT5pbmRpcmVj dF9jdHhfd2FfYmIpOworCX0KKworCWlmIChjdHgtPnBlcl9jdHhfd2FfYmIpIHsKKwkJaW50ZWxf dW5waW5fcmluZ2J1ZmZlcl9vYmooY3R4LT5wZXJfY3R4X3dhX2JiKTsKKwkJaW50ZWxfZGVzdHJv eV9yaW5nYnVmZmVyX29iaihjdHgtPnBlcl9jdHhfd2FfYmIpOworCQlrZnJlZShjdHgtPnBlcl9j dHhfd2FfYmIpOworCX0KIH0KIAogc3RhdGljIHVpbnQzMl90IGdldF9scl9jb250ZXh0X3NpemUo c3RydWN0IGludGVsX2VuZ2luZV9jcyAqcmluZykKQEAgLTIwNjAsNiArMjA5OSwxNiBAQCBpbnQg aW50ZWxfbHJfY29udGV4dF9kZWZlcnJlZF9jcmVhdGUoc3RydWN0IGludGVsX2NvbnRleHQgKmN0 eCwKIAogCX0KIAorCWlmIChyaW5nLT5pZCA9PSBSQ1MgJiYgIWN0eC0+cmNzX2luaXRpYWxpemVk KSB7CisJCWlmIChyaW5nLT5pbml0X2NvbnRleHRfYmIpIHsKKwkJCXJldCA9IHJpbmctPmluaXRf Y29udGV4dF9iYihyaW5nLCBjdHgpOworCQkJaWYgKHJldCkgeworCQkJCURSTV9FUlJPUigicmlu ZyBpbml0IGNvbnRleHQgYmI6ICVkXG4iLCByZXQpOworCQkJCWdvdG8gZXJyb3I7CisJCQl9CisJ CX0KKwl9CisKIAlyZXQgPSBwb3B1bGF0ZV9scl9jb250ZXh0KGN0eCwgY3R4X29iaiwgcmluZywg cmluZ2J1Zik7CiAJaWYgKHJldCkgewogCQlEUk1fREVCVUdfRFJJVkVSKCJGYWlsZWQgdG8gcG9w dWxhdGUgTFJDOiAlZFxuIiwgcmV0KTsKQEAgLTIwODgsNiArMjEzNywxNyBAQCBpbnQgaW50ZWxf bHJfY29udGV4dF9kZWZlcnJlZF9jcmVhdGUoc3RydWN0IGludGVsX2NvbnRleHQgKmN0eCwKIAly ZXR1cm4gMDsKIAogZXJyb3I6CisJaWYgKGN0eC0+aW5kaXJlY3RfY3R4X3dhX2JiKSB7CisJCWlu dGVsX3VucGluX3JpbmdidWZmZXJfb2JqKGN0eC0+aW5kaXJlY3RfY3R4X3dhX2JiKTsKKwkJaW50 ZWxfZGVzdHJveV9yaW5nYnVmZmVyX29iaihjdHgtPmluZGlyZWN0X2N0eF93YV9iYik7CisJCWtm cmVlKGN0eC0+aW5kaXJlY3RfY3R4X3dhX2JiKTsKKwl9CisJaWYgKGN0eC0+cGVyX2N0eF93YV9i YikgeworCQlpbnRlbF91bnBpbl9yaW5nYnVmZmVyX29iaihjdHgtPnBlcl9jdHhfd2FfYmIpOwor CQlpbnRlbF9kZXN0cm95X3JpbmdidWZmZXJfb2JqKGN0eC0+cGVyX2N0eF93YV9iYik7CisJCWtm cmVlKGN0eC0+cGVyX2N0eF93YV9iYik7CisJfQorCiAJaWYgKGlzX2dsb2JhbF9kZWZhdWx0X2N0 eCkKIAkJaW50ZWxfdW5waW5fcmluZ2J1ZmZlcl9vYmoocmluZ2J1Zik7CiBlcnJvcl9kZXN0cm95 X3JidWY6CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9yaW5nYnVmZmVy LmggYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9yaW5nYnVmZmVyLmgKaW5kZXggMzlmNmRm Yy4uZGRiODQyMSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcmluZ2J1 ZmZlci5oCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3JpbmdidWZmZXIuaApAQCAt MTU0LDYgKzE1NCw5IEBAIHN0cnVjdCAgaW50ZWxfZW5naW5lX2NzIHsKIAlpbnQJCSgqaW5pdF9j b250ZXh0KShzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICpyaW5nLAogCQkJCQlzdHJ1Y3QgaW50ZWxf Y29udGV4dCAqY3R4KTsKIAorCWludAkJKCppbml0X2NvbnRleHRfYmIpKHN0cnVjdCBpbnRlbF9l bmdpbmVfY3MgKnJpbmcsCisJCQkJCSAgIHN0cnVjdCBpbnRlbF9jb250ZXh0ICpjdHgpOworCiAJ dm9pZAkJKCp3cml0ZV90YWlsKShzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICpyaW5nLAogCQkJCSAg ICAgIHUzMiB2YWx1ZSk7CiAJaW50IF9fbXVzdF9jaGVjayAoKmZsdXNoKShzdHJ1Y3QgaW50ZWxf ZW5naW5lX2NzICpyaW5nLAotLSAKMi4zLjAKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fCkludGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwtZ2Z4QGxpc3Rz LmZyZWVkZXNrdG9wLm9yZwpodHRwOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlz dGluZm8vaW50ZWwtZ2Z4Cg==