From mboxrd@z Thu Jan  1 00:00:00 1970
From: Chris Wilson <chris@chris-wilson.co.uk>
Subject: [PATCH v2] drm/i915: Fix fallout of fake reset along
 resume
Date: Sat, 16 Jun 2018 21:25:34 +0100
Message-ID: <20180616202534.18767-1-chris@chris-wilson.co.uk>
References: <20180616171239.18434-1-chris@chris-wilson.co.uk>
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 fireflyinternet.com (mail.fireflyinternet.com [109.228.58.192])
 by gabe.freedesktop.org (Postfix) with ESMTPS id A12B16E2BA
 for <intel-gfx@lists.freedesktop.org>; Sat, 16 Jun 2018 20:25:52 +0000 (UTC)
In-Reply-To: <20180616171239.18434-1-chris@chris-wilson.co.uk>
List-Unsubscribe: <https://lists.freedesktop.org/mailman/options/intel-gfx>,
 <mailto:intel-gfx-request@lists.freedesktop.org?subject=unsubscribe>
List-Archive: <https://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: <https://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

Y29tbWl0IGIyMjA5ZTYyYTQ1MCAoImRybS9pOTE1L2V4ZWNsaXN0czogUmVzZXQgdGhlIENTQiBo
ZWFkIHRyYWNraW5nIG9uCnJlc2V0L3Nhbml0aXphdGlvbiIpIGFuZCBjb21taXQgMTI4ODc4NmIx
OGY3ICgiZHJtL2k5MTU6IE1vdmUgR0VNIHNhbml0aXplCmZyb20gcmVzdW1lX2Vhcmx5IHRvIHJl
c3VtZSIpIHNob3cgdGhlIGNvbmZsaWN0aW5nIHJlcXVpcmVtZW50cyBvbiB0aGUKY29kZS4gV2Ug
bXVzdCByZXNldCB0aGUgR1BVIGJlZm9yZSB0cmFzaGluZyBsaXZlIHN0YXRlIG9uIGEgZmFzdCBy
ZXN1bWUKKGhpYmVybmF0aW9uIGRlYnVnLCBvciBlcnJvciBwYXRocyksIGJ1dCB3ZSBtdXN0IG9u
bHkgcmVzZXQgb3VyIHN0YXRlCnRyYWNraW5nIGlmZiB0aGUgR1BVIGlzIHJlc2V0IChvciBwb3dl
ciBjeWNsZWQpLiBUaGlzIGlzIHRyaWNreSBpZiB3ZQphcmUgZGlzYWJsaW5nIEdQVSByZXNldCB0
byBzaW11bGF0ZSBicm9rZW4gaGFyZHdhcmU7IHdlIHJlc2V0IG91ciBzdGF0ZQp0cmFja2luZyBi
dXQgdGhlIEdQVSBpcyBsZWZ0IGludGFjdCBhbmQgcmVjb3ZlcnMgZnJvbSBpdHMgc3RhbGUgc3Rh
dGUuCgp2MjogQWdhaW4gd2l0aG91dCB0aGUgYXNzZXJ0aW9uIGZvciBmb3JjZXdha2UsIG5vIGxv
bmdlciByZXF1aXJlZCBzaW5jZQpjb21taXQgYjNlZTA5YTRkZTMzICgiZHJtL2k5MTUvcmluZ2J1
ZmZlcjogRml4IGNvbnRleHQgcmVzdG9yZSB1cG9uIHJlc2V0IikKYXMgdGhlIGNvbnRleHRzIGFy
ZSByZXNldCBmcm9tIHRoZSBDUyBlbnN1cmluZyBldmVyeXRoaW5nIGlzIHBvd2VyZWQgdXAuCgpG
aXhlczogYjIyMDllNjJhNDUwICgiZHJtL2k5MTUvZXhlY2xpc3RzOiBSZXNldCB0aGUgQ1NCIGhl
YWQgdHJhY2tpbmcgb24gcmVzZXQvc2FuaXRpemF0aW9uIikKRml4ZXM6IDEyODg3ODZiMThmNyAo
ImRybS9pOTE1OiBNb3ZlIEdFTSBzYW5pdGl6ZSBmcm9tIHJlc3VtZV9lYXJseSB0byByZXN1bWUi
KQpTaWduZWQtb2ZmLWJ5OiBDaHJpcyBXaWxzb24gPGNocmlzQGNocmlzLXdpbHNvbi5jby51az4K
Q2M6IFR2cnRrbyBVcnN1bGluIDx0dnJ0a28udXJzdWxpbkBpbnRlbC5jb20+CkNjOiBNaWthIEt1
b3BwYWxhIDxtaWthLmt1b3BwYWxhQGxpbnV4LmludGVsLmNvbT4KQ2M6IEpvb25hcyBMYWh0aW5l
biA8am9vbmFzLmxhaHRpbmVuQGxpbnV4LmludGVsLmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0v
aTkxNS9pOTE1X2Rydi5jICAgICAgICAgfCAgMiArKwogZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkx
NV9nZW0uYyAgICAgICAgIHwgMTQgKysrKystLS0tLS0tLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1
L2ludGVsX2VuZ2luZV9jcy5jICB8IDIyICsrKysrKysrKysrKysrKysrKysrKysKIGRyaXZlcnMv
Z3B1L2RybS9pOTE1L2ludGVsX3JpbmdidWZmZXIuYyB8ICA4IC0tLS0tLS0tCiBkcml2ZXJzL2dw
dS9kcm0vaTkxNS9pbnRlbF9yaW5nYnVmZmVyLmggfCAgMiArKwogNSBmaWxlcyBjaGFuZ2VkLCAz
MSBpbnNlcnRpb25zKCspLCAxNyBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dw
dS9kcm0vaTkxNS9pOTE1X2Rydi5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuYwpp
bmRleCA3NDIzZDc4ZjM4ZjQuLmJlYjA5NTEwMDFjZSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUv
ZHJtL2k5MTUvaTkxNV9kcnYuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5j
CkBAIC0xODQxLDYgKzE4NDEsOCBAQCBzdGF0aWMgaW50IGk5MTVfZHJtX3Jlc3VtZV9lYXJseShz
dHJ1Y3QgZHJtX2RldmljZSAqZGV2KQogCWVsc2UKIAkJaW50ZWxfZGlzcGxheV9zZXRfaW5pdF9w
b3dlcihkZXZfcHJpdiwgdHJ1ZSk7CiAKKwlpbnRlbF9lbmdpbmVzX3Nhbml0aXplKGRldl9wcml2
KTsKKwogCWVuYWJsZV9ycG1fd2FrZXJlZl9hc3NlcnRzKGRldl9wcml2KTsKIAogb3V0OgpkaWZm
IC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW0uYyBiL2RyaXZlcnMvZ3B1L2Ry
bS9pOTE1L2k5MTVfZ2VtLmMKaW5kZXggNTE1NWU0NThiMTFlLi44MjJhYmY0NDQzNzggMTAwNjQ0
Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtLmMKKysrIGIvZHJpdmVycy9ncHUv
ZHJtL2k5MTUvaTkxNV9nZW0uYwpAQCAtNDk5MCw4ICs0OTkwLDcgQEAgdm9pZCBfX2k5MTVfZ2Vt
X29iamVjdF9yZWxlYXNlX3VubGVzc19hY3RpdmUoc3RydWN0IGRybV9pOTE1X2dlbV9vYmplY3Qg
Km9iaikKIAogdm9pZCBpOTE1X2dlbV9zYW5pdGl6ZShzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAq
aTkxNSkKIHsKLQlzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICplbmdpbmU7Ci0JZW51bSBpbnRlbF9l
bmdpbmVfaWQgaWQ7CisJaW50IGVycjsKIAogCUdFTV9UUkFDRSgiXG4iKTsKIApAQCAtNTAxNywx
NCArNTAxNiwxMSBAQCB2b2lkIGk5MTVfZ2VtX3Nhbml0aXplKHN0cnVjdCBkcm1faTkxNV9wcml2
YXRlICppOTE1KQogCSAqIGl0IG1heSBpbXBhY3QgdGhlIGRpc3BsYXkgYW5kIHdlIGFyZSB1bmNl
cnRhaW4gYWJvdXQgdGhlIHN0YWJpbGl0eQogCSAqIG9mIHRoZSByZXNldCwgc28gdGhpcyBjb3Vs
ZCBiZSBhcHBsaWVkIHRvIGV2ZW4gZWFybGllciBnZW4uCiAJICovCisJZXJyID0gLUVOT0RFVjsK
IAlpZiAoSU5URUxfR0VOKGk5MTUpID49IDUgJiYgaW50ZWxfaGFzX2dwdV9yZXNldChpOTE1KSkK
LQkJV0FSTl9PTihpbnRlbF9ncHVfcmVzZXQoaTkxNSwgQUxMX0VOR0lORVMpKTsKLQotCS8qIFJl
c2V0IHRoZSBzdWJtaXNzaW9uIGJhY2tlbmQgYWZ0ZXIgcmVzdW1lIGFzIHdlbGwgYXMgdGhlIEdQ
VSByZXNldCAqLwotCWZvcl9lYWNoX2VuZ2luZShlbmdpbmUsIGk5MTUsIGlkKSB7Ci0JCWlmIChl
bmdpbmUtPnJlc2V0LnJlc2V0KQotCQkJZW5naW5lLT5yZXNldC5yZXNldChlbmdpbmUsIE5VTEwp
OwotCX0KKwkJZXJyID0gV0FSTl9PTihpbnRlbF9ncHVfcmVzZXQoaTkxNSwgQUxMX0VOR0lORVMp
KTsKKwlpZiAoIWVycikKKwkJaW50ZWxfZW5naW5lc19zYW5pdGl6ZShpOTE1KTsKIAogCWludGVs
X3VuY29yZV9mb3JjZXdha2VfcHV0KGk5MTUsIEZPUkNFV0FLRV9BTEwpOwogCWludGVsX3J1bnRp
bWVfcG1fcHV0KGk5MTUpOwpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxf
ZW5naW5lX2NzLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9lbmdpbmVfY3MuYwppbmRl
eCAxM2JiOGM3ZDI2MjEuLjMyYmYzYTQwOGQ0NiAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJt
L2k5MTUvaW50ZWxfZW5naW5lX2NzLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxf
ZW5naW5lX2NzLmMKQEAgLTEwNzcsNiArMTA3NywyOCBAQCB2b2lkIGludGVsX2VuZ2luZXNfcmVz
ZXRfZGVmYXVsdF9zdWJtaXNzaW9uKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICppOTE1KQogCQll
bmdpbmUtPnNldF9kZWZhdWx0X3N1Ym1pc3Npb24oZW5naW5lKTsKIH0KIAorLyoqCisgKiBpbnRl
bF9lbmdpbmVzX3Nhbml0aXplOiBjYWxsZWQgYWZ0ZXIgdGhlIEdQVSBoYXMgbG9zdCBwb3dlcgor
ICogQGk5MTU6IHRoZSBpOTE1IGRldmljZQorICoKKyAqIEFueXRpbWUgd2UgcmVzZXQgdGhlIEdQ
VSwgZWl0aGVyIHdpdGggYW4gZXhwbGljaXQgR1BVIHJlc2V0IG9yIHRocm91Z2ggYQorICogUENJ
IHBvd2VyIGN5Y2xlLCB0aGUgR1BVIGxvc2VzIHN0YXRlIGFuZCB3ZSBtdXN0IHJlc2V0IG91ciBz
dGF0ZSB0cmFja2luZworICogdG8gbWF0Y2guIE5vdGUgdGhhdCBjYWxsaW5nIGludGVsX2VuZ2lu
ZXNfc2FuaXRpemUoKSBpZiB0aGUgR1BVIGhhcyBub3QKKyAqIGJlZW4gcmVzZXQgcmVzdWx0cyBp
biBtdWNoIGNvbmZ1c2lvbiEKKyAqLwordm9pZCBpbnRlbF9lbmdpbmVzX3Nhbml0aXplKHN0cnVj
dCBkcm1faTkxNV9wcml2YXRlICppOTE1KQoreworCXN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKmVu
Z2luZTsKKwllbnVtIGludGVsX2VuZ2luZV9pZCBpZDsKKworCUdFTV9UUkFDRSgiXG4iKTsKKwor
CWZvcl9lYWNoX2VuZ2luZShlbmdpbmUsIGk5MTUsIGlkKSB7CisJCWlmIChlbmdpbmUtPnJlc2V0
LnJlc2V0KQorCQkJZW5naW5lLT5yZXNldC5yZXNldChlbmdpbmUsIE5VTEwpOworCX0KK30KKwog
LyoqCiAgKiBpbnRlbF9lbmdpbmVzX3Bhcms6IGNhbGxlZCB3aGVuIHRoZSBHVCBpcyB0cmFuc2l0
aW9uaW5nIGZyb20gYnVzeS0+aWRsZQogICogQGk5MTU6IHRoZSBpOTE1IGRldmljZQpkaWZmIC0t
Z2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcmluZ2J1ZmZlci5jIGIvZHJpdmVycy9n
cHUvZHJtL2k5MTUvaW50ZWxfcmluZ2J1ZmZlci5jCmluZGV4IGVmM2M3NjQyNTg0My4uZTA0NDhl
ZmYxMmJkIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9yaW5nYnVmZmVy
LmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcmluZ2J1ZmZlci5jCkBAIC01NjMs
MTQgKzU2Myw2IEBAIHN0YXRpYyB2b2lkIHJlc2V0X3Jpbmcoc3RydWN0IGludGVsX2VuZ2luZV9j
cyAqZW5naW5lLCBzdHJ1Y3QgaTkxNV9yZXF1ZXN0ICpycSkKIHsKIAlHRU1fVFJBQ0UoIiVzIHNl
cW5vPSV4XG4iLCBlbmdpbmUtPm5hbWUsIHJxID8gcnEtPmdsb2JhbF9zZXFubyA6IDApOwogCi0J
LyoKLQkgKiBSQzYgbXVzdCBiZSBwcmV2ZW50ZWQgdW50aWwgdGhlIHJlc2V0IGlzIGNvbXBsZXRl
IGFuZCB0aGUgZW5naW5lCi0JICogcmVpbml0aWFsaXNlZC4gSWYgaXQgb2NjdXJzIGluIHRoZSBt
aWRkbGUgb2YgdGhpcyBzZXF1ZW5jZSwgdGhlCi0JICogc3RhdGUgd3JpdHRlbiB0by9sb2FkZWQg
ZnJvbSB0aGUgcG93ZXIgY29udGV4dCBpcyBpbGwtZGVmaW5lZCAoZS5nLgotCSAqIHRoZSBQUF9C
QVNFX0RJUiBtYXkgYmUgbG9zdCkuCi0JICovCi0JYXNzZXJ0X2ZvcmNld2FrZXNfYWN0aXZlKGVu
Z2luZS0+aTkxNSwgRk9SQ0VXQUtFX0FMTCk7Ci0KIAkvKgogCSAqIFRyeSB0byByZXN0b3JlIHRo
ZSBsb2dpY2FsIEdQVSBzdGF0ZSB0byBtYXRjaCB0aGUgY29udGludWF0aW9uCiAJICogb2YgdGhl
IHJlcXVlc3QgcXVldWUuIElmIHdlIHNraXAgdGhlIGNvbnRleHQvUEQgcmVzdG9yZSwgdGhlbgpk
aWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcmluZ2J1ZmZlci5oIGIvZHJp
dmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcmluZ2J1ZmZlci5oCmluZGV4IDQwMDNmM2ViZTNkMS4u
YTBiYzdhODIyMmI0IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9yaW5n
YnVmZmVyLmgKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcmluZ2J1ZmZlci5oCkBA
IC0xMDUyLDYgKzEwNTIsOCBAQCBnZW44X2VtaXRfZ2d0dF93cml0ZSh1MzIgKmNzLCB1MzIgdmFs
dWUsIHUzMiBndHRfb2Zmc2V0KQogCXJldHVybiBjczsKIH0KIAordm9pZCBpbnRlbF9lbmdpbmVz
X3Nhbml0aXplKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICppOTE1KTsKKwogYm9vbCBpbnRlbF9l
bmdpbmVfaXNfaWRsZShzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICplbmdpbmUpOwogYm9vbCBpbnRl
bF9lbmdpbmVzX2FyZV9pZGxlKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdik7CiAK
LS0gCjIuMTcuMQoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f
X18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3Jn
Cmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4
Cg==