From mboxrd@z Thu Jan 1 00:00:00 1970 From: Mika Kuoppala Subject: Re: [PATCH] drm/i915: tidy up gen8_init_scratch Date: Wed, 27 Apr 2016 14:26:45 +0300 Message-ID: <8760v3pa16.fsf@gaia.fi.intel.com> References: <1461662839-14690-1-git-send-email-matthew.auld@intel.com> <57209143.4030309@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 ESMTP id B272C6EA71 for ; Wed, 27 Apr 2016 11:29:12 +0000 (UTC) In-Reply-To: <57209143.4030309@intel.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" To: Dave Gordon , intel-gfx@lists.freedesktop.org, Matthew Auld List-Id: intel-gfx@lists.freedesktop.org RGF2ZSBHb3Jkb24gPGRhdmlkLnMuZ29yZG9uQGludGVsLmNvbT4gd3JpdGVzOgoKPiBbIHRleHQv cGxhaW4gXQo+IE9uIDI2LzA0LzE2IDEwOjI3LCBNYXR0aGV3IEF1bGQgd3JvdGU6Cj4+IFVzZSBn b3RvIHRlYXJkb3duIHBhdGggYW5kIGFsc28gZW5zdXJlIHdlIHJlc2V0IGFueSBzdHJ1Y3QgbWVt YmVycyB3aGljaAo+PiB3b3VsZCBvdGhlcndpc2UgY29udGFpbiBhbiBlcnJvciBlbmNvZGVkIHBv aW50ZXIsIGFuZCBjb3VsZCBiZSBtaXN0YWtlbgo+PiBmb3IgYSB2YWxpZCBhZGRyZXNzLgo+Pgo+ PiBDYzogSm9vbmFzIExhaHRpbmVuIDxqb29uYXMubGFodGluZW5AbGludXguaW50ZWwuY29tPgo+ PiBTaWduZWQtb2ZmLWJ5OiBNYXR0aGV3IEF1bGQgPG1hdHRoZXcuYXVsZEBpbnRlbC5jb20+Cj4+ IC0tLQo+PiAgIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2d0dC5jIHwgMzYgKysrKysr KysrKysrKysrKysrKysrKysrKy0tLS0tLS0tLS0tCj4+ICAgMSBmaWxlIGNoYW5nZWQsIDI1IGlu c2VydGlvbnMoKyksIDExIGRlbGV0aW9ucygtKQo+Pgo+PiBkaWZmIC0tZ2l0IGEvZHJpdmVycy9n cHUvZHJtL2k5MTUvaTkxNV9nZW1fZ3R0LmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dl bV9ndHQuYwo+PiBpbmRleCAwZDY2NmIzLi5hNzIzYjc0IDEwMDY0NAo+PiAtLS0gYS9kcml2ZXJz L2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9ndHQuYwo+PiArKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkx NS9pOTE1X2dlbV9ndHQuYwo+PiBAQCAtODY2LDMxICs4NjYsMzEgQEAgc3RhdGljIHZvaWQgZ2Vu OF9mcmVlX3BhZ2VfdGFibGVzKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsCj4+ICAgc3RhdGljIGlu dCBnZW44X2luaXRfc2NyYXRjaChzdHJ1Y3QgaTkxNV9hZGRyZXNzX3NwYWNlICp2bSkKPj4gICB7 Cj4+ICAgCXN0cnVjdCBkcm1fZGV2aWNlICpkZXYgPSB2bS0+ZGV2Owo+PiArCWludCByZXQ7Cj4+ Cj4+ICAgCXZtLT5zY3JhdGNoX3BhZ2UgPSBhbGxvY19zY3JhdGNoX3BhZ2UoZGV2KTsKPj4gLQlp ZiAoSVNfRVJSKHZtLT5zY3JhdGNoX3BhZ2UpKQo+PiAtCQlyZXR1cm4gUFRSX0VSUih2bS0+c2Ny YXRjaF9wYWdlKTsKPj4gKwlpZiAoSVNfRVJSKHZtLT5zY3JhdGNoX3BhZ2UpKSB7Cj4+ICsJCXJl dCA9IFBUUl9FUlIodm0tPnNjcmF0Y2hfcGFnZSk7Cj4+ICsJCWdvdG8gZmFpbF9zY3JhdGNoOwo+ PiArCX0KPj4KPj4gICAJdm0tPnNjcmF0Y2hfcHQgPSBhbGxvY19wdChkZXYpOwo+PiAgIAlpZiAo SVNfRVJSKHZtLT5zY3JhdGNoX3B0KSkgewo+PiAtCQlmcmVlX3NjcmF0Y2hfcGFnZShkZXYsIHZt LT5zY3JhdGNoX3BhZ2UpOwo+PiAtCQlyZXR1cm4gUFRSX0VSUih2bS0+c2NyYXRjaF9wdCk7Cj4+ ICsJCXJldCA9IFBUUl9FUlIodm0tPnNjcmF0Y2hfcHQpOwo+PiArCQlnb3RvIGZhaWxfcHQ7Cj4+ ICAgCX0KPj4KPj4gICAJdm0tPnNjcmF0Y2hfcGQgPSBhbGxvY19wZChkZXYpOwo+PiAgIAlpZiAo SVNfRVJSKHZtLT5zY3JhdGNoX3BkKSkgewo+PiAtCQlmcmVlX3B0KGRldiwgdm0tPnNjcmF0Y2hf cHQpOwo+PiAtCQlmcmVlX3NjcmF0Y2hfcGFnZShkZXYsIHZtLT5zY3JhdGNoX3BhZ2UpOwo+PiAt CQlyZXR1cm4gUFRSX0VSUih2bS0+c2NyYXRjaF9wZCk7Cj4+ICsJCXJldCA9IFBUUl9FUlIodm0t PnNjcmF0Y2hfcGQpOwo+PiArCQlnb3RvIGZhaWxfcGQ7Cj4+ICAgCX0KPj4KPj4gICAJaWYgKFVT RVNfRlVMTF80OEJJVF9QUEdUVChkZXYpKSB7Cj4+ICAgCQl2bS0+c2NyYXRjaF9wZHAgPSBhbGxv Y19wZHAoZGV2KTsKPj4gICAJCWlmIChJU19FUlIodm0tPnNjcmF0Y2hfcGRwKSkgewo+PiAtCQkJ ZnJlZV9wZChkZXYsIHZtLT5zY3JhdGNoX3BkKTsKPj4gLQkJCWZyZWVfcHQoZGV2LCB2bS0+c2Ny YXRjaF9wdCk7Cj4+IC0JCQlmcmVlX3NjcmF0Y2hfcGFnZShkZXYsIHZtLT5zY3JhdGNoX3BhZ2Up Owo+PiAtCQkJcmV0dXJuIFBUUl9FUlIodm0tPnNjcmF0Y2hfcGRwKTsKPj4gKwkJCXJldCA9IFBU Ul9FUlIodm0tPnNjcmF0Y2hfcGRwKTsKPj4gKwkJCWdvdG8gZmFpbF9wZHA7Cj4+ICAgCQl9Cj4+ ICAgCX0KPj4KPj4gQEAgLTkwMCw2ICs5MDAsMjAgQEAgc3RhdGljIGludCBnZW44X2luaXRfc2Ny YXRjaChzdHJ1Y3QgaTkxNV9hZGRyZXNzX3NwYWNlICp2bSkKPj4gICAJCWdlbjhfaW5pdGlhbGl6 ZV9wZHAodm0sIHZtLT5zY3JhdGNoX3BkcCk7Cj4+Cj4+ICAgCXJldHVybiAwOwo+PiArCj4+ICtm YWlsX3BkcDoKPj4gKwl2bS0+c2NyYXRjaF9wZHAgPSBOVUxMOwo+PiArCWZyZWVfcGQoZGV2LCB2 bS0+c2NyYXRjaF9wZCk7Cj4+ICtmYWlsX3BkOgo+PiArCXZtLT5zY3JhdGNoX3BkID0gTlVMTDsK Pj4gKwlmcmVlX3B0KGRldiwgdm0tPnNjcmF0Y2hfcHQpOwo+PiArZmFpbF9wdDoKPj4gKwl2bS0+ c2NyYXRjaF9wdCA9IE5VTEw7Cj4+ICsJZnJlZV9zY3JhdGNoX3BhZ2UoZGV2LCB2bS0+c2NyYXRj aF9wYWdlKTsKPj4gK2ZhaWxfc2NyYXRjaDoKPj4gKwl2bS0+c2NyYXRjaF9wYWdlID0gTlVMTDsK Pj4gKwo+PiArCXJldHVybiByZXQ7Cj4+ICAgfQo+Pgo+PiAgIHN0YXRpYyBpbnQgZ2VuOF9wcGd0 dF9ub3RpZnlfdmd0KHN0cnVjdCBpOTE1X2h3X3BwZ3R0ICpwcGd0dCwgYm9vbCBjcmVhdGUpCj4K PiBXZWxsLCBJIGFncmVlIGl0J3MgYSBnb29kIGlkZWEgbm90IHRvIGFzc2lnbiBub24tTlVMTCBw b2ludGVyIHZhbHVlcyB0byAKPiBtZW1iZXJzIG9mIGFuIE9VVCBwYXJhbWV0ZXIsIGJ1dCBwZXJo YXBzIGNvbnNpZGVyIGEgc3RyYXRlZ3kgb2YgCj4gYXNzaWduaW5nIHRvIGEgbG9jYWwsIGNoZWNr aW5nIHRoZSByZXN1bHQsIGFuZCBzdG9yaW5nIGluIHRoZSBwYXJhbWV0ZXIgCj4gYmxvY2sgb25s eSBhZnRlciB3ZSBrbm93IHRoYXQgaXQncyBhIGdvb2QgcG9pbnRlci4gTWF5YmUgZXZlbiBrZWVw IEFMTCAKPiB0aGUgdGVtcG9yYXJ5IHBvaW50ZXJzIGxvY2FsIGFuZCBvbmx5IGFzc2lnbiAqYW55 KiBvZiB0aGVtIHdoZW4gd2Uga25vdyAKPiB3ZSBjYW4gYXNzaWduICphbGwqIG9mIHRoZW0gYW5k IHJldHVybiBzdWNjZXNzLiBUaGF0IHdheSB0aGVyZSdzIG5vIAo+IGNsZWFudXAgb2YgdGhlIHJl c3VsdCBibG9jayByZXF1aXJlZCBpbiB0aGUgZXJyb3IgcGF0aCwgb25seSBmcmVlaW5nIG9mIAo+ IHN0aWxsLWxvY2FsIHZhbHVlcy4KCkxvY2FsIHdvdWxkIGJlIGNsZWFuIGJ1dCB0aGVuIGl0IHdv dWxkIGJlIGJ1cmRlbiBvbiB0aGUgaG90IHBhdGguCkxldHMganVzdCBpbmN1ciB0aGUsIG5vdyB1 c2VsZXNzLCB3cml0ZXMgb24gdGhlIGVycm9yIHBhdGguCgo+Cj4gQlRXLCBhcyBpdCBhcHBlYXJz IHRoYXQgdGhpcyBmdW5jdGlvbiBjYW4gYmUgY2FsbGVkIG1vcmUgdGhhbiBvbmNlIGluIAo+IHRo ZSBsaWZldGltZSBvZiB0aGUgZHJpdmVyLCBkbyB3ZSBrbm93IHRoYXQgYWxsIHRoZXNlIHBvaW50 ZXJzIHdpbGwgYmUgCj4gTlVMTCBvbiBlbnRyeT8gRXZlbiBvbiB0aGUgc2Vjb25kIGFuZCBzdWJz ZXF1ZW50IGNhbGxzPwo+CgpUaGUgZGVmZW5zaXZlIHByb2dyYW1taW5nIG9mIGlzIGdvb2QsIGJ1 dCBpbiB0aGlzIGNhc2Ugd2UKa3phbGxvYyB0aGUgcHBndHQsIHdoaWNoIGNvbnRhaW5zIHRoZSBz dHJ1Y3Qgd2UgYXJlIGluaXRpYWxpemluZy4KSWYgd2UgYXJlIHVuc3VjY2Vzc2Z1bCwgd2UgZnJl ZSB0aGUgcHBndHQuIEFuZCB0aGUgZnVuY3Rpb24gaXMgc3RhdGljCnNvIHRoZXJlIGFyZSBubyBl eHRlcm5hbCB1c2Vycy4gCgpUaGF0IHNhaWQsIHRoZSB2YWx1ZSBvZiBzZXBhcmF0aW5nIHRoZSBl cnJvciBoYW5kbGluZyBpbnRvCmEgZ290byB0ZWFyZG93biBpcyB2YWx1YWJsZSBmb3IgcmVhZGFi aWxpdHkuCgpDaGFuZ2UgdGhlIGdvdG8gbGFiZWxzIGFzIEpvb25hcyBzdWdnZXN0ZWQgYW5kIEkg YW0Kb2sgd2l0aCB0aGlzLgoKVGhhbmtzLAotTWlrYQoKLQo+IC5EYXZlLgo+IF9fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCj4gSW50ZWwtZ2Z4IG1haWxpbmcg bGlzdAo+IEludGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKPiBodHRwczovL2xpc3RzLmZy ZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeApfX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0Cklu dGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5v cmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK