From: Tvrtko Ursulin Subject: [RFC 5/7] drm/i915: Move gen and platform mask to runtime device info Date: Mon, 12 Nov 2018 17:12:40 +0000 Message-ID: <20181112171242.7640-6-tvrtko.ursulin@linux.intel.com> References: <20181112171242.7640-1-tvrtko.ursulin@linux.intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) by gabe.freedesktop.org (Postfix) with ESMTPS id E8FC56E0A5 for ; Mon, 12 Nov 2018 17:12:53 +0000 (UTC) In-Reply-To: <20181112171242.7640-1-tvrtko.ursulin@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 Cc: Jani Nikula List-Id: intel-gfx@lists.freedesktop.org RnJvbTogVHZydGtvIFVyc3VsaW4gPHR2cnRrby51cnN1bGluQGludGVsLmNvbT4KCkl0IGlzIG1v cmUgc3BhY2UgZWZmaWNpZW50IHRvIHN0b3JlIHRoZXNlIHR3byBhdCB0aGUgcnVudGltZSBjb3B5 IHNpbmNlCmJvdGggYXJlIHRyaXZpYWxseSBkZXJpdmVkIGZyb20gdGhlIHN0YXRpYyBkYXRhLgoK U2lnbmVkLW9mZi1ieTogVHZydGtvIFVyc3VsaW4gPHR2cnRrby51cnN1bGluQGludGVsLmNvbT4K Q2M6IENocmlzIFdpbHNvbiA8Y2hyaXNAY2hyaXMtd2lsc29uLmNvLnVrPgpDYzogSmFuaSBOaWt1 bGEgPGphbmkubmlrdWxhQGludGVsLmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1 X2Rydi5jICAgICAgICAgIHwgMTUgKysrKysrKysrLS0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUv aTkxNV9kcnYuaCAgICAgICAgICB8IDI4ICsrKysrKysrKysrKysrLS0tLS0tLS0tLQogZHJpdmVy cy9ncHUvZHJtL2k5MTUvaTkxNV9wY2kuYyAgICAgICAgICB8ICA0ICsrLS0KIGRyaXZlcnMvZ3B1 L2RybS9pOTE1L2ludGVsX2RldmljZV9pbmZvLmggfCAgNiArKy0tLQogZHJpdmVycy9ncHUvZHJt L2k5MTUvaW50ZWxfdW5jb3JlLmMgICAgICB8ICAyICstCiA1IGZpbGVzIGNoYW5nZWQsIDMzIGlu c2VydGlvbnMoKyksIDIyIGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2Ry bS9pOTE1L2k5MTVfZHJ2LmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5jCmluZGV4 IDc3ZGQ3NzYzYjMzNC4uNGY1ZGRjM2QyZjRkIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0v aTkxNS9pOTE1X2Rydi5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmMKQEAg LTE2NTcsMTAgKzE2NTcsNiBAQCBpOTE1X2RyaXZlcl9jcmVhdGUoc3RydWN0IHBjaV9kZXYgKnBk ZXYsIGNvbnN0IHN0cnVjdCBwY2lfZGV2aWNlX2lkICplbnQpCiAJaTkxNS0+aW5mbyA9IGRldmlj ZV9pbmZvID0gbWF0Y2hfaW5mbzsKIAlwY2lfc2V0X2RydmRhdGEocGRldiwgJmk5MTUtPmRybSk7 CiAKLQlCVUlMRF9CVUdfT04oSU5URUxfTUFYX1BMQVRGT1JNUyA+Ci0JCSAgICAgQklUU19QRVJf VFlQRShkZXZpY2VfaW5mby0+cGxhdGZvcm1fbWFzaykpOwotCUJVR19PTihkZXZpY2VfaW5mby0+ X19nZW4gPiBCSVRTX1BFUl9UWVBFKGRldmljZV9pbmZvLT5nZW5fbWFzaykpOwotCiAJLyoKIAkg KiBFYXJseSBzZXR1cCBvZiB0aGUgcnVudGltZSBkZXZpY2UgaW5mby4KIAkgKi8KQEAgLTE2ODEs NiArMTY3NywxNyBAQCBpOTE1X2RyaXZlcl9jcmVhdGUoc3RydWN0IHBjaV9kZXYgKnBkZXYsIGNv bnN0IHN0cnVjdCBwY2lfZGV2aWNlX2lkICplbnQpCiAJcnVudGltZV9pbmZvLT5yaW5nX21hc2sg PSBkZXZpY2VfaW5mby0+X19yaW5nX21hc2s7CiAJcnVudGltZV9pbmZvLT5udW1fcGlwZXMgPSBk ZXZpY2VfaW5mby0+X19udW1fcGlwZXM7CiAKKwkvKgorCSAqIEluaXRpYWxpemUgR0VOIGFuZCBw bGF0Zm9ybSBtYXNrcy4KKwkgKi8KKwlCVUlMRF9CVUdfT04oSU5URUxfTUFYX1BMQVRGT1JNUyA+ CisJCSAgICAgQklUU19QRVJfVFlQRShydW50aW1lX2luZm8tPnBsYXRmb3JtX21hc2spKTsKKwor CUJVR19PTihJTlRFTF9HRU4oaTkxNSkgPiBCSVRTX1BFUl9UWVBFKHJ1bnRpbWVfaW5mby0+Z2Vu X21hc2spKTsKKworCXJ1bnRpbWVfaW5mby0+Z2VuX21hc2sgPSBCSVQoSU5URUxfR0VOKGk5MTUp IC0gMSk7CisJcnVudGltZV9pbmZvLT5wbGF0Zm9ybV9tYXNrID0gQklUKGRldmljZV9pbmZvLT5w bGF0Zm9ybSk7CisKIAlyZXR1cm4gaTkxNTsKIH0KIApkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUv ZHJtL2k5MTUvaTkxNV9kcnYuaCBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmgKaW5k ZXggNzdlZjQxZDUzNTU4Li4yODM1OTJkZDcwMjMgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2Ry bS9pOTE1L2k5MTVfZHJ2LmgKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuaApA QCAtMjM2NSw3ICsyMzY1LDcgQEAgc3RhdGljIGlubGluZSB1bnNpZ25lZCBpbnQgaTkxNV9zZ19z ZWdtZW50X3NpemUodm9pZCkKIAogLyogUmV0dXJucyB0cnVlIGlmIEdlbiBpcyBpbiBpbmNsdXNp dmUgcmFuZ2UgW1N0YXJ0LCBFbmRdICovCiAjZGVmaW5lIElTX0dFTihkZXZfcHJpdiwgcywgZSkg XAotCSghIShJTlRFTF9JTkZPKGRldl9wcml2KS0+Z2VuX21hc2sgJiBJTlRFTF9HRU5fTUFTSygo cyksIChlKSkpKQorCSghISgoZGV2X3ByaXYpLT5ydW50aW1lX2luZm8uZ2VuX21hc2sgJiBJTlRF TF9HRU5fTUFTSygocyksIChlKSkpKQogCiAvKgogICogUmV0dXJuIHRydWUgaWYgcmV2aXNpb24g aXMgaW4gcmFuZ2UgW3NpbmNlLHVudGlsXSBpbmNsdXNpdmUuCkBAIC0yMzc1LDcgKzIzNzUsOCBA QCBzdGF0aWMgaW5saW5lIHVuc2lnbmVkIGludCBpOTE1X3NnX3NlZ21lbnRfc2l6ZSh2b2lkKQog I2RlZmluZSBJU19SRVZJRChwLCBzaW5jZSwgdW50aWwpIFwKIAkoSU5URUxfUkVWSUQocCkgPj0g KHNpbmNlKSAmJiBJTlRFTF9SRVZJRChwKSA8PSAodW50aWwpKQogCi0jZGVmaW5lIElTX1BMQVRG T1JNKGRldl9wcml2LCBwKSAoSU5URUxfSU5GTyhkZXZfcHJpdiktPnBsYXRmb3JtX21hc2sgJiBC SVQocCkpCisjZGVmaW5lIElTX1BMQVRGT1JNKGRldl9wcml2LCBwKSBcCisJKChkZXZfcHJpdikt PnJ1bnRpbWVfaW5mby5wbGF0Zm9ybV9tYXNrICYgQklUKHApKQogCiAjZGVmaW5lIElTX0k4MzAo ZGV2X3ByaXYpCUlTX1BMQVRGT1JNKGRldl9wcml2LCBJTlRFTF9JODMwKQogI2RlZmluZSBJU19J ODQ1RyhkZXZfcHJpdikJSVNfUExBVEZPUk0oZGV2X3ByaXYsIElOVEVMX0k4NDVHKQpAQCAtMjUy NCwxNiArMjUyNSwxOSBAQCBzdGF0aWMgaW5saW5lIHVuc2lnbmVkIGludCBpOTE1X3NnX3NlZ21l bnRfc2l6ZSh2b2lkKQogICogaGF2ZSB0aGVpciBvd24gKGUuZy4gSEFTX1BDSF9TUExJVCBmb3Ig SUxLKyBkaXNwbGF5LCBJU19mb28gZm9yIHBhcnRpY3VsYXIKICAqIGNoaXBzLCBldGMuKS4KICAq LwotI2RlZmluZSBJU19HRU4yKGRldl9wcml2KQkoISEoSU5URUxfSU5GTyhkZXZfcHJpdiktPmdl bl9tYXNrICYgQklUKDEpKSkKLSNkZWZpbmUgSVNfR0VOMyhkZXZfcHJpdikJKCEhKElOVEVMX0lO Rk8oZGV2X3ByaXYpLT5nZW5fbWFzayAmIEJJVCgyKSkpCi0jZGVmaW5lIElTX0dFTjQoZGV2X3By aXYpCSghIShJTlRFTF9JTkZPKGRldl9wcml2KS0+Z2VuX21hc2sgJiBCSVQoMykpKQotI2RlZmlu ZSBJU19HRU41KGRldl9wcml2KQkoISEoSU5URUxfSU5GTyhkZXZfcHJpdiktPmdlbl9tYXNrICYg QklUKDQpKSkKLSNkZWZpbmUgSVNfR0VONihkZXZfcHJpdikJKCEhKElOVEVMX0lORk8oZGV2X3By aXYpLT5nZW5fbWFzayAmIEJJVCg1KSkpCi0jZGVmaW5lIElTX0dFTjcoZGV2X3ByaXYpCSghIShJ TlRFTF9JTkZPKGRldl9wcml2KS0+Z2VuX21hc2sgJiBCSVQoNikpKQotI2RlZmluZSBJU19HRU44 KGRldl9wcml2KQkoISEoSU5URUxfSU5GTyhkZXZfcHJpdiktPmdlbl9tYXNrICYgQklUKDcpKSkK LSNkZWZpbmUgSVNfR0VOOShkZXZfcHJpdikJKCEhKElOVEVMX0lORk8oZGV2X3ByaXYpLT5nZW5f bWFzayAmIEJJVCg4KSkpCi0jZGVmaW5lIElTX0dFTjEwKGRldl9wcml2KQkoISEoSU5URUxfSU5G TyhkZXZfcHJpdiktPmdlbl9tYXNrICYgQklUKDkpKSkKLSNkZWZpbmUgSVNfR0VOMTEoZGV2X3By aXYpCSghIShJTlRFTF9JTkZPKGRldl9wcml2KS0+Z2VuX21hc2sgJiBCSVQoMTApKSkKKyNkZWZp bmUgX19JU19HRU4oZGV2X3ByaXYsIGcpCVwKKwkoISEoKGRldl9wcml2KS0+cnVudGltZV9pbmZv Lmdlbl9tYXNrICYgQklUKChnKSAtIDEpKSkKKworI2RlZmluZSBJU19HRU4yKGRldl9wcml2KQlf X0lTX0dFTihkZXZfcHJpdiwgMikKKyNkZWZpbmUgSVNfR0VOMyhkZXZfcHJpdikJX19JU19HRU4o ZGV2X3ByaXYsIDMpCisjZGVmaW5lIElTX0dFTjQoZGV2X3ByaXYpCV9fSVNfR0VOKGRldl9wcml2 LCA0KQorI2RlZmluZSBJU19HRU41KGRldl9wcml2KQlfX0lTX0dFTihkZXZfcHJpdiwgNSkKKyNk ZWZpbmUgSVNfR0VONihkZXZfcHJpdikJX19JU19HRU4oZGV2X3ByaXYsIDYpCisjZGVmaW5lIElT X0dFTjcoZGV2X3ByaXYpCV9fSVNfR0VOKGRldl9wcml2LCA3KQorI2RlZmluZSBJU19HRU44KGRl dl9wcml2KQlfX0lTX0dFTihkZXZfcHJpdiwgOCkKKyNkZWZpbmUgSVNfR0VOOShkZXZfcHJpdikJ X19JU19HRU4oZGV2X3ByaXYsIDkpCisjZGVmaW5lIElTX0dFTjEwKGRldl9wcml2KQlfX0lTX0dF TihkZXZfcHJpdiwgMTApCisjZGVmaW5lIElTX0dFTjExKGRldl9wcml2KQlfX0lTX0dFTihkZXZf cHJpdiwgMTEpCiAKICNkZWZpbmUgSVNfTFAoZGV2X3ByaXYpCShJTlRFTF9JTkZPKGRldl9wcml2 KS0+aXNfbHApCiAjZGVmaW5lIElTX0dFTjlfTFAoZGV2X3ByaXYpCShJU19HRU45KGRldl9wcml2 KSAmJiBJU19MUChkZXZfcHJpdikpCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9p OTE1X3BjaS5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9wY2kuYwppbmRleCA4ZWIxNmM1 NDY0OGYuLjRmZmY1OTI0OTkzMiAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkx NV9wY2kuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X3BjaS5jCkBAIC0yOSw4ICsy OSw4IEBACiAjaW5jbHVkZSAiaTkxNV9kcnYuaCIKICNpbmNsdWRlICJpOTE1X3NlbGZ0ZXN0Lmgi CiAKLSNkZWZpbmUgUExBVEZPUk0oeCkgLnBsYXRmb3JtID0gKHgpLCAucGxhdGZvcm1fbWFzayA9 IEJJVCh4KQotI2RlZmluZSBHRU4oeCkgLl9fZ2VuID0gKHgpLCAuZ2VuX21hc2sgPSBCSVQoKHgp IC0gMSkKKyNkZWZpbmUgUExBVEZPUk0oeCkgLnBsYXRmb3JtID0gKHgpCisjZGVmaW5lIEdFTih4 KSAuX19nZW4gPSAoeCkKIAogI2RlZmluZSBHRU5fREVGQVVMVF9QSVBFT0ZGU0VUUyBcCiAJLnBp cGVfb2Zmc2V0cyA9IHsgUElQRV9BX09GRlNFVCwgUElQRV9CX09GRlNFVCwgXApkaWZmIC0tZ2l0 IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGV2aWNlX2luZm8uaCBiL2RyaXZlcnMvZ3B1 L2RybS9pOTE1L2ludGVsX2RldmljZV9pbmZvLmgKaW5kZXggOWJhY2Q0NjZmNGEyLi5mOWU1Nzdj Y2Y3NzUgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2RldmljZV9pbmZv LmgKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGV2aWNlX2luZm8uaApAQCAtMTQ4 LDE1ICsxNDgsMTIgQEAgc3RydWN0IHNzZXVfZGV2X2luZm8gewogdHlwZWRlZiB1OCBpbnRlbF9y aW5nX21hc2tfdDsKIAogc3RydWN0IGludGVsX2RldmljZV9pbmZvIHsKLQl1MTYgZ2VuX21hc2s7 Ci0KIAl1OCBfX2dlbjsKIAl1OCBndDsgLyogR1QgbnVtYmVyLCAwIGlmIHVuZGVmaW5lZCAqLwog CWludGVsX3JpbmdfbWFza190IF9fcmluZ19tYXNrOyAvKiBSaW5ncyBzdXBwb3J0ZWQgYnkgdGhl IEhXICovCiAJdTggX19udW1fcGlwZXM7CiAKIAllbnVtIGludGVsX3BsYXRmb3JtIHBsYXRmb3Jt OwotCXUzMiBwbGF0Zm9ybV9tYXNrOwogCiAJZW51bSBpbnRlbF9wcGd0dCBfX3BwZ3R0OwogCXVu c2lnbmVkIGludCBfX3BhZ2Vfc2l6ZXM7IC8qIHBhZ2Ugc2l6ZXMgc3VwcG9ydGVkIGJ5IHRoZSBI VyAqLwpAQCAtMTg4LDExICsxODUsMTQgQEAgc3RydWN0IGludGVsX2RldmljZV9pbmZvIHsKIHN0 cnVjdCBpbnRlbF9ydW50aW1lX2RldmljZV9pbmZvIHsKIAlpbnQgZ2VuOwogCisJdTMyIHBsYXRm b3JtX21hc2s7CisKIAl1bnNpZ25lZCBpbnQgbnVtX3JpbmdzOwogCiAJZW51bSBpbnRlbF9wcGd0 dCBwcGd0dDsKIAl1bnNpZ25lZCBpbnQgcGFnZV9zaXplczsgLyogcGFnZSBzaXplcyBzdXBwb3J0 ZWQgYnkgdGhlIEhXICovCiAKKwl1MTYgZ2VuX21hc2s7CiAJdTE2IGRldmljZV9pZDsKIAogCWlu dGVsX3JpbmdfbWFza190IHJpbmdfbWFzazsgLyogUmluZ3Mgc3VwcG9ydGVkIGJ5IHRoZSBIVyAq LwpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfdW5jb3JlLmMgYi9kcml2 ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF91bmNvcmUuYwppbmRleCBkZWY0OTg0MDJiYmIuLmIyMjZh YWUyMmEwMyAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfdW5jb3JlLmMK KysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfdW5jb3JlLmMKQEAgLTE2ODMsNyArMTY4 Myw3IEBAIGludCBpOTE1X3JlZ19yZWFkX2lvY3RsKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsCiAJ CUdFTV9CVUdfT04oZW50cnktPnNpemUgPiA4KTsKIAkJR0VNX0JVR19PTihlbnRyeV9vZmZzZXQg JiAoZW50cnktPnNpemUgLSAxKSk7CiAKLQkJaWYgKElOVEVMX0lORk8oZGV2X3ByaXYpLT5nZW5f bWFzayAmIGVudHJ5LT5nZW5fbWFzayAmJgorCQlpZiAoZGV2X3ByaXYtPnJ1bnRpbWVfaW5mby5n ZW5fbWFzayAmIGVudHJ5LT5nZW5fbWFzayAmJgogCQkgICAgZW50cnlfb2Zmc2V0ID09IChyZWct Pm9mZnNldCAmIC1lbnRyeS0+c2l6ZSkpCiAJCQlicmVhazsKIAkJZW50cnkrKzsKLS0gCjIuMTku MQoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KSW50ZWwt Z2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8v bGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4Cg==