From mboxrd@z Thu Jan 1 00:00:00 1970 From: Chris Wilson Subject: [PATCH 1/2] drm/i915/execlists: Delay updating ring register state after resume Date: Thu, 13 Sep 2018 18:32:42 +0100 Message-ID: <20180913173243.2667-1-chris@chris-wilson.co.uk> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from fireflyinternet.com (mail.fireflyinternet.com [109.228.58.192]) by gabe.freedesktop.org (Postfix) with ESMTPS id BBDDE6E1CE for ; Thu, 13 Sep 2018 17:32:55 +0000 (UTC) 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 Tm93IHRoYXQgd2UgcmVsb2FkIGJvdGggUklOR19IRUFEIGFuZCBSSU5HX1RBSUwgd2hlbiByZWJp bmRpbmcgdGhlCmNvbnRleHQsIHdlIGRvIG5vdCBuZWVkIHRvIHNjcnViIHRob3NlIHJlZ2lzdGVy cyBpbW1lZGlhdGVseSBvbiByZXN1bWUuCgp2MjogSGFuZGxlIHRoZSBwZXJtYS1waW5uZWQgY29u dGV4dHMuCnYzOiBTZXQgUklOR19UQUlMIG9uIGNvbnRleHQtcGluIHNvIHRoYXQgd2UgYWx3YXlz IGhhdmUga25vd24gc3RhdGUgaW4KdGhlIGNvbnRleHQgaW1hZ2UgZm9yIHRoZSByaW5nIHJlZ2lz dGVycyBhbmQgYWxsIHBhcnRpZXMgaGF2ZSBzaW1pbGFyCmNvZGUgKHJpcGUgZm9yIHJlZmFjdG9y aW5nKS4KClNpZ25lZC1vZmYtYnk6IENocmlzIFdpbHNvbiA8Y2hyaXNAY2hyaXMtd2lsc29uLmNv LnVrPgpDYzogVHZydGtvIFVyc3VsaW4gPHR2cnRrby51cnN1bGluQGludGVsLmNvbT4KQ2M6IE1p a2EgS3VvcHBhbGEgPG1pa2Eua3VvcHBhbGFAbGludXguaW50ZWwuY29tPgotLS0KIGRyaXZlcnMv Z3B1L2RybS9pOTE1L2ludGVsX2xyYy5jIHwgMzMgKysrKysrKysrKysrKysrLS0tLS0tLS0tLS0t LS0tLS0KIDEgZmlsZSBjaGFuZ2VkLCAxNSBpbnNlcnRpb25zKCspLCAxOCBkZWxldGlvbnMoLSkK CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9scmMuYyBiL2RyaXZlcnMv Z3B1L2RybS9pOTE1L2ludGVsX2xyYy5jCmluZGV4IDliMWYwZTUyMTFhMC4uZDdmY2JiYThlOTgy IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9scmMuYworKysgYi9kcml2 ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9scmMuYwpAQCAtMTMzOCwxMSArMTMzOCwxMyBAQCBfX2V4 ZWNsaXN0c19jb250ZXh0X3BpbihzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICplbmdpbmUsCiAKIAlp bnRlbF9scl9jb250ZXh0X2Rlc2NyaXB0b3JfdXBkYXRlKGN0eCwgZW5naW5lLCBjZSk7CiAKKwlH RU1fQlVHX09OKCFpbnRlbF9yaW5nX29mZnNldF92YWxpZChjZS0+cmluZywgY2UtPnJpbmctPmhl YWQpKTsKKwogCWNlLT5scmNfcmVnX3N0YXRlID0gdmFkZHIgKyBMUkNfU1RBVEVfUE4gKiBQQUdF X1NJWkU7CiAJY2UtPmxyY19yZWdfc3RhdGVbQ1RYX1JJTkdfQlVGRkVSX1NUQVJUKzFdID0KIAkJ aTkxNV9nZ3R0X29mZnNldChjZS0+cmluZy0+dm1hKTsKLQlHRU1fQlVHX09OKCFpbnRlbF9yaW5n X29mZnNldF92YWxpZChjZS0+cmluZywgY2UtPnJpbmctPmhlYWQpKTsKLQljZS0+bHJjX3JlZ19z dGF0ZVtDVFhfUklOR19IRUFEKzFdID0gY2UtPnJpbmctPmhlYWQ7CisJY2UtPmxyY19yZWdfc3Rh dGVbQ1RYX1JJTkdfSEVBRCArIDFdID0gY2UtPnJpbmctPmhlYWQ7CisJY2UtPmxyY19yZWdfc3Rh dGVbQ1RYX1JJTkdfVEFJTCArIDFdID0gY2UtPnJpbmctPnRhaWw7CiAKIAljZS0+c3RhdGUtPm9i ai0+cGluX2dsb2JhbCsrOwogCWk5MTVfZ2VtX2NvbnRleHRfZ2V0KGN0eCk7CkBAIC0yODQxLDEz ICsyODQzLDE0IEBAIHN0YXRpYyBpbnQgZXhlY2xpc3RzX2NvbnRleHRfZGVmZXJyZWRfYWxsb2Mo c3RydWN0IGk5MTVfZ2VtX2NvbnRleHQgKmN0eCwKIAlyZXR1cm4gcmV0OwogfQogCi12b2lkIGlu dGVsX2xyX2NvbnRleHRfcmVzdW1lKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdikK K3ZvaWQgaW50ZWxfbHJfY29udGV4dF9yZXN1bWUoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmk5 MTUpCiB7CiAJc3RydWN0IGludGVsX2VuZ2luZV9jcyAqZW5naW5lOwogCXN0cnVjdCBpOTE1X2dl bV9jb250ZXh0ICpjdHg7CiAJZW51bSBpbnRlbF9lbmdpbmVfaWQgaWQ7CiAKLQkvKiBCZWNhdXNl IHdlIGVtaXQgV0FfVEFJTF9EV09SRFMgdGhlcmUgbWF5IGJlIGEgZGlzcGFyaXR5CisJLyoKKwkg KiBCZWNhdXNlIHdlIGVtaXQgV0FfVEFJTF9EV09SRFMgdGhlcmUgbWF5IGJlIGEgZGlzcGFyaXR5 CiAJICogYmV0d2VlbiBvdXIgYm9va2tlZXBpbmcgaW4gY2UtPnJpbmctPmhlYWQgYW5kIGNlLT5y aW5nLT50YWlsIGFuZAogCSAqIHRoYXQgc3RvcmVkIGluIGNvbnRleHQuIEFzIHdlIG9ubHkgd3Jp dGUgbmV3IGNvbW1hbmRzIGZyb20KIAkgKiBjZS0+cmluZy0+dGFpbCBvbndhcmRzLCBldmVyeXRo aW5nIGJlZm9yZSB0aGF0IGlzIGp1bmsuIElmIHRoZSBHUFUKQEAgLTI4NTcsMjggKzI4NjAsMjIg QEAgdm9pZCBpbnRlbF9scl9jb250ZXh0X3Jlc3VtZShzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAq ZGV2X3ByaXYpCiAJICogU28gdG8gYXZvaWQgdGhhdCB3ZSByZXNldCB0aGUgY29udGV4dCBpbWFn ZXMgdXBvbiByZXN1bWUuIEZvcgogCSAqIHNpbXBsaWNpdHksIHdlIGp1c3QgemVybyBldmVyeXRo aW5nIG91dC4KIAkgKi8KLQlsaXN0X2Zvcl9lYWNoX2VudHJ5KGN0eCwgJmRldl9wcml2LT5jb250 ZXh0cy5saXN0LCBsaW5rKSB7Ci0JCWZvcl9lYWNoX2VuZ2luZShlbmdpbmUsIGRldl9wcml2LCBp ZCkgeworCWxpc3RfZm9yX2VhY2hfZW50cnkoY3R4LCAmaTkxNS0+Y29udGV4dHMubGlzdCwgbGlu aykgeworCQlmb3JfZWFjaF9lbmdpbmUoZW5naW5lLCBpOTE1LCBpZCkgewogCQkJc3RydWN0IGlu dGVsX2NvbnRleHQgKmNlID0KIAkJCQl0b19pbnRlbF9jb250ZXh0KGN0eCwgZW5naW5lKTsKLQkJ CXUzMiAqcmVnOwogCiAJCQlpZiAoIWNlLT5zdGF0ZSkKIAkJCQljb250aW51ZTsKIAotCQkJcmVn ID0gaTkxNV9nZW1fb2JqZWN0X3Bpbl9tYXAoY2UtPnN0YXRlLT5vYmosCi0JCQkJCQkgICAgICBJ OTE1X01BUF9XQik7Ci0JCQlpZiAoV0FSTl9PTihJU19FUlIocmVnKSkpCi0JCQkJY29udGludWU7 Ci0KLQkJCXJlZyArPSBMUkNfU1RBVEVfUE4gKiBQQUdFX1NJWkUgLyBzaXplb2YoKnJlZyk7Ci0J CQlyZWdbQ1RYX1JJTkdfSEVBRCsxXSA9IDA7Ci0JCQlyZWdbQ1RYX1JJTkdfVEFJTCsxXSA9IDA7 CisJCQlpbnRlbF9yaW5nX3Jlc2V0KGNlLT5yaW5nLCAwKTsKIAotCQkJY2UtPnN0YXRlLT5vYmot Pm1tLmRpcnR5ID0gdHJ1ZTsKLQkJCWk5MTVfZ2VtX29iamVjdF91bnBpbl9tYXAoY2UtPnN0YXRl LT5vYmopOworCQkJaWYgKGNlLT5waW5fY291bnQpIHsgLyogb3RoZXJ3aXNlIGRvbmUgaW4gY29u dGV4dF9waW4gKi8KKwkJCQl1MzIgKnJlZ3MgPSBjZS0+bHJjX3JlZ19zdGF0ZTsKIAotCQkJaW50 ZWxfcmluZ19yZXNldChjZS0+cmluZywgMCk7CisJCQkJcmVnc1tDVFhfUklOR19IRUFEICsgMV0g PSBjZS0+cmluZy0+aGVhZDsKKwkJCQlyZWdzW0NUWF9SSU5HX1RBSUwgKyAxXSA9IGNlLT5yaW5n LT50YWlsOworCQkJfQogCQl9CiAJfQogfQotLSAKMi4xOS4wCgpfX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVs LWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcv bWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK