From mboxrd@z Thu Jan 1 00:00:00 1970 From: ville.syrjala@linux.intel.com Subject: [PATCH v2 3/7] drm/i915: Redo intel_tile_height() as intel_tile_size() / intel_tile_width() Date: Tue, 12 Jan 2016 21:08:33 +0200 Message-ID: <1452625717-9713-4-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 mga01.intel.com (mga01.intel.com [192.55.52.88]) by gabe.freedesktop.org (Postfix) with ESMTP id C46226E6D5 for ; Tue, 12 Jan 2016 11:09:09 -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 RnJvbTogVmlsbGUgU3lyasOkbMOkIDx2aWxsZS5zeXJqYWxhQGxpbnV4LmludGVsLmNvbT4KCkkg ZmluZCBtb3JlIHVzdWFsIHRvIHRoaW5rIGFib3V0IHRpbGUgd2lkdGhzIHRoYW4gaGVpZ2h0cywg c28gY2hhbmdpbmcKdGhlIGludGVsX3RpbGVfaGVpZ2h0KCkgdG8gY2FsY3VsYXRlIHRoZSB0aWxl IGhlaWdodCBhcwp0aWxlX3NpemUvdGlsZV93aWR0aCBpcyBlYXNpZXIgdGhhbiB0aGUgb3Bwb3Np dGUgdG8gdGhlIHBvb3IgYnJhaW4uCgp2MjogUmVvcmRlciBhcmd1bWVudHMgZm9yIGNvbnNpc3Rl bmN5CiAgICBDb25zdGlmeSBkZXZfcHJpdiBhcmd1bWVudHMKClNpZ25lZC1vZmYtYnk6IFZpbGxl IFN5cmrDpGzDpCA8dmlsbGUuc3lyamFsYUBsaW51eC5pbnRlbC5jb20+ClJldmlld2VkLWJ5OiBE YW5pZWwgVmV0dGVyIDxkYW5pZWwudmV0dGVyQGZmd2xsLmNoPgotLS0KIGRyaXZlcnMvZ3B1L2Ry bS9pOTE1L2ludGVsX2Rpc3BsYXkuYyB8IDg5ICsrKysrKysrKysrKy0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHJ2LmggICAgIHwgIDUgKy0KIGRy aXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3Nwcml0ZS5jICB8ICA1ICstCiAzIGZpbGVzIGNoYW5n ZWQsIDM0IGluc2VydGlvbnMoKyksIDY1IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZl cnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2lu dGVsX2Rpc3BsYXkuYwppbmRleCAzYTYzODcwOTJmNjMuLmUyYzdhZTkwYjM5ZCAxMDA2NDQKLS0t IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jCisrKyBiL2RyaXZlcnMvZ3B1 L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYwpAQCAtMjIyMyw2ICsyMjIzLDExIEBAIHN0YXRpYyBi b29sIG5lZWRfdnRkX3dhKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCiAJcmV0dXJuIGZhbHNlOwog fQogCitzdGF0aWMgdW5zaWduZWQgaW50IGludGVsX3RpbGVfc2l6ZShjb25zdCBzdHJ1Y3QgZHJt X2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpCit7CisJcmV0dXJuIElTX0dFTjIoZGV2X3ByaXYpID8g MjA0OCA6IDQwOTY7Cit9CisKIHN0YXRpYyB1bnNpZ25lZCBpbnQgaW50ZWxfdGlsZV93aWR0aChj b25zdCBzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYsCiAJCQkJICAgICB1aW50NjRf dCBmYl9tb2RpZmllciwgdW5zaWduZWQgaW50IGNwcCkKIHsKQEAgLTIyNjAsNjcgKzIyNjUsMzQg QEAgc3RhdGljIHVuc2lnbmVkIGludCBpbnRlbF90aWxlX3dpZHRoKGNvbnN0IHN0cnVjdCBkcm1f aTkxNV9wcml2YXRlICpkZXZfcHJpdiwKIAl9CiB9CiAKLXVuc2lnbmVkIGludAotaW50ZWxfdGls ZV9oZWlnaHQoc3RydWN0IGRybV9kZXZpY2UgKmRldiwgdWludDMyX3QgcGl4ZWxfZm9ybWF0LAot CQkgIHVpbnQ2NF90IGZiX2Zvcm1hdF9tb2RpZmllciwgdW5zaWduZWQgaW50IHBsYW5lKQordW5z aWduZWQgaW50IGludGVsX3RpbGVfaGVpZ2h0KGNvbnN0IHN0cnVjdCBkcm1faTkxNV9wcml2YXRl ICpkZXZfcHJpdiwKKwkJCSAgICAgICB1aW50NjRfdCBmYl9tb2RpZmllciwgdW5zaWduZWQgaW50 IGNwcCkKIHsKLQl1bnNpZ25lZCBpbnQgdGlsZV9oZWlnaHQ7Ci0JdWludDMyX3QgcGl4ZWxfYnl0 ZXM7Ci0KLQlzd2l0Y2ggKGZiX2Zvcm1hdF9tb2RpZmllcikgewotCWNhc2UgRFJNX0ZPUk1BVF9N T0RfTk9ORToKLQkJdGlsZV9oZWlnaHQgPSAxOwotCQlicmVhazsKLQljYXNlIEk5MTVfRk9STUFU X01PRF9YX1RJTEVEOgotCQl0aWxlX2hlaWdodCA9IElTX0dFTjIoZGV2KSA/IDE2IDogODsKLQkJ YnJlYWs7Ci0JY2FzZSBJOTE1X0ZPUk1BVF9NT0RfWV9USUxFRDoKLQkJdGlsZV9oZWlnaHQgPSAz MjsKLQkJYnJlYWs7Ci0JY2FzZSBJOTE1X0ZPUk1BVF9NT0RfWWZfVElMRUQ6Ci0JCXBpeGVsX2J5 dGVzID0gZHJtX2Zvcm1hdF9wbGFuZV9jcHAocGl4ZWxfZm9ybWF0LCBwbGFuZSk7Ci0JCXN3aXRj aCAocGl4ZWxfYnl0ZXMpIHsKLQkJZGVmYXVsdDoKLQkJY2FzZSAxOgotCQkJdGlsZV9oZWlnaHQg PSA2NDsKLQkJCWJyZWFrOwotCQljYXNlIDI6Ci0JCWNhc2UgNDoKLQkJCXRpbGVfaGVpZ2h0ID0g MzI7Ci0JCQlicmVhazsKLQkJY2FzZSA4OgotCQkJdGlsZV9oZWlnaHQgPSAxNjsKLQkJCWJyZWFr OwotCQljYXNlIDE2OgotCQkJV0FSTl9PTkNFKDEsCi0JCQkJICAiMTI4LWJpdCBwaXhlbHMgYXJl IG5vdCBzdXBwb3J0ZWQgZm9yIGRpc3BsYXkhIik7Ci0JCQl0aWxlX2hlaWdodCA9IDE2OwotCQkJ YnJlYWs7Ci0JCX0KLQkJYnJlYWs7Ci0JZGVmYXVsdDoKLQkJTUlTU0lOR19DQVNFKGZiX2Zvcm1h dF9tb2RpZmllcik7Ci0JCXRpbGVfaGVpZ2h0ID0gMTsKLQkJYnJlYWs7Ci0JfQotCi0JcmV0dXJu IHRpbGVfaGVpZ2h0OworCWlmIChmYl9tb2RpZmllciA9PSBEUk1fRk9STUFUX01PRF9OT05FKQor CQlyZXR1cm4gMTsKKwllbHNlCisJCXJldHVybiBpbnRlbF90aWxlX3NpemUoZGV2X3ByaXYpIC8K KwkJCWludGVsX3RpbGVfd2lkdGgoZGV2X3ByaXYsIGZiX21vZGlmaWVyLCBjcHApOwogfQogCiB1 bnNpZ25lZCBpbnQKIGludGVsX2ZiX2FsaWduX2hlaWdodChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2 LCB1bnNpZ25lZCBpbnQgaGVpZ2h0LAotCQkgICAgICB1aW50MzJfdCBwaXhlbF9mb3JtYXQsIHVp bnQ2NF90IGZiX2Zvcm1hdF9tb2RpZmllcikKKwkJICAgICAgdWludDMyX3QgcGl4ZWxfZm9ybWF0 LCB1aW50NjRfdCBmYl9tb2RpZmllcikKIHsKLQlyZXR1cm4gQUxJR04oaGVpZ2h0LCBpbnRlbF90 aWxlX2hlaWdodChkZXYsIHBpeGVsX2Zvcm1hdCwKLQkJCQkJICAgICAgIGZiX2Zvcm1hdF9tb2Rp ZmllciwgMCkpOworCXVuc2lnbmVkIGludCBjcHAgPSBkcm1fZm9ybWF0X3BsYW5lX2NwcChwaXhl bF9mb3JtYXQsIDApOworCXVuc2lnbmVkIGludCB0aWxlX2hlaWdodCA9IGludGVsX3RpbGVfaGVp Z2h0KHRvX2k5MTUoZGV2KSwgZmJfbW9kaWZpZXIsIGNwcCk7CisKKwlyZXR1cm4gQUxJR04oaGVp Z2h0LCB0aWxlX2hlaWdodCk7CiB9CiAKIHN0YXRpYyB2b2lkCiBpbnRlbF9maWxsX2ZiX2dndHRf dmlldyhzdHJ1Y3QgaTkxNV9nZ3R0X3ZpZXcgKnZpZXcsIHN0cnVjdCBkcm1fZnJhbWVidWZmZXIg KmZiLAogCQkJY29uc3Qgc3RydWN0IGRybV9wbGFuZV9zdGF0ZSAqcGxhbmVfc3RhdGUpCiB7CisJ c3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0gdG9faTkxNShmYi0+ZGV2KTsKIAlz dHJ1Y3QgaW50ZWxfcm90YXRpb25faW5mbyAqaW5mbyA9ICZ2aWV3LT5wYXJhbXMucm90YXRpb25f aW5mbzsKIAl1bnNpZ25lZCBpbnQgdGlsZV9oZWlnaHQsIHRpbGVfcGl0Y2g7CisJdW5zaWduZWQg aW50IGNwcCA9IGRybV9mb3JtYXRfcGxhbmVfY3BwKGZiLT5waXhlbF9mb3JtYXQsIDApOwogCiAJ KnZpZXcgPSBpOTE1X2dndHRfdmlld19ub3JtYWw7CiAKQEAgLTIzMzgsMjIgKzIzMTAsMTkgQEAg aW50ZWxfZmlsbF9mYl9nZ3R0X3ZpZXcoc3RydWN0IGk5MTVfZ2d0dF92aWV3ICp2aWV3LCBzdHJ1 Y3QgZHJtX2ZyYW1lYnVmZmVyICpmYiwKIAlpbmZvLT51dl9vZmZzZXQgPSBmYi0+b2Zmc2V0c1sx XTsKIAlpbmZvLT5mYl9tb2RpZmllciA9IGZiLT5tb2RpZmllclswXTsKIAotCXRpbGVfaGVpZ2h0 ID0gaW50ZWxfdGlsZV9oZWlnaHQoZmItPmRldiwgZmItPnBpeGVsX2Zvcm1hdCwKLQkJCQkJZmIt Pm1vZGlmaWVyWzBdLCAwKTsKKwl0aWxlX2hlaWdodCA9IGludGVsX3RpbGVfaGVpZ2h0KGRldl9w cml2LCBmYi0+bW9kaWZpZXJbMF0sIGNwcCk7CiAJdGlsZV9waXRjaCA9IFBBR0VfU0laRSAvIHRp bGVfaGVpZ2h0OwogCWluZm8tPndpZHRoX3BhZ2VzID0gRElWX1JPVU5EX1VQKGZiLT5waXRjaGVz WzBdLCB0aWxlX3BpdGNoKTsKIAlpbmZvLT5oZWlnaHRfcGFnZXMgPSBESVZfUk9VTkRfVVAoZmIt PmhlaWdodCwgdGlsZV9oZWlnaHQpOwogCWluZm8tPnNpemUgPSBpbmZvLT53aWR0aF9wYWdlcyAq IGluZm8tPmhlaWdodF9wYWdlcyAqIFBBR0VfU0laRTsKIAogCWlmIChpbmZvLT5waXhlbF9mb3Jt YXQgPT0gRFJNX0ZPUk1BVF9OVjEyKSB7Ci0JCXRpbGVfaGVpZ2h0ID0gaW50ZWxfdGlsZV9oZWln aHQoZmItPmRldiwgZmItPnBpeGVsX2Zvcm1hdCwKLQkJCQkJCWZiLT5tb2RpZmllclswXSwgMSk7 CisJCWNwcCA9IGRybV9mb3JtYXRfcGxhbmVfY3BwKGZiLT5waXhlbF9mb3JtYXQsIDEpOworCQl0 aWxlX2hlaWdodCA9IGludGVsX3RpbGVfaGVpZ2h0KGRldl9wcml2LCBmYi0+bW9kaWZpZXJbMV0s IGNwcCk7CiAJCXRpbGVfcGl0Y2ggPSBQQUdFX1NJWkUgLyB0aWxlX2hlaWdodDsKLQkJaW5mby0+ d2lkdGhfcGFnZXNfdXYgPSBESVZfUk9VTkRfVVAoZmItPnBpdGNoZXNbMF0sIHRpbGVfcGl0Y2gp OwotCQlpbmZvLT5oZWlnaHRfcGFnZXNfdXYgPSBESVZfUk9VTkRfVVAoZmItPmhlaWdodCAvIDIs Ci0JCQkJCQkgICAgIHRpbGVfaGVpZ2h0KTsKLQkJaW5mby0+c2l6ZV91diA9IGluZm8tPndpZHRo X3BhZ2VzX3V2ICogaW5mby0+aGVpZ2h0X3BhZ2VzX3V2ICoKLQkJCQlQQUdFX1NJWkU7CisJCWlu Zm8tPndpZHRoX3BhZ2VzX3V2ID0gRElWX1JPVU5EX1VQKGZiLT5waXRjaGVzWzFdLCB0aWxlX3Bp dGNoKTsKKwkJaW5mby0+aGVpZ2h0X3BhZ2VzX3V2ID0gRElWX1JPVU5EX1VQKGZiLT5oZWlnaHQg LyAyLCB0aWxlX2hlaWdodCk7CisJCWluZm8tPnNpemVfdXYgPSBpbmZvLT53aWR0aF9wYWdlc191 diAqIGluZm8tPmhlaWdodF9wYWdlc191diAqIFBBR0VfU0laRTsKIAl9CiB9CiAKQEAgLTMxNDAs OSArMzEwOSwxMCBAQCBzdGF0aWMgdm9pZCBza3lsYWtlX3VwZGF0ZV9wcmltYXJ5X3BsYW5lKHN0 cnVjdCBkcm1fcGxhbmUgKnBsYW5lLAogCVdBUk5fT04oZHJtX3JlY3Rfd2lkdGgoJnBsYW5lX3N0 YXRlLT5zcmMpID09IDApOwogCiAJaWYgKGludGVsX3JvdGF0aW9uXzkwX29yXzI3MChyb3RhdGlv bikpIHsKKwkJaW50IGNwcCA9IGRybV9mb3JtYXRfcGxhbmVfY3BwKGZiLT5waXhlbF9mb3JtYXQs IDApOworCiAJCS8qIHN0cmlkZSA9IFN1cmZhY2UgaGVpZ2h0IGluIHRpbGVzICovCi0JCXRpbGVf aGVpZ2h0ID0gaW50ZWxfdGlsZV9oZWlnaHQoZGV2LCBmYi0+cGl4ZWxfZm9ybWF0LAotCQkJCQkJ ZmItPm1vZGlmaWVyWzBdLCAwKTsKKwkJdGlsZV9oZWlnaHQgPSBpbnRlbF90aWxlX2hlaWdodChk ZXZfcHJpdiwgZmItPm1vZGlmaWVyWzBdLCBjcHApOwogCQlzdHJpZGUgPSBESVZfUk9VTkRfVVAo ZmItPmhlaWdodCwgdGlsZV9oZWlnaHQpOwogCQl4X29mZnNldCA9IHN0cmlkZSAqIHRpbGVfaGVp Z2h0IC0gc3JjX3kgLSBzcmNfaDsKIAkJeV9vZmZzZXQgPSBzcmNfeDsKQEAgLTExMzk5LDggKzEx MzY5LDcgQEAgc3RhdGljIHZvaWQgc2tsX2RvX21taW9fZmxpcChzdHJ1Y3QgaW50ZWxfY3J0YyAq aW50ZWxfY3J0YywKIAkgKi8KIAlpZiAoaW50ZWxfcm90YXRpb25fOTBfb3JfMjcwKHJvdGF0aW9u KSkgewogCQkvKiBzdHJpZGUgPSBTdXJmYWNlIGhlaWdodCBpbiB0aWxlcyAqLwotCQl0aWxlX2hl aWdodCA9IGludGVsX3RpbGVfaGVpZ2h0KGRldiwgZmItPnBpeGVsX2Zvcm1hdCwKLQkJCQkJCWZi LT5tb2RpZmllclswXSwgMCk7CisJCXRpbGVfaGVpZ2h0ID0gaW50ZWxfdGlsZV9oZWlnaHQoZGV2 X3ByaXYsIGZiLT5tb2RpZmllclswXSwgMCk7CiAJCXN0cmlkZSA9IERJVl9ST1VORF9VUChmYi0+ aGVpZ2h0LCB0aWxlX2hlaWdodCk7CiAJfSBlbHNlIHsKIAkJc3RyaWRlID0gZmItPnBpdGNoZXNb MF0gLwpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHJ2LmggYi9kcml2 ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcnYuaAppbmRleCA5YTgwNzViNzg1YWMuLjZhYWFhOGQz YjgxYSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHJ2LmgKKysrIGIv ZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHJ2LmgKQEAgLTExNTUsOSArMTE1NSw4IEBAIGlu dCBpbnRlbF9wbGFuZV9hdG9taWNfc2V0X3Byb3BlcnR5KHN0cnVjdCBkcm1fcGxhbmUgKnBsYW5l LAogaW50IGludGVsX3BsYW5lX2F0b21pY19jYWxjX2NoYW5nZXMoc3RydWN0IGRybV9jcnRjX3N0 YXRlICpjcnRjX3N0YXRlLAogCQkJCSAgICBzdHJ1Y3QgZHJtX3BsYW5lX3N0YXRlICpwbGFuZV9z dGF0ZSk7CiAKLXVuc2lnbmVkIGludAotaW50ZWxfdGlsZV9oZWlnaHQoc3RydWN0IGRybV9kZXZp Y2UgKmRldiwgdWludDMyX3QgcGl4ZWxfZm9ybWF0LAotCQkgIHVpbnQ2NF90IGZiX2Zvcm1hdF9t b2RpZmllciwgdW5zaWduZWQgaW50IHBsYW5lKTsKK3Vuc2lnbmVkIGludCBpbnRlbF90aWxlX2hl aWdodChjb25zdCBzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYsCisJCQkgICAgICAg dWludDY0X3QgZmJfbW9kaWZpZXIsIHVuc2lnbmVkIGludCBjcHApOwogCiBzdGF0aWMgaW5saW5l IGJvb2wKIGludGVsX3JvdGF0aW9uXzkwX29yXzI3MCh1bnNpZ25lZCBpbnQgcm90YXRpb24pCmRp ZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9zcHJpdGUuYyBiL2RyaXZlcnMv Z3B1L2RybS9pOTE1L2ludGVsX3Nwcml0ZS5jCmluZGV4IDZlN2FjMGVhMGE0MS4uMzlhN2JlMDJj MTgxIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9zcHJpdGUuYworKysg Yi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9zcHJpdGUuYwpAQCAtMjM5LDkgKzIzOSwxMCBA QCBza2xfdXBkYXRlX3BsYW5lKHN0cnVjdCBkcm1fcGxhbmUgKmRybV9wbGFuZSwKIAlzdXJmX2Fk ZHIgPSBpbnRlbF9wbGFuZV9vYmpfb2Zmc2V0KGludGVsX3BsYW5lLCBvYmosIDApOwogCiAJaWYg KGludGVsX3JvdGF0aW9uXzkwX29yXzI3MChyb3RhdGlvbikpIHsKKwkJaW50IGNwcCA9IGRybV9m b3JtYXRfcGxhbmVfY3BwKGZiLT5waXhlbF9mb3JtYXQsIDApOworCiAJCS8qIHN0cmlkZTogU3Vy ZmFjZSBoZWlnaHQgaW4gdGlsZXMgKi8KLQkJdGlsZV9oZWlnaHQgPSBpbnRlbF90aWxlX2hlaWdo dChkZXYsIGZiLT5waXhlbF9mb3JtYXQsCi0JCQkJCQlmYi0+bW9kaWZpZXJbMF0sIDApOworCQl0 aWxlX2hlaWdodCA9IGludGVsX3RpbGVfaGVpZ2h0KGRldl9wcml2LCBmYi0+bW9kaWZpZXJbMF0s IGNwcCk7CiAJCXN0cmlkZSA9IERJVl9ST1VORF9VUChmYi0+aGVpZ2h0LCB0aWxlX2hlaWdodCk7 CiAJCXBsYW5lX3NpemUgPSAoc3JjX3cgPDwgMTYpIHwgc3JjX2g7CiAJCXhfb2Zmc2V0ID0gc3Ry aWRlICogdGlsZV9oZWlnaHQgLSB5IC0gKHNyY19oICsgMSk7Ci0tIAoyLjQuMTAKCl9fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCkludGVsLWdmeCBtYWlsaW5n IGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwOi8vbGlzdHMuZnJlZWRl c2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4Cg==