From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jesse Barnes Subject: Re: [PATCH 2/5] drm/i915: preserve swizzle settings if necessary v3 Date: Tue, 10 Jun 2014 10:27:11 -0700 Message-ID: <20140610102711.171104dc@jbarnes-desktop> References: <1401992671-2548-1-git-send-email-jbarnes@virtuousgeek.org> <1401992671-2548-2-git-send-email-jbarnes@virtuousgeek.org> <20140610140251.GP5821@phenom.ffwll.local> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <20140610140251.GP5821@phenom.ffwll.local> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: Daniel Vetter Cc: intel-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org List-Id: intel-gfx@lists.freedesktop.org T24gVHVlLCAxMCBKdW4gMjAxNCAxNjowMjo1MSArMDIwMApEYW5pZWwgVmV0dGVyIDxkYW5pZWxA ZmZ3bGwuY2g+IHdyb3RlOgoKPiBPbiBUaHUsIEp1biAwNSwgMjAxNCBhdCAxMToyNDoyOEFNIC0w NzAwLCBKZXNzZSBCYXJuZXMgd3JvdGU6Cj4gPiBTb21lIG1hY2hpbmVzIChsaWtlIE1CQXMpIG1p Z2h0IHVzZSBhIHRpbGVkIGZyYW1lYnVmZmVyIGJ1dCBub3QgZW5hYmxlCj4gPiBkaXNwbGF5IHN3 aXp6bGluZyBhdCBib290IHRpbWUuICBXZSB3YW50IHRvIHByZXNlcnZlIHRoYXQgY29uZmlndXJh dGlvbgo+ID4gaWYgcG9zc2libGUgdG8gcHJldmVudCBhIGJvb3QgdGltZSBtb2RlIHNldC4gIE9u IElWQisgaXQgc2hvdWxkbid0Cj4gPiBhZmZlY3QgcGVyZm9ybWFuY2UgYW55d2F5IHNpbmNlIHRo ZSBtZW1vcnkgY29udHJvbGxlciBkb2VzIGludGVybmFsCj4gPiBzd2l6emxpbmcgYW55d2F5Lgo+ ID4gCj4gPiBGb3IgbW9zdCBvdGhlciBjb25maWdzIHdlJ2xsIGJlIGFibGUgdG8gZW5hYmxlIHN3 aXp6bGluZyBhdCBib290IHRpbWUsCj4gPiBzaW5jZSB0aGUgaW5pdGlhbCBmcmFtZWJ1ZmZlciB3 b24ndCBiZSB0aWxlZCwgdGh1cyB3ZSB3b24ndCBzZWUgYW55Cj4gPiBjb3JydXB0aW9uIHdoZW4g d2UgZW5hYmxlIGl0Lgo+ID4gCj4gPiB2MjogcHJlc2VydmUgc3dpenpsaW5nIGlmIEJJT1MgaGFk IGl0IHNldCAoRGFuaWVsKQo+ID4gdjM6IHByZXNlcnZlIHN3aXp6bGluZyBvbmx5IGlmIHdlIGlu aGVyaXRlZCBhIHRpbGVkIGZyYW1lYnVmZmVyIChEYW5pZWwpCj4gPiAgICAgY2hlY2sgZGlzcGxh eSBzd2l6emxlIHNldHRpbmcgaW4gZGV0ZWN0X2JpdF82X3N3aXp6bGUgKERhbmllbCkKPiA+ICAg ICB1c2UgZ2VuNiBhcyBjdXRvZmYgcG9pbnQgKERhbmllbCkKPiA+IAo+ID4gUmVwb3J0ZWQtYnk6 IEtyaXN0aWFuIEjDuGdzYmVyZyA8aG9lZ3NiZXJnQGdtYWlsLmNvbT4KPiA+IFNpZ25lZC1vZmYt Ynk6IEplc3NlIEJhcm5lcyA8amJhcm5lc0B2aXJ0dW91c2dlZWsub3JnPgo+ID4gLS0tCj4gPiAg ZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuaCAgICAgICAgfCAgMSArCj4gPiAgZHJpdmVy cy9ncHUvZHJtL2k5MTUvaTkxNV9nZW0uYyAgICAgICAgfCAgMyArKysKPiA+ICBkcml2ZXJzL2dw dS9kcm0vaTkxNS9pOTE1X2dlbV90aWxpbmcuYyB8IDM4ICsrKysrKysrKysrKysrKysrKystLS0t LS0tLS0tLS0tLS0KPiA+ICBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMgICB8 ICAzICsrKwo+ID4gIDQgZmlsZXMgY2hhbmdlZCwgMjggaW5zZXJ0aW9ucygrKSwgMTcgZGVsZXRp b25zKC0pCj4gPiAKPiA+IGRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Ry di5oIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuaAo+ID4gaW5kZXggZjU3Yjc1Mi4u ZjQ5ZmRjYiAxMDA2NDQKPiA+IC0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmgK PiA+ICsrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmgKPiA+IEBAIC0xNDA1LDYg KzE0MDUsNyBAQCBzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSB7Cj4gPiAgCXN0cnVjdCBpbnRlbF92 YnRfZGF0YSB2YnQ7Cj4gPiAgCj4gPiAgCWJvb2wgYmlvc19zc2M7IC8qIEJJT1MgaGFkIFNTQyBl bmFibGVkIGF0IGJvb3Q/ICovCj4gPiArCWJvb2wgcHJlc2VydmVfYmlvc19zd2l6emxlOwo+ID4g IAo+ID4gIAkvKiBvdmVybGF5ICovCj4gPiAgCXN0cnVjdCBpbnRlbF9vdmVybGF5ICpvdmVybGF5 Owo+ID4gZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtLmMgYi9kcml2 ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbS5jCj4gPiBpbmRleCBiZmM3YWYwLi4wYjE2OGZiIDEw MDY0NAo+ID4gLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW0uYwo+ID4gKysrIGIv ZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW0uYwo+ID4gQEAgLTQ1ODAsNiArNDU4MCw5IEBA IHZvaWQgaTkxNV9nZW1faW5pdF9zd2l6emxpbmcoc3RydWN0IGRybV9kZXZpY2UgKmRldikKPiA+ ICAJICAgIGRldl9wcml2LT5tbS5iaXRfNl9zd2l6emxlX3ggPT0gSTkxNV9CSVRfNl9TV0laWkxF X05PTkUpCj4gPiAgCQlyZXR1cm47Cj4gPiAgCj4gPiArCWlmIChJTlRFTF9JTkZPKGRldiktPmdl biA+PSA2ICYmIGRldl9wcml2LT5wcmVzZXJ2ZV9iaW9zX3N3aXp6bGUpCj4gPiArCQlyZXR1cm47 Cj4gPiArCj4gCj4gQWJvdmUgdHdvIGh1bmtzIHNob3VsZG50IGJlIG5lZWRlZCBpZiB0aGUgc2V0 dXAgaW4KPiBpOTE1X2dlbV9kZXRlY3RfYml0XzZfc3dpenpsZSB3b3JrcyBjb3JyZWN0bHkuCj4g Cj4gPiAgCUk5MTVfV1JJVEUoRElTUF9BUkJfQ1RMLCBJOTE1X1JFQUQoRElTUF9BUkJfQ1RMKSB8 Cj4gPiAgCQkJCSBESVNQX1RJTEVfU1VSRkFDRV9TV0laWkxJTkcpOwo+ID4gIAo+ID4gZGlmZiAt LWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX3RpbGluZy5jIGIvZHJpdmVycy9n cHUvZHJtL2k5MTUvaTkxNV9nZW1fdGlsaW5nLmMKPiA+IGluZGV4IGNiMTUwZTguLjczMDA1YWQg MTAwNjQ0Cj4gPiAtLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV90aWxpbmcuYwo+ ID4gKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fdGlsaW5nLmMKPiA+IEBAIC05 MSwyNiArOTEsMzAgQEAgaTkxNV9nZW1fZGV0ZWN0X2JpdF82X3N3aXp6bGUoc3RydWN0IGRybV9k ZXZpY2UgKmRldikKPiA+ICAJdWludDMyX3Qgc3dpenpsZV94ID0gSTkxNV9CSVRfNl9TV0laWkxF X1VOS05PV047Cj4gPiAgCXVpbnQzMl90IHN3aXp6bGVfeSA9IEk5MTVfQklUXzZfU1dJWlpMRV9V TktOT1dOOwo+ID4gIAo+ID4gLQlpZiAoSVNfVkFMTEVZVklFVyhkZXYpKSB7Cj4gPiAtCQlzd2l6 emxlX3ggPSBJOTE1X0JJVF82X1NXSVpaTEVfTk9ORTsKPiA+IC0JCXN3aXp6bGVfeSA9IEk5MTVf QklUXzZfU1dJWlpMRV9OT05FOwo+ID4gLQl9IGVsc2UgaWYgKElOVEVMX0lORk8oZGV2KS0+Z2Vu ID49IDYpIHsKPiA+ICsJaWYgKElOVEVMX0lORk8oZGV2KS0+Z2VuID49IDYpIHsKPiA+ICAJCXVp bnQzMl90IGRpbW1fYzAsIGRpbW1fYzE7Cj4gPiAtCQlkaW1tX2MwID0gSTkxNV9SRUFEKE1BRF9E SU1NX0MwKTsKPiA+IC0JCWRpbW1fYzEgPSBJOTE1X1JFQUQoTUFEX0RJTU1fQzEpOwo+ID4gLQkJ ZGltbV9jMCAmPSBNQURfRElNTV9BX1NJWkVfTUFTSyB8IE1BRF9ESU1NX0JfU0laRV9NQVNLOwo+ ID4gLQkJZGltbV9jMSAmPSBNQURfRElNTV9BX1NJWkVfTUFTSyB8IE1BRF9ESU1NX0JfU0laRV9N QVNLOwo+ID4gLQkJLyogRW5hYmxlIHN3aXp6bGluZyB3aGVuIHRoZSBjaGFubmVscyBhcmUgcG9w dWxhdGVkIHdpdGgKPiA+IC0JCSAqIGlkZW50aWNhbGx5IHNpemVkIGRpbW1zLiBXZSBkb24ndCBu ZWVkIHRvIGNoZWNrIHRoZSAzcmQKPiA+IC0JCSAqIGNoYW5uZWwgYmVjYXVzZSBubyBjcHUgd2l0 aCBncHUgYXR0YWNoZWQgc2hpcHMgaW4gdGhhdAo+ID4gLQkJICogY29uZmlndXJhdGlvbi4gQWxz bywgc3dpenpsaW5nIG9ubHkgbWFrZXMgc2Vuc2UgZm9yIDIKPiA+IC0JCSAqIGNoYW5uZWxzIGFu eXdheS4gKi8KPiA+IC0JCWlmIChkaW1tX2MwID09IGRpbW1fYzEpIHsKPiA+IC0JCQlzd2l6emxl X3ggPSBJOTE1X0JJVF82X1NXSVpaTEVfOV8xMDsKPiA+IC0JCQlzd2l6emxlX3kgPSBJOTE1X0JJ VF82X1NXSVpaTEVfOTsKPiA+IC0JCX0gZWxzZSB7Cj4gPiArCj4gPiArCQkvKiBNYWtlIHN1cmUg dG8gaG9ub3IgYm9vdCB0aW1lIGRpc3BsYXkgY29uZmlndXJhdGlvbiAqLwo+ID4gKwkJaWYgKCEo STkxNV9SRUFEKERJU1BfQVJCX0NUTCkgJiBESVNQX1RJTEVfU1VSRkFDRV9TV0laWkxJTkcpKSB7 Cj4gCj4gTm90IHF1aXRlIHdoYXQgSSBoYWQgaW4gbWluZC4gSW1vIHdlIG5lZWQgdG8gY2hlY2sg Zm9yIHdoZXRoZXIgYW55Cj4gaW5oZXJpdGVkIGZicyBhcmUgdGlsZWQgYW5kIGlmIHNvIGFsc28g aW5oZXJpdCB0aGUgc3dpenpsZSBzZXR0aW5nCj4gdW5jb25kaXRpb25hbGx5LCB3aGV0aGVyIGl0 IGlzIHN3aXp6bGVkIG9yIHVuc3dpenpsZWQuIFNlZQo+IAo+IGh0dHA6Ly9wYXRjaHdvcmsuZnJl ZWRlc2t0b3Aub3JnL3BhdGNoLzIyMjA0LwoKWWVzLCB0aGF0J3Mgd2hhdCBJIGRvIGJlbG93Li4u IEkgZXZlbiBhZGRlZCBpdCB0byB0aGUgY2hhbmdlbG9nOgpodHRwOi8vcGF0Y2h3b3JrLmZyZWVk ZXNrdG9wLm9yZy9wYXRjaC8yNzIyMy8KCkRpZCB5b3UgbWlzcyB0aGUgbGF0ZXIgaHVuayBpbiBp bnRlbF9kaXNwbGF5LmM/CgpXaGF0IHdlIHRyeSB0byBkbyBoZXJlIGlzIGVuYWJsZSBzd2l6emxp bmcgaWYgcG9zc2libGUsIHdoaWNoIHdlIGNhbiBkbwppZiBubyBpbmhlcml0ZWQgZmJzIGFyZSB0 aWxlZC4KClNvIEkgdGhpbmsgSSd2ZSBkb25lIGV4YWN0bHkgd2hhdCB5b3UgcmVwZWF0ZWQgYWJv dmUsIGFuZCBkb2N1bWVudGVkCml0LiAgU28geW91J3JlIGdvaW5nIHRvIG5lZWQgdG8gcmVwZWF0 IGl0IHdpdGggZGlmZmVyZW50IHdvcmRzIHNvIEkgY2FuCnVuZGVyc3RhbmQsIGlmIEknbSBzdGls bCBtaXNzaW5nIHNvbWV0aGluZy4KClRoYW5rcywKLS0gCkplc3NlIEJhcm5lcywgSW50ZWwgT3Bl biBTb3VyY2UgVGVjaG5vbG9neSBDZW50ZXIKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX18KZHJpLWRldmVsIG1haWxpbmcgbGlzdApkcmktZGV2ZWxAbGlzdHMu ZnJlZWRlc2t0b3Aub3JnCmh0dHA6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0 aW5mby9kcmktZGV2ZWwK