From mboxrd@z Thu Jan 1 00:00:00 1970 From: Wayne Boyer Subject: [PATCH] drm/i915: Clean up device info structure definitions Date: Tue, 1 Dec 2015 11:34:47 -0800 Message-ID: <1448998487-25124-1-git-send-email-wayne.boyer@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 ESMTP id 738917217C for ; Tue, 1 Dec 2015 11:35:56 -0800 (PST) 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 ZWZpbml0aW9ucyBhcmUgc2ltcGxpZmllZC4KCkdFTjdfTFBfRkVBVFVSRVMgaXMgY3JlYXRlZCB0 byBkaWZmZXJlbnRpYXRlIGFuZCBzaW1wbGlmeSB0aGUKZ2VuNyBsb3cgcG93ZXIgKExQKSBkZXZp Y2VzLgoKSFNXX0ZFQVRVUkVTIGlzIGNyZWF0ZWQgYW5kIHVzZWQgdG8gc2ltcGxpZnkgYWxsIEhT VysgZGV2aWNlcwpleGNlcHQgZm9yIExQLgoKQ2M6IFJvZHJpZ28gVml2aSA8cm9kcmlnby52aXZp QGludGVsLmNvbT4KU2lnbmVkLW9mZi1ieTogV2F5bmUgQm95ZXIgPHdheW5lLmJveWVyQGludGVs LmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5jIHwgMTM3ICsrKysrKysr KystLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0KIDEgZmlsZSBjaGFuZ2VkLCAzNSBpbnNl cnRpb25zKCspLCAxMDIgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJt L2k5MTUvaTkxNV9kcnYuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmMKaW5kZXgg OTBmYWE4ZS4uNWY4YjBmZiAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9k cnYuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5jCkBAIC0yMjYsMTI1ICsy MjYsODcgQEAgc3RhdGljIGNvbnN0IHN0cnVjdCBpbnRlbF9kZXZpY2VfaW5mbyBpbnRlbF9zYW5k eWJyaWRnZV9tX2luZm8gPSB7CiAjZGVmaW5lIEdFTjdfRkVBVFVSRVMgIFwKIAkuZ2VuID0gNywg Lm51bV9waXBlcyA9IDMsIFwKIAkubmVlZF9nZnhfaHdzID0gMSwgLmhhc19ob3RwbHVnID0gMSwg XAogCS5oYXNfZmJjID0gMSwgXAogCS5yaW5nX21hc2sgPSBSRU5ERVJfUklORyB8IEJTRF9SSU5H IHwgQkxUX1JJTkcsIFwKLQkuaGFzX2xsYyA9IDEKKwkuaGFzX2xsYyA9IDEsIFwKKwlHRU5fREVG QVVMVF9QSVBFT0ZGU0VUUywgXAorCUlWQl9DVVJTT1JfT0ZGU0VUUwogCiBzdGF0aWMgY29uc3Qg c3RydWN0IGludGVsX2RldmljZV9pbmZvIGludGVsX2l2eWJyaWRnZV9kX2luZm8gPSB7CiAJR0VO N19GRUFUVVJFUywKIAkuaXNfaXZ5YnJpZGdlID0gMSwKLQlHRU5fREVGQVVMVF9QSVBFT0ZGU0VU UywKLQlJVkJfQ1VSU09SX09GRlNFVFMsCiB9OwogCiBzdGF0aWMgY29uc3Qgc3RydWN0IGludGVs X2RldmljZV9pbmZvIGludGVsX2l2eWJyaWRnZV9tX2luZm8gPSB7CiAJR0VON19GRUFUVVJFUywK IAkuaXNfaXZ5YnJpZGdlID0gMSwKIAkuaXNfbW9iaWxlID0gMSwKLQlHRU5fREVGQVVMVF9QSVBF T0ZGU0VUUywKLQlJVkJfQ1VSU09SX09GRlNFVFMsCiB9OwogCiBzdGF0aWMgY29uc3Qgc3RydWN0 IGludGVsX2RldmljZV9pbmZvIGludGVsX2l2eWJyaWRnZV9xX2luZm8gPSB7CiAJR0VON19GRUFU VVJFUywKIAkuaXNfaXZ5YnJpZGdlID0gMSwKIAkubnVtX3BpcGVzID0gMCwgLyogbGVnYWwsIGxh c3Qgb25lIHdpbnMgKi8KLQlHRU5fREVGQVVMVF9QSVBFT0ZGU0VUUywKLQlJVkJfQ1VSU09SX09G RlNFVFMsCiB9OwogCisjZGVmaW5lIEdFTjdfTFBfRkVBVFVSRVMgIFwKKwkuZ2VuID0gNywgLm51 bV9waXBlcyA9IDIsIFwKKwkubmVlZF9nZnhfaHdzID0gMSwgLmhhc19ob3RwbHVnID0gMSwgXAor CS5yaW5nX21hc2sgPSBSRU5ERVJfUklORyB8IEJTRF9SSU5HIHwgQkxUX1JJTkcsIFwKKwkuZGlz cGxheV9tbWlvX29mZnNldCA9IFZMVl9ESVNQTEFZX0JBU0UsIFwKKwlHRU5fREVGQVVMVF9QSVBF T0ZGU0VUUywgXAorCUNVUlNPUl9PRkZTRVRTCisKIHN0YXRpYyBjb25zdCBzdHJ1Y3QgaW50ZWxf ZGV2aWNlX2luZm8gaW50ZWxfdmFsbGV5dmlld19tX2luZm8gPSB7Ci0JR0VON19GRUFUVVJFUywK LQkuaXNfbW9iaWxlID0gMSwKLQkubnVtX3BpcGVzID0gMiwKKwlHRU43X0xQX0ZFQVRVUkVTLAog CS5pc192YWxsZXl2aWV3ID0gMSwKLQkuZGlzcGxheV9tbWlvX29mZnNldCA9IFZMVl9ESVNQTEFZ X0JBU0UsCi0JLmhhc19mYmMgPSAwLCAvKiBsZWdhbCwgbGFzdCBvbmUgd2lucyAqLwotCS5oYXNf bGxjID0gMCwgLyogbGVnYWwsIGxhc3Qgb25lIHdpbnMgKi8KLQlHRU5fREVGQVVMVF9QSVBFT0ZG U0VUUywKLQlDVVJTT1JfT0ZGU0VUUywKKwkuaXNfbW9iaWxlID0gMSwKIH07CiAKIHN0YXRpYyBj b25zdCBzdHJ1Y3QgaW50ZWxfZGV2aWNlX2luZm8gaW50ZWxfdmFsbGV5dmlld19kX2luZm8gPSB7 Ci0JR0VON19GRUFUVVJFUywKLQkubnVtX3BpcGVzID0gMiwKKwlHRU43X0xQX0ZFQVRVUkVTLAog CS5pc192YWxsZXl2aWV3ID0gMSwKLQkuZGlzcGxheV9tbWlvX29mZnNldCA9IFZMVl9ESVNQTEFZ X0JBU0UsCi0JLmhhc19mYmMgPSAwLCAvKiBsZWdhbCwgbGFzdCBvbmUgd2lucyAqLwotCS5oYXNf bGxjID0gMCwgLyogbGVnYWwsIGxhc3Qgb25lIHdpbnMgKi8KLQlHRU5fREVGQVVMVF9QSVBFT0ZG U0VUUywKLQlDVVJTT1JfT0ZGU0VUUywKIH07CiAKKyNkZWZpbmUgSFNXX0ZFQVRVUkVTICBcCisJ R0VON19GRUFUVVJFUywgXAorCS5yaW5nX21hc2sgPSBSRU5ERVJfUklORyB8IEJTRF9SSU5HIHwg QkxUX1JJTkcgfCBWRUJPWF9SSU5HLCBcCisJLmhhc19kZGkgPSAxLCBcCisJLmhhc19mcGdhX2Ri ZyA9IDEKKwogc3RhdGljIGNvbnN0IHN0cnVjdCBpbnRlbF9kZXZpY2VfaW5mbyBpbnRlbF9oYXN3 ZWxsX2RfaW5mbyA9IHsKLQlHRU43X0ZFQVRVUkVTLAorCUhTV19GRUFUVVJFUywKIAkuaXNfaGFz d2VsbCA9IDEsCi0JLmhhc19kZGkgPSAxLAotCS5oYXNfZnBnYV9kYmcgPSAxLAotCS5yaW5nX21h c2sgPSBSRU5ERVJfUklORyB8IEJTRF9SSU5HIHwgQkxUX1JJTkcgfCBWRUJPWF9SSU5HLAotCUdF Tl9ERUZBVUxUX1BJUEVPRkZTRVRTLAotCUlWQl9DVVJTT1JfT0ZGU0VUUywKIH07CiAKIHN0YXRp YyBjb25zdCBzdHJ1Y3QgaW50ZWxfZGV2aWNlX2luZm8gaW50ZWxfaGFzd2VsbF9tX2luZm8gPSB7 Ci0JR0VON19GRUFUVVJFUywKKwlIU1dfRkVBVFVSRVMsCiAJLmlzX2hhc3dlbGwgPSAxLAogCS5p c19tb2JpbGUgPSAxLAotCS5oYXNfZGRpID0gMSwKLQkuaGFzX2ZwZ2FfZGJnID0gMSwKLQkucmlu Z19tYXNrID0gUkVOREVSX1JJTkcgfCBCU0RfUklORyB8IEJMVF9SSU5HIHwgVkVCT1hfUklORywK LQlHRU5fREVGQVVMVF9QSVBFT0ZGU0VUUywKLQlJVkJfQ1VSU09SX09GRlNFVFMsCiB9OwogCiBz dGF0aWMgY29uc3Qgc3RydWN0IGludGVsX2RldmljZV9pbmZvIGludGVsX2Jyb2Fkd2VsbF9kX2lu Zm8gPSB7Ci0JLmdlbiA9IDgsIC5udW1fcGlwZXMgPSAzLAotCS5uZWVkX2dmeF9od3MgPSAxLCAu aGFzX2hvdHBsdWcgPSAxLAotCS5yaW5nX21hc2sgPSBSRU5ERVJfUklORyB8IEJTRF9SSU5HIHwg QkxUX1JJTkcgfCBWRUJPWF9SSU5HLAotCS5oYXNfbGxjID0gMSwKLQkuaGFzX2RkaSA9IDEsCi0J Lmhhc19mcGdhX2RiZyA9IDEsCi0JLmhhc19mYmMgPSAxLAotCUdFTl9ERUZBVUxUX1BJUEVPRkZT RVRTLAotCUlWQl9DVVJTT1JfT0ZGU0VUUywKKwlIU1dfRkVBVFVSRVMsCisJLmdlbiA9IDgsCiB9 OwogCiBzdGF0aWMgY29uc3Qgc3RydWN0IGludGVsX2RldmljZV9pbmZvIGludGVsX2Jyb2Fkd2Vs bF9tX2luZm8gPSB7Ci0JLmdlbiA9IDgsIC5pc19tb2JpbGUgPSAxLCAubnVtX3BpcGVzID0gMywK LQkubmVlZF9nZnhfaHdzID0gMSwgLmhhc19ob3RwbHVnID0gMSwKLQkucmluZ19tYXNrID0gUkVO REVSX1JJTkcgfCBCU0RfUklORyB8IEJMVF9SSU5HIHwgVkVCT1hfUklORywKLQkuaGFzX2xsYyA9 IDEsCi0JLmhhc19kZGkgPSAxLAotCS5oYXNfZnBnYV9kYmcgPSAxLAotCS5oYXNfZmJjID0gMSwK LQlHRU5fREVGQVVMVF9QSVBFT0ZGU0VUUywKLQlJVkJfQ1VSU09SX09GRlNFVFMsCisJSFNXX0ZF QVRVUkVTLAorCS5nZW4gPSA4LCAuaXNfbW9iaWxlID0gMSwKIH07CiAKIHN0YXRpYyBjb25zdCBz dHJ1Y3QgaW50ZWxfZGV2aWNlX2luZm8gaW50ZWxfYnJvYWR3ZWxsX2d0M2RfaW5mbyA9IHsKLQku Z2VuID0gOCwgLm51bV9waXBlcyA9IDMsCi0JLm5lZWRfZ2Z4X2h3cyA9IDEsIC5oYXNfaG90cGx1 ZyA9IDEsCisJSFNXX0ZFQVRVUkVTLAorCS5nZW4gPSA4LAogCS5yaW5nX21hc2sgPSBSRU5ERVJf UklORyB8IEJTRF9SSU5HIHwgQkxUX1JJTkcgfCBWRUJPWF9SSU5HIHwgQlNEMl9SSU5HLAotCS5o YXNfbGxjID0gMSwKLQkuaGFzX2RkaSA9IDEsCi0JLmhhc19mcGdhX2RiZyA9IDEsCi0JLmhhc19m YmMgPSAxLAotCUdFTl9ERUZBVUxUX1BJUEVPRkZTRVRTLAotCUlWQl9DVVJTT1JfT0ZGU0VUUywK IH07CiAKIHN0YXRpYyBjb25zdCBzdHJ1Y3QgaW50ZWxfZGV2aWNlX2luZm8gaW50ZWxfYnJvYWR3 ZWxsX2d0M21faW5mbyA9IHsKLQkuZ2VuID0gOCwgLmlzX21vYmlsZSA9IDEsIC5udW1fcGlwZXMg PSAzLAotCS5uZWVkX2dmeF9od3MgPSAxLCAuaGFzX2hvdHBsdWcgPSAxLAorCUhTV19GRUFUVVJF UywKKwkuZ2VuID0gOCwgLmlzX21vYmlsZSA9IDEsCiAJLnJpbmdfbWFzayA9IFJFTkRFUl9SSU5H IHwgQlNEX1JJTkcgfCBCTFRfUklORyB8IFZFQk9YX1JJTkcgfCBCU0QyX1JJTkcsCi0JLmhhc19s bGMgPSAxLAotCS5oYXNfZGRpID0gMSwKLQkuaGFzX2ZwZ2FfZGJnID0gMSwKLQkuaGFzX2ZiYyA9 IDEsCi0JR0VOX0RFRkFVTFRfUElQRU9GRlNFVFMsCi0JSVZCX0NVUlNPUl9PRkZTRVRTLAogfTsK IAogc3RhdGljIGNvbnN0IHN0cnVjdCBpbnRlbF9kZXZpY2VfaW5mbyBpbnRlbF9jaGVycnl2aWV3 X2luZm8gPSB7CiAJLmdlbiA9IDgsIC5udW1fcGlwZXMgPSAzLAogCS5uZWVkX2dmeF9od3MgPSAx LCAuaGFzX2hvdHBsdWcgPSAxLApAQCAtMzU0LDMzICszMTYsMTkgQEAgc3RhdGljIGNvbnN0IHN0 cnVjdCBpbnRlbF9kZXZpY2VfaW5mbyBpbnRlbF9jaGVycnl2aWV3X2luZm8gPSB7CiAJR0VOX0NI Vl9QSVBFT0ZGU0VUUywKIAlDVVJTT1JfT0ZGU0VUUywKIH07CiAKIHN0YXRpYyBjb25zdCBzdHJ1 Y3QgaW50ZWxfZGV2aWNlX2luZm8gaW50ZWxfc2t5bGFrZV9pbmZvID0geworCUhTV19GRUFUVVJF UywKIAkuaXNfc2t5bGFrZSA9IDEsCi0JLmdlbiA9IDksIC5udW1fcGlwZXMgPSAzLAotCS5uZWVk X2dmeF9od3MgPSAxLCAuaGFzX2hvdHBsdWcgPSAxLAotCS5yaW5nX21hc2sgPSBSRU5ERVJfUklO RyB8IEJTRF9SSU5HIHwgQkxUX1JJTkcgfCBWRUJPWF9SSU5HLAotCS5oYXNfbGxjID0gMSwKLQku aGFzX2RkaSA9IDEsCi0JLmhhc19mcGdhX2RiZyA9IDEsCi0JLmhhc19mYmMgPSAxLAotCUdFTl9E RUZBVUxUX1BJUEVPRkZTRVRTLAotCUlWQl9DVVJTT1JfT0ZGU0VUUywKKwkuZ2VuID0gOSwKIH07 CiAKIHN0YXRpYyBjb25zdCBzdHJ1Y3QgaW50ZWxfZGV2aWNlX2luZm8gaW50ZWxfc2t5bGFrZV9n dDNfaW5mbyA9IHsKIAkuaXNfc2t5bGFrZSA9IDEsCi0JLmdlbiA9IDksIC5udW1fcGlwZXMgPSAz LAotCS5uZWVkX2dmeF9od3MgPSAxLCAuaGFzX2hvdHBsdWcgPSAxLAorCS5nZW4gPSA5LAogCS5y aW5nX21hc2sgPSBSRU5ERVJfUklORyB8IEJTRF9SSU5HIHwgQkxUX1JJTkcgfCBWRUJPWF9SSU5H IHwgQlNEMl9SSU5HLAotCS5oYXNfbGxjID0gMSwKLQkuaGFzX2RkaSA9IDEsCi0JLmhhc19mcGdh X2RiZyA9IDEsCi0JLmhhc19mYmMgPSAxLAotCUdFTl9ERUZBVUxUX1BJUEVPRkZTRVRTLAotCUlW Ql9DVVJTT1JfT0ZGU0VUUywKIH07CiAKIHN0YXRpYyBjb25zdCBzdHJ1Y3QgaW50ZWxfZGV2aWNl X2luZm8gaW50ZWxfYnJveHRvbl9pbmZvID0gewogCS5pc19wcmVsaW1pbmFyeSA9IDEsCiAJLmlz X2Jyb3h0b24gPSAxLApAQCAtMzk0LDM3ICszNDIsMjIgQEAgc3RhdGljIGNvbnN0IHN0cnVjdCBp bnRlbF9kZXZpY2VfaW5mbyBpbnRlbF9icm94dG9uX2luZm8gPSB7CiAJR0VOX0RFRkFVTFRfUElQ RU9GRlNFVFMsCiAJSVZCX0NVUlNPUl9PRkZTRVRTLAogfTsKIAogc3RhdGljIGNvbnN0IHN0cnVj dCBpbnRlbF9kZXZpY2VfaW5mbyBpbnRlbF9rYWJ5bGFrZV9pbmZvID0geworCUhTV19GRUFUVVJF UywKIAkuaXNfcHJlbGltaW5hcnkgPSAxLAogCS5pc19rYWJ5bGFrZSA9IDEsCiAJLmdlbiA9IDks Ci0JLm51bV9waXBlcyA9IDMsCi0JLm5lZWRfZ2Z4X2h3cyA9IDEsIC5oYXNfaG90cGx1ZyA9IDEs Ci0JLnJpbmdfbWFzayA9IFJFTkRFUl9SSU5HIHwgQlNEX1JJTkcgfCBCTFRfUklORyB8IFZFQk9Y X1JJTkcsCi0JLmhhc19sbGMgPSAxLAotCS5oYXNfZGRpID0gMSwKLQkuaGFzX2ZwZ2FfZGJnID0g MSwKLQkuaGFzX2ZiYyA9IDEsCi0JR0VOX0RFRkFVTFRfUElQRU9GRlNFVFMsCi0JSVZCX0NVUlNP Ul9PRkZTRVRTLAogfTsKIAogc3RhdGljIGNvbnN0IHN0cnVjdCBpbnRlbF9kZXZpY2VfaW5mbyBp bnRlbF9rYWJ5bGFrZV9ndDNfaW5mbyA9IHsKKwlIU1dfRkVBVFVSRVMsCiAJLmlzX3ByZWxpbWlu YXJ5ID0gMSwKIAkuaXNfa2FieWxha2UgPSAxLAogCS5nZW4gPSA5LAotCS5udW1fcGlwZXMgPSAz LAotCS5uZWVkX2dmeF9od3MgPSAxLCAuaGFzX2hvdHBsdWcgPSAxLAogCS5yaW5nX21hc2sgPSBS RU5ERVJfUklORyB8IEJTRF9SSU5HIHwgQkxUX1JJTkcgfCBWRUJPWF9SSU5HIHwgQlNEMl9SSU5H LAotCS5oYXNfbGxjID0gMSwKLQkuaGFzX2RkaSA9IDEsCi0JLmhhc19mcGdhX2RiZyA9IDEsCi0J Lmhhc19mYmMgPSAxLAotCUdFTl9ERUZBVUxUX1BJUEVPRkZTRVRTLAotCUlWQl9DVVJTT1JfT0ZG U0VUUywKIH07CiAKIC8qCiAgKiBNYWtlIHN1cmUgYW55IGRldmljZSBtYXRjaGVzIGhlcmUgYXJl IGZyb20gbW9zdCBzcGVjaWZpYyB0byBtb3N0CiAgKiBnZW5lcmFsLiAgRm9yIGV4YW1wbGUsIHNp bmNlIHRoZSBRdWFudGEgbWF0Y2ggaXMgYmFzZWQgb24gdGhlIHN1YnN5c3RlbQotLSAKMi42LjMK Cl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCkludGVsLWdm eCBtYWlsaW5nIGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwOi8vbGlz dHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4Cg==