From mboxrd@z Thu Jan 1 00:00:00 1970 From: Chris Wilson Subject: [PATCH v2] drm/i915: Mark the current context as lost on suspend Date: Tue, 19 Apr 2016 15:12:22 +0100 Message-ID: <1461075142-20699-1-git-send-email-chris@chris-wilson.co.uk> References: <1461066053-30072-2-git-send-email-chris@chris-wilson.co.uk> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mail-wm0-x242.google.com (mail-wm0-x242.google.com [IPv6:2a00:1450:400c:c09::242]) by gabe.freedesktop.org (Postfix) with ESMTPS id A9C9A6E7A9 for ; Tue, 19 Apr 2016 14:12:29 +0000 (UTC) Received: by mail-wm0-x242.google.com with SMTP id l6so5543799wml.3 for ; Tue, 19 Apr 2016 07:12:29 -0700 (PDT) In-Reply-To: <1461066053-30072-2-git-send-email-chris@chris-wilson.co.uk> 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 SW4gb3JkZXIgdG8gZm9yY2UgYSByZWxvYWQgb2YgdGhlIGNvbnRleHQgaW1hZ2UgdXBvbiByZXN1 bWUsIHdlIGZpcnN0Cm5lZWQgdG8gbWFyayBpdHMgYWJzZW5jZSBvbiBzdXNwZW5kLiBDdXJyZW50 bHkgd2UgYXJlIGZhaWxpbmcgdG8gcmVzdG9yZQp0aGUgZ29sZGVuIGNvbnRleHQgc3RhdGUgYW5k IGFueSBjb250ZXh0IHcvYSB0byB0aGUgZGVmYXVsdCBjb250ZXh0CmFmdGVyIHJlc3VtZS4KCk9u ZSBvdmVyc2lnaHQgY29ycmVjdGVkLCBpcyB0aGF0IHdlIGhhZCBmb3Jnb3R0ZW4gdG8gcmVhcHBs eSB0aGUgTDMKcmVtYXBwaW5nIHdoZW4gcmVzdG9yaW5nIHRoZSBsb3N0IGRlZmF1bHQgY29udGV4 dC4KCnYyOiBSZW1vdmUgZGVwcmVjYXRlZCBXQVJOLgoKU2lnbmVkLW9mZi1ieTogQ2hyaXMgV2ls c29uIDxjaHJpc0BjaHJpcy13aWxzb24uY28udWs+CkNjOiBNaWthIEt1b3BwYWxhIDxtaWthLmt1 b3BwYWxhQGxpbnV4LmludGVsLmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Ry di5oICAgICAgICAgfCAgMSArCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbS5jICAgICAg ICAgfCAgMSArCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9jb250ZXh0LmMgfCA1NCAr KysrKysrKysrKysrKy0tLS0tLS0tLS0tLS0tLS0tLS0KIDMgZmlsZXMgY2hhbmdlZCwgMjUgaW5z ZXJ0aW9ucygrKSwgMzEgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJt L2k5MTUvaTkxNV9kcnYuaCBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmgKaW5kZXgg ODUxMDJhZDc1OTYyLi41OTUwMzdiZWMyZGUgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9p OTE1L2k5MTVfZHJ2LmgKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuaApAQCAt MzI5OSw2ICszMjk5LDcgQEAgdm9pZCBpOTE1X2dlbV9vYmplY3Rfc2F2ZV9iaXRfMTdfc3dpenps ZShzdHJ1Y3QgZHJtX2k5MTVfZ2VtX29iamVjdCAqb2JqKTsKIAogLyogaTkxNV9nZW1fY29udGV4 dC5jICovCiBpbnQgX19tdXN0X2NoZWNrIGk5MTVfZ2VtX2NvbnRleHRfaW5pdChzdHJ1Y3QgZHJt X2RldmljZSAqZGV2KTsKK3ZvaWQgaTkxNV9nZW1fY29udGV4dF9sb3N0KHN0cnVjdCBkcm1faTkx NV9wcml2YXRlICpkZXZfcHJpdik7CiB2b2lkIGk5MTVfZ2VtX2NvbnRleHRfZmluaShzdHJ1Y3Qg ZHJtX2RldmljZSAqZGV2KTsKIHZvaWQgaTkxNV9nZW1fY29udGV4dF9yZXNldChzdHJ1Y3QgZHJt X2RldmljZSAqZGV2KTsKIGludCBpOTE1X2dlbV9jb250ZXh0X29wZW4oc3RydWN0IGRybV9kZXZp Y2UgKmRldiwgc3RydWN0IGRybV9maWxlICpmaWxlKTsKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1 L2RybS9pOTE1L2k5MTVfZ2VtLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbS5jCmlu ZGV4IDZjZTJjMzFiOWE4MS4uZTdmZTI5ODU3ZTIzIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9k cm0vaTkxNS9pOTE1X2dlbS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtLmMK QEAgLTQ3MTEsNiArNDcxMSw3IEBAIGk5MTVfZ2VtX3N1c3BlbmQoc3RydWN0IGRybV9kZXZpY2Ug KmRldikKIAlpOTE1X2dlbV9yZXRpcmVfcmVxdWVzdHMoZGV2KTsKIAogCWk5MTVfZ2VtX3N0b3Bf ZW5naW5lcyhkZXYpOworCWk5MTVfZ2VtX2NvbnRleHRfbG9zdChkZXZfcHJpdik7CiAJbXV0ZXhf dW5sb2NrKCZkZXYtPnN0cnVjdF9tdXRleCk7CiAKIAljYW5jZWxfZGVsYXllZF93b3JrX3N5bmMo JmRldl9wcml2LT5ncHVfZXJyb3IuaGFuZ2NoZWNrX3dvcmspOwpkaWZmIC0tZ2l0IGEvZHJpdmVy cy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fY29udGV4dC5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUv aTkxNV9nZW1fY29udGV4dC5jCmluZGV4IGU1YWNjMzkxNmY3NS4uYmYzMWVlMWVkOTE0IDEwMDY0 NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9jb250ZXh0LmMKKysrIGIvZHJp dmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fY29udGV4dC5jCkBAIC05MCw2ICs5MCw4IEBACiAj aW5jbHVkZSAiaTkxNV9kcnYuaCIKICNpbmNsdWRlICJpOTE1X3RyYWNlLmgiCiAKKyNkZWZpbmUg QUxMX0wzX1NMSUNFUyhkZXYpICgxIDw8IE5VTV9MM19TTElDRVMoZGV2KSkgLSAxCisKIC8qIFRo aXMgaXMgYSBIVyBjb25zdHJhaW50LiBUaGUgdmFsdWUgYmVsb3cgaXMgdGhlIGxhcmdlc3Qga25v d24gcmVxdWlyZW1lbnQKICAqIEkndmUgc2VlbiBpbiBhIHNwZWMgdG8gZGF0ZSwgYW5kIHRoYXQg d2FzIGEgd29ya2Fyb3VuZCBmb3IgYSBub24tc2hpcHBpbmcKICAqIHBhcnQuIEl0IHNob3VsZCBi ZSBzYWZlIHRvIGRlY3JlYXNlIHRoaXMsIGJ1dCBpdCdzIG1vcmUgZnV0dXJlIHByb29mIGFzIGlz LgpAQCAtMjQ5LDcgKzI1MSw3IEBAIF9fY3JlYXRlX2h3X2NvbnRleHQoc3RydWN0IGRybV9kZXZp Y2UgKmRldiwKIAkvKiBOQjogTWFyayBhbGwgc2xpY2VzIGFzIG5lZWRpbmcgYSByZW1hcCBzbyB0 aGF0IHdoZW4gdGhlIGNvbnRleHQgZmlyc3QKIAkgKiBsb2FkcyBpdCB3aWxsIHJlc3RvcmUgd2hh dGV2ZXIgcmVtYXAgc3RhdGUgYWxyZWFkeSBleGlzdHMuIElmIHRoZXJlCiAJICogaXMgbm8gcmVt YXAgaW5mbywgaXQgd2lsbCBiZSBhIE5PUC4gKi8KLQljdHgtPnJlbWFwX3NsaWNlID0gKDEgPDwg TlVNX0wzX1NMSUNFUyhkZXYpKSAtIDE7CisJY3R4LT5yZW1hcF9zbGljZSA9IEFMTF9MM19TTElD RVMoZGV2X3ByaXYpOwogCiAJY3R4LT5oYW5nX3N0YXRzLmJhbl9wZXJpb2Rfc2Vjb25kcyA9IERS TV9JOTE1X0NUWF9CQU5fUEVSSU9EOwogCkBAIC0zMzYsNyArMzM4LDYgQEAgc3RhdGljIHZvaWQg aTkxNV9nZW1fY29udGV4dF91bnBpbihzdHJ1Y3QgaW50ZWxfY29udGV4dCAqY3R4LAogdm9pZCBp OTE1X2dlbV9jb250ZXh0X3Jlc2V0KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCiB7CiAJc3RydWN0 IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0gZGV2LT5kZXZfcHJpdmF0ZTsKLQlpbnQgaTsK IAogCWlmIChpOTE1LmVuYWJsZV9leGVjbGlzdHMpIHsKIAkJc3RydWN0IGludGVsX2NvbnRleHQg KmN0eDsKQEAgLTM0NSwxNyArMzQ2LDcgQEAgdm9pZCBpOTE1X2dlbV9jb250ZXh0X3Jlc2V0KHN0 cnVjdCBkcm1fZGV2aWNlICpkZXYpCiAJCQlpbnRlbF9scl9jb250ZXh0X3Jlc2V0KGRldl9wcml2 LCBjdHgpOwogCX0KIAotCWZvciAoaSA9IDA7IGkgPCBJOTE1X05VTV9FTkdJTkVTOyBpKyspIHsK LQkJc3RydWN0IGludGVsX2VuZ2luZV9jcyAqZW5naW5lID0gJmRldl9wcml2LT5lbmdpbmVbaV07 Ci0KLQkJaWYgKGVuZ2luZS0+bGFzdF9jb250ZXh0KSB7Ci0JCQlpOTE1X2dlbV9jb250ZXh0X3Vu cGluKGVuZ2luZS0+bGFzdF9jb250ZXh0LCBlbmdpbmUpOwotCQkJZW5naW5lLT5sYXN0X2NvbnRl eHQgPSBOVUxMOwotCQl9Ci0JfQotCi0JLyogRm9yY2UgdGhlIEdQVSBzdGF0ZSB0byBiZSByZWlu aXRpYWxpc2VkIG9uIGVuYWJsaW5nICovCi0JZGV2X3ByaXYtPmtlcm5lbF9jb250ZXh0LT5sZWdh Y3lfaHdfY3R4LmluaXRpYWxpemVkID0gZmFsc2U7CisJaTkxNV9nZW1fY29udGV4dF9sb3N0KGRl dl9wcml2KTsKIH0KIAogaW50IGk5MTVfZ2VtX2NvbnRleHRfaW5pdChzdHJ1Y3QgZHJtX2Rldmlj ZSAqZGV2KQpAQCAtNDAzLDExICszOTQsMjkgQEAgaW50IGk5MTVfZ2VtX2NvbnRleHRfaW5pdChz dHJ1Y3QgZHJtX2RldmljZSAqZGV2KQogCXJldHVybiAwOwogfQogCit2b2lkIGk5MTVfZ2VtX2Nv bnRleHRfbG9zdChzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpCit7CisJc3RydWN0 IGludGVsX2VuZ2luZV9jcyAqZW5naW5lOworCisJZm9yX2VhY2hfZW5naW5lKGVuZ2luZSwgZGV2 X3ByaXYpIHsKKwkJaWYgKGVuZ2luZS0+bGFzdF9jb250ZXh0ID09IE5VTEwpCisJCQljb250aW51 ZTsKKworCQlpOTE1X2dlbV9jb250ZXh0X3VucGluKGVuZ2luZS0+bGFzdF9jb250ZXh0LCBlbmdp bmUpOworCQllbmdpbmUtPmxhc3RfY29udGV4dCA9IE5VTEw7CisJfQorCisJLyogRm9yY2UgdGhl IEdQVSBzdGF0ZSB0byBiZSByZWluaXRpYWxpc2VkIG9uIGVuYWJsaW5nICovCisJZGV2X3ByaXYt Pmtlcm5lbF9jb250ZXh0LT5sZWdhY3lfaHdfY3R4LmluaXRpYWxpemVkID0gZmFsc2U7CisJZGV2 X3ByaXYtPmtlcm5lbF9jb250ZXh0LT5yZW1hcF9zbGljZSA9IEFMTF9MM19TTElDRVMoZGV2X3By aXYpOworfQorCiB2b2lkIGk5MTVfZ2VtX2NvbnRleHRfZmluaShzdHJ1Y3QgZHJtX2RldmljZSAq ZGV2KQogewogCXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9IGRldi0+ZGV2X3By aXZhdGU7CiAJc3RydWN0IGludGVsX2NvbnRleHQgKmRjdHggPSBkZXZfcHJpdi0+a2VybmVsX2Nv bnRleHQ7Ci0JaW50IGk7CisKKwlpOTE1X2dlbV9jb250ZXh0X2xvc3QoZGV2X3ByaXYpOwogCiAJ aWYgKGRjdHgtPmxlZ2FjeV9od19jdHgucmNzX3N0YXRlKSB7CiAJCS8qIFRoZSBvbmx5IGtub3du IHdheSB0byBzdG9wIHRoZSBncHUgZnJvbSBhY2Nlc3NpbmcgdGhlIGh3IGNvbnRleHQgaXMKQEAg LTQxNSwyNiArNDI0LDkgQEAgdm9pZCBpOTE1X2dlbV9jb250ZXh0X2Zpbmkoc3RydWN0IGRybV9k ZXZpY2UgKmRldikKIAkJICogb3RoZXIgY29kZSwgbGVhZGluZyB0byBzcHVyaW91cyBlcnJvcnMu ICovCiAJCWludGVsX2dwdV9yZXNldChkZXYsIEFMTF9FTkdJTkVTKTsKIAotCQkvKiBXaGVuIGRl ZmF1bHQgY29udGV4dCBpcyBjcmVhdGVkIGFuZCBzd2l0Y2hlZCB0bywgYmFzZSBvYmplY3QgcmVm Y291bnQKLQkJICogd2lsbCBiZSAyICgrMSBmcm9tIG9iamVjdCBjcmVhdGlvbiBhbmQgKzEgZnJv bSBkb19zd2l0Y2goKSkuCi0JCSAqIGk5MTVfZ2VtX2NvbnRleHRfZmluaSgpIHdpbGwgYmUgY2Fs bGVkIGFmdGVyIGdwdV9pZGxlKCkgaGFzIHN3aXRjaGVkCi0JCSAqIHRvIGRlZmF1bHQgY29udGV4 dC4gU28gd2UgbmVlZCB0byB1bnJlZmVyZW5jZSB0aGUgYmFzZSBvYmplY3Qgb25jZQotCQkgKiB0 byBvZmZzZXQgdGhlIGRvX3N3aXRjaCBwYXJ0LCBzbyB0aGF0IGk5MTVfZ2VtX2NvbnRleHRfdW5y ZWZlcmVuY2UoKQotCQkgKiBjYW4gdGhlbiBmcmVlIHRoZSBiYXNlIG9iamVjdCBjb3JyZWN0bHku ICovCi0JCVdBUk5fT04oIWRldl9wcml2LT5lbmdpbmVbUkNTXS5sYXN0X2NvbnRleHQpOwotCiAJ CWk5MTVfZ2VtX29iamVjdF9nZ3R0X3VucGluKGRjdHgtPmxlZ2FjeV9od19jdHgucmNzX3N0YXRl KTsKIAl9CiAKLQlmb3IgKGkgPSBJOTE1X05VTV9FTkdJTkVTOyAtLWkgPj0gMDspIHsKLQkJc3Ry dWN0IGludGVsX2VuZ2luZV9jcyAqZW5naW5lID0gJmRldl9wcml2LT5lbmdpbmVbaV07Ci0KLQkJ aWYgKGVuZ2luZS0+bGFzdF9jb250ZXh0KSB7Ci0JCQlpOTE1X2dlbV9jb250ZXh0X3VucGluKGVu Z2luZS0+bGFzdF9jb250ZXh0LCBlbmdpbmUpOwotCQkJZW5naW5lLT5sYXN0X2NvbnRleHQgPSBO VUxMOwotCQl9Ci0JfQotCiAJaTkxNV9nZW1fY29udGV4dF91bnJlZmVyZW5jZShkY3R4KTsKIAlk ZXZfcHJpdi0+a2VybmVsX2NvbnRleHQgPSBOVUxMOwogfQotLSAKMi44LjAucmMzCgpfX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpJbnRlbC1nZnggbWFpbGlu ZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVl ZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK