From: Nick Hoath Subject: [PATCH v12] drm/i915: Extend LRC pinning to cover GPU context writeback Date: Fri, 22 Jan 2016 14:25:27 +0000 Message-ID: <1453472727-34622-1-git-send-email-nicholas.hoath@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) by gabe.freedesktop.org (Postfix) with ESMTP id 9DF916EC08 for ; Fri, 22 Jan 2016 06:25:31 -0800 (PST) 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 VXNlIHRoZSBmaXJzdCByZXRpcmVkIHJlcXVlc3Qgb24gYSBuZXcgY29udGV4dCB0byB1bnBpbgp0 aGUgb2xkIGNvbnRleHQuIFRoaXMgZW5zdXJlcyB0aGF0IHRoZSBodyBjb250ZXh0IHJlbWFpbnMK Ym91bmQgdW50aWwgaXQgaGFzIGJlZW4gd3JpdHRlbiBiYWNrIHRvIGJ5IHRoZSBHUFUuCk5vdyB0 aGF0IHRoZSBjb250ZXh0IGlzIHBpbm5lZCB1bnRpbCBsYXRlciBpbiB0aGUgcmVxdWVzdC9jb250 ZXh0CmxpZmVjeWNsZSwgaXQgbm8gbG9uZ2VyIG5lZWRzIHRvIGJlIHBpbm5lZCBmcm9tIGNvbnRl eHRfcXVldWUgdG8KcmV0aXJlX3JlcXVlc3RzLgpUaGlzIGZpeGVzIGFuIGlzc3VlIHdpdGggR3VD IHN1Ym1pc3Npb24gd2hlcmUgdGhlIEdQVSBtaWdodCBub3QKaGF2ZSBmaW5pc2hlZCB3cml0aW5n IGJhY2sgdGhlIGNvbnRleHQgYmVmb3JlIGl0IGlzIHVucGlubmVkLiBUaGlzCnJlc3VsdHMgaW4g YSBHUFUgaGFuZy4KCnYyOiBNb3ZlZCB0aGUgbmV3IHBpbiB0byBjb3ZlciBHdUMgc3VibWlzc2lv biAoQWxleCBEYWkpCiAgICBNb3ZlZCB0aGUgbmV3IHVucGluIHRvIHJlcXVlc3RfcmV0aXJlIHRv IGZpeCBjb3ZlcmFnZSBsZWFrCnYzOiBBZGRlZCBzd2l0Y2ggdG8gZGVmYXVsdCBjb250ZXh0IGlm IGZyZWVpbmcgYSBzdGlsbCBwaW5uZWQKICAgIGNvbnRleHQganVzdCBpbiBjYXNlIHRoZSBodyB3 YXMgYWN0dWFsbHkgc3RpbGwgdXNpbmcgaXQKdjQ6IFVud3JhcHBlZCBjb250ZXh0IHVucGluIHRv IGFsbG93IGNhbGxpbmcgd2l0aG91dCBhIHJlcXVlc3QKdjU6IE9ubHkgY3JlYXRlIGEgc3dpdGNo IHRvIGlkbGUgY29udGV4dCBpZiB0aGUgcmluZyBkb2Vzbid0CiAgICBhbHJlYWR5IGhhdmUgYSBy ZXF1ZXN0IHBlbmRpbmcgb24gaXQgKEFsZXggRGFpKQogICAgUmVuYW1lIHVuc2F2ZWQgdG8gZGly dHkgdG8gYXZvaWQgZG91YmxlIG5lZ2F0aXZlcyAoRGF2ZSBHb3Jkb24pCiAgICBDaGFuZ2VkIF9u b19yZXEgcG9zdGZpeCB0byBfXyBwcmVmaXggZm9yIGNvbnNpc3RlbmN5IChEYXZlIEdvcmRvbikK ICAgIFNwbGl0IG91dCBwZXIgZW5naW5lIGNsZWFudXAgZnJvbSBjb250ZXh0X2ZyZWUgYXMgaXQK ICAgIHdhcyBnZXR0aW5nIHVud2llbGR5CiAgICBDb3JyZWN0ZWQgbG9ja2luZyAoRGF2ZSBHb3Jk b24pCnY2OiBSZW1vdmVkIHNvbWUgYmlrZXNoZWRkaW5nIChNaWthIEt1b3BwYWxhKQogICAgQWRk ZWQgZXhwbGFuYXRpb24gb2YgdGhlIEd1QyBoYW5nIHRoYXQgdGhpcyBmaXhlcyAoRGFuaWVsIFZl dHRlcikKdjc6IFJlbW92ZWQgZXh0cmEgcGVyIHJlcXVlc3QgcGlubmluZyBmcm9tIHJpbmcgcmVz ZXQgY29kZSAoQWxleCBEYWkpCiAgICBBZGRlZCBmb3JjZWQgcmluZyB1bnBpbi9jbGVhbiBpbiBl cnJvciBjYXNlIGluIGNvbnRleHQgZnJlZSAoQWxleCBEYWkpCnY4OiBSZW5hbWVkIGxyYyBzcGVj aWZpYyBsYXN0X2NvbnRleHQgdG8gbHJjX2xhc3RfY29udGV4dCBhcyB0aGVyZQogICAgd2VyZSBz b21lIHJlc2V0IGNhc2VzIHdoZXJlIHRoZSBjb2RlcGF0aHMgbGVha2VkIChNaWthIEt1b3BwYWxh KQogICAgTlVMTCdkIGxhc3RfY29udGV4dCBpbiByZXNldCBjYXNlIC0gdGhlcmUgd2FzIGEgcG9p bnRlciBsZWFrCiAgICBpZiBzb21lb25lIGRpZCByZXNldC0+Y2xvc2UgY29udGV4dC4Kdjk6IFJl YmFzZSBvdmVyICJGaXggY29udGV4dC9lbmdpbmUgY2xlYW51cCBvcmRlciIKdjEwOiBSZWJhc2Ug b3ZlciBuaWdodGx5LCByZW1vdmUgV0FSTl9PTiB3aGljaCBjYXVzZWQgdGhlCiAgICBkZXBlbmRl bmN5IG9uIGRldi4KdjExOiBLaWNrIEJBVCByZXJ1bgp2MTI6IFJlYmFzZQoKU2lnbmVkLW9mZi1i eTogTmljayBIb2F0aCA8bmljaG9sYXMuaG9hdGhAaW50ZWwuY29tPgpJc3N1ZTogVklaLTQyNzcK LS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9scmMuYyB8IDM3ICsrKysrKysrKysrKysr Ky0tLS0tLS0tLS0tLS0tLS0tLS0tLS0KIDEgZmlsZSBjaGFuZ2VkLCAxNSBpbnNlcnRpb25zKCsp LCAyMiBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRl bF9scmMuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2xyYy5jCmluZGV4IGRiZjM3Mjku LmI0Njk4MTcgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2xyYy5jCisr KyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2xyYy5jCkBAIC03NzksMTAgKzc3OSwxMCBA QCBpbnRlbF9sb2dpY2FsX3JpbmdfYWR2YW5jZV9hbmRfc3VibWl0KHN0cnVjdCBkcm1faTkxNV9n ZW1fcmVxdWVzdCAqcmVxdWVzdCkKIAlpZiAoaW50ZWxfcmluZ19zdG9wcGVkKHJlcXVlc3QtPnJp bmcpKQogCQlyZXR1cm4gMDsKIAotCWlmIChyZXF1ZXN0LT5jdHggIT0gcmluZy0+ZGVmYXVsdF9j b250ZXh0KSB7Ci0JCWlmICghcmVxdWVzdC0+Y3R4LT5lbmdpbmVbcmluZy0+aWRdLmRpcnR5KSB7 CisJaWYgKHJlcXVlc3QtPmN0eCAhPSByZXF1ZXN0LT5jdHgtPmk5MTUtPmtlcm5lbF9jb250ZXh0 KSB7CisJCWlmICghcmVxdWVzdC0+Y3R4LT5lbmdpbmVbcmVxdWVzdC0+cmluZy0+aWRdLmRpcnR5 KSB7CiAJCQlpbnRlbF9scl9jb250ZXh0X3BpbihyZXF1ZXN0KTsKLQkJCXJlcXVlc3QtPmN0eC0+ ZW5naW5lW3JpbmctPmlkXS5kaXJ0eSA9IHRydWU7CisJCQlyZXF1ZXN0LT5jdHgtPmVuZ2luZVty ZXF1ZXN0LT5yaW5nLT5pZF0uZGlydHkgPSB0cnVlOwogCQl9CiAJfQogCkBAIC0yNDQ3LDkgKzI0 NDcsNyBAQCBpbnRlbF9scl9jb250ZXh0X2NsZWFuX3Jpbmcoc3RydWN0IGludGVsX2NvbnRleHQg KmN0eCwKIAkJCSAgICBzdHJ1Y3QgZHJtX2k5MTVfZ2VtX29iamVjdCAqY3R4X29iaiwKIAkJCSAg ICBzdHJ1Y3QgaW50ZWxfcmluZ2J1ZmZlciAqcmluZ2J1ZikKIHsKLQlpbnQgcmV0OwotCi0JaWYg KGN0eCA9PSByaW5nLT5kZWZhdWx0X2NvbnRleHQpIHsKKwlpZiAoY3R4ID09IGN0eC0+aTkxNS0+ a2VybmVsX2NvbnRleHQpIHsKIAkJaW50ZWxfdW5waW5fcmluZ2J1ZmZlcl9vYmoocmluZ2J1Zik7 CiAJCWk5MTVfZ2VtX29iamVjdF9nZ3R0X3VucGluKGN0eF9vYmopOwogCX0KQEAgLTI0NjMsMTMg KzI0NjEsMTAgQEAgaW50ZWxfbHJfY29udGV4dF9jbGVhbl9yaW5nKHN0cnVjdCBpbnRlbF9jb250 ZXh0ICpjdHgsCiAJCSAqIG90aGVyd2lzZSBjcmVhdGUgYSBzd2l0Y2ggdG8gaWRsZSByZXF1ZXN0 CiAJCSAqLwogCQlpZiAobGlzdF9lbXB0eSgmcmluZy0+cmVxdWVzdF9saXN0KSkgewotCQkJaW50 IHJldDsKLQotCQkJcmV0ID0gaTkxNV9nZW1fcmVxdWVzdF9hbGxvYygKKwkJCXJlcSA9IGk5MTVf Z2VtX3JlcXVlc3RfYWxsb2MoCiAJCQkJCXJpbmcsCi0JCQkJCXJpbmctPmRlZmF1bHRfY29udGV4 dCwKLQkJCQkJJnJlcSk7Ci0JCQlpZiAoIXJldCkKKwkJCQkJTlVMTCk7CisJCQlpZiAoIUlTX0VS UihyZXEpKQogCQkJCWk5MTVfYWRkX3JlcXVlc3QocmVxKTsKIAkJCWVsc2UKIAkJCQlEUk1fREVC VUcoIkZhaWxlZCB0byBlbnN1cmUgY29udGV4dCBzYXZlZCIpOwpAQCAtMjQ3OSw2ICsyNDc0LDgg QEAgaW50ZWxfbHJfY29udGV4dF9jbGVhbl9yaW5nKHN0cnVjdCBpbnRlbF9jb250ZXh0ICpjdHgs CiAJCQkJCXR5cGVvZigqcmVxKSwgbGlzdCk7CiAJCX0KIAkJaWYgKHJlcSkgeworCQkJaW50IHJl dDsKKwogCQkJcmV0ID0gaTkxNV93YWl0X3JlcXVlc3QocmVxKTsKIAkJCWlmIChyZXQgIT0gMCkg ewogCQkJCS8qKgpAQCAtMjUxNSwxNyArMjUxMiwxMyBAQCB2b2lkIGludGVsX2xyX2NvbnRleHRf ZnJlZShzdHJ1Y3QgaW50ZWxfY29udGV4dCAqY3R4KQogCQlzdHJ1Y3QgaW50ZWxfcmluZ2J1ZmZl ciAqcmluZ2J1ZiA9IGN0eC0+ZW5naW5lW2ldLnJpbmdidWY7CiAJCXN0cnVjdCBkcm1faTkxNV9n ZW1fb2JqZWN0ICpjdHhfb2JqID0gY3R4LT5lbmdpbmVbaV0uc3RhdGU7CiAKLQkJaWYgKCFjdHhf b2JqKQotCQkJY29udGludWU7Ci0KLQkJaWYgKGN0eCA9PSBjdHgtPmk5MTUtPmtlcm5lbF9jb250 ZXh0KSB7Ci0JCQlpbnRlbF91bnBpbl9yaW5nYnVmZmVyX29iaihyaW5nYnVmKTsKLQkJCWk5MTVf Z2VtX29iamVjdF9nZ3R0X3VucGluKGN0eF9vYmopOwotCQl9CisJCWlmIChjdHhfb2JqKQorCQkJ aW50ZWxfbHJfY29udGV4dF9jbGVhbl9yaW5nKAorCQkJCQkJY3R4LAorCQkJCQkJcmluZ2J1Zi0+ cmluZywKKwkJCQkJCWN0eF9vYmosCisJCQkJCQlyaW5nYnVmKTsKIAotCQlXQVJOX09OKGN0eC0+ ZW5naW5lW2ldLnBpbl9jb3VudCk7Ci0JCWludGVsX3JpbmdidWZmZXJfZnJlZShyaW5nYnVmKTsK LQkJZHJtX2dlbV9vYmplY3RfdW5yZWZlcmVuY2UoJmN0eF9vYmotPmJhc2UpOwogCX0KIH0KIAot LSAKMS45LjEKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f CkludGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpo dHRwOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4Cg==