From mboxrd@z Thu Jan  1 00:00:00 1970
From: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Subject: [PATCH 08/24] drm/i915: Do not add planes from
	intel_atomic_setup_scalers.
Date: Mon,  1 Jun 2015 15:27:11 +0200
Message-ID: <1433165247-15928-9-git-send-email-maarten.lankhorst@linux.intel.com>
References: <1433165247-15928-1-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: <intel-gfx-bounces@lists.freedesktop.org>
Received: from mblankhorst.nl (mblankhorst.nl [141.105.120.124])
 by gabe.freedesktop.org (Postfix) with ESMTP id B41876E601
 for <intel-gfx@lists.freedesktop.org>; Mon,  1 Jun 2015 06:27:44 -0700 (PDT)
In-Reply-To: <1433165247-15928-1-git-send-email-maarten.lankhorst@linux.intel.com>
List-Unsubscribe: <http://lists.freedesktop.org/mailman/options/intel-gfx>,
 <mailto:intel-gfx-request@lists.freedesktop.org?subject=unsubscribe>
List-Archive: <http://lists.freedesktop.org/archives/intel-gfx>
List-Post: <mailto:intel-gfx@lists.freedesktop.org>
List-Help: <mailto:intel-gfx-request@lists.freedesktop.org?subject=help>
List-Subscribe: <http://lists.freedesktop.org/mailman/listinfo/intel-gfx>,
 <mailto:intel-gfx-request@lists.freedesktop.org?subject=subscribe>
Errors-To: intel-gfx-bounces@lists.freedesktop.org
Sender: "Intel-gfx" <intel-gfx-bounces@lists.freedesktop.org>
To: intel-gfx@lists.freedesktop.org
List-Id: intel-gfx@lists.freedesktop.org

