From mboxrd@z Thu Jan 1 00:00:00 1970 From: Wayne Boyer Subject: [PATCH] drm/i915: Clean up device info structure definitions Date: Wed, 2 Dec 2015 13:28:14 -0800 Message-ID: <1449091694-7681-1-git-send-email-wayne.boyer@intel.com> References: <87k2ox2flz.fsf@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 ESMTP id AEB096EAEA for ; Wed, 2 Dec 2015 13:28:28 -0800 (PST) In-Reply-To: <87k2ox2flz.fsf@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: Rodrigo Vivi List-Id: intel-gfx@lists.freedesktop.org QmVnaW5uaW5nIHdpdGggZ2VuNywgbmV3ZXIgZGV2aWNlcyByZXBldGl0aXZlbHkgcmVkZWZpbmUg dmFsdWVzCmZvciB0aGUgZGV2aWNlIGluZm8gc3RydWN0dXJlIG1lbWJlcnMuICBUaGlzIHBhdGNo IHNpbXBsaWZpZXMgdGhlCnN0cnVjdHVyZSBkZWZpbml0aW9ucyBieSBncm91cGluZyBtZW1iZXIg dmFsdWUgZGVmaW5pdGlvbnMgaW50byB0aGUKZXhpc3RpbmcgR0VON19GRUFUVVJFUyAjZGVmaW5l IGFuZCBpbnRvIHRoZSBuZXcgR0VON19MUF9GRUFUVVJFUwphbmQgSFNXX0ZFQVRVUkVTICNkZWZp bmVzLgoKU3BlY2lmaWNhbGx5LCBHRU5fREVGQVVMVF9QSVBFT0ZGU0VUUyBhbmQgSVZCX0NVUlNP Ul9PRkZTRVRTIGFyZQphZGRlZCB0byBHRU43X0ZFQVRVUkVTIGFuZCBzdWJzZXF1ZW50IElWQiBk ZWZpbml0aW9ucyBhcmUgc2ltcGxpZmllZC4KClZMVl9GRUFUVVJFUyBpcyBkZWZpbmVkIHRvIGRp ZmZlcmVudGlhdGUgYW5kIHNpbXBsaWZ5IHRoZQpnZW43IGxvdyBwb3dlciAoTFApIGRldmljZXMu CgpIU1dfRkVBVFVSRVMgaXMgZGVmaW5lZCBhbmQgdXNlZCB0byBzaW1wbGlmeSBhbGwgSFNXKyBk ZXZpY2VzCmV4Y2VwdCBmb3IgTFAuCgp2MjogVXNlIFZMVl9GRUFUVVJFUyBmb3IgdGhlIGdlbjcg bG93IHBvd2VyIGRldmljZXMuIChKYW5pKQoKQ2M6IFJvZHJpZ28gVml2aSA8cm9kcmlnby52aXZp QGludGVsLmNvbT4KU2lnbmVkLW9mZi1ieTogV2F5bmUgQm95ZXIgPHdheW5lLmJveWVyQGludGVs LmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5jIHwgMTM3ICsrKysrKysr KystLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0KIDEgZmlsZSBjaGFuZ2VkLCAzNSBpbnNl cnRpb25zKCspLCAxMDIgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJt L2k5MTUvaTkxNV9kcnYuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmMKaW5kZXgg OTBmYWE4ZS4uZDJkN2UyNCAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9k cnYuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5jCkBAIC0yMjYsMTI1ICsy MjYsODcgQEAgc3RhdGljIGNvbnN0IHN0cnVjdCBpbnRlbF9kZXZpY2VfaW5mbyBpbnRlbF9zYW5k eWJyaWRnZV9tX2luZm8gPSB7CiAjZGVmaW5lIEdFTjdfRkVBVFVSRVMgIFwKIAkuZ2VuID0gNywg Lm51bV9waXBlcyA9IDMsIFwKIAkubmVlZF9nZnhfaHdzID0gMSwgLmhhc19ob3RwbHVnID0gMSwg XAogCS5oYXNfZmJjID0gMSwgXAogCS5yaW5nX21hc2sgPSBSRU5ERVJfUklORyB8IEJTRF9SSU5H IHwgQkxUX1JJTkcsIFwKLQkuaGFzX2xsYyA9IDEKKwkuaGFzX2xsYyA9IDEsIFwKKwlHRU5fREVG QVVMVF9QSVBFT0ZGU0VUUywgXAorCUlWQl9DVVJTT1JfT0ZGU0VUUwogCiBzdGF0aWMgY29uc3Qg c3RydWN0IGludGVsX2RldmljZV9pbmZvIGludGVsX2l2eWJyaWRnZV9kX2luZm8gPSB7CiAJR0VO N19GRUFUVVJFUywKIAkuaXNfaXZ5YnJpZGdlID0gMSwKLQlHRU5fREVGQVVMVF9QSVBFT0ZGU0VU UywKLQlJVkJfQ1VSU09SX09GRlNFVFMsCiB9OwogCiBzdGF0aWMgY29uc3Qgc3RydWN0IGludGVs X2RldmljZV9pbmZvIGludGVsX2l2eWJyaWRnZV9tX2luZm8gPSB7CiAJR0VON19GRUFUVVJFUywK IAkuaXNfaXZ5YnJpZGdlID0gMSwKIAkuaXNfbW9iaWxlID0gMSwKLQlHRU5fREVGQVVMVF9QSVBF T0ZGU0VUUywKLQlJVkJfQ1VSU09SX09GRlNFVFMsCiB9OwogCiBzdGF0aWMgY29uc3Qgc3RydWN0 IGludGVsX2RldmljZV9pbmZvIGludGVsX2l2eWJyaWRnZV9xX2luZm8gPSB7CiAJR0VON19GRUFU VVJFUywKIAkuaXNfaXZ5YnJpZGdlID0gMSwKIAkubnVtX3BpcGVzID0gMCwgLyogbGVnYWwsIGxh c3Qgb25lIHdpbnMgKi8KLQlHRU5fREVGQVVMVF9QSVBFT0ZGU0VUUywKLQlJVkJfQ1VSU09SX09G RlNFVFMsCiB9OwogCisjZGVmaW5lIFZMVl9GRUFUVVJFUyAgXAorCS5nZW4gPSA3LCAubnVtX3Bp cGVzID0gMiwgXAorCS5uZWVkX2dmeF9od3MgPSAxLCAuaGFzX2hvdHBsdWcgPSAxLCBcCisJLnJp bmdfbWFzayA9IFJFTkRFUl9SSU5HIHwgQlNEX1JJTkcgfCBCTFRfUklORywgXAorCS5kaXNwbGF5 X21taW9fb2Zmc2V0ID0gVkxWX0RJU1BMQVlfQkFTRSwgXAorCUdFTl9ERUZBVUxUX1BJUEVPRkZT RVRTLCBcCisJQ1VSU09SX09GRlNFVFMKKwogc3RhdGljIGNvbnN0IHN0cnVjdCBpbnRlbF9kZXZp Y2VfaW5mbyBpbnRlbF92YWxsZXl2aWV3X21faW5mbyA9IHsKLQlHRU43X0ZFQVRVUkVTLAotCS5p c19tb2JpbGUgPSAxLAotCS5udW1fcGlwZXMgPSAyLAorCVZMVl9GRUFUVVJFUywKIAkuaXNfdmFs bGV5dmlldyA9IDEsCi0JLmRpc3BsYXlfbW1pb19vZmZzZXQgPSBWTFZfRElTUExBWV9CQVNFLAot CS5oYXNfZmJjID0gMCwgLyogbGVnYWwsIGxhc3Qgb25lIHdpbnMgKi8KLQkuaGFzX2xsYyA9IDAs IC8qIGxlZ2FsLCBsYXN0IG9uZSB3aW5zICovCi0JR0VOX0RFRkFVTFRfUElQRU9GRlNFVFMsCi0J Q1VSU09SX09GRlNFVFMsCisJLmlzX21vYmlsZSA9IDEsCiB9OwogCiBzdGF0aWMgY29uc3Qgc3Ry dWN0IGludGVsX2RldmljZV9pbmZvIGludGVsX3ZhbGxleXZpZXdfZF9pbmZvID0gewotCUdFTjdf RkVBVFVSRVMsCi0JLm51bV9waXBlcyA9IDIsCisJVkxWX0ZFQVRVUkVTLAogCS5pc192YWxsZXl2 aWV3ID0gMSwKLQkuZGlzcGxheV9tbWlvX29mZnNldCA9IFZMVl9ESVNQTEFZX0JBU0UsCi0JLmhh c19mYmMgPSAwLCAvKiBsZWdhbCwgbGFzdCBvbmUgd2lucyAqLwotCS5oYXNfbGxjID0gMCwgLyog bGVnYWwsIGxhc3Qgb25lIHdpbnMgKi8KLQlHRU5fREVGQVVMVF9QSVBFT0ZGU0VUUywKLQlDVVJT T1JfT0ZGU0VUUywKIH07CiAKKyNkZWZpbmUgSFNXX0ZFQVRVUkVTICBcCisJR0VON19GRUFUVVJF UywgXAorCS5yaW5nX21hc2sgPSBSRU5ERVJfUklORyB8IEJTRF9SSU5HIHwgQkxUX1JJTkcgfCBW RUJPWF9SSU5HLCBcCisJLmhhc19kZGkgPSAxLCBcCisJLmhhc19mcGdhX2RiZyA9IDEKKwogc3Rh dGljIGNvbnN0IHN0cnVjdCBpbnRlbF9kZXZpY2VfaW5mbyBpbnRlbF9oYXN3ZWxsX2RfaW5mbyA9 IHsKLQlHRU43X0ZFQVRVUkVTLAorCUhTV19GRUFUVVJFUywKIAkuaXNfaGFzd2VsbCA9IDEsCi0J Lmhhc19kZGkgPSAxLAotCS5oYXNfZnBnYV9kYmcgPSAxLAotCS5yaW5nX21hc2sgPSBSRU5ERVJf UklORyB8IEJTRF9SSU5HIHwgQkxUX1JJTkcgfCBWRUJPWF9SSU5HLAotCUdFTl9ERUZBVUxUX1BJ UEVPRkZTRVRTLAotCUlWQl9DVVJTT1JfT0ZGU0VUUywKIH07CiAKIHN0YXRpYyBjb25zdCBzdHJ1 Y3QgaW50ZWxfZGV2aWNlX2luZm8gaW50ZWxfaGFzd2VsbF9tX2luZm8gPSB7Ci0JR0VON19GRUFU VVJFUywKKwlIU1dfRkVBVFVSRVMsCiAJLmlzX2hhc3dlbGwgPSAxLAogCS5pc19tb2JpbGUgPSAx LAotCS5oYXNfZGRpID0gMSwKLQkuaGFzX2ZwZ2FfZGJnID0gMSwKLQkucmluZ19tYXNrID0gUkVO REVSX1JJTkcgfCBCU0RfUklORyB8IEJMVF9SSU5HIHwgVkVCT1hfUklORywKLQlHRU5fREVGQVVM VF9QSVBFT0ZGU0VUUywKLQlJVkJfQ1VSU09SX09GRlNFVFMsCiB9OwogCiBzdGF0aWMgY29uc3Qg c3RydWN0IGludGVsX2RldmljZV9pbmZvIGludGVsX2Jyb2Fkd2VsbF9kX2luZm8gPSB7Ci0JLmdl biA9IDgsIC5udW1fcGlwZXMgPSAzLAotCS5uZWVkX2dmeF9od3MgPSAxLCAuaGFzX2hvdHBsdWcg PSAxLAotCS5yaW5nX21hc2sgPSBSRU5ERVJfUklORyB8IEJTRF9SSU5HIHwgQkxUX1JJTkcgfCBW RUJPWF9SSU5HLAotCS5oYXNfbGxjID0gMSwKLQkuaGFzX2RkaSA9IDEsCi0JLmhhc19mcGdhX2Ri ZyA9IDEsCi0JLmhhc19mYmMgPSAxLAotCUdFTl9ERUZBVUxUX1BJUEVPRkZTRVRTLAotCUlWQl9D VVJTT1JfT0ZGU0VUUywKKwlIU1dfRkVBVFVSRVMsCisJLmdlbiA9IDgsCiB9OwogCiBzdGF0aWMg Y29uc3Qgc3RydWN0IGludGVsX2RldmljZV9pbmZvIGludGVsX2Jyb2Fkd2VsbF9tX2luZm8gPSB7 Ci0JLmdlbiA9IDgsIC5pc19tb2JpbGUgPSAxLCAubnVtX3BpcGVzID0gMywKLQkubmVlZF9nZnhf aHdzID0gMSwgLmhhc19ob3RwbHVnID0gMSwKLQkucmluZ19tYXNrID0gUkVOREVSX1JJTkcgfCBC U0RfUklORyB8IEJMVF9SSU5HIHwgVkVCT1hfUklORywKLQkuaGFzX2xsYyA9IDEsCi0JLmhhc19k ZGkgPSAxLAotCS5oYXNfZnBnYV9kYmcgPSAxLAotCS5oYXNfZmJjID0gMSwKLQlHRU5fREVGQVVM VF9QSVBFT0ZGU0VUUywKLQlJVkJfQ1VSU09SX09GRlNFVFMsCisJSFNXX0ZFQVRVUkVTLAorCS5n ZW4gPSA4LCAuaXNfbW9iaWxlID0gMSwKIH07CiAKIHN0YXRpYyBjb25zdCBzdHJ1Y3QgaW50ZWxf ZGV2aWNlX2luZm8gaW50ZWxfYnJvYWR3ZWxsX2d0M2RfaW5mbyA9IHsKLQkuZ2VuID0gOCwgLm51 bV9waXBlcyA9IDMsCi0JLm5lZWRfZ2Z4X2h3cyA9IDEsIC5oYXNfaG90cGx1ZyA9IDEsCisJSFNX X0ZFQVRVUkVTLAorCS5nZW4gPSA4LAogCS5yaW5nX21hc2sgPSBSRU5ERVJfUklORyB8IEJTRF9S SU5HIHwgQkxUX1JJTkcgfCBWRUJPWF9SSU5HIHwgQlNEMl9SSU5HLAotCS5oYXNfbGxjID0gMSwK LQkuaGFzX2RkaSA9IDEsCi0JLmhhc19mcGdhX2RiZyA9IDEsCi0JLmhhc19mYmMgPSAxLAotCUdF Tl9ERUZBVUxUX1BJUEVPRkZTRVRTLAotCUlWQl9DVVJTT1JfT0ZGU0VUUywKIH07CiAKIHN0YXRp YyBjb25zdCBzdHJ1Y3QgaW50ZWxfZGV2aWNlX2luZm8gaW50ZWxfYnJvYWR3ZWxsX2d0M21faW5m byA9IHsKLQkuZ2VuID0gOCwgLmlzX21vYmlsZSA9IDEsIC5udW1fcGlwZXMgPSAzLAotCS5uZWVk X2dmeF9od3MgPSAxLCAuaGFzX2hvdHBsdWcgPSAxLAorCUhTV19GRUFUVVJFUywKKwkuZ2VuID0g OCwgLmlzX21vYmlsZSA9IDEsCiAJLnJpbmdfbWFzayA9IFJFTkRFUl9SSU5HIHwgQlNEX1JJTkcg fCBCTFRfUklORyB8IFZFQk9YX1JJTkcgfCBCU0QyX1JJTkcsCi0JLmhhc19sbGMgPSAxLAotCS5o YXNfZGRpID0gMSwKLQkuaGFzX2ZwZ2FfZGJnID0gMSwKLQkuaGFzX2ZiYyA9IDEsCi0JR0VOX0RF RkFVTFRfUElQRU9GRlNFVFMsCi0JSVZCX0NVUlNPUl9PRkZTRVRTLAogfTsKIAogc3RhdGljIGNv bnN0IHN0cnVjdCBpbnRlbF9kZXZpY2VfaW5mbyBpbnRlbF9jaGVycnl2aWV3X2luZm8gPSB7CiAJ LmdlbiA9IDgsIC5udW1fcGlwZXMgPSAzLAogCS5uZWVkX2dmeF9od3MgPSAxLCAuaGFzX2hvdHBs dWcgPSAxLApAQCAtMzU0LDMzICszMTYsMTkgQEAgc3RhdGljIGNvbnN0IHN0cnVjdCBpbnRlbF9k ZXZpY2VfaW5mbyBpbnRlbF9jaGVycnl2aWV3X2luZm8gPSB7CiAJR0VOX0NIVl9QSVBFT0ZGU0VU UywKIAlDVVJTT1JfT0ZGU0VUUywKIH07CiAKIHN0YXRpYyBjb25zdCBzdHJ1Y3QgaW50ZWxfZGV2 aWNlX2luZm8gaW50ZWxfc2t5bGFrZV9pbmZvID0geworCUhTV19GRUFUVVJFUywKIAkuaXNfc2t5 bGFrZSA9IDEsCi0JLmdlbiA9IDksIC5udW1fcGlwZXMgPSAzLAotCS5uZWVkX2dmeF9od3MgPSAx LCAuaGFzX2hvdHBsdWcgPSAxLAotCS5yaW5nX21hc2sgPSBSRU5ERVJfUklORyB8IEJTRF9SSU5H IHwgQkxUX1JJTkcgfCBWRUJPWF9SSU5HLAotCS5oYXNfbGxjID0gMSwKLQkuaGFzX2RkaSA9IDEs Ci0JLmhhc19mcGdhX2RiZyA9IDEsCi0JLmhhc19mYmMgPSAxLAotCUdFTl9ERUZBVUxUX1BJUEVP RkZTRVRTLAotCUlWQl9DVVJTT1JfT0ZGU0VUUywKKwkuZ2VuID0gOSwKIH07CiAKIHN0YXRpYyBj b25zdCBzdHJ1Y3QgaW50ZWxfZGV2aWNlX2luZm8gaW50ZWxfc2t5bGFrZV9ndDNfaW5mbyA9IHsK IAkuaXNfc2t5bGFrZSA9IDEsCi0JLmdlbiA9IDksIC5udW1fcGlwZXMgPSAzLAotCS5uZWVkX2dm eF9od3MgPSAxLCAuaGFzX2hvdHBsdWcgPSAxLAorCS5nZW4gPSA5LAogCS5yaW5nX21hc2sgPSBS RU5ERVJfUklORyB8IEJTRF9SSU5HIHwgQkxUX1JJTkcgfCBWRUJPWF9SSU5HIHwgQlNEMl9SSU5H LAotCS5oYXNfbGxjID0gMSwKLQkuaGFzX2RkaSA9IDEsCi0JLmhhc19mcGdhX2RiZyA9IDEsCi0J Lmhhc19mYmMgPSAxLAotCUdFTl9ERUZBVUxUX1BJUEVPRkZTRVRTLAotCUlWQl9DVVJTT1JfT0ZG U0VUUywKIH07CiAKIHN0YXRpYyBjb25zdCBzdHJ1Y3QgaW50ZWxfZGV2aWNlX2luZm8gaW50ZWxf YnJveHRvbl9pbmZvID0gewogCS5pc19wcmVsaW1pbmFyeSA9IDEsCiAJLmlzX2Jyb3h0b24gPSAx LApAQCAtMzk0LDM3ICszNDIsMjIgQEAgc3RhdGljIGNvbnN0IHN0cnVjdCBpbnRlbF9kZXZpY2Vf aW5mbyBpbnRlbF9icm94dG9uX2luZm8gPSB7CiAJR0VOX0RFRkFVTFRfUElQRU9GRlNFVFMsCiAJ SVZCX0NVUlNPUl9PRkZTRVRTLAogfTsKIAogc3RhdGljIGNvbnN0IHN0cnVjdCBpbnRlbF9kZXZp Y2VfaW5mbyBpbnRlbF9rYWJ5bGFrZV9pbmZvID0geworCUhTV19GRUFUVVJFUywKIAkuaXNfcHJl bGltaW5hcnkgPSAxLAogCS5pc19rYWJ5bGFrZSA9IDEsCiAJLmdlbiA9IDksCi0JLm51bV9waXBl cyA9IDMsCi0JLm5lZWRfZ2Z4X2h3cyA9IDEsIC5oYXNfaG90cGx1ZyA9IDEsCi0JLnJpbmdfbWFz ayA9IFJFTkRFUl9SSU5HIHwgQlNEX1JJTkcgfCBCTFRfUklORyB8IFZFQk9YX1JJTkcsCi0JLmhh c19sbGMgPSAxLAotCS5oYXNfZGRpID0gMSwKLQkuaGFzX2ZwZ2FfZGJnID0gMSwKLQkuaGFzX2Zi YyA9IDEsCi0JR0VOX0RFRkFVTFRfUElQRU9GRlNFVFMsCi0JSVZCX0NVUlNPUl9PRkZTRVRTLAog fTsKIAogc3RhdGljIGNvbnN0IHN0cnVjdCBpbnRlbF9kZXZpY2VfaW5mbyBpbnRlbF9rYWJ5bGFr ZV9ndDNfaW5mbyA9IHsKKwlIU1dfRkVBVFVSRVMsCiAJLmlzX3ByZWxpbWluYXJ5ID0gMSwKIAku aXNfa2FieWxha2UgPSAxLAogCS5nZW4gPSA5LAotCS5udW1fcGlwZXMgPSAzLAotCS5uZWVkX2dm eF9od3MgPSAxLCAuaGFzX2hvdHBsdWcgPSAxLAogCS5yaW5nX21hc2sgPSBSRU5ERVJfUklORyB8 IEJTRF9SSU5HIHwgQkxUX1JJTkcgfCBWRUJPWF9SSU5HIHwgQlNEMl9SSU5HLAotCS5oYXNfbGxj ID0gMSwKLQkuaGFzX2RkaSA9IDEsCi0JLmhhc19mcGdhX2RiZyA9IDEsCi0JLmhhc19mYmMgPSAx LAotCUdFTl9ERUZBVUxUX1BJUEVPRkZTRVRTLAotCUlWQl9DVVJTT1JfT0ZGU0VUUywKIH07CiAK IC8qCiAgKiBNYWtlIHN1cmUgYW55IGRldmljZSBtYXRjaGVzIGhlcmUgYXJlIGZyb20gbW9zdCBz cGVjaWZpYyB0byBtb3N0CiAgKiBnZW5lcmFsLiAgRm9yIGV4YW1wbGUsIHNpbmNlIHRoZSBRdWFu dGEgbWF0Y2ggaXMgYmFzZWQgb24gdGhlIHN1YnN5c3RlbQotLSAKMi42LjMKCl9fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCkludGVsLWdmeCBtYWlsaW5nIGxp c3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwOi8vbGlzdHMuZnJlZWRlc2t0 b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4Cg==