From: John.C.Harrison@Intel.com Subject: [PATCH 20/39] drm/i915: Added scheduler flush calls to ring throttle and idle functions Date: Mon, 23 Nov 2015 11:39:15 +0000 Message-ID: <1448278774-31376-21-git-send-email-John.C.Harrison@Intel.com> References: <1448278774-31376-1-git-send-email-John.C.Harrison@Intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by gabe.freedesktop.org (Postfix) with ESMTP id 0747972203 for ; Mon, 23 Nov 2015 03:39:56 -0800 (PST) In-Reply-To: <1448278774-31376-1-git-send-email-John.C.Harrison@Intel.com> 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 RnJvbTogSm9obiBIYXJyaXNvbiA8Sm9obi5DLkhhcnJpc29uQEludGVsLmNvbT4KCldoZW4gcmVx dWVzdGluZyB0aGF0IGFsbCBHUFUgd29yayBpcyBjb21wbGV0ZWQsIGl0IGlzIG5vdyBuZWNlc3Nh cnkgdG8KZ2V0IHRoZSBzY2hlZHVsZXIgaW52b2x2ZWQgaW4gb3JkZXIgdG8gZmx1c2ggb3V0IHdv cmsgdGhhdCBxdWV1ZWQgYW5kCm5vdCB5ZXQgc3VibWl0dGVkLgoKdjI6IFVwZGF0ZWQgdG8gYWRk IHN1cHBvcnQgZm9yIGZsdXNoaW5nIHRoZSBzY2hlZHVsZXIgcXVldWUgYnkgdGltZQpzdGFtcCBy YXRoZXIgdGhhbiBqdXN0IGRvaW5nIGEgYmxhbmtldCBmbHVzaC4KCkNoYW5nZS1JZDogSTk1ZGNj MmEyZWU1YzFhODQ0NzQ4NjIxYzMzMzk5NGRkZDZjZjZhNjYKRm9yOiBWSVotMTU4NwpTaWduZWQt b2ZmLWJ5OiBKb2huIEhhcnJpc29uIDxKb2huLkMuSGFycmlzb25ASW50ZWwuY29tPgotLS0KIGRy aXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtLmMgICAgICAgfCAyNCArKysrKysrKy0KIGRyaXZl cnMvZ3B1L2RybS9pOTE1L2k5MTVfc2NoZWR1bGVyLmMgfCA5MiArKysrKysrKysrKysrKysrKysr KysrKysrKysrKysrKysrKwogZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9zY2hlZHVsZXIuaCB8 ICAzICsrCiAzIGZpbGVzIGNoYW5nZWQsIDExOCBpbnNlcnRpb25zKCspLCAxIGRlbGV0aW9uKC0p CgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW0uYyBiL2RyaXZlcnMv Z3B1L2RybS9pOTE1L2k5MTVfZ2VtLmMKaW5kZXggMDY3ZjIxMy4uMTZiZDgyYyAxMDA2NDQKLS0t IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW0uYworKysgYi9kcml2ZXJzL2dwdS9kcm0v aTkxNS9pOTE1X2dlbS5jCkBAIC0zNzY4LDYgKzM3NjgsMTAgQEAgaW50IGk5MTVfZ3B1X2lkbGUo c3RydWN0IGRybV9kZXZpY2UgKmRldikKIAogCS8qIEZsdXNoIGV2ZXJ5dGhpbmcgb250byB0aGUg aW5hY3RpdmUgbGlzdC4gKi8KIAlmb3JfZWFjaF9yaW5nKHJpbmcsIGRldl9wcml2LCBpKSB7CisJ CXJldCA9IGk5MTVfc2NoZWR1bGVyX2ZsdXNoKHJpbmcsIHRydWUpOworCQlpZiAocmV0IDwgMCkK KwkJCXJldHVybiByZXQ7CisKIAkJaWYgKCFpOTE1LmVuYWJsZV9leGVjbGlzdHMpIHsKIAkJCXN0 cnVjdCBkcm1faTkxNV9nZW1fcmVxdWVzdCAqcmVxOwogCkBAIC00NDgxLDcgKzQ0ODUsOCBAQCBp OTE1X2dlbV9yaW5nX3Rocm90dGxlKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsIHN0cnVjdCBkcm1f ZmlsZSAqZmlsZSkKIAl1bnNpZ25lZCBsb25nIHJlY2VudF9lbm91Z2ggPSBqaWZmaWVzIC0gRFJN X0k5MTVfVEhST1RUTEVfSklGRklFUzsKIAlzdHJ1Y3QgZHJtX2k5MTVfZ2VtX3JlcXVlc3QgKnJl cXVlc3QsICp0YXJnZXQgPSBOVUxMOwogCXVuc2lnbmVkIHJlc2V0X2NvdW50ZXI7Ci0JaW50IHJl dDsKKwlpbnQgaSwgcmV0OworCXN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKnJpbmc7CiAKIAlyZXQg PSBpOTE1X2dlbV93YWl0X2Zvcl9lcnJvcigmZGV2X3ByaXYtPmdwdV9lcnJvcik7CiAJaWYgKHJl dCkKQEAgLTQ0OTEsNiArNDQ5NiwyMyBAQCBpOTE1X2dlbV9yaW5nX3Rocm90dGxlKHN0cnVjdCBk cm1fZGV2aWNlICpkZXYsIHN0cnVjdCBkcm1fZmlsZSAqZmlsZSkKIAlpZiAocmV0KQogCQlyZXR1 cm4gcmV0OwogCisJZm9yX2VhY2hfcmluZyhyaW5nLCBkZXZfcHJpdiwgaSkgeworCQkvKgorCQkg KiBGbHVzaCBvdXQgc2NoZWR1bGVyIGVudHJpZXMgdGhhdCBhcmUgZ2V0dGluZyAnc3RhbGUnLiBO b3RlCisJCSAqIHRoYXQgdGhlIGZvbGxvd2luZyByZWNlbnRfZW5vdWdoIHRlc3Qgd2lsbCBvbmx5 IGNoZWNrCisJCSAqIGFnYWluc3QgdGhlIHRpbWUgYXQgd2hpY2ggdGhlIHJlcXVlc3Qgd2FzIHN1 Ym1pdHRlZCB0byB0aGUKKwkJICogaGFyZHdhcmUgKGkuZS4gd2hlbiBpdCBsZWZ0IHRoZSBzY2hl ZHVsZXIpIG5vdCB0aGUgdGltZSBpdAorCQkgKiB3YXMgc3VibWl0dGVkIHRvIHRoZSBkcml2ZXIu CisJCSAqCisJCSAqIEFsc28sIHRoZXJlIGlzIG5vdCBtdWNoIHBvaW50IHdvcnJpbmcgYWJvdXQg YnVzeSByZXR1cm4KKwkJICogY29kZXMgZnJvbSB0aGUgc2NoZWR1bGVyIGZsdXNoIGNhbGwuIEV2 ZW4gaWYgbW9yZSB3b3JrCisJCSAqIGNhbm5vdCBiZSBzdWJtaXR0ZWQgcmlnaHQgbm93IGZvciB3 aGF0ZXZlciByZWFzb24sIHdlCisJCSAqIHN0aWxsIHdhbnQgdG8gdGhyb3R0bGUgYWdhaW5zdCBz dGFsZSB3b3JrIHRoYXQgaGFzIGFscmVhZHkKKwkJICogYmVlbiBzdWJtaXR0ZWQuCisJCSAqLwor CQlpOTE1X3NjaGVkdWxlcl9mbHVzaF9zdGFtcChyaW5nLCByZWNlbnRfZW5vdWdoLCBmYWxzZSk7 CisJfQorCiAJc3Bpbl9sb2NrKCZmaWxlX3ByaXYtPm1tLmxvY2spOwogCWxpc3RfZm9yX2VhY2hf ZW50cnkocmVxdWVzdCwgJmZpbGVfcHJpdi0+bW0ucmVxdWVzdF9saXN0LCBjbGllbnRfbGlzdCkg ewogCQlpZiAodGltZV9hZnRlcl9lcShyZXF1ZXN0LT5lbWl0dGVkX2ppZmZpZXMsIHJlY2VudF9l bm91Z2gpKQpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9zY2hlZHVsZXIu YyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfc2NoZWR1bGVyLmMKaW5kZXggYjhiODRhNi4u MjMyZjQ4YSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9zY2hlZHVsZXIu YworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X3NjaGVkdWxlci5jCkBAIC02MDcsNiAr NjA3LDk4IEBAIGludCBpOTE1X3NjaGVkdWxlcl9mbHVzaF9yZXF1ZXN0KHN0cnVjdCBkcm1faTkx NV9nZW1fcmVxdWVzdCAqcmVxLAogCXJldHVybiBmbHVzaF9jb3VudDsKIH0KIAoraW50IGk5MTVf c2NoZWR1bGVyX2ZsdXNoX3N0YW1wKHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKnJpbmcsCisJCQkg ICAgICAgdW5zaWduZWQgbG9uZyB0YXJnZXQsCisJCQkgICAgICAgYm9vbCBpc19sb2NrZWQpCit7 CisJc3RydWN0IGk5MTVfc2NoZWR1bGVyX3F1ZXVlX2VudHJ5ICpub2RlOworCXN0cnVjdCBkcm1f aTkxNV9wcml2YXRlICAgICAgICAgICAqZGV2X3ByaXY7CisJc3RydWN0IGk5MTVfc2NoZWR1bGVy ICAgICAgICAgICAgICpzY2hlZHVsZXI7CisJdW5zaWduZWQgbG9uZyAgICAgICBmbGFnczsKKwlp bnQgICAgICAgICAgICAgICAgIGZsdXNoX2NvdW50ID0gMDsKKworCWlmICghcmluZykKKwkJcmV0 dXJuIC1FSU5WQUw7CisKKwlkZXZfcHJpdiAgPSByaW5nLT5kZXYtPmRldl9wcml2YXRlOworCXNj aGVkdWxlciA9IGRldl9wcml2LT5zY2hlZHVsZXI7CisKKwlpZiAoIXNjaGVkdWxlcikKKwkJcmV0 dXJuIDA7CisKKwlpZiAoaXNfbG9ja2VkICYmIChzY2hlZHVsZXItPmZsYWdzW3JpbmctPmlkXSAm IGk5MTVfc2Zfc3VibWl0dGluZykpIHsKKwkJLyogU2NoZWR1bGVyIGlzIGJ1c3kgYWxyZWFkeSBz dWJtaXR0aW5nIGFub3RoZXIgYmF0Y2gsCisJCSAqIGNvbWUgYmFjayBsYXRlciByYXRoZXIgdGhh biBnb2luZyByZWN1cnNpdmUuLi4gKi8KKwkJcmV0dXJuIC1FQUdBSU47CisJfQorCisJc3Bpbl9s b2NrX2lycXNhdmUoJnNjaGVkdWxlci0+bG9jaywgZmxhZ3MpOworCWk5MTVfc2NoZWR1bGVyX3By aW9yaXR5X2J1bXBfY2xlYXIoc2NoZWR1bGVyKTsKKwlsaXN0X2Zvcl9lYWNoX2VudHJ5KG5vZGUs ICZzY2hlZHVsZXItPm5vZGVfcXVldWVbcmluZy0+aWRdLCBsaW5rKSB7CisJCWlmICghSTkxNV9T UVNfSVNfUVVFVUVEKG5vZGUpKQorCQkJY29udGludWU7CisKKwkJaWYgKG5vZGUtPnN0YW1wID4g dGFyZ2V0KQorCQkJY29udGludWU7CisKKwkJZmx1c2hfY291bnQgPSBpOTE1X3NjaGVkdWxlcl9w cmlvcml0eV9idW1wKHNjaGVkdWxlciwKKwkJCQkJbm9kZSwgc2NoZWR1bGVyLT5wcmlvcml0eV9s ZXZlbF9tYXgpOworCX0KKwlzcGluX3VubG9ja19pcnFyZXN0b3JlKCZzY2hlZHVsZXItPmxvY2ss IGZsYWdzKTsKKworCWlmIChmbHVzaF9jb3VudCkgeworCQlEUk1fREVCVUdfRFJJVkVSKCI8JXM+ IEJ1bXBlZCAlZCBlbnRyaWVzXG4iLCByaW5nLT5uYW1lLCBmbHVzaF9jb3VudCk7CisJCWZsdXNo X2NvdW50ID0gaTkxNV9zY2hlZHVsZXJfc3VibWl0X21heF9wcmlvcml0eShyaW5nLCBpc19sb2Nr ZWQpOworCX0KKworCXJldHVybiBmbHVzaF9jb3VudDsKK30KKworaW50IGk5MTVfc2NoZWR1bGVy X2ZsdXNoKHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKnJpbmcsIGJvb2wgaXNfbG9ja2VkKQorewor CXN0cnVjdCBpOTE1X3NjaGVkdWxlcl9xdWV1ZV9lbnRyeSAqbm9kZTsKKwlzdHJ1Y3QgZHJtX2k5 MTVfcHJpdmF0ZSAgICAgICAgICAgKmRldl9wcml2OworCXN0cnVjdCBpOTE1X3NjaGVkdWxlciAg ICAgICAgICAgICAqc2NoZWR1bGVyOworCXVuc2lnbmVkIGxvbmcgICAgICAgZmxhZ3M7CisJYm9v bCAgICAgICAgZm91bmQ7CisJaW50ICAgICAgICAgcmV0OworCXVpbnQzMl90ICAgIGNvdW50ID0g MDsKKworCWlmICghcmluZykKKwkJcmV0dXJuIC1FSU5WQUw7CisKKwlkZXZfcHJpdiAgPSByaW5n LT5kZXYtPmRldl9wcml2YXRlOworCXNjaGVkdWxlciA9IGRldl9wcml2LT5zY2hlZHVsZXI7CisK KwlpZiAoIXNjaGVkdWxlcikKKwkJcmV0dXJuIDA7CisKKwlCVUdfT04oaXNfbG9ja2VkICYmIChz Y2hlZHVsZXItPmZsYWdzW3JpbmctPmlkXSAmIGk5MTVfc2Zfc3VibWl0dGluZykpOworCisJZG8g eworCQlmb3VuZCA9IGZhbHNlOworCQlzcGluX2xvY2tfaXJxc2F2ZSgmc2NoZWR1bGVyLT5sb2Nr LCBmbGFncyk7CisJCWxpc3RfZm9yX2VhY2hfZW50cnkobm9kZSwgJnNjaGVkdWxlci0+bm9kZV9x dWV1ZVtyaW5nLT5pZF0sIGxpbmspIHsKKwkJCWlmICghSTkxNV9TUVNfSVNfUVVFVUVEKG5vZGUp KQorCQkJCWNvbnRpbnVlOworCisJCQlmb3VuZCA9IHRydWU7CisJCQlicmVhazsKKwkJfQorCQlz cGluX3VubG9ja19pcnFyZXN0b3JlKCZzY2hlZHVsZXItPmxvY2ssIGZsYWdzKTsKKworCQlpZiAo Zm91bmQpIHsKKwkJCXJldCA9IGk5MTVfc2NoZWR1bGVyX3N1Ym1pdChyaW5nLCBpc19sb2NrZWQp OworCQkJaWYgKHJldCA8IDApCisJCQkJcmV0dXJuIHJldDsKKworCQkJY291bnQgKz0gcmV0Owor CQl9CisJfSB3aGlsZSAoZm91bmQpOworCisJcmV0dXJuIGNvdW50OworfQorCiBzdGF0aWMgdm9p ZCBpOTE1X3NjaGVkdWxlcl9wcmlvcml0eV9idW1wX2NsZWFyKHN0cnVjdCBpOTE1X3NjaGVkdWxl ciAqc2NoZWR1bGVyKQogewogCXN0cnVjdCBpOTE1X3NjaGVkdWxlcl9xdWV1ZV9lbnRyeSAqbm9k ZTsKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfc2NoZWR1bGVyLmggYi9k cml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X3NjaGVkdWxlci5oCmluZGV4IDQyMzcxYjMuLjI5Zjcy NDggMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfc2NoZWR1bGVyLmgKKysr IGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9zY2hlZHVsZXIuaApAQCAtOTIsNiArOTIsOSBA QCBpbnQgICAgICAgICBpOTE1X3NjaGVkdWxlcl9xdWV1ZV9leGVjYnVmZmVyKHN0cnVjdCBpOTE1 X3NjaGVkdWxlcl9xdWV1ZV9lbnRyeSAqcQogYm9vbCAgICAgICAgaTkxNV9zY2hlZHVsZXJfbm90 aWZ5X3JlcXVlc3Qoc3RydWN0IGRybV9pOTE1X2dlbV9yZXF1ZXN0ICpyZXEpOwogdm9pZCAgICAg ICAgaTkxNV9zY2hlZHVsZXJfd2FrZXVwKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpOwogdm9pZCAg ICAgICAgaTkxNV9nZW1fc2NoZWR1bGVyX3dvcmtfaGFuZGxlcihzdHJ1Y3Qgd29ya19zdHJ1Y3Qg KndvcmspOworaW50ICAgICAgICAgaTkxNV9zY2hlZHVsZXJfZmx1c2goc3RydWN0IGludGVsX2Vu Z2luZV9jcyAqcmluZywgYm9vbCBpc19sb2NrZWQpOworaW50ICAgICAgICAgaTkxNV9zY2hlZHVs ZXJfZmx1c2hfc3RhbXAoc3RydWN0IGludGVsX2VuZ2luZV9jcyAqcmluZywKKwkJCQkgICAgICAg dW5zaWduZWQgbG9uZyBzdGFtcCwgYm9vbCBpc19sb2NrZWQpOwogaW50ICAgICAgICAgaTkxNV9z Y2hlZHVsZXJfZmx1c2hfcmVxdWVzdChzdHJ1Y3QgZHJtX2k5MTVfZ2VtX3JlcXVlc3QgKnJlcSwK IAkJCQkJIGJvb2wgaXNfbG9ja2VkKTsKIGJvb2wgICAgICAgIGk5MTVfc2NoZWR1bGVyX2lzX3Jl cXVlc3RfdHJhY2tlZChzdHJ1Y3QgZHJtX2k5MTVfZ2VtX3JlcXVlc3QgKnJlcSwKLS0gCjEuOS4x CgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpJbnRlbC1n ZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cDovL2xp c3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeAo=