From: ville.syrjala@linux.intel.com Subject: [PATCH v3 2/7] drm/i915: Factor out intel_tile_width() Date: Tue, 12 Jan 2016 21:08:32 +0200 Message-ID: <1452625717-9713-3-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 173B46E353 for ; Tue, 12 Jan 2016 11:08:46 -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 bGwgdGhlIHRpbGUgd2lkdGggY2FsY3VsYXRpb25zIGZyb20gaW50ZWxfZmJfc3RyaWRlX2FsaWdu bWVudCgpIGludG8gYQpuZXcgZnVuY3Rpb24gaW50ZWxfdGlsZV93aWR0aCgpLgoKQWxzbyB0YWtl IHRoZSBvcHBvcnR1bml0eSB0byBwYXNzIGFyb3VuIGRldl9wcml2IGluc3RlYWQgb2YgZGV2IHRv CmludGVsX2ZiX3N0cmlkZV9hbGlnbm1lbnQoKS4KCnYyOiBSZW9yZGVyIGFyZ3VtbmVudHMgdG8g YmUgbW9yZSBjb25zaXN0ZW50IHdpdGggb3RoZXIgZnVuY3Rpb25zCiAgICBDaGFuZ2UgaW50ZWxf ZmJfc3RyaWRlX2FsaWdubWVudCgpIHRvIGFjY2VwdCBkZXZfcHJpdiBpbnN0ZWFkIG9mIGRldgp2 MzogRGVhbCB3aXRoIFkgdGlsbGluZyAoRGFuaWVsKQoKU2lnbmVkLW9mZi1ieTogVmlsbGUgU3ly asOkbMOkIDx2aWxsZS5zeXJqYWxhQGxpbnV4LmludGVsLmNvbT4KUmV2aWV3ZWQtYnk6IERhbmll bCBWZXR0ZXIgPGRhbmllbC52ZXR0ZXJAZmZ3bGwuY2g+Ci0tLQogZHJpdmVycy9ncHUvZHJtL2k5 MTUvaW50ZWxfZGlzcGxheS5jIHwgODUgKysrKysrKysrKysrKysrKysrKysrLS0tLS0tLS0tLS0t LS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcnYuaCAgICAgfCAgNCArLQogZHJpdmVy cy9ncHUvZHJtL2k5MTUvaW50ZWxfc3ByaXRlLmMgIHwgIDIgKy0KIDMgZmlsZXMgY2hhbmdlZCwg NTQgaW5zZXJ0aW9ucygrKSwgMzcgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9n cHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxf ZGlzcGxheS5jCmluZGV4IDBmODE3NDA1MWQ1Yy4uM2E2Mzg3MDkyZjYzIDEwMDY0NAotLS0gYS9k cml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMKKysrIGIvZHJpdmVycy9ncHUvZHJt L2k5MTUvaW50ZWxfZGlzcGxheS5jCkBAIC0yMjIzLDYgKzIyMjMsNDMgQEAgc3RhdGljIGJvb2wg bmVlZF92dGRfd2Eoc3RydWN0IGRybV9kZXZpY2UgKmRldikKIAlyZXR1cm4gZmFsc2U7CiB9CiAK K3N0YXRpYyB1bnNpZ25lZCBpbnQgaW50ZWxfdGlsZV93aWR0aChjb25zdCBzdHJ1Y3QgZHJtX2k5 MTVfcHJpdmF0ZSAqZGV2X3ByaXYsCisJCQkJICAgICB1aW50NjRfdCBmYl9tb2RpZmllciwgdW5z aWduZWQgaW50IGNwcCkKK3sKKwlzd2l0Y2ggKGZiX21vZGlmaWVyKSB7CisJY2FzZSBEUk1fRk9S TUFUX01PRF9OT05FOgorCQlyZXR1cm4gY3BwOworCWNhc2UgSTkxNV9GT1JNQVRfTU9EX1hfVElM RUQ6CisJCWlmIChJU19HRU4yKGRldl9wcml2KSkKKwkJCXJldHVybiAxMjg7CisJCWVsc2UKKwkJ CXJldHVybiA1MTI7CisJY2FzZSBJOTE1X0ZPUk1BVF9NT0RfWV9USUxFRDoKKwkJaWYgKElTX0dF TjIoZGV2X3ByaXYpIHx8IEhBU18xMjhfQllURV9ZX1RJTElORyhkZXZfcHJpdikpCisJCQlyZXR1 cm4gMTI4OworCQllbHNlCisJCQlyZXR1cm4gNTEyOworCWNhc2UgSTkxNV9GT1JNQVRfTU9EX1lm X1RJTEVEOgorCQlzd2l0Y2ggKGNwcCkgeworCQljYXNlIDE6CisJCQlyZXR1cm4gNjQ7CisJCWNh c2UgMjoKKwkJY2FzZSA0OgorCQkJcmV0dXJuIDEyODsKKwkJY2FzZSA4OgorCQljYXNlIDE2Ogor CQkJcmV0dXJuIDI1NjsKKwkJZGVmYXVsdDoKKwkJCU1JU1NJTkdfQ0FTRShjcHApOworCQkJcmV0 dXJuIGNwcDsKKwkJfQorCQlicmVhazsKKwlkZWZhdWx0OgorCQlNSVNTSU5HX0NBU0UoZmJfbW9k aWZpZXIpOworCQlyZXR1cm4gY3BwOworCX0KK30KKwogdW5zaWduZWQgaW50CiBpbnRlbF90aWxl X2hlaWdodChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LCB1aW50MzJfdCBwaXhlbF9mb3JtYXQsCiAJ CSAgdWludDY0X3QgZmJfZm9ybWF0X21vZGlmaWVyLCB1bnNpZ25lZCBpbnQgcGxhbmUpCkBAIC0y OTE0LDM3ICsyOTUxLDE1IEBAIHN0YXRpYyB2b2lkIGlyb25sYWtlX3VwZGF0ZV9wcmltYXJ5X3Bs YW5lKHN0cnVjdCBkcm1fcGxhbmUgKnByaW1hcnksCiAJUE9TVElOR19SRUFEKHJlZyk7CiB9CiAK LXUzMiBpbnRlbF9mYl9zdHJpZGVfYWxpZ25tZW50KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsIHVp bnQ2NF90IGZiX21vZGlmaWVyLAotCQkJICAgICAgdWludDMyX3QgcGl4ZWxfZm9ybWF0KQordTMy IGludGVsX2ZiX3N0cmlkZV9hbGlnbm1lbnQoY29uc3Qgc3RydWN0IGRybV9pOTE1X3ByaXZhdGUg KmRldl9wcml2LAorCQkJICAgICAgdWludDY0X3QgZmJfbW9kaWZpZXIsIHVpbnQzMl90IHBpeGVs X2Zvcm1hdCkKIHsKLQl1MzIgYml0c19wZXJfcGl4ZWwgPSBkcm1fZm9ybWF0X3BsYW5lX2NwcChw aXhlbF9mb3JtYXQsIDApICogODsKLQotCS8qCi0JICogVGhlIHN0cmlkZSBpcyBlaXRoZXIgZXhw cmVzc2VkIGFzIGEgbXVsdGlwbGUgb2YgNjQgYnl0ZXMKLQkgKiBjaHVua3MgZm9yIGxpbmVhciBi dWZmZXJzIG9yIGluIG51bWJlciBvZiB0aWxlcyBmb3IgdGlsZWQKLQkgKiBidWZmZXJzLgotCSAq LwotCXN3aXRjaCAoZmJfbW9kaWZpZXIpIHsKLQljYXNlIERSTV9GT1JNQVRfTU9EX05PTkU6Ci0J CXJldHVybiA2NDsKLQljYXNlIEk5MTVfRk9STUFUX01PRF9YX1RJTEVEOgotCQlpZiAoSU5URUxf SU5GTyhkZXYpLT5nZW4gPT0gMikKLQkJCXJldHVybiAxMjg7Ci0JCXJldHVybiA1MTI7Ci0JY2Fz ZSBJOTE1X0ZPUk1BVF9NT0RfWV9USUxFRDoKLQkJLyogTm8gbmVlZCB0byBjaGVjayBmb3Igb2xk IGdlbnMgYW5kIFkgdGlsaW5nIHNpbmNlIHRoaXMgaXMKLQkJICogYWJvdXQgdGhlIGRpc3BsYXkg ZW5naW5lIGFuZCB0aG9zZSB3aWxsIGJlIGJsb2NrZWQgYmVmb3JlCi0JCSAqIHdlIGdldCBoZXJl LgotCQkgKi8KLQkJcmV0dXJuIDEyODsKLQljYXNlIEk5MTVfRk9STUFUX01PRF9ZZl9USUxFRDoK LQkJaWYgKGJpdHNfcGVyX3BpeGVsID09IDgpCi0JCQlyZXR1cm4gNjQ7Ci0JCWVsc2UKLQkJCXJl dHVybiAxMjg7Ci0JZGVmYXVsdDoKLQkJTUlTU0lOR19DQVNFKGZiX21vZGlmaWVyKTsKKwlpZiAo ZmJfbW9kaWZpZXIgPT0gRFJNX0ZPUk1BVF9NT0RfTk9ORSkgewogCQlyZXR1cm4gNjQ7CisJfSBl bHNlIHsKKwkJaW50IGNwcCA9IGRybV9mb3JtYXRfcGxhbmVfY3BwKHBpeGVsX2Zvcm1hdCwgMCk7 CisKKwkJcmV0dXJuIGludGVsX3RpbGVfd2lkdGgoZGV2X3ByaXYsIGZiX21vZGlmaWVyLCBjcHAp OwogCX0KIH0KIApAQCAtMzExOCw3ICszMTMzLDcgQEAgc3RhdGljIHZvaWQgc2t5bGFrZV91cGRh dGVfcHJpbWFyeV9wbGFuZShzdHJ1Y3QgZHJtX3BsYW5lICpwbGFuZSwKIAlwbGFuZV9jdGwgfD0g UExBTkVfQ1RMX1BMQU5FX0dBTU1BX0RJU0FCTEU7CiAJcGxhbmVfY3RsIHw9IHNrbF9wbGFuZV9j dGxfcm90YXRpb24ocm90YXRpb24pOwogCi0Jc3RyaWRlX2RpdiA9IGludGVsX2ZiX3N0cmlkZV9h bGlnbm1lbnQoZGV2LCBmYi0+bW9kaWZpZXJbMF0sCisJc3RyaWRlX2RpdiA9IGludGVsX2ZiX3N0 cmlkZV9hbGlnbm1lbnQoZGV2X3ByaXYsIGZiLT5tb2RpZmllclswXSwKIAkJCQkJICAgICAgIGZi LT5waXhlbF9mb3JtYXQpOwogCXN1cmZfYWRkciA9IGludGVsX3BsYW5lX29ial9vZmZzZXQodG9f aW50ZWxfcGxhbmUocGxhbmUpLCBvYmosIDApOwogCkBAIC05MzAzLDcgKzkzMTgsNyBAQCBza3ls YWtlX2dldF9pbml0aWFsX3BsYW5lX2NvbmZpZyhzdHJ1Y3QgaW50ZWxfY3J0YyAqY3J0YywKIAlm Yi0+d2lkdGggPSAoKHZhbCA+PiAwKSAmIDB4MWZmZikgKyAxOwogCiAJdmFsID0gSTkxNV9SRUFE KFBMQU5FX1NUUklERShwaXBlLCAwKSk7Ci0Jc3RyaWRlX211bHQgPSBpbnRlbF9mYl9zdHJpZGVf YWxpZ25tZW50KGRldiwgZmItPm1vZGlmaWVyWzBdLAorCXN0cmlkZV9tdWx0ID0gaW50ZWxfZmJf c3RyaWRlX2FsaWdubWVudChkZXZfcHJpdiwgZmItPm1vZGlmaWVyWzBdLAogCQkJCQkJZmItPnBp eGVsX2Zvcm1hdCk7CiAJZmItPnBpdGNoZXNbMF0gPSAodmFsICYgMHgzZmYpICogc3RyaWRlX211 bHQ7CiAKQEAgLTExMzg5LDggKzExNDA0LDggQEAgc3RhdGljIHZvaWQgc2tsX2RvX21taW9fZmxp cChzdHJ1Y3QgaW50ZWxfY3J0YyAqaW50ZWxfY3J0YywKIAkJc3RyaWRlID0gRElWX1JPVU5EX1VQ KGZiLT5oZWlnaHQsIHRpbGVfaGVpZ2h0KTsKIAl9IGVsc2UgewogCQlzdHJpZGUgPSBmYi0+cGl0 Y2hlc1swXSAvCi0JCQkJaW50ZWxfZmJfc3RyaWRlX2FsaWdubWVudChkZXYsIGZiLT5tb2RpZmll clswXSwKLQkJCQkJCQkgIGZiLT5waXhlbF9mb3JtYXQpOworCQkJaW50ZWxfZmJfc3RyaWRlX2Fs aWdubWVudChkZXZfcHJpdiwgZmItPm1vZGlmaWVyWzBdLAorCQkJCQkJICBmYi0+cGl4ZWxfZm9y bWF0KTsKIAl9CiAKIAkvKgpAQCAtMTQ3NzQsNiArMTQ3ODksNyBAQCBzdGF0aWMgaW50IGludGVs X2ZyYW1lYnVmZmVyX2luaXQoc3RydWN0IGRybV9kZXZpY2UgKmRldiwKIAkJCQkgIHN0cnVjdCBk cm1fbW9kZV9mYl9jbWQyICptb2RlX2NtZCwKIAkJCQkgIHN0cnVjdCBkcm1faTkxNV9nZW1fb2Jq ZWN0ICpvYmopCiB7CisJc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0gdG9faTkx NShkZXYpOwogCXVuc2lnbmVkIGludCBhbGlnbmVkX2hlaWdodDsKIAlpbnQgcmV0OwogCXUzMiBw aXRjaF9saW1pdCwgc3RyaWRlX2FsaWdubWVudDsKQEAgLTE0ODE1LDcgKzE0ODMxLDggQEAgc3Rh dGljIGludCBpbnRlbF9mcmFtZWJ1ZmZlcl9pbml0KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsCiAJ CXJldHVybiAtRUlOVkFMOwogCX0KIAotCXN0cmlkZV9hbGlnbm1lbnQgPSBpbnRlbF9mYl9zdHJp ZGVfYWxpZ25tZW50KGRldiwgbW9kZV9jbWQtPm1vZGlmaWVyWzBdLAorCXN0cmlkZV9hbGlnbm1l bnQgPSBpbnRlbF9mYl9zdHJpZGVfYWxpZ25tZW50KGRldl9wcml2LAorCQkJCQkJICAgICBtb2Rl X2NtZC0+bW9kaWZpZXJbMF0sCiAJCQkJCQkgICAgIG1vZGVfY21kLT5waXhlbF9mb3JtYXQpOwog CWlmIChtb2RlX2NtZC0+cGl0Y2hlc1swXSAmIChzdHJpZGVfYWxpZ25tZW50IC0gMSkpIHsKIAkJ RFJNX0RFQlVHKCJwaXRjaCAoJWQpIG11c3QgYmUgYXQgbGVhc3QgJXUgYnl0ZSBhbGlnbmVkXG4i LApkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHJ2LmggYi9kcml2ZXJz L2dwdS9kcm0vaTkxNS9pbnRlbF9kcnYuaAppbmRleCAwMTU1MzgyODcxNzEuLjlhODA3NWI3ODVh YyAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHJ2LmgKKysrIGIvZHJp dmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHJ2LmgKQEAgLTEwNzAsOCArMTA3MCw4IEBAIHVuc2ln bmVkIGludCBpbnRlbF9mYl9hbGlnbl9oZWlnaHQoc3RydWN0IGRybV9kZXZpY2UgKmRldiwKIAkJ CQkgICB1aW50NjRfdCBmYl9mb3JtYXRfbW9kaWZpZXIpOwogdm9pZCBpbnRlbF9mYl9vYmpfZmx1 c2goc3RydWN0IGRybV9pOTE1X2dlbV9vYmplY3QgKm9iaiwgYm9vbCByZXRpcmUsCiAJCQllbnVt IGZiX29wX29yaWdpbiBvcmlnaW4pOwotdTMyIGludGVsX2ZiX3N0cmlkZV9hbGlnbm1lbnQoc3Ry dWN0IGRybV9kZXZpY2UgKmRldiwgdWludDY0X3QgZmJfbW9kaWZpZXIsCi0JCQkgICAgICB1aW50 MzJfdCBwaXhlbF9mb3JtYXQpOwordTMyIGludGVsX2ZiX3N0cmlkZV9hbGlnbm1lbnQoY29uc3Qg c3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2LAorCQkJICAgICAgdWludDY0X3QgZmJf bW9kaWZpZXIsIHVpbnQzMl90IHBpeGVsX2Zvcm1hdCk7CiAKIC8qIGludGVsX2F1ZGlvLmMgKi8K IHZvaWQgaW50ZWxfaW5pdF9hdWRpbyhzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KTsKZGlmZiAtLWdp dCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3Nwcml0ZS5jIGIvZHJpdmVycy9ncHUvZHJt L2k5MTUvaW50ZWxfc3ByaXRlLmMKaW5kZXggZmM1Nzg5ZTY1YTkzLi42ZTdhYzBlYTBhNDEgMTAw NjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3Nwcml0ZS5jCisrKyBiL2RyaXZl cnMvZ3B1L2RybS9pOTE1L2ludGVsX3Nwcml0ZS5jCkBAIC0yMTYsNyArMjE2LDcgQEAgc2tsX3Vw ZGF0ZV9wbGFuZShzdHJ1Y3QgZHJtX3BsYW5lICpkcm1fcGxhbmUsCiAJcm90YXRpb24gPSBwbGFu ZV9zdGF0ZS0+YmFzZS5yb3RhdGlvbjsKIAlwbGFuZV9jdGwgfD0gc2tsX3BsYW5lX2N0bF9yb3Rh dGlvbihyb3RhdGlvbik7CiAKLQlzdHJpZGVfZGl2ID0gaW50ZWxfZmJfc3RyaWRlX2FsaWdubWVu dChkZXYsIGZiLT5tb2RpZmllclswXSwKKwlzdHJpZGVfZGl2ID0gaW50ZWxfZmJfc3RyaWRlX2Fs aWdubWVudChkZXZfcHJpdiwgZmItPm1vZGlmaWVyWzBdLAogCQkJCQkgICAgICAgZmItPnBpeGVs X2Zvcm1hdCk7CiAKIAkvKiBTaXplcyBhcmUgMCBiYXNlZCAqLwotLSAKMi40LjEwCgpfX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpJbnRlbC1nZnggbWFpbGlu ZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cDovL2xpc3RzLmZyZWVk ZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeAo=