From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jani Nikula Subject: Re: [PATCH] drm/i915: Ensure plane->state->fb stays in sync with plane->fb Date: Thu, 12 Mar 2015 14:45:31 +0200 Message-ID: <87ioe6qt90.fsf@intel.com> References: Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) by gabe.freedesktop.org (Postfix) with ESMTP id ABCB66E1D3 for ; Thu, 12 Mar 2015 05:44:04 -0700 (PDT) In-Reply-To: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" To: daniel.vetter@intel.com Cc: Xi Ruoyao , Daniel Vetter , intel-gfx@lists.freedesktop.org List-Id: intel-gfx@lists.freedesktop.org Ck1hdHQsIHBsZWFzZSByZXZpZXcgb3Igc3VnZ2VzdCBhbiBhbHRlcm5hdGl2ZSBmb3IgdjQuMC1y Yy4KClRoYW5rcywKSmFuaS4KCgpPbiBUaHUsIDEyIE1hciAyMDE1LCBYaSBSdW95YW8gPHhyeTEx MUBvdXRsb29rLmNvbT4gd3JvdGU6Cj4gcGxhbmUtPnN0YXRlLT5mYiBhbmQgcGxhbmUtPmZiIHNo b3VsZCBhbHdheXMgcmVmZXJlbmNlIHRoZSBzYW1lIEZCIHNvCj4gdGhhdCBhdG9taWMgYW5kIGxl Z2FjeSBjb2RlcGF0aHMgaGF2ZSB0aGUgc2FtZSB2aWV3IG9mIGRpc3BsYXkgc3RhdGUuCj4gSG93 ZXZlciwgdGhlcmUgYXJlIHNvbWUgcGxhY2VzIGluIGtlcm5lbCBjb2RlIHRoYXQgZGlyZWN0bHkg c2V0Cj4gcGxhbmUtPmZiIGFuZCBuZWdsZWN0IHRvIHVwZGF0ZSBwbGFuZS0+c3RhdGUtPmZiLiBJ ZiB3ZSBuZXZlciBkbyBhCj4gc3VjY2Vzc2Z1bCB1cGRhdGUgdGhyb3VnaCB0aGUgYXRvbWljIHBp cGVsaW5lLCB0aGUgUm1GQiBjbGVhbnVwIGNvZGUKPiB3aWxsIGxvb2sgYXQgdGhlIHBsYW5lLT5z dGF0ZS0+ZmIgcG9pbnRlciwgd2hpY2ggaGFzIG5ldmVyIGFjdHVhbGx5Cj4gYmVlbiBzZXQgdG8g YSBsZWdpdGltYXRlIHZhbHVlLCBhbmQgdHJ5IHRvIGNsZWFuIGl0IHVwLCBsZWFkaW5nIHRvCj4g QlVHJ3MuCj4KPiBBZGQgYSBxdWljayBoZWxwZXIgZnVuY3Rpb24gdG8gc3luY2hyb25pemUgcGxh bmUtPnN0YXRlLT5mYiB3aXRoCj4gcGxhbmUtPmZiIGFuZCBjYWxsIGl0IGV2ZXJ5d2hlcmUgdGhl IGRyaXZlciB0cmllcyB0byBtYW51YWxseSBzZXQKPiBwbGFuZS0+ZmIgb3V0c2lkZSBvZiB0aGUg YXRvbWljIHBpcGVsaW5lLiBJbiB0aGlzIGZ1bmN0aW9uLCB1c2UKPiBkcm1fYXRvbWljX3NldF9m Yl9mb3JfcGxhbmUgaW5zdGVhZCBvZiB3cml0aW5nIHBsYW5lLT5zdGF0ZS0+ZmIKPiBkaXJlY3Rs eSB0byBrZWVwIHRoZSByZWZlcmVuY2UgY291bnQgcmlnaHQuCj4KPiBCdWd6aWxsYTogaHR0cHM6 Ly9idWdzLmZyZWVkZXNrdG9wLm9yZy9zaG93X2J1Zy5jZ2k/aWQ9ODg5MDkKPiBCdWd6aWxsYTog aHR0cHM6Ly9idWd6aWxsYS5rZXJuZWwub3JnL3Nob3dfYnVnLmNnaT9pZD05MzcxMQo+IFNpZ25l ZC1vZmYtYnk6IE1hdHQgUm9wZXIgPG1hdHRoZXcuZC5yb3BlckBpbnRlbC5jb20+Cj4gU2lnbmVk LW9mZi1ieTogRGFuaWVsIFZldHRlciA8ZGFuaWVsLnZldHRlckBmZndsbC5jaD4KPiBTaWduZWQt b2ZmLWJ5OiBYaSBSdW95YW8gPHhyeTExMUBvdXRsb29rLmNvbT4KPiAtLS0KPiAgVGhpcyBpcyBt b2RpZmllZCBmcm9tIE1hdHQgUm9wZXIncyBwYXRjaCB0byBkcm0taW50ZWwtbmlnaHRseSB3aXRo IAo+ICBjb21taXQgaWQKPgo+ICAJYWZkNjVlYjRjYzA1NzhhOWMwN2Q2MjFhY2RiOGE1NzBlMjc4 MmJmNwo+Cj4gIEhvd2V2ZXIgdGhpcyBidWcgZXhpc3RzIGluIG1haW5saW5lIGtlcm5lbCB0b28s IHNvIEkgY3JlYXRlZCB0aGlzIHRvCj4gIGZpeCBpdCBpbiBtYWlubGluZSBrZXJuZWwuCj4KPiAg QSBtaW5vciBjaGFuZ2UgaXMgdG8gdXNlIGRybV9hdG9taWNfc2V0X2ZiX2Zvcl9wbGFuZSBpbnN0 ZWFkIG9mCj4gIHVwZGF0ZSByZWZlcmVuY2UgY291bnQgbWFudWFsbHkuCj4KPiAgZHJpdmVycy9n cHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jIHwgMTcgKysrKysrKysrKysrKysrKysKPiAgMSBm aWxlIGNoYW5nZWQsIDE3IGluc2VydGlvbnMoKykKPgo+IGRpZmYgLS1naXQgYS9kcml2ZXJzL2dw dS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9k aXNwbGF5LmMKPiBpbmRleCBlNzMwNzg5Li5jNDgzZjJmIDEwMDY0NAo+IC0tLSBhL2RyaXZlcnMv Z3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYwo+ICsrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1 L2ludGVsX2Rpc3BsYXkuYwo+IEBAIC0zNyw2ICszNyw3IEBACj4gICNpbmNsdWRlIDxkcm0vaTkx NV9kcm0uaD4KPiAgI2luY2x1ZGUgImk5MTVfZHJ2LmgiCj4gICNpbmNsdWRlICJpOTE1X3RyYWNl LmgiCj4gKyNpbmNsdWRlIDxkcm0vZHJtX2F0b21pYy5oPgo+ICAjaW5jbHVkZSA8ZHJtL2RybV9h dG9taWNfaGVscGVyLmg+Cj4gICNpbmNsdWRlIDxkcm0vZHJtX2RwX2hlbHBlci5oPgo+ICAjaW5j bHVkZSA8ZHJtL2RybV9jcnRjX2hlbHBlci5oPgo+IEBAIC0yNDE2LDYgKzI0MTcsMTQgQEAgb3V0 X3VucmVmX29iajoKPiAgCXJldHVybiBmYWxzZTsKPiAgfQo+ICAKPiArLyogVXBkYXRlIHBsYW5l LT5zdGF0ZS0+ZmIgdG8gbWF0Y2ggcGxhbmUtPmZiIGFmdGVyIGRyaXZlci1pbnRlcm5hbCB1cGRh dGVzICovCj4gK3N0YXRpYyB2b2lkCj4gK3VwZGF0ZV9zdGF0ZV9mYihzdHJ1Y3QgZHJtX3BsYW5l ICpwbGFuZSkKPiArewo+ICsJaWYgKHBsYW5lLT5mYiAhPSBwbGFuZS0+c3RhdGUtPmZiKQo+ICsJ CWRybV9hdG9taWNfc2V0X2ZiX2Zvcl9wbGFuZShwbGFuZS0+c3RhdGUsIHBsYW5lLT5mYik7Cj4g K30KPiArCj4gIHN0YXRpYyB2b2lkCj4gIGludGVsX2ZpbmRfcGxhbmVfb2JqKHN0cnVjdCBpbnRl bF9jcnRjICppbnRlbF9jcnRjLAo+ICAJCSAgICAgc3RydWN0IGludGVsX2luaXRpYWxfcGxhbmVf Y29uZmlnICpwbGFuZV9jb25maWcpCj4gQEAgLTI0NjIsNiArMjQ3MSw4IEBAIGludGVsX2ZpbmRf cGxhbmVfb2JqKHN0cnVjdCBpbnRlbF9jcnRjICppbnRlbF9jcnRjLAo+ICAJCQlicmVhazsKPiAg CQl9Cj4gIAl9Cj4gKwo+ICsJdXBkYXRlX3N0YXRlX2ZiKGludGVsX2NydGMtPmJhc2UucHJpbWFy eSk7Cj4gIH0KPiAgCj4gIHN0YXRpYyB2b2lkIGk5eHhfdXBkYXRlX3ByaW1hcnlfcGxhbmUoc3Ry dWN0IGRybV9jcnRjICpjcnRjLAo+IEBAIC02NjUwLDYgKzY2NjEsNyBAQCBpOXh4X2dldF9pbml0 aWFsX3BsYW5lX2NvbmZpZyhzdHJ1Y3QgaW50ZWxfY3J0YyAqY3J0YywKPiAgCQkgICAgICBwbGFu ZV9jb25maWctPnNpemUpOwo+ICAKPiAgCWNydGMtPmJhc2UucHJpbWFyeS0+ZmIgPSBmYjsKPiAr CXVwZGF0ZV9zdGF0ZV9mYihjcnRjLT5iYXNlLnByaW1hcnkpOwo+ICB9Cj4gIAo+ICBzdGF0aWMg dm9pZCBjaHZfY3J0Y19jbG9ja19nZXQoc3RydWN0IGludGVsX2NydGMgKmNydGMsCj4gQEAgLTc2 ODcsNiArNzY5OSw3IEBAIHNreWxha2VfZ2V0X2luaXRpYWxfcGxhbmVfY29uZmlnKHN0cnVjdCBp bnRlbF9jcnRjICpjcnRjLAo+ICAJCSAgICAgIHBsYW5lX2NvbmZpZy0+c2l6ZSk7Cj4gIAo+ICAJ Y3J0Yy0+YmFzZS5wcmltYXJ5LT5mYiA9IGZiOwo+ICsJdXBkYXRlX3N0YXRlX2ZiKGNydGMtPmJh c2UucHJpbWFyeSk7Cj4gIAlyZXR1cm47Cj4gIAo+ICBlcnJvcjoKPiBAQCAtNzc3OCw2ICs3Nzkx LDcgQEAgaXJvbmxha2VfZ2V0X2luaXRpYWxfcGxhbmVfY29uZmlnKHN0cnVjdCBpbnRlbF9jcnRj ICpjcnRjLAo+ICAJCSAgICAgIHBsYW5lX2NvbmZpZy0+c2l6ZSk7Cj4gIAo+ICAJY3J0Yy0+YmFz ZS5wcmltYXJ5LT5mYiA9IGZiOwo+ICsJdXBkYXRlX3N0YXRlX2ZiKGNydGMtPmJhc2UucHJpbWFy eSk7Cj4gIH0KPiAgCj4gIHN0YXRpYyBib29sIGlyb25sYWtlX2dldF9waXBlX2NvbmZpZyhzdHJ1 Y3QgaW50ZWxfY3J0YyAqY3J0YywKPiBAQCAtOTgxNiw2ICs5ODMwLDcgQEAgc3RhdGljIGludCBp bnRlbF9jcnRjX3BhZ2VfZmxpcChzdHJ1Y3QgZHJtX2NydGMgKmNydGMsCj4gIAlkcm1fZ2VtX29i amVjdF9yZWZlcmVuY2UoJm9iai0+YmFzZSk7Cj4gIAo+ICAJY3J0Yy0+cHJpbWFyeS0+ZmIgPSBm YjsKPiArCXVwZGF0ZV9zdGF0ZV9mYihjcnRjLT5wcmltYXJ5KTsKPiAgCj4gIAl3b3JrLT5wZW5k aW5nX2ZsaXBfb2JqID0gb2JqOwo+ICAKPiBAQCAtOTg4NCw2ICs5ODk5LDcgQEAgY2xlYW51cF91 bnBpbjoKPiAgY2xlYW51cF9wZW5kaW5nOgo+ICAJYXRvbWljX2RlYygmaW50ZWxfY3J0Yy0+dW5w aW5fd29ya19jb3VudCk7Cj4gIAljcnRjLT5wcmltYXJ5LT5mYiA9IG9sZF9mYjsKPiArCXVwZGF0 ZV9zdGF0ZV9mYihjcnRjLT5wcmltYXJ5KTsKPiAgCWRybV9nZW1fb2JqZWN0X3VucmVmZXJlbmNl KCZ3b3JrLT5vbGRfZmJfb2JqLT5iYXNlKTsKPiAgCWRybV9nZW1fb2JqZWN0X3VucmVmZXJlbmNl KCZvYmotPmJhc2UpOwo+ICAJbXV0ZXhfdW5sb2NrKCZkZXYtPnN0cnVjdF9tdXRleCk7Cj4gQEAg LTEzNzE4LDYgKzEzNzM0LDcgQEAgdm9pZCBpbnRlbF9tb2Rlc2V0X2dlbV9pbml0KHN0cnVjdCBk cm1fZGV2aWNlICpkZXYpCj4gIAkJCQkgIHRvX2ludGVsX2NydGMoYyktPnBpcGUpOwo+ICAJCQlk cm1fZnJhbWVidWZmZXJfdW5yZWZlcmVuY2UoYy0+cHJpbWFyeS0+ZmIpOwo+ICAJCQljLT5wcmlt YXJ5LT5mYiA9IE5VTEw7Cj4gKwkJCXVwZGF0ZV9zdGF0ZV9mYihjLT5wcmltYXJ5KTsKPiAgCQl9 Cj4gIAl9Cj4gIAltdXRleF91bmxvY2soJmRldi0+c3RydWN0X211dGV4KTsKPiAtLSAKPiAxLjku MQo+CgotLSAKSmFuaSBOaWt1bGEsIEludGVsIE9wZW4gU291cmNlIFRlY2hub2xvZ3kgQ2VudGVy Cl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCkludGVsLWdm eCBtYWlsaW5nIGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwOi8vbGlz dHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4Cg==