From mboxrd@z Thu Jan 1 00:00:00 1970 From: Daniel Vetter Subject: Re: [PATCH] drm/i915: Ensure plane->state->fb stays in sync with plane->fb Date: Wed, 4 Feb 2015 10:39:48 +0100 Message-ID: <20150204093948.GD14009@phenom.ffwll.local> References: <1422997804-3871-1-git-send-email-matthew.d.roper@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mail-wg0-f47.google.com (mail-wg0-f47.google.com [74.125.82.47]) by gabe.freedesktop.org (Postfix) with ESMTP id B561F6E17E for ; Wed, 4 Feb 2015 01:38:26 -0800 (PST) Received: by mail-wg0-f47.google.com with SMTP id n12so608433wgh.6 for ; Wed, 04 Feb 2015 01:38:25 -0800 (PST) Content-Disposition: inline In-Reply-To: <1422997804-3871-1-git-send-email-matthew.d.roper@intel.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" To: Matt Roper Cc: intel-gfx@lists.freedesktop.org List-Id: intel-gfx@lists.freedesktop.org T24gVHVlLCBGZWIgMDMsIDIwMTUgYXQgMDE6MTA6MDRQTSAtMDgwMCwgTWF0dCBSb3BlciB3cm90 ZToKPiBwbGFuZS0+c3RhdGUtPmZiIGFuZCBwbGFuZS0+ZmIgc2hvdWxkIGFsd2F5cyByZWZlcmVu Y2UgdGhlIHNhbWUgRkIgc28KPiB0aGF0IGF0b21pYyBhbmQgbGVnYWN5IGNvZGVwYXRocyBoYXZl IHRoZSBzYW1lIHZpZXcgb2YgZGlzcGxheSBzdGF0ZS4KPiBJbiBjb21taXQKPiAKPiAgICAgICAg IGNvbW1pdCBkYjA2ODQyMDU2MDUxMWRlODBhYzU5MjIyNjQ0ZjJiZGYyNzhjM2Q1Cj4gICAgICAg ICBBdXRob3I6IE1hdHQgUm9wZXIgPG1hdHRoZXcuZC5yb3BlckBpbnRlbC5jb20+Cj4gICAgICAg ICBEYXRlOiAgIEZyaSBKYW4gMzAgMTY6MjI6MzYgMjAxNSAtMDgwMAo+IAo+ICAgICAgICAgICAg IGRybS9pOTE1OiBLZWVwIHBsYW5lLT5zdGF0ZSB1cGRhdGVkIG9uIHBhZ2VmbGlwCj4gCj4gd2Ug YWxyZWFkeSBmaXhlZCBvbmUgY2FzZSB3aGVyZSB0aGVzZSB0d28gcG9pbnRlcnMgY291bGQgZ2V0 IG91dCBvZgo+IHN5bmMuICBIb3dldmVyIGl0IHR1cm5zIG91dCB0aGVyZSBhcmUgYSBmZXcgb3Ro ZXIgcGxhY2VzIChtYWlubHkgZGVhbGluZwo+IHdpdGggaW5pdGlhbCBGQiBzZXR1cCBhdCBib290 KSB0aGF0IGRpcmVjdGx5IHNldCBwbGFuZS0+ZmIgYW5kIG5lZ2xlY3QKPiB0byB1cGRhdGUgcGxh bmUtPnN0YXRlLT5mYi4gIElmIHdlIG5ldmVyIGRvIGEgc3VjY2Vzc2Z1bCB1cGRhdGUgdGhyb3Vn aAo+IHRoZSBhdG9taWMgcGlwZWxpbmUsIHRoZSBSbUZCIGNsZWFudXAgY29kZSB3aWxsIGxvb2sg YXQgdGhlCj4gcGxhbmUtPnN0YXRlLT5mYiBwb2ludGVyLCB3aGljaCBoYXMgbmV2ZXIgYWN0dWFs bHkgYmVlbiBzZXQgdG8gYQo+IGxlZ2l0aW1hdGUgdmFsdWUsIGFuZCB0cnkgdG8gY2xlYW4gaXQg dXAsIGxlYWRpbmcgdG8gQlVHJ3MuCj4gCj4gQWRkIGEgcXVpY2sgaGVscGVyIGZ1bmN0aW9uIHRv IHN5bmNocm9uaXplIHBsYW5lLT5zdGF0ZS0+ZmIgd2l0aAo+IHBsYW5lLT5mYiAoYW5kIHVwZGF0 ZSByZWZlcmVuY2UgY291bnRzIGFjY29yZGluZ2x5KSBhbmQgY2FsbCBpdAo+IGV2ZXJ5d2hlcmUg dGhlIGRyaXZlciB0cmllcyB0byBtYW51YWxseSBzZXQgcGxhbmUtPmZiIG91dHNpZGUgb2YgdGhl Cj4gYXRvbWljIHBpcGVsaW5lLgo+IAo+IEJ1Z3ppbGxhOiBodHRwczovL2J1Z3MuZnJlZWRlc2t0 b3Aub3JnL3Nob3dfYnVnLmNnaT9pZD04ODkwOQo+IFNpZ25lZC1vZmYtYnk6IE1hdHQgUm9wZXIg PG1hdHRoZXcuZC5yb3BlckBpbnRlbC5jb20+CgpVbnJlbGF0ZWQgdGhpbmcgSSd2ZSBzcG90dGVk IHdoaWxlIHJldmlld2luZyB0aGlzOiBXZSBzdGlsbCB1cGRhdGUKcGxhbmUtPmZiIGluIG91ciBw bGFuZSBjb21taXQgaG9va3MsIGJ1dCBoZWxwZXJzIHNob3VsZCB0YWtlIGNhcmUgb2YgdGhhdC4K RG8gd2Ugc3RpbGwgaGF2ZSB0aGVzZSBiZWNhdXNlIG91ciBjb2RlIHN0aWxsIGxvb2tzIGF0IHBs YW5lLT5mYiBpbnN0ZWFkCm9mIHBsYW5lLT5zdGF0ZS0+ZmIgb3IgaXMgdGhlcmUgc29tZSBkZWVw ZXIgcmVhc29uPwoKSSB0aGluayBhIGxhcmdlLXNjYWxlIHMvcGxhbmUtPmZiL3BsYW5lLT5zdGF0 ZS0+ZmIvIGFuZCB0aGVuIHJlbW92aW5nCnRob3NlIGFuZCByZWx5aW5nIHVwb24gdGhlIGZpeHVw IGNvZGUgaW4gdGhlIGhlbHBlcnMvY29yZSB3b3VsZCBiZSBnb29kLgpVbmZvcnR1bmF0ZWx5IHdl IGNhbid0IGNvY2NpIHRoaXMgc2luY2Ugd2UgbmVlZCB0byBrZWVwIGEgZmV3IC4uLgoKQW55d2F5 LCBwYXRjaCBsZ3RtIGFuZCBpcyBtZXJnZWQuCgpUaGFua3MsIERhbmllbAo+IC0tLQo+ICBkcml2 ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMgfCAyOSArKysrKysrKysrKysrKysrKysr KysrLS0tLS0tLQo+ICAxIGZpbGUgY2hhbmdlZCwgMjIgaW5zZXJ0aW9ucygrKSwgNyBkZWxldGlv bnMoLSkKPiAKPiBkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxh eS5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jCj4gaW5kZXggMjEzYjg3 MC4uZTVjMDU3OSAxMDA2NDQKPiAtLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNw bGF5LmMKPiArKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMKPiBAQCAt MjQxMCw2ICsyNDEwLDIwIEBAIG91dF91bnJlZl9vYmo6Cj4gIAlyZXR1cm4gZmFsc2U7Cj4gIH0K PiAgCj4gKy8qIFVwZGF0ZSBwbGFuZS0+c3RhdGUtPmZiIHRvIG1hdGNoIHBsYW5lLT5mYiBhZnRl ciBkcml2ZXItaW50ZXJuYWwgdXBkYXRlcyAqLwo+ICtzdGF0aWMgdm9pZAo+ICt1cGRhdGVfc3Rh dGVfZmIoc3RydWN0IGRybV9wbGFuZSAqcGxhbmUpCj4gK3sKPiArCWlmIChwbGFuZS0+ZmIgPT0g cGxhbmUtPnN0YXRlLT5mYikKPiArCQlyZXR1cm47Cj4gKwo+ICsJaWYgKHBsYW5lLT5zdGF0ZS0+ ZmIpCj4gKwkJZHJtX2ZyYW1lYnVmZmVyX3VucmVmZXJlbmNlKHBsYW5lLT5zdGF0ZS0+ZmIpOwo+ ICsJcGxhbmUtPnN0YXRlLT5mYiA9IHBsYW5lLT5mYjsKPiArCWlmIChwbGFuZS0+c3RhdGUtPmZi KQo+ICsJCWRybV9mcmFtZWJ1ZmZlcl9yZWZlcmVuY2UocGxhbmUtPnN0YXRlLT5mYik7Cj4gK30K PiArCj4gIHN0YXRpYyB2b2lkCj4gIGludGVsX2ZpbmRfcGxhbmVfb2JqKHN0cnVjdCBpbnRlbF9j cnRjICppbnRlbF9jcnRjLAo+ICAJCSAgICAgc3RydWN0IGludGVsX2luaXRpYWxfcGxhbmVfY29u ZmlnICpwbGFuZV9jb25maWcpCj4gQEAgLTI0NTYsNiArMjQ3MCw4IEBAIGludGVsX2ZpbmRfcGxh bmVfb2JqKHN0cnVjdCBpbnRlbF9jcnRjICppbnRlbF9jcnRjLAo+ICAJCQlicmVhazsKPiAgCQl9 Cj4gIAl9Cj4gKwo+ICsJdXBkYXRlX3N0YXRlX2ZiKGludGVsX2NydGMtPmJhc2UucHJpbWFyeSk7 Cj4gIH0KPiAgCj4gIHN0YXRpYyB2b2lkIGk5eHhfdXBkYXRlX3ByaW1hcnlfcGxhbmUoc3RydWN0 IGRybV9jcnRjICpjcnRjLAo+IEBAIC02NjM1LDYgKzY2NTEsNyBAQCBpOXh4X2dldF9pbml0aWFs X3BsYW5lX2NvbmZpZyhzdHJ1Y3QgaW50ZWxfY3J0YyAqY3J0YywKPiAgCQkgICAgICBwbGFuZV9j b25maWctPnNpemUpOwo+ICAKPiAgCWNydGMtPmJhc2UucHJpbWFyeS0+ZmIgPSBmYjsKPiArCXVw ZGF0ZV9zdGF0ZV9mYihjcnRjLT5iYXNlLnByaW1hcnkpOwo+ICB9Cj4gIAo+ICBzdGF0aWMgdm9p ZCBjaHZfY3J0Y19jbG9ja19nZXQoc3RydWN0IGludGVsX2NydGMgKmNydGMsCj4gQEAgLTc2NzIs NiArNzY4OSw3IEBAIHNreWxha2VfZ2V0X2luaXRpYWxfcGxhbmVfY29uZmlnKHN0cnVjdCBpbnRl bF9jcnRjICpjcnRjLAo+ICAJCSAgICAgIHBsYW5lX2NvbmZpZy0+c2l6ZSk7Cj4gIAo+ICAJY3J0 Yy0+YmFzZS5wcmltYXJ5LT5mYiA9IGZiOwo+ICsJdXBkYXRlX3N0YXRlX2ZiKGNydGMtPmJhc2Uu cHJpbWFyeSk7Cj4gIAlyZXR1cm47Cj4gIAo+ICBlcnJvcjoKPiBAQCAtNzc2Myw2ICs3NzgxLDcg QEAgaXJvbmxha2VfZ2V0X2luaXRpYWxfcGxhbmVfY29uZmlnKHN0cnVjdCBpbnRlbF9jcnRjICpj cnRjLAo+ICAJCSAgICAgIHBsYW5lX2NvbmZpZy0+c2l6ZSk7Cj4gIAo+ICAJY3J0Yy0+YmFzZS5w cmltYXJ5LT5mYiA9IGZiOwo+ICsJdXBkYXRlX3N0YXRlX2ZiKGNydGMtPmJhc2UucHJpbWFyeSk7 Cj4gIH0KPiAgCj4gIHN0YXRpYyBib29sIGlyb25sYWtlX2dldF9waXBlX2NvbmZpZyhzdHJ1Y3Qg aW50ZWxfY3J0YyAqY3J0YywKPiBAQCAtOTgwMCwxMyArOTgxOSw3IEBAIHN0YXRpYyBpbnQgaW50 ZWxfY3J0Y19wYWdlX2ZsaXAoc3RydWN0IGRybV9jcnRjICpjcnRjLAo+ICAJZHJtX2dlbV9vYmpl Y3RfcmVmZXJlbmNlKCZvYmotPmJhc2UpOwo+ICAKPiAgCWNydGMtPnByaW1hcnktPmZiID0gZmI7 Cj4gLQo+IC0JLyogS2VlcCBzdGF0ZSBzdHJ1Y3R1cmUgaW4gc3luYyAqLwo+IC0JaWYgKGNydGMt PnByaW1hcnktPnN0YXRlLT5mYikKPiAtCQlkcm1fZnJhbWVidWZmZXJfdW5yZWZlcmVuY2UoY3J0 Yy0+cHJpbWFyeS0+c3RhdGUtPmZiKTsKPiAtCWNydGMtPnByaW1hcnktPnN0YXRlLT5mYiA9IGZi Owo+IC0JaWYgKGNydGMtPnByaW1hcnktPnN0YXRlLT5mYikKPiAtCQlkcm1fZnJhbWVidWZmZXJf cmVmZXJlbmNlKGNydGMtPnByaW1hcnktPnN0YXRlLT5mYik7Cj4gKwl1cGRhdGVfc3RhdGVfZmIo Y3J0Yy0+cHJpbWFyeSk7Cj4gIAo+ICAJd29yay0+cGVuZGluZ19mbGlwX29iaiA9IG9iajsKPiAg Cj4gQEAgLTk4NzUsNiArOTg4OCw3IEBAIGNsZWFudXBfdW5waW46Cj4gIGNsZWFudXBfcGVuZGlu ZzoKPiAgCWF0b21pY19kZWMoJmludGVsX2NydGMtPnVucGluX3dvcmtfY291bnQpOwo+ICAJY3J0 Yy0+cHJpbWFyeS0+ZmIgPSBvbGRfZmI7Cj4gKwl1cGRhdGVfc3RhdGVfZmIoY3J0Yy0+cHJpbWFy eSk7Cj4gIAlkcm1fZnJhbWVidWZmZXJfdW5yZWZlcmVuY2Uod29yay0+b2xkX2ZiKTsKPiAgCWRy bV9nZW1fb2JqZWN0X3VucmVmZXJlbmNlKCZvYmotPmJhc2UpOwo+ICAJbXV0ZXhfdW5sb2NrKCZk ZXYtPnN0cnVjdF9tdXRleCk7Cj4gQEAgLTEzNzA5LDYgKzEzNzIzLDcgQEAgdm9pZCBpbnRlbF9t b2Rlc2V0X2dlbV9pbml0KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCj4gIAkJCQkgIHRvX2ludGVs X2NydGMoYyktPnBpcGUpOwo+ICAJCQlkcm1fZnJhbWVidWZmZXJfdW5yZWZlcmVuY2UoYy0+cHJp bWFyeS0+ZmIpOwo+ICAJCQljLT5wcmltYXJ5LT5mYiA9IE5VTEw7Cj4gKwkJCXVwZGF0ZV9zdGF0 ZV9mYihjLT5wcmltYXJ5KTsKPiAgCQl9Cj4gIAl9Cj4gIAltdXRleF91bmxvY2soJmRldi0+c3Ry dWN0X211dGV4KTsKPiAtLSAKPiAxLjguNS4xCj4gCj4gX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX18KPiBJbnRlbC1nZnggbWFpbGluZyBsaXN0Cj4gSW50ZWwt Z2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwo+IGh0dHA6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcv bWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngKCi0tIApEYW5pZWwgVmV0dGVyClNvZnR3YXJlIEVu Z2luZWVyLCBJbnRlbCBDb3Jwb3JhdGlvbgorNDEgKDApIDc5IDM2NSA1NyA0OCAtIGh0dHA6Ly9i bG9nLmZmd2xsLmNoCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fCkludGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9y ZwpodHRwOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4 Cg==