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, 6 Oct 2017 15:50:33 +0100 Message-ID: <20171006145041.21673-14-matthew.auld@intel.com> References: <20171006145041.21673-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 001246FAB9 for ; Fri, 6 Oct 2017 14:51:04 +0000 (UTC) In-Reply-To: <20171006145041.21673-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 PgpSZXZpZXdlZC1ieTogQ2hyaXMgV2lsc29uIDxjaHJpc0BjaHJpcy13aWxzb24uY28udWs+Ci0t LQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fZ3R0LmMgfCA2NCArKysrKysrKysrKysr KysrKysrKysrKysrKysrKystLS0tLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9n dHQuaCB8ICAxICsKIDIgZmlsZXMgY2hhbmdlZCwgNTQgaW5zZXJ0aW9ucygrKSwgMTEgZGVsZXRp b25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fZ3R0LmMg Yi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9ndHQuYwppbmRleCA3OWJhNDg1YzVkNDIu LjdlYWU2YWI4YzVmZCAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1f Z3R0LmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fZ3R0LmMKQEAgLTUxOSwy MiArNTE5LDYzIEBAIHN0YXRpYyB2b2lkIGZpbGxfcGFnZV9kbWFfMzIoc3RydWN0IGk5MTVfYWRk cmVzc19zcGFjZSAqdm0sCiBzdGF0aWMgaW50CiBzZXR1cF9zY3JhdGNoX3BhZ2Uoc3RydWN0IGk5 MTVfYWRkcmVzc19zcGFjZSAqdm0sIGdmcF90IGdmcCkKIHsKLQlzdHJ1Y3QgcGFnZSAqcGFnZTsK KwlzdHJ1Y3QgcGFnZSAqcGFnZSA9IE5VTEw7CiAJZG1hX2FkZHJfdCBhZGRyOworCWludCBvcmRl cjsKIAotCXBhZ2UgPSBhbGxvY19wYWdlKGdmcCB8IF9fR0ZQX1pFUk8pOwotCWlmICh1bmxpa2Vs eSghcGFnZSkpCi0JCXJldHVybiAtRU5PTUVNOworCS8qCisJICogSW4gb3JkZXIgdG8gdXRpbGl6 ZSA2NEsgcGFnZXMgZm9yIGFuIG9iamVjdCB3aXRoIGEgc2l6ZSA8IDJNLCB3ZSB3aWxsCisJICog bmVlZCB0byBzdXBwb3J0IGEgNjRLIHNjcmF0Y2ggcGFnZSwgZ2l2ZW4gdGhhdCBldmVyeSAxNnRo IGVudHJ5IGZvciBhCisJICogcGFnZS10YWJsZSBvcGVyYXRpbmcgaW4gNjRLIG1vZGUgbXVzdCBw b2ludCB0byBhIHByb3Blcmx5IGFsaWduZWQgNjRLCisJICogcmVnaW9uLCBpbmNsdWRpbmcgYW55 IFBURXMgd2hpY2ggaGFwcGVuIHRvIHBvaW50IHRvIHNjcmF0Y2guCisJICoKKwkgKiBUaGlzIGlz IG9ubHkgcmVsZXZhbnQgZm9yIHRoZSA0OGIgUFBHVFQgd2hlcmUgd2Ugc3VwcG9ydAorCSAqIGh1 Z2UtZ3R0LXBhZ2VzLCBzZWUgYWxzbyBpOTE1X3ZtYV9pbnNlcnQoKS4KKwkgKgorCSAqIFRPRE86 IHdlIHNob3VsZCByZWFsbHkgY29uc2lkZXIgd3JpdGUtcHJvdGVjdGluZyB0aGUgc2NyYXRjaC1w YWdlIGFuZAorCSAqIHNoYXJpbmcgYmV0d2VlbiBwcGd0dAorCSAqLworCWlmIChpOTE1X3ZtX2lz XzQ4Yml0KHZtKSAmJgorCSAgICBIQVNfUEFHRV9TSVpFUyh2bS0+aTkxNSwgSTkxNV9HVFRfUEFH RV9TSVpFXzY0SykpIHsKKwkJb3JkZXIgPSBnZXRfb3JkZXIoSTkxNV9HVFRfUEFHRV9TSVpFXzY0 Syk7CisJCXBhZ2UgPSBhbGxvY19wYWdlcyhnZnAgfCBfX0dGUF9aRVJPLCBvcmRlcik7CisJCWlm IChwYWdlKSB7CisJCQlhZGRyID0gZG1hX21hcF9wYWdlKHZtLT5kbWEsIHBhZ2UsIDAsCisJCQkJ CSAgICBJOTE1X0dUVF9QQUdFX1NJWkVfNjRLLAorCQkJCQkgICAgUENJX0RNQV9CSURJUkVDVElP TkFMKTsKKwkJCWlmICh1bmxpa2VseShkbWFfbWFwcGluZ19lcnJvcih2bS0+ZG1hLCBhZGRyKSkp IHsKKwkJCQlfX2ZyZWVfcGFnZXMocGFnZSwgb3JkZXIpOworCQkJCXBhZ2UgPSBOVUxMOworCQkJ fQogCi0JYWRkciA9IGRtYV9tYXBfcGFnZSh2bS0+ZG1hLCBwYWdlLCAwLCBQQUdFX1NJWkUsCi0J CQkgICAgUENJX0RNQV9CSURJUkVDVElPTkFMKTsKLQlpZiAodW5saWtlbHkoZG1hX21hcHBpbmdf ZXJyb3Iodm0tPmRtYSwgYWRkcikpKSB7Ci0JCV9fZnJlZV9wYWdlKHBhZ2UpOwotCQlyZXR1cm4g LUVOT01FTTsKKwkJCWlmICghSVNfQUxJR05FRChhZGRyLCBJOTE1X0dUVF9QQUdFX1NJWkVfNjRL KSkgeworCQkJCWRtYV91bm1hcF9wYWdlKHZtLT5kbWEsIGFkZHIsCisJCQkJCSAgICAgICBJOTE1 X0dUVF9QQUdFX1NJWkVfNjRLLAorCQkJCQkgICAgICAgUENJX0RNQV9CSURJUkVDVElPTkFMKTsK KwkJCQlfX2ZyZWVfcGFnZXMocGFnZSwgb3JkZXIpOworCQkJCXBhZ2UgPSBOVUxMOworCQkJfQor CQl9CisJfQorCisJaWYgKCFwYWdlKSB7CisJCW9yZGVyID0gMDsKKwkJcGFnZSA9IGFsbG9jX3Bh Z2UoZ2ZwIHwgX19HRlBfWkVSTyk7CisJCWlmICh1bmxpa2VseSghcGFnZSkpCisJCQlyZXR1cm4g LUVOT01FTTsKKworCQlhZGRyID0gZG1hX21hcF9wYWdlKHZtLT5kbWEsIHBhZ2UsIDAsIFBBR0Vf U0laRSwKKwkJCQkgICAgUENJX0RNQV9CSURJUkVDVElPTkFMKTsKKwkJaWYgKHVubGlrZWx5KGRt YV9tYXBwaW5nX2Vycm9yKHZtLT5kbWEsIGFkZHIpKSkgeworCQkJX19mcmVlX3BhZ2UocGFnZSk7 CisJCQlyZXR1cm4gLUVOT01FTTsKKwkJfQogCX0KIAogCXZtLT5zY3JhdGNoX3BhZ2UucGFnZSA9 IHBhZ2U7CiAJdm0tPnNjcmF0Y2hfcGFnZS5kYWRkciA9IGFkZHI7CisJdm0tPnNjcmF0Y2hfcGFn ZS5vcmRlciA9IG9yZGVyOworCiAJcmV0dXJuIDA7CiB9CiAKQEAgLTU0Miw4ICs1ODMsOSBAQCBz dGF0aWMgdm9pZCBjbGVhbnVwX3NjcmF0Y2hfcGFnZShzdHJ1Y3QgaTkxNV9hZGRyZXNzX3NwYWNl ICp2bSkKIHsKIAlzdHJ1Y3QgaTkxNV9wYWdlX2RtYSAqcCA9ICZ2bS0+c2NyYXRjaF9wYWdlOwog Ci0JZG1hX3VubWFwX3BhZ2Uodm0tPmRtYSwgcC0+ZGFkZHIsIFBBR0VfU0laRSwgUENJX0RNQV9C SURJUkVDVElPTkFMKTsKLQlfX2ZyZWVfcGFnZShwLT5wYWdlKTsKKwlkbWFfdW5tYXBfcGFnZSh2 bS0+ZG1hLCBwLT5kYWRkciwgQklUKHAtPm9yZGVyKSA8PCBQQUdFX1NISUZULAorCQkgICAgICAg UENJX0RNQV9CSURJUkVDVElPTkFMKTsKKwlfX2ZyZWVfcGFnZXMocC0+cGFnZSwgcC0+b3JkZXIp OwogfQogCiBzdGF0aWMgc3RydWN0IGk5MTVfcGFnZV90YWJsZSAqYWxsb2NfcHQoc3RydWN0IGk5 MTVfYWRkcmVzc19zcGFjZSAqdm0pCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9p OTE1X2dlbV9ndHQuaCBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2d0dC5oCmluZGV4 IGI5ZDcwMzZjMzY2NS4uZTlkZTNmMDViMGM5IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0v aTkxNS9pOTE1X2dlbV9ndHQuaAorKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9n dHQuaApAQCAtMjE1LDYgKzIxNSw3IEBAIHN0cnVjdCBpOTE1X3ZtYTsKIAogc3RydWN0IGk5MTVf cGFnZV9kbWEgewogCXN0cnVjdCBwYWdlICpwYWdlOworCWludCBvcmRlcjsKIAl1bmlvbiB7CiAJ CWRtYV9hZGRyX3QgZGFkZHI7CiAKLS0gCjIuMTMuNQoKX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhA bGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxt YW4vbGlzdGluZm8vaW50ZWwtZ2Z4Cg==