From: Michel Thierry Subject: [PATCH 1/4] drm/i915/gtt: Allow >= 4GB offsets in X86_32 Date: Fri, 7 Aug 2015 17:40:17 +0100 Message-ID: <1438965620-3776-1-git-send-email-michel.thierry@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by gabe.freedesktop.org (Postfix) with ESMTP id 7189E6E2C4 for ; Fri, 7 Aug 2015 09:40:43 -0700 (PDT) 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: Daniel Vetter List-Id: intel-gfx@lists.freedesktop.org U2ltaWxhciB0byBjb21taXQgYzQ0ZWY2MGU0MzcwMTliOGNhMWRhYjhiNGQyZTg3NjFmZDRjZTFl OSAoImRybS9pOTE1L2d0dDoKQWxsb3cgPj0gNEdCIHNpemVzIGZvciB2bSIpLCBpOTE1X2dlbV9v Ympfb2Zmc2V0IGFuZCBpOTE1X2dlbV9vYmpfZ2d0dF9vZmZzZXQKcmV0dXJuIGFuIHVuc2lnbmVk IGxvbmcsIHdoaWNoIGluIG9ubHkgNC1ieXRlcyBsb25nIGluIDMyLWJpdCBrZXJuZWxzLgoKQ2hh bmdlIHJldHVybiB0eXBlIChhbmQgb3RoZXIgcmVsYXRlZCBvZmZzZXQgdmFyaWFibGVzKSB0byB1 NjQuCgpTaW5jZSBHbG9iYWwgR1RUIGlzIGFsd2F5cyBsaW1pdGVkIHRvIDRHQiwgdGhpcyBjaGFu Z2Ugd291bGQgbm90IGJlIHJlcXVpcmVkCmluIGk5MTVfZ2VtX29ial9nZ3R0X29mZnNldCwgYnV0 IHRoaXMgaXMgZG9uZSBmb3IgY29uc2lzdGVuY3kuCgp2MjogUmVtb3ZlIHVubmVjZXNzYXJ5IG9m ZnNldCB2YXJpYWJsZSBpbiBkb19waW4sIGFzIHdlIGFscmVhZHkgaGF2ZQogICAgdm1hLT5ub2Rl LnN0YXJ0IChDaHJpcykuCiAgICBVcGRhdGUgR0dUVCBvZmZzZXQgdG9vIChUdnJ0a28pLgoKQ2M6 IENocmlzIFdpbHNvbiA8Y2hyaXNAY2hyaXMtd2lsc29uLmNvLnVrPgpDYzogRGFuaWVsIFZldHRl ciA8ZGFuaWVsLnZldHRlckBmZndsbC5jaD4KQ2M6IFR2cnRrbyBVcnN1bGluIDx0dnJ0a28udXJz dWxpbkBsaW51eC5pbnRlbC5jb20+ClNpZ25lZC1vZmYtYnk6IE1pY2hlbCBUaGllcnJ5IDxtaWNo ZWwudGhpZXJyeUBpbnRlbC5jb20+Ci0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYu aCAgICAgICB8IDEyICsrKysrLS0tLS0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW0u YyAgICAgICB8IDE4ICsrKysrKystLS0tLS0tLS0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkx NV9nZW1fZmVuY2UuYyB8ICA0ICsrLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2d0 dC5jICAgfCAgOCArKysrLS0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fZ3R0Lmgg ICB8ICAyICstCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9mYmRldi5jICAgIHwgIDIgKy0K IDYgZmlsZXMgY2hhbmdlZCwgMjAgaW5zZXJ0aW9ucygrKSwgMjYgZGVsZXRpb25zKC0pCgpkaWZm IC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuaCBiL2RyaXZlcnMvZ3B1L2Ry bS9pOTE1L2k5MTVfZHJ2LmgKaW5kZXggYmZkNjI5MS4uNDc2OGE5MyAxMDA2NDQKLS0tIGEvZHJp dmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuaAorKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9p OTE1X2Rydi5oCkBAIC0yOTY4LDEzICsyOTY4LDExIEBAIHN0cnVjdCBkcm1fZ2VtX29iamVjdCAq aTkxNV9nZW1fcHJpbWVfaW1wb3J0KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsCiBzdHJ1Y3QgZG1h X2J1ZiAqaTkxNV9nZW1fcHJpbWVfZXhwb3J0KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsCiAJCQkJ c3RydWN0IGRybV9nZW1fb2JqZWN0ICpnZW1fb2JqLCBpbnQgZmxhZ3MpOwogCi11bnNpZ25lZCBs b25nCi1pOTE1X2dlbV9vYmpfZ2d0dF9vZmZzZXRfdmlldyhzdHJ1Y3QgZHJtX2k5MTVfZ2VtX29i amVjdCAqbywKLQkJCSAgICAgIGNvbnN0IHN0cnVjdCBpOTE1X2dndHRfdmlldyAqdmlldyk7Ci11 bnNpZ25lZCBsb25nCi1pOTE1X2dlbV9vYmpfb2Zmc2V0KHN0cnVjdCBkcm1faTkxNV9nZW1fb2Jq ZWN0ICpvLAotCQkgICAgc3RydWN0IGk5MTVfYWRkcmVzc19zcGFjZSAqdm0pOwotc3RhdGljIGlu bGluZSB1bnNpZ25lZCBsb25nCit1NjQgaTkxNV9nZW1fb2JqX2dndHRfb2Zmc2V0X3ZpZXcoc3Ry dWN0IGRybV9pOTE1X2dlbV9vYmplY3QgKm8sCisJCQkJICBjb25zdCBzdHJ1Y3QgaTkxNV9nZ3R0 X3ZpZXcgKnZpZXcpOwordTY0IGk5MTVfZ2VtX29ial9vZmZzZXQoc3RydWN0IGRybV9pOTE1X2dl bV9vYmplY3QgKm8sCisJCQlzdHJ1Y3QgaTkxNV9hZGRyZXNzX3NwYWNlICp2bSk7CitzdGF0aWMg aW5saW5lIHU2NAogaTkxNV9nZW1fb2JqX2dndHRfb2Zmc2V0KHN0cnVjdCBkcm1faTkxNV9nZW1f b2JqZWN0ICpvKQogewogCXJldHVybiBpOTE1X2dlbV9vYmpfZ2d0dF9vZmZzZXRfdmlldyhvLCAm aTkxNV9nZ3R0X3ZpZXdfbm9ybWFsKTsKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1 L2k5MTVfZ2VtLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbS5jCmluZGV4IGE4NjIy N2UuLmI5ZGRlN2EgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtLmMK KysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW0uYwpAQCAtNDIyNSwxNSArNDIyNSwx MyBAQCBpOTE1X2dlbV9vYmplY3RfZG9fcGluKHN0cnVjdCBkcm1faTkxNV9nZW1fb2JqZWN0ICpv YmosCiAJCQlyZXR1cm4gLUVCVVNZOwogCiAJCWlmIChpOTE1X3ZtYV9taXNwbGFjZWQodm1hLCBh bGlnbm1lbnQsIGZsYWdzKSkgewotCQkJdW5zaWduZWQgbG9uZyBvZmZzZXQ7Ci0JCQlvZmZzZXQg PSBnZ3R0X3ZpZXcgPyBpOTE1X2dlbV9vYmpfZ2d0dF9vZmZzZXRfdmlldyhvYmosIGdndHRfdmll dykgOgotCQkJCQkgICAgIGk5MTVfZ2VtX29ial9vZmZzZXQob2JqLCB2bSk7CiAJCQlXQVJOKHZt YS0+cGluX2NvdW50LAogCQkJICAgICAiYm8gaXMgYWxyZWFkeSBwaW5uZWQgaW4gJXMgd2l0aCBp bmNvcnJlY3QgYWxpZ25tZW50OiIKLQkJCSAgICAgIiBvZmZzZXQ9JWx4LCByZXEuYWxpZ25tZW50 PSV4LCByZXEubWFwX2FuZF9mZW5jZWFibGU9JWQsIgorCQkJICAgICAiIG9mZnNldD0lMDh4ICUw OHgsIHJlcS5hbGlnbm1lbnQ9JXgsIHJlcS5tYXBfYW5kX2ZlbmNlYWJsZT0lZCwiCiAJCQkgICAg ICIgb2JqLT5tYXBfYW5kX2ZlbmNlYWJsZT0lZFxuIiwKIAkJCSAgICAgZ2d0dF92aWV3ID8gImdn dHQiIDogInBwZ3R0IiwKLQkJCSAgICAgb2Zmc2V0LAorCQkJICAgICB1cHBlcl8zMl9iaXRzKHZt YS0+bm9kZS5zdGFydCksCisJCQkgICAgIGxvd2VyXzMyX2JpdHModm1hLT5ub2RlLnN0YXJ0KSwK IAkJCSAgICAgYWxpZ25tZW50LAogCQkJICAgICAhIShmbGFncyAmIFBJTl9NQVBQQUJMRSksCiAJ CQkgICAgIG9iai0+bWFwX2FuZF9mZW5jZWFibGUpOwpAQCAtNTE4OCw5ICs1MTg2LDggQEAgdm9p ZCBpOTE1X2dlbV90cmFja19mYihzdHJ1Y3QgZHJtX2k5MTVfZ2VtX29iamVjdCAqb2xkLAogfQog CiAvKiBBbGwgdGhlIG5ldyBWTSBzdHVmZiAqLwotdW5zaWduZWQgbG9uZwotaTkxNV9nZW1fb2Jq X29mZnNldChzdHJ1Y3QgZHJtX2k5MTVfZ2VtX29iamVjdCAqbywKLQkJICAgIHN0cnVjdCBpOTE1 X2FkZHJlc3Nfc3BhY2UgKnZtKQordTY0IGk5MTVfZ2VtX29ial9vZmZzZXQoc3RydWN0IGRybV9p OTE1X2dlbV9vYmplY3QgKm8sCisJCQlzdHJ1Y3QgaTkxNV9hZGRyZXNzX3NwYWNlICp2bSkKIHsK IAlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSBvLT5iYXNlLmRldi0+ZGV2X3By aXZhdGU7CiAJc3RydWN0IGk5MTVfdm1hICp2bWE7CkBAIC01MjEwLDkgKzUyMDcsOCBAQCBpOTE1 X2dlbV9vYmpfb2Zmc2V0KHN0cnVjdCBkcm1faTkxNV9nZW1fb2JqZWN0ICpvLAogCXJldHVybiAt MTsKIH0KIAotdW5zaWduZWQgbG9uZwotaTkxNV9nZW1fb2JqX2dndHRfb2Zmc2V0X3ZpZXcoc3Ry dWN0IGRybV9pOTE1X2dlbV9vYmplY3QgKm8sCi0JCQkgICAgICBjb25zdCBzdHJ1Y3QgaTkxNV9n Z3R0X3ZpZXcgKnZpZXcpCit1NjQgaTkxNV9nZW1fb2JqX2dndHRfb2Zmc2V0X3ZpZXcoc3RydWN0 IGRybV9pOTE1X2dlbV9vYmplY3QgKm8sCisJCQkJICBjb25zdCBzdHJ1Y3QgaTkxNV9nZ3R0X3Zp ZXcgKnZpZXcpCiB7CiAJc3RydWN0IGk5MTVfYWRkcmVzc19zcGFjZSAqZ2d0dCA9IGk5MTVfb2Jq X3RvX2dndHQobyk7CiAJc3RydWN0IGk5MTVfdm1hICp2bWE7CmRpZmYgLS1naXQgYS9kcml2ZXJz L2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9mZW5jZS5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkx NV9nZW1fZmVuY2UuYwppbmRleCBhZjFmOGM0Li42MDc3ZGZmIDEwMDY0NAotLS0gYS9kcml2ZXJz L2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9mZW5jZS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1 L2k5MTVfZ2VtX2ZlbmNlLmMKQEAgLTEyOCw3ICsxMjgsNyBAQCBzdGF0aWMgdm9pZCBpOTE1X3dy aXRlX2ZlbmNlX3JlZyhzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LCBpbnQgcmVnLAogCQlXQVJOKChp OTE1X2dlbV9vYmpfZ2d0dF9vZmZzZXQob2JqKSAmIH5JOTE1X0ZFTkNFX1NUQVJUX01BU0spIHx8 CiAJCSAgICAgKHNpemUgJiAtc2l6ZSkgIT0gc2l6ZSB8fAogCQkgICAgIChpOTE1X2dlbV9vYmpf Z2d0dF9vZmZzZXQob2JqKSAmIChzaXplIC0gMSkpLAotCQkgICAgICJvYmplY3QgMHglMDhseCBb ZmVuY2VhYmxlPyAlZF0gbm90IDFNIG9yIHBvdC1zaXplICgweCUwOHgpIGFsaWduZWRcbiIsCisJ CSAgICAgIm9iamVjdCAweCUwOGxseCBbZmVuY2VhYmxlPyAlZF0gbm90IDFNIG9yIHBvdC1zaXpl ICgweCUwOHgpIGFsaWduZWRcbiIsCiAJCSAgICAgaTkxNV9nZW1fb2JqX2dndHRfb2Zmc2V0KG9i aiksIG9iai0+bWFwX2FuZF9mZW5jZWFibGUsIHNpemUpOwogCiAJCWlmIChvYmotPnRpbGluZ19t b2RlID09IEk5MTVfVElMSU5HX1kgJiYgSEFTXzEyOF9CWVRFX1lfVElMSU5HKGRldikpCkBAIC0x NzEsNyArMTcxLDcgQEAgc3RhdGljIHZvaWQgaTgzMF93cml0ZV9mZW5jZV9yZWcoc3RydWN0IGRy bV9kZXZpY2UgKmRldiwgaW50IHJlZywKIAkJV0FSTigoaTkxNV9nZW1fb2JqX2dndHRfb2Zmc2V0 KG9iaikgJiB+STgzMF9GRU5DRV9TVEFSVF9NQVNLKSB8fAogCQkgICAgIChzaXplICYgLXNpemUp ICE9IHNpemUgfHwKIAkJICAgICAoaTkxNV9nZW1fb2JqX2dndHRfb2Zmc2V0KG9iaikgJiAoc2l6 ZSAtIDEpKSwKLQkJICAgICAib2JqZWN0IDB4JTA4bHggbm90IDUxMksgb3IgcG90LXNpemUgMHgl MDh4IGFsaWduZWRcbiIsCisJCSAgICAgIm9iamVjdCAweCUwOGxseCBub3QgNTEySyBvciBwb3Qt c2l6ZSAweCUwOHggYWxpZ25lZFxuIiwKIAkJICAgICBpOTE1X2dlbV9vYmpfZ2d0dF9vZmZzZXQo b2JqKSwgc2l6ZSk7CiAKIAkJcGl0Y2hfdmFsID0gb2JqLT5zdHJpZGUgLyAxMjg7CmRpZmYgLS1n aXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9ndHQuYyBiL2RyaXZlcnMvZ3B1L2Ry bS9pOTE1L2k5MTVfZ2VtX2d0dC5jCmluZGV4IGE3ZGJjMjAuLmRlZTNiMzkgMTAwNjQ0Ci0tLSBh L2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2d0dC5jCisrKyBiL2RyaXZlcnMvZ3B1L2Ry bS9pOTE1L2k5MTVfZ2VtX2d0dC5jCkBAIC0yNTU4LDkgKzI1NTgsOSBAQCBzdGF0aWMgdm9pZCBp OTE1X2d0dF9jb2xvcl9hZGp1c3Qoc3RydWN0IGRybV9tbV9ub2RlICpub2RlLAogfQogCiBzdGF0 aWMgaW50IGk5MTVfZ2VtX3NldHVwX2dsb2JhbF9ndHQoc3RydWN0IGRybV9kZXZpY2UgKmRldiwK LQkJCQkgICAgIHVuc2lnbmVkIGxvbmcgc3RhcnQsCi0JCQkJICAgICB1bnNpZ25lZCBsb25nIG1h cHBhYmxlX2VuZCwKLQkJCQkgICAgIHVuc2lnbmVkIGxvbmcgZW5kKQorCQkJCSAgICAgdTY0IHN0 YXJ0LAorCQkJCSAgICAgdTY0IG1hcHBhYmxlX2VuZCwKKwkJCQkgICAgIHU2NCBlbmQpCiB7CiAJ LyogTGV0IEdFTSBNYW5hZ2UgYWxsIG9mIHRoZSBhcGVydHVyZS4KIAkgKgpAQCAtMjU5OSw3ICsy NTk5LDcgQEAgc3RhdGljIGludCBpOTE1X2dlbV9zZXR1cF9nbG9iYWxfZ3R0KHN0cnVjdCBkcm1f ZGV2aWNlICpkZXYsCiAJbGlzdF9mb3JfZWFjaF9lbnRyeShvYmosICZkZXZfcHJpdi0+bW0uYm91 bmRfbGlzdCwgZ2xvYmFsX2xpc3QpIHsKIAkJc3RydWN0IGk5MTVfdm1hICp2bWEgPSBpOTE1X2dl bV9vYmpfdG9fdm1hKG9iaiwgZ2d0dF92bSk7CiAKLQkJRFJNX0RFQlVHX0tNUygicmVzZXJ2aW5n IHByZWFsbG9jYXRlZCBzcGFjZTogJWx4ICsgJXp4XG4iLAorCQlEUk1fREVCVUdfS01TKCJyZXNl cnZpbmcgcHJlYWxsb2NhdGVkIHNwYWNlOiAlbGx4ICsgJXp4XG4iLAogCQkJICAgICAgaTkxNV9n ZW1fb2JqX2dndHRfb2Zmc2V0KG9iaiksIG9iai0+YmFzZS5zaXplKTsKIAogCQlXQVJOX09OKGk5 MTVfZ2VtX29ial9nZ3R0X2JvdW5kKG9iaikpOwpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJt L2k5MTUvaTkxNV9nZW1fZ3R0LmggYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9ndHQu aAppbmRleCA4NDEyYjE1Li5iNmM5OTkwIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkx NS9pOTE1X2dlbV9ndHQuaAorKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9ndHQu aApAQCAtMTQ5LDcgKzE0OSw3IEBAIHN0cnVjdCBpOTE1X2dndHRfdmlldyB7CiAKIAl1bmlvbiB7 CiAJCXN0cnVjdCB7Ci0JCQl1bnNpZ25lZCBsb25nIG9mZnNldDsKKwkJCXU2NCBvZmZzZXQ7CiAJ CQl1bnNpZ25lZCBpbnQgc2l6ZTsKIAkJfSBwYXJ0aWFsOwogCX0gcGFyYW1zOwpkaWZmIC0tZ2l0 IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZmJkZXYuYyBiL2RyaXZlcnMvZ3B1L2RybS9p OTE1L2ludGVsX2ZiZGV2LmMKaW5kZXggOGM2YTZmYS4uOTY0NzZkNyAxMDA2NDQKLS0tIGEvZHJp dmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZmJkZXYuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkx NS9pbnRlbF9mYmRldi5jCkBAIC0yNjMsNyArMjYzLDcgQEAgc3RhdGljIGludCBpbnRlbGZiX2Ny ZWF0ZShzdHJ1Y3QgZHJtX2ZiX2hlbHBlciAqaGVscGVyLAogCiAJLyogVXNlIGRlZmF1bHQgc2Ny YXRjaCBwaXhtYXAgKGluZm8tPnBpeG1hcC5mbGFncyA9IEZCX1BJWE1BUF9TWVNURU0pICovCiAK LQlEUk1fREVCVUdfS01TKCJhbGxvY2F0ZWQgJWR4JWQgZmI6IDB4JTA4bHgsIGJvICVwXG4iLAor CURSTV9ERUJVR19LTVMoImFsbG9jYXRlZCAlZHglZCBmYjogMHglMDhsbHgsIGJvICVwXG4iLAog CQkgICAgICBmYi0+d2lkdGgsIGZiLT5oZWlnaHQsCiAJCSAgICAgIGk5MTVfZ2VtX29ial9nZ3R0 X29mZnNldChvYmopLCBvYmopOwogCi0tIAoyLjUuMAoKX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhA bGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHA6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1h bi9saXN0aW5mby9pbnRlbC1nZngK