From mboxrd@z Thu Jan 1 00:00:00 1970 From: Matt Roper Subject: Re: [PATCH 08/24] drm/i915: Do not add planes from intel_atomic_setup_scalers. Date: Tue, 2 Jun 2015 18:29:54 -0700 Message-ID: <20150603012954.GF17555@intel.com> References: <1433165247-15928-1-git-send-email-maarten.lankhorst@linux.intel.com> <1433165247-15928-9-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 mga11.intel.com (mga11.intel.com [192.55.52.93]) by gabe.freedesktop.org (Postfix) with ESMTP id C4DBA6E196 for ; Tue, 2 Jun 2015 18:29:54 -0700 (PDT) Content-Disposition: inline In-Reply-To: <1433165247-15928-9-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: intel-gfx@lists.freedesktop.org List-Id: intel-gfx@lists.freedesktop.org T24gTW9uLCBKdW4gMDEsIDIwMTUgYXQgMDM6Mjc6MTFQTSArMDIwMCwgTWFhcnRlbiBMYW5raG9y c3Qgd3JvdGU6Cj4gVGhpcyBtYXkgcG9zdHBvbmUgZ29pbmcgdG8gSFEgbW9kZSB1bnRpbCB0aGUg cGxhbmUgaXMgaW4gdGhlCj4gZHJtX2F0b21pY19zdGF0ZSBpZiBpdCdzIG5vdCB1c2luZyBzY2Fs ZXIgMCwgYnV0IGl0IGRvZXMgYWxsb3cgbW92aW5nCj4gaW50ZWxfYXRvbWljX3NldHVwX3NjYWxl cnMgdG8gdGhlIGNydGMgY2hlY2sgZnVuY3Rpb24uCj4gCj4gU2lnbmVkLW9mZi1ieTogTWFhcnRl biBMYW5raG9yc3QgPG1hYXJ0ZW4ubGFua2hvcnN0QGxpbnV4LmludGVsLmNvbT4KPiAtLS0KPiAg ZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfYXRvbWljLmMgIHwgNDEgKysrKysrKysrKysrKysr KysrLS0tLS0tLS0tLS0tLS0tLS0tCj4gIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3Bs YXkuYyB8IDI3ICsrKysrKysrKysrKysrKy0tLS0tLS0tLQo+ICBkcml2ZXJzL2dwdS9kcm0vaTkx NS9pbnRlbF9kcnYuaCAgICAgfCAgMiArKwo+ICAzIGZpbGVzIGNoYW5nZWQsIDM5IGluc2VydGlv bnMoKyksIDMxIGRlbGV0aW9ucygtKQo+IAo+IGRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0v aTkxNS9pbnRlbF9hdG9taWMuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2F0b21pYy5j Cj4gaW5kZXggMWVkZDE2NTFjMDQ1Li5hODIwMmZhMGRhYTggMTAwNjQ0Cj4gLS0tIGEvZHJpdmVy cy9ncHUvZHJtL2k5MTUvaW50ZWxfYXRvbWljLmMKPiArKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkx NS9pbnRlbF9hdG9taWMuYwo+IEBAIC0xMDAsMTQgKzEwMCw2IEBAIGludCBpbnRlbF9hdG9taWNf Y2hlY2soc3RydWN0IGRybV9kZXZpY2UgKmRldiwKPiAgCWlmIChyZXQpCj4gIAkJcmV0dXJuIHJl dDsKPiAgCj4gLQkvKgo+IC0JICogRklYTUU6IG1vdmUgdG8gY3J0YyBhdG9taWMgY2hlY2sgZnVu Y3Rpb24gb25jZSB0aGlzIGlzCj4gLQkgKiBtb3JlIGF0b21pYyBmcmllbmRseS4KPiAtCSAqLwo+ IC0JcmV0ID0gaW50ZWxfYXRvbWljX3NldHVwX3NjYWxlcnMoZGV2LCBudWNsZWFyX2NydGMsIGNy dGNfc3RhdGUpOwo+IC0JaWYgKHJldCkKPiAtCQlyZXR1cm4gcmV0Owo+IC0KPiAgCXJldHVybiBy ZXQ7Cj4gIH0KPiAgCj4gQEAgLTMzNiwyMSArMzI4LDEwIEBAIGludCBpbnRlbF9hdG9taWNfc2V0 dXBfc2NhbGVycyhzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LAo+ICAJCQkvKiBmaW5kIHRoZSBwbGFu ZSB0aGF0IHNldCB0aGUgYml0IGFzIHNjYWxlcl91c2VyICovCj4gIAkJCXBsYW5lID0gZHJtX3N0 YXRlLT5wbGFuZXNbaV07Cj4gIAo+IC0JCQkvKgo+IC0JCQkgKiB0byBlbmFibGUvZGlzYWJsZSBo cSBtb2RlLCBhZGQgcGxhbmVzIHRoYXQgYXJlIHVzaW5nIHNjYWxlcgo+IC0JCQkgKiBpbnRvIHRo aXMgdHJhbnNhY3Rpb24KPiAtCQkJICovCj4gIAkJCWlmICghcGxhbmUpIHsKPiAtCQkJCXN0cnVj dCBkcm1fcGxhbmVfc3RhdGUgKnN0YXRlOwo+IC0JCQkJcGxhbmUgPSBkcm1fcGxhbmVfZnJvbV9p bmRleChkZXYsIGkpOwo+IC0JCQkJc3RhdGUgPSBkcm1fYXRvbWljX2dldF9wbGFuZV9zdGF0ZShk cm1fc3RhdGUsIHBsYW5lKTsKPiAtCQkJCWlmIChJU19FUlIoc3RhdGUpKSB7Cj4gLQkJCQkJRFJN X0RFQlVHX0tNUygiRmFpbGVkIHRvIGFkZCBbUExBTkU6JWRdIHRvIGRybV9zdGF0ZVxuIiwKPiAt CQkJCQkJcGxhbmUtPmJhc2UuaWQpOwo+IC0JCQkJCXJldHVybiBQVFJfRVJSKHN0YXRlKTsKPiAt CQkJCX0KPiArCQkJCURSTV9ERUJVR19LTVMoIkZhaWxlZCB0byBmaW5kIFtQTEFORTolZF0gaW4g ZHJtX3N0YXRlXG4iLCBwbGFuZS0+YmFzZS5pZCk7Cj4gKwkJCQljb250aW51ZTsKPiAgCQkJfQo+ IC0KPiAgCQkJaW50ZWxfcGxhbmUgPSB0b19pbnRlbF9wbGFuZShwbGFuZSk7Cj4gIAo+ICAJCQkv KiBwbGFuZSBvbiBkaWZmZXJlbnQgY3J0YyBjYW5ub3QgYmUgYSBzY2FsZXIgdXNlciBvZiB0aGlz IGNydGMgKi8KPiBAQCAtMzk2LDYgKzM3NywyNCBAQCBpbnQgaW50ZWxfYXRvbWljX3NldHVwX3Nj YWxlcnMoc3RydWN0IGRybV9kZXZpY2UgKmRldiwKPiAgCQl9Cj4gIAl9Cj4gIAo+ICsJLyogcGxh bmUgbm90IHBhcnQgb2YgbWFzayBtdXN0IGxlYXZlIGhxIG1vZGU/ICovCj4gKwlpZiAobnVtX3Nj YWxlcnNfbmVlZCA+IDEgJiYgc2NhbGVyX3N0YXRlLT5zY2FsZXJzWzBdLmluX3VzZSAmJgo+ICsJ ICAgIHNjYWxlcl9zdGF0ZS0+c2NhbGVyc1swXS5tb2RlID09IFBTX1NDQUxFUl9NT0RFX0hRKSB7 Cj4gKwkJc2NhbGVyX3N0YXRlLT5zY2FsZXJzWzBdLm1vZGUgPSBQU19TQ0FMRVJfTU9ERV9EWU47 Cj4gKwo+ICsJCWludGVsX2NydGMtPmF0b21pYy5za2xfdXBkYXRlX3NjYWxlcjAgPQo+ICsJCQlQ U19TQ0FMRVJfRU4gfCBQU19TQ0FMRVJfTU9ERV9EWU47Cj4gKwl9Cj4gKwo+ICsJLyogcGxhbmUg bm90IHBhcnQgb2YgbWFzayBjYW4gZW50ZXIgaHEgbW9kZT8gKi8KPiArCWlmIChudW1fc2NhbGVy c19uZWVkID09IDEgJiYgc2NhbGVyX3N0YXRlLT5zY2FsZXJzWzBdLmluX3VzZSAmJgo+ICsJICAg IGludGVsX2NydGMtPnBpcGUgIT0gUElQRV9DICYmIHNjYWxlcl9zdGF0ZS0+c2NhbGVyc1swXS5t b2RlICE9IFBTX1NDQUxFUl9NT0RFX0hRKSB7Cj4gKwkJc2NhbGVyX3N0YXRlLT5zY2FsZXJzWzBd Lm1vZGUgPSBQU19TQ0FMRVJfTU9ERV9IUTsKPiArCj4gKwkJaW50ZWxfY3J0Yy0+YXRvbWljLnNr bF91cGRhdGVfc2NhbGVyMCA9Cj4gKwkJCVBTX1NDQUxFUl9FTiB8IFBTX1NDQUxFUl9NT0RFX0hR Owo+ICsJfQo+ICsKCkkgZG9uJ3QgaGF2ZSBhY2Nlc3MgdG8gdGhlIGh3IHNwZWMgYXQgdGhlIG1v bWVudDsgaXMgc2NhbGVyICMwIHRoZSBvbmx5Cm9uZSB0aGF0IGNhbiBldmVyIGdvIGludG8gSFEg bW9kZT8gIElmIHRoZXJlIGlzbid0IGEgaGFyZHdhcmUKcmVxdWlyZW1lbnQgYWJvdXQgdGhpcywg dGhlbiBpdCBzZWVtcyBsaWtlIHdlJ3JlIG1pc3NpbmcgdGhlIGNhc2Ugd2hlcmUKcGxhbmVzIEEg YW5kIEIgZ2V0IHNjYWxlcnMgMCBhbmQgMS4gIFRoZW4gcGxhbmUgQSAoYW5kIHRodXMgc2NhbGVy IDApIGlzCmRpc2FibGVkLCB3aGljaCBzaG91bGQgYWxsb3cgc2NhbGVyIDEgdG8gZ28gaW50byBI USBtb2RlLgoKSSBndWVzcyBpdCdzIG5vdCBpbW1lZGlhdGVseSBjbGVhciB0byBtZSB3aHkgd2Ug bmVlZCB0byBub3QgcHVsbCB0aGUKb3RoZXIgcGxhbmVzIGludG8gdGhlIHRyYW5zYWN0aW9uLiAg SXMgdGhpcyBqdXN0IHRvIGF2b2lkIGRvaW5nIHNvbWUKZXh0cmEgd29yayBmb3IgYSBwbGFuZSB0 aGF0IGhhc24ndCBjaGFuZ2VkLCBvciBkb2VzIGl0IGNhdXNlIGEgcHJvYmxlbQpzb21laG93PwoK Q2hhbmRyYSBzaG91bGQgcHJvYmFibHkgdGFrZSBhIGxvb2sgYXQgdGhpcyBwYXRjaCBhcyB3ZWxs IHNpbmNlIGhlJ3MgdGhlCnNjYWxlciBleHBlcnQ7IGFkZGluZyBoaW0gdG8gdGhlIENjLgoKCk1h dHQKCj4gIAlyZXR1cm4gMDsKPiAgfQo+ICAKPiBkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJt L2k5MTUvaW50ZWxfZGlzcGxheS5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxh eS5jCj4gaW5kZXggMDA2MDc4NDUyNWRjLi45NDEwMWQxZjc4NGMgMTAwNjQ0Cj4gLS0tIGEvZHJp dmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jCj4gKysrIGIvZHJpdmVycy9ncHUvZHJt L2k5MTUvaW50ZWxfZGlzcGxheS5jCj4gQEAgLTY1MzAsNyArNjUzMCw2IEBAIHN0YXRpYyBpbnQg aW50ZWxfY3J0Y19jb21wdXRlX2NvbmZpZyhzdHJ1Y3QgaW50ZWxfY3J0YyAqY3J0YywKPiAgCXN0 cnVjdCBkcm1fZGV2aWNlICpkZXYgPSBjcnRjLT5iYXNlLmRldjsKPiAgCXN0cnVjdCBkcm1faTkx NV9wcml2YXRlICpkZXZfcHJpdiA9IGRldi0+ZGV2X3ByaXZhdGU7Cj4gIAlzdHJ1Y3QgZHJtX2Rp c3BsYXlfbW9kZSAqYWRqdXN0ZWRfbW9kZSA9ICZwaXBlX2NvbmZpZy0+YmFzZS5hZGp1c3RlZF9t b2RlOwo+IC0JaW50IHJldDsKPiAgCj4gIAkvKiBGSVhNRSBzaG91bGQgY2hlY2sgcGl4ZWwgY2xv Y2sgbGltaXRzIG9uIGFsbCBwbGF0Zm9ybXMgKi8KPiAgCWlmIChJTlRFTF9JTkZPKGRldiktPmdl biA8IDQpIHsKPiBAQCAtNjU3NywxNCArNjU3Niw3IEBAIHN0YXRpYyBpbnQgaW50ZWxfY3J0Y19j b21wdXRlX2NvbmZpZyhzdHJ1Y3QgaW50ZWxfY3J0YyAqY3J0YywKPiAgCWlmIChwaXBlX2NvbmZp Zy0+aGFzX3BjaF9lbmNvZGVyKQo+ICAJCXJldHVybiBpcm9ubGFrZV9mZGlfY29tcHV0ZV9jb25m aWcoY3J0YywgcGlwZV9jb25maWcpOwo+ICAKPiAtCS8qIEZJWE1FOiByZW1vdmUgYmVsb3cgY2Fs bCBvbmNlIGF0b21pYyBtb2RlIHNldCBpcyBwbGFjZSBhbmQgYWxsIGNydGMKPiAtCSAqIHJlbGF0 ZWQgY2hlY2tzIGNhbGxlZCBmcm9tIGF0b21pY19jcnRjX2NoZWNrIGZ1bmN0aW9uICovCj4gLQly ZXQgPSAwOwo+IC0JRFJNX0RFQlVHX0tNUygiaW50ZWxfY3J0YyA9ICVwIGRybV9zdGF0ZSAocGlw ZV9jb25maWctPmJhc2Uuc3RhdGUpID0gJXBcbiIsCj4gLQkJY3J0YywgcGlwZV9jb25maWctPmJh c2Uuc3RhdGUpOwo+IC0JcmV0ID0gaW50ZWxfYXRvbWljX3NldHVwX3NjYWxlcnMoZGV2LCBjcnRj LCBwaXBlX2NvbmZpZyk7Cj4gLQo+IC0JcmV0dXJuIHJldDsKPiArCXJldHVybiAwOwo+ICB9Cj4g IAo+ICBzdGF0aWMgaW50IHNreWxha2VfZ2V0X2Rpc3BsYXlfY2xvY2tfc3BlZWQoc3RydWN0IGRy bV9kZXZpY2UgKmRldikKPiBAQCAtMTE0NTcsNyArMTE0NDksMTAgQEAgc3RhdGljIGJvb2wgY2hl Y2tfZW5jb2Rlcl9jbG9uaW5nKHN0cnVjdCBkcm1fYXRvbWljX3N0YXRlICpzdGF0ZSwKPiAgc3Rh dGljIGludCBpbnRlbF9hdG9taWNfY2hlY2tfY3J0YyhzdHJ1Y3QgZHJtX2NydGMgKmNydGMsCj4g IAkJCQkgICBzdHJ1Y3QgZHJtX2NydGNfc3RhdGUgKmNydGNfc3RhdGUpCj4gIHsKPiArCXN0cnVj dCBkcm1fZGV2aWNlICpkZXYgPSBjcnRjLT5kZXY7Cj4gIAlzdHJ1Y3QgaW50ZWxfY3J0YyAqaW50 ZWxfY3J0YyA9IHRvX2ludGVsX2NydGMoY3J0Yyk7Cj4gKwlzdHJ1Y3QgaW50ZWxfY3J0Y19zdGF0 ZSAqcGlwZV9jb25maWcgPQo+ICsJCXRvX2ludGVsX2NydGNfc3RhdGUoY3J0Y19zdGF0ZSk7Cj4g IAlzdHJ1Y3QgZHJtX2F0b21pY19zdGF0ZSAqc3RhdGUgPSBjcnRjX3N0YXRlLT5zdGF0ZTsKPiAg CWludCBpZHggPSBjcnRjLT5iYXNlLmlkOwo+ICAJYm9vbCBpc19jcnRjX2VuYWJsZWQgPSBjcnRj X3N0YXRlLT5hY3RpdmU7Cj4gQEAgLTExNDc2LDcgKzExNDcxLDcgQEAgc3RhdGljIGludCBpbnRl bF9hdG9taWNfY2hlY2tfY3J0YyhzdHJ1Y3QgZHJtX2NydGMgKmNydGMsCj4gIAlEUk1fREVCVUdf QVRPTUlDKCJDcnRjICVpIHdhcyBlbmFibGVkICVpIG5vdyBlbmFibGVkOiAlaVxuIiwKPiAgCQkJ IGlkeCwgd2FzX2NydGNfZW5hYmxlZCwgaXNfY3J0Y19lbmFibGVkKTsKPiAgCj4gLQlyZXR1cm4g MDsKPiArCXJldHVybiBpbnRlbF9hdG9taWNfc2V0dXBfc2NhbGVycyhkZXYsIGludGVsX2NydGMs IHBpcGVfY29uZmlnKTsKPiAgfQo+ICAKPiAgc3RhdGljIGNvbnN0IHN0cnVjdCBkcm1fY3J0Y19o ZWxwZXJfZnVuY3MgaW50ZWxfaGVscGVyX2Z1bmNzID0gewo+IEBAIC0xMzQyMyw2ICsxMzQxOCwx OCBAQCBzdGF0aWMgdm9pZCBpbnRlbF9iZWdpbl9jcnRjX2NvbW1pdChzdHJ1Y3QgZHJtX2NydGMg KmNydGMpCj4gIAkJaW50ZWxfY3J0Yy0+YXRvbWljLmV2YWRlID0KPiAgCQkJaW50ZWxfcGlwZV91 cGRhdGVfc3RhcnQoaW50ZWxfY3J0YywKPiAgCQkJCQkJJmludGVsX2NydGMtPmF0b21pYy5zdGFy dF92YmxfY291bnQpOwo+ICsKPiArCWlmIChpbnRlbF9jcnRjLT5hdG9taWMuc2tsX3VwZGF0ZV9z Y2FsZXIwKSB7Cj4gKwkJdWludDMyX3QgcHNfY3RybCwgcHNfd2luX3N6Owo+ICsKPiArCQlwc19j dHJsID0gSTkxNV9SRUFEKFNLTF9QU19DVFJMKGludGVsX2NydGMtPnBpcGUsIDApKTsKPiArCQlw c19jdHJsICY9IH5QU19TQ0FMRVJfTU9ERV9NQVNLOwo+ICsJCXBzX2N0cmwgfD0gaW50ZWxfY3J0 Yy0+YXRvbWljLnNrbF91cGRhdGVfc2NhbGVyMCAmIFBTX1NDQUxFUl9NT0RFX01BU0s7Cj4gKwkJ STkxNV9XUklURShTS0xfUFNfQ1RSTChpbnRlbF9jcnRjLT5waXBlLCAwKSwgcHNfY3RybCk7Cj4g Kwo+ICsJCXBzX3dpbl9zeiA9IEk5MTVfUkVBRChTS0xfUFNfV0lOX1NaKGludGVsX2NydGMtPnBp cGUsIDApKTsKPiArCQlJOTE1X1dSSVRFKFNLTF9QU19XSU5fU1ooaW50ZWxfY3J0Yy0+cGlwZSwg MCksIHBzX3dpbl9zeik7Cj4gKwl9Cj4gIH0KPiAgCj4gIHN0YXRpYyB2b2lkIGludGVsX2Zpbmlz aF9jcnRjX2NvbW1pdChzdHJ1Y3QgZHJtX2NydGMgKmNydGMpCj4gZGlmZiAtLWdpdCBhL2RyaXZl cnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rydi5oIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxf ZHJ2LmgKPiBpbmRleCAxZDlmZWI4NzI3ZWEuLjcxYWQ4YTFlMTNhYiAxMDA2NDQKPiAtLS0gYS9k cml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcnYuaAo+ICsrKyBiL2RyaXZlcnMvZ3B1L2RybS9p OTE1L2ludGVsX2Rydi5oCj4gQEAgLTQ4Nyw2ICs0ODcsOCBAQCBzdHJ1Y3QgaW50ZWxfY3J0Y19h dG9taWNfY29tbWl0IHsKPiAgCWJvb2wgdXBkYXRlX3dtOwo+ICAJdW5zaWduZWQgZGlzYWJsZWRf cGxhbmVzOwo+ICAKPiArCXVuc2lnbmVkIHNrbF91cGRhdGVfc2NhbGVyMDsKPiArCj4gIAkvKiBT bGVlcGFibGUgb3BlcmF0aW9ucyB0byBwZXJmb3JtIGFmdGVyIGNvbW1pdCAqLwo+ICAJdW5zaWdu ZWQgZmJfYml0czsKPiAgCWJvb2wgd2FpdF92Ymxhbms7Cj4gLS0gCj4gMi4xLjAKPiAKPiBfX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwo+IEludGVsLWdmeCBt YWlsaW5nIGxpc3QKPiBJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCj4gaHR0cDovL2xp c3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeAoKLS0gCk1hdHQg Um9wZXIKR3JhcGhpY3MgU29mdHdhcmUgRW5naW5lZXIKSW9URyBQbGF0Zm9ybSBFbmFibGluZyAm IERldmVsb3BtZW50CkludGVsIENvcnBvcmF0aW9uCig5MTYpIDM1Ni0yNzk1Cl9fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCkludGVsLWdmeCBtYWlsaW5nIGxp c3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwOi8vbGlzdHMuZnJlZWRlc2t0 b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4Cg==