From mboxrd@z Thu Jan 1 00:00:00 1970 From: Matt Roper Subject: Re: [PATCH] drm/i915: Ensure plane->state->fb stays in sync with plane->fb Date: Thu, 12 Mar 2015 09:12:23 -0700 Message-ID: <20150312161223.GX27526@intel.com> References: <87ioe6qt90.fsf@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 7E9F46E45C for ; Thu, 12 Mar 2015 09:14:23 -0700 (PDT) Content-Disposition: inline In-Reply-To: <87ioe6qt90.fsf@intel.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" To: Jani Nikula Cc: Xi Ruoyao , daniel.vetter@intel.com, intel-gfx@lists.freedesktop.org, Daniel Vetter List-Id: intel-gfx@lists.freedesktop.org T24gVGh1LCBNYXIgMTIsIDIwMTUgYXQgMDI6NDU6MzFQTSArMDIwMCwgSmFuaSBOaWt1bGEgd3Jv dGU6Cj4gCj4gTWF0dCwgcGxlYXNlIHJldmlldyBvciBzdWdnZXN0IGFuIGFsdGVybmF0aXZlIGZv ciB2NC4wLXJjLgo+IAo+IFRoYW5rcywKPiBKYW5pLgoKWWVwLCB0aGlzIGxvb2tzIGdvb2QgdG8g bWUuICBTbwoKUmV2aWV3ZWQtYnk6IE1hdHQgUm9wZXIgPG1hdHRoZXcuZC5yb3BlckBpbnRlbC5j b20+CgoKTWF0dAoKPiAKPiAKPiBPbiBUaHUsIDEyIE1hciAyMDE1LCBYaSBSdW95YW8gPHhyeTEx MUBvdXRsb29rLmNvbT4gd3JvdGU6Cj4gPiBwbGFuZS0+c3RhdGUtPmZiIGFuZCBwbGFuZS0+ZmIg c2hvdWxkIGFsd2F5cyByZWZlcmVuY2UgdGhlIHNhbWUgRkIgc28KPiA+IHRoYXQgYXRvbWljIGFu ZCBsZWdhY3kgY29kZXBhdGhzIGhhdmUgdGhlIHNhbWUgdmlldyBvZiBkaXNwbGF5IHN0YXRlLgo+ ID4gSG93ZXZlciwgdGhlcmUgYXJlIHNvbWUgcGxhY2VzIGluIGtlcm5lbCBjb2RlIHRoYXQgZGly ZWN0bHkgc2V0Cj4gPiBwbGFuZS0+ZmIgYW5kIG5lZ2xlY3QgdG8gdXBkYXRlIHBsYW5lLT5zdGF0 ZS0+ZmIuIElmIHdlIG5ldmVyIGRvIGEKPiA+IHN1Y2Nlc3NmdWwgdXBkYXRlIHRocm91Z2ggdGhl IGF0b21pYyBwaXBlbGluZSwgdGhlIFJtRkIgY2xlYW51cCBjb2RlCj4gPiB3aWxsIGxvb2sgYXQg dGhlIHBsYW5lLT5zdGF0ZS0+ZmIgcG9pbnRlciwgd2hpY2ggaGFzIG5ldmVyIGFjdHVhbGx5Cj4g PiBiZWVuIHNldCB0byBhIGxlZ2l0aW1hdGUgdmFsdWUsIGFuZCB0cnkgdG8gY2xlYW4gaXQgdXAs IGxlYWRpbmcgdG8KPiA+IEJVRydzLgo+ID4KPiA+IEFkZCBhIHF1aWNrIGhlbHBlciBmdW5jdGlv biB0byBzeW5jaHJvbml6ZSBwbGFuZS0+c3RhdGUtPmZiIHdpdGgKPiA+IHBsYW5lLT5mYiBhbmQg Y2FsbCBpdCBldmVyeXdoZXJlIHRoZSBkcml2ZXIgdHJpZXMgdG8gbWFudWFsbHkgc2V0Cj4gPiBw bGFuZS0+ZmIgb3V0c2lkZSBvZiB0aGUgYXRvbWljIHBpcGVsaW5lLiBJbiB0aGlzIGZ1bmN0aW9u LCB1c2UKPiA+IGRybV9hdG9taWNfc2V0X2ZiX2Zvcl9wbGFuZSBpbnN0ZWFkIG9mIHdyaXRpbmcg cGxhbmUtPnN0YXRlLT5mYgo+ID4gZGlyZWN0bHkgdG8ga2VlcCB0aGUgcmVmZXJlbmNlIGNvdW50 IHJpZ2h0Lgo+ID4KPiA+IEJ1Z3ppbGxhOiBodHRwczovL2J1Z3MuZnJlZWRlc2t0b3Aub3JnL3No b3dfYnVnLmNnaT9pZD04ODkwOQo+ID4gQnVnemlsbGE6IGh0dHBzOi8vYnVnemlsbGEua2VybmVs Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9OTM3MTEKPiA+IFNpZ25lZC1vZmYtYnk6IE1hdHQgUm9wZXIg PG1hdHRoZXcuZC5yb3BlckBpbnRlbC5jb20+Cj4gPiBTaWduZWQtb2ZmLWJ5OiBEYW5pZWwgVmV0 dGVyIDxkYW5pZWwudmV0dGVyQGZmd2xsLmNoPgo+ID4gU2lnbmVkLW9mZi1ieTogWGkgUnVveWFv IDx4cnkxMTFAb3V0bG9vay5jb20+Cj4gPiAtLS0KPiA+ICBUaGlzIGlzIG1vZGlmaWVkIGZyb20g TWF0dCBSb3BlcidzIHBhdGNoIHRvIGRybS1pbnRlbC1uaWdodGx5IHdpdGggCj4gPiAgY29tbWl0 IGlkCj4gPgo+ID4gIAlhZmQ2NWViNGNjMDU3OGE5YzA3ZDYyMWFjZGI4YTU3MGUyNzgyYmY3Cj4g Pgo+ID4gIEhvd2V2ZXIgdGhpcyBidWcgZXhpc3RzIGluIG1haW5saW5lIGtlcm5lbCB0b28sIHNv IEkgY3JlYXRlZCB0aGlzIHRvCj4gPiAgZml4IGl0IGluIG1haW5saW5lIGtlcm5lbC4KPiA+Cj4g PiAgQSBtaW5vciBjaGFuZ2UgaXMgdG8gdXNlIGRybV9hdG9taWNfc2V0X2ZiX2Zvcl9wbGFuZSBp bnN0ZWFkIG9mCj4gPiAgdXBkYXRlIHJlZmVyZW5jZSBjb3VudCBtYW51YWxseS4KPiA+Cj4gPiAg ZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jIHwgMTcgKysrKysrKysrKysrKysr KysKPiA+ICAxIGZpbGUgY2hhbmdlZCwgMTcgaW5zZXJ0aW9ucygrKQo+ID4KPiA+IGRpZmYgLS1n aXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMgYi9kcml2ZXJzL2dwdS9k cm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMKPiA+IGluZGV4IGU3MzA3ODkuLmM0ODNmMmYgMTAwNjQ0 Cj4gPiAtLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMKPiA+ICsrKyBi L2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYwo+ID4gQEAgLTM3LDYgKzM3LDcg QEAKPiA+ICAjaW5jbHVkZSA8ZHJtL2k5MTVfZHJtLmg+Cj4gPiAgI2luY2x1ZGUgImk5MTVfZHJ2 LmgiCj4gPiAgI2luY2x1ZGUgImk5MTVfdHJhY2UuaCIKPiA+ICsjaW5jbHVkZSA8ZHJtL2RybV9h dG9taWMuaD4KPiA+ICAjaW5jbHVkZSA8ZHJtL2RybV9hdG9taWNfaGVscGVyLmg+Cj4gPiAgI2lu Y2x1ZGUgPGRybS9kcm1fZHBfaGVscGVyLmg+Cj4gPiAgI2luY2x1ZGUgPGRybS9kcm1fY3J0Y19o ZWxwZXIuaD4KPiA+IEBAIC0yNDE2LDYgKzI0MTcsMTQgQEAgb3V0X3VucmVmX29iajoKPiA+ICAJ cmV0dXJuIGZhbHNlOwo+ID4gIH0KPiA+ICAKPiA+ICsvKiBVcGRhdGUgcGxhbmUtPnN0YXRlLT5m YiB0byBtYXRjaCBwbGFuZS0+ZmIgYWZ0ZXIgZHJpdmVyLWludGVybmFsIHVwZGF0ZXMgKi8KPiA+ ICtzdGF0aWMgdm9pZAo+ID4gK3VwZGF0ZV9zdGF0ZV9mYihzdHJ1Y3QgZHJtX3BsYW5lICpwbGFu ZSkKPiA+ICt7Cj4gPiArCWlmIChwbGFuZS0+ZmIgIT0gcGxhbmUtPnN0YXRlLT5mYikKPiA+ICsJ CWRybV9hdG9taWNfc2V0X2ZiX2Zvcl9wbGFuZShwbGFuZS0+c3RhdGUsIHBsYW5lLT5mYik7Cj4g PiArfQo+ID4gKwo+ID4gIHN0YXRpYyB2b2lkCj4gPiAgaW50ZWxfZmluZF9wbGFuZV9vYmooc3Ry dWN0IGludGVsX2NydGMgKmludGVsX2NydGMsCj4gPiAgCQkgICAgIHN0cnVjdCBpbnRlbF9pbml0 aWFsX3BsYW5lX2NvbmZpZyAqcGxhbmVfY29uZmlnKQo+ID4gQEAgLTI0NjIsNiArMjQ3MSw4IEBA IGludGVsX2ZpbmRfcGxhbmVfb2JqKHN0cnVjdCBpbnRlbF9jcnRjICppbnRlbF9jcnRjLAo+ID4g IAkJCWJyZWFrOwo+ID4gIAkJfQo+ID4gIAl9Cj4gPiArCj4gPiArCXVwZGF0ZV9zdGF0ZV9mYihp bnRlbF9jcnRjLT5iYXNlLnByaW1hcnkpOwo+ID4gIH0KPiA+ICAKPiA+ICBzdGF0aWMgdm9pZCBp OXh4X3VwZGF0ZV9wcmltYXJ5X3BsYW5lKHN0cnVjdCBkcm1fY3J0YyAqY3J0YywKPiA+IEBAIC02 NjUwLDYgKzY2NjEsNyBAQCBpOXh4X2dldF9pbml0aWFsX3BsYW5lX2NvbmZpZyhzdHJ1Y3QgaW50 ZWxfY3J0YyAqY3J0YywKPiA+ICAJCSAgICAgIHBsYW5lX2NvbmZpZy0+c2l6ZSk7Cj4gPiAgCj4g PiAgCWNydGMtPmJhc2UucHJpbWFyeS0+ZmIgPSBmYjsKPiA+ICsJdXBkYXRlX3N0YXRlX2ZiKGNy dGMtPmJhc2UucHJpbWFyeSk7Cj4gPiAgfQo+ID4gIAo+ID4gIHN0YXRpYyB2b2lkIGNodl9jcnRj X2Nsb2NrX2dldChzdHJ1Y3QgaW50ZWxfY3J0YyAqY3J0YywKPiA+IEBAIC03Njg3LDYgKzc2OTks NyBAQCBza3lsYWtlX2dldF9pbml0aWFsX3BsYW5lX2NvbmZpZyhzdHJ1Y3QgaW50ZWxfY3J0YyAq Y3J0YywKPiA+ICAJCSAgICAgIHBsYW5lX2NvbmZpZy0+c2l6ZSk7Cj4gPiAgCj4gPiAgCWNydGMt PmJhc2UucHJpbWFyeS0+ZmIgPSBmYjsKPiA+ICsJdXBkYXRlX3N0YXRlX2ZiKGNydGMtPmJhc2Uu cHJpbWFyeSk7Cj4gPiAgCXJldHVybjsKPiA+ICAKPiA+ICBlcnJvcjoKPiA+IEBAIC03Nzc4LDYg Kzc3OTEsNyBAQCBpcm9ubGFrZV9nZXRfaW5pdGlhbF9wbGFuZV9jb25maWcoc3RydWN0IGludGVs X2NydGMgKmNydGMsCj4gPiAgCQkgICAgICBwbGFuZV9jb25maWctPnNpemUpOwo+ID4gIAo+ID4g IAljcnRjLT5iYXNlLnByaW1hcnktPmZiID0gZmI7Cj4gPiArCXVwZGF0ZV9zdGF0ZV9mYihjcnRj LT5iYXNlLnByaW1hcnkpOwo+ID4gIH0KPiA+ICAKPiA+ICBzdGF0aWMgYm9vbCBpcm9ubGFrZV9n ZXRfcGlwZV9jb25maWcoc3RydWN0IGludGVsX2NydGMgKmNydGMsCj4gPiBAQCAtOTgxNiw2ICs5 ODMwLDcgQEAgc3RhdGljIGludCBpbnRlbF9jcnRjX3BhZ2VfZmxpcChzdHJ1Y3QgZHJtX2NydGMg KmNydGMsCj4gPiAgCWRybV9nZW1fb2JqZWN0X3JlZmVyZW5jZSgmb2JqLT5iYXNlKTsKPiA+ICAK PiA+ICAJY3J0Yy0+cHJpbWFyeS0+ZmIgPSBmYjsKPiA+ICsJdXBkYXRlX3N0YXRlX2ZiKGNydGMt PnByaW1hcnkpOwo+ID4gIAo+ID4gIAl3b3JrLT5wZW5kaW5nX2ZsaXBfb2JqID0gb2JqOwo+ID4g IAo+ID4gQEAgLTk4ODQsNiArOTg5OSw3IEBAIGNsZWFudXBfdW5waW46Cj4gPiAgY2xlYW51cF9w ZW5kaW5nOgo+ID4gIAlhdG9taWNfZGVjKCZpbnRlbF9jcnRjLT51bnBpbl93b3JrX2NvdW50KTsK PiA+ICAJY3J0Yy0+cHJpbWFyeS0+ZmIgPSBvbGRfZmI7Cj4gPiArCXVwZGF0ZV9zdGF0ZV9mYihj cnRjLT5wcmltYXJ5KTsKPiA+ICAJZHJtX2dlbV9vYmplY3RfdW5yZWZlcmVuY2UoJndvcmstPm9s ZF9mYl9vYmotPmJhc2UpOwo+ID4gIAlkcm1fZ2VtX29iamVjdF91bnJlZmVyZW5jZSgmb2JqLT5i YXNlKTsKPiA+ICAJbXV0ZXhfdW5sb2NrKCZkZXYtPnN0cnVjdF9tdXRleCk7Cj4gPiBAQCAtMTM3 MTgsNiArMTM3MzQsNyBAQCB2b2lkIGludGVsX21vZGVzZXRfZ2VtX2luaXQoc3RydWN0IGRybV9k ZXZpY2UgKmRldikKPiA+ICAJCQkJICB0b19pbnRlbF9jcnRjKGMpLT5waXBlKTsKPiA+ICAJCQlk cm1fZnJhbWVidWZmZXJfdW5yZWZlcmVuY2UoYy0+cHJpbWFyeS0+ZmIpOwo+ID4gIAkJCWMtPnBy aW1hcnktPmZiID0gTlVMTDsKPiA+ICsJCQl1cGRhdGVfc3RhdGVfZmIoYy0+cHJpbWFyeSk7Cj4g PiAgCQl9Cj4gPiAgCX0KPiA+ICAJbXV0ZXhfdW5sb2NrKCZkZXYtPnN0cnVjdF9tdXRleCk7Cj4g PiAtLSAKPiA+IDEuOS4xCj4gPgo+IAo+IC0tIAo+IEphbmkgTmlrdWxhLCBJbnRlbCBPcGVuIFNv dXJjZSBUZWNobm9sb2d5IENlbnRlcgoKLS0gCk1hdHQgUm9wZXIKR3JhcGhpY3MgU29mdHdhcmUg RW5naW5lZXIKSW9URyBQbGF0Zm9ybSBFbmFibGluZyAmIERldmVsb3BtZW50CkludGVsIENvcnBv cmF0aW9uCig5MTYpIDM1Ni0yNzk1Cl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fCkludGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVk ZXNrdG9wLm9yZwpodHRwOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8v aW50ZWwtZ2Z4Cg==