From: Tvrtko Ursulin Subject: [PATCH 3/3] drm/i915: Fix premature LRC unpin in GuC mode Date: Wed, 20 Jan 2016 13:40:57 +0000 Message-ID: <1453297257-4707-3-git-send-email-tvrtko.ursulin@linux.intel.com> References: <1453297257-4707-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 mga14.intel.com (mga14.intel.com [192.55.52.115]) by gabe.freedesktop.org (Postfix) with ESMTP id ED7E56E933 for ; Wed, 20 Jan 2016 05:41:03 -0800 (PST) In-Reply-To: <1453297257-4707-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 bmdidWZmZXIgcnVubmluZyBiZWZvcmUgaXRzZWxmLgoKU2lnbmVkLW9mZi1ieTogVHZydGtvIFVy c3VsaW4gPHR2cnRrby51cnN1bGluQGludGVsLmNvbT4KSXNzdWU6IFZJWi00Mjc3CkNjOiBDaHJp cyBXaWxzb24gPGNocmlzQGNocmlzLXdpbHNvbi5jby51az4KQ2M6IE5pY2sgSG9hdGggPG5pY2hv bGFzLmhvYXRoQGludGVsLmNvbT4KLS0tCkkgY2Fubm90IHRlc3QgdGhpcyB3aXRoIEd1QyBidXQg aXQgcGFzc2VzIEJBVCB3aXRoIGV4ZWNsaXN0cwphbmQgc29tZSByZWFsIHdvcmxkIHNtb2tlIHRl c3RzLgotLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2NvbnRleHQuYyB8IDQgKysr LQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfbHJjLmMgICAgICAgIHwgNyArKysrKysrCiAy IGZpbGVzIGNoYW5nZWQsIDEwIGluc2VydGlvbnMoKyksIDEgZGVsZXRpb24oLSkKCmRpZmYgLS1n aXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9jb250ZXh0LmMgYi9kcml2ZXJzL2dw dS9kcm0vaTkxNS9pOTE1X2dlbV9jb250ZXh0LmMKaW5kZXggYzI1MDgzYzc4YmE3Li4wYjQxOWUx NjU4MzYgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2NvbnRleHQu YworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9jb250ZXh0LmMKQEAgLTQzOCw3 ICs0MzgsOSBAQCB2b2lkIGk5MTVfZ2VtX2NvbnRleHRfZmluaShzdHJ1Y3QgZHJtX2RldmljZSAq ZGV2KQogCWZvciAoaSA9IDA7IGkgPCBJOTE1X05VTV9SSU5HUzsgaSsrKSB7CiAJCXN0cnVjdCBp bnRlbF9lbmdpbmVfY3MgKnJpbmcgPSAmZGV2X3ByaXYtPnJpbmdbaV07CiAKLQkJaWYgKHJpbmct Pmxhc3RfY29udGV4dCkKKwkJaWYgKHJpbmctPmxhc3RfY29udGV4dCAmJiBpOTE1LmVuYWJsZV9l eGVjbGlzdHMpCisJCQlpbnRlbF9scl9jb250ZXh0X3VucGluKHJpbmctPmxhc3RfY29udGV4dCwg cmluZyk7CisJCWVsc2UgaWYgKHJpbmctPmxhc3RfY29udGV4dCkKIAkJCWk5MTVfZ2VtX2NvbnRl eHRfdW5yZWZlcmVuY2UocmluZy0+bGFzdF9jb250ZXh0KTsKIAogCQlyaW5nLT5kZWZhdWx0X2Nv bnRleHQgPSBOVUxMOwpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfbHJj LmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9scmMuYwppbmRleCA1YzNmNTdmZWQ5MTYu LmI4YTdlMTI2ZDZkMiAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfbHJj LmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfbHJjLmMKQEAgLTkxOCw2ICs5MTgs NyBAQCBpbnQgaW50ZWxfZXhlY2xpc3RzX3N1Ym1pc3Npb24oc3RydWN0IGk5MTVfZXhlY2J1ZmZl cl9wYXJhbXMgKnBhcmFtcywKIAlzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICAqcmluZyA9IHBhcmFt cy0+cmluZzsKIAlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSBkZXYtPmRldl9w cml2YXRlOwogCXN0cnVjdCBpbnRlbF9yaW5nYnVmZmVyICpyaW5nYnVmID0gcGFyYW1zLT5jdHgt PmVuZ2luZVtyaW5nLT5pZF0ucmluZ2J1ZjsKKwlzdHJ1Y3QgaW50ZWxfY29udGV4dCAgICAqY3R4 ID0gcGFyYW1zLT5yZXF1ZXN0LT5jdHg7CiAJdTY0IGV4ZWNfc3RhcnQ7CiAJaW50IGluc3RwX21v ZGU7CiAJdTMyIGluc3RwX21hc2s7CkBAIC05ODIsNiArOTgzLDEyIEBAIGludCBpbnRlbF9leGVj bGlzdHNfc3VibWlzc2lvbihzdHJ1Y3QgaTkxNV9leGVjYnVmZmVyX3BhcmFtcyAqcGFyYW1zLAog CiAJdHJhY2VfaTkxNV9nZW1fcmluZ19kaXNwYXRjaChwYXJhbXMtPnJlcXVlc3QsIHBhcmFtcy0+ ZGlzcGF0Y2hfZmxhZ3MpOwogCisJaWYgKHJpbmctPmxhc3RfY29udGV4dCAmJiByaW5nLT5sYXN0 X2NvbnRleHQgIT0gY3R4KSB7CisJCWludGVsX2xyX2NvbnRleHRfdW5waW4ocmluZy0+bGFzdF9j b250ZXh0LCByaW5nKTsKKwkJaW50ZWxfbHJfY29udGV4dF9waW4oY3R4LCByaW5nKTsKKwkJcmlu Zy0+bGFzdF9jb250ZXh0ID0gY3R4OworCX0KKwogCWk5MTVfZ2VtX2V4ZWNidWZmZXJfbW92ZV90 b19hY3RpdmUodm1hcywgcGFyYW1zLT5yZXF1ZXN0KTsKIAlpOTE1X2dlbV9leGVjYnVmZmVyX3Jl dGlyZV9jb21tYW5kcyhwYXJhbXMpOwogCi0tIAoxLjkuMQoKX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1n ZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHA6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFp bG1hbi9saXN0aW5mby9pbnRlbC1nZngK