From mboxrd@z Thu Jan 1 00:00:00 1970 From: Tomas Elf Subject: Re: [PATCH 18/59] drm/i915: Split i915_ppgtt_init_hw() in half - generic and per ring Date: Tue, 31 Mar 2015 17:34:38 +0100 Message-ID: <551ACC9E.2030700@intel.com> References: <1426768264-16996-1-git-send-email-John.C.Harrison@Intel.com> <1426768264-16996-19-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 mga11.intel.com (mga11.intel.com [192.55.52.93]) by gabe.freedesktop.org (Postfix) with ESMTP id 28C726E401 for ; Tue, 31 Mar 2015 09:34:40 -0700 (PDT) In-Reply-To: <1426768264-16996-19-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 T24gMTkvMDMvMjAxNSAxMjozMCwgSm9obi5DLkhhcnJpc29uQEludGVsLmNvbSB3cm90ZToKPiBG cm9tOiBKb2huIEhhcnJpc29uIDxKb2huLkMuSGFycmlzb25ASW50ZWwuY29tPgo+Cj4gVGhlIGk5 MTVfZ2VtX2luaXRfaHcoKSBmdW5jdGlvbiBjYWxscyBhIGJ1bmNoIG9mIHNtYWxsZXIgaW5pdGlh bGlzYXRpb24KPiBmdW5jdGlvbnMuIE11bHRpcGxlIG9mIHdoaWNoIGhhdmUgZ2VuZXJpYyBzZWN0 aW9ucyBhbmQgcGVyIHJpbmcgc2VjdGlvbnMuIFRoaXMKPiBtZWFucyBtdWx0aXBsZSBwYXNzZXMg YXJlIGRvbmUgb3ZlciB0aGUgcmluZ3MuIEVhY2ggcGFzcyB3cml0ZXMgZGF0YSB0byB0aGUgcmlu Zwo+IHdoaWNoIGZsb2F0cyBhcm91bmQgaW4gdGhhdCByaW5nJ3MgT0xSIHVudGlsIHNvbWUgcmFu ZG9tIHBvaW50IGluIHRoZSBmdXR1cmUKPiB3aGVuIGFuIGFkZF9yZXF1ZXN0KCkgaXMgZG9uZSBi eSBzb21lIHJhbmRvbSBvdGhlciBwaWVjZSBvZiBjb2RlLgo+Cj4gVGhpcyBwYXRjaCBicmVha3Mg aTkxNV9wcGd0dF9pbml0X2h3KCkgaW4gdHdvIHdpdGggdGhlIHBlciByaW5nIGluaXRpYWxpc2F0 aW9uCj4gbm93IGJlaW5nIGRvbmUgaW4gaTkxNV9wcGd0dF9pbml0X3JpbmcoKS4gVGhlIHJpbmcg bG9vcGluZyBpcyBub3cgZG9uZSBhdCB0aGUKPiB0b3AgbGV2ZWwgaW4gaTkxNV9nZW1faW5pdF9o dygpLgo+Cj4gRm9yOiBWSVotNTExNQo+IFNpZ25lZC1vZmYtYnk6IEpvaG4gSGFycmlzb24gPEpv aG4uQy5IYXJyaXNvbkBJbnRlbC5jb20+Cj4gLS0tCj4gICBkcml2ZXJzL2dwdS9kcm0vaTkxNS9p OTE1X2dlbS5jICAgICB8ICAgMjUgKysrKysrKysrKysrKysrKysrKy0tLS0tLQo+ICAgZHJpdmVy cy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fZ3R0LmMgfCAgIDI4ICsrKysrKysrKysrKysrKy0tLS0t LS0tLS0tLS0KPiAgIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2d0dC5oIHwgICAgMSAr Cj4gICAzIGZpbGVzIGNoYW5nZWQsIDM1IGluc2VydGlvbnMoKyksIDE5IGRlbGV0aW9ucygtKQo+ Cj4gZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtLmMgYi9kcml2ZXJz L2dwdS9kcm0vaTkxNS9pOTE1X2dlbS5jCj4gaW5kZXggODY3NzI5My4uNjgzZmM4MCAxMDA2NDQK PiAtLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbS5jCj4gKysrIGIvZHJpdmVycy9n cHUvZHJtL2k5MTUvaTkxNV9nZW0uYwo+IEBAIC00ODgzLDE5ICs0ODgzLDMyIEBAIGk5MTVfZ2Vt X2luaXRfaHcoc3RydWN0IGRybV9kZXZpY2UgKmRldikKPiAgIAkgKi8KPiAgIAlpbml0X3VudXNl ZF9yaW5ncyhkZXYpOwo+Cj4gKwlyZXQgPSBpOTE1X3BwZ3R0X2luaXRfaHcoZGV2KTsKPiArCWlm IChyZXQpIHsKPiArCQlEUk1fRVJST1IoIlBQR1RUIGVuYWJsZSBIVyBmYWlsZWQgJWRcbiIsIHJl dCk7Cj4gKwkJZ290byBvdXQ7Cj4gKwl9Cj4gKwo+ICsJLyogTmVlZCB0byBkbyBiYXNpYyBpbml0 aWFsaXNhdGlvbiBvZiBhbGwgcmluZ3MgZmlyc3Q6ICovCj4gICAJZm9yX2VhY2hfcmluZyhyaW5n LCBkZXZfcHJpdiwgaSkgewo+ICAgCQlyZXQgPSByaW5nLT5pbml0X2h3KHJpbmcpOwo+ICAgCQlp ZiAocmV0KQo+ICAgCQkJZ290byBvdXQ7Cj4gICAJfQo+Cj4gLQlmb3IgKGkgPSAwOyBpIDwgTlVN X0wzX1NMSUNFUyhkZXYpOyBpKyspCj4gLQkJaTkxNV9nZW1fbDNfcmVtYXAoJmRldl9wcml2LT5y aW5nW1JDU10sIGkpOwo+ICsJLyogTm93IGl0IGlzIHNhZmUgdG8gZ28gYmFjayByb3VuZCBhbmQg ZG8gZXZlcnl0aGluZyBlbHNlOiAqLwo+ICsJZm9yX2VhY2hfcmluZyhyaW5nLCBkZXZfcHJpdiwg aSkgewo+ICsJCWlmIChyaW5nLT5pZCA9PSBSQ1MpIHsKPiArCQkJZm9yIChpID0gMDsgaSA8IE5V TV9MM19TTElDRVMoZGV2KTsgaSsrKQo+ICsJCQkJaTkxNV9nZW1fbDNfcmVtYXAocmluZywgaSk7 Cj4gKwkJfQo+Cj4gLQlyZXQgPSBpOTE1X3BwZ3R0X2luaXRfaHcoZGV2KTsKPiAtCWlmIChyZXQg JiYgcmV0ICE9IC1FSU8pIHsKPiAtCQlEUk1fRVJST1IoIlBQR1RUIGVuYWJsZSBmYWlsZWQgJWRc biIsIHJldCk7Cj4gLQkJaTkxNV9nZW1fY2xlYW51cF9yaW5nYnVmZmVyKGRldik7Cj4gKwkJcmV0 ID0gaTkxNV9wcGd0dF9pbml0X3JpbmcocmluZyk7Cj4gKwkJaWYgKHJldCAmJiByZXQgIT0gLUVJ Tykgewo+ICsJCQlEUk1fRVJST1IoIlBQR1RUIGVuYWJsZSByaW5nICMlZCBmYWlsZWQgJWRcbiIs IGksIHJldCk7Cj4gKwkJCWk5MTVfZ2VtX2NsZWFudXBfcmluZ2J1ZmZlcihkZXYpOwo+ICsJCQln b3RvIG91dDsKPiArCQl9Cj4gICAJfQo+Cj4gICAJcmV0ID0gaTkxNV9nZW1fY29udGV4dF9lbmFi bGUoZGV2X3ByaXYpOwo+IGRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dl bV9ndHQuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2d0dC5jCj4gaW5kZXggZDhm ZjFhOC4uODMwNzZkNyAxMDA2NDQKPiAtLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dl bV9ndHQuYwo+ICsrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2d0dC5jCj4gQEAg LTEyODAsMTEgKzEyODAsNiBAQCBpbnQgaTkxNV9wcGd0dF9pbml0KHN0cnVjdCBkcm1fZGV2aWNl ICpkZXYsIHN0cnVjdCBpOTE1X2h3X3BwZ3R0ICpwcGd0dCkKPgo+ICAgaW50IGk5MTVfcHBndHRf aW5pdF9odyhzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KQo+ICAgewo+IC0Jc3RydWN0IGRybV9pOTE1 X3ByaXZhdGUgKmRldl9wcml2ID0gZGV2LT5kZXZfcHJpdmF0ZTsKPiAtCXN0cnVjdCBpbnRlbF9l bmdpbmVfY3MgKnJpbmc7Cj4gLQlzdHJ1Y3QgaTkxNV9od19wcGd0dCAqcHBndHQgPSBkZXZfcHJp di0+bW0uYWxpYXNpbmdfcHBndHQ7Cj4gLQlpbnQgaSwgcmV0ID0gMDsKPiAtCj4gICAJLyogSW4g dGhlIGNhc2Ugb2YgZXhlY2xpc3RzLCBQUEdUVCBpcyBlbmFibGVkIGJ5IHRoZSBjb250ZXh0IGRl c2NyaXB0b3IKPiAgIAkgKiBhbmQgdGhlIFBEUHMgYXJlIGNvbnRhaW5lZCB3aXRoaW4gdGhlIGNv bnRleHQgaXRzZWxmLiAgV2UgZG9uJ3QKPiAgIAkgKiBuZWVkIHRvIGRvIGFueXRoaW5nIGhlcmUu ICovCj4gQEAgLTEzMDMsMTYgKzEyOTgsMjMgQEAgaW50IGk5MTVfcHBndHRfaW5pdF9odyhzdHJ1 Y3QgZHJtX2RldmljZSAqZGV2KQo+ICAgCWVsc2UKPiAgIAkJTUlTU0lOR19DQVNFKElOVEVMX0lO Rk8oZGV2KS0+Z2VuKTsKPgo+IC0JaWYgKHBwZ3R0KSB7Cj4gLQkJZm9yX2VhY2hfcmluZyhyaW5n LCBkZXZfcHJpdiwgaSkgewo+IC0JCQlyZXQgPSBwcGd0dC0+c3dpdGNoX21tKHBwZ3R0LCByaW5n KTsKPiAtCQkJaWYgKHJldCAhPSAwKQo+IC0JCQkJcmV0dXJuIHJldDsKPiAtCQl9Cj4gLQl9Cj4g KwlyZXR1cm4gMDsKPiArfQo+Cj4gLQlyZXR1cm4gcmV0Owo+ICtpbnQgaTkxNV9wcGd0dF9pbml0 X3Jpbmcoc3RydWN0IGludGVsX2VuZ2luZV9jcyAqcmluZykKPiArewo+ICsJc3RydWN0IGRybV9p OTE1X3ByaXZhdGUgKmRldl9wcml2ID0gcmluZy0+ZGV2LT5kZXZfcHJpdmF0ZTsKPiArCXN0cnVj dCBpOTE1X2h3X3BwZ3R0ICpwcGd0dCA9IGRldl9wcml2LT5tbS5hbGlhc2luZ19wcGd0dDsKPiAr Cj4gKwlpZiAoaTkxNS5lbmFibGVfZXhlY2xpc3RzKQo+ICsJCXJldHVybiAwOwo+ICsKPiArCWlm ICghcHBndHQpCj4gKwkJcmV0dXJuIDA7Cj4gKwo+ICsJcmV0dXJuIHBwZ3R0LT5zd2l0Y2hfbW0o cHBndHQsIHJpbmcpOwo+ICAgfQo+ICsKPiAgIHN0cnVjdCBpOTE1X2h3X3BwZ3R0ICoKPiAgIGk5 MTVfcHBndHRfY3JlYXRlKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsIHN0cnVjdCBkcm1faTkxNV9m aWxlX3ByaXZhdGUgKmZwcml2KQo+ICAgewo+IGRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0v aTkxNS9pOTE1X2dlbV9ndHQuaCBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2d0dC5o Cj4gaW5kZXggYzllOTNmNS4uMjk0MWZiYiAxMDA2NDQKPiAtLS0gYS9kcml2ZXJzL2dwdS9kcm0v aTkxNS9pOTE1X2dlbV9ndHQuaAo+ICsrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2Vt X2d0dC5oCj4gQEAgLTMxMSw2ICszMTEsNyBAQCB2b2lkIGk5MTVfZ2xvYmFsX2d0dF9jbGVhbnVw KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpOwo+Cj4gICBpbnQgaTkxNV9wcGd0dF9pbml0KHN0cnVj dCBkcm1fZGV2aWNlICpkZXYsIHN0cnVjdCBpOTE1X2h3X3BwZ3R0ICpwcGd0dCk7Cj4gICBpbnQg aTkxNV9wcGd0dF9pbml0X2h3KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpOwo+ICtpbnQgaTkxNV9w cGd0dF9pbml0X3Jpbmcoc3RydWN0IGludGVsX2VuZ2luZV9jcyAqcmluZyk7Cj4gICB2b2lkIGk5 MTVfcHBndHRfcmVsZWFzZShzdHJ1Y3Qga3JlZiAqa3JlZik7Cj4gICBzdHJ1Y3QgaTkxNV9od19w cGd0dCAqaTkxNV9wcGd0dF9jcmVhdGUoc3RydWN0IGRybV9kZXZpY2UgKmRldiwKPiAgIAkJCQkJ c3RydWN0IGRybV9pOTE1X2ZpbGVfcHJpdmF0ZSAqZnByaXYpOwo+CgpSZXZpZXdlZC1ieTogVG9t YXMgRWxmIDx0b21hcy5lbGZAaW50ZWwuY29tPgoKVGhhbmtzLApUb21hcwpfX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0 CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cDovL2xpc3RzLmZyZWVkZXNrdG9w Lm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeAo=