From mboxrd@z Thu Jan  1 00:00:00 1970
From: Thomas Daniel <thomas.daniel@intel.com>
Subject: [PATCH] drm/i915: Reset logical ring contexts' head and
	tail during GPU reset
Date: Mon, 16 Feb 2015 16:12:53 +0000
Message-ID: <1424103173-17387-1-git-send-email-thomas.daniel@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 mga09.intel.com (mga09.intel.com [134.134.136.24])
 by gabe.freedesktop.org (Postfix) with ESMTP id 7F2486E2BF
 for <intel-gfx@lists.freedesktop.org>; Mon, 16 Feb 2015 08:13:00 -0800 (PST)
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

V29yayB3YXMgZ2V0dGluZyBsZWZ0IGJlaGluZCBpbiBMUkMgY29udGV4dHMgZHVyaW5nIHJlc2V0
LiAgVGhpcyBjYXVzZXMgYSBoYW5nCmlmIHRoZSBHUFUgaXMgcmVzZXQgd2hlbiBIRUFEPT1UQUlM
IGJlY2F1c2UgdGhlIGNvbnRleHQncyByaW5nYnVmZmVyIGhlYWQgYW5kCnRhaWwgZG9uJ3QgZ2V0
IHJlc2V0IGFuZCByZXRpcmluZyBhIHJlcXVlc3QgZG9lc24ndCBhbHRlciB0aGVtLCBzbyB0aGUg
cmluZwpzdGlsbCBhcHBlYXJzIGZ1bGwuCgpBZGRlZCBhIGZ1bmN0aW9uIGludGVsX2xyX2NvbnRl
eHRfcmVzZXQoKSB0byByZXNldCBoZWFkIGFuZCB0YWlsIG9uIGEgTFJDIGFuZAppdHMgcmluZ2J1
ZmZlci4KCkNhbGwgaW50ZWxfbHJfY29udGV4dF9yZXNldCgpIGZvciBlYWNoIGNvbnRleHQgaW4g
aTkxNV9nZW1fY29udGV4dF9yZXNldCgpIHdoZW4KaW4gZXhlY2xpc3RzIG1vZGUuCgpUZXN0Y2Fz
ZTogaWd0L3BtX3JwcyAtLXJ1bi1zdWJ0ZXN0IHJlc2V0ICNiZHcKQnVnemlsbGE6IGh0dHBzOi8v
YnVncy5mcmVlZGVza3RvcC5vcmcvc2hvd19idWcuY2dpP2lkPTg4MDk2ClNpZ25lZC1vZmYtYnk6
IFRob21hcyBEYW5pZWwgPHRob21hcy5kYW5pZWxAaW50ZWwuY29tPgotLS0KIGRyaXZlcnMvZ3B1
L2RybS9pOTE1L2k5MTVfZ2VtX2NvbnRleHQuYyB8ICAgMTIgKysrKysrKy0tLS0KIGRyaXZlcnMv
Z3B1L2RybS9pOTE1L2ludGVsX2xyYy5jICAgICAgICB8ICAgMzQgKysrKysrKysrKysrKysrKysr
KysrKysrKysrKysrKwogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfbHJjLmggICAgICAgIHwg
ICAgMiArKwogMyBmaWxlcyBjaGFuZ2VkLCA0NCBpbnNlcnRpb25zKCspLCA0IGRlbGV0aW9ucygt
KQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2NvbnRleHQuYyBi
L2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2NvbnRleHQuYwppbmRleCA4NjAzYmY0Li43
MDM0NmIwIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9jb250ZXh0
LmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fY29udGV4dC5jCkBAIC0yOTYs
MTEgKzI5NiwxNSBAQCB2b2lkIGk5MTVfZ2VtX2NvbnRleHRfcmVzZXQoc3RydWN0IGRybV9kZXZp
Y2UgKmRldikKIAlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSBkZXYtPmRldl9w
cml2YXRlOwogCWludCBpOwogCi0JLyogSW4gZXhlY2xpc3RzIG1vZGUgd2Ugd2lsbCB1bnJlZmVy
ZW5jZSB0aGUgY29udGV4dCB3aGVuIHRoZSBleGVjbGlzdAotCSAqIHF1ZXVlIGlzIGNsZWFyZWQg
YW5kIHRoZSByZXF1ZXN0cyBkZXN0cm95ZWQuCi0JICovCi0JaWYgKGk5MTUuZW5hYmxlX2V4ZWNs
aXN0cykKKwlpZiAoaTkxNS5lbmFibGVfZXhlY2xpc3RzKSB7CisJCXN0cnVjdCBpbnRlbF9jb250
ZXh0ICpjdHg7CisKKwkJbGlzdF9mb3JfZWFjaF9lbnRyeShjdHgsICZkZXZfcHJpdi0+Y29udGV4
dF9saXN0LCBsaW5rKSB7CisJCQlpbnRlbF9scl9jb250ZXh0X3Jlc2V0KGRldiwgY3R4KTsKKwkJ
fQorCiAJCXJldHVybjsKKwl9CiAKIAlmb3IgKGkgPSAwOyBpIDwgSTkxNV9OVU1fUklOR1M7IGkr
KykgewogCQlzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICpyaW5nID0gJmRldl9wcml2LT5yaW5nW2ld
OwpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfbHJjLmMgYi9kcml2ZXJz
L2dwdS9kcm0vaTkxNS9pbnRlbF9scmMuYwppbmRleCBhYWZjZWYzLi4xOTQ2YmI5IDEwMDY0NAot
LS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9scmMuYworKysgYi9kcml2ZXJzL2dwdS9k
cm0vaTkxNS9pbnRlbF9scmMuYwpAQCAtMTk1MCwzICsxOTUwLDM3IEBAIGVycm9yX3VucGluX2N0
eDoKIAlkcm1fZ2VtX29iamVjdF91bnJlZmVyZW5jZSgmY3R4X29iai0+YmFzZSk7CiAJcmV0dXJu
IHJldDsKIH0KKwordm9pZCBpbnRlbF9scl9jb250ZXh0X3Jlc2V0KHN0cnVjdCBkcm1fZGV2aWNl
ICpkZXYsCisJCQlzdHJ1Y3QgaW50ZWxfY29udGV4dCAqY3R4KQoreworCXN0cnVjdCBkcm1faTkx
NV9wcml2YXRlICpkZXZfcHJpdiA9IGRldi0+ZGV2X3ByaXZhdGU7CisJc3RydWN0IGludGVsX2Vu
Z2luZV9jcyAqcmluZzsKKwlpbnQgaTsKKworCWZvcl9lYWNoX3JpbmcocmluZywgZGV2X3ByaXYs
IGkpIHsKKwkJc3RydWN0IGRybV9pOTE1X2dlbV9vYmplY3QgKmN0eF9vYmogPQorCQkJCWN0eC0+
ZW5naW5lW3JpbmctPmlkXS5zdGF0ZTsKKwkJaWYgKGN0eF9vYmopIHsKKwkJCXN0cnVjdCBpbnRl
bF9yaW5nYnVmZmVyICpyaW5nYnVmID0KKwkJCQkJY3R4LT5lbmdpbmVbcmluZy0+aWRdLnJpbmdi
dWY7CisJCQl1aW50MzJfdCAqcmVnX3N0YXRlOworCQkJc3RydWN0IHBhZ2UgKnBhZ2U7CisKKwkJ
CWlmIChpOTE1X2dlbV9vYmplY3RfZ2V0X3BhZ2VzKGN0eF9vYmopKSB7CisJCQkJV0FSTigxLCAi
RmFpbGVkIGdldF9wYWdlcyBmb3IgY29udGV4dCBvYmpcbiIpOworCQkJCWNvbnRpbnVlOworCQkJ
fQorCQkJcGFnZSA9IGk5MTVfZ2VtX29iamVjdF9nZXRfcGFnZShjdHhfb2JqLCAxKTsKKwkJCXJl
Z19zdGF0ZSA9IGttYXBfYXRvbWljKHBhZ2UpOworCisJCQlyZWdfc3RhdGVbQ1RYX1JJTkdfSEVB
RCsxXSA9IDA7CisJCQlyZWdfc3RhdGVbQ1RYX1JJTkdfVEFJTCsxXSA9IDA7CisKKwkJCWt1bm1h
cF9hdG9taWMocmVnX3N0YXRlKTsKKworCQkJcmluZ2J1Zi0+aGVhZCA9IDA7CisJCQlyaW5nYnVm
LT50YWlsID0gMDsKKwkJfQorCX0KK30KZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1
L2ludGVsX2xyYy5oIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfbHJjLmgKaW5kZXggZjYz
NTczNS4uNWRkMGVjYSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfbHJj
LmgKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfbHJjLmgKQEAgLTczLDYgKzczLDgg
QEAgaW50IGludGVsX2xyX2NvbnRleHRfZGVmZXJyZWRfY3JlYXRlKHN0cnVjdCBpbnRlbF9jb250
ZXh0ICpjdHgsCiAJCQkJICAgICBzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICpyaW5nKTsKIHZvaWQg
aW50ZWxfbHJfY29udGV4dF91bnBpbihzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICpyaW5nLAogCQlz
dHJ1Y3QgaW50ZWxfY29udGV4dCAqY3R4KTsKK3ZvaWQgaW50ZWxfbHJfY29udGV4dF9yZXNldChz
dHJ1Y3QgZHJtX2RldmljZSAqZGV2LAorCQkJc3RydWN0IGludGVsX2NvbnRleHQgKmN0eCk7CiAK
IC8qIEV4ZWNsaXN0cyAqLwogaW50IGludGVsX3Nhbml0aXplX2VuYWJsZV9leGVjbGlzdHMoc3Ry
dWN0IGRybV9kZXZpY2UgKmRldiwgaW50IGVuYWJsZV9leGVjbGlzdHMpOwotLSAKMS43LjkuNQoK
X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4
IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHA6Ly9saXN0
cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK