From: Wayne Boyer Subject: [PATCH] drm/i915: Clean up device info structure definitions Date: Fri, 4 Dec 2015 10:06:20 -0800 Message-ID: <1449252380-21506-1-git-send-email-wayne.boyer@intel.com> References: <1449091694-7681-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 mga09.intel.com (mga09.intel.com [134.134.136.24]) by gabe.freedesktop.org (Postfix) with ESMTP id 1D1AC6E3F7 for ; Fri, 4 Dec 2015 10:06:42 -0800 (PST) In-Reply-To: <1449091694-7681-1-git-send-email-wayne.boyer@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 IGFuZCBpbnRvIHRoZSBuZXcgVkxWX0ZFQVRVUkVTIGFuZApIU1dfRkVBVFVSRVMgI2RlZmluZXMu CgpTcGVjaWZpY2FsbHksIEdFTl9ERUZBVUxUX1BJUEVPRkZTRVRTIGFuZCBJVkJfQ1VSU09SX09G RlNFVFMgYXJlCmFkZGVkIHRvIEdFTjdfRkVBVFVSRVMgYW5kIHN1YnNlcXVlbnQgSVZCIGRlZmlu aXRpb25zIGFyZSBzaW1wbGlmaWVkLgoKVkxWX0ZFQVRVUkVTIGlzIGRlZmluZWQgdG8gZGlmZmVy ZW50aWF0ZSBhbmQgc2ltcGxpZnkgdGhlCmdlbjcgbG93IHBvd2VyIChMUCkgZGV2aWNlcy4KCkhT V19GRUFUVVJFUyBpcyBkZWZpbmVkIGFuZCB1c2VkIHRvIHNpbXBsaWZ5IGFsbCBIU1crIGRldmlj ZXMKZXhjZXB0IGZvciBMUC4KCnYyOiBVc2UgVkxWX0ZFQVRVUkVTIGZvciB0aGUgZ2VuNyBsb3cg cG93ZXIgZGV2aWNlcy4gKEphbmkpCnYzOiBJbmNsdWRlIEhTV19GRUFUVVJFUyBkZWZpbml0aW9u IGluIGludGVsX3NreWxha2VfZ3QzX2luZm8uIChDaHJpcykKdjQ6IEZpeCBjb21taXQgbWVzc2Fn ZS4KCkNjOiBSb2RyaWdvIFZpdmkgPHJvZHJpZ28udml2aUBpbnRlbC5jb20+ClNpZ25lZC1vZmYt Ynk6IFdheW5lIEJveWVyIDx3YXluZS5ib3llckBpbnRlbC5jb20+Ci0tLQogZHJpdmVycy9ncHUv ZHJtL2k5MTUvaTkxNV9kcnYuYyB8IDEzOCArKysrKysrKysrKy0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tCiAxIGZpbGUgY2hhbmdlZCwgMzYgaW5zZXJ0aW9ucygrKSwgMTAyIGRlbGV0aW9u cygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmMgYi9kcml2 ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5jCmluZGV4IDkwZmFhOGUuLjQ2YWM2NjQgMTAwNjQ0 Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmMKKysrIGIvZHJpdmVycy9ncHUv ZHJtL2k5MTUvaTkxNV9kcnYuYwpAQCAtMjI2LDEyNSArMjI2LDg3IEBAIHN0YXRpYyBjb25zdCBz dHJ1Y3QgaW50ZWxfZGV2aWNlX2luZm8gaW50ZWxfc2FuZHlicmlkZ2VfbV9pbmZvID0gewogI2Rl ZmluZSBHRU43X0ZFQVRVUkVTICBcCiAJLmdlbiA9IDcsIC5udW1fcGlwZXMgPSAzLCBcCiAJLm5l ZWRfZ2Z4X2h3cyA9IDEsIC5oYXNfaG90cGx1ZyA9IDEsIFwKIAkuaGFzX2ZiYyA9IDEsIFwKIAku cmluZ19tYXNrID0gUkVOREVSX1JJTkcgfCBCU0RfUklORyB8IEJMVF9SSU5HLCBcCi0JLmhhc19s bGMgPSAxCisJLmhhc19sbGMgPSAxLCBcCisJR0VOX0RFRkFVTFRfUElQRU9GRlNFVFMsIFwKKwlJ VkJfQ1VSU09SX09GRlNFVFMKIAogc3RhdGljIGNvbnN0IHN0cnVjdCBpbnRlbF9kZXZpY2VfaW5m byBpbnRlbF9pdnlicmlkZ2VfZF9pbmZvID0gewogCUdFTjdfRkVBVFVSRVMsCiAJLmlzX2l2eWJy aWRnZSA9IDEsCi0JR0VOX0RFRkFVTFRfUElQRU9GRlNFVFMsCi0JSVZCX0NVUlNPUl9PRkZTRVRT LAogfTsKIAogc3RhdGljIGNvbnN0IHN0cnVjdCBpbnRlbF9kZXZpY2VfaW5mbyBpbnRlbF9pdnli cmlkZ2VfbV9pbmZvID0gewogCUdFTjdfRkVBVFVSRVMsCiAJLmlzX2l2eWJyaWRnZSA9IDEsCiAJ LmlzX21vYmlsZSA9IDEsCi0JR0VOX0RFRkFVTFRfUElQRU9GRlNFVFMsCi0JSVZCX0NVUlNPUl9P RkZTRVRTLAogfTsKIAogc3RhdGljIGNvbnN0IHN0cnVjdCBpbnRlbF9kZXZpY2VfaW5mbyBpbnRl bF9pdnlicmlkZ2VfcV9pbmZvID0gewogCUdFTjdfRkVBVFVSRVMsCiAJLmlzX2l2eWJyaWRnZSA9 IDEsCiAJLm51bV9waXBlcyA9IDAsIC8qIGxlZ2FsLCBsYXN0IG9uZSB3aW5zICovCi0JR0VOX0RF RkFVTFRfUElQRU9GRlNFVFMsCi0JSVZCX0NVUlNPUl9PRkZTRVRTLAogfTsKIAorI2RlZmluZSBW TFZfRkVBVFVSRVMgIFwKKwkuZ2VuID0gNywgLm51bV9waXBlcyA9IDIsIFwKKwkubmVlZF9nZnhf aHdzID0gMSwgLmhhc19ob3RwbHVnID0gMSwgXAorCS5yaW5nX21hc2sgPSBSRU5ERVJfUklORyB8 IEJTRF9SSU5HIHwgQkxUX1JJTkcsIFwKKwkuZGlzcGxheV9tbWlvX29mZnNldCA9IFZMVl9ESVNQ TEFZX0JBU0UsIFwKKwlHRU5fREVGQVVMVF9QSVBFT0ZGU0VUUywgXAorCUNVUlNPUl9PRkZTRVRT CisKIHN0YXRpYyBjb25zdCBzdHJ1Y3QgaW50ZWxfZGV2aWNlX2luZm8gaW50ZWxfdmFsbGV5dmll d19tX2luZm8gPSB7Ci0JR0VON19GRUFUVVJFUywKLQkuaXNfbW9iaWxlID0gMSwKLQkubnVtX3Bp cGVzID0gMiwKKwlWTFZfRkVBVFVSRVMsCiAJLmlzX3ZhbGxleXZpZXcgPSAxLAotCS5kaXNwbGF5 X21taW9fb2Zmc2V0ID0gVkxWX0RJU1BMQVlfQkFTRSwKLQkuaGFzX2ZiYyA9IDAsIC8qIGxlZ2Fs LCBsYXN0IG9uZSB3aW5zICovCi0JLmhhc19sbGMgPSAwLCAvKiBsZWdhbCwgbGFzdCBvbmUgd2lu cyAqLwotCUdFTl9ERUZBVUxUX1BJUEVPRkZTRVRTLAotCUNVUlNPUl9PRkZTRVRTLAorCS5pc19t b2JpbGUgPSAxLAogfTsKIAogc3RhdGljIGNvbnN0IHN0cnVjdCBpbnRlbF9kZXZpY2VfaW5mbyBp bnRlbF92YWxsZXl2aWV3X2RfaW5mbyA9IHsKLQlHRU43X0ZFQVRVUkVTLAotCS5udW1fcGlwZXMg PSAyLAorCVZMVl9GRUFUVVJFUywKIAkuaXNfdmFsbGV5dmlldyA9IDEsCi0JLmRpc3BsYXlfbW1p b19vZmZzZXQgPSBWTFZfRElTUExBWV9CQVNFLAotCS5oYXNfZmJjID0gMCwgLyogbGVnYWwsIGxh c3Qgb25lIHdpbnMgKi8KLQkuaGFzX2xsYyA9IDAsIC8qIGxlZ2FsLCBsYXN0IG9uZSB3aW5zICov Ci0JR0VOX0RFRkFVTFRfUElQRU9GRlNFVFMsCi0JQ1VSU09SX09GRlNFVFMsCiB9OwogCisjZGVm aW5lIEhTV19GRUFUVVJFUyAgXAorCUdFTjdfRkVBVFVSRVMsIFwKKwkucmluZ19tYXNrID0gUkVO REVSX1JJTkcgfCBCU0RfUklORyB8IEJMVF9SSU5HIHwgVkVCT1hfUklORywgXAorCS5oYXNfZGRp ID0gMSwgXAorCS5oYXNfZnBnYV9kYmcgPSAxCisKIHN0YXRpYyBjb25zdCBzdHJ1Y3QgaW50ZWxf ZGV2aWNlX2luZm8gaW50ZWxfaGFzd2VsbF9kX2luZm8gPSB7Ci0JR0VON19GRUFUVVJFUywKKwlI U1dfRkVBVFVSRVMsCiAJLmlzX2hhc3dlbGwgPSAxLAotCS5oYXNfZGRpID0gMSwKLQkuaGFzX2Zw Z2FfZGJnID0gMSwKLQkucmluZ19tYXNrID0gUkVOREVSX1JJTkcgfCBCU0RfUklORyB8IEJMVF9S SU5HIHwgVkVCT1hfUklORywKLQlHRU5fREVGQVVMVF9QSVBFT0ZGU0VUUywKLQlJVkJfQ1VSU09S X09GRlNFVFMsCiB9OwogCiBzdGF0aWMgY29uc3Qgc3RydWN0IGludGVsX2RldmljZV9pbmZvIGlu dGVsX2hhc3dlbGxfbV9pbmZvID0gewotCUdFTjdfRkVBVFVSRVMsCisJSFNXX0ZFQVRVUkVTLAog CS5pc19oYXN3ZWxsID0gMSwKIAkuaXNfbW9iaWxlID0gMSwKLQkuaGFzX2RkaSA9IDEsCi0JLmhh c19mcGdhX2RiZyA9IDEsCi0JLnJpbmdfbWFzayA9IFJFTkRFUl9SSU5HIHwgQlNEX1JJTkcgfCBC TFRfUklORyB8IFZFQk9YX1JJTkcsCi0JR0VOX0RFRkFVTFRfUElQRU9GRlNFVFMsCi0JSVZCX0NV UlNPUl9PRkZTRVRTLAogfTsKIAogc3RhdGljIGNvbnN0IHN0cnVjdCBpbnRlbF9kZXZpY2VfaW5m byBpbnRlbF9icm9hZHdlbGxfZF9pbmZvID0gewotCS5nZW4gPSA4LCAubnVtX3BpcGVzID0gMywK LQkubmVlZF9nZnhfaHdzID0gMSwgLmhhc19ob3RwbHVnID0gMSwKLQkucmluZ19tYXNrID0gUkVO REVSX1JJTkcgfCBCU0RfUklORyB8IEJMVF9SSU5HIHwgVkVCT1hfUklORywKLQkuaGFzX2xsYyA9 IDEsCi0JLmhhc19kZGkgPSAxLAotCS5oYXNfZnBnYV9kYmcgPSAxLAotCS5oYXNfZmJjID0gMSwK LQlHRU5fREVGQVVMVF9QSVBFT0ZGU0VUUywKLQlJVkJfQ1VSU09SX09GRlNFVFMsCisJSFNXX0ZF QVRVUkVTLAorCS5nZW4gPSA4LAogfTsKIAogc3RhdGljIGNvbnN0IHN0cnVjdCBpbnRlbF9kZXZp Y2VfaW5mbyBpbnRlbF9icm9hZHdlbGxfbV9pbmZvID0gewotCS5nZW4gPSA4LCAuaXNfbW9iaWxl ID0gMSwgLm51bV9waXBlcyA9IDMsCi0JLm5lZWRfZ2Z4X2h3cyA9IDEsIC5oYXNfaG90cGx1ZyA9 IDEsCi0JLnJpbmdfbWFzayA9IFJFTkRFUl9SSU5HIHwgQlNEX1JJTkcgfCBCTFRfUklORyB8IFZF Qk9YX1JJTkcsCi0JLmhhc19sbGMgPSAxLAotCS5oYXNfZGRpID0gMSwKLQkuaGFzX2ZwZ2FfZGJn ID0gMSwKLQkuaGFzX2ZiYyA9IDEsCi0JR0VOX0RFRkFVTFRfUElQRU9GRlNFVFMsCi0JSVZCX0NV UlNPUl9PRkZTRVRTLAorCUhTV19GRUFUVVJFUywKKwkuZ2VuID0gOCwgLmlzX21vYmlsZSA9IDEs CiB9OwogCiBzdGF0aWMgY29uc3Qgc3RydWN0IGludGVsX2RldmljZV9pbmZvIGludGVsX2Jyb2Fk d2VsbF9ndDNkX2luZm8gPSB7Ci0JLmdlbiA9IDgsIC5udW1fcGlwZXMgPSAzLAotCS5uZWVkX2dm eF9od3MgPSAxLCAuaGFzX2hvdHBsdWcgPSAxLAorCUhTV19GRUFUVVJFUywKKwkuZ2VuID0gOCwK IAkucmluZ19tYXNrID0gUkVOREVSX1JJTkcgfCBCU0RfUklORyB8IEJMVF9SSU5HIHwgVkVCT1hf UklORyB8IEJTRDJfUklORywKLQkuaGFzX2xsYyA9IDEsCi0JLmhhc19kZGkgPSAxLAotCS5oYXNf ZnBnYV9kYmcgPSAxLAotCS5oYXNfZmJjID0gMSwKLQlHRU5fREVGQVVMVF9QSVBFT0ZGU0VUUywK LQlJVkJfQ1VSU09SX09GRlNFVFMsCiB9OwogCiBzdGF0aWMgY29uc3Qgc3RydWN0IGludGVsX2Rl dmljZV9pbmZvIGludGVsX2Jyb2Fkd2VsbF9ndDNtX2luZm8gPSB7Ci0JLmdlbiA9IDgsIC5pc19t b2JpbGUgPSAxLCAubnVtX3BpcGVzID0gMywKLQkubmVlZF9nZnhfaHdzID0gMSwgLmhhc19ob3Rw bHVnID0gMSwKKwlIU1dfRkVBVFVSRVMsCisJLmdlbiA9IDgsIC5pc19tb2JpbGUgPSAxLAogCS5y aW5nX21hc2sgPSBSRU5ERVJfUklORyB8IEJTRF9SSU5HIHwgQkxUX1JJTkcgfCBWRUJPWF9SSU5H IHwgQlNEMl9SSU5HLAotCS5oYXNfbGxjID0gMSwKLQkuaGFzX2RkaSA9IDEsCi0JLmhhc19mcGdh X2RiZyA9IDEsCi0JLmhhc19mYmMgPSAxLAotCUdFTl9ERUZBVUxUX1BJUEVPRkZTRVRTLAotCUlW Ql9DVVJTT1JfT0ZGU0VUUywKIH07CiAKIHN0YXRpYyBjb25zdCBzdHJ1Y3QgaW50ZWxfZGV2aWNl X2luZm8gaW50ZWxfY2hlcnJ5dmlld19pbmZvID0gewogCS5nZW4gPSA4LCAubnVtX3BpcGVzID0g MywKIAkubmVlZF9nZnhfaHdzID0gMSwgLmhhc19ob3RwbHVnID0gMSwKQEAgLTM1NCwzMyArMzE2 LDIwIEBAIHN0YXRpYyBjb25zdCBzdHJ1Y3QgaW50ZWxfZGV2aWNlX2luZm8gaW50ZWxfY2hlcnJ5 dmlld19pbmZvID0gewogCUdFTl9DSFZfUElQRU9GRlNFVFMsCiAJQ1VSU09SX09GRlNFVFMsCiB9 OwogCiBzdGF0aWMgY29uc3Qgc3RydWN0IGludGVsX2RldmljZV9pbmZvIGludGVsX3NreWxha2Vf aW5mbyA9IHsKKwlIU1dfRkVBVFVSRVMsCiAJLmlzX3NreWxha2UgPSAxLAotCS5nZW4gPSA5LCAu bnVtX3BpcGVzID0gMywKLQkubmVlZF9nZnhfaHdzID0gMSwgLmhhc19ob3RwbHVnID0gMSwKLQku cmluZ19tYXNrID0gUkVOREVSX1JJTkcgfCBCU0RfUklORyB8IEJMVF9SSU5HIHwgVkVCT1hfUklO RywKLQkuaGFzX2xsYyA9IDEsCi0JLmhhc19kZGkgPSAxLAotCS5oYXNfZnBnYV9kYmcgPSAxLAot CS5oYXNfZmJjID0gMSwKLQlHRU5fREVGQVVMVF9QSVBFT0ZGU0VUUywKLQlJVkJfQ1VSU09SX09G RlNFVFMsCisJLmdlbiA9IDksCiB9OwogCiBzdGF0aWMgY29uc3Qgc3RydWN0IGludGVsX2Rldmlj ZV9pbmZvIGludGVsX3NreWxha2VfZ3QzX2luZm8gPSB7CisJSFNXX0ZFQVRVUkVTLAogCS5pc19z a3lsYWtlID0gMSwKLQkuZ2VuID0gOSwgLm51bV9waXBlcyA9IDMsCi0JLm5lZWRfZ2Z4X2h3cyA9 IDEsIC5oYXNfaG90cGx1ZyA9IDEsCisJLmdlbiA9IDksCiAJLnJpbmdfbWFzayA9IFJFTkRFUl9S SU5HIHwgQlNEX1JJTkcgfCBCTFRfUklORyB8IFZFQk9YX1JJTkcgfCBCU0QyX1JJTkcsCi0JLmhh c19sbGMgPSAxLAotCS5oYXNfZGRpID0gMSwKLQkuaGFzX2ZwZ2FfZGJnID0gMSwKLQkuaGFzX2Zi YyA9IDEsCi0JR0VOX0RFRkFVTFRfUElQRU9GRlNFVFMsCi0JSVZCX0NVUlNPUl9PRkZTRVRTLAog fTsKIAogc3RhdGljIGNvbnN0IHN0cnVjdCBpbnRlbF9kZXZpY2VfaW5mbyBpbnRlbF9icm94dG9u X2luZm8gPSB7CiAJLmlzX3ByZWxpbWluYXJ5ID0gMSwKIAkuaXNfYnJveHRvbiA9IDEsCkBAIC0z OTQsMzcgKzM0MywyMiBAQCBzdGF0aWMgY29uc3Qgc3RydWN0IGludGVsX2RldmljZV9pbmZvIGlu dGVsX2Jyb3h0b25faW5mbyA9IHsKIAlHRU5fREVGQVVMVF9QSVBFT0ZGU0VUUywKIAlJVkJfQ1VS U09SX09GRlNFVFMsCiB9OwogCiBzdGF0aWMgY29uc3Qgc3RydWN0IGludGVsX2RldmljZV9pbmZv IGludGVsX2thYnlsYWtlX2luZm8gPSB7CisJSFNXX0ZFQVRVUkVTLAogCS5pc19wcmVsaW1pbmFy eSA9IDEsCiAJLmlzX2thYnlsYWtlID0gMSwKIAkuZ2VuID0gOSwKLQkubnVtX3BpcGVzID0gMywK LQkubmVlZF9nZnhfaHdzID0gMSwgLmhhc19ob3RwbHVnID0gMSwKLQkucmluZ19tYXNrID0gUkVO REVSX1JJTkcgfCBCU0RfUklORyB8IEJMVF9SSU5HIHwgVkVCT1hfUklORywKLQkuaGFzX2xsYyA9 IDEsCi0JLmhhc19kZGkgPSAxLAotCS5oYXNfZnBnYV9kYmcgPSAxLAotCS5oYXNfZmJjID0gMSwK LQlHRU5fREVGQVVMVF9QSVBFT0ZGU0VUUywKLQlJVkJfQ1VSU09SX09GRlNFVFMsCiB9OwogCiBz dGF0aWMgY29uc3Qgc3RydWN0IGludGVsX2RldmljZV9pbmZvIGludGVsX2thYnlsYWtlX2d0M19p bmZvID0geworCUhTV19GRUFUVVJFUywKIAkuaXNfcHJlbGltaW5hcnkgPSAxLAogCS5pc19rYWJ5 bGFrZSA9IDEsCiAJLmdlbiA9IDksCi0JLm51bV9waXBlcyA9IDMsCi0JLm5lZWRfZ2Z4X2h3cyA9 IDEsIC5oYXNfaG90cGx1ZyA9IDEsCiAJLnJpbmdfbWFzayA9IFJFTkRFUl9SSU5HIHwgQlNEX1JJ TkcgfCBCTFRfUklORyB8IFZFQk9YX1JJTkcgfCBCU0QyX1JJTkcsCi0JLmhhc19sbGMgPSAxLAot CS5oYXNfZGRpID0gMSwKLQkuaGFzX2ZwZ2FfZGJnID0gMSwKLQkuaGFzX2ZiYyA9IDEsCi0JR0VO X0RFRkFVTFRfUElQRU9GRlNFVFMsCi0JSVZCX0NVUlNPUl9PRkZTRVRTLAogfTsKIAogLyoKICAq IE1ha2Ugc3VyZSBhbnkgZGV2aWNlIG1hdGNoZXMgaGVyZSBhcmUgZnJvbSBtb3N0IHNwZWNpZmlj IHRvIG1vc3QKICAqIGdlbmVyYWwuICBGb3IgZXhhbXBsZSwgc2luY2UgdGhlIFF1YW50YSBtYXRj aCBpcyBiYXNlZCBvbiB0aGUgc3Vic3lzdGVtCi0tIAoyLjYuMwoKX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRl bC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHA6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcv bWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK