From mboxrd@z Thu Jan  1 00:00:00 1970
From: Tvrtko Ursulin <tvrtko.ursulin@linux.intel.com>
Subject: [PATCH v4 4/4] drm/i915: Fix premature LRC unpin in GuC
	mode
Date: Mon, 25 Jan 2016 11:25:50 +0000
Message-ID: <1453721150-36705-4-git-send-email-tvrtko.ursulin@linux.intel.com>
References: <1453721150-36705-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: <intel-gfx-bounces@lists.freedesktop.org>
Received: from mga02.intel.com (mga02.intel.com [134.134.136.20])
 by gabe.freedesktop.org (Postfix) with ESMTP id 6A40A6E1D4
 for <Intel-gfx@lists.freedesktop.org>; Mon, 25 Jan 2016 03:25:57 -0800 (PST)
In-Reply-To: <1453721150-36705-1-git-send-email-tvrtko.ursulin@linux.intel.com>
List-Unsubscribe: <http://lists.freedesktop.org/mailman/options/intel-gfx>,
 <mailto:intel-gfx-request@lists.freedesktop.org?subject=unsubscribe>
List-Archive: <http://lists.freedesktop.org/archives/intel-gfx>
List-Post: <mailto:intel-gfx@lists.freedesktop.org>
List-Help: <mailto:intel-gfx-request@lists.freedesktop.org?subject=help>
List-Subscribe: <http://lists.freedesktop.org/mailman/listinfo/intel-gfx>,
 <mailto:intel-gfx-request@lists.freedesktop.org?subject=subscribe>
Errors-To: intel-gfx-bounces@lists.freedesktop.org
Sender: "Intel-gfx" <intel-gfx-bounces@lists.freedesktop.org>
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+ClJldmlld2VkLWJ5OiBDaHJpcyBXaWxzb24gPGNocmlzQGNocmlzLXdpbHNvbi5j
by51az4KSXNzdWU6IFZJWi00Mjc3CkNjOiBDaHJpcyBXaWxzb24gPGNocmlzQGNocmlzLXdpbHNv
bi5jby51az4KQ2M6IE5pY2sgSG9hdGggPG5pY2hvbGFzLmhvYXRoQGludGVsLmNvbT4KLS0tCiBk
cml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9jb250ZXh0LmMgfCAxMCArKysrKysrLS0tCiBk
cml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9scmMuYyAgICAgICAgfCAxNiArKysrKysrKysrKysr
Ky0tCiAyIGZpbGVzIGNoYW5nZWQsIDIxIGluc2VydGlvbnMoKyksIDUgZGVsZXRpb25zKC0pCgpk
aWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fY29udGV4dC5jIGIvZHJp
dmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fY29udGV4dC5jCmluZGV4IGJiYTE3YjlmMWJlNS4u
ODNhMDk3Yzk0OTExIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9j
b250ZXh0LmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fY29udGV4dC5jCkBA
IC0zMjQsOSArMzI0LDEzIEBAIGVycl9kZXN0cm95Ogogc3RhdGljIHZvaWQgaTkxNV9nZW1fY29u
dGV4dF91bnBpbihzdHJ1Y3QgaW50ZWxfY29udGV4dCAqY3R4LAogCQkJCSAgIHN0cnVjdCBpbnRl
bF9lbmdpbmVfY3MgKmVuZ2luZSkKIHsKLQlpZiAoZW5naW5lLT5pZCA9PSBSQ1MgJiYgY3R4LT5s
ZWdhY3lfaHdfY3R4LnJjc19zdGF0ZSkKLQkJaTkxNV9nZW1fb2JqZWN0X2dndHRfdW5waW4oY3R4
LT5sZWdhY3lfaHdfY3R4LnJjc19zdGF0ZSk7Ci0JaTkxNV9nZW1fY29udGV4dF91bnJlZmVyZW5j
ZShjdHgpOworCWlmIChpOTE1LmVuYWJsZV9leGVjbGlzdHMpIHsKKwkJaW50ZWxfbHJfY29udGV4
dF91bnBpbihjdHgsIGVuZ2luZSk7CisJfSBlbHNlIHsKKwkJaWYgKGVuZ2luZS0+aWQgPT0gUkNT
ICYmIGN0eC0+bGVnYWN5X2h3X2N0eC5yY3Nfc3RhdGUpCisJCQlpOTE1X2dlbV9vYmplY3RfZ2d0
dF91bnBpbihjdHgtPmxlZ2FjeV9od19jdHgucmNzX3N0YXRlKTsKKwkJaTkxNV9nZW1fY29udGV4
dF91bnJlZmVyZW5jZShjdHgpOworCX0KIH0KIAogdm9pZCBpOTE1X2dlbV9jb250ZXh0X3Jlc2V0
KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkx
NS9pbnRlbF9scmMuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2xyYy5jCmluZGV4IDYx
ZTY0ZDc4YWRiZC4uM2EwMzY0NmUzNDNkIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkx
NS9pbnRlbF9scmMuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9scmMuYwpAQCAt
NzY1LDYgKzc2NSw3IEBAIGludGVsX2xvZ2ljYWxfcmluZ19hZHZhbmNlX2FuZF9zdWJtaXQoc3Ry
dWN0IGRybV9pOTE1X2dlbV9yZXF1ZXN0ICpyZXF1ZXN0KQogewogCXN0cnVjdCBpbnRlbF9yaW5n
YnVmZmVyICpyaW5nYnVmID0gcmVxdWVzdC0+cmluZ2J1ZjsKIAlzdHJ1Y3QgZHJtX2k5MTVfcHJp
dmF0ZSAqZGV2X3ByaXYgPSByZXF1ZXN0LT5pOTE1OworCXN0cnVjdCBpbnRlbF9lbmdpbmVfY3Mg
KmVuZ2luZSA9IHJlcXVlc3QtPnJpbmc7CiAKIAlpbnRlbF9sb2dpY2FsX3JpbmdfYWR2YW5jZShy
aW5nYnVmKTsKIAlyZXF1ZXN0LT50YWlsID0gcmluZ2J1Zi0+dGFpbDsKQEAgLTc3OSw5ICs3ODAs
MjAgQEAgaW50ZWxfbG9naWNhbF9yaW5nX2FkdmFuY2VfYW5kX3N1Ym1pdChzdHJ1Y3QgZHJtX2k5
MTVfZ2VtX3JlcXVlc3QgKnJlcXVlc3QpCiAJaW50ZWxfbG9naWNhbF9yaW5nX2VtaXQocmluZ2J1
ZiwgTUlfTk9PUCk7CiAJaW50ZWxfbG9naWNhbF9yaW5nX2FkdmFuY2UocmluZ2J1Zik7CiAKLQlp
ZiAoaW50ZWxfcmluZ19zdG9wcGVkKHJlcXVlc3QtPnJpbmcpKQorCWlmIChpbnRlbF9yaW5nX3N0
b3BwZWQoZW5naW5lKSkKIAkJcmV0dXJuIDA7CiAKKwlpZiAoZW5naW5lLT5sYXN0X2NvbnRleHQg
IT0gcmVxdWVzdC0+Y3R4KSB7CisJCWlmIChlbmdpbmUtPmxhc3RfY29udGV4dCkKKwkJCWludGVs
X2xyX2NvbnRleHRfdW5waW4oZW5naW5lLT5sYXN0X2NvbnRleHQsIGVuZ2luZSk7CisJCWlmIChy
ZXF1ZXN0LT5jdHggIT0gcmVxdWVzdC0+aTkxNS0+a2VybmVsX2NvbnRleHQpIHsKKwkJCWludGVs
X2xyX2NvbnRleHRfcGluKHJlcXVlc3QtPmN0eCwgZW5naW5lKTsKKwkJCWVuZ2luZS0+bGFzdF9j
b250ZXh0ID0gcmVxdWVzdC0+Y3R4OworCQl9IGVsc2UgeworCQkJZW5naW5lLT5sYXN0X2NvbnRl
eHQgPSBOVUxMOworCQl9CisJfQorCiAJaWYgKGRldl9wcml2LT5ndWMuZXhlY2J1Zl9jbGllbnQp
CiAJCWk5MTVfZ3VjX3N1Ym1pdChkZXZfcHJpdi0+Z3VjLmV4ZWNidWZfY2xpZW50LCByZXF1ZXN0
KTsKIAllbHNlCkBAIC0xMTMxLDcgKzExNDMsNyBAQCB2b2lkIGludGVsX2xyX2NvbnRleHRfdW5w
aW4oc3RydWN0IGludGVsX2NvbnRleHQgKmN0eCwKIHsKIAlzdHJ1Y3QgZHJtX2k5MTVfZ2VtX29i
amVjdCAqY3R4X29iaiA9IGN0eC0+ZW5naW5lW2VuZ2luZS0+aWRdLnN0YXRlOwogCi0JV0FSTl9P
TighbXV0ZXhfaXNfbG9ja2VkKCZlbmdpbmUtPmRldi0+c3RydWN0X211dGV4KSk7CisJV0FSTl9P
TighbXV0ZXhfaXNfbG9ja2VkKCZjdHgtPmk5MTUtPmRldi0+c3RydWN0X211dGV4KSk7CiAKIAlp
ZiAoV0FSTl9PTl9PTkNFKCFjdHhfb2JqKSkKIAkJcmV0dXJuOwotLSAKMS45LjEKCl9fX19fX19f
X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCkludGVsLWdmeCBtYWlsaW5n
IGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwOi8vbGlzdHMuZnJlZWRl
c2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4Cg==