From mboxrd@z Thu Jan  1 00:00:00 1970
From: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Subject: [PATCH v2 15/27] drm/i915: remove force argument from
	disable_plane
Date: Thu,  4 Jun 2015 14:47:45 +0200
Message-ID: <1433422077-14907-16-git-send-email-maarten.lankhorst@linux.intel.com>
References: <1433422077-14907-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 987A66EAC2
 for <intel-gfx@lists.freedesktop.org>; Thu,  4 Jun 2015 05:48:12 -0700 (PDT)
In-Reply-To: <1433422077-14907-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

VGhlIGlkZWEgd2FzIGdvb2QsIGJ1dCBwbGFuZXMgY2FuIGhhdmUgYSBmYiBldmVuIHRob3VnaAp0
aGV5J3JlIGRpc2FibGVkLiBUaGlzIG1ha2VzIHRoZSBmb3JjZSBhcmd1bWVudCB1c2VsZXNzCmFu
ZCBhbHdheXMgdHJ1ZSwgYmVjYXVzZSBvbmx5IHRoZSBjb21taXQgZnVuY3Rpb24gdXBkYXRlcwpz
dGF0ZS4KClNpZ25lZC1vZmYtYnk6IE1hYXJ0ZW4gTGFua2hvcnN0IDxtYWFydGVuLmxhbmtob3Jz
dEBsaW51eC5pbnRlbC5jb20+Ci0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxh
eS5jIHwgMTYgKysrLS0tLS0tLS0tLS0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHJ2
LmggICAgIHwgIDIgKy0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3Nwcml0ZS5jICB8IDEw
ICsrKysrLS0tLS0KIDMgZmlsZXMgY2hhbmdlZCwgOSBpbnNlcnRpb25zKCspLCAxOSBkZWxldGlv
bnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMg
Yi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMKaW5kZXggODg0MWNmNWU4ZjFi
Li5mNWYwNzQ1MjQ2MDMgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rp
c3BsYXkuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMKQEAgLTQ3
ODQsNyArNDc4NCw3IEBAIHN0YXRpYyB2b2lkIGludGVsX2NydGNfZGlzYWJsZV9wbGFuZXMoc3Ry
dWN0IGRybV9jcnRjICpjcnRjKQogCQkJc3RydWN0IGRybV9jcnRjICpmcm9tID0gaW50ZWxfcGxh
bmUtPmJhc2UuY3J0YzsKIAogCQkJaW50ZWxfcGxhbmUtPmRpc2FibGVfcGxhbmUoJmludGVsX3Bs
YW5lLT5iYXNlLAotCQkJCQkJICAgZnJvbSA/OiBjcnRjLCB0cnVlKTsKKwkJCQkJCSAgIGZyb20g
PzogY3J0Yyk7CiAJCX0KIAl9CiAKQEAgLTEzNDQ0LDggKzEzNDQ0LDcgQEAgaW50ZWxfY29tbWl0
X3ByaW1hcnlfcGxhbmUoc3RydWN0IGRybV9wbGFuZSAqcGxhbmUsCiAKIHN0YXRpYyB2b2lkCiBp
bnRlbF9kaXNhYmxlX3ByaW1hcnlfcGxhbmUoc3RydWN0IGRybV9wbGFuZSAqcGxhbmUsCi0JCQkg
ICAgc3RydWN0IGRybV9jcnRjICpjcnRjLAotCQkJICAgIGJvb2wgZm9yY2UpCisJCQkgICAgc3Ry
dWN0IGRybV9jcnRjICpjcnRjKQogewogCXN0cnVjdCBkcm1fZGV2aWNlICpkZXYgPSBwbGFuZS0+
ZGV2OwogCXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9IGRldi0+ZGV2X3ByaXZh
dGU7CkBAIC0xMzY5MSwxNyArMTM2OTAsOCBAQCBpbnRlbF9jaGVja19jdXJzb3JfcGxhbmUoc3Ry
dWN0IGRybV9wbGFuZSAqcGxhbmUsCiAKIHN0YXRpYyB2b2lkCiBpbnRlbF9kaXNhYmxlX2N1cnNv
cl9wbGFuZShzdHJ1Y3QgZHJtX3BsYW5lICpwbGFuZSwKLQkJCSAgIHN0cnVjdCBkcm1fY3J0YyAq
Y3J0YywKLQkJCSAgIGJvb2wgZm9yY2UpCisJCQkgICBzdHJ1Y3QgZHJtX2NydGMgKmNydGMpCiB7
Ci0Jc3RydWN0IGludGVsX2NydGMgKmludGVsX2NydGMgPSB0b19pbnRlbF9jcnRjKGNydGMpOwot
Ci0JaWYgKCFmb3JjZSkgewotCQlwbGFuZS0+ZmIgPSBOVUxMOwotCQlpbnRlbF9jcnRjLT5jdXJz
b3JfYm8gPSBOVUxMOwotCQlpbnRlbF9jcnRjLT5jdXJzb3JfYWRkciA9IDA7Ci0JfQotCiAJaW50
ZWxfY3J0Y191cGRhdGVfY3Vyc29yKGNydGMsIGZhbHNlKTsKIH0KIApkaWZmIC0tZ2l0IGEvZHJp
dmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHJ2LmggYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRl
bF9kcnYuaAppbmRleCA5NmUzNjVlNzRiMDQuLjBkYWU5NDYzMTA5NCAxMDA2NDQKLS0tIGEvZHJp
dmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHJ2LmgKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUv
aW50ZWxfZHJ2LmgKQEAgLTU5OSw3ICs1OTksNyBAQCBzdHJ1Y3QgaW50ZWxfcGxhbmUgewogCQkJ
ICAgICB1aW50MzJfdCB4LCB1aW50MzJfdCB5LAogCQkJICAgICB1aW50MzJfdCBzcmNfdywgdWlu
dDMyX3Qgc3JjX2gpOwogCXZvaWQgKCpkaXNhYmxlX3BsYW5lKShzdHJ1Y3QgZHJtX3BsYW5lICpw
bGFuZSwKLQkJCSAgICAgIHN0cnVjdCBkcm1fY3J0YyAqY3J0YywgYm9vbCBmb3JjZSk7CisJCQkg
ICAgICBzdHJ1Y3QgZHJtX2NydGMgKmNydGMpOwogCWludCAoKmNoZWNrX3BsYW5lKShzdHJ1Y3Qg
ZHJtX3BsYW5lICpwbGFuZSwKIAkJCSAgIHN0cnVjdCBpbnRlbF9jcnRjX3N0YXRlICpjcnRjX3N0
YXRlLAogCQkJICAgc3RydWN0IGludGVsX3BsYW5lX3N0YXRlICpzdGF0ZSk7CmRpZmYgLS1naXQg
YS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9zcHJpdGUuYyBiL2RyaXZlcnMvZ3B1L2RybS9p
OTE1L2ludGVsX3Nwcml0ZS5jCmluZGV4IGMxNWQ1NGI2MDEwNS4uMmE2Y2ZhYzIxMGNiIDEwMDY0
NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9zcHJpdGUuYworKysgYi9kcml2ZXJz
L2dwdS9kcm0vaTkxNS9pbnRlbF9zcHJpdGUuYwpAQCAtMjcyLDcgKzI3Miw3IEBAIHNrbF91cGRh
dGVfcGxhbmUoc3RydWN0IGRybV9wbGFuZSAqZHJtX3BsYW5lLCBzdHJ1Y3QgZHJtX2NydGMgKmNy
dGMsCiB9CiAKIHN0YXRpYyB2b2lkCi1za2xfZGlzYWJsZV9wbGFuZShzdHJ1Y3QgZHJtX3BsYW5l
ICpkcGxhbmUsIHN0cnVjdCBkcm1fY3J0YyAqY3J0YywgYm9vbCBmb3JjZSkKK3NrbF9kaXNhYmxl
X3BsYW5lKHN0cnVjdCBkcm1fcGxhbmUgKmRwbGFuZSwgc3RydWN0IGRybV9jcnRjICpjcnRjKQog
ewogCXN0cnVjdCBkcm1fZGV2aWNlICpkZXYgPSBkcGxhbmUtPmRldjsKIAlzdHJ1Y3QgZHJtX2k5
MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSBkZXYtPmRldl9wcml2YXRlOwpAQCAtNDU1LDcgKzQ1NSw3
IEBAIHZsdl91cGRhdGVfcGxhbmUoc3RydWN0IGRybV9wbGFuZSAqZHBsYW5lLCBzdHJ1Y3QgZHJt
X2NydGMgKmNydGMsCiB9CiAKIHN0YXRpYyB2b2lkCi12bHZfZGlzYWJsZV9wbGFuZShzdHJ1Y3Qg
ZHJtX3BsYW5lICpkcGxhbmUsIHN0cnVjdCBkcm1fY3J0YyAqY3J0YywgYm9vbCBmb3JjZSkKK3Zs
dl9kaXNhYmxlX3BsYW5lKHN0cnVjdCBkcm1fcGxhbmUgKmRwbGFuZSwgc3RydWN0IGRybV9jcnRj
ICpjcnRjKQogewogCXN0cnVjdCBkcm1fZGV2aWNlICpkZXYgPSBkcGxhbmUtPmRldjsKIAlzdHJ1
Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSBkZXYtPmRldl9wcml2YXRlOwpAQCAtNTk1
LDcgKzU5NSw3IEBAIGl2Yl91cGRhdGVfcGxhbmUoc3RydWN0IGRybV9wbGFuZSAqcGxhbmUsIHN0
cnVjdCBkcm1fY3J0YyAqY3J0YywKIH0KIAogc3RhdGljIHZvaWQKLWl2Yl9kaXNhYmxlX3BsYW5l
KHN0cnVjdCBkcm1fcGxhbmUgKnBsYW5lLCBzdHJ1Y3QgZHJtX2NydGMgKmNydGMsIGJvb2wgZm9y
Y2UpCitpdmJfZGlzYWJsZV9wbGFuZShzdHJ1Y3QgZHJtX3BsYW5lICpwbGFuZSwgc3RydWN0IGRy
bV9jcnRjICpjcnRjKQogewogCXN0cnVjdCBkcm1fZGV2aWNlICpkZXYgPSBwbGFuZS0+ZGV2Owog
CXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9IGRldi0+ZGV2X3ByaXZhdGU7CkBA
IC03MjIsNyArNzIyLDcgQEAgaWxrX3VwZGF0ZV9wbGFuZShzdHJ1Y3QgZHJtX3BsYW5lICpwbGFu
ZSwgc3RydWN0IGRybV9jcnRjICpjcnRjLAogfQogCiBzdGF0aWMgdm9pZAotaWxrX2Rpc2FibGVf
cGxhbmUoc3RydWN0IGRybV9wbGFuZSAqcGxhbmUsIHN0cnVjdCBkcm1fY3J0YyAqY3J0YywgYm9v
bCBmb3JjZSkKK2lsa19kaXNhYmxlX3BsYW5lKHN0cnVjdCBkcm1fcGxhbmUgKnBsYW5lLCBzdHJ1
Y3QgZHJtX2NydGMgKmNydGMpCiB7CiAJc3RydWN0IGRybV9kZXZpY2UgKmRldiA9IHBsYW5lLT5k
ZXY7CiAJc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0gZGV2LT5kZXZfcHJpdmF0
ZTsKQEAgLTk0MSw3ICs5NDEsNyBAQCBpbnRlbF9jb21taXRfc3ByaXRlX3BsYW5lKHN0cnVjdCBk
cm1fcGxhbmUgKnBsYW5lLAogCQkJCQkgIGRybV9yZWN0X3dpZHRoKCZzdGF0ZS0+c3JjKSA+PiAx
NiwKIAkJCQkJICBkcm1fcmVjdF9oZWlnaHQoJnN0YXRlLT5zcmMpID4+IDE2KTsKIAl9IGVsc2Ug
ewotCQlpbnRlbF9wbGFuZS0+ZGlzYWJsZV9wbGFuZShwbGFuZSwgY3J0YywgZmFsc2UpOworCQlp
bnRlbF9wbGFuZS0+ZGlzYWJsZV9wbGFuZShwbGFuZSwgY3J0Yyk7CiAJfQogfQogCi0tIAoyLjEu
MAoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KSW50ZWwt
Z2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHA6Ly9s
aXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK