From: Jani Nikula Subject: [PATCH v2 2/8] drm/i915/color: switch to kernel types Date: Fri, 18 Jan 2019 14:01:19 +0200 Message-ID: <20190118120125.15484-2-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 305446F70D for ; Fri, 18 Jan 2019 11:59:48 +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 TWl4ZWQgQzk5IGFuZCBrZXJuZWwgdHlwZXMgdXNlIGlzIGdldHRpbmcgdWdseS4JUHJlZmVyIGtl cm5lbCB0eXBlcy4KCnNlZCAtaSAncy9cYnVpbnRcKDhcfDE2XHwzMlx8NjRcKV90XGIvdVwxL2cn CgpBY2tlZC1ieTogQ2hyaXMgV2lsc29uIDxjaHJpc0BjaHJpcy13aWxzb24uY28udWs+CkFja2Vk LWJ5OiBUdnJ0a28gVXJzdWxpbiA8dHZydGtvLnVyc3VsaW5AaW50ZWwuY29tPgpSZXZpZXdlZC1i eTogVmlsbGUgU3lyasOkbMOkIDx2aWxsZS5zeXJqYWxhQGxpbnV4LmludGVsLmNvbT4KUmV2aWV3 ZWQtYnk6IEpvc8OpIFJvYmVydG8gZGUgU291emEgPGpvc2Uuc291emFAaW50ZWwuY29tPgpTaWdu ZWQtb2ZmLWJ5OiBKYW5pIE5pa3VsYSA8amFuaS5uaWt1bGFAaW50ZWwuY29tPgotLS0KIGRyaXZl cnMvZ3B1L2RybS9pOTE1L2ludGVsX2NvbG9yLmMgfCA0MCArKysrKysrKysrKysrKystLS0tLS0t LS0tLS0tLS0KIDEgZmlsZSBjaGFuZ2VkLCAyMCBpbnNlcnRpb25zKCspLCAyMCBkZWxldGlvbnMo LSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9jb2xvci5jIGIvZHJp dmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfY29sb3IuYwppbmRleCAzN2ZkOWRkZjc2MmUuLjI5OWVi Nzg1OGFkYyAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfY29sb3IuYwor KysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9jb2xvci5jCkBAIC0xNDIsNyArMTQyLDcg QEAgc3RhdGljIHZvaWQgaWxrX2xvYWRfY3NjX21hdHJpeChzdHJ1Y3QgaW50ZWxfY3J0Y19zdGF0 ZSAqY3J0Y19zdGF0ZSkKIAlzdHJ1Y3QgaW50ZWxfY3J0YyAqY3J0YyA9IHRvX2ludGVsX2NydGMo Y3J0Y19zdGF0ZS0+YmFzZS5jcnRjKTsKIAlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3By aXYgPSB0b19pOTE1KGNydGMtPmJhc2UuZGV2KTsKIAlpbnQgaSwgcGlwZSA9IGNydGMtPnBpcGU7 Ci0JdWludDE2X3QgY29lZmZzWzldID0geyAwLCB9OworCXUxNiBjb2VmZnNbOV0gPSB7IDAsIH07 CiAJYm9vbCBsaW1pdGVkX2NvbG9yX3JhbmdlID0gZmFsc2U7CiAKIAkvKgpAQCAtMTcxLDcgKzE3 MSw3IEBAIHN0YXRpYyB2b2lkIGlsa19sb2FkX2NzY19tYXRyaXgoc3RydWN0IGludGVsX2NydGNf c3RhdGUgKmNydGNfc3RhdGUpCiAJCSAqIGhhcmR3YXJlLgogCQkgKi8KIAkJZm9yIChpID0gMDsg aSA8IEFSUkFZX1NJWkUoY29lZmZzKTsgaSsrKSB7Ci0JCQl1aW50NjRfdCBhYnNfY29lZmYgPSAo KDFVTEwgPDwgNjMpIC0gMSkgJiBpbnB1dFtpXTsKKwkJCXU2NCBhYnNfY29lZmYgPSAoKDFVTEwg PDwgNjMpIC0gMSkgJiBpbnB1dFtpXTsKIAogCQkJLyoKIAkJCSAqIENsYW1wIGlucHV0IHZhbHVl IHRvIG1pbi9tYXggc3VwcG9ydGVkIGJ5CkBAIC0yMzMsNyArMjMzLDcgQEAgc3RhdGljIHZvaWQg aWxrX2xvYWRfY3NjX21hdHJpeChzdHJ1Y3QgaW50ZWxfY3J0Y19zdGF0ZSAqY3J0Y19zdGF0ZSkK IAlJOTE1X1dSSVRFKFBJUEVfQ1NDX1BSRU9GRl9MTyhwaXBlKSwgMCk7CiAKIAlpZiAoSU5URUxf R0VOKGRldl9wcml2KSA+IDYpIHsKLQkJdWludDE2X3QgcG9zdG9mZiA9IDA7CisJCXUxNiBwb3N0 b2ZmID0gMDsKIAogCQlpZiAobGltaXRlZF9jb2xvcl9yYW5nZSkKIAkJCXBvc3RvZmYgPSAoMTYg KiAoMSA8PCAxMikgLyAyNTUpICYgMHgxZmZmOwpAQCAtMjQ0LDcgKzI0NCw3IEBAIHN0YXRpYyB2 b2lkIGlsa19sb2FkX2NzY19tYXRyaXgoc3RydWN0IGludGVsX2NydGNfc3RhdGUgKmNydGNfc3Rh dGUpCiAKIAkJSTkxNV9XUklURShQSVBFX0NTQ19NT0RFKHBpcGUpLCAwKTsKIAl9IGVsc2Ugewot CQl1aW50MzJfdCBtb2RlID0gQ1NDX01PREVfWVVWX1RPX1JHQjsKKwkJdTMyIG1vZGUgPSBDU0Nf TU9ERV9ZVVZfVE9fUkdCOwogCiAJCWlmIChsaW1pdGVkX2NvbG9yX3JhbmdlKQogCQkJbW9kZSB8 PSBDU0NfQkxBQ0tfU0NSRUVOX09GRlNFVDsKQEAgLTI2MSwxNSArMjYxLDE1IEBAIHN0YXRpYyB2 b2lkIGNoZXJyeXZpZXdfbG9hZF9jc2NfbWF0cml4KHN0cnVjdCBpbnRlbF9jcnRjX3N0YXRlICpj cnRjX3N0YXRlKQogCXN0cnVjdCBkcm1fZGV2aWNlICpkZXYgPSBjcnRjX3N0YXRlLT5iYXNlLmNy dGMtPmRldjsKIAlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSB0b19pOTE1KGRl dik7CiAJaW50IHBpcGUgPSB0b19pbnRlbF9jcnRjKGNydGNfc3RhdGUtPmJhc2UuY3J0YyktPnBp cGU7Ci0JdWludDMyX3QgbW9kZTsKKwl1MzIgbW9kZTsKIAogCWlmIChjcnRjX3N0YXRlLT5iYXNl LmN0bSkgewogCQlzdHJ1Y3QgZHJtX2NvbG9yX2N0bSAqY3RtID0gY3J0Y19zdGF0ZS0+YmFzZS5j dG0tPmRhdGE7Ci0JCXVpbnQxNl90IGNvZWZmc1s5XSA9IHsgMCwgfTsKKwkJdTE2IGNvZWZmc1s5 XSA9IHsgMCwgfTsKIAkJaW50IGk7CiAKIAkJZm9yIChpID0gMDsgaSA8IEFSUkFZX1NJWkUoY29l ZmZzKTsgaSsrKSB7Ci0JCQl1aW50NjRfdCBhYnNfY29lZmYgPQorCQkJdTY0IGFic19jb2VmZiA9 CiAJCQkJKCgxVUxMIDw8IDYzKSAtIDEpICYgY3RtLT5tYXRyaXhbaV07CiAKIAkJCS8qIFJvdW5k IGNvZWZmaWNpZW50LiAqLwpAQCAtMzMxLDcgKzMzMSw3IEBAIHN0YXRpYyB2b2lkIGk5eHhfbG9h ZF9sdXRzX2ludGVybmFsKHN0cnVjdCBpbnRlbF9jcnRjX3N0YXRlICpjcnRjX3N0YXRlLAogCWlm IChibG9iKSB7CiAJCXN0cnVjdCBkcm1fY29sb3JfbHV0ICpsdXQgPSBibG9iLT5kYXRhOwogCQlm b3IgKGkgPSAwOyBpIDwgMjU2OyBpKyspIHsKLQkJCXVpbnQzMl90IHdvcmQgPQorCQkJdTMyIHdv cmQgPQogCQkJCShkcm1fY29sb3JfbHV0X2V4dHJhY3QobHV0W2ldLnJlZCwgOCkgPDwgMTYpIHwK IAkJCQkoZHJtX2NvbG9yX2x1dF9leHRyYWN0KGx1dFtpXS5ncmVlbiwgOCkgPDwgOCkgfAogCQkJ CWRybV9jb2xvcl9sdXRfZXh0cmFjdChsdXRbaV0uYmx1ZSwgOCk7CkBAIC0zNDMsNyArMzQzLDcg QEAgc3RhdGljIHZvaWQgaTl4eF9sb2FkX2x1dHNfaW50ZXJuYWwoc3RydWN0IGludGVsX2NydGNf c3RhdGUgKmNydGNfc3RhdGUsCiAJCX0KIAl9IGVsc2UgewogCQlmb3IgKGkgPSAwOyBpIDwgMjU2 OyBpKyspIHsKLQkJCXVpbnQzMl90IHdvcmQgPSAoaSA8PCAxNikgfCAoaSA8PCA4KSB8IGk7CisJ CQl1MzIgd29yZCA9IChpIDw8IDE2KSB8IChpIDw8IDgpIHwgaTsKIAogCQkJaWYgKEhBU19HTUNI X0RJU1BMQVkoZGV2X3ByaXYpKQogCQkJCUk5MTVfV1JJVEUoUEFMRVRURShwaXBlLCBpKSwgd29y ZCk7CkBAIC0zODgsNyArMzg4LDcgQEAgc3RhdGljIHZvaWQgYmR3X2xvYWRfZGVnYW1tYV9sdXQo c3RydWN0IGludGVsX2NydGNfc3RhdGUgKmNydGNfc3RhdGUpCiB7CiAJc3RydWN0IGRybV9pOTE1 X3ByaXZhdGUgKmRldl9wcml2ID0gdG9faTkxNShjcnRjX3N0YXRlLT5iYXNlLmNydGMtPmRldik7 CiAJZW51bSBwaXBlIHBpcGUgPSB0b19pbnRlbF9jcnRjKGNydGNfc3RhdGUtPmJhc2UuY3J0Yykt PnBpcGU7Ci0JdWludDMyX3QgaSwgbHV0X3NpemUgPSBJTlRFTF9JTkZPKGRldl9wcml2KS0+Y29s b3IuZGVnYW1tYV9sdXRfc2l6ZTsKKwl1MzIgaSwgbHV0X3NpemUgPSBJTlRFTF9JTkZPKGRldl9w cml2KS0+Y29sb3IuZGVnYW1tYV9sdXRfc2l6ZTsKIAogCUk5MTVfV1JJVEUoUFJFQ19QQUxfSU5E RVgocGlwZSksCiAJCSAgIFBBTF9QUkVDX1NQTElUX01PREUgfCBQQUxfUFJFQ19BVVRPX0lOQ1JF TUVOVCk7CkBAIC0zOTcsNyArMzk3LDcgQEAgc3RhdGljIHZvaWQgYmR3X2xvYWRfZGVnYW1tYV9s dXQoc3RydWN0IGludGVsX2NydGNfc3RhdGUgKmNydGNfc3RhdGUpCiAJCXN0cnVjdCBkcm1fY29s b3JfbHV0ICpsdXQgPSBjcnRjX3N0YXRlLT5iYXNlLmRlZ2FtbWFfbHV0LT5kYXRhOwogCiAJCWZv ciAoaSA9IDA7IGkgPCBsdXRfc2l6ZTsgaSsrKSB7Ci0JCQl1aW50MzJfdCB3b3JkID0KKwkJCXUz MiB3b3JkID0KIAkJCWRybV9jb2xvcl9sdXRfZXh0cmFjdChsdXRbaV0ucmVkLCAxMCkgPDwgMjAg fAogCQkJZHJtX2NvbG9yX2x1dF9leHRyYWN0KGx1dFtpXS5ncmVlbiwgMTApIDw8IDEwIHwKIAkJ CWRybV9jb2xvcl9sdXRfZXh0cmFjdChsdXRbaV0uYmx1ZSwgMTApOwpAQCAtNDA2LDcgKzQwNiw3 IEBAIHN0YXRpYyB2b2lkIGJkd19sb2FkX2RlZ2FtbWFfbHV0KHN0cnVjdCBpbnRlbF9jcnRjX3N0 YXRlICpjcnRjX3N0YXRlKQogCQl9CiAJfSBlbHNlIHsKIAkJZm9yIChpID0gMDsgaSA8IGx1dF9z aXplOyBpKyspIHsKLQkJCXVpbnQzMl90IHYgPSAoaSAqICgoMSA8PCAxMCkgLSAxKSkgLyAobHV0 X3NpemUgLSAxKTsKKwkJCXUzMiB2ID0gKGkgKiAoKDEgPDwgMTApIC0gMSkpIC8gKGx1dF9zaXpl IC0gMSk7CiAKIAkJCUk5MTVfV1JJVEUoUFJFQ19QQUxfREFUQShwaXBlKSwKIAkJCQkgICAodiA8 PCAyMCkgfCAodiA8PCAxMCkgfCB2KTsKQEAgLTQxOCw3ICs0MTgsNyBAQCBzdGF0aWMgdm9pZCBi ZHdfbG9hZF9nYW1tYV9sdXQoc3RydWN0IGludGVsX2NydGNfc3RhdGUgKmNydGNfc3RhdGUsIHUz MiBvZmZzZXQpCiB7CiAJc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0gdG9faTkx NShjcnRjX3N0YXRlLT5iYXNlLmNydGMtPmRldik7CiAJZW51bSBwaXBlIHBpcGUgPSB0b19pbnRl bF9jcnRjKGNydGNfc3RhdGUtPmJhc2UuY3J0YyktPnBpcGU7Ci0JdWludDMyX3QgaSwgbHV0X3Np emUgPSBJTlRFTF9JTkZPKGRldl9wcml2KS0+Y29sb3IuZ2FtbWFfbHV0X3NpemU7CisJdTMyIGks IGx1dF9zaXplID0gSU5URUxfSU5GTyhkZXZfcHJpdiktPmNvbG9yLmdhbW1hX2x1dF9zaXplOwog CiAJV0FSTl9PTihvZmZzZXQgJiB+UEFMX1BSRUNfSU5ERVhfVkFMVUVfTUFTSyk7CiAKQEAgLTQz MSw3ICs0MzEsNyBAQCBzdGF0aWMgdm9pZCBiZHdfbG9hZF9nYW1tYV9sdXQoc3RydWN0IGludGVs X2NydGNfc3RhdGUgKmNydGNfc3RhdGUsIHUzMiBvZmZzZXQpCiAJCXN0cnVjdCBkcm1fY29sb3Jf bHV0ICpsdXQgPSBjcnRjX3N0YXRlLT5iYXNlLmdhbW1hX2x1dC0+ZGF0YTsKIAogCQlmb3IgKGkg PSAwOyBpIDwgbHV0X3NpemU7IGkrKykgewotCQkJdWludDMyX3Qgd29yZCA9CisJCQl1MzIgd29y ZCA9CiAJCQkoZHJtX2NvbG9yX2x1dF9leHRyYWN0KGx1dFtpXS5yZWQsIDEwKSA8PCAyMCkgfAog CQkJKGRybV9jb2xvcl9sdXRfZXh0cmFjdChsdXRbaV0uZ3JlZW4sIDEwKSA8PCAxMCkgfAogCQkJ ZHJtX2NvbG9yX2x1dF9leHRyYWN0KGx1dFtpXS5ibHVlLCAxMCk7CkBAIC00NDksNyArNDQ5LDcg QEAgc3RhdGljIHZvaWQgYmR3X2xvYWRfZ2FtbWFfbHV0KHN0cnVjdCBpbnRlbF9jcnRjX3N0YXRl ICpjcnRjX3N0YXRlLCB1MzIgb2Zmc2V0KQogCQkJICAgZHJtX2NvbG9yX2x1dF9leHRyYWN0KGx1 dFtpXS5ibHVlLCAxNikpOwogCX0gZWxzZSB7CiAJCWZvciAoaSA9IDA7IGkgPCBsdXRfc2l6ZTsg aSsrKSB7Ci0JCQl1aW50MzJfdCB2ID0gKGkgKiAoKDEgPDwgMTApIC0gMSkpIC8gKGx1dF9zaXpl IC0gMSk7CisJCQl1MzIgdiA9IChpICogKCgxIDw8IDEwKSAtIDEpKSAvIChsdXRfc2l6ZSAtIDEp OwogCiAJCQlJOTE1X1dSSVRFKFBSRUNfUEFMX0RBVEEocGlwZSksCiAJCQkJICAgKHYgPDwgMjAp IHwgKHYgPDwgMTApIHwgdik7CkBAIC00OTEsOCArNDkxLDggQEAgc3RhdGljIHZvaWQgZ2xrX2xv YWRfZGVnYW1tYV9sdXQoc3RydWN0IGludGVsX2NydGNfc3RhdGUgKmNydGNfc3RhdGUpCiB7CiAJ c3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0gdG9faTkxNShjcnRjX3N0YXRlLT5i YXNlLmNydGMtPmRldik7CiAJZW51bSBwaXBlIHBpcGUgPSB0b19pbnRlbF9jcnRjKGNydGNfc3Rh dGUtPmJhc2UuY3J0YyktPnBpcGU7Ci0JY29uc3QgdWludDMyX3QgbHV0X3NpemUgPSAzMzsKLQl1 aW50MzJfdCBpOworCWNvbnN0IHUzMiBsdXRfc2l6ZSA9IDMzOworCXUzMiBpOwogCiAJLyoKIAkg KiBXaGVuIHNldHRpbmcgdGhlIGF1dG8taW5jcmVtZW50IGJpdCwgdGhlIGhhcmR3YXJlIHNlZW1z IHRvCkBAIC01MDcsNyArNTA3LDcgQEAgc3RhdGljIHZvaWQgZ2xrX2xvYWRfZGVnYW1tYV9sdXQo c3RydWN0IGludGVsX2NydGNfc3RhdGUgKmNydGNfc3RhdGUpCiAJICogIGRpZmZlcmVudCB2YWx1 ZXMgcGVyIGNoYW5uZWwsIHNvIHRoaXMganVzdCBsb2FkcyBhIGxpbmVhciB0YWJsZS4KIAkgKi8K IAlmb3IgKGkgPSAwOyBpIDwgbHV0X3NpemU7IGkrKykgewotCQl1aW50MzJfdCB2ID0gKGkgKiAo MSA8PCAxNikpIC8gKGx1dF9zaXplIC0gMSk7CisJCXUzMiB2ID0gKGkgKiAoMSA8PCAxNikpIC8g KGx1dF9zaXplIC0gMSk7CiAKIAkJSTkxNV9XUklURShQUkVfQ1NDX0dBTUNfREFUQShwaXBlKSwg dik7CiAJfQpAQCAtNTQ0LDggKzU0NCw4IEBAIHN0YXRpYyB2b2lkIGNoZXJyeXZpZXdfbG9hZF9s dXRzKHN0cnVjdCBpbnRlbF9jcnRjX3N0YXRlICpjcnRjX3N0YXRlKQogCXN0cnVjdCBkcm1faTkx NV9wcml2YXRlICpkZXZfcHJpdiA9IHRvX2k5MTUoY3J0Yy0+ZGV2KTsKIAllbnVtIHBpcGUgcGlw ZSA9IHRvX2ludGVsX2NydGMoY3J0YyktPnBpcGU7CiAJc3RydWN0IGRybV9jb2xvcl9sdXQgKmx1 dDsKLQl1aW50MzJfdCBpLCBsdXRfc2l6ZTsKLQl1aW50MzJfdCB3b3JkMCwgd29yZDE7CisJdTMy IGksIGx1dF9zaXplOworCXUzMiB3b3JkMCwgd29yZDE7CiAKIAlpZiAoY3J0Y19zdGF0ZV9pc19s ZWdhY3lfZ2FtbWEoY3J0Y19zdGF0ZSkpIHsKIAkJLyogVHVybiBvZmYgZGVnYW1tYS9nYW1tYSBv biBDR00gYmxvY2suICovCi0tIAoyLjIwLjEKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fCkludGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwtZ2Z4QGxpc3Rz LmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xp c3RpbmZvL2ludGVsLWdmeAo=