From mboxrd@z Thu Jan 1 00:00:00 1970 From: John.C.Harrison@Intel.com Subject: [RFC 21/39] drm/i915: Added scheduler flush calls to ring throttle and idle functions Date: Fri, 17 Jul 2015 15:33:30 +0100 Message-ID: <1437143628-6329-22-git-send-email-John.C.Harrison@Intel.com> References: <1437143628-6329-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 mga11.intel.com (mga11.intel.com [192.55.52.93]) by gabe.freedesktop.org (Postfix) with ESMTP id B169B6E4FD for ; Fri, 17 Jul 2015 07:34:14 -0700 (PDT) In-Reply-To: <1437143628-6329-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 cnkgdG8gZ2V0IHRoZQpzY2hlZHVsZXIgaW52b2x2ZWQgaW4gb3JkZXIgdG8gZmx1c2ggb3V0IHdv cmsgdGhhdCBxdWV1ZWQgYW5kIG5vdCB5ZXQgc3VibWl0dGVkLgoKQ2hhbmdlLUlkOiBJOTVkY2My YTJlZTVjMWE4NDQ3NDg2MjFjMzMzOTk0ZGRkNmNmNmE2NgpGb3I6IFZJWi0xNTg3ClNpZ25lZC1v ZmYtYnk6IEpvaG4gSGFycmlzb24gPEpvaG4uQy5IYXJyaXNvbkBJbnRlbC5jb20+Ci0tLQogZHJp dmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW0uYyAgICAgICB8IDE3ICsrKysrKysrKysrKy0KIGRy aXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfc2NoZWR1bGVyLmMgfCA0NSArKysrKysrKysrKysrKysr KysrKysrKysrKysrKysrKysrKwogZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9zY2hlZHVsZXIu aCB8ICAxICsKIDMgZmlsZXMgY2hhbmdlZCwgNjIgaW5zZXJ0aW9ucygrKSwgMSBkZWxldGlvbigt KQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtLmMgYi9kcml2ZXJz L2dwdS9kcm0vaTkxNS9pOTE1X2dlbS5jCmluZGV4IGRkOWViYmUuLjYxNDJlNjggMTAwNjQ0Ci0t LSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtLmMKKysrIGIvZHJpdmVycy9ncHUvZHJt L2k5MTUvaTkxNV9nZW0uYwpAQCAtMzcxMCw2ICszNzEwLDEwIEBAIGludCBpOTE1X2dwdV9pZGxl KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCiAKIAkvKiBGbHVzaCBldmVyeXRoaW5nIG9udG8gdGhl IGluYWN0aXZlIGxpc3QuICovCiAJZm9yX2VhY2hfcmluZyhyaW5nLCBkZXZfcHJpdiwgaSkgewor CQlyZXQgPSBpOTE1X3NjaGVkdWxlcl9mbHVzaChyaW5nLCB0cnVlKTsKKwkJaWYgKHJldCA8IDAp CisJCQlyZXR1cm4gcmV0OworCiAJCWlmICghaTkxNS5lbmFibGVfZXhlY2xpc3RzKSB7CiAJCQlz dHJ1Y3QgZHJtX2k5MTVfZ2VtX3JlcXVlc3QgKnJlcTsKIApAQCAtNDY3OSw3ICs0NjgzLDggQEAg aTkxNV9nZW1fcmluZ190aHJvdHRsZShzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LCBzdHJ1Y3QgZHJt X2ZpbGUgKmZpbGUpCiAJdW5zaWduZWQgbG9uZyByZWNlbnRfZW5vdWdoID0gamlmZmllcyAtIERS TV9JOTE1X1RIUk9UVExFX0pJRkZJRVM7CiAJc3RydWN0IGRybV9pOTE1X2dlbV9yZXF1ZXN0ICpy ZXF1ZXN0LCAqdGFyZ2V0ID0gTlVMTDsKIAl1bnNpZ25lZCByZXNldF9jb3VudGVyOwotCWludCBy ZXQ7CisJaW50IGksIHJldDsKKwlzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICpyaW5nOwogCiAJcmV0 ID0gaTkxNV9nZW1fd2FpdF9mb3JfZXJyb3IoJmRldl9wcml2LT5ncHVfZXJyb3IpOwogCWlmIChy ZXQpCkBAIC00Njg5LDYgKzQ2OTQsMTYgQEAgaTkxNV9nZW1fcmluZ190aHJvdHRsZShzdHJ1Y3Qg ZHJtX2RldmljZSAqZGV2LCBzdHJ1Y3QgZHJtX2ZpbGUgKmZpbGUpCiAJaWYgKHJldCkKIAkJcmV0 dXJuIHJldDsKIAorCWZvcl9lYWNoX3JpbmcocmluZywgZGV2X3ByaXYsIGkpIHsKKwkJLyogTmVl ZCBhIG1lY2hhbmlzbSB0byBmbHVzaCBvdXQgc2NoZWR1bGVyIGVudHJpZXMgdGhhdCB3ZXJlCisJ CSAqIHN1Ym1pdHRlZCBtb3JlIHRoYW4gJ3JlY2VudF9lbm91Z2gnIHRpbWUgYWdvIGFzIHdlbGwh IEluIHRoZQorCQkgKiBtZWFudGltZSwganVzdCBmbHVzaCBldmVyeXRoaW5nIG91dCB0byBlbnN1 cmUgdGhhdCBlbnRyaWVzCisJCSAqIGNhbiBub3Qgc2l0IGFyb3VuZCBpbmRlZmluaXRlbHkuICov CisJCXJldCA9IGk5MTVfc2NoZWR1bGVyX2ZsdXNoKHJpbmcsIGZhbHNlKTsKKwkJaWYgKHJldCA8 IDApCisJCQlyZXR1cm4gcmV0OworCX0KKwogCXNwaW5fbG9jaygmZmlsZV9wcml2LT5tbS5sb2Nr KTsKIAlsaXN0X2Zvcl9lYWNoX2VudHJ5KHJlcXVlc3QsICZmaWxlX3ByaXYtPm1tLnJlcXVlc3Rf bGlzdCwgY2xpZW50X2xpc3QpIHsKIAkJaWYgKHRpbWVfYWZ0ZXJfZXEocmVxdWVzdC0+ZW1pdHRl ZF9qaWZmaWVzLCByZWNlbnRfZW5vdWdoKSkKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9p OTE1L2k5MTVfc2NoZWR1bGVyLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X3NjaGVkdWxl ci5jCmluZGV4IDgxMWNiZTQuLjczYzliYTYgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9p OTE1L2k5MTVfc2NoZWR1bGVyLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9zY2hl ZHVsZXIuYwpAQCAtNjUzLDYgKzY1Myw1MSBAQCBpbnQgaTkxNV9zY2hlZHVsZXJfZmx1c2hfcmVx dWVzdChzdHJ1Y3QgZHJtX2k5MTVfZ2VtX3JlcXVlc3QgKnJlcSwKIAlyZXR1cm4gZmx1c2hfY291 bnQ7CiB9CiAKK2ludCBpOTE1X3NjaGVkdWxlcl9mbHVzaChzdHJ1Y3QgaW50ZWxfZW5naW5lX2Nz ICpyaW5nLCBib29sIGlzX2xvY2tlZCkKK3sKKwlzdHJ1Y3QgaTkxNV9zY2hlZHVsZXJfcXVldWVf ZW50cnkgKm5vZGU7CisJc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgICAgICAgICAgICpkZXZfcHJp djsKKwlzdHJ1Y3QgaTkxNV9zY2hlZHVsZXIgICAgICAgICAgICAgKnNjaGVkdWxlcjsKKwl1bnNp Z25lZCBsb25nICAgICAgIGZsYWdzOworCWJvb2wgICAgICAgIGZvdW5kOworCWludCAgICAgICAg IHJldDsKKwl1aW50MzJfdCAgICBjb3VudCA9IDA7CisKKwlpZiAoIXJpbmcpCisJCXJldHVybiAt RUlOVkFMOworCisJZGV2X3ByaXYgID0gcmluZy0+ZGV2LT5kZXZfcHJpdmF0ZTsKKwlzY2hlZHVs ZXIgPSBkZXZfcHJpdi0+c2NoZWR1bGVyOworCisJaWYgKCFzY2hlZHVsZXIpCisJCXJldHVybiAw OworCisJQlVHX09OKGlzX2xvY2tlZCAmJiAoc2NoZWR1bGVyLT5mbGFnc1tyaW5nLT5pZF0gJiBp OTE1X3NmX3N1Ym1pdHRpbmcpKTsKKworCWRvIHsKKwkJZm91bmQgPSBmYWxzZTsKKwkJc3Bpbl9s b2NrX2lycXNhdmUoJnNjaGVkdWxlci0+bG9jaywgZmxhZ3MpOworCQlsaXN0X2Zvcl9lYWNoX2Vu dHJ5KG5vZGUsICZzY2hlZHVsZXItPm5vZGVfcXVldWVbcmluZy0+aWRdLCBsaW5rKSB7CisJCQlp ZiAoIUk5MTVfU1FTX0lTX1FVRVVFRChub2RlKSkKKwkJCQljb250aW51ZTsKKworCQkJZm91bmQg PSB0cnVlOworCQkJYnJlYWs7CisJCX0KKwkJc3Bpbl91bmxvY2tfaXJxcmVzdG9yZSgmc2NoZWR1 bGVyLT5sb2NrLCBmbGFncyk7CisKKwkJaWYgKGZvdW5kKSB7CisJCQlyZXQgPSBpOTE1X3NjaGVk dWxlcl9zdWJtaXQocmluZywgaXNfbG9ja2VkKTsKKwkJCWlmIChyZXQgPCAwKQorCQkJCXJldHVy biByZXQ7CisKKwkJCWNvdW50ICs9IHJldDsKKwkJfQorCX0gd2hpbGUgKGZvdW5kKTsKKworCXJl dHVybiBjb3VudDsKK30KKwogc3RhdGljIHZvaWQgaTkxNV9zY2hlZHVsZXJfcHJpb3JpdHlfYnVt cF9jbGVhcihzdHJ1Y3QgaTkxNV9zY2hlZHVsZXIgKnNjaGVkdWxlcikKIHsKIAlzdHJ1Y3QgaTkx NV9zY2hlZHVsZXJfcXVldWVfZW50cnkgKm5vZGU7CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9k cm0vaTkxNS9pOTE1X3NjaGVkdWxlci5oIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9zY2hl ZHVsZXIuaAppbmRleCBmY2YyNjQwLi41ZTA5NGQ1IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9k cm0vaTkxNS9pOTE1X3NjaGVkdWxlci5oCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVf c2NoZWR1bGVyLmgKQEAgLTkyLDYgKzkyLDcgQEAgdm9pZCAgICAgICAgaTkxNV9nZW1fc2NoZWR1 bGVyX2NsZWFuX25vZGUoc3RydWN0IGk5MTVfc2NoZWR1bGVyX3F1ZXVlX2VudHJ5ICpub2QKIGlu dCAgICAgICAgIGk5MTVfc2NoZWR1bGVyX3F1ZXVlX2V4ZWNidWZmZXIoc3RydWN0IGk5MTVfc2No ZWR1bGVyX3F1ZXVlX2VudHJ5ICpxZSk7CiBpbnQgICAgICAgICBpOTE1X3NjaGVkdWxlcl9oYW5k bGVfaXJxKHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKnJpbmcpOwogdm9pZCAgICAgICAgaTkxNV9n ZW1fc2NoZWR1bGVyX3dvcmtfaGFuZGxlcihzdHJ1Y3Qgd29ya19zdHJ1Y3QgKndvcmspOworaW50 ICAgICAgICAgaTkxNV9zY2hlZHVsZXJfZmx1c2goc3RydWN0IGludGVsX2VuZ2luZV9jcyAqcmlu ZywgYm9vbCBpc19sb2NrZWQpOwogaW50ICAgICAgICAgaTkxNV9zY2hlZHVsZXJfZmx1c2hfcmVx dWVzdChzdHJ1Y3QgZHJtX2k5MTVfZ2VtX3JlcXVlc3QgKnJlcSwKIAkJCQkJIGJvb2wgaXNfbG9j a2VkKTsKIGJvb2wgICAgICAgIGk5MTVfc2NoZWR1bGVyX2lzX3JlcXVlc3RfdHJhY2tlZChzdHJ1 Y3QgZHJtX2k5MTVfZ2VtX3JlcXVlc3QgKnJlcSwKLS0gCjEuOS4xCgpfX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0Cklu dGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cDovL2xpc3RzLmZyZWVkZXNrdG9wLm9y Zy9tYWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeAo=