From mboxrd@z Thu Jan 1 00:00:00 1970 From: Tvrtko Ursulin Subject: [PATCH v3 3/3] drm/i915: Fix premature LRC unpin in GuC mode Date: Thu, 21 Jan 2016 10:10:42 +0000 Message-ID: <1453371042-4109-3-git-send-email-tvrtko.ursulin@linux.intel.com> References: <1453371042-4109-1-git-send-email-tvrtko.ursulin@linux.intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by gabe.freedesktop.org (Postfix) with ESMTP id 440A96E21A for ; Thu, 21 Jan 2016 02:11:05 -0800 (PST) In-Reply-To: <1453371042-4109-1-git-send-email-tvrtko.ursulin@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 RnJvbTogVHZydGtvIFVyc3VsaW4gPHR2cnRrby51cnN1bGluQGludGVsLmNvbT4KCkluIEd1QyBt b2RlIExSQyBwaW5uaW5nIGxpZmV0aW1lIGRlcGVuZHMgZXhjbHVzaXZlbHkgb24gdGhlCnJlcXVl c3QgbGlmdGltZS4gU2luY2UgdGhhdCBpcyB0ZXJtaW5hdGVkIGJ5IHRoZSBzZXFubyB1cGRhdGUK dGhhdCBvcGVucyB1cCBhIHJhY2UgY29uZGl0aW9uIGJldHdlZW4gR1BVIGZpbmlzaGluZyB3cml0 aW5nCm91dCB0aGUgY29udGV4dCBpbWFnZSBhbmQgdGhlIGRyaXZlciB1bnBpbm5pbmcgdGhlIExS Qy4KClRvIGV4dGVuZCB0aGUgTFJDIGxpZmV0aW1lIHdlIHdpbGwgZW1wbG95IGEgc2ltaWxhciBh cHByb2FjaAp0byB3aGF0IGxlZ2FjeSByaW5nYnVmZmVyIHN1Ym1pc3Npb24gZG9lcy4KCldlIHdp bGwgc3RhcnQgdHJhY2tpbmcgdGhlIGxhc3Qgc3VibWl0dGVkIGNvbnRleHQgcGVyIGVuZ2luZQph bmQga2VlcCBpdCBwaW5uZWQgdW50aWwgaXQgaXMgcmVwbGFjZWQgYnkgYW5vdGhlciBvbmUuCgpO b3RlIHRoYXQgdGhlIGRyaXZlciB1bmxvYWQgcGF0aCBpcyBhIGJpdCBmcmFnaWxlIGFuZCBjb3Vs ZApiZW5lZml0IGdyZWF0bHkgZnJvbSBlZmZvcnRzIHRvIHVuaWZ5IHRoZSBsZWdhY3kgYW5kIGV4 ZWMKbGlzdCBzdWJtaXNzaW9uIGNvZGUgcGF0aHMuCgpBdCB0aGUgbW9tZW50IGk5MTVfZ2VtX2Nv bnRleHRfZmluaSBoYXMgc3BlY2lhbCBjYXNpbmcgZm9yIHRoZQp0d28gd2hpY2ggYXJlIHBvdGVu dGlhbHkgbm90IG5lZWRlZCwgYW5kIGFsc28gZGVwZW5kcyBvbgppOTE1X2dlbV9jbGVhbnVwX3Jp bmdidWZmZXIgcnVubmluZyBiZWZvcmUgaXRzZWxmLgoKdjI6CiAqIE1vdmUgcGlubmluZyBpbnRv IGVuZ2luZS0+ZW1pdF9yZXF1ZXN0IGFuZCBhY3R1YWxseSBmaXgKICAgdGhlIHJlZmVyZW5jZS91 bnJlZmVyZW5jZSBsb2dpYy4gKENocmlzIFdpbHNvbikKCiAqIHJpbmctPmRldiBjYW4gYmUgTlVM TCBvbiBkcml2ZXIgdW5sb2FkIHNvIHVzZSBhIGRpZmZlcmVudAogICByb3V0ZSB0b3dhcmRzIGl0 LgoKdjM6CiAqIFJlYmFzZS4KICogSGFuZGxlIHRoZSByZXNldCBwYXRoLiAoQ2hyaXMgV2lsc29u KQogKiBFeGNsdWRlIGRlZmF1bHQgY29udGV4dCBmcm9tIHRoZSBwaW5uaW5nIC0gaXQgaXMgaW1w b3NzaWJsZQogICB0byBnZXQgaXQgcmlnaHQgYmVmb3JlIGRlZmF1bHQgY29udGV4dCBzcGVjaWFs IGNhc2luZyBpbgogICBnZW5lcmFsIGlzIGVsaW1pbmF0ZWQuCgpTaWduZWQtb2ZmLWJ5OiBUdnJ0 a28gVXJzdWxpbiA8dHZydGtvLnVyc3VsaW5AaW50ZWwuY29tPgpJc3N1ZTogVklaLTQyNzcKQ2M6 IENocmlzIFdpbHNvbiA8Y2hyaXNAY2hyaXMtd2lsc29uLmNvLnVrPgpDYzogTmljayBIb2F0aCA8 bmljaG9sYXMuaG9hdGhAaW50ZWwuY29tPgotLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVf Z2VtX2NvbnRleHQuYyB8IDE1ICsrKysrKysrKysrLS0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUv aW50ZWxfbHJjLmMgICAgICAgIHwgMTMgKysrKysrKysrKysrLQogMiBmaWxlcyBjaGFuZ2VkLCAy MyBpbnNlcnRpb25zKCspLCA1IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1 L2RybS9pOTE1L2k5MTVfZ2VtX2NvbnRleHQuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVf Z2VtX2NvbnRleHQuYwppbmRleCA2YTRmNjRiMDNkYjYuLjQ3ODcwYjQ2M2JiZCAxMDA2NDQKLS0t IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fY29udGV4dC5jCisrKyBiL2RyaXZlcnMv Z3B1L2RybS9pOTE1L2k5MTVfZ2VtX2NvbnRleHQuYwpAQCAtMzQxLDEwICszNDEsMTQgQEAgdm9p ZCBpOTE1X2dlbV9jb250ZXh0X3Jlc2V0KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCiAJCXN0cnVj dCBpbnRlbF9jb250ZXh0ICpsY3R4ID0gcmluZy0+bGFzdF9jb250ZXh0OwogCiAJCWlmIChsY3R4 KSB7Ci0JCQlpZiAobGN0eC0+bGVnYWN5X2h3X2N0eC5yY3Nfc3RhdGUgJiYgaSA9PSBSQ1MpCi0J CQkJaTkxNV9nZW1fb2JqZWN0X2dndHRfdW5waW4obGN0eC0+bGVnYWN5X2h3X2N0eC5yY3Nfc3Rh dGUpOworCQkJaWYgKCFpOTE1LmVuYWJsZV9leGVjbGlzdHMpIHsKKwkJCQlpZiAobGN0eC0+bGVn YWN5X2h3X2N0eC5yY3Nfc3RhdGUgJiYgaSA9PSBSQ1MpCisJCQkJCWk5MTVfZ2VtX29iamVjdF9n Z3R0X3VucGluKGxjdHgtPmxlZ2FjeV9od19jdHgucmNzX3N0YXRlKTsKIAotCQkJaTkxNV9nZW1f Y29udGV4dF91bnJlZmVyZW5jZShsY3R4KTsKKwkJCQlpOTE1X2dlbV9jb250ZXh0X3VucmVmZXJl bmNlKGxjdHgpOworCQkJfSBlbHNlIHsKKwkJCQlpbnRlbF9scl9jb250ZXh0X3VucGluKGxjdHgs IHJpbmcpOworCQkJfQogCQkJcmluZy0+bGFzdF9jb250ZXh0ID0gTlVMTDsKIAkJfQogCX0KQEAg LTQzMiw3ICs0MzYsMTAgQEAgdm9pZCBpOTE1X2dlbV9jb250ZXh0X2Zpbmkoc3RydWN0IGRybV9k ZXZpY2UgKmRldikKIAkJc3RydWN0IGludGVsX2VuZ2luZV9jcyAqcmluZyA9ICZkZXZfcHJpdi0+ cmluZ1tpXTsKIAogCQlpZiAocmluZy0+bGFzdF9jb250ZXh0KSB7Ci0JCQlpOTE1X2dlbV9jb250 ZXh0X3VucmVmZXJlbmNlKHJpbmctPmxhc3RfY29udGV4dCk7CisJCQlpZiAoaTkxNS5lbmFibGVf ZXhlY2xpc3RzKQorCQkJCWludGVsX2xyX2NvbnRleHRfdW5waW4ocmluZy0+bGFzdF9jb250ZXh0 LCByaW5nKTsKKwkJCWVsc2UKKwkJCQlpOTE1X2dlbV9jb250ZXh0X3VucmVmZXJlbmNlKHJpbmct Pmxhc3RfY29udGV4dCk7CiAJCQlyaW5nLT5sYXN0X2NvbnRleHQgPSBOVUxMOwogCQl9CiAJfQpk aWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfbHJjLmMgYi9kcml2ZXJzL2dw dS9kcm0vaTkxNS9pbnRlbF9scmMuYwppbmRleCBiMzU3ODhlZTJmODMuLjg2MTk0MTVmNjBjNyAx MDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfbHJjLmMKKysrIGIvZHJpdmVy cy9ncHUvZHJtL2k5MTUvaW50ZWxfbHJjLmMKQEAgLTExMTgsNyArMTExOCw3IEBAIHZvaWQgaW50 ZWxfbHJfY29udGV4dF91bnBpbihzdHJ1Y3QgaW50ZWxfY29udGV4dCAqY3R4LAogewogCXN0cnVj dCBkcm1faTkxNV9nZW1fb2JqZWN0ICpjdHhfb2JqID0gY3R4LT5lbmdpbmVbZW5naW5lLT5pZF0u c3RhdGU7CiAKLQlXQVJOX09OKCFtdXRleF9pc19sb2NrZWQoJmVuZ2luZS0+ZGV2LT5zdHJ1Y3Rf bXV0ZXgpKTsKKwlXQVJOX09OKCFtdXRleF9pc19sb2NrZWQoJmN0eC0+aTkxNS0+ZGV2LT5zdHJ1 Y3RfbXV0ZXgpKTsKIAogCWlmIChXQVJOX09OX09OQ0UoIWN0eF9vYmopKQogCQlyZXR1cm47CkBA IC0xODU3LDYgKzE4NTcsMTcgQEAgc3RhdGljIGludCBnZW44X2VtaXRfcmVxdWVzdChzdHJ1Y3Qg ZHJtX2k5MTVfZ2VtX3JlcXVlc3QgKnJlcXVlc3QpCiAJdTMyIGNtZDsKIAlpbnQgcmV0OwogCisJ aWYgKHJpbmctPmxhc3RfY29udGV4dCAhPSByZXF1ZXN0LT5jdHgpIHsKKwkJaWYgKHJpbmctPmxh c3RfY29udGV4dCkKKwkJCWludGVsX2xyX2NvbnRleHRfdW5waW4ocmluZy0+bGFzdF9jb250ZXh0 LCByaW5nKTsKKwkJaWYgKHJlcXVlc3QtPmN0eCAhPSByZXF1ZXN0LT5pOTE1LT5rZXJuZWxfY29u dGV4dCkgeworCQkJaW50ZWxfbHJfY29udGV4dF9waW4ocmVxdWVzdC0+Y3R4LCByaW5nKTsKKwkJ CXJpbmctPmxhc3RfY29udGV4dCA9IHJlcXVlc3QtPmN0eDsKKwkJfSBlbHNlIHsKKwkJCXJpbmct Pmxhc3RfY29udGV4dCA9IE5VTEw7CisJCX0KKwl9CisKIAkvKgogCSAqIFJlc2VydmUgc3BhY2Ug Zm9yIDIgTk9PUHMgYXQgdGhlIGVuZCBvZiBlYWNoIHJlcXVlc3QgdG8gYmUKIAkgKiB1c2VkIGFz IGEgd29ya2Fyb3VuZCBmb3Igbm90IGJlaW5nIGFsbG93ZWQgdG8gZG8gbGl0ZQotLSAKMS45LjEK Cl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCkludGVsLWdm eCBtYWlsaW5nIGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwOi8vbGlz dHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4Cg==