From mboxrd@z Thu Jan 1 00:00:00 1970 From: Stuart Summers Subject: [PATCH 05/11] drm/i915: Use local variables for subslice_mask for device info Date: Tue, 20 Aug 2019 16:05:38 -0700 Message-ID: <20190820230544.170010-6-stuart.summers@intel.com> References: <20190820230544.170010-1-stuart.summers@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by gabe.freedesktop.org (Postfix) with ESMTPS id 4C2826E8A0 for ; Tue, 20 Aug 2019 23:04:54 +0000 (UTC) In-Reply-To: <20190820230544.170010-1-stuart.summers@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 V2hlbiBzZXR0aW5nIHVwIHN1YnNsaWNlX21hc2ssIGluc3RlYWQgb2Ygb3BlcmF0aW5nIG9uIHRo ZSBzbGljZQphcnJheSBkaXJlY3RseSwgdXNlIGEgbG9jYWwgdmFyaWFibGUgdG8gc3RhcnQgYml0 cyBwZXIgc2xpY2UsIHRoZW4KdXNlIHRoaXMgdG8gc2V0IHRoZSBwZXIgc2xpY2UgYXJyYXkgaW4g b25lIHN0ZXAuCgpTaWduZWQtb2ZmLWJ5OiBTdHVhcnQgU3VtbWVycyA8c3R1YXJ0LnN1bW1lcnNA aW50ZWwuY29tPgotLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2RldmljZV9pbmZvLmMg fCA0OSArKysrKysrKysrKysrLS0tLS0tLS0tLS0KIDEgZmlsZSBjaGFuZ2VkLCAyNiBpbnNlcnRp b25zKCspLCAyMyBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkx NS9pbnRlbF9kZXZpY2VfaW5mby5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGV2aWNl X2luZm8uYwppbmRleCBiMWE3OWVkNDA4ZWIuLjUyNTE1ZWZlOWY0ZSAxMDA2NDQKLS0tIGEvZHJp dmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGV2aWNlX2luZm8uYworKysgYi9kcml2ZXJzL2dwdS9k cm0vaTkxNS9pbnRlbF9kZXZpY2VfaW5mby5jCkBAIC0yMzUsMTggKzIzNSw2IEBAIHN0YXRpYyB2 b2lkIGdlbjEwX3NzZXVfaW5mb19pbml0KHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJp dikKIAlzc2V1LT5zbGljZV9tYXNrID0gKGZ1c2UyICYgR0VOMTBfRjJfU19FTkFfTUFTSykgPj4K IAkJCSAgICBHRU4xMF9GMl9TX0VOQV9TSElGVDsKIAotCXN1YnNsaWNlX21hc2sgPSAoMSA8PCA0 KSAtIDE7Ci0Jc3Vic2xpY2VfbWFzayAmPSB+KChmdXNlMiAmIEdFTjEwX0YyX1NTX0RJU19NQVNL KSA+PgotCQkJICAgR0VOMTBfRjJfU1NfRElTX1NISUZUKTsKLQotCS8qCi0JICogU2xpY2UwIGNh biBoYXZlIHVwIHRvIDMgc3Vic2xpY2VzLCBidXQgdGhlcmUgYXJlIG9ubHkgMiBpbgotCSAqIHNs aWNlMS8yLgotCSAqLwotCXNzZXUtPnN1YnNsaWNlX21hc2tbMF0gPSBzdWJzbGljZV9tYXNrOwot CWZvciAocyA9IDE7IHMgPCBzc2V1LT5tYXhfc2xpY2VzOyBzKyspCi0JCXNzZXUtPnN1YnNsaWNl X21hc2tbc10gPSBzdWJzbGljZV9tYXNrICYgMHgzOwotCiAJLyogU2xpY2UwICovCiAJZXVfZW4g PSB+STkxNV9SRUFEKEdFTjhfRVVfRElTQUJMRTApOwogCWZvciAoc3MgPSAwOyBzcyA8IHNzZXUt Pm1heF9zdWJzbGljZXM7IHNzKyspCkBAIC0yNzAsMTQgKzI1OCwyNCBAQCBzdGF0aWMgdm9pZCBn ZW4xMF9zc2V1X2luZm9faW5pdChzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpCiAJ ZXVfZW4gPSB+STkxNV9SRUFEKEdFTjEwX0VVX0RJU0FCTEUzKTsKIAlzc2V1X3NldF9ldXMoc3Nl dSwgNSwgMSwgZXVfZW4gJiBldV9tYXNrKTsKIAotCS8qIERvIGEgc2Vjb25kIHBhc3Mgd2hlcmUg d2UgbWFyayB0aGUgc3Vic2xpY2VzIGRpc2FibGVkIGlmIGFsbCB0aGVpcgotCSAqIGV1cyBhcmUg b2ZmLgotCSAqLworCXN1YnNsaWNlX21hc2sgPSAoMSA8PCA0KSAtIDE7CisJc3Vic2xpY2VfbWFz ayAmPSB+KChmdXNlMiAmIEdFTjEwX0YyX1NTX0RJU19NQVNLKSA+PgorCQkJICAgR0VOMTBfRjJf U1NfRElTX1NISUZUKTsKKwogCWZvciAocyA9IDA7IHMgPCBzc2V1LT5tYXhfc2xpY2VzOyBzKysp IHsKKwkJdTMyIHN1YnNsaWNlX21hc2tfd2l0aF9ldXMgPSBzdWJzbGljZV9tYXNrOworCiAJCWZv ciAoc3MgPSAwOyBzcyA8IHNzZXUtPm1heF9zdWJzbGljZXM7IHNzKyspIHsKIAkJCWlmIChzc2V1 X2dldF9ldXMoc3NldSwgcywgc3MpID09IDApCi0JCQkJc3NldS0+c3Vic2xpY2VfbWFza1tzXSAm PSB+QklUKHNzKTsKKwkJCQlzdWJzbGljZV9tYXNrX3dpdGhfZXVzICY9IH5CSVQoc3MpOwogCQl9 CisKKwkJLyoKKwkJICogU2xpY2UwIGNhbiBoYXZlIHVwIHRvIDMgc3Vic2xpY2VzLCBidXQgdGhl cmUgYXJlIG9ubHkgMiBpbgorCQkgKiBzbGljZTEvMi4KKwkJICovCisJCXNzZXUtPnN1YnNsaWNl X21hc2tbc10gPSBzID09IDAgPyBzdWJzbGljZV9tYXNrX3dpdGhfZXVzIDoKKwkJCQkJCSAgc3Vi c2xpY2VfbWFza193aXRoX2V1cyAmIDB4MzsKIAl9CiAKIAlzc2V1LT5ldV90b3RhbCA9IGNvbXB1 dGVfZXVfdG90YWwoc3NldSk7CkBAIC0zMDMsNiArMzAxLDcgQEAgc3RhdGljIHZvaWQgY2hlcnJ5 dmlld19zc2V1X2luZm9faW5pdChzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpCiB7 CiAJc3RydWN0IHNzZXVfZGV2X2luZm8gKnNzZXUgPSAmUlVOVElNRV9JTkZPKGRldl9wcml2KS0+ c3NldTsKIAl1MzIgZnVzZTsKKwl1OCBzdWJzbGljZV9tYXNrID0gMDsKIAogCWZ1c2UgPSBJOTE1 X1JFQUQoQ0hWX0ZVU0VfR1QpOwogCkBAIC0zMTYsNyArMzE1LDcgQEAgc3RhdGljIHZvaWQgY2hl cnJ5dmlld19zc2V1X2luZm9faW5pdChzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYp CiAJCQkoKChmdXNlICYgQ0hWX0ZHVF9FVV9ESVNfU1MwX1IxX01BU0spID4+CiAJCQkgIENIVl9G R1RfRVVfRElTX1NTMF9SMV9TSElGVCkgPDwgNCk7CiAKLQkJc3NldS0+c3Vic2xpY2VfbWFza1sw XSB8PSBCSVQoMCk7CisJCXN1YnNsaWNlX21hc2sgfD0gQklUKDApOwogCQlzc2V1X3NldF9ldXMo c3NldSwgMCwgMCwgfmRpc2FibGVkX21hc2spOwogCX0KIApAQCAtMzI3LDEwICszMjYsMTIgQEAg c3RhdGljIHZvaWQgY2hlcnJ5dmlld19zc2V1X2luZm9faW5pdChzdHJ1Y3QgZHJtX2k5MTVfcHJp dmF0ZSAqZGV2X3ByaXYpCiAJCQkoKChmdXNlICYgQ0hWX0ZHVF9FVV9ESVNfU1MxX1IxX01BU0sp ID4+CiAJCQkgIENIVl9GR1RfRVVfRElTX1NTMV9SMV9TSElGVCkgPDwgNCk7CiAKLQkJc3NldS0+ c3Vic2xpY2VfbWFza1swXSB8PSBCSVQoMSk7CisJCXN1YnNsaWNlX21hc2sgfD0gQklUKDEpOwog CQlzc2V1X3NldF9ldXMoc3NldSwgMCwgMSwgfmRpc2FibGVkX21hc2spOwogCX0KIAorCXNzZXUt PnN1YnNsaWNlX21hc2tbMF0gPSBzdWJzbGljZV9tYXNrOworCiAJc3NldS0+ZXVfdG90YWwgPSBj b21wdXRlX2V1X3RvdGFsKHNzZXUpOwogCiAJLyoKQEAgLTU0MCw2ICs1NDEsNyBAQCBzdGF0aWMg dm9pZCBoYXN3ZWxsX3NzZXVfaW5mb19pbml0KHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZf cHJpdikKIHsKIAlzdHJ1Y3Qgc3NldV9kZXZfaW5mbyAqc3NldSA9ICZSVU5USU1FX0lORk8oZGV2 X3ByaXYpLT5zc2V1OwogCXUzMiBmdXNlMTsKKwl1OCBzdWJzbGljZV9tYXNrID0gMDsKIAlpbnQg cywgc3M7CiAKIAkvKgpAQCAtNTUyLDE2ICs1NTQsMTUgQEAgc3RhdGljIHZvaWQgaGFzd2VsbF9z c2V1X2luZm9faW5pdChzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpCiAJCS8qIGZh bGwgdGhyb3VnaCAqLwogCWNhc2UgMToKIAkJc3NldS0+c2xpY2VfbWFzayA9IEJJVCgwKTsKLQkJ c3NldS0+c3Vic2xpY2VfbWFza1swXSA9IEJJVCgwKTsKKwkJc3Vic2xpY2VfbWFzayA9IEJJVCgw KTsKIAkJYnJlYWs7CiAJY2FzZSAyOgogCQlzc2V1LT5zbGljZV9tYXNrID0gQklUKDApOwotCQlz c2V1LT5zdWJzbGljZV9tYXNrWzBdID0gQklUKDApIHwgQklUKDEpOworCQlzdWJzbGljZV9tYXNr ID0gQklUKDApIHwgQklUKDEpOwogCQlicmVhazsKIAljYXNlIDM6CiAJCXNzZXUtPnNsaWNlX21h c2sgPSBCSVQoMCkgfCBCSVQoMSk7Ci0JCXNzZXUtPnN1YnNsaWNlX21hc2tbMF0gPSBCSVQoMCkg fCBCSVQoMSk7Ci0JCXNzZXUtPnN1YnNsaWNlX21hc2tbMV0gPSBCSVQoMCkgfCBCSVQoMSk7CisJ CXN1YnNsaWNlX21hc2sgPSBCSVQoMCkgfCBCSVQoMSk7CiAJCWJyZWFrOwogCX0KIApAQCAtNTgz LDEwICs1ODQsMTIgQEAgc3RhdGljIHZvaWQgaGFzd2VsbF9zc2V1X2luZm9faW5pdChzdHJ1Y3Qg ZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpCiAJfQogCiAJaW50ZWxfc3NldV9zZXRfaW5mbyhz c2V1LCBod2VpZ2h0OChzc2V1LT5zbGljZV9tYXNrKSwKLQkJCSAgICBod2VpZ2h0OChzc2V1LT5z dWJzbGljZV9tYXNrWzBdKSwKKwkJCSAgICBod2VpZ2h0OChzdWJzbGljZV9tYXNrKSwKIAkJCSAg ICBzc2V1LT5ldV9wZXJfc3Vic2xpY2UpOwogCiAJZm9yIChzID0gMDsgcyA8IHNzZXUtPm1heF9z bGljZXM7IHMrKykgeworCQlzc2V1LT5zdWJzbGljZV9tYXNrW3NdID0gc3Vic2xpY2VfbWFzazsK KwogCQlmb3IgKHNzID0gMDsgc3MgPCBzc2V1LT5tYXhfc3Vic2xpY2VzOyBzcysrKSB7CiAJCQlz c2V1X3NldF9ldXMoc3NldSwgcywgc3MsCiAJCQkJICAgICAoMVVMIDw8IHNzZXUtPmV1X3Blcl9z dWJzbGljZSkgLSAxKTsKLS0gCjIuMjIuMAoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMu ZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlz dGluZm8vaW50ZWwtZ2Z4