From mboxrd@z Thu Jan  1 00:00:00 1970
From: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Subject: [PATCH 21/24] drm/i915: remove force argument from
	disable_plane
Date: Mon,  1 Jun 2015 15:27:24 +0200
Message-ID: <1433165247-15928-22-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 5A1666E605
 for <intel-gfx@lists.freedesktop.org>; Mon,  1 Jun 2015 06:27:45 -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

VGhlIGlkZWEgd2FzIGdvb2QsIGJ1dCBwbGFuZXMgY2FuIGhhdmUgYSBmYiBldmVuIHRob3VnaAp0
aGV5J3JlIGRpc2FibGVkLiBUaGlzIG1ha2VzIHRoZSBmb3JjZSBhcmd1bWVudCB1c2VsZXNzCmFu
ZCBhbHdheXMgdHJ1ZSwgYmVjYXVzZSBvbmx5IHRoZSBjb21taXQgZnVuY3Rpb24gdXBkYXRlcwpz
dGF0ZS4KClNpZ25lZC1vZmYtYnk6IE1hYXJ0ZW4gTGFua2hvcnN0IDxtYWFydGVuLmxhbmtob3Jz
dEBsaW51eC5pbnRlbC5jb20+Ci0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxh
eS5jIHwgMTYgKysrLS0tLS0tLS0tLS0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHJ2
LmggICAgIHwgIDIgKy0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3Nwcml0ZS5jICB8IDEw
ICsrKysrLS0tLS0KIDMgZmlsZXMgY2hhbmdlZCwgOSBpbnNlcnRpb25zKCspLCAxOSBkZWxldGlv
bnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMg
Yi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMKaW5kZXggZjMxZWQ1MTc2MGY3
Li5iZWU1Y2Q1OGQ3ZTYgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rp
c3BsYXkuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMKQEAgLTQ3
OTUsNyArNDc5NSw3IEBAIHN0YXRpYyB2b2lkIGludGVsX2NydGNfZGlzYWJsZV9wbGFuZXMoc3Ry
dWN0IGRybV9jcnRjICpjcnRjLAogCQlzdHJ1Y3QgaW50ZWxfcGxhbmUgKnBsYW5lID0gdG9faW50
ZWxfcGxhbmUocCk7CiAKIAkJaWYgKGNydGMtPnN0YXRlLT5hY3RpdmUpCi0JCQlwbGFuZS0+ZGlz
YWJsZV9wbGFuZShwLCBjcnRjLCB0cnVlKTsKKwkJCXBsYW5lLT5kaXNhYmxlX3BsYW5lKHAsIGNy
dGMpOwogCQllbHNlCiAJCQlwbGFuZS0+Y29tbWl0X3BsYW5lKHAsIHRvX2ludGVsX3BsYW5lX3N0
YXRlKHAtPnN0YXRlKSk7CiAJfQpAQCAtMTM0MzAsOCArMTM0MzAsNyBAQCBpbnRlbF9jb21taXRf
cHJpbWFyeV9wbGFuZShzdHJ1Y3QgZHJtX3BsYW5lICpwbGFuZSwKIAogc3RhdGljIHZvaWQKIGlu
dGVsX2Rpc2FibGVfcHJpbWFyeV9wbGFuZShzdHJ1Y3QgZHJtX3BsYW5lICpwbGFuZSwKLQkJCSAg
ICBzdHJ1Y3QgZHJtX2NydGMgKmNydGMsCi0JCQkgICAgYm9vbCBmb3JjZSkKKwkJCSAgICBzdHJ1
Y3QgZHJtX2NydGMgKmNydGMpCiB7CiAJc3RydWN0IGRybV9kZXZpY2UgKmRldiA9IHBsYW5lLT5k
ZXY7CiAJc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0gZGV2LT5kZXZfcHJpdmF0
ZTsKQEAgLTEzNjM0LDE3ICsxMzYzMyw4IEBAIGludGVsX2NoZWNrX2N1cnNvcl9wbGFuZShzdHJ1
Y3QgZHJtX3BsYW5lICpwbGFuZSwKIAogc3RhdGljIHZvaWQKIGludGVsX2Rpc2FibGVfY3Vyc29y
X3BsYW5lKHN0cnVjdCBkcm1fcGxhbmUgKnBsYW5lLAotCQkJICAgc3RydWN0IGRybV9jcnRjICpj
cnRjLAotCQkJICAgYm9vbCBmb3JjZSkKKwkJCSAgIHN0cnVjdCBkcm1fY3J0YyAqY3J0YykKIHsK
LQlzdHJ1Y3QgaW50ZWxfY3J0YyAqaW50ZWxfY3J0YyA9IHRvX2ludGVsX2NydGMoY3J0Yyk7Ci0K
LQlpZiAoIWZvcmNlKSB7Ci0JCXBsYW5lLT5mYiA9IE5VTEw7Ci0JCWludGVsX2NydGMtPmN1cnNv
cl9ibyA9IE5VTEw7Ci0JCWludGVsX2NydGMtPmN1cnNvcl9hZGRyID0gMDsKLQl9Ci0KIAlpbnRl
bF9jcnRjX3VwZGF0ZV9jdXJzb3IoY3J0YywgZmFsc2UpOwogfQogCmRpZmYgLS1naXQgYS9kcml2
ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcnYuaCBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVs
X2Rydi5oCmluZGV4IDc5ZTE4MWIzZjc3Yi4uNTFlNTdlOTI0YmM2IDEwMDY0NAotLS0gYS9kcml2
ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcnYuaAorKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9p
bnRlbF9kcnYuaApAQCAtNjAwLDcgKzYwMCw3IEBAIHN0cnVjdCBpbnRlbF9wbGFuZSB7CiAJCQkg
ICAgIHVpbnQzMl90IHgsIHVpbnQzMl90IHksCiAJCQkgICAgIHVpbnQzMl90IHNyY193LCB1aW50
MzJfdCBzcmNfaCk7CiAJdm9pZCAoKmRpc2FibGVfcGxhbmUpKHN0cnVjdCBkcm1fcGxhbmUgKnBs
YW5lLAotCQkJICAgICAgc3RydWN0IGRybV9jcnRjICpjcnRjLCBib29sIGZvcmNlKTsKKwkJCSAg
ICAgIHN0cnVjdCBkcm1fY3J0YyAqY3J0Yyk7CiAJaW50ICgqY2hlY2tfcGxhbmUpKHN0cnVjdCBk
cm1fcGxhbmUgKnBsYW5lLAogCQkJICAgc3RydWN0IGludGVsX2NydGNfc3RhdGUgKmNydGNfc3Rh
dGUsCiAJCQkgICBzdHJ1Y3QgaW50ZWxfcGxhbmVfc3RhdGUgKnN0YXRlKTsKZGlmZiAtLWdpdCBh
L2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3Nwcml0ZS5jIGIvZHJpdmVycy9ncHUvZHJtL2k5
MTUvaW50ZWxfc3ByaXRlLmMKaW5kZXggNTQ1N2M4ZGFmZjNiLi5mMzU1NWM2ZGM0MmUgMTAwNjQ0
Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3Nwcml0ZS5jCisrKyBiL2RyaXZlcnMv
Z3B1L2RybS9pOTE1L2ludGVsX3Nwcml0ZS5jCkBAIC0yNzMsNyArMjczLDcgQEAgc2tsX3VwZGF0
ZV9wbGFuZShzdHJ1Y3QgZHJtX3BsYW5lICpkcm1fcGxhbmUsIHN0cnVjdCBkcm1fY3J0YyAqY3J0
YywKIH0KIAogc3RhdGljIHZvaWQKLXNrbF9kaXNhYmxlX3BsYW5lKHN0cnVjdCBkcm1fcGxhbmUg
KmRwbGFuZSwgc3RydWN0IGRybV9jcnRjICpjcnRjLCBib29sIGZvcmNlKQorc2tsX2Rpc2FibGVf
cGxhbmUoc3RydWN0IGRybV9wbGFuZSAqZHBsYW5lLCBzdHJ1Y3QgZHJtX2NydGMgKmNydGMpCiB7
CiAJc3RydWN0IGRybV9kZXZpY2UgKmRldiA9IGRwbGFuZS0+ZGV2OwogCXN0cnVjdCBkcm1faTkx
NV9wcml2YXRlICpkZXZfcHJpdiA9IGRldi0+ZGV2X3ByaXZhdGU7CkBAIC00NTcsNyArNDU3LDcg
QEAgdmx2X3VwZGF0ZV9wbGFuZShzdHJ1Y3QgZHJtX3BsYW5lICpkcGxhbmUsIHN0cnVjdCBkcm1f
Y3J0YyAqY3J0YywKIH0KIAogc3RhdGljIHZvaWQKLXZsdl9kaXNhYmxlX3BsYW5lKHN0cnVjdCBk
cm1fcGxhbmUgKmRwbGFuZSwgc3RydWN0IGRybV9jcnRjICpjcnRjLCBib29sIGZvcmNlKQordmx2
X2Rpc2FibGVfcGxhbmUoc3RydWN0IGRybV9wbGFuZSAqZHBsYW5lLCBzdHJ1Y3QgZHJtX2NydGMg
KmNydGMpCiB7CiAJc3RydWN0IGRybV9kZXZpY2UgKmRldiA9IGRwbGFuZS0+ZGV2OwogCXN0cnVj
dCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9IGRldi0+ZGV2X3ByaXZhdGU7CkBAIC01OTgs
NyArNTk4LDcgQEAgaXZiX3VwZGF0ZV9wbGFuZShzdHJ1Y3QgZHJtX3BsYW5lICpwbGFuZSwgc3Ry
dWN0IGRybV9jcnRjICpjcnRjLAogfQogCiBzdGF0aWMgdm9pZAotaXZiX2Rpc2FibGVfcGxhbmUo
c3RydWN0IGRybV9wbGFuZSAqcGxhbmUsIHN0cnVjdCBkcm1fY3J0YyAqY3J0YywgYm9vbCBmb3Jj
ZSkKK2l2Yl9kaXNhYmxlX3BsYW5lKHN0cnVjdCBkcm1fcGxhbmUgKnBsYW5lLCBzdHJ1Y3QgZHJt
X2NydGMgKmNydGMpCiB7CiAJc3RydWN0IGRybV9kZXZpY2UgKmRldiA9IHBsYW5lLT5kZXY7CiAJ
c3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0gZGV2LT5kZXZfcHJpdmF0ZTsKQEAg
LTcyNiw3ICs3MjYsNyBAQCBpbGtfdXBkYXRlX3BsYW5lKHN0cnVjdCBkcm1fcGxhbmUgKnBsYW5l
LCBzdHJ1Y3QgZHJtX2NydGMgKmNydGMsCiB9CiAKIHN0YXRpYyB2b2lkCi1pbGtfZGlzYWJsZV9w
bGFuZShzdHJ1Y3QgZHJtX3BsYW5lICpwbGFuZSwgc3RydWN0IGRybV9jcnRjICpjcnRjLCBib29s
IGZvcmNlKQoraWxrX2Rpc2FibGVfcGxhbmUoc3RydWN0IGRybV9wbGFuZSAqcGxhbmUsIHN0cnVj
dCBkcm1fY3J0YyAqY3J0YykKIHsKIAlzdHJ1Y3QgZHJtX2RldmljZSAqZGV2ID0gcGxhbmUtPmRl
djsKIAlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSBkZXYtPmRldl9wcml2YXRl
OwpAQCAtOTQ0LDcgKzk0NCw3IEBAIGludGVsX2NvbW1pdF9zcHJpdGVfcGxhbmUoc3RydWN0IGRy
bV9wbGFuZSAqcGxhbmUsCiAJCQkJCSAgZHJtX3JlY3Rfd2lkdGgoJnN0YXRlLT5zcmMpID4+IDE2
LAogCQkJCQkgIGRybV9yZWN0X2hlaWdodCgmc3RhdGUtPnNyYykgPj4gMTYpOwogCX0gZWxzZSB7
Ci0JCWludGVsX3BsYW5lLT5kaXNhYmxlX3BsYW5lKHBsYW5lLCBjcnRjLCBmYWxzZSk7CisJCWlu
dGVsX3BsYW5lLT5kaXNhYmxlX3BsYW5lKHBsYW5lLCBjcnRjKTsKIAl9CiB9CiAKLS0gCjIuMS4w
CgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpJbnRlbC1n
ZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cDovL2xp
c3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeAo=