From: Ville Syrjala Subject: [PATCH 02/12] drm/i915: Use the spr/cur latencies on vlv/chv/g4x Date: Wed, 10 Oct 2018 16:04:44 +0300 Message-ID: <20181010130454.28557-3-ville.syrjala@linux.intel.com> References: <20181010130454.28557-1-ville.syrjala@linux.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 ESMTPS id 083806E101 for ; Wed, 10 Oct 2018 13:06:40 +0000 (UTC) In-Reply-To: <20181010130454.28557-1-ville.syrjala@linux.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 RnJvbTogVmlsbGUgU3lyasOkbMOkIDx2aWxsZS5zeXJqYWxhQGxpbnV4LmludGVsLmNvbT4KClJl ZHVjZSB0aGUgZGlmZmVyZW5jZXMgYmV0d2VlbiB0aGUgcGxhdGZvcm1zIGJ5IHVzaW5nIHRoZSBz cHIvY3VyCndhdGVybWFyayBsYXRlbmN5IHZhbHVlcyBvbiBnbWNoIHBsYXRmb3JtcyBhcyB3ZWxs LiBXZSdsbCBhbHNvCnByaW50IHRoZSB3bSBsYXRlbmNpZXMgdGhlIHNhbWUgd2F5IGFzIHdlIGRv IGZvciBpbGsrLgoKU2lnbmVkLW9mZi1ieTogVmlsbGUgU3lyasOkbMOkIDx2aWxsZS5zeXJqYWxh QGxpbnV4LmludGVsLmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2RlYnVnZnMu YyB8ICA0ICstCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9wbS5jICAgICB8IDYzICsrKysr KysrKysrKysrKysrKy0tLS0tLS0tLS0tCiAyIGZpbGVzIGNoYW5nZWQsIDQxIGluc2VydGlvbnMo KyksIDI2IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5 MTVfZGVidWdmcy5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kZWJ1Z2ZzLmMKaW5kZXgg OWUwY2I5OTU4MDFmLi4zNWI0YzQ5YzliY2EgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9p OTE1L2k5MTVfZGVidWdmcy5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZGVidWdm cy5jCkBAIC0zODczLDcgKzM4NzMsNyBAQCBzdGF0aWMgaW50IHNwcl93bV9sYXRlbmN5X29wZW4o c3RydWN0IGlub2RlICppbm9kZSwgc3RydWN0IGZpbGUgKmZpbGUpCiB7CiAJc3RydWN0IGRybV9p OTE1X3ByaXZhdGUgKmRldl9wcml2ID0gaW5vZGUtPmlfcHJpdmF0ZTsKIAotCWlmIChIQVNfR01D SF9ESVNQTEFZKGRldl9wcml2KSkKKwlpZiAoSU5URUxfR0VOKGRldl9wcml2KSA8IDUgJiYgIUlT X0c0WChkZXZfcHJpdikpCiAJCXJldHVybiAtRU5PREVWOwogCiAJcmV0dXJuIHNpbmdsZV9vcGVu KGZpbGUsIHNwcl93bV9sYXRlbmN5X3Nob3csIGRldl9wcml2KTsKQEAgLTM4ODMsNyArMzg4Myw3 IEBAIHN0YXRpYyBpbnQgY3VyX3dtX2xhdGVuY3lfb3BlbihzdHJ1Y3QgaW5vZGUgKmlub2RlLCBz dHJ1Y3QgZmlsZSAqZmlsZSkKIHsKIAlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYg PSBpbm9kZS0+aV9wcml2YXRlOwogCi0JaWYgKEhBU19HTUNIX0RJU1BMQVkoZGV2X3ByaXYpKQor CWlmIChJTlRFTF9HRU4oZGV2X3ByaXYpIDwgNSAmJiAhSVNfRzRYKGRldl9wcml2KSkKIAkJcmV0 dXJuIC1FTk9ERVY7CiAKIAlyZXR1cm4gc2luZ2xlX29wZW4oZmlsZSwgY3VyX3dtX2xhdGVuY3lf c2hvdywgZGV2X3ByaXYpOwpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxf cG0uYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3BtLmMKaW5kZXggZjg3MWE2ZjE1MmMz Li5mZTUyMmNlYWU5N2EgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3Bt LmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcG0uYwpAQCAtODAxLDYgKzgwMSwy NyBAQCBzdGF0aWMgaW50IGludGVsX3dtX251bV9sZXZlbHMoc3RydWN0IGRybV9pOTE1X3ByaXZh dGUgKmRldl9wcml2KQogCXJldHVybiBkZXZfcHJpdi0+d20ubWF4X2xldmVsICsgMTsKIH0KIAor c3RhdGljIHZvaWQgaW50ZWxfcHJpbnRfd21fbGF0ZW5jeShzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0 ZSAqZGV2X3ByaXYsCisJCQkJICAgY29uc3QgY2hhciAqbmFtZSwKKwkJCQkgICBjb25zdCB1aW50 MTZfdCB3bVs4XSkKK3sKKwlpbnQgbGV2ZWwsIG1heF9sZXZlbCA9IGlsa193bV9tYXhfbGV2ZWwo ZGV2X3ByaXYpOworCisJZm9yIChsZXZlbCA9IDA7IGxldmVsIDw9IG1heF9sZXZlbDsgbGV2ZWwr KykgeworCQl1bnNpZ25lZCBpbnQgbGF0ZW5jeSA9IHdtW2xldmVsXTsKKworCQlpZiAobGF0ZW5j eSA9PSAwKSB7CisJCQlEUk1fREVCVUdfS01TKCIlcyBXTSVkIGxhdGVuY3kgbm90IHByb3ZpZGVk XG4iLAorCQkJCSAgICAgIG5hbWUsIGxldmVsKTsKKwkJCWNvbnRpbnVlOworCQl9CisKKwkJRFJN X0RFQlVHX0tNUygiJXMgV00lZCBsYXRlbmN5ICV1ICgldS4ldSB1c2VjKVxuIiwKKwkJCSAgICAg IG5hbWUsIGxldmVsLCB3bVtsZXZlbF0sCisJCQkgICAgICBsYXRlbmN5IC8gMTAsIGxhdGVuY3kg JSAxMCk7CisJfQorfQorCiBzdGF0aWMgaW50IGludGVsX3BsYW5lX3dtX2xhdGVuY3koc3RydWN0 IGludGVsX3BsYW5lICpwbGFuZSwKIAkJCQkgIGludCBsZXZlbCkKIHsKQEAgLTgwOSw5ICs4MzAs NiBAQCBzdGF0aWMgaW50IGludGVsX3BsYW5lX3dtX2xhdGVuY3koc3RydWN0IGludGVsX3BsYW5l ICpwbGFuZSwKIAlpZiAoSU5URUxfR0VOKGRldl9wcml2KSA+PSA5KQogCQlyZXR1cm4gZGV2X3By aXYtPndtLnNrbF9sYXRlbmN5W2xldmVsXTsKIAotCWlmIChIQVNfR01DSF9ESVNQTEFZKGRldl9w cml2KSkKLQkJcmV0dXJuIGRldl9wcml2LT53bS5wcmlfbGF0ZW5jeVtsZXZlbF07Ci0KIAlzd2l0 Y2ggKHBsYW5lLT5pZCkgewogCWNhc2UgUExBTkVfUFJJTUFSWToKIAkJcmV0dXJuIGRldl9wcml2 LT53bS5wcmlfbGF0ZW5jeVtsZXZlbF07CkBAIC0xMDY2LDYgKzEwODQsMTUgQEAgc3RhdGljIHZv aWQgZzR4X3NldHVwX3dtX2xhdGVuY3koc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2 KQogCWRldl9wcml2LT53bS5wcmlfbGF0ZW5jeVtHNFhfV01fTEVWRUxfSFBMTF0gPSAzNTA7CiAK IAlkZXZfcHJpdi0+d20ubWF4X2xldmVsID0gRzRYX1dNX0xFVkVMX0hQTEw7CisKKwltZW1jcHko ZGV2X3ByaXYtPndtLnNwcl9sYXRlbmN5LCBkZXZfcHJpdi0+d20ucHJpX2xhdGVuY3ksCisJICAg ICAgIHNpemVvZihkZXZfcHJpdi0+d20ucHJpX2xhdGVuY3kpKTsKKwltZW1jcHkoZGV2X3ByaXYt PndtLmN1cl9sYXRlbmN5LCBkZXZfcHJpdi0+d20ucHJpX2xhdGVuY3ksCisJICAgICAgIHNpemVv ZihkZXZfcHJpdi0+d20ucHJpX2xhdGVuY3kpKTsKKworCWludGVsX3ByaW50X3dtX2xhdGVuY3ko ZGV2X3ByaXYsICJQcmltYXJ5IiwgZGV2X3ByaXYtPndtLnByaV9sYXRlbmN5KTsKKwlpbnRlbF9w cmludF93bV9sYXRlbmN5KGRldl9wcml2LCAiU3ByaXRlIiwgZGV2X3ByaXYtPndtLnNwcl9sYXRl bmN5KTsKKwlpbnRlbF9wcmludF93bV9sYXRlbmN5KGRldl9wcml2LCAiQ3Vyc29yIiwgZGV2X3By aXYtPndtLmN1cl9sYXRlbmN5KTsKIH0KIAogc3RhdGljIGludCBnNHhfcGxhbmVfZmlmb19zaXpl KGVudW0gcGxhbmVfaWQgcGxhbmVfaWQsIGludCBsZXZlbCkKQEAgLTE2MTgsNiArMTY0NSwxNSBA QCBzdGF0aWMgdm9pZCB2bHZfc2V0dXBfd21fbGF0ZW5jeShzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0 ZSAqZGV2X3ByaXYpCiAKIAkJZGV2X3ByaXYtPndtLm1heF9sZXZlbCA9IFZMVl9XTV9MRVZFTF9E RFJfRFZGUzsKIAl9CisKKwltZW1jcHkoZGV2X3ByaXYtPndtLnNwcl9sYXRlbmN5LCBkZXZfcHJp di0+d20ucHJpX2xhdGVuY3ksCisJICAgICAgIHNpemVvZihkZXZfcHJpdi0+d20ucHJpX2xhdGVu Y3kpKTsKKwltZW1jcHkoZGV2X3ByaXYtPndtLmN1cl9sYXRlbmN5LCBkZXZfcHJpdi0+d20ucHJp X2xhdGVuY3ksCisJICAgICAgIHNpemVvZihkZXZfcHJpdi0+d20ucHJpX2xhdGVuY3kpKTsKKwor CWludGVsX3ByaW50X3dtX2xhdGVuY3koZGV2X3ByaXYsICJQcmltYXJ5IiwgZGV2X3ByaXYtPndt LnByaV9sYXRlbmN5KTsKKwlpbnRlbF9wcmludF93bV9sYXRlbmN5KGRldl9wcml2LCAiU3ByaXRl IiwgZGV2X3ByaXYtPndtLnNwcl9sYXRlbmN5KTsKKwlpbnRlbF9wcmludF93bV9sYXRlbmN5KGRl dl9wcml2LCAiQ3Vyc29yIiwgZGV2X3ByaXYtPndtLmN1cl9sYXRlbmN5KTsKIH0KIAogc3RhdGlj IHVpbnQxNl90IHZsdl9jb21wdXRlX3dtX2xldmVsKGNvbnN0IHN0cnVjdCBpbnRlbF9jcnRjX3N0 YXRlICpjcnRjX3N0YXRlLApAQCAtMjk1NCwyNyArMjk5MCw2IEBAIGludCBpbGtfd21fbWF4X2xl dmVsKGNvbnN0IHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdikKIAkJcmV0dXJuIDI7 CiB9CiAKLXN0YXRpYyB2b2lkIGludGVsX3ByaW50X3dtX2xhdGVuY3koc3RydWN0IGRybV9pOTE1 X3ByaXZhdGUgKmRldl9wcml2LAotCQkJCSAgIGNvbnN0IGNoYXIgKm5hbWUsCi0JCQkJICAgY29u c3QgdWludDE2X3Qgd21bOF0pCi17Ci0JaW50IGxldmVsLCBtYXhfbGV2ZWwgPSBpbGtfd21fbWF4 X2xldmVsKGRldl9wcml2KTsKLQotCWZvciAobGV2ZWwgPSAwOyBsZXZlbCA8PSBtYXhfbGV2ZWw7 IGxldmVsKyspIHsKLQkJdW5zaWduZWQgaW50IGxhdGVuY3kgPSB3bVtsZXZlbF07Ci0KLQkJaWYg KGxhdGVuY3kgPT0gMCkgewotCQkJRFJNX0RFQlVHX0tNUygiJXMgV00lZCBsYXRlbmN5IG5vdCBw cm92aWRlZFxuIiwKLQkJCQkgICAgICBuYW1lLCBsZXZlbCk7Ci0JCQljb250aW51ZTsKLQkJfQot Ci0JCURSTV9ERUJVR19LTVMoIiVzIFdNJWQgbGF0ZW5jeSAldSAoJXUuJXUgdXNlYylcbiIsCi0J CQkgICAgICBuYW1lLCBsZXZlbCwgd21bbGV2ZWxdLAotCQkJICAgICAgbGF0ZW5jeSAvIDEwLCBs YXRlbmN5ICUgMTApOwotCX0KLX0KLQogc3RhdGljIGJvb2wgaWxrX2luY3JlYXNlX3dtX2xhdGVu Y3koc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2LAogCQkJCSAgICB1aW50MTZfdCB3 bVs1XSwgdWludDE2X3QgbWluKQogewotLSAKMi4xOC4xCgpfX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdm eEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFp bG1hbi9saXN0aW5mby9pbnRlbC1nZngK