From: ville.syrjala@linux.intel.com Subject: [PATCH 01/12] drm/i915: Treat fb->offsets[] as a raw byte offset instead of a linear offset Date: Thu, 24 Aug 2017 22:10:49 +0300 Message-ID: <20170824191100.10949-2-ville.syrjala@linux.intel.com> References: <20170824191100.10949-1-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 ESMTPS id D577A6E7A3 for ; Thu, 24 Aug 2017 19:11:07 +0000 (UTC) In-Reply-To: <20170824191100.10949-1-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 Cc: Ben Widawsky , Daniel Stone List-Id: intel-gfx@lists.freedesktop.org RnJvbTogVmlsbGUgU3lyasOkbMOkIDx2aWxsZS5zeXJqYWxhQGxpbnV4LmludGVsLmNvbT4KClVz ZXJzcGFjZSB3YW50cyB0byB0cmVhdCBmYi0+b2Zmc2V0c1tdIGFzIHJhdyBieXRlIG9mZnNldHMg aW50byB0aGUgZ2VtCmJvLiBBZGp1c3QgdGhlIGtlcm5lbCBjb2RlIHRvIG1hdGNoLgoKQ2M6IEJl biBXaWRhd3NreSA8YmVuQGJ3aWRhd3NrLm5ldD4KQ2M6IEphc29uIEVrc3RyYW5kIDxqYXNvbkBq bGVrc3RyYW5kLm5ldD4KQ2M6IERhbmllbCBTdG9uZSA8ZGFuaWVsc0Bjb2xsYWJvcmEuY29tPgpT aWduZWQtb2ZmLWJ5OiBWaWxsZSBTeXJqw6Rsw6QgPHZpbGxlLnN5cmphbGFAbGludXguaW50ZWwu Y29tPgotLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYyB8IDEwOCArKysr KysrKysrKysrKysrKysrKystLS0tLS0tLS0tLS0tLQogMSBmaWxlIGNoYW5nZWQsIDY0IGluc2Vy dGlvbnMoKyksIDQ0IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9p OTE1L2ludGVsX2Rpc3BsYXkuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXku YwppbmRleCBhZDc0ZDFkMTFkYmUuLjZmNDdlYWNhMDdmYiAxMDA2NDQKLS0tIGEvZHJpdmVycy9n cHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2lu dGVsX2Rpc3BsYXkuYwpAQCAtMjI4OCwxNyArMjI4OCwxMyBAQCB2b2lkIGludGVsX2FkZF9mYl9v ZmZzZXRzKGludCAqeCwgaW50ICp5LAogCX0KIH0KIAotLyoKLSAqIElucHV0IHRpbGUgZGltZW5z aW9ucyBhbmQgcGl0Y2ggbXVzdCBhbHJlYWR5IGJlCi0gKiByb3RhdGVkIHRvIG1hdGNoIHggYW5k IHksIGFuZCBpbiBwaXhlbCB1bml0cy4KLSAqLwotc3RhdGljIHUzMiBfaW50ZWxfYWRqdXN0X3Rp bGVfb2Zmc2V0KGludCAqeCwgaW50ICp5LAotCQkJCSAgICAgdW5zaWduZWQgaW50IHRpbGVfd2lk dGgsCi0JCQkJICAgICB1bnNpZ25lZCBpbnQgdGlsZV9oZWlnaHQsCi0JCQkJICAgICB1bnNpZ25l ZCBpbnQgdGlsZV9zaXplLAotCQkJCSAgICAgdW5zaWduZWQgaW50IHBpdGNoX3RpbGVzLAotCQkJ CSAgICAgdTMyIG9sZF9vZmZzZXQsCi0JCQkJICAgICB1MzIgbmV3X29mZnNldCkKK3N0YXRpYyB1 MzIgX19pbnRlbF9hZGp1c3RfdGlsZV9vZmZzZXQoaW50ICp4LCBpbnQgKnksCisJCQkJICAgICAg dW5zaWduZWQgaW50IHRpbGVfd2lkdGgsCisJCQkJICAgICAgdW5zaWduZWQgaW50IHRpbGVfaGVp Z2h0LAorCQkJCSAgICAgIHVuc2lnbmVkIGludCB0aWxlX3NpemUsCisJCQkJICAgICAgdW5zaWdu ZWQgaW50IHBpdGNoX3RpbGVzLAorCQkJCSAgICAgIHUzMiBvbGRfb2Zmc2V0LAorCQkJCSAgICAg IHUzMiBuZXdfb2Zmc2V0KQogewogCXVuc2lnbmVkIGludCBwaXRjaF9waXhlbHMgPSBwaXRjaF90 aWxlcyAqIHRpbGVfd2lkdGg7CiAJdW5zaWduZWQgaW50IHRpbGVzOwpAQCAtMjMxOSwxOCArMjMx NSwxMyBAQCBzdGF0aWMgdTMyIF9pbnRlbF9hZGp1c3RfdGlsZV9vZmZzZXQoaW50ICp4LCBpbnQg KnksCiAJcmV0dXJuIG5ld19vZmZzZXQ7CiB9CiAKLS8qCi0gKiBBZGp1c3QgdGhlIHRpbGUgb2Zm c2V0IGJ5IG1vdmluZyB0aGUgZGlmZmVyZW5jZSBpbnRvCi0gKiB0aGUgeC95IG9mZnNldHMuCi0g Ki8KLXN0YXRpYyB1MzIgaW50ZWxfYWRqdXN0X3RpbGVfb2Zmc2V0KGludCAqeCwgaW50ICp5LAot CQkJCSAgICBjb25zdCBzdHJ1Y3QgaW50ZWxfcGxhbmVfc3RhdGUgKnN0YXRlLCBpbnQgcGxhbmUs Ci0JCQkJICAgIHUzMiBvbGRfb2Zmc2V0LCB1MzIgbmV3X29mZnNldCkKK3N0YXRpYyB1MzIgX2lu dGVsX2FkanVzdF90aWxlX29mZnNldChpbnQgKngsIGludCAqeSwKKwkJCQkgICAgIGNvbnN0IHN0 cnVjdCBkcm1fZnJhbWVidWZmZXIgKmZiLCBpbnQgcGxhbmUsCisJCQkJICAgICB1bnNpZ25lZCBp bnQgcm90YXRpb24sCisJCQkJICAgICB1MzIgb2xkX29mZnNldCwgdTMyIG5ld19vZmZzZXQpCiB7 Ci0JY29uc3Qgc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0gdG9faTkxNShzdGF0 ZS0+YmFzZS5wbGFuZS0+ZGV2KTsKLQljb25zdCBzdHJ1Y3QgZHJtX2ZyYW1lYnVmZmVyICpmYiA9 IHN0YXRlLT5iYXNlLmZiOworCWNvbnN0IHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJp diA9IHRvX2k5MTUoZmItPmRldik7CiAJdW5zaWduZWQgaW50IGNwcCA9IGZiLT5mb3JtYXQtPmNw cFtwbGFuZV07Ci0JdW5zaWduZWQgaW50IHJvdGF0aW9uID0gc3RhdGUtPmJhc2Uucm90YXRpb247 CiAJdW5zaWduZWQgaW50IHBpdGNoID0gaW50ZWxfZmJfcGl0Y2goZmIsIHBsYW5lLCByb3RhdGlv bik7CiAKIAlXQVJOX09OKG5ld19vZmZzZXQgPiBvbGRfb2Zmc2V0KTsKQEAgLTIzNDksOSArMjM0 MCw5IEBAIHN0YXRpYyB1MzIgaW50ZWxfYWRqdXN0X3RpbGVfb2Zmc2V0KGludCAqeCwgaW50ICp5 LAogCQkJcGl0Y2hfdGlsZXMgPSBwaXRjaCAvICh0aWxlX3dpZHRoICogY3BwKTsKIAkJfQogCi0J CV9pbnRlbF9hZGp1c3RfdGlsZV9vZmZzZXQoeCwgeSwgdGlsZV93aWR0aCwgdGlsZV9oZWlnaHQs Ci0JCQkJCSAgdGlsZV9zaXplLCBwaXRjaF90aWxlcywKLQkJCQkJICBvbGRfb2Zmc2V0LCBuZXdf b2Zmc2V0KTsKKwkJX19pbnRlbF9hZGp1c3RfdGlsZV9vZmZzZXQoeCwgeSwgdGlsZV93aWR0aCwg dGlsZV9oZWlnaHQsCisJCQkJCSAgIHRpbGVfc2l6ZSwgcGl0Y2hfdGlsZXMsCisJCQkJCSAgIG9s ZF9vZmZzZXQsIG5ld19vZmZzZXQpOwogCX0gZWxzZSB7CiAJCW9sZF9vZmZzZXQgKz0gKnkgKiBw aXRjaCArICp4ICogY3BwOwogCkBAIC0yMzYzLDYgKzIzNTQsMTkgQEAgc3RhdGljIHUzMiBpbnRl bF9hZGp1c3RfdGlsZV9vZmZzZXQoaW50ICp4LCBpbnQgKnksCiB9CiAKIC8qCisgKiBBZGp1c3Qg dGhlIHRpbGUgb2Zmc2V0IGJ5IG1vdmluZyB0aGUgZGlmZmVyZW5jZSBpbnRvCisgKiB0aGUgeC95 IG9mZnNldHMuCisgKi8KK3N0YXRpYyB1MzIgaW50ZWxfYWRqdXN0X3RpbGVfb2Zmc2V0KGludCAq eCwgaW50ICp5LAorCQkJCSAgICBjb25zdCBzdHJ1Y3QgaW50ZWxfcGxhbmVfc3RhdGUgKnN0YXRl LCBpbnQgcGxhbmUsCisJCQkJICAgIHUzMiBvbGRfb2Zmc2V0LCB1MzIgbmV3X29mZnNldCkKK3sK KwlyZXR1cm4gX2ludGVsX2FkanVzdF90aWxlX29mZnNldCh4LCB5LCBzdGF0ZS0+YmFzZS5mYiwg cGxhbmUsCisJCQkJCSBzdGF0ZS0+YmFzZS5yb3RhdGlvbiwKKwkJCQkJIG9sZF9vZmZzZXQsIG5l d19vZmZzZXQpOworfQorCisvKgogICogQ29tcHV0ZXMgdGhlIGxpbmVhciBvZmZzZXQgdG8gdGhl IGJhc2UgdGlsZSBhbmQgYWRqdXN0cwogICogeCwgeS4gYnl0ZXMgcGVyIHBpeGVsIGlzIGFzc3Vt ZWQgdG8gYmUgYSBwb3dlci1vZi10d28uCiAgKgpAQCAtMjQxMyw5ICsyNDE3LDkgQEAgc3RhdGlj IHUzMiBfaW50ZWxfY29tcHV0ZV90aWxlX29mZnNldChjb25zdCBzdHJ1Y3QgZHJtX2k5MTVfcHJp dmF0ZSAqZGV2X3ByaXYsCiAJCW9mZnNldCA9ICh0aWxlX3Jvd3MgKiBwaXRjaF90aWxlcyArIHRp bGVzKSAqIHRpbGVfc2l6ZTsKIAkJb2Zmc2V0X2FsaWduZWQgPSBvZmZzZXQgJiB+YWxpZ25tZW50 OwogCi0JCV9pbnRlbF9hZGp1c3RfdGlsZV9vZmZzZXQoeCwgeSwgdGlsZV93aWR0aCwgdGlsZV9o ZWlnaHQsCi0JCQkJCSAgdGlsZV9zaXplLCBwaXRjaF90aWxlcywKLQkJCQkJICBvZmZzZXQsIG9m ZnNldF9hbGlnbmVkKTsKKwkJX19pbnRlbF9hZGp1c3RfdGlsZV9vZmZzZXQoeCwgeSwgdGlsZV93 aWR0aCwgdGlsZV9oZWlnaHQsCisJCQkJCSAgIHRpbGVfc2l6ZSwgcGl0Y2hfdGlsZXMsCisJCQkJ CSAgIG9mZnNldCwgb2Zmc2V0X2FsaWduZWQpOwogCX0gZWxzZSB7CiAJCW9mZnNldCA9ICp5ICog cGl0Y2ggKyAqeCAqIGNwcDsKIAkJb2Zmc2V0X2FsaWduZWQgPSBvZmZzZXQgJiB+YWxpZ25tZW50 OwpAQCAtMjQ0NywxNiArMjQ1MSwyNCBAQCB1MzIgaW50ZWxfY29tcHV0ZV90aWxlX29mZnNldChp bnQgKngsIGludCAqeSwKIAkJCQkJICByb3RhdGlvbiwgYWxpZ25tZW50KTsKIH0KIAotLyogQ29u dmVydCB0aGUgZmItPm9mZnNldFtdIGxpbmVhciBvZmZzZXQgaW50byB4L3kgb2Zmc2V0cyAqLwot c3RhdGljIHZvaWQgaW50ZWxfZmJfb2Zmc2V0X3RvX3h5KGludCAqeCwgaW50ICp5LAotCQkJCSAg Y29uc3Qgc3RydWN0IGRybV9mcmFtZWJ1ZmZlciAqZmIsIGludCBwbGFuZSkKKy8qIENvbnZlcnQg dGhlIGZiLT5vZmZzZXRbXSBpbnRvIHgveSBvZmZzZXRzICovCitzdGF0aWMgaW50IGludGVsX2Zi X29mZnNldF90b194eShpbnQgKngsIGludCAqeSwKKwkJCQkgY29uc3Qgc3RydWN0IGRybV9mcmFt ZWJ1ZmZlciAqZmIsIGludCBwbGFuZSkKIHsKLQl1bnNpZ25lZCBpbnQgY3BwID0gZmItPmZvcm1h dC0+Y3BwW3BsYW5lXTsKLQl1bnNpZ25lZCBpbnQgcGl0Y2ggPSBmYi0+cGl0Y2hlc1twbGFuZV07 Ci0JdTMyIGxpbmVhcl9vZmZzZXQgPSBmYi0+b2Zmc2V0c1twbGFuZV07CisJc3RydWN0IGRybV9p OTE1X3ByaXZhdGUgKmRldl9wcml2ID0gdG9faTkxNShmYi0+ZGV2KTsKKworCWlmIChmYi0+bW9k aWZpZXIgIT0gRFJNX0ZPUk1BVF9NT0RfTElORUFSICYmCisJICAgIGZiLT5vZmZzZXRzW3BsYW5l XSAlIGludGVsX3RpbGVfc2l6ZShkZXZfcHJpdikpCisJCXJldHVybiAtRUlOVkFMOwogCi0JKnkg PSBsaW5lYXJfb2Zmc2V0IC8gcGl0Y2g7Ci0JKnggPSBsaW5lYXJfb2Zmc2V0ICUgcGl0Y2ggLyBj cHA7CisJKnggPSAwOworCSp5ID0gMDsKKworCV9pbnRlbF9hZGp1c3RfdGlsZV9vZmZzZXQoeCwg eSwKKwkJCQkgIGZiLCBwbGFuZSwgRFJNX01PREVfUk9UQVRFXzAsCisJCQkJICBmYi0+b2Zmc2V0 c1twbGFuZV0sIDApOworCisJcmV0dXJuIDA7CiB9CiAKIHN0YXRpYyB1bnNpZ25lZCBpbnQgaW50 ZWxfZmJfbW9kaWZpZXJfdG9fdGlsaW5nKHVpbnQ2NF90IGZiX21vZGlmaWVyKQpAQCAtMjUyMywx MiArMjUzNSwxOCBAQCBpbnRlbF9maWxsX2ZiX2luZm8oc3RydWN0IGRybV9pOTE1X3ByaXZhdGUg KmRldl9wcml2LAogCQl1bnNpZ25lZCBpbnQgY3BwLCBzaXplOwogCQl1MzIgb2Zmc2V0OwogCQlp bnQgeCwgeTsKKwkJaW50IHJldDsKIAogCQljcHAgPSBmYi0+Zm9ybWF0LT5jcHBbaV07CiAJCXdp ZHRoID0gZHJtX2ZyYW1lYnVmZmVyX3BsYW5lX3dpZHRoKGZiLT53aWR0aCwgZmIsIGkpOwogCQlo ZWlnaHQgPSBkcm1fZnJhbWVidWZmZXJfcGxhbmVfaGVpZ2h0KGZiLT5oZWlnaHQsIGZiLCBpKTsK IAotCQlpbnRlbF9mYl9vZmZzZXRfdG9feHkoJngsICZ5LCBmYiwgaSk7CisJCXJldCA9IGludGVs X2ZiX29mZnNldF90b194eSgmeCwgJnksIGZiLCBpKTsKKwkJaWYgKHJldCkgeworCQkJRFJNX0RF QlVHX0tNUygiYmFkIGZiIHBsYW5lICVkIG9mZnNldDogMHgleFxuIiwKKwkJCQkgICAgICBpLCBm Yi0+b2Zmc2V0c1tpXSk7CisJCQlyZXR1cm4gcmV0OworCQl9CiAKIAkJaWYgKChmYi0+bW9kaWZp ZXIgPT0gSTkxNV9GT1JNQVRfTU9EX1lfVElMRURfQ0NTIHx8CiAJCSAgICAgZmItPm1vZGlmaWVy ID09IEk5MTVfRk9STUFUX01PRF9ZZl9USUxFRF9DQ1MpICYmIGkgPT0gMSkgewpAQCAtMjUzOSwx MSArMjU1NywxMyBAQCBpbnRlbF9maWxsX2ZiX2luZm8oc3RydWN0IGRybV9pOTE1X3ByaXZhdGUg KmRldl9wcml2LAogCQkJaW50IGNjc194LCBjY3NfeTsKIAogCQkJaW50ZWxfdGlsZV9kaW1zKGZi LCBpLCAmdGlsZV93aWR0aCwgJnRpbGVfaGVpZ2h0KTsKKwkJCXRpbGVfd2lkdGggKj0gaHN1YjsK KwkJCXRpbGVfaGVpZ2h0ICo9IHZzdWI7CiAKLQkJCWNjc194ID0gKHggKiBoc3ViKSAlICh0aWxl X3dpZHRoICogaHN1Yik7Ci0JCQljY3NfeSA9ICh5ICogdnN1YikgJSAodGlsZV9oZWlnaHQgKiB2 c3ViKTsKLQkJCW1haW5feCA9IGludGVsX2ZiLT5ub3JtYWxbMF0ueCAlICh0aWxlX3dpZHRoICog aHN1Yik7Ci0JCQltYWluX3kgPSBpbnRlbF9mYi0+bm9ybWFsWzBdLnkgJSAodGlsZV9oZWlnaHQg KiB2c3ViKTsKKwkJCWNjc194ID0gKHggKiBoc3ViKSAlIHRpbGVfd2lkdGg7CisJCQljY3NfeSA9 ICh5ICogdnN1YikgJSB0aWxlX2hlaWdodDsKKwkJCW1haW5feCA9IGludGVsX2ZiLT5ub3JtYWxb MF0ueCAlIHRpbGVfd2lkdGg7CisJCQltYWluX3kgPSBpbnRlbF9mYi0+bm9ybWFsWzBdLnkgJSB0 aWxlX2hlaWdodDsKIAogCQkJLyoKIAkJCSAqIENDUyBkb2Vzbid0IGhhdmUgaXRzIG93biB4L3kg b2Zmc2V0IHJlZ2lzdGVyLCBzbyB0aGUgaW50cmEgQ0NTIHRpbGUKQEAgLTI2MzIsMTAgKzI2NTIs MTAgQEAgaW50ZWxfZmlsbF9mYl9pbmZvKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJp diwKIAkJCSAqIFdlIG9ubHkga2VlcCB0aGUgeC95IG9mZnNldHMsIHNvIHB1c2ggYWxsIG9mIHRo ZQogCQkJICogZ3R0IG9mZnNldCBpbnRvIHRoZSB4L3kgb2Zmc2V0cy4KIAkJCSAqLwotCQkJX2lu dGVsX2FkanVzdF90aWxlX29mZnNldCgmeCwgJnksCi0JCQkJCQkgIHRpbGVfd2lkdGgsIHRpbGVf aGVpZ2h0LAotCQkJCQkJICB0aWxlX3NpemUsIHBpdGNoX3RpbGVzLAotCQkJCQkJICBndHRfb2Zm c2V0X3JvdGF0ZWQgKiB0aWxlX3NpemUsIDApOworCQkJX19pbnRlbF9hZGp1c3RfdGlsZV9vZmZz ZXQoJngsICZ5LAorCQkJCQkJICAgdGlsZV93aWR0aCwgdGlsZV9oZWlnaHQsCisJCQkJCQkgICB0 aWxlX3NpemUsIHBpdGNoX3RpbGVzLAorCQkJCQkJICAgZ3R0X29mZnNldF9yb3RhdGVkICogdGls ZV9zaXplLCAwKTsKIAogCQkJZ3R0X29mZnNldF9yb3RhdGVkICs9IHJvdF9pbmZvLT5wbGFuZVtp XS53aWR0aCAqIHJvdF9pbmZvLT5wbGFuZVtpXS5oZWlnaHQ7CiAKLS0gCjIuMTMuMAoKX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4IG1haWxp bmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJl ZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4Cg==