VGhpcyBtYXkgcG9zdHBvbmUgZ29pbmcgdG8gSFEgbW9kZSB1bnRpbCB0aGUgcGxhbmUgaXMgaW4g
dGhlCmRybV9hdG9taWNfc3RhdGUgaWYgaXQncyBub3QgdXNpbmcgc2NhbGVyIDAsIGJ1dCBpdCBk
b2VzIGFsbG93IG1vdmluZwppbnRlbF9hdG9taWNfc2V0dXBfc2NhbGVycyB0byB0aGUgY3J0YyBj
aGVjayBmdW5jdGlvbi4KClNpZ25lZC1vZmYtYnk6IE1hYXJ0ZW4gTGFua2hvcnN0IDxtYWFydGVu
Lmxhbmtob3JzdEBsaW51eC5pbnRlbC5jb20+Ci0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50
ZWxfYXRvbWljLmMgIHwgNDEgKysrKysrKysrKysrKysrKysrLS0tLS0tLS0tLS0tLS0tLS0tCiBk
cml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMgfCAyNyArKysrKysrKysrKysrKyst
LS0tLS0tLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rydi5oICAgICB8ICAyICsrCiAz
IGZpbGVzIGNoYW5nZWQsIDM5IGluc2VydGlvbnMoKyksIDMxIGRlbGV0aW9ucygtKQoKZGlmZiAt
LWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2F0b21pYy5jIGIvZHJpdmVycy9ncHUv
ZHJtL2k5MTUvaW50ZWxfYXRvbWljLmMKaW5kZXggMWVkZDE2NTFjMDQ1Li5hODIwMmZhMGRhYTgg
MTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2F0b21pYy5jCisrKyBiL2Ry
aXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2F0b21pYy5jCkBAIC0xMDAsMTQgKzEwMCw2IEBAIGlu
dCBpbnRlbF9hdG9taWNfY2hlY2soc3RydWN0IGRybV9kZXZpY2UgKmRldiwKIAlpZiAocmV0KQog
CQlyZXR1cm4gcmV0OwogCi0JLyoKLQkgKiBGSVhNRTogbW92ZSB0byBjcnRjIGF0b21pYyBjaGVj
ayBmdW5jdGlvbiBvbmNlIHRoaXMgaXMKLQkgKiBtb3JlIGF0b21pYyBmcmllbmRseS4KLQkgKi8K
LQlyZXQgPSBpbnRlbF9hdG9taWNfc2V0dXBfc2NhbGVycyhkZXYsIG51Y2xlYXJfY3J0YywgY3J0
Y19zdGF0ZSk7Ci0JaWYgKHJldCkKLQkJcmV0dXJuIHJldDsKLQogCXJldHVybiByZXQ7CiB9CiAK
QEAgLTMzNiwyMSArMzI4LDEwIEBAIGludCBpbnRlbF9hdG9taWNfc2V0dXBfc2NhbGVycyhzdHJ1
Y3QgZHJtX2RldmljZSAqZGV2LAogCQkJLyogZmluZCB0aGUgcGxhbmUgdGhhdCBzZXQgdGhlIGJp
dCBhcyBzY2FsZXJfdXNlciAqLwogCQkJcGxhbmUgPSBkcm1fc3RhdGUtPnBsYW5lc1tpXTsKIAot
CQkJLyoKLQkJCSAqIHRvIGVuYWJsZS9kaXNhYmxlIGhxIG1vZGUsIGFkZCBwbGFuZXMgdGhhdCBh
cmUgdXNpbmcgc2NhbGVyCi0JCQkgKiBpbnRvIHRoaXMgdHJhbnNhY3Rpb24KLQkJCSAqLwogCQkJ
aWYgKCFwbGFuZSkgewotCQkJCXN0cnVjdCBkcm1fcGxhbmVfc3RhdGUgKnN0YXRlOwotCQkJCXBs
YW5lID0gZHJtX3BsYW5lX2Zyb21faW5kZXgoZGV2LCBpKTsKLQkJCQlzdGF0ZSA9IGRybV9hdG9t
aWNfZ2V0X3BsYW5lX3N0YXRlKGRybV9zdGF0ZSwgcGxhbmUpOwotCQkJCWlmIChJU19FUlIoc3Rh
dGUpKSB7Ci0JCQkJCURSTV9ERUJVR19LTVMoIkZhaWxlZCB0byBhZGQgW1BMQU5FOiVkXSB0byBk
cm1fc3RhdGVcbiIsCi0JCQkJCQlwbGFuZS0+YmFzZS5pZCk7Ci0JCQkJCXJldHVybiBQVFJfRVJS
KHN0YXRlKTsKLQkJCQl9CisJCQkJRFJNX0RFQlVHX0tNUygiRmFpbGVkIHRvIGZpbmQgW1BMQU5F
OiVkXSBpbiBkcm1fc3RhdGVcbiIsIHBsYW5lLT5iYXNlLmlkKTsKKwkJCQljb250aW51ZTsKIAkJ
CX0KLQogCQkJaW50ZWxfcGxhbmUgPSB0b19pbnRlbF9wbGFuZShwbGFuZSk7CiAKIAkJCS8qIHBs
YW5lIG9uIGRpZmZlcmVudCBjcnRjIGNhbm5vdCBiZSBhIHNjYWxlciB1c2VyIG9mIHRoaXMgY3J0
YyAqLwpAQCAtMzk2LDYgKzM3NywyNCBAQCBpbnQgaW50ZWxfYXRvbWljX3NldHVwX3NjYWxlcnMo
c3RydWN0IGRybV9kZXZpY2UgKmRldiwKIAkJfQogCX0KIAorCS8qIHBsYW5lIG5vdCBwYXJ0IG9m
IG1hc2sgbXVzdCBsZWF2ZSBocSBtb2RlPyAqLworCWlmIChudW1fc2NhbGVyc19uZWVkID4gMSAm
JiBzY2FsZXJfc3RhdGUtPnNjYWxlcnNbMF0uaW5fdXNlICYmCisJICAgIHNjYWxlcl9zdGF0ZS0+
c2NhbGVyc1swXS5tb2RlID09IFBTX1NDQUxFUl9NT0RFX0hRKSB7CisJCXNjYWxlcl9zdGF0ZS0+
c2NhbGVyc1swXS5tb2RlID0gUFNfU0NBTEVSX01PREVfRFlOOworCisJCWludGVsX2NydGMtPmF0
b21pYy5za2xfdXBkYXRlX3NjYWxlcjAgPQorCQkJUFNfU0NBTEVSX0VOIHwgUFNfU0NBTEVSX01P
REVfRFlOOworCX0KKworCS8qIHBsYW5lIG5vdCBwYXJ0IG9mIG1hc2sgY2FuIGVudGVyIGhxIG1v
ZGU/ICovCisJaWYgKG51bV9zY2FsZXJzX25lZWQgPT0gMSAmJiBzY2FsZXJfc3RhdGUtPnNjYWxl
cnNbMF0uaW5fdXNlICYmCisJICAgIGludGVsX2NydGMtPnBpcGUgIT0gUElQRV9DICYmIHNjYWxl
cl9zdGF0ZS0+c2NhbGVyc1swXS5tb2RlICE9IFBTX1NDQUxFUl9NT0RFX0hRKSB7CisJCXNjYWxl
cl9zdGF0ZS0+c2NhbGVyc1swXS5tb2RlID0gUFNfU0NBTEVSX01PREVfSFE7CisKKwkJaW50ZWxf
Y3J0Yy0+YXRvbWljLnNrbF91cGRhdGVfc2NhbGVyMCA9CisJCQlQU19TQ0FMRVJfRU4gfCBQU19T
Q0FMRVJfTU9ERV9IUTsKKwl9CisKIAlyZXR1cm4gMDsKIH0KIApkaWZmIC0tZ2l0IGEvZHJpdmVy
cy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50
ZWxfZGlzcGxheS5jCmluZGV4IDAwNjA3ODQ1MjVkYy4uOTQxMDFkMWY3ODRjIDEwMDY0NAotLS0g
YS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMKKysrIGIvZHJpdmVycy9ncHUv
ZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jCkBAIC02NTMwLDcgKzY1MzAsNiBAQCBzdGF0aWMgaW50
IGludGVsX2NydGNfY29tcHV0ZV9jb25maWcoc3RydWN0IGludGVsX2NydGMgKmNydGMsCiAJc3Ry
dWN0IGRybV9kZXZpY2UgKmRldiA9IGNydGMtPmJhc2UuZGV2OwogCXN0cnVjdCBkcm1faTkxNV9w
cml2YXRlICpkZXZfcHJpdiA9IGRldi0+ZGV2X3ByaXZhdGU7CiAJc3RydWN0IGRybV9kaXNwbGF5
X21vZGUgKmFkanVzdGVkX21vZGUgPSAmcGlwZV9jb25maWctPmJhc2UuYWRqdXN0ZWRfbW9kZTsK
LQlpbnQgcmV0OwogCiAJLyogRklYTUUgc2hvdWxkIGNoZWNrIHBpeGVsIGNsb2NrIGxpbWl0cyBv
biBhbGwgcGxhdGZvcm1zICovCiAJaWYgKElOVEVMX0lORk8oZGV2KS0+Z2VuIDwgNCkgewpAQCAt
NjU3NywxNCArNjU3Niw3IEBAIHN0YXRpYyBpbnQgaW50ZWxfY3J0Y19jb21wdXRlX2NvbmZpZyhz
dHJ1Y3QgaW50ZWxfY3J0YyAqY3J0YywKIAlpZiAocGlwZV9jb25maWctPmhhc19wY2hfZW5jb2Rl
cikKIAkJcmV0dXJuIGlyb25sYWtlX2ZkaV9jb21wdXRlX2NvbmZpZyhjcnRjLCBwaXBlX2NvbmZp
Zyk7CiAKLQkvKiBGSVhNRTogcmVtb3ZlIGJlbG93IGNhbGwgb25jZSBhdG9taWMgbW9kZSBzZXQg
aXMgcGxhY2UgYW5kIGFsbCBjcnRjCi0JICogcmVsYXRlZCBjaGVja3MgY2FsbGVkIGZyb20gYXRv
bWljX2NydGNfY2hlY2sgZnVuY3Rpb24gKi8KLQlyZXQgPSAwOwotCURSTV9ERUJVR19LTVMoImlu
dGVsX2NydGMgPSAlcCBkcm1fc3RhdGUgKHBpcGVfY29uZmlnLT5iYXNlLnN0YXRlKSA9ICVwXG4i
LAotCQljcnRjLCBwaXBlX2NvbmZpZy0+YmFzZS5zdGF0ZSk7Ci0JcmV0ID0gaW50ZWxfYXRvbWlj
X3NldHVwX3NjYWxlcnMoZGV2LCBjcnRjLCBwaXBlX2NvbmZpZyk7Ci0KLQlyZXR1cm4gcmV0Owor
CXJldHVybiAwOwogfQogCiBzdGF0aWMgaW50IHNreWxha2VfZ2V0X2Rpc3BsYXlfY2xvY2tfc3Bl
ZWQoc3RydWN0IGRybV9kZXZpY2UgKmRldikKQEAgLTExNDU3LDcgKzExNDQ5LDEwIEBAIHN0YXRp
YyBib29sIGNoZWNrX2VuY29kZXJfY2xvbmluZyhzdHJ1Y3QgZHJtX2F0b21pY19zdGF0ZSAqc3Rh
dGUsCiBzdGF0aWMgaW50IGludGVsX2F0b21pY19jaGVja19jcnRjKHN0cnVjdCBkcm1fY3J0YyAq
Y3J0YywKIAkJCQkgICBzdHJ1Y3QgZHJtX2NydGNfc3RhdGUgKmNydGNfc3RhdGUpCiB7CisJc3Ry
dWN0IGRybV9kZXZpY2UgKmRldiA9IGNydGMtPmRldjsKIAlzdHJ1Y3QgaW50ZWxfY3J0YyAqaW50
ZWxfY3J0YyA9IHRvX2ludGVsX2NydGMoY3J0Yyk7CisJc3RydWN0IGludGVsX2NydGNfc3RhdGUg
KnBpcGVfY29uZmlnID0KKwkJdG9faW50ZWxfY3J0Y19zdGF0ZShjcnRjX3N0YXRlKTsKIAlzdHJ1
Y3QgZHJtX2F0b21pY19zdGF0ZSAqc3RhdGUgPSBjcnRjX3N0YXRlLT5zdGF0ZTsKIAlpbnQgaWR4
ID0gY3J0Yy0+YmFzZS5pZDsKIAlib29sIGlzX2NydGNfZW5hYmxlZCA9IGNydGNfc3RhdGUtPmFj
dGl2ZTsKQEAgLTExNDc2LDcgKzExNDcxLDcgQEAgc3RhdGljIGludCBpbnRlbF9hdG9taWNfY2hl
Y2tfY3J0YyhzdHJ1Y3QgZHJtX2NydGMgKmNydGMsCiAJRFJNX0RFQlVHX0FUT01JQygiQ3J0YyAl
aSB3YXMgZW5hYmxlZCAlaSBub3cgZW5hYmxlZDogJWlcbiIsCiAJCQkgaWR4LCB3YXNfY3J0Y19l
bmFibGVkLCBpc19jcnRjX2VuYWJsZWQpOwogCi0JcmV0dXJuIDA7CisJcmV0dXJuIGludGVsX2F0
b21pY19zZXR1cF9zY2FsZXJzKGRldiwgaW50ZWxfY3J0YywgcGlwZV9jb25maWcpOwogfQogCiBz
dGF0aWMgY29uc3Qgc3RydWN0IGRybV9jcnRjX2hlbHBlcl9mdW5jcyBpbnRlbF9oZWxwZXJfZnVu
Y3MgPSB7CkBAIC0xMzQyMyw2ICsxMzQxOCwxOCBAQCBzdGF0aWMgdm9pZCBpbnRlbF9iZWdpbl9j
cnRjX2NvbW1pdChzdHJ1Y3QgZHJtX2NydGMgKmNydGMpCiAJCWludGVsX2NydGMtPmF0b21pYy5l
dmFkZSA9CiAJCQlpbnRlbF9waXBlX3VwZGF0ZV9zdGFydChpbnRlbF9jcnRjLAogCQkJCQkJJmlu
dGVsX2NydGMtPmF0b21pYy5zdGFydF92YmxfY291bnQpOworCisJaWYgKGludGVsX2NydGMtPmF0
b21pYy5za2xfdXBkYXRlX3NjYWxlcjApIHsKKwkJdWludDMyX3QgcHNfY3RybCwgcHNfd2luX3N6
OworCisJCXBzX2N0cmwgPSBJOTE1X1JFQUQoU0tMX1BTX0NUUkwoaW50ZWxfY3J0Yy0+cGlwZSwg
MCkpOworCQlwc19jdHJsICY9IH5QU19TQ0FMRVJfTU9ERV9NQVNLOworCQlwc19jdHJsIHw9IGlu
dGVsX2NydGMtPmF0b21pYy5za2xfdXBkYXRlX3NjYWxlcjAgJiBQU19TQ0FMRVJfTU9ERV9NQVNL
OworCQlJOTE1X1dSSVRFKFNLTF9QU19DVFJMKGludGVsX2NydGMtPnBpcGUsIDApLCBwc19jdHJs
KTsKKworCQlwc193aW5fc3ogPSBJOTE1X1JFQUQoU0tMX1BTX1dJTl9TWihpbnRlbF9jcnRjLT5w
aXBlLCAwKSk7CisJCUk5MTVfV1JJVEUoU0tMX1BTX1dJTl9TWihpbnRlbF9jcnRjLT5waXBlLCAw
KSwgcHNfd2luX3N6KTsKKwl9CiB9CiAKIHN0YXRpYyB2b2lkIGludGVsX2ZpbmlzaF9jcnRjX2Nv
bW1pdChzdHJ1Y3QgZHJtX2NydGMgKmNydGMpCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0v
aTkxNS9pbnRlbF9kcnYuaCBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rydi5oCmluZGV4
IDFkOWZlYjg3MjdlYS4uNzFhZDhhMWUxM2FiIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0v
aTkxNS9pbnRlbF9kcnYuaAorKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcnYuaApA
QCAtNDg3LDYgKzQ4Nyw4IEBAIHN0cnVjdCBpbnRlbF9jcnRjX2F0b21pY19jb21taXQgewogCWJv
b2wgdXBkYXRlX3dtOwogCXVuc2lnbmVkIGRpc2FibGVkX3BsYW5lczsKIAorCXVuc2lnbmVkIHNr
bF91cGRhdGVfc2NhbGVyMDsKKwogCS8qIFNsZWVwYWJsZSBvcGVyYXRpb25zIHRvIHBlcmZvcm0g
YWZ0ZXIgY29tbWl0ICovCiAJdW5zaWduZWQgZmJfYml0czsKIAlib29sIHdhaXRfdmJsYW5rOwot
LSAKMi4xLjAKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f
CkludGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpo
dHRwOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4Cg==