From: Jani Nikula Subject: [PATCH 5/5] drm/i915/fixed: cosmetic cleanup Date: Thu, 15 Nov 2018 14:01:26 +0200 Message-ID: <20181115120126.9545-5-jani.nikula@intel.com> References: <20181115120126.9545-1-jani.nikula@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) by gabe.freedesktop.org (Postfix) with ESMTPS id 1BE986E61F for ; Thu, 15 Nov 2018 12:01:00 +0000 (UTC) In-Reply-To: <20181115120126.9545-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@intel.com List-Id: intel-gfx@lists.freedesktop.org Q2xlYW4gdXAgZml4ZWQgcG9pbnQgdGVtcCB2YXJpYWJsZSBpbml0aWFsaXphdGlvbiwgdXNlIHRo ZSBtb3JlCmNvbnZlbnRpb25hbCB0bXAgbmFtZSBmb3IgdGVtcCB2YXJpYWJsZXMsIGFkZCBlbXB0 eSBsaW5lcyBiZWZvcmUKcmV0dXJuLiBObyBmdW5jdGlvbmFsIGNoYW5nZXMuCgpTaWduZWQtb2Zm LWJ5OiBKYW5pIE5pa3VsYSA8amFuaS5uaWt1bGFAaW50ZWwuY29tPgotLS0KIGRyaXZlcnMvZ3B1 L2RybS9pOTE1L2k5MTVfZml4ZWQuaCB8IDc3ICsrKysrKysrKysrKysrKysrKysrKy0tLS0tLS0t LS0tLS0tLS0tLQogMSBmaWxlIGNoYW5nZWQsIDQxIGluc2VydGlvbnMoKyksIDM2IGRlbGV0aW9u cygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZml4ZWQuaCBiL2Ry aXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZml4ZWQuaAppbmRleCA1MjRmMWM5NWM0ZTEuLmE3YTNl YWNkMjU1ZSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9maXhlZC5oCisr KyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZml4ZWQuaApAQCAtMTYsMTEgKzE2LDEwIEBA IHN0YXRpYyBpbmxpbmUgYm9vbCBpc19maXhlZDE2X3plcm8odWludF9maXhlZF8xNl8xNl90IHZh bCkKIAogc3RhdGljIGlubGluZSB1aW50X2ZpeGVkXzE2XzE2X3QgdTMyX3RvX2ZpeGVkMTYodTMy IHZhbCkKIHsKLQl1aW50X2ZpeGVkXzE2XzE2X3QgZnA7CisJdWludF9maXhlZF8xNl8xNl90IGZw ID0geyAudmFsID0gdmFsIDw8IDE2IH07CiAKIAlXQVJOX09OKHZhbCA+IFUxNl9NQVgpOwogCi0J ZnAudmFsID0gdmFsIDw8IDE2OwogCXJldHVybiBmcDsKIH0KIApAQCAtMzcsMjYgKzM2LDI1IEBA IHN0YXRpYyBpbmxpbmUgdTMyIGZpeGVkMTZfdG9fdTMyKHVpbnRfZml4ZWRfMTZfMTZfdCBmcCkK IHN0YXRpYyBpbmxpbmUgdWludF9maXhlZF8xNl8xNl90IG1pbl9maXhlZDE2KHVpbnRfZml4ZWRf MTZfMTZfdCBtaW4xLAogCQkJCQkgICAgIHVpbnRfZml4ZWRfMTZfMTZfdCBtaW4yKQogewotCXVp bnRfZml4ZWRfMTZfMTZfdCBtaW47CisJdWludF9maXhlZF8xNl8xNl90IG1pbiA9IHsgLnZhbCA9 IG1pbihtaW4xLnZhbCwgbWluMi52YWwpIH07CiAKLQltaW4udmFsID0gbWluKG1pbjEudmFsLCBt aW4yLnZhbCk7CiAJcmV0dXJuIG1pbjsKIH0KIAogc3RhdGljIGlubGluZSB1aW50X2ZpeGVkXzE2 XzE2X3QgbWF4X2ZpeGVkMTYodWludF9maXhlZF8xNl8xNl90IG1heDEsCiAJCQkJCSAgICAgdWlu dF9maXhlZF8xNl8xNl90IG1heDIpCiB7Ci0JdWludF9maXhlZF8xNl8xNl90IG1heDsKKwl1aW50 X2ZpeGVkXzE2XzE2X3QgbWF4ID0geyAudmFsID0gbWF4KG1heDEudmFsLCBtYXgyLnZhbCkgfTsK IAotCW1heC52YWwgPSBtYXgobWF4MS52YWwsIG1heDIudmFsKTsKIAlyZXR1cm4gbWF4OwogfQog CiBzdGF0aWMgaW5saW5lIHVpbnRfZml4ZWRfMTZfMTZfdCBjbGFtcF91NjRfdG9fZml4ZWQxNih1 NjQgdmFsKQogewotCXVpbnRfZml4ZWRfMTZfMTZfdCBmcDsKKwl1aW50X2ZpeGVkXzE2XzE2X3Qg ZnAgPSB7IC52YWwgPSAodTMyKXZhbCB9OworCiAJV0FSTl9PTih2YWwgPiBVMzJfTUFYKTsKLQlm cC52YWwgPSAodTMyKXZhbDsKKwogCXJldHVybiBmcDsKIH0KIApAQCAtNjgsNjYgKzY2LDczIEBA IHN0YXRpYyBpbmxpbmUgdTMyIGRpdl9yb3VuZF91cF9maXhlZDE2KHVpbnRfZml4ZWRfMTZfMTZf dCB2YWwsCiAKIHN0YXRpYyBpbmxpbmUgdTMyIG11bF9yb3VuZF91cF91MzJfZml4ZWQxNih1MzIg dmFsLCB1aW50X2ZpeGVkXzE2XzE2X3QgbXVsKQogewotCXU2NCBpbnRlcm1lZGlhdGVfdmFsOwor CXU2NCB0bXA7CisKKwl0bXAgPSAodTY0KXZhbCAqIG11bC52YWw7CisJdG1wID0gRElWX1JPVU5E X1VQX1VMTCh0bXAsIDEgPDwgMTYpOworCVdBUk5fT04odG1wID4gVTMyX01BWCk7CiAKLQlpbnRl cm1lZGlhdGVfdmFsID0gKHU2NCl2YWwgKiBtdWwudmFsOwotCWludGVybWVkaWF0ZV92YWwgPSBE SVZfUk9VTkRfVVBfVUxMKGludGVybWVkaWF0ZV92YWwsIDEgPDwgMTYpOwotCVdBUk5fT04oaW50 ZXJtZWRpYXRlX3ZhbCA+IFUzMl9NQVgpOwotCXJldHVybiAodTMyKWludGVybWVkaWF0ZV92YWw7 CisJcmV0dXJuICh1MzIpdG1wOwogfQogCiBzdGF0aWMgaW5saW5lIHVpbnRfZml4ZWRfMTZfMTZf dCBtdWxfZml4ZWQxNih1aW50X2ZpeGVkXzE2XzE2X3QgdmFsLAogCQkJCQkgICAgIHVpbnRfZml4 ZWRfMTZfMTZfdCBtdWwpCiB7Ci0JdTY0IGludGVybWVkaWF0ZV92YWw7CisJdTY0IHRtcDsKIAot CWludGVybWVkaWF0ZV92YWwgPSAodTY0KXZhbC52YWwgKiBtdWwudmFsOwotCWludGVybWVkaWF0 ZV92YWwgPSBpbnRlcm1lZGlhdGVfdmFsID4+IDE2OwotCXJldHVybiBjbGFtcF91NjRfdG9fZml4 ZWQxNihpbnRlcm1lZGlhdGVfdmFsKTsKKwl0bXAgPSAodTY0KXZhbC52YWwgKiBtdWwudmFsOwor CXRtcCA9IHRtcCA+PiAxNjsKKworCXJldHVybiBjbGFtcF91NjRfdG9fZml4ZWQxNih0bXApOwog fQogCiBzdGF0aWMgaW5saW5lIHVpbnRfZml4ZWRfMTZfMTZfdCBkaXZfZml4ZWQxNih1MzIgdmFs LCB1MzIgZCkKIHsKLQl1NjQgaW50ZXJtX3ZhbDsKKwl1NjQgdG1wOworCisJdG1wID0gKHU2NCl2 YWwgPDwgMTY7CisJdG1wID0gRElWX1JPVU5EX1VQX1VMTCh0bXAsIGQpOwogCi0JaW50ZXJtX3Zh bCA9ICh1NjQpdmFsIDw8IDE2OwotCWludGVybV92YWwgPSBESVZfUk9VTkRfVVBfVUxMKGludGVy bV92YWwsIGQpOwotCXJldHVybiBjbGFtcF91NjRfdG9fZml4ZWQxNihpbnRlcm1fdmFsKTsKKwly ZXR1cm4gY2xhbXBfdTY0X3RvX2ZpeGVkMTYodG1wKTsKIH0KIAogc3RhdGljIGlubGluZSB1MzIg ZGl2X3JvdW5kX3VwX3UzMl9maXhlZDE2KHUzMiB2YWwsIHVpbnRfZml4ZWRfMTZfMTZfdCBkKQog ewotCXU2NCBpbnRlcm1fdmFsOworCXU2NCB0bXA7CiAKLQlpbnRlcm1fdmFsID0gKHU2NCl2YWwg PDwgMTY7Ci0JaW50ZXJtX3ZhbCA9IERJVl9ST1VORF9VUF9VTEwoaW50ZXJtX3ZhbCwgZC52YWwp OwotCVdBUk5fT04oaW50ZXJtX3ZhbCA+IFUzMl9NQVgpOwotCXJldHVybiAodTMyKWludGVybV92 YWw7CisJdG1wID0gKHU2NCl2YWwgPDwgMTY7CisJdG1wID0gRElWX1JPVU5EX1VQX1VMTCh0bXAs IGQudmFsKTsKKwlXQVJOX09OKHRtcCA+IFUzMl9NQVgpOworCisJcmV0dXJuICh1MzIpdG1wOwog fQogCiBzdGF0aWMgaW5saW5lIHVpbnRfZml4ZWRfMTZfMTZfdCBtdWxfdTMyX2ZpeGVkMTYodTMy IHZhbCwgdWludF9maXhlZF8xNl8xNl90IG11bCkKIHsKLQl1NjQgaW50ZXJtZWRpYXRlX3ZhbDsK Kwl1NjQgdG1wOworCisJdG1wID0gKHU2NCl2YWwgKiBtdWwudmFsOwogCi0JaW50ZXJtZWRpYXRl X3ZhbCA9ICh1NjQpdmFsICogbXVsLnZhbDsKLQlyZXR1cm4gY2xhbXBfdTY0X3RvX2ZpeGVkMTYo aW50ZXJtZWRpYXRlX3ZhbCk7CisJcmV0dXJuIGNsYW1wX3U2NF90b19maXhlZDE2KHRtcCk7CiB9 CiAKIHN0YXRpYyBpbmxpbmUgdWludF9maXhlZF8xNl8xNl90IGFkZF9maXhlZDE2KHVpbnRfZml4 ZWRfMTZfMTZfdCBhZGQxLAogCQkJCQkgICAgIHVpbnRfZml4ZWRfMTZfMTZfdCBhZGQyKQogewot CXU2NCBpbnRlcm1fc3VtOworCXU2NCB0bXA7CiAKLQlpbnRlcm1fc3VtID0gKHU2NClhZGQxLnZh bCArIGFkZDIudmFsOwotCXJldHVybiBjbGFtcF91NjRfdG9fZml4ZWQxNihpbnRlcm1fc3VtKTsK Kwl0bXAgPSAodTY0KWFkZDEudmFsICsgYWRkMi52YWw7CisKKwlyZXR1cm4gY2xhbXBfdTY0X3Rv X2ZpeGVkMTYodG1wKTsKIH0KIAogc3RhdGljIGlubGluZSB1aW50X2ZpeGVkXzE2XzE2X3QgYWRk X2ZpeGVkMTZfdTMyKHVpbnRfZml4ZWRfMTZfMTZfdCBhZGQxLAogCQkJCQkJIHUzMiBhZGQyKQog ewotCXU2NCBpbnRlcm1fc3VtOwotCXVpbnRfZml4ZWRfMTZfMTZfdCBpbnRlcm1fYWRkMiA9IHUz Ml90b19maXhlZDE2KGFkZDIpOworCXVpbnRfZml4ZWRfMTZfMTZfdCB0bXBfYWRkMiA9IHUzMl90 b19maXhlZDE2KGFkZDIpOworCXU2NCB0bXA7CisKKwl0bXAgPSAodTY0KWFkZDEudmFsICsgdG1w X2FkZDIudmFsOwogCi0JaW50ZXJtX3N1bSA9ICh1NjQpYWRkMS52YWwgKyBpbnRlcm1fYWRkMi52 YWw7Ci0JcmV0dXJuIGNsYW1wX3U2NF90b19maXhlZDE2KGludGVybV9zdW0pOworCXJldHVybiBj bGFtcF91NjRfdG9fZml4ZWQxNih0bXApOwogfQotLSAKMi4xMS4wCgpfX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0Cklu dGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5v cmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK