From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.8 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 27364C43460 for ; Mon, 12 Apr 2021 09:09:57 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id E05516120F for ; Mon, 12 Apr 2021 09:09:56 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org E05516120F Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=intel.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=dri-devel-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 0AEC76E342; Mon, 12 Apr 2021 09:09:41 +0000 (UTC) Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) by gabe.freedesktop.org (Postfix) with ESMTPS id CBB5D6E2EF; Mon, 12 Apr 2021 09:09:38 +0000 (UTC) IronPort-SDR: jOwJlP2nS2S7HciqV2qk3VrOV+X7f43D9zZxRpBINKD0a7WsvvpNpKfxbXyROnxMZxaaEENjcu KyDQbV9eiUrA== X-IronPort-AV: E=McAfee;i="6000,8403,9951"; a="193709737" X-IronPort-AV: E=Sophos;i="5.82,216,1613462400"; d="scan'208";a="193709737" Received: from orsmga008.jf.intel.com ([10.7.209.65]) by fmsmga103.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 12 Apr 2021 02:09:37 -0700 IronPort-SDR: 7HBIrVjfBmrgP1a/pF3M5GjLK5lQYW89zLrV1TpNeAIvaiouMHtyJnSNb1QalBk4aTWk29bNVZ n6wkrIjBmx5w== X-IronPort-AV: E=Sophos;i="5.82,216,1613462400"; d="scan'208";a="423712728" Received: from tarynrox-mobl1.ger.corp.intel.com (HELO mwauld-desk1.ger.corp.intel.com) ([10.252.5.30]) by orsmga008-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 12 Apr 2021 02:09:34 -0700 From: Matthew Auld To: intel-gfx@lists.freedesktop.org Subject: [PATCH 12/19] drm/i915/lmem: Bypass aperture when lmem is available Date: Mon, 12 Apr 2021 10:05:19 +0100 Message-Id: <20210412090526.30547-13-matthew.auld@intel.com> X-Mailer: git-send-email 2.26.3 In-Reply-To: <20210412090526.30547-1-matthew.auld@intel.com> References: <20210412090526.30547-1-matthew.auld@intel.com> MIME-Version: 1.0 X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Anusha Srivatsa , Chris P Wilson , CQ Tang , Daniele Ceraolo Spurio , dri-devel@lists.freedesktop.org, Daniel Vetter , Dhinakaran Pandiyan Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" RnJvbTogQW51c2hhIFNyaXZhdHNhIDxhbnVzaGEuc3JpdmF0c2FAaW50ZWwuY29tPgoKSW4gdGhl IHNjZW5hcmlvIHdoZXJlIGxvY2FsIG1lbW9yeSBpcyBhdmFpbGFibGUsIHdlIGhhdmUKcmVseSBv biBDUFUgYWNjZXNzIHZpYSBsbWVtIGRpcmVjdGx5IGluc3RlYWQgb2YgYXBlcnR1cmUuCgp2MjoK Z21jaCBpcyBvbmx5IHJlbGV2YW50IGZvciBtdWNoIG9sZGVyIGh3LCB0aGVyZWZvcmUgd2UgY2Fu IGRyb3AgdGhlCmhhc19hcGVydHVyZSBjaGVjayBzaW5jZSBpdCBzaG91bGQgYWx3YXlzIGJlIHBy ZXNlbnQgb24gc3VjaCBwbGF0Zm9ybXMuCihDaHJpcykKCkNjOiBWaWxsZSBTeXJqw6Rsw6QgPHZp bGxlLnN5cmphbGFAbGludXguaW50ZWwuY29tPgpDYzogRGhpbmFrYXJhbiBQYW5kaXlhbiA8ZGhp bmFrYXJhbi5wYW5kaXlhbkBpbnRlbC5jb20+CkNjOiBNYWFydGVuIExhbmtob3JzdCA8bWFhcnRl bi5sYW5raG9yc3RAbGludXguaW50ZWwuY29tPgpDYzogQ2hyaXMgUCBXaWxzb24gPGNocmlzLnAu d2lsc29uQGludGVsLmNvbT4KQ2M6IERhbmllbCBWZXR0ZXIgPGRhbmllbC52ZXR0ZXJAaW50ZWwu Y29tPgpDYzogSm9vbmFzIExhaHRpbmVuIDxqb29uYXMubGFodGluZW5AbGludXguaW50ZWwuY29t PgpDYzogRGFuaWVsZSBDZXJhb2xvIFNwdXJpbyA8ZGFuaWVsZS5jZXJhb2xvc3B1cmlvQGludGVs LmNvbT4KQ2M6IENRIFRhbmcgPGNxLnRhbmdAaW50ZWwuY29tPgpTaWduZWQtb2ZmLWJ5OiBBbnVz aGEgU3JpdmF0c2EgPGFudXNoYS5zcml2YXRzYUBpbnRlbC5jb20+Ci0tLQogZHJpdmVycy9ncHUv ZHJtL2k5MTUvZGlzcGxheS9pbnRlbF9mYmRldi5jIHwgMjIgKysrKysrKysrKysrKysrLS0tLS0t LQogZHJpdmVycy9ncHUvZHJtL2k5MTUvZ2VtL2k5MTVfZ2VtX2xtZW0uYyAgIHwgMTUgKysrKysr KysrKysrKysrCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9nZW0vaTkxNV9nZW1fbG1lbS5oICAgfCAg NSArKysrKwogZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV92bWEuYyAgICAgICAgICAgIHwgMTkg KysrKysrKysrKysrKy0tLS0tLQogNCBmaWxlcyBjaGFuZ2VkLCA0OCBpbnNlcnRpb25zKCspLCAx MyBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9kaXNwbGF5 L2ludGVsX2ZiZGV2LmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9kaXNwbGF5L2ludGVsX2ZiZGV2 LmMKaW5kZXggMmIzNzk1OWRhNzQ3Li40YWY0MDIyOWY1ZWMgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMv Z3B1L2RybS9pOTE1L2Rpc3BsYXkvaW50ZWxfZmJkZXYuYworKysgYi9kcml2ZXJzL2dwdS9kcm0v aTkxNS9kaXNwbGF5L2ludGVsX2ZiZGV2LmMKQEAgLTEzOSwxNCArMTM5LDIyIEBAIHN0YXRpYyBp bnQgaW50ZWxmYl9hbGxvYyhzdHJ1Y3QgZHJtX2ZiX2hlbHBlciAqaGVscGVyLAogCXNpemUgPSBt b2RlX2NtZC5waXRjaGVzWzBdICogbW9kZV9jbWQuaGVpZ2h0OwogCXNpemUgPSBQQUdFX0FMSUdO KHNpemUpOwogCi0JLyogSWYgdGhlIEZCIGlzIHRvbyBiaWcsIGp1c3QgZG9uJ3QgdXNlIGl0IHNp bmNlIGZiZGV2IGlzIG5vdCB2ZXJ5Ci0JICogaW1wb3J0YW50IGFuZCB3ZSBzaG91bGQgcHJvYmFi bHkgdXNlIHRoYXQgc3BhY2Ugd2l0aCBGQkMgb3Igb3RoZXIKLQkgKiBmZWF0dXJlcy4gKi8KIAlv YmogPSBFUlJfUFRSKC1FTk9ERVYpOwotCWlmIChzaXplICogMiA8IGRldl9wcml2LT5zdG9sZW5f dXNhYmxlX3NpemUpCi0JCW9iaiA9IGk5MTVfZ2VtX29iamVjdF9jcmVhdGVfc3RvbGVuKGRldl9w cml2LCBzaXplKTsKLQlpZiAoSVNfRVJSKG9iaikpCi0JCW9iaiA9IGk5MTVfZ2VtX29iamVjdF9j cmVhdGVfc2htZW0oZGV2X3ByaXYsIHNpemUpOworCWlmIChIQVNfTE1FTShkZXZfcHJpdikpIHsK KwkJb2JqID0gaTkxNV9nZW1fb2JqZWN0X2NyZWF0ZV9sbWVtKGRldl9wcml2LCBzaXplLAorCQkJ CQkJICBJOTE1X0JPX0FMTE9DX0NPTlRJR1VPVVMpOworCX0gZWxzZSB7CisJCS8qCisJCSAqIElm IHRoZSBGQiBpcyB0b28gYmlnLCBqdXN0IGRvbid0IHVzZSBpdCBzaW5jZSBmYmRldiBpcyBub3Qg dmVyeQorCQkgKiBpbXBvcnRhbnQgYW5kIHdlIHNob3VsZCBwcm9iYWJseSB1c2UgdGhhdCBzcGFj ZSB3aXRoIEZCQyBvciBvdGhlcgorCQkgKiBmZWF0dXJlcy4KKwkJICovCisJCWlmIChzaXplICog MiA8IGRldl9wcml2LT5zdG9sZW5fdXNhYmxlX3NpemUpCisJCQlvYmogPSBpOTE1X2dlbV9vYmpl Y3RfY3JlYXRlX3N0b2xlbihkZXZfcHJpdiwgc2l6ZSk7CisJCWlmIChJU19FUlIob2JqKSkKKwkJ CW9iaiA9IGk5MTVfZ2VtX29iamVjdF9jcmVhdGVfc2htZW0oZGV2X3ByaXYsIHNpemUpOworCX0K KwogCWlmIChJU19FUlIob2JqKSkgewogCQlkcm1fZXJyKCZkZXZfcHJpdi0+ZHJtLCAiZmFpbGVk IHRvIGFsbG9jYXRlIGZyYW1lYnVmZmVyXG4iKTsKIAkJcmV0dXJuIFBUUl9FUlIob2JqKTsKZGlm ZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2dlbS9pOTE1X2dlbV9sbWVtLmMgYi9kcml2 ZXJzL2dwdS9kcm0vaTkxNS9nZW0vaTkxNV9nZW1fbG1lbS5jCmluZGV4IDAxN2RiOGY3MTEzMC4u ZjQ0YmRkMDhmN2NiIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9nZW0vaTkxNV9n ZW1fbG1lbS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2dlbS9pOTE1X2dlbV9sbWVtLmMK QEAgLTE3LDYgKzE3LDIxIEBAIGNvbnN0IHN0cnVjdCBkcm1faTkxNV9nZW1fb2JqZWN0X29wcyBp OTE1X2dlbV9sbWVtX29ial9vcHMgPSB7CiAJLnJlbGVhc2UgPSBpOTE1X2dlbV9vYmplY3RfcmVs ZWFzZV9tZW1vcnlfcmVnaW9uLAogfTsKIAordm9pZCBfX2lvbWVtICoKK2k5MTVfZ2VtX29iamVj dF9sbWVtX2lvX21hcChzdHJ1Y3QgZHJtX2k5MTVfZ2VtX29iamVjdCAqb2JqLAorCQkJICAgIHVu c2lnbmVkIGxvbmcgbiwKKwkJCSAgICB1bnNpZ25lZCBsb25nIHNpemUpCit7CisJcmVzb3VyY2Vf c2l6ZV90IG9mZnNldDsKKworCUdFTV9CVUdfT04oIWk5MTVfZ2VtX29iamVjdF9pc19jb250aWd1 b3VzKG9iaikpOworCisJb2Zmc2V0ID0gaTkxNV9nZW1fb2JqZWN0X2dldF9kbWFfYWRkcmVzcyhv YmosIG4pOworCW9mZnNldCAtPSBvYmotPm1tLnJlZ2lvbi0+cmVnaW9uLnN0YXJ0OworCisJcmV0 dXJuIGlvX21hcHBpbmdfbWFwX3djKCZvYmotPm1tLnJlZ2lvbi0+aW9tYXAsIG9mZnNldCwgc2l6 ZSk7Cit9CisKIGJvb2wgaTkxNV9nZW1fb2JqZWN0X2lzX2xtZW0oc3RydWN0IGRybV9pOTE1X2dl bV9vYmplY3QgKm9iaikKIHsKIAlzdHJ1Y3QgaW50ZWxfbWVtb3J5X3JlZ2lvbiAqbXIgPSBvYmot Pm1tLnJlZ2lvbjsKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2dlbS9pOTE1X2dl bV9sbWVtLmggYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9nZW0vaTkxNV9nZW1fbG1lbS5oCmluZGV4 IDAzNmQ1M2MwMWRlOS4uZmFjNmJjNWE1ZWJiIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0v aTkxNS9nZW0vaTkxNV9nZW1fbG1lbS5oCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2dlbS9p OTE1X2dlbV9sbWVtLmgKQEAgLTE0LDYgKzE0LDExIEBAIHN0cnVjdCBpbnRlbF9tZW1vcnlfcmVn aW9uOwogCiBleHRlcm4gY29uc3Qgc3RydWN0IGRybV9pOTE1X2dlbV9vYmplY3Rfb3BzIGk5MTVf Z2VtX2xtZW1fb2JqX29wczsKIAordm9pZCBfX2lvbWVtICoKK2k5MTVfZ2VtX29iamVjdF9sbWVt X2lvX21hcChzdHJ1Y3QgZHJtX2k5MTVfZ2VtX29iamVjdCAqb2JqLAorCQkJICAgIHVuc2lnbmVk IGxvbmcgbiwKKwkJCSAgICB1bnNpZ25lZCBsb25nIHNpemUpOworCiBib29sIGk5MTVfZ2VtX29i amVjdF9pc19sbWVtKHN0cnVjdCBkcm1faTkxNV9nZW1fb2JqZWN0ICpvYmopOwogCiBzdHJ1Y3Qg ZHJtX2k5MTVfZ2VtX29iamVjdCAqCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9p OTE1X3ZtYS5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV92bWEuYwppbmRleCAwNzQ5MGRi NTFjZGMuLmUyNGQzM2FlY2FjNCAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkx NV92bWEuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X3ZtYS5jCkBAIC0yNyw2ICsy Nyw3IEBACiAKICNpbmNsdWRlICJkaXNwbGF5L2ludGVsX2Zyb250YnVmZmVyLmgiCiAKKyNpbmNs dWRlICJnZW0vaTkxNV9nZW1fbG1lbS5oIgogI2luY2x1ZGUgImd0L2ludGVsX2VuZ2luZS5oIgog I2luY2x1ZGUgImd0L2ludGVsX2VuZ2luZV9oZWFydGJlYXQuaCIKICNpbmNsdWRlICJndC9pbnRl bF9ndC5oIgpAQCAtNDQ4LDkgKzQ0OSwxMSBAQCB2b2lkIF9faW9tZW0gKmk5MTVfdm1hX3Bpbl9p b21hcChzdHJ1Y3QgaTkxNV92bWEgKnZtYSkKIAl2b2lkIF9faW9tZW0gKnB0cjsKIAlpbnQgZXJy OwogCi0JaWYgKEdFTV9XQVJOX09OKCFpOTE1X3ZtYV9pc19tYXBfYW5kX2ZlbmNlYWJsZSh2bWEp KSkgewotCQllcnIgPSAtRU5PREVWOwotCQlnb3RvIGVycjsKKwlpZiAoIWk5MTVfZ2VtX29iamVj dF9pc19sbWVtKHZtYS0+b2JqKSkgeworCQlpZiAoR0VNX1dBUk5fT04oIWk5MTVfdm1hX2lzX21h cF9hbmRfZmVuY2VhYmxlKHZtYSkpKSB7CisJCQllcnIgPSAtRU5PREVWOworCQkJZ290byBlcnI7 CisJCX0KIAl9CiAKIAlHRU1fQlVHX09OKCFpOTE1X3ZtYV9pc19nZ3R0KHZtYSkpOwpAQCAtNDU4 LDkgKzQ2MSwxMyBAQCB2b2lkIF9faW9tZW0gKmk5MTVfdm1hX3Bpbl9pb21hcChzdHJ1Y3QgaTkx NV92bWEgKnZtYSkKIAogCXB0ciA9IFJFQURfT05DRSh2bWEtPmlvbWFwKTsKIAlpZiAocHRyID09 IE5VTEwpIHsKLQkJcHRyID0gaW9fbWFwcGluZ19tYXBfd2MoJmk5MTVfdm1fdG9fZ2d0dCh2bWEt PnZtKS0+aW9tYXAsCi0JCQkJCXZtYS0+bm9kZS5zdGFydCwKLQkJCQkJdm1hLT5ub2RlLnNpemUp OworCQlpZiAoaTkxNV9nZW1fb2JqZWN0X2lzX2xtZW0odm1hLT5vYmopKQorCQkJcHRyID0gaTkx NV9nZW1fb2JqZWN0X2xtZW1faW9fbWFwKHZtYS0+b2JqLCAwLAorCQkJCQkJCSAgdm1hLT5vYmot PmJhc2Uuc2l6ZSk7CisJCWVsc2UKKwkJCXB0ciA9IGlvX21hcHBpbmdfbWFwX3djKCZpOTE1X3Zt X3RvX2dndHQodm1hLT52bSktPmlvbWFwLAorCQkJCQkJdm1hLT5ub2RlLnN0YXJ0LAorCQkJCQkJ dm1hLT5ub2RlLnNpemUpOwogCQlpZiAocHRyID09IE5VTEwpIHsKIAkJCWVyciA9IC1FTk9NRU07 CiAJCQlnb3RvIGVycjsKLS0gCjIuMjYuMwoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX18KZHJpLWRldmVsIG1haWxpbmcgbGlzdApkcmktZGV2ZWxAbGlzdHMu ZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlz dGluZm8vZHJpLWRldmVsCg==