From: Tvrtko Ursulin Subject: [PATCH v4 4/4] drm/i915: Fix premature LRC unpin in GuC mode Date: Thu, 21 Jan 2016 12:14:10 +0000 Message-ID: <1453378450-33327-4-git-send-email-tvrtko.ursulin@linux.intel.com> References: <1453378450-33327-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 mga01.intel.com (mga01.intel.com [192.55.52.88]) by gabe.freedesktop.org (Postfix) with ESMTP id 9B1A76EA85 for ; Thu, 21 Jan 2016 04:14:29 -0800 (PST) In-Reply-To: <1453378450-33327-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 IGNhc2luZyBpbgogICBnZW5lcmFsIGlzIGVsaW1pbmF0ZWQuCgp2NDoKICogUmViYXNlZCAmIG1v dmVkIGNvbnRleHQgdHJhY2tpbmcgdG8KICAgaW50ZWxfbG9naWNhbF9yaW5nX2FkdmFuY2VfYW5k X3N1Ym1pdC4KClNpZ25lZC1vZmYtYnk6IFR2cnRrbyBVcnN1bGluIDx0dnJ0a28udXJzdWxpbkBp bnRlbC5jb20+Cklzc3VlOiBWSVotNDI3NwpDYzogQ2hyaXMgV2lsc29uIDxjaHJpc0BjaHJpcy13 aWxzb24uY28udWs+CkNjOiBOaWNrIEhvYXRoIDxuaWNob2xhcy5ob2F0aEBpbnRlbC5jb20+Ci0t LQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fY29udGV4dC5jIHwgMTAgKysrKysrKy0t LQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfbHJjLmMgICAgICAgIHwgMTYgKysrKysrKysr KysrKystLQogMiBmaWxlcyBjaGFuZ2VkLCAyMSBpbnNlcnRpb25zKCspLCA1IGRlbGV0aW9ucygt KQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2NvbnRleHQuYyBi L2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2NvbnRleHQuYwppbmRleCAxYTY3ZTA3Yjll NmEuLjdlNmY4YzdiNmQwMSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9n ZW1fY29udGV4dC5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2NvbnRleHQu YwpAQCAtMzI0LDkgKzMyNCwxMyBAQCBlcnJfZGVzdHJveToKIHN0YXRpYyB2b2lkIGk5MTVfZ2Vt X2NvbnRleHRfdW5waW4oc3RydWN0IGludGVsX2NvbnRleHQgKmN0eCwKIAkJCQkgICBzdHJ1Y3Qg aW50ZWxfZW5naW5lX2NzICplbmdpbmUpCiB7Ci0JaWYgKGVuZ2luZS0+aWQgPT0gUkNTICYmIGN0 eC0+bGVnYWN5X2h3X2N0eC5yY3Nfc3RhdGUpCi0JCWk5MTVfZ2VtX29iamVjdF9nZ3R0X3VucGlu KGN0eC0+bGVnYWN5X2h3X2N0eC5yY3Nfc3RhdGUpOwotCWk5MTVfZ2VtX2NvbnRleHRfdW5yZWZl cmVuY2UoY3R4KTsKKwlpZiAoaTkxNS5lbmFibGVfZXhlY2xpc3RzKSB7CisJCWludGVsX2xyX2Nv bnRleHRfdW5waW4oY3R4LCBlbmdpbmUpOworCX0gZWxzZSB7CisJCWlmIChlbmdpbmUtPmlkID09 IFJDUyAmJiBjdHgtPmxlZ2FjeV9od19jdHgucmNzX3N0YXRlKQorCQkJaTkxNV9nZW1fb2JqZWN0 X2dndHRfdW5waW4oY3R4LT5sZWdhY3lfaHdfY3R4LnJjc19zdGF0ZSk7CisJCWk5MTVfZ2VtX2Nv bnRleHRfdW5yZWZlcmVuY2UoY3R4KTsKKwl9CiB9CiAKIHZvaWQgaTkxNV9nZW1fY29udGV4dF9y ZXNldChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KQpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJt L2k5MTUvaW50ZWxfbHJjLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9scmMuYwppbmRl eCA4ZWI2ZTM2NGZlZmMuLjBlMjE1ZWEzZjhhYiAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJt L2k5MTUvaW50ZWxfbHJjLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfbHJjLmMK QEAgLTc2Niw2ICs3NjYsNyBAQCBpbnRlbF9sb2dpY2FsX3JpbmdfYWR2YW5jZV9hbmRfc3VibWl0 KHN0cnVjdCBkcm1faTkxNV9nZW1fcmVxdWVzdCAqcmVxdWVzdCkKIHsKIAlzdHJ1Y3QgaW50ZWxf cmluZ2J1ZmZlciAqcmluZ2J1ZiA9IHJlcXVlc3QtPnJpbmdidWY7CiAJc3RydWN0IGRybV9pOTE1 X3ByaXZhdGUgKmRldl9wcml2ID0gcmVxdWVzdC0+aTkxNTsKKwlzdHJ1Y3QgaW50ZWxfZW5naW5l X2NzICplbmdpbmUgPSByZXF1ZXN0LT5yaW5nOwogCiAJaW50ZWxfbG9naWNhbF9yaW5nX2FkdmFu Y2UocmluZ2J1Zik7CiAJcmVxdWVzdC0+dGFpbCA9IHJpbmdidWYtPnRhaWw7CkBAIC03ODAsOSAr NzgxLDIwIEBAIGludGVsX2xvZ2ljYWxfcmluZ19hZHZhbmNlX2FuZF9zdWJtaXQoc3RydWN0IGRy bV9pOTE1X2dlbV9yZXF1ZXN0ICpyZXF1ZXN0KQogCWludGVsX2xvZ2ljYWxfcmluZ19lbWl0KHJp bmdidWYsIE1JX05PT1ApOwogCWludGVsX2xvZ2ljYWxfcmluZ19hZHZhbmNlKHJpbmdidWYpOwog Ci0JaWYgKGludGVsX3Jpbmdfc3RvcHBlZChyZXF1ZXN0LT5yaW5nKSkKKwlpZiAoaW50ZWxfcmlu Z19zdG9wcGVkKGVuZ2luZSkpCiAJCXJldHVybiAwOwogCisJaWYgKGVuZ2luZS0+bGFzdF9jb250 ZXh0ICE9IHJlcXVlc3QtPmN0eCkgeworCQlpZiAoZW5naW5lLT5sYXN0X2NvbnRleHQpCisJCQlp bnRlbF9scl9jb250ZXh0X3VucGluKGVuZ2luZS0+bGFzdF9jb250ZXh0LCBlbmdpbmUpOworCQlp ZiAocmVxdWVzdC0+Y3R4ICE9IHJlcXVlc3QtPmk5MTUtPmtlcm5lbF9jb250ZXh0KSB7CisJCQlp bnRlbF9scl9jb250ZXh0X3BpbihyZXF1ZXN0LT5jdHgsIGVuZ2luZSk7CisJCQllbmdpbmUtPmxh c3RfY29udGV4dCA9IHJlcXVlc3QtPmN0eDsKKwkJfSBlbHNlIHsKKwkJCWVuZ2luZS0+bGFzdF9j b250ZXh0ID0gTlVMTDsKKwkJfQorCX0KKwogCWlmIChkZXZfcHJpdi0+Z3VjLmV4ZWNidWZfY2xp ZW50KQogCQlpOTE1X2d1Y19zdWJtaXQoZGV2X3ByaXYtPmd1Yy5leGVjYnVmX2NsaWVudCwgcmVx dWVzdCk7CiAJZWxzZQpAQCAtMTEyOSw3ICsxMTQxLDcgQEAgdm9pZCBpbnRlbF9scl9jb250ZXh0 X3VucGluKHN0cnVjdCBpbnRlbF9jb250ZXh0ICpjdHgsCiB7CiAJc3RydWN0IGRybV9pOTE1X2dl bV9vYmplY3QgKmN0eF9vYmogPSBjdHgtPmVuZ2luZVtlbmdpbmUtPmlkXS5zdGF0ZTsKIAotCVdB Uk5fT04oIW11dGV4X2lzX2xvY2tlZCgmZW5naW5lLT5kZXYtPnN0cnVjdF9tdXRleCkpOworCVdB Uk5fT04oIW11dGV4X2lzX2xvY2tlZCgmY3R4LT5pOTE1LT5kZXYtPnN0cnVjdF9tdXRleCkpOwog CiAJaWYgKFdBUk5fT05fT05DRSghY3R4X29iaikpCiAJCXJldHVybjsKLS0gCjEuOS4xCgpfX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpJbnRlbC1nZnggbWFp bGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cDovL2xpc3RzLmZy ZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeAo=