From mboxrd@z Thu Jan 1 00:00:00 1970 From: =?UTF-8?q?Jakub=20Bartmi=C5=84ski?= Subject: [PATCH v6 4/6] drm/i915: Remove unnecessary ggtt_offset_bias from i915_gem_context Date: Fri, 27 Jul 2018 10:53:48 +0200 Message-ID: <20180727085350.321-4-jakub.bartminski@intel.com> References: <20180727085350.321-1-jakub.bartminski@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga07.intel.com (mga07.intel.com [134.134.136.100]) by gabe.freedesktop.org (Postfix) with ESMTPS id 1447C6E93F for ; Fri, 27 Jul 2018 08:54:12 +0000 (UTC) In-Reply-To: <20180727085350.321-1-jakub.bartminski@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 U2luY2UgZ2d0dF9vZmZzZXRfYmlhcyBpcyBub3cgc3RvcmVkIGluIGdndHQucGluX2JpYXMsIGl0 IGlzIGR1cGxpY2F0ZWQKaW5zaWRlIGk5MTVfZ2VtX2NvbnRleHQsIGFuZCBjYW4gaW5zdGVhZCBi ZSBhY2Nlc3NlZCBkaXJlY3RseSBmcm9tIGdndHQuCgp2MzoKQWRkZWQgYSBoZWxwZXIgZnVuY3Rp b24gdG8gcmV0cmlldmUgdGhlIGdndHQucGluX2JpYXMgZnJvbSB0aGUgdm1hLgoKdjQ6Ck1vdmVk IHRoZSBoZWxwZXIgZnVuY3Rpb24gdG8gdGhlIHByZXZpb3VzIHBhdGNoIGluIHRoZSBzZXJpZXMu CkRyb3BwZWQgdGhlIGJpYXMgZnJvbSBpbnRlbF9yaW5nX3Bpbi4gVGhpcyBpbnRyb2R1Y2VzIGEg c2xpZ2h0IGZ1bmN0aW9uYWwKY2hhbmdlIHNpbmNlIHdlIGFyZSBhbHdheXMgcGlubmluZyB0aGUg cmluZyBhIGJpdCBoaWdoZXIgaWYgR3VDIGlzIHByZXNlbnQKZXZlbiB0aG91Z2ggd2UgZG9uJ3Qg cmVhbGx5IG5lZWQgdG8uCgpTaWduZWQtb2ZmLWJ5OiBKYWt1YiBCYXJ0bWnFhHNraSA8amFrdWIu YmFydG1pbnNraUBpbnRlbC5jb20+CkNjOiBDaHJpcyBXaWxzb24gPGNocmlzQGNocmlzLXdpbHNv bi5jby51az4KQ2M6IE1pY2hhxYIgV2luaWFyc2tpIDxtaWNoYWwud2luaWFyc2tpQGludGVsLmNv bT4KQ2M6IE1pY2hhbCBXYWpkZWN6a28gPG1pY2hhbC53YWpkZWN6a29AaW50ZWwuY29tPgotLS0K IGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2NvbnRleHQuYyB8ICAyIC0tCiBkcml2ZXJz L2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9jb250ZXh0LmggfCAgMyAtLS0KIGRyaXZlcnMvZ3B1L2Ry bS9pOTE1L2ludGVsX2xyYy5jICAgICAgICB8ICA2ICsrLS0tLQogZHJpdmVycy9ncHUvZHJtL2k5 MTUvaW50ZWxfcmluZ2J1ZmZlci5jIHwgMTQgKysrKysrLS0tLS0tLS0KIGRyaXZlcnMvZ3B1L2Ry bS9pOTE1L2ludGVsX3JpbmdidWZmZXIuaCB8ICA0ICstLS0KIDUgZmlsZXMgY2hhbmdlZCwgOSBp bnNlcnRpb25zKCspLCAyMCBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9k cm0vaTkxNS9pOTE1X2dlbV9jb250ZXh0LmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dl bV9jb250ZXh0LmMKaW5kZXggMzJmOTZiOGNkOWM0Li5mMTVhMDM5NzcyZGIgMTAwNjQ0Ci0tLSBh L2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2NvbnRleHQuYworKysgYi9kcml2ZXJzL2dw dS9kcm0vaTkxNS9pOTE1X2dlbV9jb250ZXh0LmMKQEAgLTMyOSw4ICszMjksNiBAQCBfX2NyZWF0 ZV9od19jb250ZXh0KHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiwKIAljdHgtPmRl c2NfdGVtcGxhdGUgPQogCQlkZWZhdWx0X2Rlc2NfdGVtcGxhdGUoZGV2X3ByaXYsIGRldl9wcml2 LT5tbS5hbGlhc2luZ19wcGd0dCk7CiAKLQljdHgtPmdndHRfb2Zmc2V0X2JpYXMgPSBkZXZfcHJp di0+Z2d0dC5waW5fYmlhczsKLQogCXJldHVybiBjdHg7CiAKIGVycl9waWQ6CmRpZmYgLS1naXQg YS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9jb250ZXh0LmggYi9kcml2ZXJzL2dwdS9k cm0vaTkxNS9pOTE1X2dlbV9jb250ZXh0LmgKaW5kZXggYjExNmU0OTQyYzEwLi44NTFkYWQ2ZGVj ZDcgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2NvbnRleHQuaAor KysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9jb250ZXh0LmgKQEAgLTE0Nyw5ICsx NDcsNiBAQCBzdHJ1Y3QgaTkxNV9nZW1fY29udGV4dCB7CiAKIAlzdHJ1Y3QgaTkxNV9zY2hlZF9h dHRyIHNjaGVkOwogCi0JLyoqIGdndHRfb2Zmc2V0X2JpYXM6IHBsYWNlbWVudCByZXN0cmljdGlv biBmb3IgY29udGV4dCBvYmplY3RzICovCi0JdTMyIGdndHRfb2Zmc2V0X2JpYXM7Ci0KIAkvKiog ZW5naW5lOiBwZXItZW5naW5lIGxvZ2ljYWwgSFcgc3RhdGUgKi8KIAlzdHJ1Y3QgaW50ZWxfY29u dGV4dCB7CiAJCXN0cnVjdCBpOTE1X2dlbV9jb250ZXh0ICpnZW1fY29udGV4dDsKZGlmZiAtLWdp dCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2xyYy5jIGIvZHJpdmVycy9ncHUvZHJtL2k5 MTUvaW50ZWxfbHJjLmMKaW5kZXggMzVkMzdhZjBjYjlhLi5jOTIzZWI5OThjMjggMTAwNjQ0Ci0t LSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2xyYy5jCisrKyBiL2RyaXZlcnMvZ3B1L2Ry bS9pOTE1L2ludGVsX2xyYy5jCkBAIC0xMzYzLDkgKzEzNjMsNyBAQCBzdGF0aWMgaW50IF9fY29u dGV4dF9waW4oc3RydWN0IGk5MTVfZ2VtX2NvbnRleHQgKmN0eCwgc3RydWN0IGk5MTVfdm1hICp2 bWEpCiAJfQogCiAJZmxhZ3MgPSBQSU5fR0xPQkFMIHwgUElOX0hJR0g7Ci0JaWYgKGN0eC0+Z2d0 dF9vZmZzZXRfYmlhcykKLQkJZmxhZ3MgfD0gUElOX09GRlNFVF9CSUFTIHwgY3R4LT5nZ3R0X29m ZnNldF9iaWFzOwotCisJZmxhZ3MgfD0gUElOX09GRlNFVF9CSUFTIHwgaTkxNV9nZ3R0X3Bpbl9i aWFzKHZtYSk7CiAJcmV0dXJuIGk5MTVfdm1hX3Bpbih2bWEsIDAsIEdFTjhfTFJfQ09OVEVYVF9B TElHTiwgZmxhZ3MpOwogfQogCkBAIC0xMzkyLDcgKzEzOTAsNyBAQCBfX2V4ZWNsaXN0c19jb250 ZXh0X3BpbihzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICplbmdpbmUsCiAJCWdvdG8gdW5waW5fdm1h OwogCX0KIAotCXJldCA9IGludGVsX3JpbmdfcGluKGNlLT5yaW5nLCBjdHgtPmk5MTUsIGN0eC0+ Z2d0dF9vZmZzZXRfYmlhcyk7CisJcmV0ID0gaW50ZWxfcmluZ19waW4oY2UtPnJpbmcsIGN0eC0+ aTkxNSk7CiAJaWYgKHJldCkKIAkJZ290byB1bnBpbl9tYXA7CiAKZGlmZiAtLWdpdCBhL2RyaXZl cnMvZ3B1L2RybS9pOTE1L2ludGVsX3JpbmdidWZmZXIuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1 L2ludGVsX3JpbmdidWZmZXIuYwppbmRleCBmNGJkMTg1YzkzNjkuLjhhNDgzMjUyNDlhMyAxMDA2 NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcmluZ2J1ZmZlci5jCisrKyBiL2Ry aXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3JpbmdidWZmZXIuYwpAQCAtMTAwNSw5ICsxMDA1LDcg QEAgaTkxNV9lbWl0X2JiX3N0YXJ0KHN0cnVjdCBpOTE1X3JlcXVlc3QgKnJxLAogCiAKIAotaW50 IGludGVsX3JpbmdfcGluKHN0cnVjdCBpbnRlbF9yaW5nICpyaW5nLAotCQkgICBzdHJ1Y3QgZHJt X2k5MTVfcHJpdmF0ZSAqaTkxNSwKLQkJICAgdW5zaWduZWQgaW50IG9mZnNldF9iaWFzKQoraW50 IGludGVsX3JpbmdfcGluKHN0cnVjdCBpbnRlbF9yaW5nICpyaW5nLCBzdHJ1Y3QgZHJtX2k5MTVf cHJpdmF0ZSAqaTkxNSkKIHsKIAllbnVtIGk5MTVfbWFwX3R5cGUgbWFwID0gSEFTX0xMQyhpOTE1 KSA/IEk5MTVfTUFQX1dCIDogSTkxNV9NQVBfV0M7CiAJc3RydWN0IGk5MTVfdm1hICp2bWEgPSBy aW5nLT52bWE7CkBAIC0xMDE3LDEwICsxMDE1LDExIEBAIGludCBpbnRlbF9yaW5nX3BpbihzdHJ1 Y3QgaW50ZWxfcmluZyAqcmluZywKIAogCUdFTV9CVUdfT04ocmluZy0+dmFkZHIpOwogCi0KIAlm bGFncyA9IFBJTl9HTE9CQUw7Ci0JaWYgKG9mZnNldF9iaWFzKQotCQlmbGFncyB8PSBQSU5fT0ZG U0VUX0JJQVMgfCBvZmZzZXRfYmlhczsKKworCS8qIFJpbmcgd3JhcGFyb3VuZCBhdCBvZmZzZXQg MCBzb21ldGltZXMgaGFuZ3MuIE5vIGlkZWEgd2h5LiAqLworCWZsYWdzIHw9IFBJTl9PRkZTRVRf QklBUyB8IGk5MTVfZ2d0dF9waW5fYmlhcyh2bWEpOworCiAJaWYgKHZtYS0+b2JqLT5zdG9sZW4p CiAJCWZsYWdzIHw9IFBJTl9NQVBQQUJMRTsKIAllbHNlCkBAIC0xNDA0LDggKzE0MDMsNyBAQCBz dGF0aWMgaW50IGludGVsX2luaXRfcmluZ19idWZmZXIoc3RydWN0IGludGVsX2VuZ2luZV9jcyAq ZW5naW5lKQogCQlnb3RvIGVycjsKIAl9CiAKLQkvKiBSaW5nIHdyYXBhcm91bmQgYXQgb2Zmc2V0 IDAgc29tZXRpbWVzIGhhbmdzLiBObyBpZGVhIHdoeS4gKi8KLQllcnIgPSBpbnRlbF9yaW5nX3Bp bihyaW5nLCBlbmdpbmUtPmk5MTUsIEk5MTVfR1RUX1BBR0VfU0laRSk7CisJZXJyID0gaW50ZWxf cmluZ19waW4ocmluZywgZW5naW5lLT5pOTE1KTsKIAlpZiAoZXJyKQogCQlnb3RvIGVycl9yaW5n OwogCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9yaW5nYnVmZmVyLmgg Yi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9yaW5nYnVmZmVyLmgKaW5kZXggZDFlZWUwOGU1 ZjZiLi43ZmUwN2IyZGUyYTcgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVs X3JpbmdidWZmZXIuaAorKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9yaW5nYnVmZmVy LmgKQEAgLTc4NCw5ICs3ODQsNyBAQCBzdHJ1Y3QgaW50ZWxfcmluZyAqCiBpbnRlbF9lbmdpbmVf Y3JlYXRlX3Jpbmcoc3RydWN0IGludGVsX2VuZ2luZV9jcyAqZW5naW5lLAogCQkJIHN0cnVjdCBp OTE1X3RpbWVsaW5lICp0aW1lbGluZSwKIAkJCSBpbnQgc2l6ZSk7Ci1pbnQgaW50ZWxfcmluZ19w aW4oc3RydWN0IGludGVsX3JpbmcgKnJpbmcsCi0JCSAgIHN0cnVjdCBkcm1faTkxNV9wcml2YXRl ICppOTE1LAotCQkgICB1bnNpZ25lZCBpbnQgb2Zmc2V0X2JpYXMpOworaW50IGludGVsX3Jpbmdf cGluKHN0cnVjdCBpbnRlbF9yaW5nICpyaW5nLCBzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqaTkx NSk7CiB2b2lkIGludGVsX3JpbmdfcmVzZXQoc3RydWN0IGludGVsX3JpbmcgKnJpbmcsIHUzMiB0 YWlsKTsKIHVuc2lnbmVkIGludCBpbnRlbF9yaW5nX3VwZGF0ZV9zcGFjZShzdHJ1Y3QgaW50ZWxf cmluZyAqcmluZyk7CiB2b2lkIGludGVsX3JpbmdfdW5waW4oc3RydWN0IGludGVsX3JpbmcgKnJp bmcpOwotLSAKMi4xNy4xCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3Rv cC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRl bC1nZngK