From mboxrd@z Thu Jan 1 00:00:00 1970 From: ville.syrjala@linux.intel.com Subject: [PATCH 03/22] drm/i915: Factor out intel_tile_width() Date: Wed, 14 Oct 2015 19:28:55 +0300 Message-ID: <1444840154-7804-4-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 mga14.intel.com (mga14.intel.com [192.55.52.115]) by gabe.freedesktop.org (Postfix) with ESMTP id 078866ED29 for ; Wed, 14 Oct 2015 09:29:32 -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 RnJvbTogVmlsbGUgU3lyasOkbMOkIDx2aWxsZS5zeXJqYWxhQGxpbnV4LmludGVsLmNvbT4KClB1 bGwgdGhlIHRpbGUgd2lkdGggY2FsY3VsYXRpb25zIGZyb20gaW50ZWxfZmJfc3RyaWRlX2FsaWdu bWVudCgpIGludG8gYQpuZXcgZnVuY3Rpb24gaW50ZWxfdGlsZV93aWR0aCgpLgoKQWxzbyB0YWtl IHRoZSBvcHBvcnR1bml0eSB0byBwYXNzIGFyb3VuIGRldl9wcml2IGluc3RlYWQgb2YgZGV2IHRv CmludGVsX2ZiX3N0cmlkZV9hbGlnbm1lbnQoKS4KCnYyOiBSZW9yZGVyIGFyZ3VtbmVudHMgdG8g YmUgbW9yZSBjb25zaXN0ZW50IHdpdGggb3RoZXIgZnVuY3Rpb25zCiAgICBDaGFuZ2UgaW50ZWxf ZmJfc3RyaWRlX2FsaWdubWVudCgpIHRvIGFjY2VwdCBkZXZfcHJpdiBpbnN0ZWFkIG9mIGRldgoK U2lnbmVkLW9mZi1ieTogVmlsbGUgU3lyasOkbMOkIDx2aWxsZS5zeXJqYWxhQGxpbnV4LmludGVs LmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMgfCA3NiArKysr KysrKysrKysrKysrKysrKysrKy0tLS0tLS0tLS0tLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2lu dGVsX2Rydi5oICAgICB8ICA0ICstCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9zcHJpdGUu YyAgfCAgMiArLQogMyBmaWxlcyBjaGFuZ2VkLCA1MSBpbnNlcnRpb25zKCspLCAzMSBkZWxldGlv bnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMg Yi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMKaW5kZXggNmFkZDhkMS4uYzMx ZmU0NyAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jCisr KyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYwpAQCAtMjIxNCw2ICsyMjE0 LDQxIEBAIHN0YXRpYyBib29sIG5lZWRfdnRkX3dhKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCiAJ cmV0dXJuIGZhbHNlOwogfQogCitzdGF0aWMgdW5zaWduZWQgaW50IGludGVsX3RpbGVfd2lkdGgo Y29uc3Qgc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2LAorCQkJCSAgICAgdWludDY0 X3QgZmJfbW9kaWZpZXIsIHVuc2lnbmVkIGludCBjcHApCit7CisJc3dpdGNoIChmYl9tb2RpZmll cikgeworCWNhc2UgRFJNX0ZPUk1BVF9NT0RfTk9ORToKKwkJcmV0dXJuIGNwcDsKKwljYXNlIEk5 MTVfRk9STUFUX01PRF9YX1RJTEVEOgorCQlyZXR1cm4gSVNfR0VOMihkZXZfcHJpdikgPyAxMjgg OiA1MTI7CisJY2FzZSBJOTE1X0ZPUk1BVF9NT0RfWV9USUxFRDoKKwkJLyogTm8gbmVlZCB0byBj aGVjayBmb3Igb2xkIGdlbnMgYW5kIFkgdGlsaW5nIHNpbmNlIHRoaXMgaXMKKwkJICogYWJvdXQg dGhlIGRpc3BsYXkgZW5naW5lIGFuZCB0aG9zZSB3aWxsIGJlIGJsb2NrZWQgYmVmb3JlCisJCSAq IHdlIGdldCBoZXJlLgorCQkgKi8KKwkJcmV0dXJuIDEyODsKKwljYXNlIEk5MTVfRk9STUFUX01P RF9ZZl9USUxFRDoKKwkJc3dpdGNoIChjcHApIHsKKwkJY2FzZSAxOgorCQkJcmV0dXJuIDY0Owor CQljYXNlIDI6CisJCWNhc2UgNDoKKwkJCXJldHVybiAxMjg7CisJCWNhc2UgODoKKwkJY2FzZSAx NjoKKwkJCXJldHVybiAyNTY7CisJCWRlZmF1bHQ6CisJCQlNSVNTSU5HX0NBU0UoY3BwKTsKKwkJ CXJldHVybiBjcHA7CisJCX0KKwkJYnJlYWs7CisJZGVmYXVsdDoKKwkJTUlTU0lOR19DQVNFKGZi X21vZGlmaWVyKTsKKwkJcmV0dXJuIGNwcDsKKwl9Cit9CisKIHVuc2lnbmVkIGludAogaW50ZWxf dGlsZV9oZWlnaHQoc3RydWN0IGRybV9kZXZpY2UgKmRldiwgdWludDMyX3QgcGl4ZWxfZm9ybWF0 LAogCQkgIHVpbnQ2NF90IGZiX2Zvcm1hdF9tb2RpZmllciwgdW5zaWduZWQgaW50IHBsYW5lKQpA QCAtMjg5NSwzNyArMjkzMCwyMCBAQCBzdGF0aWMgdm9pZCBpcm9ubGFrZV91cGRhdGVfcHJpbWFy eV9wbGFuZShzdHJ1Y3QgZHJtX2NydGMgKmNydGMsCiAJUE9TVElOR19SRUFEKHJlZyk7CiB9CiAK LXUzMiBpbnRlbF9mYl9zdHJpZGVfYWxpZ25tZW50KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsIHVp bnQ2NF90IGZiX21vZGlmaWVyLAotCQkJICAgICAgdWludDMyX3QgcGl4ZWxfZm9ybWF0KQordTMy IGludGVsX2ZiX3N0cmlkZV9hbGlnbm1lbnQoY29uc3Qgc3RydWN0IGRybV9pOTE1X3ByaXZhdGUg KmRldl9wcml2LAorCQkJICAgICAgdWludDY0X3QgZmJfbW9kaWZpZXIsIHVpbnQzMl90IHBpeGVs X2Zvcm1hdCkKIHsKLQl1MzIgYml0c19wZXJfcGl4ZWwgPSBkcm1fZm9ybWF0X3BsYW5lX2NwcChw aXhlbF9mb3JtYXQsIDApICogODsKLQogCS8qCiAJICogVGhlIHN0cmlkZSBpcyBlaXRoZXIgZXhw cmVzc2VkIGFzIGEgbXVsdGlwbGUgb2YgNjQgYnl0ZXMKIAkgKiBjaHVua3MgZm9yIGxpbmVhciBi dWZmZXJzIG9yIGluIG51bWJlciBvZiB0aWxlcyBmb3IgdGlsZWQKIAkgKiBidWZmZXJzLgogCSAq LwotCXN3aXRjaCAoZmJfbW9kaWZpZXIpIHsKLQljYXNlIERSTV9GT1JNQVRfTU9EX05PTkU6Ci0J CXJldHVybiA2NDsKLQljYXNlIEk5MTVfRk9STUFUX01PRF9YX1RJTEVEOgotCQlpZiAoSU5URUxf SU5GTyhkZXYpLT5nZW4gPT0gMikKLQkJCXJldHVybiAxMjg7Ci0JCXJldHVybiA1MTI7Ci0JY2Fz ZSBJOTE1X0ZPUk1BVF9NT0RfWV9USUxFRDoKLQkJLyogTm8gbmVlZCB0byBjaGVjayBmb3Igb2xk IGdlbnMgYW5kIFkgdGlsaW5nIHNpbmNlIHRoaXMgaXMKLQkJICogYWJvdXQgdGhlIGRpc3BsYXkg ZW5naW5lIGFuZCB0aG9zZSB3aWxsIGJlIGJsb2NrZWQgYmVmb3JlCi0JCSAqIHdlIGdldCBoZXJl LgotCQkgKi8KLQkJcmV0dXJuIDEyODsKLQljYXNlIEk5MTVfRk9STUFUX01PRF9ZZl9USUxFRDoK LQkJaWYgKGJpdHNfcGVyX3BpeGVsID09IDgpCi0JCQlyZXR1cm4gNjQ7Ci0JCWVsc2UKLQkJCXJl dHVybiAxMjg7Ci0JZGVmYXVsdDoKLQkJTUlTU0lOR19DQVNFKGZiX21vZGlmaWVyKTsKKwlpZiAo ZmJfbW9kaWZpZXIgPT0gRFJNX0ZPUk1BVF9NT0RfTk9ORSkgewogCQlyZXR1cm4gNjQ7CisJfSBl bHNlIHsKKwkJdW5zaWduZWQgaW50IGNwcCA9IGRybV9mb3JtYXRfcGxhbmVfY3BwKHBpeGVsX2Zv cm1hdCwgMCk7CisKKwkJcmV0dXJuIGludGVsX3RpbGVfd2lkdGgoZGV2X3ByaXYsIGZiX21vZGlm aWVyLCBjcHApOwogCX0KIH0KIApAQCAtMzEwNiw3ICszMTI0LDcgQEAgc3RhdGljIHZvaWQgc2t5 bGFrZV91cGRhdGVfcHJpbWFyeV9wbGFuZShzdHJ1Y3QgZHJtX2NydGMgKmNydGMsCiAJcGxhbmVf Y3RsIHw9IHNrbF9wbGFuZV9jdGxfcm90YXRpb24ocm90YXRpb24pOwogCiAJb2JqID0gaW50ZWxf ZmJfb2JqKGZiKTsKLQlzdHJpZGVfZGl2ID0gaW50ZWxfZmJfc3RyaWRlX2FsaWdubWVudChkZXYs IGZiLT5tb2RpZmllclswXSwKKwlzdHJpZGVfZGl2ID0gaW50ZWxfZmJfc3RyaWRlX2FsaWdubWVu dChkZXZfcHJpdiwgZmItPm1vZGlmaWVyWzBdLAogCQkJCQkgICAgICAgZmItPnBpeGVsX2Zvcm1h dCk7CiAJc3VyZl9hZGRyID0gaW50ZWxfcGxhbmVfb2JqX29mZnNldCh0b19pbnRlbF9wbGFuZShw bGFuZSksIG9iaiwgMCk7CiAKQEAgLTkwNjYsNyArOTA4NCw3IEBAIHNreWxha2VfZ2V0X2luaXRp YWxfcGxhbmVfY29uZmlnKHN0cnVjdCBpbnRlbF9jcnRjICpjcnRjLAogCWZiLT53aWR0aCA9ICgo dmFsID4+IDApICYgMHgxZmZmKSArIDE7CiAKIAl2YWwgPSBJOTE1X1JFQUQoUExBTkVfU1RSSURF KHBpcGUsIDApKTsKLQlzdHJpZGVfbXVsdCA9IGludGVsX2ZiX3N0cmlkZV9hbGlnbm1lbnQoZGV2 LCBmYi0+bW9kaWZpZXJbMF0sCisJc3RyaWRlX211bHQgPSBpbnRlbF9mYl9zdHJpZGVfYWxpZ25t ZW50KGRldl9wcml2LCBmYi0+bW9kaWZpZXJbMF0sCiAJCQkJCQlmYi0+cGl4ZWxfZm9ybWF0KTsK IAlmYi0+cGl0Y2hlc1swXSA9ICh2YWwgJiAweDNmZikgKiBzdHJpZGVfbXVsdDsKIApAQCAtMTEx MzcsNyArMTExNTUsNyBAQCBzdGF0aWMgdm9pZCBza2xfZG9fbW1pb19mbGlwKHN0cnVjdCBpbnRl bF9jcnRjICppbnRlbF9jcnRjLAogCSAqIGxpbmVhciBidWZmZXJzIG9yIGluIG51bWJlciBvZiB0 aWxlcyBmb3IgdGlsZWQgYnVmZmVycy4KIAkgKi8KIAlzdHJpZGUgPSBmYi0+cGl0Y2hlc1swXSAv Ci0JCSBpbnRlbF9mYl9zdHJpZGVfYWxpZ25tZW50KGRldiwgZmItPm1vZGlmaWVyWzBdLAorCQkg aW50ZWxfZmJfc3RyaWRlX2FsaWdubWVudChkZXZfcHJpdiwgZmItPm1vZGlmaWVyWzBdLAogCQkJ CQkgICBmYi0+cGl4ZWxfZm9ybWF0KTsKIAogCS8qCkBAIC0xNDIxNCw2ICsxNDIzMiw3IEBAIHN0 YXRpYyBpbnQgaW50ZWxfZnJhbWVidWZmZXJfaW5pdChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LAog CQkJCSAgc3RydWN0IGRybV9tb2RlX2ZiX2NtZDIgKm1vZGVfY21kLAogCQkJCSAgc3RydWN0IGRy bV9pOTE1X2dlbV9vYmplY3QgKm9iaikKIHsKKwlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2 X3ByaXYgPSB0b19pOTE1KGRldik7CiAJdW5zaWduZWQgaW50IGFsaWduZWRfaGVpZ2h0OwogCWlu dCByZXQ7CiAJdTMyIHBpdGNoX2xpbWl0LCBzdHJpZGVfYWxpZ25tZW50OwpAQCAtMTQyNTUsNyAr MTQyNzQsOCBAQCBzdGF0aWMgaW50IGludGVsX2ZyYW1lYnVmZmVyX2luaXQoc3RydWN0IGRybV9k ZXZpY2UgKmRldiwKIAkJcmV0dXJuIC1FSU5WQUw7CiAJfQogCi0Jc3RyaWRlX2FsaWdubWVudCA9 IGludGVsX2ZiX3N0cmlkZV9hbGlnbm1lbnQoZGV2LCBtb2RlX2NtZC0+bW9kaWZpZXJbMF0sCisJ c3RyaWRlX2FsaWdubWVudCA9IGludGVsX2ZiX3N0cmlkZV9hbGlnbm1lbnQoZGV2X3ByaXYsCisJ CQkJCQkgICAgIG1vZGVfY21kLT5tb2RpZmllclswXSwKIAkJCQkJCSAgICAgbW9kZV9jbWQtPnBp eGVsX2Zvcm1hdCk7CiAJaWYgKG1vZGVfY21kLT5waXRjaGVzWzBdICYgKHN0cmlkZV9hbGlnbm1l bnQgLSAxKSkgewogCQlEUk1fREVCVUcoInBpdGNoICglZCkgbXVzdCBiZSBhdCBsZWFzdCAldSBi eXRlIGFsaWduZWRcbiIsCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9k cnYuaCBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rydi5oCmluZGV4IDExNTI1NjYuLjk4 YThkMzEgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rydi5oCisrKyBi L2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rydi5oCkBAIC0xMDE3LDggKzEwMTcsOCBAQCB1 bnNpZ25lZCBpbnQgaW50ZWxfZmJfYWxpZ25faGVpZ2h0KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYs CiAJCQkJICAgdWludDY0X3QgZmJfZm9ybWF0X21vZGlmaWVyKTsKIHZvaWQgaW50ZWxfZmJfb2Jq X2ZsdXNoKHN0cnVjdCBkcm1faTkxNV9nZW1fb2JqZWN0ICpvYmosIGJvb2wgcmV0aXJlLAogCQkJ ZW51bSBmYl9vcF9vcmlnaW4gb3JpZ2luKTsKLXUzMiBpbnRlbF9mYl9zdHJpZGVfYWxpZ25tZW50 KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsIHVpbnQ2NF90IGZiX21vZGlmaWVyLAotCQkJICAgICAg dWludDMyX3QgcGl4ZWxfZm9ybWF0KTsKK3UzMiBpbnRlbF9mYl9zdHJpZGVfYWxpZ25tZW50KGNv bnN0IHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiwKKwkJCSAgICAgIHVpbnQ2NF90 IGZiX21vZGlmaWVyLCB1aW50MzJfdCBwaXhlbF9mb3JtYXQpOwogCiAvKiBpbnRlbF9hdWRpby5j ICovCiB2b2lkIGludGVsX2luaXRfYXVkaW8oc3RydWN0IGRybV9kZXZpY2UgKmRldik7CmRpZmYg LS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9zcHJpdGUuYyBiL2RyaXZlcnMvZ3B1 L2RybS9pOTE1L2ludGVsX3Nwcml0ZS5jCmluZGV4IDkwZTI3YzguLjNkOTY4NzEgMTAwNjQ0Ci0t LSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3Nwcml0ZS5jCisrKyBiL2RyaXZlcnMvZ3B1 L2RybS9pOTE1L2ludGVsX3Nwcml0ZS5jCkBAIC0yMTUsNyArMjE1LDcgQEAgc2tsX3VwZGF0ZV9w bGFuZShzdHJ1Y3QgZHJtX3BsYW5lICpkcm1fcGxhbmUsIHN0cnVjdCBkcm1fY3J0YyAqY3J0YywK IAkJCQkgICAgICAgcGl4ZWxfc2l6ZSwgdHJ1ZSwKIAkJCQkgICAgICAgc3JjX3cgIT0gY3J0Y193 IHx8IHNyY19oICE9IGNydGNfaCk7CiAKLQlzdHJpZGVfZGl2ID0gaW50ZWxfZmJfc3RyaWRlX2Fs aWdubWVudChkZXYsIGZiLT5tb2RpZmllclswXSwKKwlzdHJpZGVfZGl2ID0gaW50ZWxfZmJfc3Ry aWRlX2FsaWdubWVudChkZXZfcHJpdiwgZmItPm1vZGlmaWVyWzBdLAogCQkJCQkgICAgICAgZmIt PnBpeGVsX2Zvcm1hdCk7CiAKIAlzY2FsZXJfaWQgPSB0b19pbnRlbF9wbGFuZV9zdGF0ZShkcm1f cGxhbmUtPnN0YXRlKS0+c2NhbGVyX2lkOwotLSAKMi40LjkKCl9fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fCkludGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwt Z2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21h aWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4Cg==