From: Mika Kuoppala Subject: [PATCH] drm/i915: Stop ring before doing readiness check Date: Wed, 13 Sep 2017 17:01:17 +0300 Message-ID: <20170913140117.11072-1-mika.kuoppala@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga05.intel.com (mga05.intel.com [192.55.52.43]) by gabe.freedesktop.org (Postfix) with ESMTPS id 0066D8936B for ; Wed, 13 Sep 2017 14:02:41 +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 RXZpZGVuY2UgaW5kaWNhdGVzIHRoYXQgZXZlbiBpZiB0aGUgaGFyZHdhcmUgaGFwcGlseQp0ZWxs cyB1cyB0byBwcm9jZWVkIHdpdGggcmVzZXQsIGl0IHJlYWxseSBpc24ndCByZWFkeS4KUmVzZXR0 aW5nIGEgZnJlZWx5IHJ1bm5pbmcgYmF0Y2hidWZmZXIgYWZ0ZXIgd2UgaGF2ZQpnb3QgYWNrIGZv ciByZWFkaW5lc3MsIHN0aWxsIGNhbiBjYXVzZSBhIHN5c3RlbSBoYW5nLgoKQXR0ZW1wdCB0byBz dG9wIHJpbmcgYmVmb3JlIHByb2NlZWRpbmcgZm9yIHJlYWR5IGNoZWNrCmFuZCByZXNldCB0byBh dm9pZCBsb3NpbmcgdGhlIG1hY2hpbmUuCgpUZXN0Y2FzZTogaWd0L3ByaW1lX2J1c3kvaGFuZy0q ICMga2JsCkNjOiBKb29uYXMgTGFodGluZW4gPGpvb25hcy5sYWh0aW5lbkBsaW51eC5pbnRlbC5j b20+CkNjOiBDaHJpcyBXaWxzb24gPGNocmlzQGNocmlzLXdpbHNvbi5jby51az4KU2lnbmVkLW9m Zi1ieTogTWlrYSBLdW9wcGFsYSA8bWlrYS5rdW9wcGFsYUBpbnRlbC5jb20+Ci0tLQogZHJpdmVy cy9ncHUvZHJtL2k5MTUvaW50ZWxfdW5jb3JlLmMgfCA1NCArKysrKysrKysrKysrKysrKysrKysr LS0tLS0tLS0tLS0tLS0tCiAxIGZpbGUgY2hhbmdlZCwgMzIgaW5zZXJ0aW9ucygrKSwgMjIgZGVs ZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfdW5jb3Jl LmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF91bmNvcmUuYwppbmRleCAxYjM4ZWI5NGQ0 NjEuLmY5ZWYxOTMxNTE2YyAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxf dW5jb3JlLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfdW5jb3JlLmMKQEAgLTEz NjEsMzMgKzEzNjEsMzggQEAgaW50IGk5MTVfcmVnX3JlYWRfaW9jdGwoc3RydWN0IGRybV9kZXZp Y2UgKmRldiwKIAlyZXR1cm4gcmV0OwogfQogCitzdGF0aWMgdm9pZCBnZW4zX3N0b3BfcmluZyhz dHJ1Y3QgaW50ZWxfZW5naW5lX2NzICplbmdpbmUpCit7CisJc3RydWN0IGRybV9pOTE1X3ByaXZh dGUgKmRldl9wcml2ID0gZW5naW5lLT5pOTE1OworCWNvbnN0IHUzMiBiYXNlID0gZW5naW5lLT5t bWlvX2Jhc2U7CisJY29uc3QgaTkxNV9yZWdfdCBtb2RlID0gUklOR19NSV9NT0RFKGJhc2UpOwor CisJSTkxNV9XUklURV9GVyhtb2RlLCBfTUFTS0VEX0JJVF9FTkFCTEUoU1RPUF9SSU5HKSk7CisJ aWYgKGludGVsX3dhaXRfZm9yX3JlZ2lzdGVyX2Z3KGRldl9wcml2LAorCQkJCSAgICAgICBtb2Rl LAorCQkJCSAgICAgICBNT0RFX0lETEUsCisJCQkJICAgICAgIE1PREVfSURMRSwKKwkJCQkgICAg ICAgNTAwKSkKKwkJRFJNX0RFQlVHX0RSSVZFUigiJXM6IHRpbWVkIG91dCBvbiBTVE9QX1JJTkdc biIsCisJCQkJIGVuZ2luZS0+bmFtZSk7CisKKwlJOTE1X1dSSVRFX0ZXKFJJTkdfQ1RMKGJhc2Up LCAwKTsKKwlJOTE1X1dSSVRFX0ZXKFJJTkdfSEVBRChiYXNlKSwgMCk7CisJSTkxNV9XUklURV9G VyhSSU5HX1RBSUwoYmFzZSksIDApOworCisJLyogQ2hlY2sgYWN0cyBhcyBhIHBvc3QgKi8KKwlp ZiAoSTkxNV9SRUFEX0ZXKFJJTkdfSEVBRChiYXNlKSkgIT0gMCkKKwkJRFJNX0RFQlVHX0RSSVZF UigiJXM6IHJpbmcgaGVhZCBub3QgcGFya2VkXG4iLAorCQkJCSBlbmdpbmUtPm5hbWUpOworfQor CiBzdGF0aWMgdm9pZCBnZW4zX3N0b3BfcmluZ3Moc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRl dl9wcml2KQogewogCXN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKmVuZ2luZTsKIAllbnVtIGludGVs X2VuZ2luZV9pZCBpZDsKIAotCWZvcl9lYWNoX2VuZ2luZShlbmdpbmUsIGRldl9wcml2LCBpZCkg ewotCQljb25zdCB1MzIgYmFzZSA9IGVuZ2luZS0+bW1pb19iYXNlOwotCQljb25zdCBpOTE1X3Jl Z190IG1vZGUgPSBSSU5HX01JX01PREUoYmFzZSk7Ci0KLQkJSTkxNV9XUklURV9GVyhtb2RlLCBf TUFTS0VEX0JJVF9FTkFCTEUoU1RPUF9SSU5HKSk7Ci0JCWlmIChpbnRlbF93YWl0X2Zvcl9yZWdp c3Rlcl9mdyhkZXZfcHJpdiwKLQkJCQkJICAgICAgIG1vZGUsCi0JCQkJCSAgICAgICBNT0RFX0lE TEUsCi0JCQkJCSAgICAgICBNT0RFX0lETEUsCi0JCQkJCSAgICAgICA1MDApKQotCQkJRFJNX0RF QlVHX0RSSVZFUigiJXM6IHRpbWVkIG91dCBvbiBTVE9QX1JJTkdcbiIsCi0JCQkJCSBlbmdpbmUt Pm5hbWUpOwotCi0JCUk5MTVfV1JJVEVfRlcoUklOR19DVEwoYmFzZSksIDApOwotCQlJOTE1X1dS SVRFX0ZXKFJJTkdfSEVBRChiYXNlKSwgMCk7Ci0JCUk5MTVfV1JJVEVfRlcoUklOR19UQUlMKGJh c2UpLCAwKTsKLQotCQkvKiBDaGVjayBhY3RzIGFzIGEgcG9zdCAqLwotCQlpZiAoSTkxNV9SRUFE X0ZXKFJJTkdfSEVBRChiYXNlKSkgIT0gMCkKLQkJCURSTV9ERUJVR19EUklWRVIoIiVzOiByaW5n IGhlYWQgbm90IHBhcmtlZFxuIiwKLQkJCQkJIGVuZ2luZS0+bmFtZSk7Ci0JfQorCWZvcl9lYWNo X2VuZ2luZShlbmdpbmUsIGRldl9wcml2LCBpZCkKKwkJZ2VuM19zdG9wX3JpbmcoZW5naW5lKTsK IH0KIAogc3RhdGljIGJvb2wgaTkxNV9yZXNldF9jb21wbGV0ZShzdHJ1Y3QgcGNpX2RldiAqcGRl dikKQEAgLTE2NjgsNiArMTY3MywxMSBAQCBzdGF0aWMgaW50IGdlbjhfcmVzZXRfZW5naW5lX3N0 YXJ0KHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKmVuZ2luZSkKIAlzdHJ1Y3QgZHJtX2k5MTVfcHJp dmF0ZSAqZGV2X3ByaXYgPSBlbmdpbmUtPmk5MTU7CiAJaW50IHJldDsKIAorCS8qIElmIHRoZSBi YiBpcyBzdGlsbCBydW5uaW5nIGF0IHRoaXMgc3RhZ2UsIGZvcmNpbmcgYQorCSAqIHJlc2V0IHJp c2tzIGEgc3lzdGVtIGhhbmcuCisJICovCisJZ2VuM19zdG9wX3JpbmcoZW5naW5lKTsKKwogCUk5 MTVfV1JJVEVfRlcoUklOR19SRVNFVF9DVEwoZW5naW5lLT5tbWlvX2Jhc2UpLAogCQkgICAgICBf TUFTS0VEX0JJVF9FTkFCTEUoUkVTRVRfQ1RMX1JFUVVFU1RfUkVTRVQpKTsKIAotLSAKMi4xMS4w CgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpJbnRlbC1n ZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9s aXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK