From mboxrd@z Thu Jan 1 00:00:00 1970 From: ville.syrjala@linux.intel.com Subject: [PATCH 1/3] drm/i915: Actually respect DSPSURF alignment restrictions Date: Thu, 11 Jun 2015 16:31:14 +0300 Message-ID: <1434029476-958-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 mga02.intel.com (mga02.intel.com [134.134.136.20]) by gabe.freedesktop.org (Postfix) with ESMTP id AF9E66E41B for ; Thu, 11 Jun 2015 06:31:28 -0700 (PDT) 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 RnJvbTogVmlsbGUgU3lyasOkbMOkIDx2aWxsZS5zeXJqYWxhQGxpbnV4LmludGVsLmNvbT4KCkN1 cnJlbnRseSBpbnRlbF9nZW40X2NvbXB1dGVfcGFnZV9vZmZzZXQoKSBzaW1wbHkgcGlja3MgdGhl IGNsb3Nlc3QKcGFnZSBib3VuZGFyeSBiZWxvdyB0aGUgbGluZWFyIG9mZnNldC4gVGhhdCBob3dl dmVyIG1heSBub3QgYmUgc3VpdGFibHkKYWxpZ25lZCB0byBzYXRpc2Z5IGFueSBoYXJkd2FyZSBz cGVjaWZpYyByZXN0cmljdGlvbnMuIFNvIGxldCdzIG1ha2UKc3VyZSB0aGUgcGFnZSBib3VuZGFy eSB3ZSBjaG9vc2UgaXMgcHJvcGVybHkgYWxpZ25lZC4KCkFsc28gdG8gcGxheSBpdCBhIGJpdCBz YWZlciBsZXRzIHNwbGl0IHRoZSByZW1haW5pbmcgbGluZWFyIG9mZnNldCBpbnRvCnggYW5kIHkg dmFsdWVzIGluc3RlYWQgb2YganVzdCB4LiBUaGlzIHNob3VsZCBtYWtlIG5vIGRpZmZlcmVuY2Ug Zm9yCm1vc3QgcGxhdGZvcm1zIHNpbmNlIHdlIGNvbnZlcnQgdGhlIHggYW5kIHkgb2Zmc2V0cyBi YWNrIGludG8gYSBsaW5lYXIKb2Zmc2V0IGJlZm9yZSBmZWVkaW5nIHRoZW0gdG8gdGhlIGhhcmR3 YXJlLiBIU1crIGFyZSBkaWZmZXJlbnQgaG93ZXZlcgphbmQgdXNlIHggYW5kIHkgb2Zmc2V0cyBl dmVuIHdpdGggbGluZWFyIGJ1ZmZlcnMsIHNvIHRoZXkgbWlnaHQgaGF2ZQp0cm91YmxlIGlmIGVp dGhlciB0aGUgeCBvciB5IGdldCB0b28gYmlnLgoKU2lnbmVkLW9mZi1ieTogVmlsbGUgU3lyasOk bMOkIDx2aWxsZS5zeXJqYWxhQGxpbnV4LmludGVsLmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0v aTkxNS9pbnRlbF9kaXNwbGF5LmMgfCAzNyArKysrKysrKysrKysrKysrKysrKysrLS0tLS0tLS0t LS0tLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rydi5oICAgICB8ICAzICsrLQogZHJp dmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfc3ByaXRlLmMgIHwgIDkgKysrKysrLS0tCiAzIGZpbGVz IGNoYW5nZWQsIDMxIGluc2VydGlvbnMoKyksIDE4IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBh L2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYyBiL2RyaXZlcnMvZ3B1L2RybS9p OTE1L2ludGVsX2Rpc3BsYXkuYwppbmRleCA1Y2MyMjYzLi4wYWMyMTNhIDEwMDY0NAotLS0gYS9k cml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMKKysrIGIvZHJpdmVycy9ncHUvZHJt L2k5MTUvaW50ZWxfZGlzcGxheS5jCkBAIC0yMzI1LDYgKzIzMjUsMTggQEAgaW50ZWxfZmlsbF9m Yl9nZ3R0X3ZpZXcoc3RydWN0IGk5MTVfZ2d0dF92aWV3ICp2aWV3LCBzdHJ1Y3QgZHJtX2ZyYW1l YnVmZmVyICpmYiwKIAlyZXR1cm4gMDsKIH0KIAorc3RhdGljIHVuc2lnbmVkIGludCBpbnRlbF9s aW5lYXJfYWxpZ25tZW50KHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdikKK3sKKwlp ZiAoSU5URUxfSU5GTyhkZXZfcHJpdiktPmdlbiA+PSA5KQorCQlyZXR1cm4gMjU2ICogMTAyNDsK KwllbHNlIGlmIChJU19CUk9BRFdBVEVSKGRldl9wcml2KSB8fCBJU19DUkVTVExJTkUoZGV2X3By aXYpKQorCQlyZXR1cm4gMTI4ICogMTAyNDsKKwllbHNlIGlmIChJTlRFTF9JTkZPKGRldl9wcml2 KS0+Z2VuID49IDQpCisJCXJldHVybiA0ICogMTAyNDsKKwllbHNlCisJCXJldHVybiA2NCAqIDEw MjQ7Cit9CisKIGludAogaW50ZWxfcGluX2FuZF9mZW5jZV9mYl9vYmooc3RydWN0IGRybV9wbGFu ZSAqcGxhbmUsCiAJCQkgICBzdHJ1Y3QgZHJtX2ZyYW1lYnVmZmVyICpmYiwKQEAgLTIzNDIsMTQg KzIzNTQsNyBAQCBpbnRlbF9waW5fYW5kX2ZlbmNlX2ZiX29iaihzdHJ1Y3QgZHJtX3BsYW5lICpw bGFuZSwKIAogCXN3aXRjaCAoZmItPm1vZGlmaWVyWzBdKSB7CiAJY2FzZSBEUk1fRk9STUFUX01P RF9OT05FOgotCQlpZiAoSU5URUxfSU5GTyhkZXYpLT5nZW4gPj0gOSkKLQkJCWFsaWdubWVudCA9 IDI1NiAqIDEwMjQ7Ci0JCWVsc2UgaWYgKElTX0JST0FEV0FURVIoZGV2KSB8fCBJU19DUkVTVExJ TkUoZGV2KSkKLQkJCWFsaWdubWVudCA9IDEyOCAqIDEwMjQ7Ci0JCWVsc2UgaWYgKElOVEVMX0lO Rk8oZGV2KS0+Z2VuID49IDQpCi0JCQlhbGlnbm1lbnQgPSA0ICogMTAyNDsKLQkJZWxzZQotCQkJ YWxpZ25tZW50ID0gNjQgKiAxMDI0OworCQlhbGlnbm1lbnQgPSBpbnRlbF9saW5lYXJfYWxpZ25t ZW50KGRldl9wcml2KTsKIAkJYnJlYWs7CiAJY2FzZSBJOTE1X0ZPUk1BVF9NT0RfWF9USUxFRDoK IAkJaWYgKElOVEVMX0lORk8oZGV2KS0+Z2VuID49IDkpCkBAIC0yNDM5LDcgKzI0NDQsOCBAQCBz dGF0aWMgdm9pZCBpbnRlbF91bnBpbl9mYl9vYmooc3RydWN0IGRybV9mcmFtZWJ1ZmZlciAqZmIs CiAKIC8qIENvbXB1dGVzIHRoZSBsaW5lYXIgb2Zmc2V0IHRvIHRoZSBiYXNlIHRpbGUgYW5kIGFk anVzdHMgeCwgeS4gYnl0ZXMgcGVyIHBpeGVsCiAgKiBpcyBhc3N1bWVkIHRvIGJlIGEgcG93ZXIt b2YtdHdvLiAqLwotdW5zaWduZWQgbG9uZyBpbnRlbF9nZW40X2NvbXB1dGVfcGFnZV9vZmZzZXQo aW50ICp4LCBpbnQgKnksCit1bnNpZ25lZCBsb25nIGludGVsX2dlbjRfY29tcHV0ZV9wYWdlX29m ZnNldChzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYsCisJCQkJCSAgICAgaW50ICp4 LCBpbnQgKnksCiAJCQkJCSAgICAgdW5zaWduZWQgaW50IHRpbGluZ19tb2RlLAogCQkJCQkgICAg IHVuc2lnbmVkIGludCBjcHAsCiAJCQkJCSAgICAgdW5zaWduZWQgaW50IHBpdGNoKQpAQCAtMjQ1 NSwxMiArMjQ2MSwxMyBAQCB1bnNpZ25lZCBsb25nIGludGVsX2dlbjRfY29tcHV0ZV9wYWdlX29m ZnNldChpbnQgKngsIGludCAqeSwKIAogCQlyZXR1cm4gdGlsZV9yb3dzICogcGl0Y2ggKiA4ICsg dGlsZXMgKiA0MDk2OwogCX0gZWxzZSB7CisJCXVuc2lnbmVkIGludCBhbGlnbm1lbnQgPSBpbnRl bF9saW5lYXJfYWxpZ25tZW50KGRldl9wcml2KSAtIDE7CiAJCXVuc2lnbmVkIGludCBvZmZzZXQ7 CiAKIAkJb2Zmc2V0ID0gKnkgKiBwaXRjaCArICp4ICogY3BwOwotCQkqeSA9IDA7Ci0JCSp4ID0g KG9mZnNldCAmIDQwOTUpIC8gY3BwOwotCQlyZXR1cm4gb2Zmc2V0ICYgLTQwOTY7CisJCSp5ID0g KG9mZnNldCAmIGFsaWdubWVudCkgLyBwaXRjaDsKKwkJKnggPSAoKG9mZnNldCAmIGFsaWdubWVu dCkgLSAqeSAqIHBpdGNoKSAvIGNwcDsKKwkJcmV0dXJuIG9mZnNldCAmIH5hbGlnbm1lbnQ7CiAJ fQogfQogCkBAIC0yNzI5LDcgKzI3MzYsOCBAQCBzdGF0aWMgdm9pZCBpOXh4X3VwZGF0ZV9wcmlt YXJ5X3BsYW5lKHN0cnVjdCBkcm1fY3J0YyAqY3J0YywKIAogCWlmIChJTlRFTF9JTkZPKGRldikt PmdlbiA+PSA0KSB7CiAJCWludGVsX2NydGMtPmRzcGFkZHJfb2Zmc2V0ID0KLQkJCWludGVsX2dl bjRfY29tcHV0ZV9wYWdlX29mZnNldCgmeCwgJnksIG9iai0+dGlsaW5nX21vZGUsCisJCQlpbnRl bF9nZW40X2NvbXB1dGVfcGFnZV9vZmZzZXQoZGV2X3ByaXYsCisJCQkJCQkgICAgICAgJngsICZ5 LCBvYmotPnRpbGluZ19tb2RlLAogCQkJCQkJICAgICAgIHBpeGVsX3NpemUsCiAJCQkJCQkgICAg ICAgZmItPnBpdGNoZXNbMF0pOwogCQlsaW5lYXJfb2Zmc2V0IC09IGludGVsX2NydGMtPmRzcGFk ZHJfb2Zmc2V0OwpAQCAtMjgzMCw3ICsyODM4LDggQEAgc3RhdGljIHZvaWQgaXJvbmxha2VfdXBk YXRlX3ByaW1hcnlfcGxhbmUoc3RydWN0IGRybV9jcnRjICpjcnRjLAogCiAJbGluZWFyX29mZnNl dCA9IHkgKiBmYi0+cGl0Y2hlc1swXSArIHggKiBwaXhlbF9zaXplOwogCWludGVsX2NydGMtPmRz cGFkZHJfb2Zmc2V0ID0KLQkJaW50ZWxfZ2VuNF9jb21wdXRlX3BhZ2Vfb2Zmc2V0KCZ4LCAmeSwg b2JqLT50aWxpbmdfbW9kZSwKKwkJaW50ZWxfZ2VuNF9jb21wdXRlX3BhZ2Vfb2Zmc2V0KGRldl9w cml2LAorCQkJCQkgICAgICAgJngsICZ5LCBvYmotPnRpbGluZ19tb2RlLAogCQkJCQkgICAgICAg cGl4ZWxfc2l6ZSwKIAkJCQkJICAgICAgIGZiLT5waXRjaGVzWzBdKTsKIAlsaW5lYXJfb2Zmc2V0 IC09IGludGVsX2NydGMtPmRzcGFkZHJfb2Zmc2V0OwpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUv ZHJtL2k5MTUvaW50ZWxfZHJ2LmggYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcnYuaApp bmRleCBiMjgwMjlhLi5jMjhkMTE3IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9p bnRlbF9kcnYuaAorKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcnYuaApAQCAtMTEx Myw3ICsxMTEzLDggQEAgdm9pZCBhc3NlcnRfZmRpX3J4X3BsbChzdHJ1Y3QgZHJtX2k5MTVfcHJp dmF0ZSAqZGV2X3ByaXYsCiB2b2lkIGFzc2VydF9waXBlKHN0cnVjdCBkcm1faTkxNV9wcml2YXRl ICpkZXZfcHJpdiwgZW51bSBwaXBlIHBpcGUsIGJvb2wgc3RhdGUpOwogI2RlZmluZSBhc3NlcnRf cGlwZV9lbmFibGVkKGQsIHApIGFzc2VydF9waXBlKGQsIHAsIHRydWUpCiAjZGVmaW5lIGFzc2Vy dF9waXBlX2Rpc2FibGVkKGQsIHApIGFzc2VydF9waXBlKGQsIHAsIGZhbHNlKQotdW5zaWduZWQg bG9uZyBpbnRlbF9nZW40X2NvbXB1dGVfcGFnZV9vZmZzZXQoaW50ICp4LCBpbnQgKnksCit1bnNp Z25lZCBsb25nIGludGVsX2dlbjRfY29tcHV0ZV9wYWdlX29mZnNldChzdHJ1Y3QgZHJtX2k5MTVf cHJpdmF0ZSAqZGV2X3ByaXYsCisJCQkJCSAgICAgaW50ICp4LCBpbnQgKnksCiAJCQkJCSAgICAg dW5zaWduZWQgaW50IHRpbGluZ19tb2RlLAogCQkJCQkgICAgIHVuc2lnbmVkIGludCBicHAsCiAJ CQkJCSAgICAgdW5zaWduZWQgaW50IHBpdGNoKTsKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2Ry bS9pOTE1L2ludGVsX3Nwcml0ZS5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfc3ByaXRl LmMKaW5kZXggODE5M2EzNS4uMjhmNjk3MiAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5 MTUvaW50ZWxfc3ByaXRlLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfc3ByaXRl LmMKQEAgLTQxMSw3ICs0MTEsOCBAQCB2bHZfdXBkYXRlX3BsYW5lKHN0cnVjdCBkcm1fcGxhbmUg KmRwbGFuZSwgc3RydWN0IGRybV9jcnRjICpjcnRjLAogCWNydGNfaC0tOwogCiAJbGluZWFyX29m ZnNldCA9IHkgKiBmYi0+cGl0Y2hlc1swXSArIHggKiBwaXhlbF9zaXplOwotCXNwcnN1cmZfb2Zm c2V0ID0gaW50ZWxfZ2VuNF9jb21wdXRlX3BhZ2Vfb2Zmc2V0KCZ4LCAmeSwKKwlzcHJzdXJmX29m ZnNldCA9IGludGVsX2dlbjRfY29tcHV0ZV9wYWdlX29mZnNldChkZXZfcHJpdiwKKwkJCQkJCQkm eCwgJnksCiAJCQkJCQkJb2JqLT50aWxpbmdfbW9kZSwKIAkJCQkJCQlwaXhlbF9zaXplLAogCQkJ CQkJCWZiLT5waXRjaGVzWzBdKTsKQEAgLTU0Niw3ICs1NDcsOCBAQCBpdmJfdXBkYXRlX3BsYW5l KHN0cnVjdCBkcm1fcGxhbmUgKnBsYW5lLCBzdHJ1Y3QgZHJtX2NydGMgKmNydGMsCiAKIAlsaW5l YXJfb2Zmc2V0ID0geSAqIGZiLT5waXRjaGVzWzBdICsgeCAqIHBpeGVsX3NpemU7CiAJc3Byc3Vy Zl9vZmZzZXQgPQotCQlpbnRlbF9nZW40X2NvbXB1dGVfcGFnZV9vZmZzZXQoJngsICZ5LCBvYmot PnRpbGluZ19tb2RlLAorCQlpbnRlbF9nZW40X2NvbXB1dGVfcGFnZV9vZmZzZXQoZGV2X3ByaXYs CisJCQkJCSAgICAgICAmeCwgJnksIG9iai0+dGlsaW5nX21vZGUsCiAJCQkJCSAgICAgICBwaXhl bF9zaXplLCBmYi0+cGl0Y2hlc1swXSk7CiAJbGluZWFyX29mZnNldCAtPSBzcHJzdXJmX29mZnNl dDsKIApAQCAtNjgyLDcgKzY4NCw4IEBAIGlsa191cGRhdGVfcGxhbmUoc3RydWN0IGRybV9wbGFu ZSAqcGxhbmUsIHN0cnVjdCBkcm1fY3J0YyAqY3J0YywKIAogCWxpbmVhcl9vZmZzZXQgPSB5ICog ZmItPnBpdGNoZXNbMF0gKyB4ICogcGl4ZWxfc2l6ZTsKIAlkdnNzdXJmX29mZnNldCA9Ci0JCWlu dGVsX2dlbjRfY29tcHV0ZV9wYWdlX29mZnNldCgmeCwgJnksIG9iai0+dGlsaW5nX21vZGUsCisJ CWludGVsX2dlbjRfY29tcHV0ZV9wYWdlX29mZnNldChkZXZfcHJpdiwKKwkJCQkJICAgICAgICZ4 LCAmeSwgb2JqLT50aWxpbmdfbW9kZSwKIAkJCQkJICAgICAgIHBpeGVsX3NpemUsIGZiLT5waXRj aGVzWzBdKTsKIAlsaW5lYXJfb2Zmc2V0IC09IGR2c3N1cmZfb2Zmc2V0OwogCi0tIAoyLjMuNgoK X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4 IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHA6Ly9saXN0 cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK