From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ville Syrjala Subject: [PATCH 1/2] drm/i915: Turn dram_info.num_channels into a bitmask Date: Wed, 20 Mar 2019 23:46:34 +0200 Message-ID: <20190320214635.27814-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 mga14.intel.com (mga14.intel.com [192.55.52.115]) by gabe.freedesktop.org (Postfix) with ESMTPS id 9735389D5F for ; Wed, 20 Mar 2019 21:46:38 +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 List-Id: intel-gfx@lists.freedesktop.org RnJvbTogVmlsbGUgU3lyasOkbMOkIDx2aWxsZS5zeXJqYWxhQGxpbnV4LmludGVsLmNvbT4KCldl IHdhbnQgdG8ga25vdyBvdXQgd2hpY2ggY2hhbm5lbHMgYXJlIGFjdHVhbGx5IG9jY3VwaWVkIHNv IHRoYXQKbGF0ZXIgb24gd2UgY2FuIHJlYWQgdGhlIG1lbW9yeSB0aW1pbmdzIGZyb20gdGhlIHJp Z2h0IHJlZ2lzdGVycy4KVG8gdGhhdCBlbmQgY29udmVydCBudW1fY2hhbm5lbHMgaW50byBhIGJp dG1hc2suCgpTaWduZWQtb2ZmLWJ5OiBWaWxsZSBTeXJqw6Rsw6QgPHZpbGxlLnN5cmphbGFAbGlu dXguaW50ZWwuY29tPgotLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmMgfCAyOCAr KysrKysrKysrKysrKystLS0tLS0tLS0tLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Ry di5oIHwgIDIgKy0KIDIgZmlsZXMgY2hhbmdlZCwgMTYgaW5zZXJ0aW9ucygrKSwgMTQgZGVsZXRp b25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuYyBiL2Ry aXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmMKaW5kZXggOWUzODBjZDMxN2RjLi44YjM3ZWMw ZTA2NzYgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmMKKysrIGIv ZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuYwpAQCAtMTIwOSwxNCArMTIwOSwxNCBAQCBz a2xfZHJhbV9nZXRfY2hhbm5lbHNfaW5mbyhzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3By aXYpCiAJdmFsID0gSTkxNV9SRUFEKFNLTF9NQURfRElNTV9DSDBfMF8wXzBfTUNIQkFSX01DTUFJ Tik7CiAJcmV0ID0gc2tsX2RyYW1fZ2V0X2NoYW5uZWxfaW5mbyhkZXZfcHJpdiwgJmNoMCwgMCwg dmFsKTsKIAlpZiAocmV0ID09IDApCi0JCWRyYW1faW5mby0+bnVtX2NoYW5uZWxzKys7CisJCWRy YW1faW5mby0+Y2hhbm5lbHMgfD0gQklUKDApOwogCiAJdmFsID0gSTkxNV9SRUFEKFNLTF9NQURf RElNTV9DSDFfMF8wXzBfTUNIQkFSX01DTUFJTik7CiAJcmV0ID0gc2tsX2RyYW1fZ2V0X2NoYW5u ZWxfaW5mbyhkZXZfcHJpdiwgJmNoMSwgMSwgdmFsKTsKIAlpZiAocmV0ID09IDApCi0JCWRyYW1f aW5mby0+bnVtX2NoYW5uZWxzKys7CisJCWRyYW1faW5mby0+Y2hhbm5lbHMgfD0gQklUKDEpOwog Ci0JaWYgKGRyYW1faW5mby0+bnVtX2NoYW5uZWxzID09IDApIHsKKwlpZiAoZHJhbV9pbmZvLT5j aGFubmVscyA9PSAwKSB7CiAJCURSTV9JTkZPKCJOdW1iZXIgb2YgbWVtb3J5IGNoYW5uZWxzIGlz IHplcm9cbiIpOwogCQlyZXR1cm4gLUVJTlZBTDsKIAl9CkBAIC0xMjg1LDggKzEyODUsOCBAQCBz a2xfZ2V0X2RyYW1faW5mbyhzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpCiAJbWVt X2ZyZXFfa2h6ID0gRElWX1JPVU5EX1VQKCh2YWwgJiBTS0xfUkVRX0RBVEFfTUFTSykgKgogCQkJ CSAgICBTS0xfTUVNT1JZX0ZSRVFfTVVMVElQTElFUl9IWiwgMTAwMCk7CiAKLQlkcmFtX2luZm8t PmJhbmR3aWR0aF9rYnBzID0gZHJhbV9pbmZvLT5udW1fY2hhbm5lbHMgKgotCQkJCQkJCW1lbV9m cmVxX2toeiAqIDg7CisJZHJhbV9pbmZvLT5iYW5kd2lkdGhfa2JwcyA9IG1lbV9mcmVxX2toeiAq CisJCWh3ZWlnaHQ4KGRyYW1faW5mby0+Y2hhbm5lbHMpICogODsKIAogCWlmIChkcmFtX2luZm8t PmJhbmR3aWR0aF9rYnBzID09IDApIHsKIAkJRFJNX0lORk8oIkNvdWxkbid0IGdldCBzeXN0ZW0g bWVtb3J5IGJhbmR3aWR0aFxuIik7CkBAIC0xMzgwLDIwICsxMzgwLDIwIEBAIHN0YXRpYyBpbnQK IGJ4dF9nZXRfZHJhbV9pbmZvKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdikKIHsK IAlzdHJ1Y3QgZHJhbV9pbmZvICpkcmFtX2luZm8gPSAmZGV2X3ByaXYtPmRyYW1faW5mbzsKLQl1 MzIgZHJhbV9jaGFubmVsczsKIAl1MzIgbWVtX2ZyZXFfa2h6LCB2YWw7Ci0JdTggbnVtX2FjdGl2 ZV9jaGFubmVsczsKKwl1OCBudW1fY2hhbm5lbHMgPSAwOwogCWludCBpOwogCiAJdmFsID0gSTkx NV9SRUFEKEJYVF9QX0NSX01DX0JJT1NfUkVRXzBfMF8wKTsKIAltZW1fZnJlcV9raHogPSBESVZf Uk9VTkRfVVAoKHZhbCAmIEJYVF9SRVFfREFUQV9NQVNLKSAqCiAJCQkJICAgIEJYVF9NRU1PUllf RlJFUV9NVUxUSVBMSUVSX0haLCAxMDAwKTsKIAotCWRyYW1fY2hhbm5lbHMgPSB2YWwgJiBCWFRf RFJBTV9DSEFOTkVMX0FDVElWRV9NQVNLOwotCW51bV9hY3RpdmVfY2hhbm5lbHMgPSBod2VpZ2h0 MzIoZHJhbV9jaGFubmVscyk7CisJZHJhbV9pbmZvLT5jaGFubmVscyA9ICh2YWwgJiBCWFRfRFJB TV9DSEFOTkVMX0FDVElWRV9NQVNLKSA+PgorCQlCWFRfRFJBTV9DSEFOTkVMX0FDVElWRV9TSElG VDsKIAogCS8qIEVhY2ggYWN0aXZlIGJpdCByZXByZXNlbnRzIDQtYnl0ZSBjaGFubmVsICovCi0J ZHJhbV9pbmZvLT5iYW5kd2lkdGhfa2JwcyA9IChtZW1fZnJlcV9raHogKiBudW1fYWN0aXZlX2No YW5uZWxzICogNCk7CisJZHJhbV9pbmZvLT5iYW5kd2lkdGhfa2JwcyA9IG1lbV9mcmVxX2toeiAq CisJCWh3ZWlnaHQ4KGRyYW1faW5mby0+Y2hhbm5lbHMpICogNDsKIAogCWlmIChkcmFtX2luZm8t PmJhbmR3aWR0aF9rYnBzID09IDApIHsKIAkJRFJNX0lORk8oIkNvdWxkbid0IGdldCBzeXN0ZW0g bWVtb3J5IGJhbmR3aWR0aFxuIik7CkBAIC0xNDExLDcgKzE0MTEsNyBAQCBieHRfZ2V0X2RyYW1f aW5mbyhzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpCiAJCWlmICh2YWwgPT0gMHhG RkZGRkZGRikKIAkJCWNvbnRpbnVlOwogCi0JCWRyYW1faW5mby0+bnVtX2NoYW5uZWxzKys7CisJ CW51bV9jaGFubmVscysrOwogCiAJCWJ4dF9nZXRfZGltbV9pbmZvKCZkaW1tLCB2YWwpOwogCQl0 eXBlID0gYnh0X2dldF9kaW1tX3R5cGUodmFsKTsKQEAgLTE0MzksNiArMTQzOSw4IEBAIGJ4dF9n ZXRfZHJhbV9pbmZvKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdikKIAkJCWRyYW1f aW5mby0+dHlwZSA9IHR5cGU7CiAJfQogCisJV0FSTl9PTihudW1fY2hhbm5lbHMgIT0gaHdlaWdo dDgoZHJhbV9pbmZvLT5jaGFubmVscykpOworCiAJaWYgKGRyYW1faW5mby0+dHlwZSA9PSBJTlRF TF9EUkFNX1VOS05PV04gfHwKIAkgICAgZHJhbV9pbmZvLT5yYW5rcyA9PSAwKSB7CiAJCURSTV9J TkZPKCJjb3VsZG4ndCBnZXQgbWVtb3J5IGluZm9ybWF0aW9uXG4iKTsKQEAgLTE0NzIsOSArMTQ3 NCw5IEBAIGludGVsX2dldF9kcmFtX2luZm8oc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9w cml2KQogCWlmIChyZXQpCiAJCXJldHVybjsKIAotCURSTV9ERUJVR19LTVMoIkRSQU0gYmFuZHdp ZHRoOiAldSBrQnBzLCBjaGFubmVsczogJXVcbiIsCisJRFJNX0RFQlVHX0tNUygiRFJBTSBiYW5k d2lkdGg6ICV1IGtCcHMsIGNoYW5uZWxzOiAweCV4XG4iLAogCQkgICAgICBkcmFtX2luZm8tPmJh bmR3aWR0aF9rYnBzLAotCQkgICAgICBkcmFtX2luZm8tPm51bV9jaGFubmVscyk7CisJCSAgICAg IGRyYW1faW5mby0+Y2hhbm5lbHMpOwogCiAJRFJNX0RFQlVHX0tNUygiRFJBTSByYW5rczogJXUs IDE2R2IgRElNTXM6ICVzXG4iLAogCQkgICAgICBkcmFtX2luZm8tPnJhbmtzLCB5ZXNubyhkcmFt X2luZm8tPmlzXzE2Z2JfZGltbSkpOwpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUv aTkxNV9kcnYuaCBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmgKaW5kZXggMzYzYjJk M2U0ZDUwLi5mNjM4YzBjNzQ5NTUgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5 MTVfZHJ2LmgKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuaApAQCAtMTgzMiw3 ICsxODMyLDcgQEAgc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgewogCXN0cnVjdCBkcmFtX2luZm8g ewogCQlib29sIHZhbGlkOwogCQlib29sIGlzXzE2Z2JfZGltbTsKLQkJdTggbnVtX2NoYW5uZWxz OworCQl1OCBjaGFubmVsczsgLyogYml0bWFzayAqLwogCQl1OCByYW5rczsKIAkJdTMyIGJhbmR3 aWR0aF9rYnBzOwogCQlib29sIHN5bW1ldHJpY19tZW1vcnk7Ci0tIAoyLjE5LjIKCl9fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCkludGVsLWdmeCBtYWlsaW5n IGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVk ZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeA==