From mboxrd@z Thu Jan 1 00:00:00 1970 From: Matthew Auld Subject: [PATCH 13/21] drm/i915: add support for 64K scratch page Date: Fri, 22 Sep 2017 18:32:44 +0100 Message-ID: <20170922173252.10137-14-matthew.auld@intel.com> References: <20170922173252.10137-1-matthew.auld@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by gabe.freedesktop.org (Postfix) with ESMTPS id DD1576EA5E for ; Fri, 22 Sep 2017 17:33:35 +0000 (UTC) In-Reply-To: <20170922173252.10137-1-matthew.auld@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 QmVmb3JlIHdlIGNhbiBmdWxseSBlbmFibGUgNjRLIHBhZ2VzLCB3ZSBuZWVkIHRvIGZpcnN0IHN1 cHBvcnQgYSA2NEsKc2NyYXRjaCBwYWdlIGlmIHdlIGludGVuZCB0byBzdXBwb3J0IHRoZSBjYXNl IHdoZXJlIHdlIGhhdmUgb2JqZWN0IHNpemVzCjwgMk0sIHNpbmNlIGFueSBzY3JhdGNoIFBURSBt dXN0IGFsc28gcG9pbnQgdG8gYSA2NEsgcmVnaW9uLiAgV2l0aG91dAp0aGlzIG91ciA2NEsgdXNh Z2UgaXMgbGltaXRlZCB0byBvYmplY3RzIHdoaWNoIGNvbXBsZXRlbHkgZmlsbCB0aGUKcGFnZS10 YWJsZSwgYW5kIHRoZXJlZm9yZSBkb24ndCBuZWVkIGFueSBzY3JhdGNoLgoKdjI6IGFkZCByZW1p bmRlciBhYm91dCB3aHkgNDhiIFBQR1RUCgpSZXBvcnRlZC1ieTogQ2hyaXMgV2lsc29uIDxjaHJp c0BjaHJpcy13aWxzb24uY28udWs+ClNpZ25lZC1vZmYtYnk6IE1hdHRoZXcgQXVsZCA8bWF0dGhl dy5hdWxkQGludGVsLmNvbT4KQ2M6IEpvb25hcyBMYWh0aW5lbiA8am9vbmFzLmxhaHRpbmVuQGxp bnV4LmludGVsLmNvbT4KQ2M6IENocmlzIFdpbHNvbiA8Y2hyaXNAY2hyaXMtd2lsc29uLmNvLnVr PgotLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2d0dC5jIHwgNjAgKysrKysrKysr KysrKysrKysrKysrKysrKysrKysrLS0tLS0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9n ZW1fZ3R0LmggfCAgMSArCiAyIGZpbGVzIGNoYW5nZWQsIDUwIGluc2VydGlvbnMoKyksIDExIGRl bGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2d0 dC5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fZ3R0LmMKaW5kZXggOGNkYjUzNjFi NTgyLi5lNGQ1OWE1OTJhODggMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVf Z2VtX2d0dC5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2d0dC5jCkBAIC01 MjIsMjIgKzUyMiw1OSBAQCBzdGF0aWMgdm9pZCBmaWxsX3BhZ2VfZG1hXzMyKHN0cnVjdCBpOTE1 X2FkZHJlc3Nfc3BhY2UgKnZtLAogc3RhdGljIGludAogc2V0dXBfc2NyYXRjaF9wYWdlKHN0cnVj dCBpOTE1X2FkZHJlc3Nfc3BhY2UgKnZtLCBnZnBfdCBnZnApCiB7Ci0Jc3RydWN0IHBhZ2UgKnBh Z2U7CisJc3RydWN0IHBhZ2UgKnBhZ2UgPSBOVUxMOwogCWRtYV9hZGRyX3QgYWRkcjsKKwlpbnQg b3JkZXI7CiAKLQlwYWdlID0gYWxsb2NfcGFnZShnZnAgfCBfX0dGUF9aRVJPKTsKLQlpZiAodW5s aWtlbHkoIXBhZ2UpKQotCQlyZXR1cm4gLUVOT01FTTsKKwkvKiBJbiBvcmRlciB0byB1dGlsaXpl IDY0SyBwYWdlcyBmb3IgYW4gb2JqZWN0IHdpdGggYSBzaXplIDwgMk0sIHdlIHdpbGwKKwkgKiBu ZWVkIHRvIHN1cHBvcnQgYSA2NEsgc2NyYXRjaCBwYWdlLCBnaXZlbiB0aGF0IGV2ZXJ5IDE2dGgg ZW50cnkgZm9yIGEKKwkgKiBwYWdlLXRhYmxlIG9wZXJhdGluZyBpbiA2NEsgbW9kZSBtdXN0IHBv aW50IHRvIGEgcHJvcGVybHkgYWxpZ25lZCA2NEsKKwkgKiByZWdpb24sIGluY2x1ZGluZyBhbnkg UFRFcyB3aGljaCBoYXBwZW4gdG8gcG9pbnQgdG8gc2NyYXRjaC4KKwkgKgorCSAqIFRoaXMgaXMg b25seSByZWxldmFudCBmb3IgdGhlIDQ4YiBQUEdUVCB3aGVyZSB3ZSBzdXBwb3J0CisJICogaHVn ZS1ndHQtcGFnZXMsIHNlZSBhbHNvIGk5MTVfdm1hX2luc2VydCgpLgorCSAqLworCWlmIChpOTE1 X3ZtX2lzXzQ4Yml0KHZtKSAmJgorCSAgICBIQVNfUEFHRV9TSVpFUyh2bS0+aTkxNSwgSTkxNV9H VFRfUEFHRV9TSVpFXzY0SykpIHsKKwkJb3JkZXIgPSBnZXRfb3JkZXIoSTkxNV9HVFRfUEFHRV9T SVpFXzY0Syk7CisJCXBhZ2UgPSBhbGxvY19wYWdlcyhnZnAgfCBfX0dGUF9aRVJPLCBvcmRlcik7 CisJCWlmIChwYWdlKSB7CisJCQlhZGRyID0gZG1hX21hcF9wYWdlKHZtLT5kbWEsIHBhZ2UsIDAs CisJCQkJCSAgICBJOTE1X0dUVF9QQUdFX1NJWkVfNjRLLAorCQkJCQkgICAgUENJX0RNQV9CSURJ UkVDVElPTkFMKTsKKwkJCWlmICh1bmxpa2VseShkbWFfbWFwcGluZ19lcnJvcih2bS0+ZG1hLCBh ZGRyKSkpIHsKKwkJCQlfX2ZyZWVfcGFnZXMocGFnZSwgb3JkZXIpOworCQkJCXBhZ2UgPSBOVUxM OworCQkJfQogCi0JYWRkciA9IGRtYV9tYXBfcGFnZSh2bS0+ZG1hLCBwYWdlLCAwLCBQQUdFX1NJ WkUsCi0JCQkgICAgUENJX0RNQV9CSURJUkVDVElPTkFMKTsKLQlpZiAodW5saWtlbHkoZG1hX21h cHBpbmdfZXJyb3Iodm0tPmRtYSwgYWRkcikpKSB7Ci0JCV9fZnJlZV9wYWdlKHBhZ2UpOwotCQly ZXR1cm4gLUVOT01FTTsKKwkJCWlmICghSVNfQUxJR05FRChhZGRyLCBJOTE1X0dUVF9QQUdFX1NJ WkVfNjRLKSkgeworCQkJCWRtYV91bm1hcF9wYWdlKHZtLT5kbWEsIGFkZHIsCisJCQkJCSAgICAg ICBJOTE1X0dUVF9QQUdFX1NJWkVfNjRLLAorCQkJCQkgICAgICAgUENJX0RNQV9CSURJUkVDVElP TkFMKTsKKwkJCQlfX2ZyZWVfcGFnZXMocGFnZSwgb3JkZXIpOworCQkJCXBhZ2UgPSBOVUxMOwor CQkJfQorCQl9CisJfQorCisJaWYgKCFwYWdlKSB7CisJCW9yZGVyID0gMDsKKwkJcGFnZSA9IGFs bG9jX3BhZ2UoZ2ZwIHwgX19HRlBfWkVSTyk7CisJCWlmICh1bmxpa2VseSghcGFnZSkpCisJCQly ZXR1cm4gLUVOT01FTTsKKworCQlhZGRyID0gZG1hX21hcF9wYWdlKHZtLT5kbWEsIHBhZ2UsIDAs IFBBR0VfU0laRSwKKwkJCQkgICAgUENJX0RNQV9CSURJUkVDVElPTkFMKTsKKwkJaWYgKHVubGlr ZWx5KGRtYV9tYXBwaW5nX2Vycm9yKHZtLT5kbWEsIGFkZHIpKSkgeworCQkJX19mcmVlX3BhZ2Uo cGFnZSk7CisJCQlyZXR1cm4gLUVOT01FTTsKKwkJfQogCX0KIAogCXZtLT5zY3JhdGNoX3BhZ2Uu cGFnZSA9IHBhZ2U7CiAJdm0tPnNjcmF0Y2hfcGFnZS5kYWRkciA9IGFkZHI7CisJdm0tPnNjcmF0 Y2hfcGFnZS5vcmRlciA9IG9yZGVyOworCiAJcmV0dXJuIDA7CiB9CiAKQEAgLTU0NSw4ICs1ODIs OSBAQCBzdGF0aWMgdm9pZCBjbGVhbnVwX3NjcmF0Y2hfcGFnZShzdHJ1Y3QgaTkxNV9hZGRyZXNz X3NwYWNlICp2bSkKIHsKIAlzdHJ1Y3QgaTkxNV9wYWdlX2RtYSAqcCA9ICZ2bS0+c2NyYXRjaF9w YWdlOwogCi0JZG1hX3VubWFwX3BhZ2Uodm0tPmRtYSwgcC0+ZGFkZHIsIFBBR0VfU0laRSwgUENJ X0RNQV9CSURJUkVDVElPTkFMKTsKLQlfX2ZyZWVfcGFnZShwLT5wYWdlKTsKKwlkbWFfdW5tYXBf cGFnZSh2bS0+ZG1hLCBwLT5kYWRkciwgQklUKHAtPm9yZGVyKSA8PCBQQUdFX1NISUZULAorCQkg ICAgICAgUENJX0RNQV9CSURJUkVDVElPTkFMKTsKKwlfX2ZyZWVfcGFnZXMocC0+cGFnZSwgcC0+ b3JkZXIpOwogfQogCiBzdGF0aWMgc3RydWN0IGk5MTVfcGFnZV90YWJsZSAqYWxsb2NfcHQoc3Ry dWN0IGk5MTVfYWRkcmVzc19zcGFjZSAqdm0pCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0v aTkxNS9pOTE1X2dlbV9ndHQuaCBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2d0dC5o CmluZGV4IGU5ZTY2YWJiZTUzMi4uMGEzMWRjMzY5YzI4IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dw dS9kcm0vaTkxNS9pOTE1X2dlbV9ndHQuaAorKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1 X2dlbV9ndHQuaApAQCAtMjE0LDYgKzIxNCw3IEBAIHN0cnVjdCBpOTE1X3ZtYTsKIAogc3RydWN0 IGk5MTVfcGFnZV9kbWEgewogCXN0cnVjdCBwYWdlICpwYWdlOworCWludCBvcmRlcjsKIAl1bmlv biB7CiAJCWRtYV9hZGRyX3QgZGFkZHI7CiAKLS0gCjIuMTMuNQoKX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRl bC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3Jn L21haWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4Cg==