From mboxrd@z Thu Jan 1 00:00:00 1970 From: Tomas Elf Subject: Re: [PATCH 17/53] drm/i915: Split i915_ppgtt_init_hw() in half - generic and per ring Date: Thu, 05 Mar 2015 16:53:40 +0000 Message-ID: <54F88A14.4050503@intel.com> References: <1423828140-10653-1-git-send-email-John.C.Harrison@Intel.com> <1424366285-29232-1-git-send-email-John.C.Harrison@Intel.com> <1424366285-29232-18-git-send-email-John.C.Harrison@Intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8"; Format="flowed" Content-Transfer-Encoding: base64 Return-path: Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by gabe.freedesktop.org (Postfix) with ESMTP id D27986E7F1 for ; Thu, 5 Mar 2015 08:53:42 -0800 (PST) In-Reply-To: <1424366285-29232-18-git-send-email-John.C.Harrison@Intel.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" To: John.C.Harrison@Intel.com, Intel-GFX@Lists.FreeDesktop.Org List-Id: intel-gfx@lists.freedesktop.org T24gMTkvMDIvMjAxNSAxNzoxNywgSm9obi5DLkhhcnJpc29uQEludGVsLmNvbSB3cm90ZToKPiBG cm9tOiBKb2huIEhhcnJpc29uIDxKb2huLkMuSGFycmlzb25ASW50ZWwuY29tPgo+Cj4gVGhlIGk5 MTVfZ2VtX2luaXRfaHcoKSBmdW5jdGlvbiBjYWxscyBhIGJ1bmNoIG9mIHNtYWxsZXIgaW5pdGlh bGlzYXRpb24KPiBmdW5jdGlvbnMuIE11bHRpcGxlIG9mIHdoaWNoIGhhdmUgZ2VuZXJpYyBzZWN0 aW9ucyBhbmQgcGVyIHJpbmcgc2VjdGlvbnMuIFRoaXMKPiBtZWFucyBtdWx0aXBsZSBwYXNzZXMg YXJlIGRvbmUgb3ZlciB0aGUgcmluZ3MuIEVhY2ggcGFzcyB3cml0ZXMgZGF0YSB0byB0aGUgcmlu Zwo+IHdoaWNoIGZsb2F0cyBhcm91bmQgaW4gdGhhdCByaW5nJ3MgT0xSIHVudGlsIHNvbWUgcmFu ZG9tIHBvaW50IGluIHRoZSBmdXR1cmUKPiB3aGVuIGFuIGFkZF9yZXF1ZXN0KCkgaXMgZG9uZSBi eSBzb21lIHJhbmRvbSBvdGhlciBwaWVjZSBvZiBjb2RlLgo+Cj4gVGhpcyBwYXRjaCBicmVha3Mg aTkxNV9wcGd0dF9pbml0X2h3KCkgaW4gdHdvIHdpdGggdGhlIHBlciByaW5nIGluaXRpYWxpc2F0 aW9uCj4gbm93IGJlaW5nIGRvbmUgaW4gaTkxNV9wcGd0dF9pbml0X3JpbmcoKS4gVGhlIHJpbmcg bG9vcGluZyBpcyBub3cgZG9uZSBhdCB0aGUKPiB0b3AgbGV2ZWwgaW4gaTkxNV9nZW1faW5pdF9o dygpLgo+Cj4gRm9yOiBWSVotNTExNQo+IFNpZ25lZC1vZmYtYnk6IEpvaG4gSGFycmlzb24gPEpv aG4uQy5IYXJyaXNvbkBJbnRlbC5jb20+Cj4gLS0tCj4gICBkcml2ZXJzL2dwdS9kcm0vaTkxNS9p OTE1X2dlbS5jICAgICB8ICAgMjUgKysrKysrKysrKysrKysrKysrKy0tLS0tLQo+ICAgZHJpdmVy cy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fZ3R0LmMgfCAgIDI1ICsrKysrKysrKysrKy0tLS0tLS0t LS0tLS0KPiAgIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2d0dC5oIHwgICAgMSArCj4g ICAzIGZpbGVzIGNoYW5nZWQsIDMyIGluc2VydGlvbnMoKyksIDE5IGRlbGV0aW9ucygtKQo+Cj4g ZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtLmMgYi9kcml2ZXJzL2dw dS9kcm0vaTkxNS9pOTE1X2dlbS5jCj4gaW5kZXggNTFmNzE5Yy4uOWJjNjBkNyAxMDA2NDQKPiAt LS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbS5jCj4gKysrIGIvZHJpdmVycy9ncHUv ZHJtL2k5MTUvaTkxNV9nZW0uYwo+IEBAIC00ODQ0LDE5ICs0ODQ0LDMyIEBAIGk5MTVfZ2VtX2lu aXRfaHcoc3RydWN0IGRybV9kZXZpY2UgKmRldikKPiAgIAkgKi8KPiAgIAlpbml0X3VudXNlZF9y aW5ncyhkZXYpOwo+Cj4gKwlyZXQgPSBpOTE1X3BwZ3R0X2luaXRfaHcoZGV2KTsKPiArCWlmIChy ZXQpIHsKPiArCQlEUk1fRVJST1IoIlBQR1RUIGVuYWJsZSBIVyBmYWlsZWQgJWRcbiIsIHJldCk7 Cj4gKwkJcmV0dXJuIHJldDsKPiArCX0KPiArCj4gKwkvKiBOZWVkIHRvIGRvIGJhc2ljIGluaXRp YWxpc2F0aW9uIG9mIGFsbCByaW5ncyBmaXJzdDogKi8KCk5pdHBpY2s6IE5vIG5lZWQgZm9yIHRy YWlsaW5nIGNvbG9uIGluIGNvbW1lbnQKCj4gICAJZm9yX2VhY2hfcmluZyhyaW5nLCBkZXZfcHJp diwgaSkgewo+ICAgCQlyZXQgPSByaW5nLT5pbml0X2h3KHJpbmcpOwo+ICAgCQlpZiAocmV0KQo+ ICAgCQkJcmV0dXJuIHJldDsKPiAgIAl9Cj4KPiAtCWZvciAoaSA9IDA7IGkgPCBOVU1fTDNfU0xJ Q0VTKGRldik7IGkrKykKPiAtCQlpOTE1X2dlbV9sM19yZW1hcCgmZGV2X3ByaXYtPnJpbmdbUkNT XSwgaSk7Cj4gKwkvKiBOb3cgaXQgaXMgc2FmZSB0byBnbyBiYWNrIHJvdW5kIGFuZCBkbyBldmVy eXRoaW5nIGVsc2U6ICovCgpOaXRwaWNrOiBObyBuZWVkIGZvciB0cmFpbGluZyBjb2xvbiBpbiBj b21tZW50CgpSZXZpZXdlZC1ieTogVG9tYXMgRWxmIDx0b21hcy5lbGZAaW50ZWwuY29tPgoKVGhh bmtzLApUb21hcwoKCj4gKwlmb3JfZWFjaF9yaW5nKHJpbmcsIGRldl9wcml2LCBpKSB7Cj4gKwkJ aWYgKHJpbmctPmlkID09IFJDUykgewo+ICsJCQlmb3IgKGkgPSAwOyBpIDwgTlVNX0wzX1NMSUNF UyhkZXYpOyBpKyspCj4gKwkJCQlpOTE1X2dlbV9sM19yZW1hcChyaW5nLCBpKTsKPiArCQl9Cj4K PiAtCXJldCA9IGk5MTVfcHBndHRfaW5pdF9odyhkZXYpOwo+IC0JaWYgKHJldCAmJiByZXQgIT0g LUVJTykgewo+IC0JCURSTV9FUlJPUigiUFBHVFQgZW5hYmxlIGZhaWxlZCAlZFxuIiwgcmV0KTsK PiAtCQlpOTE1X2dlbV9jbGVhbnVwX3JpbmdidWZmZXIoZGV2KTsKPiArCQlyZXQgPSBpOTE1X3Bw Z3R0X2luaXRfcmluZyhyaW5nKTsKPiArCQlpZiAocmV0ICYmIHJldCAhPSAtRUlPKSB7Cj4gKwkJ CURSTV9FUlJPUigiUFBHVFQgZW5hYmxlIHJpbmcgIyVkIGZhaWxlZCAlZFxuIiwgaSwgcmV0KTsK PiArCQkJaTkxNV9nZW1fY2xlYW51cF9yaW5nYnVmZmVyKGRldik7Cj4gKwkJCXJldHVybiByZXQ7 Cj4gKwkJfQo+ICAgCX0KPgo+ICAgCXJldCA9IGk5MTVfZ2VtX2NvbnRleHRfZW5hYmxlKGRldl9w cml2KTsKPiBkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fZ3R0LmMg Yi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9ndHQuYwo+IGluZGV4IGU1NGIyYTAuLjQy OGQyZjYgMTAwNjQ0Cj4gLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fZ3R0LmMK PiArKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9ndHQuYwo+IEBAIC0xMjA2LDEx ICsxMjA2LDYgQEAgaW50IGk5MTVfcHBndHRfaW5pdChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LCBz dHJ1Y3QgaTkxNV9od19wcGd0dCAqcHBndHQpCj4KPiAgIGludCBpOTE1X3BwZ3R0X2luaXRfaHco c3RydWN0IGRybV9kZXZpY2UgKmRldikKPiAgIHsKPiAtCXN0cnVjdCBkcm1faTkxNV9wcml2YXRl ICpkZXZfcHJpdiA9IGRldi0+ZGV2X3ByaXZhdGU7Cj4gLQlzdHJ1Y3QgaW50ZWxfZW5naW5lX2Nz ICpyaW5nOwo+IC0Jc3RydWN0IGk5MTVfaHdfcHBndHQgKnBwZ3R0ID0gZGV2X3ByaXYtPm1tLmFs aWFzaW5nX3BwZ3R0Owo+IC0JaW50IGksIHJldCA9IDA7Cj4gLQo+ICAgCS8qIEluIHRoZSBjYXNl IG9mIGV4ZWNsaXN0cywgUFBHVFQgaXMgZW5hYmxlZCBieSB0aGUgY29udGV4dCBkZXNjcmlwdG9y Cj4gICAJICogYW5kIHRoZSBQRFBzIGFyZSBjb250YWluZWQgd2l0aGluIHRoZSBjb250ZXh0IGl0 c2VsZi4gIFdlIGRvbid0Cj4gICAJICogbmVlZCB0byBkbyBhbnl0aGluZyBoZXJlLiAqLwo+IEBA IC0xMjI5LDE2ICsxMjI0LDIwIEBAIGludCBpOTE1X3BwZ3R0X2luaXRfaHcoc3RydWN0IGRybV9k ZXZpY2UgKmRldikKPiAgIAllbHNlCj4gICAJCU1JU1NJTkdfQ0FTRShJTlRFTF9JTkZPKGRldikt Pmdlbik7Cj4KPiAtCWlmIChwcGd0dCkgewo+IC0JCWZvcl9lYWNoX3JpbmcocmluZywgZGV2X3By aXYsIGkpIHsKPiAtCQkJcmV0ID0gcHBndHQtPnN3aXRjaF9tbShwcGd0dCwgcmluZyk7Cj4gLQkJ CWlmIChyZXQgIT0gMCkKPiAtCQkJCXJldHVybiByZXQ7Cj4gLQkJfQo+IC0JfQo+ICsJcmV0dXJu IDA7Cj4gK30KPgo+IC0JcmV0dXJuIHJldDsKPiAraW50IGk5MTVfcHBndHRfaW5pdF9yaW5nKHN0 cnVjdCBpbnRlbF9lbmdpbmVfY3MgKnJpbmcpCj4gK3sKPiArCXN0cnVjdCBkcm1faTkxNV9wcml2 YXRlICpkZXZfcHJpdiA9IHJpbmctPmRldi0+ZGV2X3ByaXZhdGU7Cj4gKwlzdHJ1Y3QgaTkxNV9o d19wcGd0dCAqcHBndHQgPSBkZXZfcHJpdi0+bW0uYWxpYXNpbmdfcHBndHQ7Cj4gKwo+ICsJaWYg KCFwcGd0dCkKPiArCQlyZXR1cm4gMDsKPiArCj4gKwlyZXR1cm4gcHBndHQtPnN3aXRjaF9tbShw cGd0dCwgcmluZyk7Cj4gICB9Cj4gKwo+ICAgc3RydWN0IGk5MTVfaHdfcHBndHQgKgo+ICAgaTkx NV9wcGd0dF9jcmVhdGUoc3RydWN0IGRybV9kZXZpY2UgKmRldiwgc3RydWN0IGRybV9pOTE1X2Zp bGVfcHJpdmF0ZSAqZnByaXYpCj4gICB7Cj4gZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9p OTE1L2k5MTVfZ2VtX2d0dC5oIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fZ3R0LmgK PiBpbmRleCA4Zjc2OTkwLi41YTZjZWY5IDEwMDY0NAo+IC0tLSBhL2RyaXZlcnMvZ3B1L2RybS9p OTE1L2k5MTVfZ2VtX2d0dC5oCj4gKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1f Z3R0LmgKPiBAQCAtMzAwLDYgKzMwMCw3IEBAIHZvaWQgaTkxNV9nbG9iYWxfZ3R0X2NsZWFudXAo c3RydWN0IGRybV9kZXZpY2UgKmRldik7Cj4KPiAgIGludCBpOTE1X3BwZ3R0X2luaXQoc3RydWN0 IGRybV9kZXZpY2UgKmRldiwgc3RydWN0IGk5MTVfaHdfcHBndHQgKnBwZ3R0KTsKPiAgIGludCBp OTE1X3BwZ3R0X2luaXRfaHcoc3RydWN0IGRybV9kZXZpY2UgKmRldik7Cj4gK2ludCBpOTE1X3Bw Z3R0X2luaXRfcmluZyhzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICpyaW5nKTsKPiAgIHZvaWQgaTkx NV9wcGd0dF9yZWxlYXNlKHN0cnVjdCBrcmVmICprcmVmKTsKPiAgIHN0cnVjdCBpOTE1X2h3X3Bw Z3R0ICppOTE1X3BwZ3R0X2NyZWF0ZShzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LAo+ICAgCQkJCQlz dHJ1Y3QgZHJtX2k5MTVfZmlsZV9wcml2YXRlICpmcHJpdik7Cj4KCl9fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCkludGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50 ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3Jn L21haWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4Cg==