From mboxrd@z Thu Jan  1 00:00:00 1970
From: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Subject: [PATCH 07/12] drm/i915: Remove
	atomic.pre_disable_primary.
Date: Thu, 19 Nov 2015 16:07:20 +0100
Message-ID: <1447945645-32005-8-git-send-email-maarten.lankhorst@linux.intel.com>
References: <1447945645-32005-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 ESMTPS id 5103C6E98C
 for <intel-gfx@lists.freedesktop.org>; Thu, 19 Nov 2015 07:07:38 -0800 (PST)
In-Reply-To: <1447945645-32005-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

VGhpcyBjYW4gYmUgZGVyaXZlZCBmcm9tIHRoZSBhdG9taWMgc3RhdGUgaW4gcHJlX3BsYW5lX3Vw
ZGF0ZSwKd2hpY2ggbWFrZXMgaXQgbW9yZSBjbGVhciB3aGVuIGl0J3Mgc3VwcG9zZWQgdG8gYmUg
Y2FsbGVkLgoKUmV2aWV3ZWQtYnk6IEFuZGVyIENvbnNlbHZhbiBkZSBPbGl2ZWlyYSA8Y29uc2Vs
dmFuMkBnbWFpbC5jb20+ClNpZ25lZC1vZmYtYnk6IE1hYXJ0ZW4gTGFua2hvcnN0IDxtYWFydGVu
Lmxhbmtob3JzdEBsaW51eC5pbnRlbC5jb20+Ci0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50
ZWxfZGlzcGxheS5jIHwgMjggKysrKysrKysrKysrKysrKysrKystLS0tLS0tLQogZHJpdmVycy9n
cHUvZHJtL2k5MTUvaW50ZWxfZHJ2LmggICAgIHwgIDEgLQogMiBmaWxlcyBjaGFuZ2VkLCAyMCBp
bnNlcnRpb25zKCspLCA5IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2Ry
bS9pOTE1L2ludGVsX2Rpc3BsYXkuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3Bs
YXkuYwppbmRleCAxZmVjNDljNDQ5MGUuLjUyYTAwNThjZjE0NSAxMDA2NDQKLS0tIGEvZHJpdmVy
cy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1
L2ludGVsX2Rpc3BsYXkuYwpAQCAtNDc1NywyNiArNDc1Nyw0MCBAQCBzdGF0aWMgdm9pZCBpbnRl
bF9wb3N0X3BsYW5lX3VwZGF0ZShzdHJ1Y3QgaW50ZWxfY3J0YyAqY3J0YykKIAltZW1zZXQoYXRv
bWljLCAwLCBzaXplb2YoKmF0b21pYykpOwogfQogCi1zdGF0aWMgdm9pZCBpbnRlbF9wcmVfcGxh
bmVfdXBkYXRlKHN0cnVjdCBpbnRlbF9jcnRjICpjcnRjKQorc3RhdGljIHZvaWQgaW50ZWxfcHJl
X3BsYW5lX3VwZGF0ZShzdHJ1Y3QgaW50ZWxfY3J0Y19zdGF0ZSAqb2xkX2NydGNfc3RhdGUpCiB7
CisJc3RydWN0IGludGVsX2NydGMgKmNydGMgPSB0b19pbnRlbF9jcnRjKG9sZF9jcnRjX3N0YXRl
LT5iYXNlLmNydGMpOwogCXN0cnVjdCBkcm1fZGV2aWNlICpkZXYgPSBjcnRjLT5iYXNlLmRldjsK
IAlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSBkZXYtPmRldl9wcml2YXRlOwog
CXN0cnVjdCBpbnRlbF9jcnRjX2F0b21pY19jb21taXQgKmF0b21pYyA9ICZjcnRjLT5hdG9taWM7
CiAJc3RydWN0IGludGVsX2NydGNfc3RhdGUgKnBpcGVfY29uZmlnID0KIAkJdG9faW50ZWxfY3J0
Y19zdGF0ZShjcnRjLT5iYXNlLnN0YXRlKTsKKwlzdHJ1Y3QgZHJtX2F0b21pY19zdGF0ZSAqb2xk
X3N0YXRlID0gb2xkX2NydGNfc3RhdGUtPmJhc2Uuc3RhdGU7CisJc3RydWN0IGRybV9wbGFuZSAq
cHJpbWFyeSA9IGNydGMtPmJhc2UucHJpbWFyeTsKKwlzdHJ1Y3QgZHJtX3BsYW5lX3N0YXRlICpv
bGRfcHJpX3N0YXRlID0KKwkJZHJtX2F0b21pY19nZXRfZXhpc3RpbmdfcGxhbmVfc3RhdGUob2xk
X3N0YXRlLCBwcmltYXJ5KTsKKwlib29sIG1vZGVzZXQgPSBuZWVkc19tb2Rlc2V0KCZwaXBlX2Nv
bmZpZy0+YmFzZSk7CiAKIAlpZiAoYXRvbWljLT5kaXNhYmxlX2ZiYykKIAkJaW50ZWxfZmJjX2Rp
c2FibGVfY3J0YyhjcnRjKTsKIAotCWlmIChhdG9taWMtPnByZV9kaXNhYmxlX3ByaW1hcnkpCi0J
CWludGVsX3ByZV9kaXNhYmxlX3ByaW1hcnkoJmNydGMtPmJhc2UpOworCWlmIChvbGRfcHJpX3N0
YXRlKSB7CisJCXN0cnVjdCBpbnRlbF9wbGFuZV9zdGF0ZSAqcHJpbWFyeV9zdGF0ZSA9CisJCQl0
b19pbnRlbF9wbGFuZV9zdGF0ZShwcmltYXJ5LT5zdGF0ZSk7CisJCXN0cnVjdCBpbnRlbF9wbGFu
ZV9zdGF0ZSAqb2xkX3ByaW1hcnlfc3RhdGUgPQorCQkJdG9faW50ZWxfcGxhbmVfc3RhdGUob2xk
X3ByaV9zdGF0ZSk7CisKKwkJaWYgKG9sZF9wcmltYXJ5X3N0YXRlLT52aXNpYmxlICYmCisJCSAg
ICAobW9kZXNldCB8fCAhcHJpbWFyeV9zdGF0ZS0+dmlzaWJsZSkpCisJCQlpbnRlbF9wcmVfZGlz
YWJsZV9wcmltYXJ5KCZjcnRjLT5iYXNlKTsKKwl9CiAKIAlpZiAocGlwZV9jb25maWctPmRpc2Fi
bGVfY3hzcikgewogCQljcnRjLT53bS5jeHNyX2FsbG93ZWQgPSBmYWxzZTsKIAkJaW50ZWxfc2V0
X21lbW9yeV9jeHNyKGRldl9wcml2LCBmYWxzZSk7CiAJfQogCi0JaWYgKCFuZWVkc19tb2Rlc2V0
KCZwaXBlX2NvbmZpZy0+YmFzZSkgJiYgcGlwZV9jb25maWctPndtX2NoYW5nZWQpCisJaWYgKCFt
b2Rlc2V0ICYmIHBpcGVfY29uZmlnLT53bV9jaGFuZ2VkKQogCQlpbnRlbF91cGRhdGVfd2F0ZXJt
YXJrcygmY3J0Yy0+YmFzZSk7CiB9CiAKQEAgLTExNzIxLDcgKzExNzM1LDYgQEAgaW50IGludGVs
X3BsYW5lX2F0b21pY19jYWxjX2NoYW5nZXMoc3RydWN0IGRybV9jcnRjX3N0YXRlICpjcnRjX3N0
YXRlLAogCiAJc3dpdGNoIChwbGFuZS0+dHlwZSkgewogCWNhc2UgRFJNX1BMQU5FX1RZUEVfUFJJ
TUFSWToKLQkJaW50ZWxfY3J0Yy0+YXRvbWljLnByZV9kaXNhYmxlX3ByaW1hcnkgPSB0dXJuX29m
ZjsKIAkJaW50ZWxfY3J0Yy0+YXRvbWljLnBvc3RfZW5hYmxlX3ByaW1hcnkgPSB0dXJuX29uOwog
CiAJCWlmICh0dXJuX29mZikKQEAgLTEzMzY3LDcgKzEzMzgwLDcgQEAgc3RhdGljIGludCBpbnRl
bF9hdG9taWNfY29tbWl0KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsCiAJCWlmICghbmVlZHNfbW9k
ZXNldChjcnRjLT5zdGF0ZSkpCiAJCQljb250aW51ZTsKIAotCQlpbnRlbF9wcmVfcGxhbmVfdXBk
YXRlKGludGVsX2NydGMpOworCQlpbnRlbF9wcmVfcGxhbmVfdXBkYXRlKHRvX2ludGVsX2NydGNf
c3RhdGUoY3J0Y19zdGF0ZSkpOwogCiAJCWlmIChjcnRjX3N0YXRlLT5hY3RpdmUpIHsKIAkJCWlu
dGVsX2NydGNfZGlzYWJsZV9wbGFuZXMoY3J0YywgY3J0Y19zdGF0ZS0+cGxhbmVfbWFzayk7CkBA
IC0xMzM5Myw3ICsxMzQwNiw2IEBAIHN0YXRpYyBpbnQgaW50ZWxfYXRvbWljX2NvbW1pdChzdHJ1
Y3QgZHJtX2RldmljZSAqZGV2LAogCiAJLyogTm93IGVuYWJsZSB0aGUgY2xvY2tzLCBwbGFuZSwg
cGlwZSwgYW5kIGNvbm5lY3RvcnMgdGhhdCB3ZSBzZXQgdXAuICovCiAJZm9yX2VhY2hfY3J0Y19p
bl9zdGF0ZShzdGF0ZSwgY3J0YywgY3J0Y19zdGF0ZSwgaSkgewotCQlzdHJ1Y3QgaW50ZWxfY3J0
YyAqaW50ZWxfY3J0YyA9IHRvX2ludGVsX2NydGMoY3J0Yyk7CiAJCWJvb2wgbW9kZXNldCA9IG5l
ZWRzX21vZGVzZXQoY3J0Yy0+c3RhdGUpOwogCQlzdHJ1Y3QgaW50ZWxfY3J0Y19zdGF0ZSAqcGlw
ZV9jb25maWcgPQogCQkJdG9faW50ZWxfY3J0Y19zdGF0ZShjcnRjLT5zdGF0ZSk7CkBAIC0xMzQx
Niw3ICsxMzQyOCw3IEBAIHN0YXRpYyBpbnQgaW50ZWxfYXRvbWljX2NvbW1pdChzdHJ1Y3QgZHJt
X2RldmljZSAqZGV2LAogCQl9CiAKIAkJaWYgKCFtb2Rlc2V0KQotCQkJaW50ZWxfcHJlX3BsYW5l
X3VwZGF0ZShpbnRlbF9jcnRjKTsKKwkJCWludGVsX3ByZV9wbGFuZV91cGRhdGUodG9faW50ZWxf
Y3J0Y19zdGF0ZShjcnRjX3N0YXRlKSk7CiAKIAkJaWYgKGNydGMtPnN0YXRlLT5hY3RpdmUgJiYK
IAkJICAgIChjcnRjLT5zdGF0ZS0+cGxhbmVzX2NoYW5nZWQgfHwgdXBkYXRlX3BpcGUpKQpkaWZm
IC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHJ2LmggYi9kcml2ZXJzL2dwdS9k
cm0vaTkxNS9pbnRlbF9kcnYuaAppbmRleCAxM2ZmZWZhM2E2YzEuLmVlNTUwYTkzYmI5ZiAxMDA2
NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHJ2LmgKKysrIGIvZHJpdmVycy9n
cHUvZHJtL2k5MTUvaW50ZWxfZHJ2LmgKQEAgLTUzNSw3ICs1MzUsNiBAQCBzdHJ1Y3QgaW50ZWxf
bW1pb19mbGlwIHsKIHN0cnVjdCBpbnRlbF9jcnRjX2F0b21pY19jb21taXQgewogCS8qIFNsZWVw
YWJsZSBvcGVyYXRpb25zIHRvIHBlcmZvcm0gYmVmb3JlIGNvbW1pdCAqLwogCWJvb2wgZGlzYWJs
ZV9mYmM7Ci0JYm9vbCBwcmVfZGlzYWJsZV9wcmltYXJ5OwogCiAJLyogU2xlZXBhYmxlIG9wZXJh
dGlvbnMgdG8gcGVyZm9ybSBhZnRlciBjb21taXQgKi8KIAl1bnNpZ25lZCBmYl9iaXRzOwotLSAK
Mi4xLjAKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCklu
dGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRw
Oi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4Cg==