From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ander Conselvan de Oliveira Subject: Re: [PATCH 7/9] drm/i915: Consolidate plane 'cleanup' operations Date: Mon, 01 Dec 2014 15:46:07 +0200 Message-ID: <547C711F.70406@gmail.com> References: <1416858786-25376-1-git-send-email-matthew.d.roper@intel.com> <1416858786-25376-8-git-send-email-matthew.d.roper@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8"; Format="flowed" Content-Transfer-Encoding: base64 Return-path: Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by gabe.freedesktop.org (Postfix) with ESMTP id 669876E478 for ; Mon, 1 Dec 2014 05:46:27 -0800 (PST) In-Reply-To: <1416858786-25376-8-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 , intel-gfx@lists.freedesktop.org List-Id: intel-gfx@lists.freedesktop.org T24gMTEvMjQvMjAxNCAwOTo1MyBQTSwgTWF0dCBSb3BlciB3cm90ZToKPiBBbGwgcGxhbmUgdXBk YXRlIGZ1bmN0aW9ucyBuZWVkIHRvIHVucGluIHRoZSBvbGQgZnJhbWVidWZmZXIgd2hlbgo+IGZs aXBwaW5nIHRvIGEgbmV3IG9uZS4gIFB1bGwgdGhpcyBsb2dpYyBpbnRvIGEgc2VwYXJhdGUgZnVu Y3Rpb24gdG8gZWFzZQo+IHRoZSBpbnRlZ3JhdGlvbiB3aXRoIGF0b21pYyBwbGFuZSBoZWxwZXJz Lgo+Cj4gU2lnbmVkLW9mZi1ieTogTWF0dCBSb3BlciA8bWF0dGhldy5kLnJvcGVyQGludGVsLmNv bT4KPiAtLS0KPiAgIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYyB8IDU3ICsr KysrKysrKysrKysrKysrKysrKysrKysrLS0tLS0tLS0tLQo+ICAgZHJpdmVycy9ncHUvZHJtL2k5 MTUvaW50ZWxfZHJ2LmggICAgIHwgIDIgKysKPiAgIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVs X3Nwcml0ZS5jICB8IDI3ICsrKysrKy0tLS0tLS0tLS0tCj4gICAzIGZpbGVzIGNoYW5nZWQsIDUy IGluc2VydGlvbnMoKyksIDM0IGRlbGV0aW9ucygtKQo+Cj4gZGlmZiAtLWdpdCBhL2RyaXZlcnMv Z3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVs X2Rpc3BsYXkuYwo+IGluZGV4IDUwZDQyOTkuLjIwODkwYTkgMTAwNjQ0Cj4gLS0tIGEvZHJpdmVy cy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jCj4gKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5 MTUvaW50ZWxfZGlzcGxheS5jCj4gQEAgLTExNjM0LDYgKzExNjM0LDMxIEBAIGludGVsX3ByZXBh cmVfcGxhbmVfZmIoc3RydWN0IGRybV9wbGFuZSAqcGxhbmUsCj4gICAJcmV0dXJuIHJldDsKPiAg IH0KPgo+ICsvKioKPiArICogaW50ZWxfY2xlYW51cF9wbGFuZV9mYiAtIENsZWFucyB1cCBhbiBm YiBhZnRlciBwbGFuZSB1c2UKPiArICogQHBsYW5lOiBkcm0gcGxhbmUgdG8gY2xlYW4gdXAgZm9y Cj4gKyAqIEBmYjogb2xkIGZyYW1lYnVmZmVyIHRoYXQgd2FzIG9uIHBsYW5lCj4gKyAqCj4gKyAq IENsZWFucyB1cCBhIGZyYW1lYnVmZmVyIHRoYXQgaGFzIGp1c3QgYmVlbiByZW1vdmVkIGZyb20g YSBwbGFuZS4KPiArICovCj4gK3ZvaWQKPiAraW50ZWxfY2xlYW51cF9wbGFuZV9mYihzdHJ1Y3Qg ZHJtX3BsYW5lICpwbGFuZSwKPiArCQkgICAgICAgc3RydWN0IGRybV9mcmFtZWJ1ZmZlciAqZmIp Cj4gK3sKPiArCXN0cnVjdCBkcm1fZGV2aWNlICpkZXYgPSBwbGFuZS0+ZGV2Owo+ICsJc3RydWN0 IGRybV9pOTE1X2dlbV9vYmplY3QgKm9iaiA9IGludGVsX2ZiX29iaihmYik7Cj4gKwo+ICsJaWYg KFdBUk5fT04oIW9iaikpCj4gKwkJcmV0dXJuOwo+ICsKPiArCWlmIChwbGFuZS0+dHlwZSAhPSBE Uk1fUExBTkVfVFlQRV9DVVJTT1IgfHwKPiArCSAgICAhSU5URUxfSU5GTyhkZXYpLT5jdXJzb3Jf bmVlZHNfcGh5c2ljYWwpIHsKPiArCQltdXRleF9sb2NrKCZkZXYtPnN0cnVjdF9tdXRleCk7Cj4g KwkJaW50ZWxfdW5waW5fZmJfb2JqKG9iaik7Cj4gKwkJbXV0ZXhfdW5sb2NrKCZkZXYtPnN0cnVj dF9tdXRleCk7Cj4gKwl9Cj4gK30KPiArCj4gICBzdGF0aWMgaW50Cj4gICBpbnRlbF9jaGVja19w cmltYXJ5X3BsYW5lKHN0cnVjdCBkcm1fcGxhbmUgKnBsYW5lLAo+ICAgCQkJICBzdHJ1Y3QgaW50 ZWxfcGxhbmVfc3RhdGUgKnN0YXRlKQo+IEBAIC0xMTY2MSw5ICsxMTY4Niw3IEBAIGludGVsX2Nv bW1pdF9wcmltYXJ5X3BsYW5lKHN0cnVjdCBkcm1fcGxhbmUgKnBsYW5lLAo+ICAgCXN0cnVjdCBk cm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9IGRldi0+ZGV2X3ByaXZhdGU7Cj4gICAJc3RydWN0 IGludGVsX2NydGMgKmludGVsX2NydGMgPSB0b19pbnRlbF9jcnRjKGNydGMpOwo+ICAgCWVudW0g cGlwZSBwaXBlID0gaW50ZWxfY3J0Yy0+cGlwZTsKPiAtCXN0cnVjdCBkcm1fZnJhbWVidWZmZXIg Km9sZF9mYiA9IHBsYW5lLT5mYjsKPiAgIAlzdHJ1Y3QgZHJtX2k5MTVfZ2VtX29iamVjdCAqb2Jq ID0gaW50ZWxfZmJfb2JqKGZiKTsKPiAtCXN0cnVjdCBkcm1faTkxNV9nZW1fb2JqZWN0ICpvbGRf b2JqID0gaW50ZWxfZmJfb2JqKHBsYW5lLT5mYik7Cj4gICAJc3RydWN0IGludGVsX3BsYW5lICpp bnRlbF9wbGFuZSA9IHRvX2ludGVsX3BsYW5lKHBsYW5lKTsKPiAgIAlzdHJ1Y3QgZHJtX3JlY3Qg KnNyYyA9ICZzdGF0ZS0+c3JjOwo+Cj4gQEAgLTExNzM0LDE1ICsxMTc1Nyw2IEBAIGludGVsX2Nv bW1pdF9wcmltYXJ5X3BsYW5lKHN0cnVjdCBkcm1fcGxhbmUgKnBsYW5lLAo+ICAgCQlpbnRlbF91 cGRhdGVfZmJjKGRldik7Cj4gICAJCW11dGV4X3VubG9jaygmZGV2LT5zdHJ1Y3RfbXV0ZXgpOwo+ ICAgCX0KPiAtCj4gLQlpZiAob2xkX2ZiICYmIG9sZF9mYiAhPSBmYikgewo+IC0JCWlmIChpbnRl bF9jcnRjLT5hY3RpdmUpCj4gLQkJCWludGVsX3dhaXRfZm9yX3ZibGFuayhkZXYsIGludGVsX2Ny dGMtPnBpcGUpOwo+IC0KPiAtCQltdXRleF9sb2NrKCZkZXYtPnN0cnVjdF9tdXRleCk7Cj4gLQkJ aW50ZWxfdW5waW5fZmJfb2JqKG9sZF9vYmopOwo+IC0JCW11dGV4X3VubG9jaygmZGV2LT5zdHJ1 Y3RfbXV0ZXgpOwo+IC0JfQo+ICAgfQo+Cj4gICBzdGF0aWMgaW50Cj4gQEAgLTExNzUyLDYgKzEx NzY2LDcgQEAgaW50ZWxfcHJpbWFyeV9wbGFuZV9zZXRwbGFuZShzdHJ1Y3QgZHJtX3BsYW5lICpw bGFuZSwgc3RydWN0IGRybV9jcnRjICpjcnRjLAo+ICAgCQkJICAgICB1aW50MzJfdCBzcmNfeCwg dWludDMyX3Qgc3JjX3ksCj4gICAJCQkgICAgIHVpbnQzMl90IHNyY193LCB1aW50MzJfdCBzcmNf aCkKPiAgIHsKPiArCXN0cnVjdCBkcm1fZGV2aWNlICpkZXYgPSBwbGFuZS0+ZGV2Owo+ICAgCXN0 cnVjdCBkcm1fZnJhbWVidWZmZXIgKm9sZF9mYiA9IHBsYW5lLT5mYjsKPiAgIAlzdHJ1Y3QgaW50 ZWxfcGxhbmVfc3RhdGUgc3RhdGU7Cj4gICAJc3RydWN0IGludGVsX2NydGMgKmludGVsX2NydGMg PSB0b19pbnRlbF9jcnRjKGNydGMpOwo+IEBAIC0xMTc5OSw2ICsxMTgxNCwxMyBAQCBpbnRlbF9w cmltYXJ5X3BsYW5lX3NldHBsYW5lKHN0cnVjdCBkcm1fcGxhbmUgKnBsYW5lLCBzdHJ1Y3QgZHJt X2NydGMgKmNydGMsCj4KPiAgIAlpbnRlbF9jb21taXRfcHJpbWFyeV9wbGFuZShwbGFuZSwgJnN0 YXRlKTsKPgo+ICsJaWYgKGZiICE9IG9sZF9mYikgewo+ICsJCWlmIChpbnRlbF9jcnRjLT5hY3Rp dmUpCj4gKwkJCWludGVsX3dhaXRfZm9yX3ZibGFuayhkZXYsIGludGVsX2NydGMtPnBpcGUpOwoK U28gbm93IHdlIHdhaXQgZm9yIHZibGFuayBldmVuIGlmIHRoZXJlJ3Mgbm8gZmIgdG8gdW5waW4/ CgpBbmRlcgoKCj4gKwkJaWYgKG9sZF9mYikKPiArCQkJaW50ZWxfY2xlYW51cF9wbGFuZV9mYihw bGFuZSwgb2xkX2ZiKTsKPiArCX0KPiArCj4gICAJcmV0dXJuIDA7Cj4gICB9Cj4KPiBAQCAtMTE5 ODAsMTEgKzEyMDAyLDYgQEAgaW50ZWxfY29tbWl0X2N1cnNvcl9wbGFuZShzdHJ1Y3QgZHJtX3Bs YW5lICpwbGFuZSwKPiAgIAllbHNlCj4gICAJCWFkZHIgPSBvYmotPnBoeXNfaGFuZGxlLT5idXNh ZGRyOwo+Cj4gLQlpZiAoaW50ZWxfY3J0Yy0+Y3Vyc29yX2JvKSB7Cj4gLQkJaWYgKCFJTlRFTF9J TkZPKGRldiktPmN1cnNvcl9uZWVkc19waHlzaWNhbCkKPiAtCQkJaTkxNV9nZW1fb2JqZWN0X3Vu cGluX2Zyb21fZGlzcGxheV9wbGFuZShpbnRlbF9jcnRjLT5jdXJzb3JfYm8pOwo+IC0JfQo+IC0K PiAgIAlpbnRlbF9jcnRjLT5jdXJzb3JfYWRkciA9IGFkZHI7Cj4gICAJaW50ZWxfY3J0Yy0+Y3Vy c29yX2JvID0gb2JqOwo+ICAgdXBkYXRlOgo+IEBAIC0xMjAwOSw2ICsxMjAyNiw3IEBAIGludGVs X2N1cnNvcl9wbGFuZV91cGRhdGUoc3RydWN0IGRybV9wbGFuZSAqcGxhbmUsIHN0cnVjdCBkcm1f Y3J0YyAqY3J0YywKPiAgIAkJCSAgdWludDMyX3Qgc3JjX3gsIHVpbnQzMl90IHNyY195LAo+ICAg CQkJICB1aW50MzJfdCBzcmNfdywgdWludDMyX3Qgc3JjX2gpCj4gICB7Cj4gKwlzdHJ1Y3QgZHJt X2RldmljZSAqZGV2ID0gcGxhbmUtPmRldjsKPiAgIAlzdHJ1Y3QgZHJtX2ZyYW1lYnVmZmVyICpv bGRfZmIgPSBwbGFuZS0+ZmI7Cj4gICAJc3RydWN0IGludGVsX2NydGMgKmludGVsX2NydGMgPSB0 b19pbnRlbF9jcnRjKGNydGMpOwo+ICAgCXN0cnVjdCBpbnRlbF9wbGFuZV9zdGF0ZSBzdGF0ZTsK PiBAQCAtMTIwNDksNiArMTIwNjcsMTMgQEAgaW50ZWxfY3Vyc29yX3BsYW5lX3VwZGF0ZShzdHJ1 Y3QgZHJtX3BsYW5lICpwbGFuZSwgc3RydWN0IGRybV9jcnRjICpjcnRjLAo+Cj4gICAJaW50ZWxf Y29tbWl0X2N1cnNvcl9wbGFuZShwbGFuZSwgJnN0YXRlKTsKPgo+ICsJaWYgKGZiICE9IG9sZF9m Yikgewo+ICsJCWlmIChpbnRlbF9jcnRjLT5hY3RpdmUpCj4gKwkJCWludGVsX3dhaXRfZm9yX3Zi bGFuayhkZXYsIGludGVsX2NydGMtPnBpcGUpOwo+ICsJCWlmIChvbGRfZmIpCj4gKwkJCWludGVs X2NsZWFudXBfcGxhbmVfZmIocGxhbmUsIG9sZF9mYik7Cj4gKwl9Cj4gKwo+ICAgCXJldHVybiAw Owo+ICAgfQo+Cj4gZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rydi5o IGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHJ2LmgKPiBpbmRleCBlOWY0ZGMxLi4yOTlm YzRmIDEwMDY0NAo+IC0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rydi5oCj4gKysr IGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHJ2LmgKPiBAQCAtOTI2LDYgKzkyNiw4IEBA IHZvaWQgaW50ZWxfZmluaXNoX3BhZ2VfZmxpcF9wbGFuZShzdHJ1Y3QgZHJtX2RldmljZSAqZGV2 LCBpbnQgcGxhbmUpOwo+ICAgdm9pZCBpbnRlbF9jaGVja19wYWdlX2ZsaXAoc3RydWN0IGRybV9k ZXZpY2UgKmRldiwgaW50IHBpcGUpOwo+ICAgaW50IGludGVsX3ByZXBhcmVfcGxhbmVfZmIoc3Ry dWN0IGRybV9wbGFuZSAqcGxhbmUsCj4gICAJCQkgICBzdHJ1Y3QgZHJtX2ZyYW1lYnVmZmVyICpm Yik7Cj4gK3ZvaWQgaW50ZWxfY2xlYW51cF9wbGFuZV9mYihzdHJ1Y3QgZHJtX3BsYW5lICpwbGFu ZSwKPiArCQkJICAgIHN0cnVjdCBkcm1fZnJhbWVidWZmZXIgKmZiKTsKPgo+ICAgLyogc2hhcmVk IGRwbGwgZnVuY3Rpb25zICovCj4gICBzdHJ1Y3QgaW50ZWxfc2hhcmVkX2RwbGwgKmludGVsX2Ny dGNfdG9fc2hhcmVkX2RwbGwoc3RydWN0IGludGVsX2NydGMgKmNydGMpOwo+IGRpZmYgLS1naXQg YS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9zcHJpdGUuYyBiL2RyaXZlcnMvZ3B1L2RybS9p OTE1L2ludGVsX3Nwcml0ZS5jCj4gaW5kZXggNWQ4YzJlMC4uMTUyYTMyZCAxMDA2NDQKPiAtLS0g YS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9zcHJpdGUuYwo+ICsrKyBiL2RyaXZlcnMvZ3B1 L2RybS9pOTE1L2ludGVsX3Nwcml0ZS5jCj4gQEAgLTEyNjgsNyArMTI2OCw2IEBAIGludGVsX2Nv bW1pdF9zcHJpdGVfcGxhbmUoc3RydWN0IGRybV9wbGFuZSAqcGxhbmUsCj4gICAJZW51bSBwaXBl IHBpcGUgPSBpbnRlbF9jcnRjLT5waXBlOwo+ICAgCXN0cnVjdCBkcm1fZnJhbWVidWZmZXIgKmZi ID0gc3RhdGUtPmJhc2UuZmI7Cj4gICAJc3RydWN0IGRybV9pOTE1X2dlbV9vYmplY3QgKm9iaiA9 IGludGVsX2ZiX29iaihmYik7Cj4gLQlzdHJ1Y3QgZHJtX2k5MTVfZ2VtX29iamVjdCAqb2xkX29i aiA9IGludGVsX3BsYW5lLT5vYmo7Cj4gICAJaW50IGNydGNfeCwgY3J0Y195Owo+ICAgCXVuc2ln bmVkIGludCBjcnRjX3csIGNydGNfaDsKPiAgIAl1aW50MzJfdCBzcmNfeCwgc3JjX3ksIHNyY193 LCBzcmNfaDsKPiBAQCAtMTMyNiwyMyArMTMyNSw2IEBAIGludGVsX2NvbW1pdF9zcHJpdGVfcGxh bmUoc3RydWN0IGRybV9wbGFuZSAqcGxhbmUsCj4gICAJCWlmICghcHJpbWFyeV93YXNfZW5hYmxl ZCAmJiBwcmltYXJ5X2VuYWJsZWQpCj4gICAJCQlpbnRlbF9wb3N0X2VuYWJsZV9wcmltYXJ5KGNy dGMpOwo+ICAgCX0KPiAtCj4gLQkvKiBVbnBpbiBvbGQgb2JqIGFmdGVyIG5ldyBvbmUgaXMgYWN0 aXZlIHRvIGF2b2lkIHVnbGluZXNzICovCj4gLQlpZiAob2xkX29iaiAmJiBvbGRfb2JqICE9IG9i aikgewo+IC0KPiAtCQkvKgo+IC0JCSAqIEl0J3MgZmFpcmx5IGNvbW1vbiB0byBzaW1wbHkgdXBk YXRlIHRoZSBwb3NpdGlvbiBvZgo+IC0JCSAqIGFuIGV4aXN0aW5nIG9iamVjdC4gIEluIHRoYXQg Y2FzZSwgd2UgZG9uJ3QgbmVlZCB0bwo+IC0JCSAqIHdhaXQgZm9yIHZibGFuayB0byBhdm9pZCB1 Z2xpbmVzcywgd2Ugb25seSBuZWVkIHRvCj4gLQkJICogZG8gdGhlIHBpbiAmIHJlZiBib29ra2Vl cGluZy4KPiAtCQkgKi8KPiAtCQlpZiAoaW50ZWxfY3J0Yy0+YWN0aXZlKQo+IC0JCQlpbnRlbF93 YWl0X2Zvcl92YmxhbmsoZGV2LCBpbnRlbF9jcnRjLT5waXBlKTsKPiAtCj4gLQkJbXV0ZXhfbG9j aygmZGV2LT5zdHJ1Y3RfbXV0ZXgpOwo+IC0JCWludGVsX3VucGluX2ZiX29iaihvbGRfb2JqKTsK PiAtCQltdXRleF91bmxvY2soJmRldi0+c3RydWN0X211dGV4KTsKPiAtCX0KPiAgIH0KPgo+ICAg c3RhdGljIGludAo+IEBAIC0xMzUyLDYgKzEzMzQsNyBAQCBpbnRlbF91cGRhdGVfcGxhbmUoc3Ry dWN0IGRybV9wbGFuZSAqcGxhbmUsIHN0cnVjdCBkcm1fY3J0YyAqY3J0YywKPiAgIAkJICAgdWlu dDMyX3Qgc3JjX3gsIHVpbnQzMl90IHNyY195LAo+ICAgCQkgICB1aW50MzJfdCBzcmNfdywgdWlu dDMyX3Qgc3JjX2gpCj4gICB7Cj4gKwlzdHJ1Y3QgZHJtX2RldmljZSAqZGV2ID0gcGxhbmUtPmRl djsKPiAgIAlzdHJ1Y3QgZHJtX2ZyYW1lYnVmZmVyICpvbGRfZmIgPSBwbGFuZS0+ZmI7Cj4gICAJ c3RydWN0IGludGVsX3BsYW5lX3N0YXRlIHN0YXRlOwo+ICAgCXN0cnVjdCBpbnRlbF9jcnRjICpp bnRlbF9jcnRjID0gdG9faW50ZWxfY3J0YyhjcnRjKTsKPiBAQCAtMTM5MCw2ICsxMzczLDE0IEBA IGludGVsX3VwZGF0ZV9wbGFuZShzdHJ1Y3QgZHJtX3BsYW5lICpwbGFuZSwgc3RydWN0IGRybV9j cnRjICpjcnRjLAo+ICAgCX0KPgo+ICAgCWludGVsX2NvbW1pdF9zcHJpdGVfcGxhbmUocGxhbmUs ICZzdGF0ZSk7Cj4gKwo+ICsJaWYgKGZiICE9IG9sZF9mYikgewo+ICsJCWlmIChpbnRlbF9jcnRj LT5hY3RpdmUpCj4gKwkJCWludGVsX3dhaXRfZm9yX3ZibGFuayhkZXYsIGludGVsX2NydGMtPnBp cGUpOwo+ICsJCWlmIChvbGRfZmIpCj4gKwkJCWludGVsX2NsZWFudXBfcGxhbmVfZmIocGxhbmUs IG9sZF9mYik7Cj4gKwl9Cj4gKwo+ICAgCXJldHVybiAwOwo+ICAgfQo+Cj4KCl9fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCkludGVsLWdmeCBtYWlsaW5nIGxp c3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwOi8vbGlzdHMuZnJlZWRlc2t0 b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4Cg==