From mboxrd@z Thu Jan 1 00:00:00 1970 From: Wayne Boyer Subject: [PATCH] drm/i915: Clean up device info structure definitions Date: Fri, 4 Dec 2015 09:30:00 -0800 Message-ID: <1449250200-21102-1-git-send-email-wayne.boyer@intel.com> References: <20151204150959.GN27216@nuc-i3427.alporthouse.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 D0FC36E340 for ; Fri, 4 Dec 2015 09:30:10 -0800 (PST) In-Reply-To: <20151204150959.GN27216@nuc-i3427.alporthouse.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 bG93IHBvd2VyIGRldmljZXMuIChKYW5pKQp2MzogSW5jbHVkZSBIU1dfRkVBVFVSRVMgZGVmaW5p dGlvbiBpbiBpbnRlbF9za3lsYWtlX2d0M19pbmZvLiAoQ2hyaXMpCgpDYzogUm9kcmlnbyBWaXZp IDxyb2RyaWdvLnZpdmlAaW50ZWwuY29tPgpTaWduZWQtb2ZmLWJ5OiBXYXluZSBCb3llciA8d2F5 bmUuYm95ZXJAaW50ZWwuY29tPgotLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmMg fCAxMzggKysrKysrKysrKystLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLQogMSBmaWxlIGNo YW5nZWQsIDM2IGluc2VydGlvbnMoKyksIDEwMiBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9k cml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkx NV9kcnYuYwppbmRleCA5MGZhYThlLi40NmFjNjY0IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9k cm0vaTkxNS9pOTE1X2Rydi5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmMK QEAgLTIyNiwxMjUgKzIyNiw4NyBAQCBzdGF0aWMgY29uc3Qgc3RydWN0IGludGVsX2RldmljZV9p bmZvIGludGVsX3NhbmR5YnJpZGdlX21faW5mbyA9IHsKICNkZWZpbmUgR0VON19GRUFUVVJFUyAg XAogCS5nZW4gPSA3LCAubnVtX3BpcGVzID0gMywgXAogCS5uZWVkX2dmeF9od3MgPSAxLCAuaGFz X2hvdHBsdWcgPSAxLCBcCiAJLmhhc19mYmMgPSAxLCBcCiAJLnJpbmdfbWFzayA9IFJFTkRFUl9S SU5HIHwgQlNEX1JJTkcgfCBCTFRfUklORywgXAotCS5oYXNfbGxjID0gMQorCS5oYXNfbGxjID0g MSwgXAorCUdFTl9ERUZBVUxUX1BJUEVPRkZTRVRTLCBcCisJSVZCX0NVUlNPUl9PRkZTRVRTCiAK IHN0YXRpYyBjb25zdCBzdHJ1Y3QgaW50ZWxfZGV2aWNlX2luZm8gaW50ZWxfaXZ5YnJpZGdlX2Rf aW5mbyA9IHsKIAlHRU43X0ZFQVRVUkVTLAogCS5pc19pdnlicmlkZ2UgPSAxLAotCUdFTl9ERUZB VUxUX1BJUEVPRkZTRVRTLAotCUlWQl9DVVJTT1JfT0ZGU0VUUywKIH07CiAKIHN0YXRpYyBjb25z dCBzdHJ1Y3QgaW50ZWxfZGV2aWNlX2luZm8gaW50ZWxfaXZ5YnJpZGdlX21faW5mbyA9IHsKIAlH RU43X0ZFQVRVUkVTLAogCS5pc19pdnlicmlkZ2UgPSAxLAogCS5pc19tb2JpbGUgPSAxLAotCUdF Tl9ERUZBVUxUX1BJUEVPRkZTRVRTLAotCUlWQl9DVVJTT1JfT0ZGU0VUUywKIH07CiAKIHN0YXRp YyBjb25zdCBzdHJ1Y3QgaW50ZWxfZGV2aWNlX2luZm8gaW50ZWxfaXZ5YnJpZGdlX3FfaW5mbyA9 IHsKIAlHRU43X0ZFQVRVUkVTLAogCS5pc19pdnlicmlkZ2UgPSAxLAogCS5udW1fcGlwZXMgPSAw LCAvKiBsZWdhbCwgbGFzdCBvbmUgd2lucyAqLwotCUdFTl9ERUZBVUxUX1BJUEVPRkZTRVRTLAot CUlWQl9DVVJTT1JfT0ZGU0VUUywKIH07CiAKKyNkZWZpbmUgVkxWX0ZFQVRVUkVTICBcCisJLmdl biA9IDcsIC5udW1fcGlwZXMgPSAyLCBcCisJLm5lZWRfZ2Z4X2h3cyA9IDEsIC5oYXNfaG90cGx1 ZyA9IDEsIFwKKwkucmluZ19tYXNrID0gUkVOREVSX1JJTkcgfCBCU0RfUklORyB8IEJMVF9SSU5H LCBcCisJLmRpc3BsYXlfbW1pb19vZmZzZXQgPSBWTFZfRElTUExBWV9CQVNFLCBcCisJR0VOX0RF RkFVTFRfUElQRU9GRlNFVFMsIFwKKwlDVVJTT1JfT0ZGU0VUUworCiBzdGF0aWMgY29uc3Qgc3Ry dWN0IGludGVsX2RldmljZV9pbmZvIGludGVsX3ZhbGxleXZpZXdfbV9pbmZvID0gewotCUdFTjdf RkVBVFVSRVMsCi0JLmlzX21vYmlsZSA9IDEsCi0JLm51bV9waXBlcyA9IDIsCisJVkxWX0ZFQVRV UkVTLAogCS5pc192YWxsZXl2aWV3ID0gMSwKLQkuZGlzcGxheV9tbWlvX29mZnNldCA9IFZMVl9E SVNQTEFZX0JBU0UsCi0JLmhhc19mYmMgPSAwLCAvKiBsZWdhbCwgbGFzdCBvbmUgd2lucyAqLwot CS5oYXNfbGxjID0gMCwgLyogbGVnYWwsIGxhc3Qgb25lIHdpbnMgKi8KLQlHRU5fREVGQVVMVF9Q SVBFT0ZGU0VUUywKLQlDVVJTT1JfT0ZGU0VUUywKKwkuaXNfbW9iaWxlID0gMSwKIH07CiAKIHN0 YXRpYyBjb25zdCBzdHJ1Y3QgaW50ZWxfZGV2aWNlX2luZm8gaW50ZWxfdmFsbGV5dmlld19kX2lu Zm8gPSB7Ci0JR0VON19GRUFUVVJFUywKLQkubnVtX3BpcGVzID0gMiwKKwlWTFZfRkVBVFVSRVMs CiAJLmlzX3ZhbGxleXZpZXcgPSAxLAotCS5kaXNwbGF5X21taW9fb2Zmc2V0ID0gVkxWX0RJU1BM QVlfQkFTRSwKLQkuaGFzX2ZiYyA9IDAsIC8qIGxlZ2FsLCBsYXN0IG9uZSB3aW5zICovCi0JLmhh c19sbGMgPSAwLCAvKiBsZWdhbCwgbGFzdCBvbmUgd2lucyAqLwotCUdFTl9ERUZBVUxUX1BJUEVP RkZTRVRTLAotCUNVUlNPUl9PRkZTRVRTLAogfTsKIAorI2RlZmluZSBIU1dfRkVBVFVSRVMgIFwK KwlHRU43X0ZFQVRVUkVTLCBcCisJLnJpbmdfbWFzayA9IFJFTkRFUl9SSU5HIHwgQlNEX1JJTkcg fCBCTFRfUklORyB8IFZFQk9YX1JJTkcsIFwKKwkuaGFzX2RkaSA9IDEsIFwKKwkuaGFzX2ZwZ2Ff ZGJnID0gMQorCiBzdGF0aWMgY29uc3Qgc3RydWN0IGludGVsX2RldmljZV9pbmZvIGludGVsX2hh c3dlbGxfZF9pbmZvID0gewotCUdFTjdfRkVBVFVSRVMsCisJSFNXX0ZFQVRVUkVTLAogCS5pc19o YXN3ZWxsID0gMSwKLQkuaGFzX2RkaSA9IDEsCi0JLmhhc19mcGdhX2RiZyA9IDEsCi0JLnJpbmdf bWFzayA9IFJFTkRFUl9SSU5HIHwgQlNEX1JJTkcgfCBCTFRfUklORyB8IFZFQk9YX1JJTkcsCi0J R0VOX0RFRkFVTFRfUElQRU9GRlNFVFMsCi0JSVZCX0NVUlNPUl9PRkZTRVRTLAogfTsKIAogc3Rh dGljIGNvbnN0IHN0cnVjdCBpbnRlbF9kZXZpY2VfaW5mbyBpbnRlbF9oYXN3ZWxsX21faW5mbyA9 IHsKLQlHRU43X0ZFQVRVUkVTLAorCUhTV19GRUFUVVJFUywKIAkuaXNfaGFzd2VsbCA9IDEsCiAJ LmlzX21vYmlsZSA9IDEsCi0JLmhhc19kZGkgPSAxLAotCS5oYXNfZnBnYV9kYmcgPSAxLAotCS5y aW5nX21hc2sgPSBSRU5ERVJfUklORyB8IEJTRF9SSU5HIHwgQkxUX1JJTkcgfCBWRUJPWF9SSU5H LAotCUdFTl9ERUZBVUxUX1BJUEVPRkZTRVRTLAotCUlWQl9DVVJTT1JfT0ZGU0VUUywKIH07CiAK IHN0YXRpYyBjb25zdCBzdHJ1Y3QgaW50ZWxfZGV2aWNlX2luZm8gaW50ZWxfYnJvYWR3ZWxsX2Rf aW5mbyA9IHsKLQkuZ2VuID0gOCwgLm51bV9waXBlcyA9IDMsCi0JLm5lZWRfZ2Z4X2h3cyA9IDEs IC5oYXNfaG90cGx1ZyA9IDEsCi0JLnJpbmdfbWFzayA9IFJFTkRFUl9SSU5HIHwgQlNEX1JJTkcg fCBCTFRfUklORyB8IFZFQk9YX1JJTkcsCi0JLmhhc19sbGMgPSAxLAotCS5oYXNfZGRpID0gMSwK LQkuaGFzX2ZwZ2FfZGJnID0gMSwKLQkuaGFzX2ZiYyA9IDEsCi0JR0VOX0RFRkFVTFRfUElQRU9G RlNFVFMsCi0JSVZCX0NVUlNPUl9PRkZTRVRTLAorCUhTV19GRUFUVVJFUywKKwkuZ2VuID0gOCwK IH07CiAKIHN0YXRpYyBjb25zdCBzdHJ1Y3QgaW50ZWxfZGV2aWNlX2luZm8gaW50ZWxfYnJvYWR3 ZWxsX21faW5mbyA9IHsKLQkuZ2VuID0gOCwgLmlzX21vYmlsZSA9IDEsIC5udW1fcGlwZXMgPSAz LAotCS5uZWVkX2dmeF9od3MgPSAxLCAuaGFzX2hvdHBsdWcgPSAxLAotCS5yaW5nX21hc2sgPSBS RU5ERVJfUklORyB8IEJTRF9SSU5HIHwgQkxUX1JJTkcgfCBWRUJPWF9SSU5HLAotCS5oYXNfbGxj ID0gMSwKLQkuaGFzX2RkaSA9IDEsCi0JLmhhc19mcGdhX2RiZyA9IDEsCi0JLmhhc19mYmMgPSAx LAotCUdFTl9ERUZBVUxUX1BJUEVPRkZTRVRTLAotCUlWQl9DVVJTT1JfT0ZGU0VUUywKKwlIU1df RkVBVFVSRVMsCisJLmdlbiA9IDgsIC5pc19tb2JpbGUgPSAxLAogfTsKIAogc3RhdGljIGNvbnN0 IHN0cnVjdCBpbnRlbF9kZXZpY2VfaW5mbyBpbnRlbF9icm9hZHdlbGxfZ3QzZF9pbmZvID0gewot CS5nZW4gPSA4LCAubnVtX3BpcGVzID0gMywKLQkubmVlZF9nZnhfaHdzID0gMSwgLmhhc19ob3Rw bHVnID0gMSwKKwlIU1dfRkVBVFVSRVMsCisJLmdlbiA9IDgsCiAJLnJpbmdfbWFzayA9IFJFTkRF Ul9SSU5HIHwgQlNEX1JJTkcgfCBCTFRfUklORyB8IFZFQk9YX1JJTkcgfCBCU0QyX1JJTkcsCi0J Lmhhc19sbGMgPSAxLAotCS5oYXNfZGRpID0gMSwKLQkuaGFzX2ZwZ2FfZGJnID0gMSwKLQkuaGFz X2ZiYyA9IDEsCi0JR0VOX0RFRkFVTFRfUElQRU9GRlNFVFMsCi0JSVZCX0NVUlNPUl9PRkZTRVRT LAogfTsKIAogc3RhdGljIGNvbnN0IHN0cnVjdCBpbnRlbF9kZXZpY2VfaW5mbyBpbnRlbF9icm9h ZHdlbGxfZ3QzbV9pbmZvID0gewotCS5nZW4gPSA4LCAuaXNfbW9iaWxlID0gMSwgLm51bV9waXBl cyA9IDMsCi0JLm5lZWRfZ2Z4X2h3cyA9IDEsIC5oYXNfaG90cGx1ZyA9IDEsCisJSFNXX0ZFQVRV UkVTLAorCS5nZW4gPSA4LCAuaXNfbW9iaWxlID0gMSwKIAkucmluZ19tYXNrID0gUkVOREVSX1JJ TkcgfCBCU0RfUklORyB8IEJMVF9SSU5HIHwgVkVCT1hfUklORyB8IEJTRDJfUklORywKLQkuaGFz X2xsYyA9IDEsCi0JLmhhc19kZGkgPSAxLAotCS5oYXNfZnBnYV9kYmcgPSAxLAotCS5oYXNfZmJj ID0gMSwKLQlHRU5fREVGQVVMVF9QSVBFT0ZGU0VUUywKLQlJVkJfQ1VSU09SX09GRlNFVFMsCiB9 OwogCiBzdGF0aWMgY29uc3Qgc3RydWN0IGludGVsX2RldmljZV9pbmZvIGludGVsX2NoZXJyeXZp ZXdfaW5mbyA9IHsKIAkuZ2VuID0gOCwgLm51bV9waXBlcyA9IDMsCiAJLm5lZWRfZ2Z4X2h3cyA9 IDEsIC5oYXNfaG90cGx1ZyA9IDEsCkBAIC0zNTQsMzMgKzMxNiwyMCBAQCBzdGF0aWMgY29uc3Qg c3RydWN0IGludGVsX2RldmljZV9pbmZvIGludGVsX2NoZXJyeXZpZXdfaW5mbyA9IHsKIAlHRU5f Q0hWX1BJUEVPRkZTRVRTLAogCUNVUlNPUl9PRkZTRVRTLAogfTsKIAogc3RhdGljIGNvbnN0IHN0 cnVjdCBpbnRlbF9kZXZpY2VfaW5mbyBpbnRlbF9za3lsYWtlX2luZm8gPSB7CisJSFNXX0ZFQVRV UkVTLAogCS5pc19za3lsYWtlID0gMSwKLQkuZ2VuID0gOSwgLm51bV9waXBlcyA9IDMsCi0JLm5l ZWRfZ2Z4X2h3cyA9IDEsIC5oYXNfaG90cGx1ZyA9IDEsCi0JLnJpbmdfbWFzayA9IFJFTkRFUl9S SU5HIHwgQlNEX1JJTkcgfCBCTFRfUklORyB8IFZFQk9YX1JJTkcsCi0JLmhhc19sbGMgPSAxLAot CS5oYXNfZGRpID0gMSwKLQkuaGFzX2ZwZ2FfZGJnID0gMSwKLQkuaGFzX2ZiYyA9IDEsCi0JR0VO X0RFRkFVTFRfUElQRU9GRlNFVFMsCi0JSVZCX0NVUlNPUl9PRkZTRVRTLAorCS5nZW4gPSA5LAog fTsKIAogc3RhdGljIGNvbnN0IHN0cnVjdCBpbnRlbF9kZXZpY2VfaW5mbyBpbnRlbF9za3lsYWtl X2d0M19pbmZvID0geworCUhTV19GRUFUVVJFUywKIAkuaXNfc2t5bGFrZSA9IDEsCi0JLmdlbiA9 IDksIC5udW1fcGlwZXMgPSAzLAotCS5uZWVkX2dmeF9od3MgPSAxLCAuaGFzX2hvdHBsdWcgPSAx LAorCS5nZW4gPSA5LAogCS5yaW5nX21hc2sgPSBSRU5ERVJfUklORyB8IEJTRF9SSU5HIHwgQkxU X1JJTkcgfCBWRUJPWF9SSU5HIHwgQlNEMl9SSU5HLAotCS5oYXNfbGxjID0gMSwKLQkuaGFzX2Rk aSA9IDEsCi0JLmhhc19mcGdhX2RiZyA9IDEsCi0JLmhhc19mYmMgPSAxLAotCUdFTl9ERUZBVUxU X1BJUEVPRkZTRVRTLAotCUlWQl9DVVJTT1JfT0ZGU0VUUywKIH07CiAKIHN0YXRpYyBjb25zdCBz dHJ1Y3QgaW50ZWxfZGV2aWNlX2luZm8gaW50ZWxfYnJveHRvbl9pbmZvID0gewogCS5pc19wcmVs aW1pbmFyeSA9IDEsCiAJLmlzX2Jyb3h0b24gPSAxLApAQCAtMzk0LDM3ICszNDMsMjIgQEAgc3Rh dGljIGNvbnN0IHN0cnVjdCBpbnRlbF9kZXZpY2VfaW5mbyBpbnRlbF9icm94dG9uX2luZm8gPSB7 CiAJR0VOX0RFRkFVTFRfUElQRU9GRlNFVFMsCiAJSVZCX0NVUlNPUl9PRkZTRVRTLAogfTsKIAog c3RhdGljIGNvbnN0IHN0cnVjdCBpbnRlbF9kZXZpY2VfaW5mbyBpbnRlbF9rYWJ5bGFrZV9pbmZv ID0geworCUhTV19GRUFUVVJFUywKIAkuaXNfcHJlbGltaW5hcnkgPSAxLAogCS5pc19rYWJ5bGFr ZSA9IDEsCiAJLmdlbiA9IDksCi0JLm51bV9waXBlcyA9IDMsCi0JLm5lZWRfZ2Z4X2h3cyA9IDEs IC5oYXNfaG90cGx1ZyA9IDEsCi0JLnJpbmdfbWFzayA9IFJFTkRFUl9SSU5HIHwgQlNEX1JJTkcg fCBCTFRfUklORyB8IFZFQk9YX1JJTkcsCi0JLmhhc19sbGMgPSAxLAotCS5oYXNfZGRpID0gMSwK LQkuaGFzX2ZwZ2FfZGJnID0gMSwKLQkuaGFzX2ZiYyA9IDEsCi0JR0VOX0RFRkFVTFRfUElQRU9G RlNFVFMsCi0JSVZCX0NVUlNPUl9PRkZTRVRTLAogfTsKIAogc3RhdGljIGNvbnN0IHN0cnVjdCBp bnRlbF9kZXZpY2VfaW5mbyBpbnRlbF9rYWJ5bGFrZV9ndDNfaW5mbyA9IHsKKwlIU1dfRkVBVFVS RVMsCiAJLmlzX3ByZWxpbWluYXJ5ID0gMSwKIAkuaXNfa2FieWxha2UgPSAxLAogCS5nZW4gPSA5 LAotCS5udW1fcGlwZXMgPSAzLAotCS5uZWVkX2dmeF9od3MgPSAxLCAuaGFzX2hvdHBsdWcgPSAx LAogCS5yaW5nX21hc2sgPSBSRU5ERVJfUklORyB8IEJTRF9SSU5HIHwgQkxUX1JJTkcgfCBWRUJP WF9SSU5HIHwgQlNEMl9SSU5HLAotCS5oYXNfbGxjID0gMSwKLQkuaGFzX2RkaSA9IDEsCi0JLmhh c19mcGdhX2RiZyA9IDEsCi0JLmhhc19mYmMgPSAxLAotCUdFTl9ERUZBVUxUX1BJUEVPRkZTRVRT LAotCUlWQl9DVVJTT1JfT0ZGU0VUUywKIH07CiAKIC8qCiAgKiBNYWtlIHN1cmUgYW55IGRldmlj ZSBtYXRjaGVzIGhlcmUgYXJlIGZyb20gbW9zdCBzcGVjaWZpYyB0byBtb3N0CiAgKiBnZW5lcmFs LiAgRm9yIGV4YW1wbGUsIHNpbmNlIHRoZSBRdWFudGEgbWF0Y2ggaXMgYmFzZWQgb24gdGhlIHN1 YnN5c3RlbQotLSAKMi42LjMKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fCkludGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNr dG9wLm9yZwpodHRwOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50 ZWwtZ2Z4Cg==