From: Joonas Lahtinen Subject: [PATCH] drm/i915: Introduce HAS_64BIT_RELOC Date: Wed, 2 Nov 2016 14:32:54 +0200 Message-ID: <1478089974-16711-1-git-send-email-joonas.lahtinen@linux.intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) by gabe.freedesktop.org (Postfix) with ESMTPS id C557C6E544 for ; Wed, 2 Nov 2016 12:33:00 +0000 (UTC) List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" To: Intel graphics driver community testing & development List-Id: intel-gfx@lists.freedesktop.org VW5pZnkge3VzZSxoYXN9XzY0Yml0X3JlbG9jIGludG8gZGV2X3ByaXYtPmluZm8uCgpDYzogQ2hy aXMgV2lsc29uIDxjaHJpc0BjaHJpcy13aWxzb24uY28udWs+ClNpZ25lZC1vZmYtYnk6IEpvb25h cyBMYWh0aW5lbiA8am9vbmFzLmxhaHRpbmVuQGxpbnV4LmludGVsLmNvbT4KLS0tCiBkcml2ZXJz L2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5oICAgICAgICAgICAgICB8IDMgKysrCiBkcml2ZXJzL2dw dS9kcm0vaTkxNS9pOTE1X2dlbV9leGVjYnVmZmVyLmMgICB8IDggKysrLS0tLS0KIGRyaXZlcnMv Z3B1L2RybS9pOTE1L2k5MTVfZ2VtX3JlbmRlcl9zdGF0ZS5jIHwgMyArLS0KIGRyaXZlcnMvZ3B1 L2RybS9pOTE1L2k5MTVfcGNpLmMgICAgICAgICAgICAgIHwgMyArKy0KIDQgZmlsZXMgY2hhbmdl ZCwgOSBpbnNlcnRpb25zKCspLCA4IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMv Z3B1L2RybS9pOTE1L2k5MTVfZHJ2LmggYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5o CmluZGV4IGVhYTAxZGEuLmFlMDIxN2QgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1 L2k5MTVfZHJ2LmgKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuaApAQCAtNjcw LDYgKzY3MCw3IEBAIHN0cnVjdCBpbnRlbF9jc3IgewogCWZ1bmMoaXNfa2FieWxha2UpOyBcCiAJ ZnVuYyhpc19wcmVsaW1pbmFyeSk7IFwKIAkvKiBLZWVwIGhhc18qIGluIGFscGhhYmV0aWNhbCBv cmRlciAqLyBcCisJZnVuYyhoYXNfNjRiaXRfcmVsb2MpOyBcCiAJZnVuYyhoYXNfY3NyKTsgXAog CWZ1bmMoaGFzX2RkaSk7IFwKIAlmdW5jKGhhc19kcF9tc3QpOyBcCkBAIC0yOTE3LDYgKzI5MTgs OCBAQCBzdHJ1Y3QgZHJtX2k5MTVfY21kX3RhYmxlIHsKICNkZWZpbmUgSEFTX0NTUihkZXYpCShJ TlRFTF9JTkZPKGRldiktPmhhc19jc3IpCiAKICNkZWZpbmUgSEFTX1JVTlRJTUVfUE0oZGV2X3By aXYpICgoZGV2X3ByaXYpLT5pbmZvLmhhc19ydW50aW1lX3BtKQorI2RlZmluZSBIQVNfNjRCSVRf UkVMT0MoZGV2X3ByaXYpICgoZGV2X3ByaXYpLT5pbmZvLmhhc182NGJpdF9yZWxvYykKKwogLyoK ICAqIEZvciBub3csIGFueXRoaW5nIHdpdGggYSBHdUMgcmVxdWlyZXMgdUNvZGUgbG9hZGluZywg YW5kIHRoZW4gc3VwcG9ydHMKICAqIGNvbW1hbmQgc3VibWlzc2lvbiBvbmNlIGxvYWRlZC4gQnV0 IHRoZXNlIGFyZSBsb2dpY2FsbHkgaW5kZXBlbmRlbnQKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1 L2RybS9pOTE1L2k5MTVfZ2VtX2V4ZWNidWZmZXIuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5 MTVfZ2VtX2V4ZWNidWZmZXIuYwppbmRleCBjMzVlODQ3Li4zZTczZjc3IDEwMDY0NAotLS0gYS9k cml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9leGVjYnVmZmVyLmMKKysrIGIvZHJpdmVycy9n cHUvZHJtL2k5MTUvaTkxNV9nZW1fZXhlY2J1ZmZlci5jCkBAIC0zMjIsNyArMzIyLDYgQEAgc3Ry dWN0IHJlbG9jX2NhY2hlIHsKIAlzdHJ1Y3QgZHJtX21tX25vZGUgbm9kZTsKIAl1bnNpZ25lZCBs b25nIHZhZGRyOwogCXVuc2lnbmVkIGludCBwYWdlOwotCWJvb2wgdXNlXzY0Yml0X3JlbG9jOwog fTsKIAogc3RhdGljIHZvaWQgcmVsb2NfY2FjaGVfaW5pdChzdHJ1Y3QgcmVsb2NfY2FjaGUgKmNh Y2hlLApAQCAtMzMxLDcgKzMzMCw2IEBAIHN0YXRpYyB2b2lkIHJlbG9jX2NhY2hlX2luaXQoc3Ry dWN0IHJlbG9jX2NhY2hlICpjYWNoZSwKIAljYWNoZS0+cGFnZSA9IC0xOwogCWNhY2hlLT52YWRk ciA9IDA7CiAJY2FjaGUtPmk5MTUgPSBpOTE1OwotCWNhY2hlLT51c2VfNjRiaXRfcmVsb2MgPSBJ TlRFTF9HRU4oY2FjaGUtPmk5MTUpID49IDg7CiAJY2FjaGUtPm5vZGUuYWxsb2NhdGVkID0gZmFs c2U7CiB9CiAKQEAgLTUxOSw3ICs1MTcsNyBAQCByZWxvY2F0ZV9lbnRyeShzdHJ1Y3QgZHJtX2k5 MTVfZ2VtX29iamVjdCAqb2JqLAogCSAgICAgICB1NjQgdGFyZ2V0X29mZnNldCkKIHsKIAl1NjQg b2Zmc2V0ID0gcmVsb2MtPm9mZnNldDsKLQlib29sIHdpZGUgPSBjYWNoZS0+dXNlXzY0Yml0X3Jl bG9jOworCWJvb2wgd2lkZSA9IEhBU182NEJJVF9SRUxPQyhjYWNoZS0+aTkxNSk7CiAJdm9pZCAq dmFkZHI7CiAKIAl0YXJnZXRfb2Zmc2V0ID0gcmVsb2NhdGlvbl90YXJnZXQocmVsb2MsIHRhcmdl dF9vZmZzZXQpOwpAQCAtNTUyLDYgKzU1MCw3IEBAIGk5MTVfZ2VtX2V4ZWNidWZmZXJfcmVsb2Nh dGVfZW50cnkoc3RydWN0IGRybV9pOTE1X2dlbV9vYmplY3QgKm9iaiwKIAlzdHJ1Y3QgZHJtX2dl bV9vYmplY3QgKnRhcmdldF9vYmo7CiAJc3RydWN0IGRybV9pOTE1X2dlbV9vYmplY3QgKnRhcmdl dF9pOTE1X29iajsKIAlzdHJ1Y3QgaTkxNV92bWEgKnRhcmdldF92bWE7CisJY29uc3Qgc2l6ZV90 IHJlbG9jX3cgPSBIQVNfNjRCSVRfUkVMT0MoZGV2X3ByaXYpID8gOCA6IDQ7CiAJdWludDY0X3Qg dGFyZ2V0X29mZnNldDsKIAlpbnQgcmV0OwogCkBAIC02MDgsOCArNjA3LDcgQEAgaTkxNV9nZW1f ZXhlY2J1ZmZlcl9yZWxvY2F0ZV9lbnRyeShzdHJ1Y3QgZHJtX2k5MTVfZ2VtX29iamVjdCAqb2Jq LAogCQlyZXR1cm4gMDsKIAogCS8qIENoZWNrIHRoYXQgdGhlIHJlbG9jYXRpb24gYWRkcmVzcyBp cyB2YWxpZC4uLiAqLwotCWlmICh1bmxpa2VseShyZWxvYy0+b2Zmc2V0ID4KLQkJICAgICBvYmot PmJhc2Uuc2l6ZSAtIChjYWNoZS0+dXNlXzY0Yml0X3JlbG9jID8gOCA6IDQpKSkgeworCWlmICh1 bmxpa2VseShyZWxvYy0+b2Zmc2V0ID4gb2JqLT5iYXNlLnNpemUgLSByZWxvY193KSkgewogCQlE Uk1fREVCVUcoIlJlbG9jYXRpb24gYmV5b25kIG9iamVjdCBib3VuZHM6ICIKIAkJCSAgIm9iaiAl cCB0YXJnZXQgJWQgb2Zmc2V0ICVkIHNpemUgJWQuXG4iLAogCQkJICBvYmosIHJlbG9jLT50YXJn ZXRfaGFuZGxlLApkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fcmVu ZGVyX3N0YXRlLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9yZW5kZXJfc3RhdGUu YwppbmRleCA1NzkxOGYyLi41YWYxOWIwIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkx NS9pOTE1X2dlbV9yZW5kZXJfc3RhdGUuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1 X2dlbV9yZW5kZXJfc3RhdGUuYwpAQCAtNzQsNyArNzQsNiBAQCBzdGF0aWMgaW50IHJlbmRlcl9z dGF0ZV9zZXR1cChzdHJ1Y3QgaW50ZWxfcmVuZGVyX3N0YXRlICpzbywKIAkJCSAgICAgIHN0cnVj dCBkcm1faTkxNV9wcml2YXRlICppOTE1KQogewogCWNvbnN0IHN0cnVjdCBpbnRlbF9yZW5kZXJz dGF0ZV9yb2RhdGEgKnJvZGF0YSA9IHNvLT5yb2RhdGE7Ci0JY29uc3QgYm9vbCBoYXNfNjRiaXRf cmVsb2MgPSBJTlRFTF9HRU4oaTkxNSkgPj0gODsKIAlzdHJ1Y3QgZHJtX2k5MTVfZ2VtX29iamVj dCAqb2JqID0gc28tPnZtYS0+b2JqOwogCXVuc2lnbmVkIGludCBpID0gMCwgcmVsb2NfaW5kZXgg PSAwOwogCXVuc2lnbmVkIGludCBuZWVkc19jbGZsdXNoOwpAQCAtOTMsNyArOTIsNyBAQCBzdGF0 aWMgaW50IHJlbmRlcl9zdGF0ZV9zZXR1cChzdHJ1Y3QgaW50ZWxfcmVuZGVyX3N0YXRlICpzbywK IAkJaWYgKGkgKiA0ICA9PSByb2RhdGEtPnJlbG9jW3JlbG9jX2luZGV4XSkgewogCQkJdTY0IHIg PSBzICsgc28tPnZtYS0+bm9kZS5zdGFydDsKIAkJCXMgPSBsb3dlcl8zMl9iaXRzKHIpOwotCQkJ aWYgKGhhc182NGJpdF9yZWxvYykgeworCQkJaWYgKEhBU182NEJJVF9SRUxPQyhpOTE1KSkgewog CQkJCWlmIChpICsgMSA+PSByb2RhdGEtPmJhdGNoX2l0ZW1zIHx8CiAJCQkJICAgIHJvZGF0YS0+ YmF0Y2hbaSArIDFdICE9IDApCiAJCQkJCWdvdG8gZXJyOwpkaWZmIC0tZ2l0IGEvZHJpdmVycy9n cHUvZHJtL2k5MTUvaTkxNV9wY2kuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfcGNpLmMK aW5kZXggMzFlNmVkZC4uOWQyYjVkMyAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUv aTkxNV9wY2kuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X3BjaS5jCkBAIC0yODgs NyArMjg4LDggQEAgc3RhdGljIGNvbnN0IHN0cnVjdCBpbnRlbF9kZXZpY2VfaW5mbyBpbnRlbF9o YXN3ZWxsX2luZm8gPSB7CiAjZGVmaW5lIEJEV19GRUFUVVJFUyBcCiAJSFNXX0ZFQVRVUkVTLCBc CiAJQkRXX0NPTE9SUywgXAotCS5oYXNfbG9naWNhbF9yaW5nX2NvbnRleHRzID0gMQorCS5oYXNf bG9naWNhbF9yaW5nX2NvbnRleHRzID0gMSwgXAorCS5oYXNfNjRiaXRfcmVsb2MgPSAxCiAKIHN0 YXRpYyBjb25zdCBzdHJ1Y3QgaW50ZWxfZGV2aWNlX2luZm8gaW50ZWxfYnJvYWR3ZWxsX2luZm8g PSB7CiAJQkRXX0ZFQVRVUkVTLAotLSAKMi43LjQKCl9fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fCkludGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwtZ2Z4QGxp c3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFu L2xpc3RpbmZvL2ludGVsLWdmeAo=