From mboxrd@z Thu Jan 1 00:00:00 1970 From: Daniel Vetter Subject: Re: [PATCH 37/42] drm/i915: swap state correctly in intel_atomic_commit Date: Tue, 12 May 2015 15:03:31 +0200 Message-ID: <20150512130331.GU15256@phenom.ffwll.local> References: <1431354318-11995-1-git-send-email-maarten.lankhorst@linux.intel.com> <1431354318-11995-38-git-send-email-maarten.lankhorst@linux.intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mail-wg0-f41.google.com (mail-wg0-f41.google.com [74.125.82.41]) by gabe.freedesktop.org (Postfix) with ESMTP id 612106E5F3 for ; Tue, 12 May 2015 06:01:11 -0700 (PDT) Received: by wgic8 with SMTP id c8so8896533wgi.1 for ; Tue, 12 May 2015 06:01:10 -0700 (PDT) Content-Disposition: inline In-Reply-To: <1431354318-11995-38-git-send-email-maarten.lankhorst@linux.intel.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" To: Maarten Lankhorst Cc: Ander Conselvan de Oliveira , intel-gfx@lists.freedesktop.org List-Id: intel-gfx@lists.freedesktop.org T24gTW9uLCBNYXkgMTEsIDIwMTUgYXQgMDQ6MjU6MTNQTSArMDIwMCwgTWFhcnRlbiBMYW5raG9y c3Qgd3JvdGU6Cj4gY3J0Yy0+Y29uZmlnIGlzIGdvbmUsIHN3YXAgc3dhcCBzd2FwLiA6RAo+IAo+ IFNpZ25lZC1vZmYtYnk6IE1hYXJ0ZW4gTGFua2hvcnN0IDxtYWFydGVuLmxhbmtob3JzdEBsaW51 eC5pbnRlbC5jb20+Cj4gLS0tCj4gIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2F0b21pYy5j ICB8IDM2ICsrLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLQo+ICBkcml2ZXJzL2dw dS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMgfCAgNyArKysrKy0tCj4gIDIgZmlsZXMgY2hhbmdl ZCwgNyBpbnNlcnRpb25zKCspLCAzNiBkZWxldGlvbnMoLSkKPiAKPiBkaWZmIC0tZ2l0IGEvZHJp dmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfYXRvbWljLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9p bnRlbF9hdG9taWMuYwo+IGluZGV4IGFjZTZhZWViMTM1OS4uMDMxNWRjNDRiMTdhIDEwMDY0NAo+ IC0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2F0b21pYy5jCj4gKysrIGIvZHJpdmVy cy9ncHUvZHJtL2k5MTUvaW50ZWxfYXRvbWljLmMKPiBAQCAtMTMwLDcgKzEzMCw2IEBAIGludCBp bnRlbF9hdG9taWNfY29tbWl0KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsCj4gIAkJCWJvb2wgYXN5 bmMpCj4gIHsKPiAgCWludCByZXQ7Cj4gLQlpbnQgaTsKPiAgCj4gIAlpZiAoYXN5bmMpIHsKPiAg CQlEUk1fREVCVUdfS01TKCJpOTE1IGRvZXMgbm90IHlldCBzdXBwb3J0IGFzeW5jIGNvbW1pdFxu Iik7Cj4gQEAgLTE0Miw0OCArMTQxLDE3IEBAIGludCBpbnRlbF9hdG9taWNfY29tbWl0KHN0cnVj dCBkcm1fZGV2aWNlICpkZXYsCj4gIAkJcmV0dXJuIHJldDsKPiAgCj4gIAkvKiBQb2ludCBvZiBu byByZXR1cm4gKi8KPiArCWRybV9hdG9taWNfaGVscGVyX3N3YXBfc3RhdGUoZGV2LCBzdGF0ZSk7 Cj4gIAo+ICAJLyoKPiAgCSAqIEZJWE1FOiAgVGhlIHByb3BlciBzZXF1ZW5jZSBoZXJlIHdpbGwg ZXZlbnR1YWxseSBiZToKPiAgCSAqCj4gLQkgKiBkcm1fYXRvbWljX2hlbHBlcl9zd2FwX3N0YXRl KGRldiwgc3RhdGUpCj4gIAkgKiBkcm1fYXRvbWljX2hlbHBlcl9jb21taXRfbW9kZXNldF9kaXNh YmxlcyhkZXYsIHN0YXRlKTsKPiAgCSAqIGRybV9hdG9taWNfaGVscGVyX2NvbW1pdF9wbGFuZXMo ZGV2LCBzdGF0ZSk7Cj4gIAkgKiBkcm1fYXRvbWljX2hlbHBlcl9jb21taXRfbW9kZXNldF9lbmFi bGVzKGRldiwgc3RhdGUpOwo+IC0JICogZHJtX2F0b21pY19oZWxwZXJfd2FpdF9mb3JfdmJsYW5r cyhkZXYsIHN0YXRlKTsKPiAtCSAqIGRybV9hdG9taWNfaGVscGVyX2NsZWFudXBfcGxhbmVzKGRl diwgc3RhdGUpOwo+IC0JICogZHJtX2F0b21pY19zdGF0ZV9mcmVlKHN0YXRlKTsKPiAtCSAqCj4g LQkgKiBvbmNlIHdlIGhhdmUgZnVsbCBhdG9taWMgbW9kZXNldC4gIEZvciBub3csIGp1c3QgbWFu dWFsbHkgdXBkYXRlCj4gLQkgKiBwbGFuZSBzdGF0ZXMgdG8gYXZvaWQgY2xvYmJlcmluZyBnb29k IHN0YXRlcyB3aXRoIGR1bW15IHN0YXRlcwo+IC0JICogd2hpbGUgbnVjbGVhciBwYWdlZmxpcHBp bmcuCj4gIAkgKi8KPiAtCWZvciAoaSA9IDA7IGkgPCBkZXYtPm1vZGVfY29uZmlnLm51bV90b3Rh bF9wbGFuZTsgaSsrKSB7Cj4gLQkJc3RydWN0IGRybV9wbGFuZSAqcGxhbmUgPSBzdGF0ZS0+cGxh bmVzW2ldOwo+IC0KPiAtCQlpZiAoIXBsYW5lKQo+IC0JCQljb250aW51ZTsKPiAtCj4gLQkJcGxh bmUtPnN0YXRlLT5zdGF0ZSA9IHN0YXRlOwo+IC0JCXN3YXAoc3RhdGUtPnBsYW5lX3N0YXRlc1tp XSwgcGxhbmUtPnN0YXRlKTsKPiAtCQlwbGFuZS0+c3RhdGUtPnN0YXRlID0gTlVMTDsKPiAtCX0K PiAtCj4gLQkvKiBzd2FwIGNydGNfc2NhbGVyX3N0YXRlICovCj4gLQlmb3IgKGkgPSAwOyBpIDwg ZGV2LT5tb2RlX2NvbmZpZy5udW1fY3J0YzsgaSsrKSB7Cj4gLQkJc3RydWN0IGRybV9jcnRjICpj cnRjID0gc3RhdGUtPmNydGNzW2ldOwo+IC0JCWlmICghY3J0Yykgewo+IC0JCQljb250aW51ZTsK PiAtCQl9Cj4gLQo+IC0JCXRvX2ludGVsX2NydGNfc3RhdGUoY3J0Yy0+c3RhdGUpLT5zY2FsZXJf c3RhdGUgPQo+IC0JCQl0b19pbnRlbF9jcnRjX3N0YXRlKHN0YXRlLT5jcnRjX3N0YXRlc1tpXSkt PnNjYWxlcl9zdGF0ZTsKPiAtCj4gLQkJaWYgKElOVEVMX0lORk8oZGV2KS0+Z2VuID49IDkpCj4g LQkJCXNrbF9kZXRhY2hfc2NhbGVycyh0b19pbnRlbF9jcnRjKGNydGMpKTsKPiAtCX0KPiAtCj4g IAlkcm1fYXRvbWljX2hlbHBlcl9jb21taXRfcGxhbmVzKGRldiwgc3RhdGUpOwo+ICsKPiAgCWRy bV9hdG9taWNfaGVscGVyX3dhaXRfZm9yX3ZibGFua3MoZGV2LCBzdGF0ZSk7Cj4gIAlkcm1fYXRv bWljX2hlbHBlcl9jbGVhbnVwX3BsYW5lcyhkZXYsIHN0YXRlKTsKPiAgCWRybV9hdG9taWNfc3Rh dGVfZnJlZShzdGF0ZSk7Cj4gZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVs X2Rpc3BsYXkuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYwo+IGluZGV4 IDY1ZWUyY2QwNDM3Yy4uMTA1YmRmODRlNDZhIDEwMDY0NAo+IC0tLSBhL2RyaXZlcnMvZ3B1L2Ry bS9pOTE1L2ludGVsX2Rpc3BsYXkuYwo+ICsrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVs X2Rpc3BsYXkuYwo+IEBAIC0xMzIwMiwxMSArMTMyMDIsMTQgQEAgc3RhdGljIHZvaWQgaW50ZWxf YmVnaW5fY3J0Y19jb21taXQoc3RydWN0IGRybV9jcnRjICpjcnRjKQo+ICAKPiAgCS8qIFBlcmZv cm0gdmJsYW5rIGV2YXNpb24gYXJvdW5kIGNvbW1pdCBvcGVyYXRpb24gKi8KPiAgCWlmIChpbnRl bF9jcnRjLT5hdG9taWMuZXZhZGUgJiYKPiAtCSAgICAhZGV2X3ByaXYtPnBvd2VyX2RvbWFpbnMu aW5pdF9wb3dlcl9vbikKPiArCSAgICAhZGV2X3ByaXYtPnBvd2VyX2RvbWFpbnMuaW5pdF9wb3dl cl9vbikgewo+ICsJCWlmIChkZXZfcHJpdi0+aW5mby5nZW4gPj0gOSkKPiArCQkJc2tsX2RldGFj aF9zY2FsZXJzKHRvX2ludGVsX2NydGMoY3J0YykpOwoKRG9uJ3Qgd2UgbmVlZCB0byB1cGRhdGUg c2tsX2RldGFjaF9zY2FsZXJzIHRvIGxvb2sgYXQgdGhlIG90aGVyIGNvbmZpZwpub3c/IE9yIGlz IHRoaXMgYW4gaXNzdWUgd2l0aCB0aGUgcGF0Y2ggc3BsaXR0aW5nPwoKQWxzbyB3aHkgaXMgdGhp cyBwcm90ZWN0ZWQgYnkgYXRvbWljLmV2YWRlPwotRGFuaWVsCgo+ICsKPiAgCQlpbnRlbF9jcnRj LT5hdG9taWMuZXZhZGUgPQo+ICAJCQlpbnRlbF9waXBlX3VwZGF0ZV9zdGFydChpbnRlbF9jcnRj LAo+ICAJCQkJCQkmaW50ZWxfY3J0Yy0+YXRvbWljLnN0YXJ0X3ZibF9jb3VudCk7Cj4gLQllbHNl Cj4gKwl9IGVsc2UKPiAgCQlpbnRlbF9jcnRjLT5hdG9taWMuZXZhZGUgPSBmYWxzZTsKPiAgfQo+ ICAKPiAtLSAKPiAyLjEuMAo+IAo+IF9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fCj4gSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdAo+IEludGVsLWdmeEBsaXN0cy5m cmVlZGVza3RvcC5vcmcKPiBodHRwOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlz dGluZm8vaW50ZWwtZ2Z4CgotLSAKRGFuaWVsIFZldHRlcgpTb2Z0d2FyZSBFbmdpbmVlciwgSW50 ZWwgQ29ycG9yYXRpb24KaHR0cDovL2Jsb2cuZmZ3bGwuY2gKX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1n ZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHA6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFp bG1hbi9saXN0aW5mby9pbnRlbC1nZngK