From mboxrd@z Thu Jan 1 00:00:00 1970 From: Daniele Ceraolo Spurio Subject: [PATCH] drm/i915: move the edram detection out of uncore init Date: Thu, 28 Mar 2019 10:45:32 -0700 Message-ID: <20190328174533.31532-1-daniele.ceraolospurio@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 A02D96E4C1 for ; Thu, 28 Mar 2019 17:45:45 +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 Cc: Paulo Zanoni List-Id: intel-gfx@lists.freedesktop.org ZWRyYW0gaXMgbm90IHBhcnQgb2YgdW5jb3JlIGFuZCB0aGVyZSBpcyBubyByZXF1aXJlbWVudCBm b3IgdGhlCmRldGVjdGlvbiB0byBiZSBkb25lIGJlZm9yZSB3ZSBpbml0aWFsaXplIHRoZSB1bmNv cmUgZnVuY3Rpb25zLiBUaGUKZmlyc3QgY2hlY2sgb24gSEFTX0VEUkFNIGlzIGluIHRoZSBnZ3R0 X2luaXQgcGF0aCwgc28gbW92ZSBpdCB0bwppOTE1X2RyaXZlcl9pbml0X2h3LCB3aGVyZSBvdGhl ciBkcmFtLXJlbGF0ZWQgZGV0ZWN0aW9uIGhhcHBlbnMuCgpXaGlsZSBhdCBpdCwgc2F2ZSB0aGUg c2l6ZSBpbiBNQiBpbnN0ZWFkIG9mIHRoZSBjYXBhYmlsaXRpZXMgYmVjYXVzZSB0aGUKc2l6ZSBp cyB0aGUgb25seSB0aGluZyB3ZSBsb29rIGF0IG91dHNpZGUgb2YgdGhlIGluaXQgZnVuY3Rpb24u CgpTaWduZWQtb2ZmLWJ5OiBEYW5pZWxlIENlcmFvbG8gU3B1cmlvIDxkYW5pZWxlLmNlcmFvbG9z cHVyaW9AaW50ZWwuY29tPgpDYzogUGF1bG8gWmFub25pIDxwYXVsby5yLnphbm9uaUBpbnRlbC5j b20+CkNjOiBDaHJpcyBXaWxzb24gPGNocmlzQGNocmlzLXdpbHNvbi5jby51az4KLS0tCiBkcml2 ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2RlYnVnZnMuYyB8ICA0ICstLQogZHJpdmVycy9ncHUvZHJt L2k5MTUvaTkxNV9kcnYuYyAgICAgfCA0MiArKysrKysrKysrKysrKysrKysrKysrKysrKwogZHJp dmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuaCAgICAgfCAgOSArKysrLS0KIGRyaXZlcnMvZ3B1 L2RybS9pOTE1L2ludGVsX3VuY29yZS5jIHwgNDYgLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3VuY29yZS5oIHwgIDEgLQogNSBmaWxlcyBj aGFuZ2VkLCA1MCBpbnNlcnRpb25zKCspLCA1MiBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9k cml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2RlYnVnZnMuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1 L2k5MTVfZGVidWdmcy5jCmluZGV4IDY1MmY2NWQyZTEzMS4uZjkzYTA0M2YwMzNhIDEwMDY0NAot LS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2RlYnVnZnMuYworKysgYi9kcml2ZXJzL2dw dS9kcm0vaTkxNS9pOTE1X2RlYnVnZnMuYwpAQCAtMjA4Nyw4ICsyMDg3LDggQEAgc3RhdGljIGlu dCBpOTE1X2xsYyhzdHJ1Y3Qgc2VxX2ZpbGUgKm0sIHZvaWQgKmRhdGEpCiAJY29uc3QgYm9vbCBl ZHJhbSA9IElOVEVMX0dFTihkZXZfcHJpdikgPiA4OwogCiAJc2VxX3ByaW50ZihtLCAiTExDOiAl c1xuIiwgeWVzbm8oSEFTX0xMQyhkZXZfcHJpdikpKTsKLQlzZXFfcHJpbnRmKG0sICIlczogJWxs dU1CXG4iLCBlZHJhbSA/ICJlRFJBTSIgOiAiZUxMQyIsCi0JCSAgIGludGVsX3VuY29yZV9lZHJh bV9zaXplKGRldl9wcml2KS8xMDI0LzEwMjQpOworCXNlcV9wcmludGYobSwgIiVzOiAldU1CXG4i LCBlZHJhbSA/ICJlRFJBTSIgOiAiZUxMQyIsCisJCSAgIGRldl9wcml2LT5lZHJhbV9zaXplX21i KTsKIAogCXJldHVybiAwOwogfQpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkx NV9kcnYuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmMKaW5kZXggYmJlMWE1ZDU2 NDgwLi40ZDVmM2YyZDk0ZWUgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVf ZHJ2LmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuYwpAQCAtMTQ0MSw2ICsx NDQxLDQ1IEBAIGludGVsX2dldF9kcmFtX2luZm8oc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRl dl9wcml2KQogCQkgICAgICBkcmFtX2luZm8tPnJhbmtzLCB5ZXNubyhkcmFtX2luZm8tPmlzXzE2 Z2JfZGltbSkpOwogfQogCitzdGF0aWMgdTMyIGdlbjlfZWRyYW1fc2l6ZV9tYihzdHJ1Y3QgZHJt X2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYsIHUzMiBjYXApCit7CisJY29uc3QgdW5zaWduZWQgaW50 IHdheXNbOF0gPSB7IDQsIDgsIDEyLCAxNiwgMTYsIDE2LCAxNiwgMTYgfTsKKwljb25zdCB1bnNp Z25lZCBpbnQgc2V0c1s0XSA9IHsgMSwgMSwgMiwgMiB9OworCisJcmV0dXJuIEVEUkFNX05VTV9C QU5LUyhjYXApICoKKwkJd2F5c1tFRFJBTV9XQVlTX0lEWChjYXApXSAqCisJCXNldHNbRURSQU1f U0VUU19JRFgoY2FwKV07Cit9CisKK3N0YXRpYyB2b2lkIGVkcmFtX2RldGVjdChzdHJ1Y3QgZHJt X2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpCit7CisJdTMyIGVkcmFtX2NhcCA9IDA7CisKKwlpZiAo IShJU19IQVNXRUxMKGRldl9wcml2KSB8fAorCSAgICAgIElTX0JST0FEV0VMTChkZXZfcHJpdikg fHwKKwkgICAgICBJTlRFTF9HRU4oZGV2X3ByaXYpID49IDkpKQorCQlyZXR1cm47CisKKwllZHJh bV9jYXAgPSBfX3Jhd191bmNvcmVfcmVhZDMyKCZkZXZfcHJpdi0+dW5jb3JlLCBIU1dfRURSQU1f Q0FQKTsKKworCS8qIE5COiBXZSBjYW4ndCB3cml0ZSBJRElDUiB5ZXQgYmVjYXVzZSB3ZSBkb24n dCBoYXZlIGd0IGZ1bmNzIHNldCB1cCAqLworCisJaWYgKCEoZWRyYW1fY2FwICYgRURSQU1fRU5B QkxFRCkpCisJCXJldHVybjsKKworCS8qCisJICogVGhlIG5lZWRlZCBjYXBhYmlsaXR5IGJpdHMg Zm9yIHNpemUgY2FsY3VsYXRpb24gYXJlIG5vdCB0aGVyZSB3aXRoCisJICogcHJlIGdlbjkgc28g cmV0dXJuIDEyOE1CIGFsd2F5cy4KKwkgKi8KKwlpZiAoSU5URUxfR0VOKGRldl9wcml2KSA8IDkp CisJCWRldl9wcml2LT5lZHJhbV9zaXplX21iID0gMTI4OworCWVsc2UKKwkJZGV2X3ByaXYtPmVk cmFtX3NpemVfbWIgPQorCQkJZ2VuOV9lZHJhbV9zaXplX21iKGRldl9wcml2LCBlZHJhbV9jYXAp OworCisJRFJNX0lORk8oIkZvdW5kICV1TUIgb2YgZURSQU1cbiIsIGRldl9wcml2LT5lZHJhbV9z aXplX21iKTsKK30KKwogLyoqCiAgKiBpOTE1X2RyaXZlcl9pbml0X2h3IC0gc2V0dXAgc3RhdGUg cmVxdWlyaW5nIGRldmljZSBhY2Nlc3MKICAqIEBkZXZfcHJpdjogZGV2aWNlIHByaXZhdGUKQEAg LTE0ODMsNiArMTUyMiw5IEBAIHN0YXRpYyBpbnQgaTkxNV9kcml2ZXJfaW5pdF9odyhzdHJ1Y3Qg ZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpCiAKIAlpbnRlbF9zYW5pdGl6ZV9vcHRpb25zKGRl dl9wcml2KTsKIAorCS8qIG5lZWRzIHRvIGJlIGRvbmUgYmVmb3JlIGdndHQgcHJvYmUgKi8KKwll ZHJhbV9kZXRlY3QoZGV2X3ByaXYpOworCiAJaTkxNV9wZXJmX2luaXQoZGV2X3ByaXYpOwogCiAJ cmV0ID0gaTkxNV9nZ3R0X3Byb2JlX2h3KGRldl9wcml2KTsKZGlmZiAtLWdpdCBhL2RyaXZlcnMv Z3B1L2RybS9pOTE1L2k5MTVfZHJ2LmggYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5o CmluZGV4IGIwNTY4N2VkOTFlZi4uM2M2YjMxZjk0Mjc4IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dw dS9kcm0vaTkxNS9pOTE1X2Rydi5oCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2 LmgKQEAgLTE3MDYsOCArMTcwNiwxMSBAQCBzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSB7CiAKIAlz dHJ1Y3QgaW50ZWxfbDNfcGFyaXR5IGwzX3Bhcml0eTsKIAotCS8qIENhbm5vdCBiZSBkZXRlcm1p bmVkIGJ5IFBDSUlELiBZb3UgbXVzdCBhbHdheXMgcmVhZCBhIHJlZ2lzdGVyLiAqLwotCXUzMiBl ZHJhbV9jYXA7CisJLyoKKwkgKiBlZHJhbSBzaXplIGluIE1CLgorCSAqIENhbm5vdCBiZSBkZXRl cm1pbmVkIGJ5IFBDSUlELiBZb3UgbXVzdCBhbHdheXMgcmVhZCBhIHJlZ2lzdGVyLgorCSAqLwor CXUzMiBlZHJhbV9zaXplX21iOwogCiAJLyoKIAkgKiBQcm90ZWN0cyBSUFMvUkM2IHJlZ2lzdGVy IGFjY2VzcyBhbmQgUENVIGNvbW11bmljYXRpb24uCkBAIC0yNDY3LDcgKzI0NzAsNyBAQCBzdGF0 aWMgaW5saW5lIHVuc2lnbmVkIGludCBpOTE1X3NnX3NlZ21lbnRfc2l6ZSh2b2lkKQogCiAjZGVm aW5lIEhBU19MTEMoZGV2X3ByaXYpCShJTlRFTF9JTkZPKGRldl9wcml2KS0+aGFzX2xsYykKICNk ZWZpbmUgSEFTX1NOT09QKGRldl9wcml2KQkoSU5URUxfSU5GTyhkZXZfcHJpdiktPmhhc19zbm9v cCkKLSNkZWZpbmUgSEFTX0VEUkFNKGRldl9wcml2KQkoISEoKGRldl9wcml2KS0+ZWRyYW1fY2Fw ICYgRURSQU1fRU5BQkxFRCkpCisjZGVmaW5lIEhBU19FRFJBTShkZXZfcHJpdikJKChkZXZfcHJp diktPmVkcmFtX3NpemVfbWIgPiAwKQogI2RlZmluZSBIQVNfV1QoZGV2X3ByaXYpCSgoSVNfSEFT V0VMTChkZXZfcHJpdikgfHwgXAogCQkJCSBJU19CUk9BRFdFTEwoZGV2X3ByaXYpKSAmJiBIQVNf RURSQU0oZGV2X3ByaXYpKQogCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRl bF91bmNvcmUuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3VuY29yZS5jCmluZGV4IDVj ODA3MDRiZjI4My4uMTA2ZGYyNGYyMGE1IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkx NS9pbnRlbF91bmNvcmUuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF91bmNvcmUu YwpAQCAtNDIwLDUxICs0MjAsNiBAQCBpbnRlbF91bmNvcmVfZm9yY2V3YWtlX3Jlc2V0KHN0cnVj dCBpbnRlbF91bmNvcmUgKnVuY29yZSkKIAlyZXR1cm4gZnc7IC8qIHRyYWNrIHRoZSBsb3N0IHVz ZXIgZm9yY2V3YWtlIGRvbWFpbnMgKi8KIH0KIAotc3RhdGljIHU2NCBnZW45X2VkcmFtX3NpemUo c3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KQotewotCWNvbnN0IHVuc2lnbmVkIGlu dCB3YXlzWzhdID0geyA0LCA4LCAxMiwgMTYsIDE2LCAxNiwgMTYsIDE2IH07Ci0JY29uc3QgdW5z aWduZWQgaW50IHNldHNbNF0gPSB7IDEsIDEsIDIsIDIgfTsKLQljb25zdCB1MzIgY2FwID0gZGV2 X3ByaXYtPmVkcmFtX2NhcDsKLQotCXJldHVybiBFRFJBTV9OVU1fQkFOS1MoY2FwKSAqCi0JCXdh eXNbRURSQU1fV0FZU19JRFgoY2FwKV0gKgotCQlzZXRzW0VEUkFNX1NFVFNfSURYKGNhcCldICoK LQkJMTAyNCAqIDEwMjQ7Ci19Ci0KLXU2NCBpbnRlbF91bmNvcmVfZWRyYW1fc2l6ZShzdHJ1Y3Qg ZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpCi17Ci0JaWYgKCFIQVNfRURSQU0oZGV2X3ByaXYp KQotCQlyZXR1cm4gMDsKLQotCS8qIFRoZSBuZWVkZWQgY2FwYWJpbGl0eSBiaXRzIGZvciBzaXpl IGNhbGN1bGF0aW9uCi0JICogYXJlIG5vdCB0aGVyZSB3aXRoIHByZSBnZW45IHNvIHJldHVybiAx MjhNQiBhbHdheXMuCi0JICovCi0JaWYgKElOVEVMX0dFTihkZXZfcHJpdikgPCA5KQotCQlyZXR1 cm4gMTI4ICogMTAyNCAqIDEwMjQ7Ci0KLQlyZXR1cm4gZ2VuOV9lZHJhbV9zaXplKGRldl9wcml2 KTsKLX0KLQotc3RhdGljIHZvaWQgaW50ZWxfdW5jb3JlX2VkcmFtX2RldGVjdChzdHJ1Y3QgZHJt X2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpCi17Ci0JaWYgKElTX0hBU1dFTEwoZGV2X3ByaXYpIHx8 Ci0JICAgIElTX0JST0FEV0VMTChkZXZfcHJpdikgfHwKLQkgICAgSU5URUxfR0VOKGRldl9wcml2 KSA+PSA5KSB7Ci0JCWRldl9wcml2LT5lZHJhbV9jYXAgPSBfX3Jhd191bmNvcmVfcmVhZDMyKCZk ZXZfcHJpdi0+dW5jb3JlLAotCQkJCQkJCSAgSFNXX0VEUkFNX0NBUCk7Ci0KLQkJLyogTkI6IFdl IGNhbid0IHdyaXRlIElESUNSIHlldCBiZWNhdXNlIHdlIGRvIG5vdCBoYXZlIGd0IGZ1bmNzCi0J CSAqIHNldCB1cCAqLwotCX0gZWxzZSB7Ci0JCWRldl9wcml2LT5lZHJhbV9jYXAgPSAwOwotCX0K LQotCWlmIChIQVNfRURSQU0oZGV2X3ByaXYpKQotCQlEUk1fSU5GTygiRm91bmQgJWxsdU1CIG9m IGVEUkFNXG4iLAotCQkJIGludGVsX3VuY29yZV9lZHJhbV9zaXplKGRldl9wcml2KSAvICgxMDI0 ICogMTAyNCkpOwotfQotCiBzdGF0aWMgYm9vbAogZnBnYV9jaGVja19mb3JfdW5jbGFpbWVkX21t aW8oc3RydWN0IGludGVsX3VuY29yZSAqdW5jb3JlKQogewpAQCAtMTU4NCw3ICsxNTM5LDYgQEAg aW50IGludGVsX3VuY29yZV9pbml0KHN0cnVjdCBpbnRlbF91bmNvcmUgKnVuY29yZSkKIAlpZiAo SU5URUxfR0VOKGk5MTUpID4gNSAmJiAhaW50ZWxfdmdwdV9hY3RpdmUoaTkxNSkpCiAJCXVuY29y ZS0+ZmxhZ3MgfD0gVU5DT1JFX0hBU19GT1JDRVdBS0U7CiAKLQlpbnRlbF91bmNvcmVfZWRyYW1f ZGV0ZWN0KGk5MTUpOwogCWludGVsX3VuY29yZV9md19kb21haW5zX2luaXQodW5jb3JlKTsKIAlf X2ludGVsX3VuY29yZV9lYXJseV9zYW5pdGl6ZSh1bmNvcmUsIDApOwogCmRpZmYgLS1naXQgYS9k cml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF91bmNvcmUuaCBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1 L2ludGVsX3VuY29yZS5oCmluZGV4IDUwZDIyNmY2ODc1My4uODk2NTg1YTFjMmRkIDEwMDY0NAot LS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF91bmNvcmUuaAorKysgYi9kcml2ZXJzL2dw dS9kcm0vaTkxNS9pbnRlbF91bmNvcmUuaApAQCAtMTg3LDcgKzE4Nyw2IEBAIHZvaWQgaW50ZWxf dW5jb3JlX3N1c3BlbmQoc3RydWN0IGludGVsX3VuY29yZSAqdW5jb3JlKTsKIHZvaWQgaW50ZWxf dW5jb3JlX3Jlc3VtZV9lYXJseShzdHJ1Y3QgaW50ZWxfdW5jb3JlICp1bmNvcmUpOwogdm9pZCBp bnRlbF91bmNvcmVfcnVudGltZV9yZXN1bWUoc3RydWN0IGludGVsX3VuY29yZSAqdW5jb3JlKTsK IAotdTY0IGludGVsX3VuY29yZV9lZHJhbV9zaXplKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpk ZXZfcHJpdik7CiB2b2lkIGFzc2VydF9mb3JjZXdha2VzX2luYWN0aXZlKHN0cnVjdCBpbnRlbF91 bmNvcmUgKnVuY29yZSk7CiB2b2lkIGFzc2VydF9mb3JjZXdha2VzX2FjdGl2ZShzdHJ1Y3QgaW50 ZWxfdW5jb3JlICp1bmNvcmUsCiAJCQkgICAgICBlbnVtIGZvcmNld2FrZV9kb21haW5zIGZ3X2Rv bWFpbnMpOwotLSAKMi4yMC4xCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVz a3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9p bnRlbC1nZng=