From mboxrd@z Thu Jan 1 00:00:00 1970 From: =?UTF-8?q?Jakub=20Bartmi=C5=84ski?= Subject: [PATCH v5 3/5] drm/i915: Remove unnecessary ggtt_offset_bias from i915_gem_context Date: Wed, 25 Jul 2018 12:56:54 +0200 Message-ID: <20180725105656.13348-3-jakub.bartminski@intel.com> References: <20180725105656.13348-1-jakub.bartminski@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) by gabe.freedesktop.org (Postfix) with ESMTPS id D7AB16E630 for ; Wed, 25 Jul 2018 10:57:33 +0000 (UTC) In-Reply-To: <20180725105656.13348-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 c2xpZ2h0IGZ1bmN0aW9uYWwKY2hhbmdlIHNpbmNlIHdlIGFyZSBhbHdheXMgcGlubmluZyBhIHJp bmcgYSBiaXQgaGlnaGVyIGlmIEd1QyBpcyBwcmVzZW50CmV2ZW4gdGhvdWdoIHdlIGRvbid0IHJl YWxseSBuZWVkIHRvLgoKU2lnbmVkLW9mZi1ieTogSmFrdWIgQmFydG1pxYRza2kgPGpha3ViLmJh cnRtaW5za2lAaW50ZWwuY29tPgpDYzogQ2hyaXMgV2lsc29uIDxjaHJpc0BjaHJpcy13aWxzb24u Y28udWs+CkNjOiBNaWNoYcWCIFdpbmlhcnNraSA8bWljaGFsLndpbmlhcnNraUBpbnRlbC5jb20+ CkNjOiBNaWNoYWwgV2FqZGVjemtvIDxtaWNoYWwud2FqZGVjemtvQGludGVsLmNvbT4KLS0tCiBk cml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9jb250ZXh0LmMgfCAgMiAtLQogZHJpdmVycy9n cHUvZHJtL2k5MTUvaTkxNV9nZW1fY29udGV4dC5oIHwgIDMgLS0tCiBkcml2ZXJzL2dwdS9kcm0v aTkxNS9pbnRlbF9scmMuYyAgICAgICAgfCAgNiArKy0tLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1 L2ludGVsX3JpbmdidWZmZXIuYyB8IDE0ICsrKysrKy0tLS0tLS0tCiBkcml2ZXJzL2dwdS9kcm0v aTkxNS9pbnRlbF9yaW5nYnVmZmVyLmggfCAgNCArLS0tCiA1IGZpbGVzIGNoYW5nZWQsIDkgaW5z ZXJ0aW9ucygrKSwgMjAgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJt L2k5MTUvaTkxNV9nZW1fY29udGV4dC5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1f Y29udGV4dC5jCmluZGV4IGFlMjdjYWFkMTc2Ni4uNjA2NzU2Mzc1MGRlIDEwMDY0NAotLS0gYS9k cml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9jb250ZXh0LmMKKysrIGIvZHJpdmVycy9ncHUv ZHJtL2k5MTUvaTkxNV9nZW1fY29udGV4dC5jCkBAIC0zMjksOCArMzI5LDYgQEAgX19jcmVhdGVf aHdfY29udGV4dChzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqaTkxNSwKIAljdHgtPmRlc2NfdGVt cGxhdGUgPQogCQlkZWZhdWx0X2Rlc2NfdGVtcGxhdGUoaTkxNSwgaTkxNS0+bW0uYWxpYXNpbmdf cHBndHQpOwogCi0JY3R4LT5nZ3R0X29mZnNldF9iaWFzID0gaTkxNS0+Z2d0dC5waW5fYmlhczsK LQogCXJldHVybiBjdHg7CiAKIGVycl9waWQ6CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0v aTkxNS9pOTE1X2dlbV9jb250ZXh0LmggYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9j b250ZXh0LmgKaW5kZXggYjExNmU0OTQyYzEwLi44NTFkYWQ2ZGVjZDcgMTAwNjQ0Ci0tLSBhL2Ry aXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2NvbnRleHQuaAorKysgYi9kcml2ZXJzL2dwdS9k cm0vaTkxNS9pOTE1X2dlbV9jb250ZXh0LmgKQEAgLTE0Nyw5ICsxNDcsNiBAQCBzdHJ1Y3QgaTkx NV9nZW1fY29udGV4dCB7CiAKIAlzdHJ1Y3QgaTkxNV9zY2hlZF9hdHRyIHNjaGVkOwogCi0JLyoq IGdndHRfb2Zmc2V0X2JpYXM6IHBsYWNlbWVudCByZXN0cmljdGlvbiBmb3IgY29udGV4dCBvYmpl Y3RzICovCi0JdTMyIGdndHRfb2Zmc2V0X2JpYXM7Ci0KIAkvKiogZW5naW5lOiBwZXItZW5naW5l IGxvZ2ljYWwgSFcgc3RhdGUgKi8KIAlzdHJ1Y3QgaW50ZWxfY29udGV4dCB7CiAJCXN0cnVjdCBp OTE1X2dlbV9jb250ZXh0ICpnZW1fY29udGV4dDsKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2Ry bS9pOTE1L2ludGVsX2xyYy5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfbHJjLmMKaW5k ZXggMzVkMzdhZjBjYjlhLi5jOTIzZWI5OThjMjggMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2Ry bS9pOTE1L2ludGVsX2xyYy5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2xyYy5j CkBAIC0xMzYzLDkgKzEzNjMsNyBAQCBzdGF0aWMgaW50IF9fY29udGV4dF9waW4oc3RydWN0IGk5 MTVfZ2VtX2NvbnRleHQgKmN0eCwgc3RydWN0IGk5MTVfdm1hICp2bWEpCiAJfQogCiAJZmxhZ3Mg PSBQSU5fR0xPQkFMIHwgUElOX0hJR0g7Ci0JaWYgKGN0eC0+Z2d0dF9vZmZzZXRfYmlhcykKLQkJ ZmxhZ3MgfD0gUElOX09GRlNFVF9CSUFTIHwgY3R4LT5nZ3R0X29mZnNldF9iaWFzOwotCisJZmxh Z3MgfD0gUElOX09GRlNFVF9CSUFTIHwgaTkxNV9nZ3R0X3Bpbl9iaWFzKHZtYSk7CiAJcmV0dXJu IGk5MTVfdm1hX3Bpbih2bWEsIDAsIEdFTjhfTFJfQ09OVEVYVF9BTElHTiwgZmxhZ3MpOwogfQog CkBAIC0xMzkyLDcgKzEzOTAsNyBAQCBfX2V4ZWNsaXN0c19jb250ZXh0X3BpbihzdHJ1Y3QgaW50 ZWxfZW5naW5lX2NzICplbmdpbmUsCiAJCWdvdG8gdW5waW5fdm1hOwogCX0KIAotCXJldCA9IGlu dGVsX3JpbmdfcGluKGNlLT5yaW5nLCBjdHgtPmk5MTUsIGN0eC0+Z2d0dF9vZmZzZXRfYmlhcyk7 CisJcmV0ID0gaW50ZWxfcmluZ19waW4oY2UtPnJpbmcsIGN0eC0+aTkxNSk7CiAJaWYgKHJldCkK IAkJZ290byB1bnBpbl9tYXA7CiAKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2lu dGVsX3JpbmdidWZmZXIuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3JpbmdidWZmZXIu YwppbmRleCBmNGJkMTg1YzkzNjkuLjhhNDgzMjUyNDlhMyAxMDA2NDQKLS0tIGEvZHJpdmVycy9n cHUvZHJtL2k5MTUvaW50ZWxfcmluZ2J1ZmZlci5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1 L2ludGVsX3JpbmdidWZmZXIuYwpAQCAtMTAwNSw5ICsxMDA1LDcgQEAgaTkxNV9lbWl0X2JiX3N0 YXJ0KHN0cnVjdCBpOTE1X3JlcXVlc3QgKnJxLAogCiAKIAotaW50IGludGVsX3JpbmdfcGluKHN0 cnVjdCBpbnRlbF9yaW5nICpyaW5nLAotCQkgICBzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqaTkx NSwKLQkJICAgdW5zaWduZWQgaW50IG9mZnNldF9iaWFzKQoraW50IGludGVsX3JpbmdfcGluKHN0 cnVjdCBpbnRlbF9yaW5nICpyaW5nLCBzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqaTkxNSkKIHsK IAllbnVtIGk5MTVfbWFwX3R5cGUgbWFwID0gSEFTX0xMQyhpOTE1KSA/IEk5MTVfTUFQX1dCIDog STkxNV9NQVBfV0M7CiAJc3RydWN0IGk5MTVfdm1hICp2bWEgPSByaW5nLT52bWE7CkBAIC0xMDE3 LDEwICsxMDE1LDExIEBAIGludCBpbnRlbF9yaW5nX3BpbihzdHJ1Y3QgaW50ZWxfcmluZyAqcmlu ZywKIAogCUdFTV9CVUdfT04ocmluZy0+dmFkZHIpOwogCi0KIAlmbGFncyA9IFBJTl9HTE9CQUw7 Ci0JaWYgKG9mZnNldF9iaWFzKQotCQlmbGFncyB8PSBQSU5fT0ZGU0VUX0JJQVMgfCBvZmZzZXRf YmlhczsKKworCS8qIFJpbmcgd3JhcGFyb3VuZCBhdCBvZmZzZXQgMCBzb21ldGltZXMgaGFuZ3Mu IE5vIGlkZWEgd2h5LiAqLworCWZsYWdzIHw9IFBJTl9PRkZTRVRfQklBUyB8IGk5MTVfZ2d0dF9w aW5fYmlhcyh2bWEpOworCiAJaWYgKHZtYS0+b2JqLT5zdG9sZW4pCiAJCWZsYWdzIHw9IFBJTl9N QVBQQUJMRTsKIAllbHNlCkBAIC0xNDA0LDggKzE0MDMsNyBAQCBzdGF0aWMgaW50IGludGVsX2lu aXRfcmluZ19idWZmZXIoc3RydWN0IGludGVsX2VuZ2luZV9jcyAqZW5naW5lKQogCQlnb3RvIGVy cjsKIAl9CiAKLQkvKiBSaW5nIHdyYXBhcm91bmQgYXQgb2Zmc2V0IDAgc29tZXRpbWVzIGhhbmdz LiBObyBpZGVhIHdoeS4gKi8KLQllcnIgPSBpbnRlbF9yaW5nX3BpbihyaW5nLCBlbmdpbmUtPmk5 MTUsIEk5MTVfR1RUX1BBR0VfU0laRSk7CisJZXJyID0gaW50ZWxfcmluZ19waW4ocmluZywgZW5n aW5lLT5pOTE1KTsKIAlpZiAoZXJyKQogCQlnb3RvIGVycl9yaW5nOwogCmRpZmYgLS1naXQgYS9k cml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9yaW5nYnVmZmVyLmggYi9kcml2ZXJzL2dwdS9kcm0v aTkxNS9pbnRlbF9yaW5nYnVmZmVyLmgKaW5kZXggZDFlZWUwOGU1ZjZiLi43ZmUwN2IyZGUyYTcg MTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3JpbmdidWZmZXIuaAorKysg Yi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9yaW5nYnVmZmVyLmgKQEAgLTc4NCw5ICs3ODQs NyBAQCBzdHJ1Y3QgaW50ZWxfcmluZyAqCiBpbnRlbF9lbmdpbmVfY3JlYXRlX3Jpbmcoc3RydWN0 IGludGVsX2VuZ2luZV9jcyAqZW5naW5lLAogCQkJIHN0cnVjdCBpOTE1X3RpbWVsaW5lICp0aW1l bGluZSwKIAkJCSBpbnQgc2l6ZSk7Ci1pbnQgaW50ZWxfcmluZ19waW4oc3RydWN0IGludGVsX3Jp bmcgKnJpbmcsCi0JCSAgIHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICppOTE1LAotCQkgICB1bnNp Z25lZCBpbnQgb2Zmc2V0X2JpYXMpOworaW50IGludGVsX3JpbmdfcGluKHN0cnVjdCBpbnRlbF9y aW5nICpyaW5nLCBzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqaTkxNSk7CiB2b2lkIGludGVsX3Jp bmdfcmVzZXQoc3RydWN0IGludGVsX3JpbmcgKnJpbmcsIHUzMiB0YWlsKTsKIHVuc2lnbmVkIGlu dCBpbnRlbF9yaW5nX3VwZGF0ZV9zcGFjZShzdHJ1Y3QgaW50ZWxfcmluZyAqcmluZyk7CiB2b2lk IGludGVsX3JpbmdfdW5waW4oc3RydWN0IGludGVsX3JpbmcgKnJpbmcpOwotLSAKMi4xNy4xCgpf X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpJbnRlbC1nZngg bWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0 cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK