From: ville.syrjala@linux.intel.com Subject: [PATCH v2 6/7] drm/i915: s/intel_gen4_compute_page_offset/intel_compute_tile_offset/ Date: Tue, 12 Jan 2016 21:08:36 +0200 Message-ID: <1452625717-9713-7-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 BE81F6E6D8 for ; Tue, 12 Jan 2016 11:09:18 -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 RnJvbTogVmlsbGUgU3lyasOkbMOkIDx2aWxsZS5zeXJqYWxhQGxpbnV4LmludGVsLmNvbT4KClNp bmNlIGludGVsX2dlbjRfY29tcHV0ZV9wYWdlX29mZnNldCgpIGNhbiBub3cgaGFuZGxlIHRpbGlu ZyBmb3JtYXRzCmFsbCB0aGUgd2F5IGRvd24gdG8gZ2VuMiwgcmVuYW1lIGl0IHRvIGludGVsX2Nv bXB1dGVfdGlsZV9vZmZzZXQoKS4KTm90IHRoYXQgd2UgYWN0dWFsbHkgdXNlIGl0IG9uIGdlbjIv MyBzaW5jZSB0aGVyZSdzIG5vIERTUFNVUkYgZXRjLgpyZWdpc3RlcnMgd2hpY2ggd291bGQgdGFr ZSBhIHBhZ2UgYWxpZ25lZCBhZGRyZXNzLgoKdjI6IHMvcGFnZS90aWxlLyAoRGFuaWVsKQoKU2ln bmVkLW9mZi1ieTogVmlsbGUgU3lyasOkbMOkIDx2aWxsZS5zeXJqYWxhQGxpbnV4LmludGVsLmNv bT4KUmV2aWV3ZWQtYnk6IERhbmllbCBWZXR0ZXIgPGRhbmllbC52ZXR0ZXJAZmZ3bGwuY2g+Ci0t LQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jIHwgMjYgKysrKysrKysrKysr Ky0tLS0tLS0tLS0tLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rydi5oICAgICB8IDEw ICsrKysrLS0tLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3Nwcml0ZS5jICB8IDI0ICsr KysrKysrKysrKy0tLS0tLS0tLS0tLQogMyBmaWxlcyBjaGFuZ2VkLCAzMCBpbnNlcnRpb25zKCsp LCAzMCBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRl bF9kaXNwbGF5LmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMKaW5kZXgg MmNlMTY2ZDcxZDNhLi4yZTViOWYzNGZlY2QgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9p OTE1L2ludGVsX2Rpc3BsYXkuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNw bGF5LmMKQEAgLTI0NTcsMTEgKzI0NTcsMTEgQEAgc3RhdGljIHZvaWQgaW50ZWxfdW5waW5fZmJf b2JqKHN0cnVjdCBkcm1fZnJhbWVidWZmZXIgKmZiLAogCiAvKiBDb21wdXRlcyB0aGUgbGluZWFy IG9mZnNldCB0byB0aGUgYmFzZSB0aWxlIGFuZCBhZGp1c3RzIHgsIHkuIGJ5dGVzIHBlciBwaXhl bAogICogaXMgYXNzdW1lZCB0byBiZSBhIHBvd2VyLW9mLXR3by4gKi8KLXVuc2lnbmVkIGxvbmcg aW50ZWxfZ2VuNF9jb21wdXRlX3BhZ2Vfb2Zmc2V0KHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpk ZXZfcHJpdiwKLQkJCQkJICAgICBpbnQgKngsIGludCAqeSwKLQkJCQkJICAgICB1aW50NjRfdCBm Yl9tb2RpZmllciwKLQkJCQkJICAgICB1bnNpZ25lZCBpbnQgY3BwLAotCQkJCQkgICAgIHVuc2ln bmVkIGludCBwaXRjaCkKK3Vuc2lnbmVkIGxvbmcgaW50ZWxfY29tcHV0ZV90aWxlX29mZnNldChz dHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYsCisJCQkJCWludCAqeCwgaW50ICp5LAor CQkJCQl1aW50NjRfdCBmYl9tb2RpZmllciwKKwkJCQkJdW5zaWduZWQgaW50IGNwcCwKKwkJCQkJ dW5zaWduZWQgaW50IHBpdGNoKQogewogCWlmIChmYl9tb2RpZmllciAhPSBEUk1fRk9STUFUX01P RF9OT05FKSB7CiAJCXVuc2lnbmVkIGludCB0aWxlX3NpemUsIHRpbGVfd2lkdGgsIHRpbGVfaGVp Z2h0OwpAQCAtMjc4NCwxMCArMjc4NCwxMCBAQCBzdGF0aWMgdm9pZCBpOXh4X3VwZGF0ZV9wcmlt YXJ5X3BsYW5lKHN0cnVjdCBkcm1fcGxhbmUgKnByaW1hcnksCiAKIAlpZiAoSU5URUxfSU5GTyhk ZXYpLT5nZW4gPj0gNCkgewogCQlpbnRlbF9jcnRjLT5kc3BhZGRyX29mZnNldCA9Ci0JCQlpbnRl bF9nZW40X2NvbXB1dGVfcGFnZV9vZmZzZXQoZGV2X3ByaXYsICZ4LCAmeSwKLQkJCQkJCSAgICAg ICBmYi0+bW9kaWZpZXJbMF0sCi0JCQkJCQkgICAgICAgcGl4ZWxfc2l6ZSwKLQkJCQkJCSAgICAg ICBmYi0+cGl0Y2hlc1swXSk7CisJCQlpbnRlbF9jb21wdXRlX3RpbGVfb2Zmc2V0KGRldl9wcml2 LCAmeCwgJnksCisJCQkJCQkgIGZiLT5tb2RpZmllclswXSwKKwkJCQkJCSAgcGl4ZWxfc2l6ZSwK KwkJCQkJCSAgZmItPnBpdGNoZXNbMF0pOwogCQlsaW5lYXJfb2Zmc2V0IC09IGludGVsX2NydGMt PmRzcGFkZHJfb2Zmc2V0OwogCX0gZWxzZSB7CiAJCWludGVsX2NydGMtPmRzcGFkZHJfb2Zmc2V0 ID0gbGluZWFyX29mZnNldDsKQEAgLTI4OTIsMTAgKzI4OTIsMTAgQEAgc3RhdGljIHZvaWQgaXJv bmxha2VfdXBkYXRlX3ByaW1hcnlfcGxhbmUoc3RydWN0IGRybV9wbGFuZSAqcHJpbWFyeSwKIAog CWxpbmVhcl9vZmZzZXQgPSB5ICogZmItPnBpdGNoZXNbMF0gKyB4ICogcGl4ZWxfc2l6ZTsKIAlp bnRlbF9jcnRjLT5kc3BhZGRyX29mZnNldCA9Ci0JCWludGVsX2dlbjRfY29tcHV0ZV9wYWdlX29m ZnNldChkZXZfcHJpdiwgJngsICZ5LAotCQkJCQkgICAgICAgZmItPm1vZGlmaWVyWzBdLAotCQkJ CQkgICAgICAgcGl4ZWxfc2l6ZSwKLQkJCQkJICAgICAgIGZiLT5waXRjaGVzWzBdKTsKKwkJaW50 ZWxfY29tcHV0ZV90aWxlX29mZnNldChkZXZfcHJpdiwgJngsICZ5LAorCQkJCQkgIGZiLT5tb2Rp ZmllclswXSwKKwkJCQkJICBwaXhlbF9zaXplLAorCQkJCQkgIGZiLT5waXRjaGVzWzBdKTsKIAls aW5lYXJfb2Zmc2V0IC09IGludGVsX2NydGMtPmRzcGFkZHJfb2Zmc2V0OwogCWlmIChwbGFuZV9z dGF0ZS0+YmFzZS5yb3RhdGlvbiA9PSBCSVQoRFJNX1JPVEFURV8xODApKSB7CiAJCWRzcGNudHIg fD0gRElTUFBMQU5FX1JPVEFURV8xODA7CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkx NS9pbnRlbF9kcnYuaCBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rydi5oCmluZGV4IDZh YWFhOGQzYjgxYS4uMDU5YjQ2ZTIyYzMxIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkx NS9pbnRlbF9kcnYuaAorKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcnYuaApAQCAt MTE5NSwxMSArMTE5NSwxMSBAQCB2b2lkIGFzc2VydF9mZGlfcnhfcGxsKHN0cnVjdCBkcm1faTkx NV9wcml2YXRlICpkZXZfcHJpdiwKIHZvaWQgYXNzZXJ0X3BpcGUoc3RydWN0IGRybV9pOTE1X3By aXZhdGUgKmRldl9wcml2LCBlbnVtIHBpcGUgcGlwZSwgYm9vbCBzdGF0ZSk7CiAjZGVmaW5lIGFz c2VydF9waXBlX2VuYWJsZWQoZCwgcCkgYXNzZXJ0X3BpcGUoZCwgcCwgdHJ1ZSkKICNkZWZpbmUg YXNzZXJ0X3BpcGVfZGlzYWJsZWQoZCwgcCkgYXNzZXJ0X3BpcGUoZCwgcCwgZmFsc2UpCi11bnNp Z25lZCBsb25nIGludGVsX2dlbjRfY29tcHV0ZV9wYWdlX29mZnNldChzdHJ1Y3QgZHJtX2k5MTVf cHJpdmF0ZSAqZGV2X3ByaXYsCi0JCQkJCSAgICAgaW50ICp4LCBpbnQgKnksCi0JCQkJCSAgICAg dWludDY0X3QgZmJfbW9kaWZpZXIsCi0JCQkJCSAgICAgdW5zaWduZWQgaW50IGNwcCwKLQkJCQkJ ICAgICB1bnNpZ25lZCBpbnQgcGl0Y2gpOwordW5zaWduZWQgbG9uZyBpbnRlbF9jb21wdXRlX3Rp bGVfb2Zmc2V0KHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiwKKwkJCQkJaW50ICp4 LCBpbnQgKnksCisJCQkJCXVpbnQ2NF90IGZiX21vZGlmaWVyLAorCQkJCQl1bnNpZ25lZCBpbnQg Y3BwLAorCQkJCQl1bnNpZ25lZCBpbnQgcGl0Y2gpOwogdm9pZCBpbnRlbF9wcmVwYXJlX3Jlc2V0 KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpOwogdm9pZCBpbnRlbF9maW5pc2hfcmVzZXQoc3RydWN0 IGRybV9kZXZpY2UgKmRldik7CiB2b2lkIGhzd19lbmFibGVfcGM4KHN0cnVjdCBkcm1faTkxNV9w cml2YXRlICpkZXZfcHJpdik7CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRl bF9zcHJpdGUuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3Nwcml0ZS5jCmluZGV4IDM5 YTdiZTAyYzE4MS4uMDg3NWM4ZTBlYzBhIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkx NS9pbnRlbF9zcHJpdGUuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9zcHJpdGUu YwpAQCAtNDIzLDEwICs0MjMsMTAgQEAgdmx2X3VwZGF0ZV9wbGFuZShzdHJ1Y3QgZHJtX3BsYW5l ICpkcGxhbmUsCiAJY3J0Y19oLS07CiAKIAlsaW5lYXJfb2Zmc2V0ID0geSAqIGZiLT5waXRjaGVz WzBdICsgeCAqIHBpeGVsX3NpemU7Ci0Jc3Byc3VyZl9vZmZzZXQgPSBpbnRlbF9nZW40X2NvbXB1 dGVfcGFnZV9vZmZzZXQoZGV2X3ByaXYsICZ4LCAmeSwKLQkJCQkJCQlmYi0+bW9kaWZpZXJbMF0s Ci0JCQkJCQkJcGl4ZWxfc2l6ZSwKLQkJCQkJCQlmYi0+cGl0Y2hlc1swXSk7CisJc3Byc3VyZl9v ZmZzZXQgPSBpbnRlbF9jb21wdXRlX3RpbGVfb2Zmc2V0KGRldl9wcml2LCAmeCwgJnksCisJCQkJ CQkgICBmYi0+bW9kaWZpZXJbMF0sCisJCQkJCQkgICBwaXhlbF9zaXplLAorCQkJCQkJICAgZmIt PnBpdGNoZXNbMF0pOwogCWxpbmVhcl9vZmZzZXQgLT0gc3Byc3VyZl9vZmZzZXQ7CiAKIAlpZiAo cGxhbmVfc3RhdGUtPmJhc2Uucm90YXRpb24gPT0gQklUKERSTV9ST1RBVEVfMTgwKSkgewpAQCAt NTU3LDEwICs1NTcsMTAgQEAgaXZiX3VwZGF0ZV9wbGFuZShzdHJ1Y3QgZHJtX3BsYW5lICpwbGFu ZSwKIAkJc3Byc2NhbGUgPSBTUFJJVEVfU0NBTEVfRU5BQkxFIHwgKHNyY193IDw8IDE2KSB8IHNy Y19oOwogCiAJbGluZWFyX29mZnNldCA9IHkgKiBmYi0+cGl0Y2hlc1swXSArIHggKiBwaXhlbF9z aXplOwotCXNwcnN1cmZfb2Zmc2V0ID0gaW50ZWxfZ2VuNF9jb21wdXRlX3BhZ2Vfb2Zmc2V0KGRl dl9wcml2LCAmeCwgJnksCi0JCQkJCQkJZmItPm1vZGlmaWVyWzBdLAotCQkJCQkJCXBpeGVsX3Np emUsCi0JCQkJCQkJZmItPnBpdGNoZXNbMF0pOworCXNwcnN1cmZfb2Zmc2V0ID0gaW50ZWxfY29t cHV0ZV90aWxlX29mZnNldChkZXZfcHJpdiwgJngsICZ5LAorCQkJCQkJICAgZmItPm1vZGlmaWVy WzBdLAorCQkJCQkJICAgcGl4ZWxfc2l6ZSwKKwkJCQkJCSAgIGZiLT5waXRjaGVzWzBdKTsKIAls aW5lYXJfb2Zmc2V0IC09IHNwcnN1cmZfb2Zmc2V0OwogCiAJaWYgKHBsYW5lX3N0YXRlLT5iYXNl LnJvdGF0aW9uID09IEJJVChEUk1fUk9UQVRFXzE4MCkpIHsKQEAgLTY5NiwxMCArNjk2LDEwIEBA IGlsa191cGRhdGVfcGxhbmUoc3RydWN0IGRybV9wbGFuZSAqcGxhbmUsCiAJCWR2c3NjYWxlID0g RFZTX1NDQUxFX0VOQUJMRSB8IChzcmNfdyA8PCAxNikgfCBzcmNfaDsKIAogCWxpbmVhcl9vZmZz ZXQgPSB5ICogZmItPnBpdGNoZXNbMF0gKyB4ICogcGl4ZWxfc2l6ZTsKLQlkdnNzdXJmX29mZnNl dCA9IGludGVsX2dlbjRfY29tcHV0ZV9wYWdlX29mZnNldChkZXZfcHJpdiwgJngsICZ5LAotCQkJ CQkJCWZiLT5tb2RpZmllclswXSwKLQkJCQkJCQlwaXhlbF9zaXplLAotCQkJCQkJCWZiLT5waXRj aGVzWzBdKTsKKwlkdnNzdXJmX29mZnNldCA9IGludGVsX2NvbXB1dGVfdGlsZV9vZmZzZXQoZGV2 X3ByaXYsICZ4LCAmeSwKKwkJCQkJCSAgIGZiLT5tb2RpZmllclswXSwKKwkJCQkJCSAgIHBpeGVs X3NpemUsCisJCQkJCQkgICBmYi0+cGl0Y2hlc1swXSk7CiAJbGluZWFyX29mZnNldCAtPSBkdnNz dXJmX29mZnNldDsKIAogCWlmIChwbGFuZV9zdGF0ZS0+YmFzZS5yb3RhdGlvbiA9PSBCSVQoRFJN X1JPVEFURV8xODApKSB7Ci0tIAoyLjQuMTAKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fCkludGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwtZ2Z4QGxpc3Rz LmZyZWVkZXNrdG9wLm9yZwpodHRwOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlz dGluZm8vaW50ZWwtZ2Z4Cg==