From: ville.syrjala@linux.intel.com Subject: [PATCH 1/7] drm/i915: Pass modifier instead of tiling_mode to gen4_compute_page_offset() Date: Tue, 12 Jan 2016 21:08:31 +0200 Message-ID: <1452625717-9713-2-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 1280C6E008 for ; Tue, 12 Jan 2016 11:08:43 -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 RnJvbTogVmlsbGUgU3lyasOkbMOkIDx2aWxsZS5zeXJqYWxhQGxpbnV4LmludGVsLmNvbT4KCklu IHByZXBhcmF0aW9uIGZvciBoYW5kbGluZyBtb3JlIHRoYW4gWCB0aWxpbmcsIHBhc3MgdGhlIGZi IG1vZGlmaWVyIHRvCmdlbjRfY29tcHV0ZV9wYWdlX29mZnNldCgpIGluc3RlYWQgb2YgdGhlIG9i ai0+dGlsaW5nX21vZGUuCgpTaWduZWQtb2ZmLWJ5OiBWaWxsZSBTeXJqw6Rsw6QgPHZpbGxlLnN5 cmphbGFAbGludXguaW50ZWwuY29tPgpSZXZpZXdlZC1ieTogRGFuaWVsIFZldHRlciA8ZGFuaWVs LnZldHRlckBmZndsbC5jaD4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5 LmMgfCAxMiArKysrKystLS0tLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rydi5oICAg ICB8ICA0ICsrLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3Nwcml0ZS5jICB8IDIxICsr KysrKysrKystLS0tLS0tLS0tLQogMyBmaWxlcyBjaGFuZ2VkLCAxOCBpbnNlcnRpb25zKCspLCAx OSBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9k aXNwbGF5LmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMKaW5kZXggYWJm YjViYTA1NGRiLi4wZjgxNzQwNTFkNWMgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1 L2ludGVsX2Rpc3BsYXkuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5 LmMKQEAgLTI0NDksMTEgKzI0NDksMTEgQEAgc3RhdGljIHZvaWQgaW50ZWxfdW5waW5fZmJfb2Jq KHN0cnVjdCBkcm1fZnJhbWVidWZmZXIgKmZiLAogICogaXMgYXNzdW1lZCB0byBiZSBhIHBvd2Vy LW9mLXR3by4gKi8KIHVuc2lnbmVkIGxvbmcgaW50ZWxfZ2VuNF9jb21wdXRlX3BhZ2Vfb2Zmc2V0 KHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiwKIAkJCQkJICAgICBpbnQgKngsIGlu dCAqeSwKLQkJCQkJICAgICB1bnNpZ25lZCBpbnQgdGlsaW5nX21vZGUsCisJCQkJCSAgICAgdWlu dDY0X3QgZmJfbW9kaWZpZXIsCiAJCQkJCSAgICAgdW5zaWduZWQgaW50IGNwcCwKIAkJCQkJICAg ICB1bnNpZ25lZCBpbnQgcGl0Y2gpCiB7Ci0JaWYgKHRpbGluZ19tb2RlICE9IEk5MTVfVElMSU5H X05PTkUpIHsKKwlpZiAoZmJfbW9kaWZpZXIgIT0gRFJNX0ZPUk1BVF9NT0RfTk9ORSkgewogCQl1 bnNpZ25lZCBpbnQgdGlsZV9yb3dzLCB0aWxlczsKIAogCQl0aWxlX3Jvd3MgPSAqeSAvIDg7CkBA IC0yNzY5LDggKzI3NjksOCBAQCBzdGF0aWMgdm9pZCBpOXh4X3VwZGF0ZV9wcmltYXJ5X3BsYW5l KHN0cnVjdCBkcm1fcGxhbmUgKnByaW1hcnksCiAKIAlpZiAoSU5URUxfSU5GTyhkZXYpLT5nZW4g Pj0gNCkgewogCQlpbnRlbF9jcnRjLT5kc3BhZGRyX29mZnNldCA9Ci0JCQlpbnRlbF9nZW40X2Nv bXB1dGVfcGFnZV9vZmZzZXQoZGV2X3ByaXYsCi0JCQkJCQkgICAgICAgJngsICZ5LCBvYmotPnRp bGluZ19tb2RlLAorCQkJaW50ZWxfZ2VuNF9jb21wdXRlX3BhZ2Vfb2Zmc2V0KGRldl9wcml2LCAm eCwgJnksCisJCQkJCQkgICAgICAgZmItPm1vZGlmaWVyWzBdLAogCQkJCQkJICAgICAgIHBpeGVs X3NpemUsCiAJCQkJCQkgICAgICAgZmItPnBpdGNoZXNbMF0pOwogCQlsaW5lYXJfb2Zmc2V0IC09 IGludGVsX2NydGMtPmRzcGFkZHJfb2Zmc2V0OwpAQCAtMjg3Nyw4ICsyODc3LDggQEAgc3RhdGlj IHZvaWQgaXJvbmxha2VfdXBkYXRlX3ByaW1hcnlfcGxhbmUoc3RydWN0IGRybV9wbGFuZSAqcHJp bWFyeSwKIAogCWxpbmVhcl9vZmZzZXQgPSB5ICogZmItPnBpdGNoZXNbMF0gKyB4ICogcGl4ZWxf c2l6ZTsKIAlpbnRlbF9jcnRjLT5kc3BhZGRyX29mZnNldCA9Ci0JCWludGVsX2dlbjRfY29tcHV0 ZV9wYWdlX29mZnNldChkZXZfcHJpdiwKLQkJCQkJICAgICAgICZ4LCAmeSwgb2JqLT50aWxpbmdf bW9kZSwKKwkJaW50ZWxfZ2VuNF9jb21wdXRlX3BhZ2Vfb2Zmc2V0KGRldl9wcml2LCAmeCwgJnks CisJCQkJCSAgICAgICBmYi0+bW9kaWZpZXJbMF0sCiAJCQkJCSAgICAgICBwaXhlbF9zaXplLAog CQkJCQkgICAgICAgZmItPnBpdGNoZXNbMF0pOwogCWxpbmVhcl9vZmZzZXQgLT0gaW50ZWxfY3J0 Yy0+ZHNwYWRkcl9vZmZzZXQ7CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRl bF9kcnYuaCBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rydi5oCmluZGV4IGUyNzk1NGQy ZWRhZC4uMDE1NTM4Mjg3MTcxIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRl bF9kcnYuaAorKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcnYuaApAQCAtMTE5OCw4 ICsxMTk4LDggQEAgdm9pZCBhc3NlcnRfcGlwZShzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2 X3ByaXYsIGVudW0gcGlwZSBwaXBlLCBib29sIHN0YXRlKTsKICNkZWZpbmUgYXNzZXJ0X3BpcGVf ZGlzYWJsZWQoZCwgcCkgYXNzZXJ0X3BpcGUoZCwgcCwgZmFsc2UpCiB1bnNpZ25lZCBsb25nIGlu dGVsX2dlbjRfY29tcHV0ZV9wYWdlX29mZnNldChzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2 X3ByaXYsCiAJCQkJCSAgICAgaW50ICp4LCBpbnQgKnksCi0JCQkJCSAgICAgdW5zaWduZWQgaW50 IHRpbGluZ19tb2RlLAotCQkJCQkgICAgIHVuc2lnbmVkIGludCBicHAsCisJCQkJCSAgICAgdWlu dDY0X3QgZmJfbW9kaWZpZXIsCisJCQkJCSAgICAgdW5zaWduZWQgaW50IGNwcCwKIAkJCQkJICAg ICB1bnNpZ25lZCBpbnQgcGl0Y2gpOwogdm9pZCBpbnRlbF9wcmVwYXJlX3Jlc2V0KHN0cnVjdCBk cm1fZGV2aWNlICpkZXYpOwogdm9pZCBpbnRlbF9maW5pc2hfcmVzZXQoc3RydWN0IGRybV9kZXZp Y2UgKmRldik7CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9zcHJpdGUu YyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3Nwcml0ZS5jCmluZGV4IDRkNDQ4Yjk5MGM1 MC4uZmM1Nzg5ZTY1YTkzIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9z cHJpdGUuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9zcHJpdGUuYwpAQCAtNDIy LDkgKzQyMiw4IEBAIHZsdl91cGRhdGVfcGxhbmUoc3RydWN0IGRybV9wbGFuZSAqZHBsYW5lLAog CWNydGNfaC0tOwogCiAJbGluZWFyX29mZnNldCA9IHkgKiBmYi0+cGl0Y2hlc1swXSArIHggKiBw aXhlbF9zaXplOwotCXNwcnN1cmZfb2Zmc2V0ID0gaW50ZWxfZ2VuNF9jb21wdXRlX3BhZ2Vfb2Zm c2V0KGRldl9wcml2LAotCQkJCQkJCSZ4LCAmeSwKLQkJCQkJCQlvYmotPnRpbGluZ19tb2RlLAor CXNwcnN1cmZfb2Zmc2V0ID0gaW50ZWxfZ2VuNF9jb21wdXRlX3BhZ2Vfb2Zmc2V0KGRldl9wcml2 LCAmeCwgJnksCisJCQkJCQkJZmItPm1vZGlmaWVyWzBdLAogCQkJCQkJCXBpeGVsX3NpemUsCiAJ CQkJCQkJZmItPnBpdGNoZXNbMF0pOwogCWxpbmVhcl9vZmZzZXQgLT0gc3Byc3VyZl9vZmZzZXQ7 CkBAIC01NTcsMTAgKzU1NiwxMCBAQCBpdmJfdXBkYXRlX3BsYW5lKHN0cnVjdCBkcm1fcGxhbmUg KnBsYW5lLAogCQlzcHJzY2FsZSA9IFNQUklURV9TQ0FMRV9FTkFCTEUgfCAoc3JjX3cgPDwgMTYp IHwgc3JjX2g7CiAKIAlsaW5lYXJfb2Zmc2V0ID0geSAqIGZiLT5waXRjaGVzWzBdICsgeCAqIHBp eGVsX3NpemU7Ci0Jc3Byc3VyZl9vZmZzZXQgPQotCQlpbnRlbF9nZW40X2NvbXB1dGVfcGFnZV9v ZmZzZXQoZGV2X3ByaXYsCi0JCQkJCSAgICAgICAmeCwgJnksIG9iai0+dGlsaW5nX21vZGUsCi0J CQkJCSAgICAgICBwaXhlbF9zaXplLCBmYi0+cGl0Y2hlc1swXSk7CisJc3Byc3VyZl9vZmZzZXQg PSBpbnRlbF9nZW40X2NvbXB1dGVfcGFnZV9vZmZzZXQoZGV2X3ByaXYsICZ4LCAmeSwKKwkJCQkJ CQlmYi0+bW9kaWZpZXJbMF0sCisJCQkJCQkJcGl4ZWxfc2l6ZSwKKwkJCQkJCQlmYi0+cGl0Y2hl c1swXSk7CiAJbGluZWFyX29mZnNldCAtPSBzcHJzdXJmX29mZnNldDsKIAogCWlmIChwbGFuZV9z dGF0ZS0+YmFzZS5yb3RhdGlvbiA9PSBCSVQoRFJNX1JPVEFURV8xODApKSB7CkBAIC02OTYsMTAg KzY5NSwxMCBAQCBpbGtfdXBkYXRlX3BsYW5lKHN0cnVjdCBkcm1fcGxhbmUgKnBsYW5lLAogCQlk dnNzY2FsZSA9IERWU19TQ0FMRV9FTkFCTEUgfCAoc3JjX3cgPDwgMTYpIHwgc3JjX2g7CiAKIAls aW5lYXJfb2Zmc2V0ID0geSAqIGZiLT5waXRjaGVzWzBdICsgeCAqIHBpeGVsX3NpemU7Ci0JZHZz c3VyZl9vZmZzZXQgPQotCQlpbnRlbF9nZW40X2NvbXB1dGVfcGFnZV9vZmZzZXQoZGV2X3ByaXYs Ci0JCQkJCSAgICAgICAmeCwgJnksIG9iai0+dGlsaW5nX21vZGUsCi0JCQkJCSAgICAgICBwaXhl bF9zaXplLCBmYi0+cGl0Y2hlc1swXSk7CisJZHZzc3VyZl9vZmZzZXQgPSBpbnRlbF9nZW40X2Nv bXB1dGVfcGFnZV9vZmZzZXQoZGV2X3ByaXYsICZ4LCAmeSwKKwkJCQkJCQlmYi0+bW9kaWZpZXJb MF0sCisJCQkJCQkJcGl4ZWxfc2l6ZSwKKwkJCQkJCQlmYi0+cGl0Y2hlc1swXSk7CiAJbGluZWFy X29mZnNldCAtPSBkdnNzdXJmX29mZnNldDsKIAogCWlmIChwbGFuZV9zdGF0ZS0+YmFzZS5yb3Rh dGlvbiA9PSBCSVQoRFJNX1JPVEFURV8xODApKSB7Ci0tIAoyLjQuMTAKCl9fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCkludGVsLWdmeCBtYWlsaW5nIGxpc3QK SW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwOi8vbGlzdHMuZnJlZWRlc2t0b3Au b3JnL21haWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4Cg==