From: Jani Nikula Subject: [PATCH v2 5/5] drm/i915/fixed: cosmetic cleanup Date: Fri, 16 Nov 2018 14:07:29 +0200 Message-ID: <20181116120729.7580-5-jani.nikula@intel.com> References: <20181116120729.7580-1-jani.nikula@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga05.intel.com (mga05.intel.com [192.55.52.43]) by gabe.freedesktop.org (Postfix) with ESMTPS id 7E0F76E781 for ; Fri, 16 Nov 2018 12:07:05 +0000 (UTC) In-Reply-To: <20181116120729.7580-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 eSBsaW5lcyBiZWZvcmUKcmV0dXJuLiBObyBmdW5jdGlvbmFsIGNoYW5nZXMuCgpSZXZpZXdlZC1i eTogSm9vbmFzIExhaHRpbmVuIDxqb29uYXMubGFodGluZW5AbGludXguaW50ZWwuY29tPgpTaWdu ZWQtb2ZmLWJ5OiBKYW5pIE5pa3VsYSA8amFuaS5uaWt1bGFAaW50ZWwuY29tPgotLS0KIGRyaXZl cnMvZ3B1L2RybS9pOTE1L2k5MTVfZml4ZWQuaCB8IDc3ICsrKysrKysrKysrKysrKysrKysrKy0t LS0tLS0tLS0tLS0tLS0tLQogMSBmaWxlIGNoYW5nZWQsIDQxIGluc2VydGlvbnMoKyksIDM2IGRl bGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZml4ZWQu aCBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZml4ZWQuaAppbmRleCBjYjA5OTcwMWE3NWUu LjU5MWRkODliYTdhZiAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9maXhl ZC5oCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZml4ZWQuaApAQCAtMTksMTEgKzE5 LDEwIEBAIHN0YXRpYyBpbmxpbmUgYm9vbCBpc19maXhlZDE2X3plcm8odWludF9maXhlZF8xNl8x Nl90IHZhbCkKIAogc3RhdGljIGlubGluZSB1aW50X2ZpeGVkXzE2XzE2X3QgdTMyX3RvX2ZpeGVk MTYodTMyIHZhbCkKIHsKLQl1aW50X2ZpeGVkXzE2XzE2X3QgZnA7CisJdWludF9maXhlZF8xNl8x Nl90IGZwID0geyAudmFsID0gdmFsIDw8IDE2IH07CiAKIAlXQVJOX09OKHZhbCA+IFUxNl9NQVgp OwogCi0JZnAudmFsID0gdmFsIDw8IDE2OwogCXJldHVybiBmcDsKIH0KIApAQCAtNDAsMjYgKzM5 LDI1IEBAIHN0YXRpYyBpbmxpbmUgdTMyIGZpeGVkMTZfdG9fdTMyKHVpbnRfZml4ZWRfMTZfMTZf dCBmcCkKIHN0YXRpYyBpbmxpbmUgdWludF9maXhlZF8xNl8xNl90IG1pbl9maXhlZDE2KHVpbnRf Zml4ZWRfMTZfMTZfdCBtaW4xLAogCQkJCQkgICAgIHVpbnRfZml4ZWRfMTZfMTZfdCBtaW4yKQog ewotCXVpbnRfZml4ZWRfMTZfMTZfdCBtaW47CisJdWludF9maXhlZF8xNl8xNl90IG1pbiA9IHsg LnZhbCA9IG1pbihtaW4xLnZhbCwgbWluMi52YWwpIH07CiAKLQltaW4udmFsID0gbWluKG1pbjEu dmFsLCBtaW4yLnZhbCk7CiAJcmV0dXJuIG1pbjsKIH0KIAogc3RhdGljIGlubGluZSB1aW50X2Zp eGVkXzE2XzE2X3QgbWF4X2ZpeGVkMTYodWludF9maXhlZF8xNl8xNl90IG1heDEsCiAJCQkJCSAg ICAgdWludF9maXhlZF8xNl8xNl90IG1heDIpCiB7Ci0JdWludF9maXhlZF8xNl8xNl90IG1heDsK Kwl1aW50X2ZpeGVkXzE2XzE2X3QgbWF4ID0geyAudmFsID0gbWF4KG1heDEudmFsLCBtYXgyLnZh bCkgfTsKIAotCW1heC52YWwgPSBtYXgobWF4MS52YWwsIG1heDIudmFsKTsKIAlyZXR1cm4gbWF4 OwogfQogCiBzdGF0aWMgaW5saW5lIHVpbnRfZml4ZWRfMTZfMTZfdCBjbGFtcF91NjRfdG9fZml4 ZWQxNih1NjQgdmFsKQogewotCXVpbnRfZml4ZWRfMTZfMTZfdCBmcDsKKwl1aW50X2ZpeGVkXzE2 XzE2X3QgZnAgPSB7IC52YWwgPSAodTMyKXZhbCB9OworCiAJV0FSTl9PTih2YWwgPiBVMzJfTUFY KTsKLQlmcC52YWwgPSAodTMyKXZhbDsKKwogCXJldHVybiBmcDsKIH0KIApAQCAtNzEsNjggKzY5 LDc1IEBAIHN0YXRpYyBpbmxpbmUgdTMyIGRpdl9yb3VuZF91cF9maXhlZDE2KHVpbnRfZml4ZWRf MTZfMTZfdCB2YWwsCiAKIHN0YXRpYyBpbmxpbmUgdTMyIG11bF9yb3VuZF91cF91MzJfZml4ZWQx Nih1MzIgdmFsLCB1aW50X2ZpeGVkXzE2XzE2X3QgbXVsKQogewotCXU2NCBpbnRlcm1lZGlhdGVf dmFsOworCXU2NCB0bXA7CisKKwl0bXAgPSAodTY0KXZhbCAqIG11bC52YWw7CisJdG1wID0gRElW X1JPVU5EX1VQX1VMTCh0bXAsIDEgPDwgMTYpOworCVdBUk5fT04odG1wID4gVTMyX01BWCk7CiAK LQlpbnRlcm1lZGlhdGVfdmFsID0gKHU2NCl2YWwgKiBtdWwudmFsOwotCWludGVybWVkaWF0ZV92 YWwgPSBESVZfUk9VTkRfVVBfVUxMKGludGVybWVkaWF0ZV92YWwsIDEgPDwgMTYpOwotCVdBUk5f T04oaW50ZXJtZWRpYXRlX3ZhbCA+IFUzMl9NQVgpOwotCXJldHVybiAodTMyKWludGVybWVkaWF0 ZV92YWw7CisJcmV0dXJuICh1MzIpdG1wOwogfQogCiBzdGF0aWMgaW5saW5lIHVpbnRfZml4ZWRf MTZfMTZfdCBtdWxfZml4ZWQxNih1aW50X2ZpeGVkXzE2XzE2X3QgdmFsLAogCQkJCQkgICAgIHVp bnRfZml4ZWRfMTZfMTZfdCBtdWwpCiB7Ci0JdTY0IGludGVybWVkaWF0ZV92YWw7CisJdTY0IHRt cDsKIAotCWludGVybWVkaWF0ZV92YWwgPSAodTY0KXZhbC52YWwgKiBtdWwudmFsOwotCWludGVy bWVkaWF0ZV92YWwgPSBpbnRlcm1lZGlhdGVfdmFsID4+IDE2OwotCXJldHVybiBjbGFtcF91NjRf dG9fZml4ZWQxNihpbnRlcm1lZGlhdGVfdmFsKTsKKwl0bXAgPSAodTY0KXZhbC52YWwgKiBtdWwu dmFsOworCXRtcCA9IHRtcCA+PiAxNjsKKworCXJldHVybiBjbGFtcF91NjRfdG9fZml4ZWQxNih0 bXApOwogfQogCiBzdGF0aWMgaW5saW5lIHVpbnRfZml4ZWRfMTZfMTZfdCBkaXZfZml4ZWQxNih1 MzIgdmFsLCB1MzIgZCkKIHsKLQl1NjQgaW50ZXJtX3ZhbDsKKwl1NjQgdG1wOworCisJdG1wID0g KHU2NCl2YWwgPDwgMTY7CisJdG1wID0gRElWX1JPVU5EX1VQX1VMTCh0bXAsIGQpOwogCi0JaW50 ZXJtX3ZhbCA9ICh1NjQpdmFsIDw8IDE2OwotCWludGVybV92YWwgPSBESVZfUk9VTkRfVVBfVUxM KGludGVybV92YWwsIGQpOwotCXJldHVybiBjbGFtcF91NjRfdG9fZml4ZWQxNihpbnRlcm1fdmFs KTsKKwlyZXR1cm4gY2xhbXBfdTY0X3RvX2ZpeGVkMTYodG1wKTsKIH0KIAogc3RhdGljIGlubGlu ZSB1MzIgZGl2X3JvdW5kX3VwX3UzMl9maXhlZDE2KHUzMiB2YWwsIHVpbnRfZml4ZWRfMTZfMTZf dCBkKQogewotCXU2NCBpbnRlcm1fdmFsOworCXU2NCB0bXA7CiAKLQlpbnRlcm1fdmFsID0gKHU2 NCl2YWwgPDwgMTY7Ci0JaW50ZXJtX3ZhbCA9IERJVl9ST1VORF9VUF9VTEwoaW50ZXJtX3ZhbCwg ZC52YWwpOwotCVdBUk5fT04oaW50ZXJtX3ZhbCA+IFUzMl9NQVgpOwotCXJldHVybiAodTMyKWlu dGVybV92YWw7CisJdG1wID0gKHU2NCl2YWwgPDwgMTY7CisJdG1wID0gRElWX1JPVU5EX1VQX1VM TCh0bXAsIGQudmFsKTsKKwlXQVJOX09OKHRtcCA+IFUzMl9NQVgpOworCisJcmV0dXJuICh1MzIp dG1wOwogfQogCiBzdGF0aWMgaW5saW5lIHVpbnRfZml4ZWRfMTZfMTZfdCBtdWxfdTMyX2ZpeGVk MTYodTMyIHZhbCwgdWludF9maXhlZF8xNl8xNl90IG11bCkKIHsKLQl1NjQgaW50ZXJtZWRpYXRl X3ZhbDsKKwl1NjQgdG1wOworCisJdG1wID0gKHU2NCl2YWwgKiBtdWwudmFsOwogCi0JaW50ZXJt ZWRpYXRlX3ZhbCA9ICh1NjQpdmFsICogbXVsLnZhbDsKLQlyZXR1cm4gY2xhbXBfdTY0X3RvX2Zp eGVkMTYoaW50ZXJtZWRpYXRlX3ZhbCk7CisJcmV0dXJuIGNsYW1wX3U2NF90b19maXhlZDE2KHRt cCk7CiB9CiAKIHN0YXRpYyBpbmxpbmUgdWludF9maXhlZF8xNl8xNl90IGFkZF9maXhlZDE2KHVp bnRfZml4ZWRfMTZfMTZfdCBhZGQxLAogCQkJCQkgICAgIHVpbnRfZml4ZWRfMTZfMTZfdCBhZGQy KQogewotCXU2NCBpbnRlcm1fc3VtOworCXU2NCB0bXA7CiAKLQlpbnRlcm1fc3VtID0gKHU2NClh ZGQxLnZhbCArIGFkZDIudmFsOwotCXJldHVybiBjbGFtcF91NjRfdG9fZml4ZWQxNihpbnRlcm1f c3VtKTsKKwl0bXAgPSAodTY0KWFkZDEudmFsICsgYWRkMi52YWw7CisKKwlyZXR1cm4gY2xhbXBf dTY0X3RvX2ZpeGVkMTYodG1wKTsKIH0KIAogc3RhdGljIGlubGluZSB1aW50X2ZpeGVkXzE2XzE2 X3QgYWRkX2ZpeGVkMTZfdTMyKHVpbnRfZml4ZWRfMTZfMTZfdCBhZGQxLAogCQkJCQkJIHUzMiBh ZGQyKQogewotCXU2NCBpbnRlcm1fc3VtOwotCXVpbnRfZml4ZWRfMTZfMTZfdCBpbnRlcm1fYWRk MiA9IHUzMl90b19maXhlZDE2KGFkZDIpOworCXVpbnRfZml4ZWRfMTZfMTZfdCB0bXBfYWRkMiA9 IHUzMl90b19maXhlZDE2KGFkZDIpOworCXU2NCB0bXA7CisKKwl0bXAgPSAodTY0KWFkZDEudmFs ICsgdG1wX2FkZDIudmFsOwogCi0JaW50ZXJtX3N1bSA9ICh1NjQpYWRkMS52YWwgKyBpbnRlcm1f YWRkMi52YWw7Ci0JcmV0dXJuIGNsYW1wX3U2NF90b19maXhlZDE2KGludGVybV9zdW0pOworCXJl dHVybiBjbGFtcF91NjRfdG9fZml4ZWQxNih0bXApOwogfQogCiAjZW5kaWYgLyogX0k5MTVfRklY RURfSF8gKi8KLS0gCjIuMTEuMAoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRl c2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8v aW50ZWwtZ2Z4Cg==