From: Jani Nikula Subject: [PATCH v2 5/8] drm/i915/csr: switch to kernel types Date: Fri, 18 Jan 2019 14:01:22 +0200 Message-ID: <20190118120125.15484-5-jani.nikula@intel.com> References: <20190118120125.15484-1-jani.nikula@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 ESMTPS id D9C9D6F712 for ; Fri, 18 Jan 2019 11:59:58 +0000 (UTC) In-Reply-To: <20190118120125.15484-1-jani.nikula@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: Jani Nikula List-Id: intel-gfx@lists.freedesktop.org TWl4ZWQgQzk5IGFuZCBrZXJuZWwgdHlwZXMgdXNlIGlzIGdldHRpbmcgdWdseS4gUHJlZmVyIGtl cm5lbCB0eXBlcy4KCnNlZCAtaSAncy9cYnVpbnRcKDhcfDE2XHwzMlx8NjRcKV90XGIvdVwxL2cn CgpNaW5vciBjaGVja3BhdGNoL3doaXRlcGFjZSBmaXhlcyBzcHJpbmtsZWQgb24gdG9wIG9mIHRo ZSBjaGFuZ2VkIGxpbmVzLgoKdjI6IG1vcmUgd2hpdGVzcGFjZSBmaXhlcyAoVmlsbGUsIEpvc8Op KQoKQWNrZWQtYnk6IENocmlzIFdpbHNvbiA8Y2hyaXNAY2hyaXMtd2lsc29uLmNvLnVrPgpBY2tl ZC1ieTogVHZydGtvIFVyc3VsaW4gPHR2cnRrby51cnN1bGluQGludGVsLmNvbT4KUmV2aWV3ZWQt Ynk6IFZpbGxlIFN5cmrDpGzDpCA8dmlsbGUuc3lyamFsYUBsaW51eC5pbnRlbC5jb20+ClJldmll d2VkLWJ5OiBKb3PDqSBSb2JlcnRvIGRlIFNvdXphIDxqb3NlLnNvdXphQGludGVsLmNvbT4KU2ln bmVkLW9mZi1ieTogSmFuaSBOaWt1bGEgPGphbmkubmlrdWxhQGludGVsLmNvbT4KLS0tCiBkcml2 ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9jc3IuYyB8IDY4ICsrKysrKysrKysrKysrKystLS0tLS0t LS0tLS0tLS0tCiAxIGZpbGUgY2hhbmdlZCwgMzQgaW5zZXJ0aW9ucygrKSwgMzQgZGVsZXRpb25z KC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfY3NyLmMgYi9kcml2 ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9jc3IuYwppbmRleCBlYTVmYjY0ZDMzZGQuLmU4YWMwNGMz M2UyOSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfY3NyLmMKKysrIGIv ZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfY3NyLmMKQEAgLTcwLDUwICs3MCw1MCBAQCBNT0RV TEVfRklSTVdBUkUoQlhUX0NTUl9QQVRIKTsKIAogc3RydWN0IGludGVsX2Nzc19oZWFkZXIgewog CS8qIDB4MDkgZm9yIERNQyAqLwotCXVpbnQzMl90IG1vZHVsZV90eXBlOworCXUzMiBtb2R1bGVf dHlwZTsKIAogCS8qIEluY2x1ZGVzIHRoZSBETUMgc3BlY2lmaWMgaGVhZGVyIGluIGR3b3JkcyAq LwotCXVpbnQzMl90IGhlYWRlcl9sZW47CisJdTMyIGhlYWRlcl9sZW47CiAKIAkvKiBhbHdheXMg dmFsdWUgd291bGQgYmUgMHgxMDAwMCAqLwotCXVpbnQzMl90IGhlYWRlcl92ZXI7CisJdTMyIGhl YWRlcl92ZXI7CiAKIAkvKiBOb3QgdXNlZCAqLwotCXVpbnQzMl90IG1vZHVsZV9pZDsKKwl1MzIg bW9kdWxlX2lkOwogCiAJLyogTm90IHVzZWQgKi8KLQl1aW50MzJfdCBtb2R1bGVfdmVuZG9yOwor CXUzMiBtb2R1bGVfdmVuZG9yOwogCiAJLyogaW4gWVlZWU1NREQgZm9ybWF0ICovCi0JdWludDMy X3QgZGF0ZTsKKwl1MzIgZGF0ZTsKIAogCS8qIFNpemUgaW4gZHdvcmRzIChDU1NfSGVhZGVybGVu ICsgUGFja2FnZUhlYWRlckxlbiArIGRtYyBGV3NMZW4pLzQgKi8KLQl1aW50MzJfdCBzaXplOwor CXUzMiBzaXplOwogCiAJLyogTm90IHVzZWQgKi8KLQl1aW50MzJfdCBrZXlfc2l6ZTsKKwl1MzIg a2V5X3NpemU7CiAKIAkvKiBOb3QgdXNlZCAqLwotCXVpbnQzMl90IG1vZHVsdXNfc2l6ZTsKKwl1 MzIgbW9kdWx1c19zaXplOwogCiAJLyogTm90IHVzZWQgKi8KLQl1aW50MzJfdCBleHBvbmVudF9z aXplOworCXUzMiBleHBvbmVudF9zaXplOwogCiAJLyogTm90IHVzZWQgKi8KLQl1aW50MzJfdCBy ZXNlcnZlZDFbMTJdOworCXUzMiByZXNlcnZlZDFbMTJdOwogCiAJLyogTWFqb3IgTWlub3IgKi8K LQl1aW50MzJfdCB2ZXJzaW9uOworCXUzMiB2ZXJzaW9uOwogCiAJLyogTm90IHVzZWQgKi8KLQl1 aW50MzJfdCByZXNlcnZlZDJbOF07CisJdTMyIHJlc2VydmVkMls4XTsKIAogCS8qIE5vdCB1c2Vk ICovCi0JdWludDMyX3Qga2VybmVsX2hlYWRlcl9pbmZvOworCXUzMiBrZXJuZWxfaGVhZGVyX2lu Zm87CiB9IF9fcGFja2VkOwogCiBzdHJ1Y3QgaW50ZWxfZndfaW5mbyB7Ci0JdWludDE2X3QgcmVz ZXJ2ZWQxOworCXUxNiByZXNlcnZlZDE7CiAKIAkvKiBTdGVwcGluZyAoQSwgQiwgQywgLi4uLCAq KS4gKiBpcyBhIHdpbGRjYXJkICovCiAJY2hhciBzdGVwcGluZzsKQEAgLTEyMSw4ICsxMjEsOCBA QCBzdHJ1Y3QgaW50ZWxfZndfaW5mbyB7CiAJLyogU3ViLXN0ZXBwaW5nICgwLCAxLCAuLi4sICop LiAqIGlzIGEgd2lsZGNhcmQgKi8KIAljaGFyIHN1YnN0ZXBwaW5nOwogCi0JdWludDMyX3Qgb2Zm c2V0OwotCXVpbnQzMl90IHJlc2VydmVkMjsKKwl1MzIgb2Zmc2V0OworCXUzMiByZXNlcnZlZDI7 CiB9IF9fcGFja2VkOwogCiBzdHJ1Y3QgaW50ZWxfcGFja2FnZV9oZWFkZXIgewpAQCAtMTM1LDE0 ICsxMzUsMTQgQEAgc3RydWN0IGludGVsX3BhY2thZ2VfaGVhZGVyIHsKIAl1bnNpZ25lZCBjaGFy IHJlc2VydmVkWzEwXTsKIAogCS8qIE51bWJlciBvZiB2YWxpZCBlbnRyaWVzIGluIHRoZSBGV0lu Zm8gYXJyYXkgYmVsb3cgKi8KLQl1aW50MzJfdCBudW1fZW50cmllczsKKwl1MzIgbnVtX2VudHJp ZXM7CiAKIAlzdHJ1Y3QgaW50ZWxfZndfaW5mbyBmd19pbmZvWzIwXTsKIH0gX19wYWNrZWQ7CiAK IHN0cnVjdCBpbnRlbF9kbWNfaGVhZGVyIHsKIAkvKiBhbHdheXMgdmFsdWUgd291bGQgYmUgMHg0 MDQwM0UzRSAqLwotCXVpbnQzMl90IHNpZ25hdHVyZTsKKwl1MzIgc2lnbmF0dXJlOwogCiAJLyog RE1DIGJpbmFyeSBoZWFkZXIgbGVuZ3RoICovCiAJdW5zaWduZWQgY2hhciBoZWFkZXJfbGVuOwpA QCAtMTUxLDMwICsxNTEsMzAgQEAgc3RydWN0IGludGVsX2RtY19oZWFkZXIgewogCXVuc2lnbmVk IGNoYXIgaGVhZGVyX3ZlcjsKIAogCS8qIFJlc2VydmVkICovCi0JdWludDE2X3QgZG1jY192ZXI7 CisJdTE2IGRtY2NfdmVyOwogCiAJLyogTWFqb3IsIE1pbm9yICovCi0JdWludDMyX3QJcHJvamVj dDsKKwl1MzIgcHJvamVjdDsKIAogCS8qIEZpcm13YXJlIHByb2dyYW0gc2l6ZSAoZXhjbHVkaW5n IGhlYWRlcikgaW4gZHdvcmRzICovCi0JdWludDMyX3QJZndfc2l6ZTsKKwl1MzIgZndfc2l6ZTsK IAogCS8qIE1ham9yIE1pbm9yIHZlcnNpb24gKi8KLQl1aW50MzJfdCBmd192ZXJzaW9uOworCXUz MiBmd192ZXJzaW9uOwogCiAJLyogTnVtYmVyIG9mIHZhbGlkIE1NSU8gY3ljbGVzIHByZXNlbnQu ICovCi0JdWludDMyX3QgbW1pb19jb3VudDsKKwl1MzIgbW1pb19jb3VudDsKIAogCS8qIE1NSU8g YWRkcmVzcyAqLwotCXVpbnQzMl90IG1taW9hZGRyWzhdOworCXUzMiBtbWlvYWRkcls4XTsKIAog CS8qIE1NSU8gZGF0YSAqLwotCXVpbnQzMl90IG1taW9kYXRhWzhdOworCXUzMiBtbWlvZGF0YVs4 XTsKIAogCS8qIEZXIGZpbGVuYW1lICAqLwogCXVuc2lnbmVkIGNoYXIgZGZpbGVbMzJdOwogCi0J dWludDMyX3QgcmVzZXJ2ZWQxWzJdOworCXUzMiByZXNlcnZlZDFbMl07CiB9IF9fcGFja2VkOwog CiBzdHJ1Y3Qgc3RlcHBpbmdfaW5mbyB7CkBAIC0yMzAsNyArMjMwLDcgQEAgaW50ZWxfZ2V0X3N0 ZXBwaW5nX2luZm8oc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KQogCiBzdGF0aWMg dm9pZCBnZW45X3NldF9kY19zdGF0ZV9kZWJ1Z21hc2soc3RydWN0IGRybV9pOTE1X3ByaXZhdGUg KmRldl9wcml2KQogewotCXVpbnQzMl90IHZhbCwgbWFzazsKKwl1MzIgdmFsLCBtYXNrOwogCiAJ bWFzayA9IERDX1NUQVRFX0RFQlVHX01BU0tfTUVNT1JZX1VQOwogCkBAIC0yNTcsNyArMjU3LDcg QEAgc3RhdGljIHZvaWQgZ2VuOV9zZXRfZGNfc3RhdGVfZGVidWdtYXNrKHN0cnVjdCBkcm1faTkx NV9wcml2YXRlICpkZXZfcHJpdikKIHZvaWQgaW50ZWxfY3NyX2xvYWRfcHJvZ3JhbShzdHJ1Y3Qg ZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpCiB7CiAJdTMyICpwYXlsb2FkID0gZGV2X3ByaXYt PmNzci5kbWNfcGF5bG9hZDsKLQl1aW50MzJfdCBpLCBmd19zaXplOworCXUzMiBpLCBmd19zaXpl OwogCiAJaWYgKCFIQVNfQ1NSKGRldl9wcml2KSkgewogCQlEUk1fRVJST1IoIk5vIENTUiBzdXBw b3J0IGF2YWlsYWJsZSBmb3IgdGhpcyBwbGF0Zm9ybVxuIik7CkBAIC0yODksMTcgKzI4OSwxNyBA QCB2b2lkIGludGVsX2Nzcl9sb2FkX3Byb2dyYW0oc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRl dl9wcml2KQogCWdlbjlfc2V0X2RjX3N0YXRlX2RlYnVnbWFzayhkZXZfcHJpdik7CiB9CiAKLXN0 YXRpYyB1aW50MzJfdCAqcGFyc2VfY3NyX2Z3KHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZf cHJpdiwKLQkJCSAgICAgIGNvbnN0IHN0cnVjdCBmaXJtd2FyZSAqZncpCitzdGF0aWMgdTMyICpw YXJzZV9jc3JfZncoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2LAorCQkJIGNvbnN0 IHN0cnVjdCBmaXJtd2FyZSAqZncpCiB7CiAJc3RydWN0IGludGVsX2Nzc19oZWFkZXIgKmNzc19o ZWFkZXI7CiAJc3RydWN0IGludGVsX3BhY2thZ2VfaGVhZGVyICpwYWNrYWdlX2hlYWRlcjsKIAlz dHJ1Y3QgaW50ZWxfZG1jX2hlYWRlciAqZG1jX2hlYWRlcjsKIAlzdHJ1Y3QgaW50ZWxfY3NyICpj c3IgPSAmZGV2X3ByaXYtPmNzcjsKIAljb25zdCBzdHJ1Y3Qgc3RlcHBpbmdfaW5mbyAqc2kgPSBp bnRlbF9nZXRfc3RlcHBpbmdfaW5mbyhkZXZfcHJpdik7Ci0JdWludDMyX3QgZG1jX29mZnNldCA9 IENTUl9ERUZBVUxUX0ZXX09GRlNFVCwgcmVhZGNvdW50ID0gMCwgbmJ5dGVzOwotCXVpbnQzMl90 IGk7Ci0JdWludDMyX3QgKmRtY19wYXlsb2FkOworCXUzMiBkbWNfb2Zmc2V0ID0gQ1NSX0RFRkFV TFRfRldfT0ZGU0VULCByZWFkY291bnQgPSAwLCBuYnl0ZXM7CisJdTMyIGk7CisJdTMyICpkbWNf cGF5bG9hZDsKIAogCWlmICghZncpCiAJCXJldHVybiBOVUxMOwotLSAKMi4yMC4xCgpfX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpJbnRlbC1nZnggbWFpbGlu ZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVl ZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK