From: ville.syrjala@linux.intel.com Subject: [PATCH 7/7] drm/i915: Refactor intel_surf_alignment() Date: Tue, 12 Jan 2016 21:08:37 +0200 Message-ID: <1452625717-9713-8-git-send-email-ville.syrjala@linux.intel.com> References: <1452625717-9713-1-git-send-email-ville.syrjala@linux.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 ESMTP id 75F3D6E6D7 for ; Tue, 12 Jan 2016 11:09:00 -0800 (PST) In-Reply-To: <1452625717-9713-1-git-send-email-ville.syrjala@linux.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 List-Id: intel-gfx@lists.freedesktop.org RnJvbTogVmlsbGUgU3lyasOkbMOkIDx2aWxsZS5zeXJqYWxhQGxpbnV4LmludGVsLmNvbT4KClB1 bGwgdGhlIGNvZGUgdG8gZGV0ZXJtaW5lIHRoZSBzdXJmYWNlIGFsaWdubWVudCBmb3IgYm90aCBs aW5lYXIgYW5kCnRpbGVkIHN1cmZhY2VzIGludG8gYSBzZXBhcmF0ZSBmdW5jdGlvbiBpbnRlbF9z dXJmX2FsaWdubWVudCgpLiBUaGlzCndpbGwgYmUgdXNlZCBub3Qgb25seSBmb3IgdGhlIHZtYSBh bGlnbm1lbnQgYnV0IGFjdHVhbGx5IGFsaWduaW5nCnRoZSBwbGFuZSBTVVJGIG9uY2UgU0tMKyBz dGFydHMgdXNpbmcgaW50ZWxfY29tcHV0ZV9wYWdlX29mZnNldCgpCihzaW5jZSBTS0wrIG5lZWRz ID40SyBhbGlnbm1lbnQgZm9yIHRpbGVkIHN1cmZhY2VzIHRvbykuCgpTaWduZWQtb2ZmLWJ5OiBW aWxsZSBTeXJqw6Rsw6QgPHZpbGxlLnN5cmphbGFAbGludXguaW50ZWwuY29tPgpSZXZpZXdlZC1i eTogRGFuaWVsIFZldHRlciA8ZGFuaWVsLnZldHRlckBmZndsbC5jaD4KLS0tCiBkcml2ZXJzL2dw dS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMgfCA0NSArKysrKysrKysrKysrKysrKy0tLS0tLS0t LS0tLS0tLS0tLS0KIDEgZmlsZSBjaGFuZ2VkLCAyMSBpbnNlcnRpb25zKCspLCAyNCBkZWxldGlv bnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMg Yi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMKaW5kZXggMmU1YjlmMzRmZWNk Li4wYzNhMzk4NDczZWYgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rp c3BsYXkuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMKQEAgLTIz MzAsNyArMjMzMCw3IEBAIGludGVsX2ZpbGxfZmJfZ2d0dF92aWV3KHN0cnVjdCBpOTE1X2dndHRf dmlldyAqdmlldywgc3RydWN0IGRybV9mcmFtZWJ1ZmZlciAqZmIsCiAJfQogfQogCi1zdGF0aWMg dW5zaWduZWQgaW50IGludGVsX2xpbmVhcl9hbGlnbm1lbnQoc3RydWN0IGRybV9pOTE1X3ByaXZh dGUgKmRldl9wcml2KQorc3RhdGljIHVuc2lnbmVkIGludCBpbnRlbF9saW5lYXJfYWxpZ25tZW50 KGNvbnN0IHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdikKIHsKIAlpZiAoSU5URUxf SU5GTyhkZXZfcHJpdiktPmdlbiA+PSA5KQogCQlyZXR1cm4gMjU2ICogMTAyNDsKQEAgLTIzNDMs NiArMjM0MywyNSBAQCBzdGF0aWMgdW5zaWduZWQgaW50IGludGVsX2xpbmVhcl9hbGlnbm1lbnQo c3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KQogCQlyZXR1cm4gMDsKIH0KIAorc3Rh dGljIHVuc2lnbmVkIGludCBpbnRlbF9zdXJmX2FsaWdubWVudChjb25zdCBzdHJ1Y3QgZHJtX2k5 MTVfcHJpdmF0ZSAqZGV2X3ByaXYsCisJCQkJCSB1aW50NjRfdCBmYl9tb2RpZmllcikKK3sKKwlz d2l0Y2ggKGZiX21vZGlmaWVyKSB7CisJY2FzZSBEUk1fRk9STUFUX01PRF9OT05FOgorCQlyZXR1 cm4gaW50ZWxfbGluZWFyX2FsaWdubWVudChkZXZfcHJpdik7CisJY2FzZSBJOTE1X0ZPUk1BVF9N T0RfWF9USUxFRDoKKwkJaWYgKElOVEVMX0lORk8oZGV2X3ByaXYpLT5nZW4gPj0gOSkKKwkJCXJl dHVybiAyNTYgKiAxMDI0OworCQlyZXR1cm4gMDsKKwljYXNlIEk5MTVfRk9STUFUX01PRF9ZX1RJ TEVEOgorCWNhc2UgSTkxNV9GT1JNQVRfTU9EX1lmX1RJTEVEOgorCQlyZXR1cm4gMSAqIDEwMjQg KiAxMDI0OworCWRlZmF1bHQ6CisJCU1JU1NJTkdfQ0FTRShmYl9tb2RpZmllcik7CisJCXJldHVy biAwOworCX0KK30KKwogaW50CiBpbnRlbF9waW5fYW5kX2ZlbmNlX2ZiX29iaihzdHJ1Y3QgZHJt X3BsYW5lICpwbGFuZSwKIAkJCSAgIHN0cnVjdCBkcm1fZnJhbWVidWZmZXIgKmZiLApAQCAtMjM1 NywyOSArMjM3Niw3IEBAIGludGVsX3Bpbl9hbmRfZmVuY2VfZmJfb2JqKHN0cnVjdCBkcm1fcGxh bmUgKnBsYW5lLAogCiAJV0FSTl9PTighbXV0ZXhfaXNfbG9ja2VkKCZkZXYtPnN0cnVjdF9tdXRl eCkpOwogCi0Jc3dpdGNoIChmYi0+bW9kaWZpZXJbMF0pIHsKLQljYXNlIERSTV9GT1JNQVRfTU9E X05PTkU6Ci0JCWFsaWdubWVudCA9IGludGVsX2xpbmVhcl9hbGlnbm1lbnQoZGV2X3ByaXYpOwot CQlicmVhazsKLQljYXNlIEk5MTVfRk9STUFUX01PRF9YX1RJTEVEOgotCQlpZiAoSU5URUxfSU5G TyhkZXYpLT5nZW4gPj0gOSkKLQkJCWFsaWdubWVudCA9IDI1NiAqIDEwMjQ7Ci0JCWVsc2Ugewot CQkJLyogcGluKCkgd2lsbCBhbGlnbiB0aGUgb2JqZWN0IGFzIHJlcXVpcmVkIGJ5IGZlbmNlICov Ci0JCQlhbGlnbm1lbnQgPSAwOwotCQl9Ci0JCWJyZWFrOwotCWNhc2UgSTkxNV9GT1JNQVRfTU9E X1lfVElMRUQ6Ci0JY2FzZSBJOTE1X0ZPUk1BVF9NT0RfWWZfVElMRUQ6Ci0JCWlmIChXQVJOX09O Q0UoSU5URUxfSU5GTyhkZXYpLT5nZW4gPCA5LAotCQkJICAiWSB0aWxpbmcgYm8gc2xpcHBlZCB0 aHJvdWdoLCBkcml2ZXIgYnVnIVxuIikpCi0JCQlyZXR1cm4gLUVJTlZBTDsKLQkJYWxpZ25tZW50 ID0gMSAqIDEwMjQgKiAxMDI0OwotCQlicmVhazsKLQlkZWZhdWx0OgotCQlNSVNTSU5HX0NBU0Uo ZmItPm1vZGlmaWVyWzBdKTsKLQkJcmV0dXJuIC1FSU5WQUw7Ci0JfQorCWFsaWdubWVudCA9IGlu dGVsX3N1cmZfYWxpZ25tZW50KGRldl9wcml2LCBmYi0+bW9kaWZpZXJbMF0pOwogCiAJaW50ZWxf ZmlsbF9mYl9nZ3R0X3ZpZXcoJnZpZXcsIGZiLCBwbGFuZV9zdGF0ZSk7CiAKLS0gCjIuNC4xMAoK X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4 IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHA6Ly9saXN0 cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK