From mboxrd@z Thu Jan 1 00:00:00 1970 From: ville.syrjala@linux.intel.com Subject: [PATCH 04/22] drm/i915: Redo intel_tile_height() as intel_tile_size() / intel_tile_width() Date: Wed, 14 Oct 2015 19:28:56 +0300 Message-ID: <1444840154-7804-5-git-send-email-ville.syrjala@linux.intel.com> References: <1444840154-7804-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 mga01.intel.com (mga01.intel.com [192.55.52.88]) by gabe.freedesktop.org (Postfix) with ESMTP id DF48F6ED2C for ; Wed, 14 Oct 2015 09:29:53 -0700 (PDT) In-Reply-To: <1444840154-7804-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 RnJvbTogVmlsbGUgU3lyasOkbMOkIDx2aWxsZS5zeXJqYWxhQGxpbnV4LmludGVsLmNvbT4KCkkg ZmluZCBtb3JlIHVzdWFsIHRvIHRoaW5rIGFib3V0IHRpbGUgd2lkdGhzIHRoYW4gaGVpZ2h0cywg c28gY2hhbmdpbmcKdGhlIGludGVsX3RpbGVfaGVpZ2h0KCkgdG8gY2FsY3VsYXRlIHRoZSB0aWxl IGhlaWdodCBhcwp0aWxlX3NpemUvdGlsZV93aWR0aCBpcyBlYXNpZXIgdGhhbiB0aGUgb3Bwb3Np dGUgdG8gdGhlIHBvb3IgYnJhaW4uCgp2MjogUmVvcmRlciBhcmd1bWVudHMgZm9yIGNvbnNpc3Rl bmN5CiAgICBDb25zdGlmeSBkZXZfcHJpdiBhcmd1bWVudHMKClNpZ25lZC1vZmYtYnk6IFZpbGxl IFN5cmrDpGzDpCA8dmlsbGUuc3lyamFsYUBsaW51eC5pbnRlbC5jb20+Ci0tLQogZHJpdmVycy9n cHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jIHwgODggKysrKysrKysrKysrLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcnYuaCAgICAgfCAgNSAr LQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfc3ByaXRlLmMgIHwgIDQgKy0KIDMgZmlsZXMg Y2hhbmdlZCwgMzQgaW5zZXJ0aW9ucygrKSwgNjMgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEv ZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jIGIvZHJpdmVycy9ncHUvZHJtL2k5 MTUvaW50ZWxfZGlzcGxheS5jCmluZGV4IGMzMWZlNDcuLmQwMjgzMjYgMTAwNjQ0Ci0tLSBhL2Ry aXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYworKysgYi9kcml2ZXJzL2dwdS9kcm0v aTkxNS9pbnRlbF9kaXNwbGF5LmMKQEAgLTIyMTQsNiArMjIxNCwxMSBAQCBzdGF0aWMgYm9vbCBu ZWVkX3Z0ZF93YShzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KQogCXJldHVybiBmYWxzZTsKIH0KIAor c3RhdGljIHVuc2lnbmVkIGludCBpbnRlbF90aWxlX3NpemUoY29uc3Qgc3RydWN0IGRybV9pOTE1 X3ByaXZhdGUgKmRldl9wcml2KQoreworCXJldHVybiBJU19HRU4yKGRldl9wcml2KSA/IDIwNDgg OiA0MDk2OworfQorCiBzdGF0aWMgdW5zaWduZWQgaW50IGludGVsX3RpbGVfd2lkdGgoY29uc3Qg c3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2LAogCQkJCSAgICAgdWludDY0X3QgZmJf bW9kaWZpZXIsIHVuc2lnbmVkIGludCBjcHApCiB7CkBAIC0yMjQ5LDY3ICsyMjU0LDM0IEBAIHN0 YXRpYyB1bnNpZ25lZCBpbnQgaW50ZWxfdGlsZV93aWR0aChjb25zdCBzdHJ1Y3QgZHJtX2k5MTVf cHJpdmF0ZSAqZGV2X3ByaXYsCiAJfQogfQogCi11bnNpZ25lZCBpbnQKLWludGVsX3RpbGVfaGVp Z2h0KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsIHVpbnQzMl90IHBpeGVsX2Zvcm1hdCwKLQkJICB1 aW50NjRfdCBmYl9mb3JtYXRfbW9kaWZpZXIsIHVuc2lnbmVkIGludCBwbGFuZSkKK3Vuc2lnbmVk IGludCBpbnRlbF90aWxlX2hlaWdodChjb25zdCBzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2 X3ByaXYsCisJCQkgICAgICAgdWludDY0X3QgZmJfbW9kaWZpZXIsIHVuc2lnbmVkIGludCBjcHAp CiB7Ci0JdW5zaWduZWQgaW50IHRpbGVfaGVpZ2h0OwotCXVpbnQzMl90IHBpeGVsX2J5dGVzOwot Ci0Jc3dpdGNoIChmYl9mb3JtYXRfbW9kaWZpZXIpIHsKLQljYXNlIERSTV9GT1JNQVRfTU9EX05P TkU6Ci0JCXRpbGVfaGVpZ2h0ID0gMTsKLQkJYnJlYWs7Ci0JY2FzZSBJOTE1X0ZPUk1BVF9NT0Rf WF9USUxFRDoKLQkJdGlsZV9oZWlnaHQgPSBJU19HRU4yKGRldikgPyAxNiA6IDg7Ci0JCWJyZWFr OwotCWNhc2UgSTkxNV9GT1JNQVRfTU9EX1lfVElMRUQ6Ci0JCXRpbGVfaGVpZ2h0ID0gMzI7Ci0J CWJyZWFrOwotCWNhc2UgSTkxNV9GT1JNQVRfTU9EX1lmX1RJTEVEOgotCQlwaXhlbF9ieXRlcyA9 IGRybV9mb3JtYXRfcGxhbmVfY3BwKHBpeGVsX2Zvcm1hdCwgcGxhbmUpOwotCQlzd2l0Y2ggKHBp eGVsX2J5dGVzKSB7Ci0JCWRlZmF1bHQ6Ci0JCWNhc2UgMToKLQkJCXRpbGVfaGVpZ2h0ID0gNjQ7 Ci0JCQlicmVhazsKLQkJY2FzZSAyOgotCQljYXNlIDQ6Ci0JCQl0aWxlX2hlaWdodCA9IDMyOwot CQkJYnJlYWs7Ci0JCWNhc2UgODoKLQkJCXRpbGVfaGVpZ2h0ID0gMTY7Ci0JCQlicmVhazsKLQkJ Y2FzZSAxNjoKLQkJCVdBUk5fT05DRSgxLAotCQkJCSAgIjEyOC1iaXQgcGl4ZWxzIGFyZSBub3Qg c3VwcG9ydGVkIGZvciBkaXNwbGF5ISIpOwotCQkJdGlsZV9oZWlnaHQgPSAxNjsKLQkJCWJyZWFr OwotCQl9Ci0JCWJyZWFrOwotCWRlZmF1bHQ6Ci0JCU1JU1NJTkdfQ0FTRShmYl9mb3JtYXRfbW9k aWZpZXIpOwotCQl0aWxlX2hlaWdodCA9IDE7Ci0JCWJyZWFrOwotCX0KLQotCXJldHVybiB0aWxl X2hlaWdodDsKKwlpZiAoZmJfbW9kaWZpZXIgPT0gRFJNX0ZPUk1BVF9NT0RfTk9ORSkKKwkJcmV0 dXJuIDE7CisJZWxzZQorCQlyZXR1cm4gaW50ZWxfdGlsZV9zaXplKGRldl9wcml2KSAvCisJCQlp bnRlbF90aWxlX3dpZHRoKGRldl9wcml2LCBmYl9tb2RpZmllciwgY3BwKTsKIH0KIAogdW5zaWdu ZWQgaW50CiBpbnRlbF9mYl9hbGlnbl9oZWlnaHQoc3RydWN0IGRybV9kZXZpY2UgKmRldiwgdW5z aWduZWQgaW50IGhlaWdodCwKLQkJICAgICAgdWludDMyX3QgcGl4ZWxfZm9ybWF0LCB1aW50NjRf dCBmYl9mb3JtYXRfbW9kaWZpZXIpCisJCSAgICAgIHVpbnQzMl90IHBpeGVsX2Zvcm1hdCwgdWlu dDY0X3QgZmJfbW9kaWZpZXIpCiB7Ci0JcmV0dXJuIEFMSUdOKGhlaWdodCwgaW50ZWxfdGlsZV9o ZWlnaHQoZGV2LCBwaXhlbF9mb3JtYXQsCi0JCQkJCSAgICAgICBmYl9mb3JtYXRfbW9kaWZpZXIs IDApKTsKKwl1bnNpZ25lZCBpbnQgY3BwID0gZHJtX2Zvcm1hdF9wbGFuZV9jcHAocGl4ZWxfZm9y bWF0LCAwKTsKKwl1bnNpZ25lZCBpbnQgdGlsZV9oZWlnaHQgPSBpbnRlbF90aWxlX2hlaWdodCh0 b19pOTE1KGRldiksIGZiX21vZGlmaWVyLCBjcHApOworCisJcmV0dXJuIEFMSUdOKGhlaWdodCwg dGlsZV9oZWlnaHQpOwogfQogCiBzdGF0aWMgaW50CiBpbnRlbF9maWxsX2ZiX2dndHRfdmlldyhz dHJ1Y3QgaTkxNV9nZ3R0X3ZpZXcgKnZpZXcsIHN0cnVjdCBkcm1fZnJhbWVidWZmZXIgKmZiLAog CQkJY29uc3Qgc3RydWN0IGRybV9wbGFuZV9zdGF0ZSAqcGxhbmVfc3RhdGUpCiB7CisJc3RydWN0 IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0gdG9faTkxNShmYi0+ZGV2KTsKIAlzdHJ1Y3Qg aW50ZWxfcm90YXRpb25faW5mbyAqaW5mbyA9ICZ2aWV3LT5yb3RhdGlvbl9pbmZvOwogCXVuc2ln bmVkIGludCB0aWxlX2hlaWdodCwgdGlsZV9waXRjaDsKKwl1bnNpZ25lZCBpbnQgY3BwID0gZHJt X2Zvcm1hdF9wbGFuZV9jcHAoZmItPnBpeGVsX2Zvcm1hdCwgMCk7CiAKIAkqdmlldyA9IGk5MTVf Z2d0dF92aWV3X25vcm1hbDsKIApAQCAtMjMyNywyMiArMjI5OSwxOSBAQCBpbnRlbF9maWxsX2Zi X2dndHRfdmlldyhzdHJ1Y3QgaTkxNV9nZ3R0X3ZpZXcgKnZpZXcsIHN0cnVjdCBkcm1fZnJhbWVi dWZmZXIgKmZiLAogCWluZm8tPnV2X29mZnNldCA9IGZiLT5vZmZzZXRzWzFdOwogCWluZm8tPmZi X21vZGlmaWVyID0gZmItPm1vZGlmaWVyWzBdOwogCi0JdGlsZV9oZWlnaHQgPSBpbnRlbF90aWxl X2hlaWdodChmYi0+ZGV2LCBmYi0+cGl4ZWxfZm9ybWF0LAotCQkJCQlmYi0+bW9kaWZpZXJbMF0s IDApOworCXRpbGVfaGVpZ2h0ID0gaW50ZWxfdGlsZV9oZWlnaHQoZGV2X3ByaXYsIGZiLT5tb2Rp ZmllclswXSwgY3BwKTsKIAl0aWxlX3BpdGNoID0gUEFHRV9TSVpFIC8gdGlsZV9oZWlnaHQ7CiAJ aW5mby0+d2lkdGhfcGFnZXMgPSBESVZfUk9VTkRfVVAoZmItPnBpdGNoZXNbMF0sIHRpbGVfcGl0 Y2gpOwogCWluZm8tPmhlaWdodF9wYWdlcyA9IERJVl9ST1VORF9VUChmYi0+aGVpZ2h0LCB0aWxl X2hlaWdodCk7CiAJaW5mby0+c2l6ZSA9IGluZm8tPndpZHRoX3BhZ2VzICogaW5mby0+aGVpZ2h0 X3BhZ2VzICogUEFHRV9TSVpFOwogCiAJaWYgKGluZm8tPnBpeGVsX2Zvcm1hdCA9PSBEUk1fRk9S TUFUX05WMTIpIHsKLQkJdGlsZV9oZWlnaHQgPSBpbnRlbF90aWxlX2hlaWdodChmYi0+ZGV2LCBm Yi0+cGl4ZWxfZm9ybWF0LAotCQkJCQkJZmItPm1vZGlmaWVyWzBdLCAxKTsKKwkJY3BwID0gZHJt X2Zvcm1hdF9wbGFuZV9jcHAoZmItPnBpeGVsX2Zvcm1hdCwgMSk7CisJCXRpbGVfaGVpZ2h0ID0g aW50ZWxfdGlsZV9oZWlnaHQoZGV2X3ByaXYsIGZiLT5tb2RpZmllclsxXSwgY3BwKTsKIAkJdGls ZV9waXRjaCA9IFBBR0VfU0laRSAvIHRpbGVfaGVpZ2h0OwotCQlpbmZvLT53aWR0aF9wYWdlc191 diA9IERJVl9ST1VORF9VUChmYi0+cGl0Y2hlc1swXSwgdGlsZV9waXRjaCk7Ci0JCWluZm8tPmhl aWdodF9wYWdlc191diA9IERJVl9ST1VORF9VUChmYi0+aGVpZ2h0IC8gMiwKLQkJCQkJCSAgICAg dGlsZV9oZWlnaHQpOwotCQlpbmZvLT5zaXplX3V2ID0gaW5mby0+d2lkdGhfcGFnZXNfdXYgKiBp bmZvLT5oZWlnaHRfcGFnZXNfdXYgKgotCQkJCVBBR0VfU0laRTsKKwkJaW5mby0+d2lkdGhfcGFn ZXNfdXYgPSBESVZfUk9VTkRfVVAoZmItPnBpdGNoZXNbMV0sIHRpbGVfcGl0Y2gpOworCQlpbmZv LT5oZWlnaHRfcGFnZXNfdXYgPSBESVZfUk9VTkRfVVAoZmItPmhlaWdodCAvIDIsIHRpbGVfaGVp Z2h0KTsKKwkJaW5mby0+c2l6ZV91diA9IGluZm8tPndpZHRoX3BhZ2VzX3V2ICogaW5mby0+aGVp Z2h0X3BhZ2VzX3V2ICogUEFHRV9TSVpFOwogCX0KIAogCXJldHVybiAwOwpAQCAtMzEwMiw2ICsz MDcxLDcgQEAgc3RhdGljIHZvaWQgc2t5bGFrZV91cGRhdGVfcHJpbWFyeV9wbGFuZShzdHJ1Y3Qg ZHJtX2NydGMgKmNydGMsCiAJaW50IHNyY194ID0gMCwgc3JjX3kgPSAwLCBzcmNfdyA9IDAsIHNy Y19oID0gMDsKIAlpbnQgZHN0X3ggPSAwLCBkc3RfeSA9IDAsIGRzdF93ID0gMCwgZHN0X2ggPSAw OwogCWludCBzY2FsZXJfaWQgPSAtMTsKKwlpbnQgcGl4ZWxfc2l6ZTsKIAogCXBsYW5lX3N0YXRl ID0gdG9faW50ZWxfcGxhbmVfc3RhdGUocGxhbmUtPnN0YXRlKTsKIApAQCAtMzExMiw2ICszMDgy LDggQEAgc3RhdGljIHZvaWQgc2t5bGFrZV91cGRhdGVfcHJpbWFyeV9wbGFuZShzdHJ1Y3QgZHJt X2NydGMgKmNydGMsCiAJCXJldHVybjsKIAl9CiAKKwlwaXhlbF9zaXplID0gZHJtX2Zvcm1hdF9w bGFuZV9jcHAoZmItPnBpeGVsX2Zvcm1hdCwgMCk7CisKIAlwbGFuZV9jdGwgPSBQTEFORV9DVExf RU5BQkxFIHwKIAkJICAgIFBMQU5FX0NUTF9QSVBFX0dBTU1BX0VOQUJMRSB8CiAJCSAgICBQTEFO RV9DVExfUElQRV9DU0NfRU5BQkxFOwpAQCAtMzE0NCw4ICszMTE2LDggQEAgc3RhdGljIHZvaWQg c2t5bGFrZV91cGRhdGVfcHJpbWFyeV9wbGFuZShzdHJ1Y3QgZHJtX2NydGMgKmNydGMsCiAKIAlp ZiAoaW50ZWxfcm90YXRpb25fOTBfb3JfMjcwKHJvdGF0aW9uKSkgewogCQkvKiBzdHJpZGUgPSBT dXJmYWNlIGhlaWdodCBpbiB0aWxlcyAqLwotCQl0aWxlX2hlaWdodCA9IGludGVsX3RpbGVfaGVp Z2h0KGRldiwgZmItPnBpeGVsX2Zvcm1hdCwKLQkJCQkJCWZiLT5tb2RpZmllclswXSwgMCk7CisJ CXRpbGVfaGVpZ2h0ID0gaW50ZWxfdGlsZV9oZWlnaHQoZGV2X3ByaXYsIGZiLT5tb2RpZmllclsw XSwKKwkJCQkJCXBpeGVsX3NpemUpOwogCQlzdHJpZGUgPSBESVZfUk9VTkRfVVAoZmItPmhlaWdo dCwgdGlsZV9oZWlnaHQpOwogCQl4X29mZnNldCA9IHN0cmlkZSAqIHRpbGVfaGVpZ2h0IC0geSAt IHNyY19oOwogCQl5X29mZnNldCA9IHg7CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkx NS9pbnRlbF9kcnYuaCBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rydi5oCmluZGV4IDk4 YThkMzEuLjQyOWY3NDQgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Ry di5oCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rydi5oCkBAIC0xMDk1LDkgKzEw OTUsOCBAQCBpbnQgaW50ZWxfcGxhbmVfYXRvbWljX3NldF9wcm9wZXJ0eShzdHJ1Y3QgZHJtX3Bs YW5lICpwbGFuZSwKIGludCBpbnRlbF9wbGFuZV9hdG9taWNfY2FsY19jaGFuZ2VzKHN0cnVjdCBk cm1fY3J0Y19zdGF0ZSAqY3J0Y19zdGF0ZSwKIAkJCQkgICAgc3RydWN0IGRybV9wbGFuZV9zdGF0 ZSAqcGxhbmVfc3RhdGUpOwogCi11bnNpZ25lZCBpbnQKLWludGVsX3RpbGVfaGVpZ2h0KHN0cnVj dCBkcm1fZGV2aWNlICpkZXYsIHVpbnQzMl90IHBpeGVsX2Zvcm1hdCwKLQkJICB1aW50NjRfdCBm Yl9mb3JtYXRfbW9kaWZpZXIsIHVuc2lnbmVkIGludCBwbGFuZSk7Cit1bnNpZ25lZCBpbnQgaW50 ZWxfdGlsZV9oZWlnaHQoY29uc3Qgc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2LAor CQkJICAgICAgIHVpbnQ2NF90IGZiX21vZGlmaWVyLCB1bnNpZ25lZCBpbnQgY3BwKTsKIAogc3Rh dGljIGlubGluZSBib29sCiBpbnRlbF9yb3RhdGlvbl85MF9vcl8yNzAodW5zaWduZWQgaW50IHJv dGF0aW9uKQpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfc3ByaXRlLmMg Yi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9zcHJpdGUuYwppbmRleCAzZDk2ODcxLi40YTFh NWY0IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9zcHJpdGUuYworKysg Yi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9zcHJpdGUuYwpAQCAtMjQxLDggKzI0MSw4IEBA IHNrbF91cGRhdGVfcGxhbmUoc3RydWN0IGRybV9wbGFuZSAqZHJtX3BsYW5lLCBzdHJ1Y3QgZHJt X2NydGMgKmNydGMsCiAKIAlpZiAoaW50ZWxfcm90YXRpb25fOTBfb3JfMjcwKHJvdGF0aW9uKSkg ewogCQkvKiBzdHJpZGU6IFN1cmZhY2UgaGVpZ2h0IGluIHRpbGVzICovCi0JCXRpbGVfaGVpZ2h0 ID0gaW50ZWxfdGlsZV9oZWlnaHQoZGV2LCBmYi0+cGl4ZWxfZm9ybWF0LAotCQkJCQkJZmItPm1v ZGlmaWVyWzBdLCAwKTsKKwkJdGlsZV9oZWlnaHQgPSBpbnRlbF90aWxlX2hlaWdodChkZXZfcHJp diwgZmItPm1vZGlmaWVyWzBdLAorCQkJCQkJcGl4ZWxfc2l6ZSk7CiAJCXN0cmlkZSA9IERJVl9S T1VORF9VUChmYi0+aGVpZ2h0LCB0aWxlX2hlaWdodCk7CiAJCXBsYW5lX3NpemUgPSAoc3JjX3cg PDwgMTYpIHwgc3JjX2g7CiAJCXhfb2Zmc2V0ID0gc3RyaWRlICogdGlsZV9oZWlnaHQgLSB5IC0g KHNyY19oICsgMSk7Ci0tIAoyLjQuOQoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJl ZWRlc2t0b3Aub3JnCmh0dHA6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5m by9pbnRlbC1nZngK