From mboxrd@z Thu Jan 1 00:00:00 1970 From: Matthew Auld Subject: [RFC PATCH 23/42] drm/i915: do not map aperture if it is not available. Date: Thu, 14 Feb 2019 14:57:21 +0000 Message-ID: <20190214145740.14521-24-matthew.auld@intel.com> References: <20190214145740.14521-1-matthew.auld@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) by gabe.freedesktop.org (Postfix) with ESMTPS id 136776E924 for ; Thu, 14 Feb 2019 14:58:12 +0000 (UTC) In-Reply-To: <20190214145740.14521-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 RnJvbTogRGFuaWVsZSBDZXJhb2xvIFNwdXJpbyA8ZGFuaWVsZS5jZXJhb2xvc3B1cmlvQGludGVs LmNvbT4KClNraXAgYm90aCBzZXR1cCBhbmQgY2xlYW51cCBvZiB0aGUgYXBlcnR1cmUgbWFwcGlu ZyBpZiB0aGUgSFcgZG9lc24ndApoYXZlIGFuIGFwZXJ0dXJlIGJhci4KClNpZ25lZC1vZmYtYnk6 IERhbmllbGUgQ2VyYW9sbyBTcHVyaW8gPGRhbmllbGUuY2VyYW9sb3NwdXJpb0BpbnRlbC5jb20+ CkNjOiBNYXR0aGV3IEF1bGQgPG1hdHRoZXcuYXVsZEBpbnRlbC5jb20+Ci0tLQogZHJpdmVycy9n cHUvZHJtL2k5MTUvaTkxNV9nZW1fZ3R0LmMgfCAzNCArKysrKysrKysrKysrKysrKystLS0tLS0t LS0tLQogMSBmaWxlIGNoYW5nZWQsIDIxIGluc2VydGlvbnMoKyksIDEzIGRlbGV0aW9ucygtKQoK ZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2d0dC5jIGIvZHJpdmVy cy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fZ3R0LmMKaW5kZXggZGU2N2EyZjFjY2ZlLi4zNzMyZjIx MTQ4ZDMgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2d0dC5jCisr KyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2d0dC5jCkBAIC0yODMxLDggKzI4MzEs MTAgQEAgdm9pZCBpOTE1X2dndHRfY2xlYW51cF9odyhzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAq ZGV2X3ByaXYpCiAKIAltdXRleF91bmxvY2soJmRldl9wcml2LT5kcm0uc3RydWN0X211dGV4KTsK IAotCWFyY2hfcGh5c193Y19kZWwoZ2d0dC0+bXRycik7Ci0JaW9fbWFwcGluZ19maW5pKCZnZ3R0 LT5pb21hcCk7CisJaWYgKEhBU19NQVBQQUJMRV9BUEVSVFVSRShkZXZfcHJpdikpIHsKKwkJYXJj aF9waHlzX3djX2RlbChnZ3R0LT5tdHJyKTsKKwkJaW9fbWFwcGluZ19maW5pKCZnZ3R0LT5pb21h cCk7CisJfQogCiAJaTkxNV9nZW1fY2xlYW51cF9zdG9sZW4oZGV2X3ByaXYpOwogfQpAQCAtMzIx NCwxMCArMzIxNiwxMyBAQCBzdGF0aWMgaW50IGdlbjhfZ21jaF9wcm9iZShzdHJ1Y3QgaTkxNV9n Z3R0ICpnZ3R0KQogCWludCBlcnI7CiAKIAkvKiBUT0RPOiBXZSdyZSBub3QgYXdhcmUgb2YgbWFw cGFibGUgY29uc3RyYWludHMgb24gZ2VuOCB5ZXQgKi8KLQlnZ3R0LT5nbWFkciA9Ci0JCShzdHJ1 Y3QgcmVzb3VyY2UpIERFRklORV9SRVNfTUVNKHBjaV9yZXNvdXJjZV9zdGFydChwZGV2LCAyKSwK LQkJCQkJCSBwY2lfcmVzb3VyY2VfbGVuKHBkZXYsIDIpKTsKLQlnZ3R0LT5tYXBwYWJsZV9lbmQg PSByZXNvdXJjZV9zaXplKCZnZ3R0LT5nbWFkcik7CisJLyogRklYTUU6IFdlIHByb2JhYmx5IG5l ZWQgdG8gYWRkIGRvIGRldmljZV9pbmZvIG9yIHJ1bnRpbWVfaW5mbyAqLworCWlmICghSEFTX0xN RU0oZGV2X3ByaXYpKSB7CisJCWdndHQtPmdtYWRyID0KKwkJCShzdHJ1Y3QgcmVzb3VyY2UpIERF RklORV9SRVNfTUVNKHBjaV9yZXNvdXJjZV9zdGFydChwZGV2LCAyKSwKKwkJCQkJCQkgcGNpX3Jl c291cmNlX2xlbihwZGV2LCAyKSk7CisJCWdndHQtPm1hcHBhYmxlX2VuZCA9IHJlc291cmNlX3Np emUoJmdndHQtPmdtYWRyKTsKKwl9CiAKIAllcnIgPSBwY2lfc2V0X2RtYV9tYXNrKHBkZXYsIERN QV9CSVRfTUFTSygzOSkpOwogCWlmICghZXJyKQpAQCAtMzQ1NCwxNCArMzQ1OSwxNyBAQCBpbnQg aTkxNV9nZ3R0X2luaXRfaHcoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KQogCQln Z3R0LT52bS5tbS5jb2xvcl9hZGp1c3QgPSBpOTE1X2d0dF9jb2xvcl9hZGp1c3Q7CiAJbXV0ZXhf dW5sb2NrKCZkZXZfcHJpdi0+ZHJtLnN0cnVjdF9tdXRleCk7CiAKLQlpZiAoIWlvX21hcHBpbmdf aW5pdF93YygmZGV2X3ByaXYtPmdndHQuaW9tYXAsCi0JCQkJZGV2X3ByaXYtPmdndHQuZ21hZHIu c3RhcnQsCi0JCQkJZGV2X3ByaXYtPmdndHQubWFwcGFibGVfZW5kKSkgewotCQlyZXQgPSAtRUlP OwotCQlnb3RvIG91dF9ndHRfY2xlYW51cDsKLQl9CisJaWYgKEhBU19NQVBQQUJMRV9BUEVSVFVS RShkZXZfcHJpdikpIHsKKwkJaWYgKCFpb19tYXBwaW5nX2luaXRfd2MoJmRldl9wcml2LT5nZ3R0 LmlvbWFwLAorCQkJCQlkZXZfcHJpdi0+Z2d0dC5nbWFkci5zdGFydCwKKwkJCQkJZGV2X3ByaXYt PmdndHQubWFwcGFibGVfZW5kKSkgeworCQkJcmV0ID0gLUVJTzsKKwkJCWdvdG8gb3V0X2d0dF9j bGVhbnVwOworCQl9CiAKLQlnZ3R0LT5tdHJyID0gYXJjaF9waHlzX3djX2FkZChnZ3R0LT5nbWFk ci5zdGFydCwgZ2d0dC0+bWFwcGFibGVfZW5kKTsKKwkJZ2d0dC0+bXRyciA9IGFyY2hfcGh5c193 Y19hZGQoZ2d0dC0+Z21hZHIuc3RhcnQsCisJCQkJCSAgICAgIGdndHQtPm1hcHBhYmxlX2VuZCk7 CisJfQogCiAJLyoKIAkgKiBJbml0aWFsaXNlIHN0b2xlbiBlYXJseSBzbyB0aGF0IHdlIG1heSBy ZXNlcnZlIHByZWFsbG9jYXRlZAotLSAKMi4yMC4xCgpfX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBs aXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1h bi9saXN0aW5mby9pbnRlbC1nZng=