From mboxrd@z Thu Jan  1 00:00:00 1970
From: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Subject: [PATCH 06/11] drm/i915: Remove
	atomic.pre_disable_primary.
Date: Thu, 22 Oct 2015 13:56:31 +0200
Message-ID: <1445514996-18733-7-git-send-email-maarten.lankhorst@linux.intel.com>
References: <1445514996-18733-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 B63A56E3C5
 for <intel-gfx@lists.freedesktop.org>; Thu, 22 Oct 2015 04:56:42 -0700 (PDT)
In-Reply-To: <1445514996-18733-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
Y2FsbGVkLgoKU2lnbmVkLW9mZi1ieTogTWFhcnRlbiBMYW5raG9yc3QgPG1hYXJ0ZW4ubGFua2hv
cnN0QGxpbnV4LmludGVsLmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNw
bGF5LmMgfCAyOCArKysrKysrKysrKysrKysrKysrKy0tLS0tLS0tCiBkcml2ZXJzL2dwdS9kcm0v
aTkxNS9pbnRlbF9kcnYuaCAgICAgfCAgMSAtCiAyIGZpbGVzIGNoYW5nZWQsIDIwIGluc2VydGlv
bnMoKyksIDkgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUv
aW50ZWxfZGlzcGxheS5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jCmlu
ZGV4IGQyNGZkZTZkMWUyZC4uMzE3ZmY0MDVhY2E5IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9k
cm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxf
ZGlzcGxheS5jCkBAIC00Nzc0LDI2ICs0Nzc0LDQwIEBAIHN0YXRpYyB2b2lkIGludGVsX3Bvc3Rf
cGxhbmVfdXBkYXRlKHN0cnVjdCBpbnRlbF9jcnRjICpjcnRjKQogCW1lbXNldChhdG9taWMsIDAs
IHNpemVvZigqYXRvbWljKSk7CiB9CiAKLXN0YXRpYyB2b2lkIGludGVsX3ByZV9wbGFuZV91cGRh
dGUoc3RydWN0IGludGVsX2NydGMgKmNydGMpCitzdGF0aWMgdm9pZCBpbnRlbF9wcmVfcGxhbmVf
dXBkYXRlKHN0cnVjdCBpbnRlbF9jcnRjX3N0YXRlICpvbGRfY3J0Y19zdGF0ZSkKIHsKKwlzdHJ1
Y3QgaW50ZWxfY3J0YyAqY3J0YyA9IHRvX2ludGVsX2NydGMob2xkX2NydGNfc3RhdGUtPmJhc2Uu
Y3J0Yyk7CiAJc3RydWN0IGRybV9kZXZpY2UgKmRldiA9IGNydGMtPmJhc2UuZGV2OwogCXN0cnVj
dCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9IGRldi0+ZGV2X3ByaXZhdGU7CiAJc3RydWN0
IGludGVsX2NydGNfYXRvbWljX2NvbW1pdCAqYXRvbWljID0gJmNydGMtPmF0b21pYzsKIAlzdHJ1
Y3QgaW50ZWxfY3J0Y19zdGF0ZSAqcGlwZV9jb25maWcgPQogCQl0b19pbnRlbF9jcnRjX3N0YXRl
KGNydGMtPmJhc2Uuc3RhdGUpOworCXN0cnVjdCBkcm1fYXRvbWljX3N0YXRlICpvbGRfc3RhdGUg
PSBvbGRfY3J0Y19zdGF0ZS0+YmFzZS5zdGF0ZTsKKwlzdHJ1Y3QgZHJtX3BsYW5lICpwcmltYXJ5
ID0gY3J0Yy0+YmFzZS5wcmltYXJ5OworCXN0cnVjdCBkcm1fcGxhbmVfc3RhdGUgKm9sZF9wcmlf
c3RhdGUgPQorCQlkcm1fYXRvbWljX2dldF9leGlzdGluZ19wbGFuZV9zdGF0ZShvbGRfc3RhdGUs
IHByaW1hcnkpOworCWJvb2wgbW9kZXNldCA9IG5lZWRzX21vZGVzZXQoJnBpcGVfY29uZmlnLT5i
YXNlKTsKIAogCWlmIChhdG9taWMtPmRpc2FibGVfZmJjKQogCQlpbnRlbF9mYmNfZGlzYWJsZV9j
cnRjKGNydGMpOwogCi0JaWYgKGF0b21pYy0+cHJlX2Rpc2FibGVfcHJpbWFyeSkKLQkJaW50ZWxf
cHJlX2Rpc2FibGVfcHJpbWFyeSgmY3J0Yy0+YmFzZSk7CisJaWYgKG9sZF9wcmlfc3RhdGUpIHsK
KwkJc3RydWN0IGludGVsX3BsYW5lX3N0YXRlICpwcmltYXJ5X3N0YXRlID0KKwkJCXRvX2ludGVs
X3BsYW5lX3N0YXRlKHByaW1hcnktPnN0YXRlKTsKKwkJc3RydWN0IGludGVsX3BsYW5lX3N0YXRl
ICpvbGRfcHJpbWFyeV9zdGF0ZSA9CisJCQl0b19pbnRlbF9wbGFuZV9zdGF0ZShvbGRfcHJpX3N0
YXRlKTsKKworCQlpZiAob2xkX3ByaW1hcnlfc3RhdGUtPnZpc2libGUgJiYKKwkJICAgIChtb2Rl
c2V0IHx8ICFwcmltYXJ5X3N0YXRlLT52aXNpYmxlKSkKKwkJCWludGVsX3ByZV9kaXNhYmxlX3By
aW1hcnkoJmNydGMtPmJhc2UpOworCX0KIAogCWlmIChwaXBlX2NvbmZpZy0+dmlzaWJsZV9jaGFu
Z2VkKSB7CiAJCWNydGMtPndtLmN4c3JfYWxsb3dlZCA9IGZhbHNlOwogCQlpbnRlbF9zZXRfbWVt
b3J5X2N4c3IoZGV2X3ByaXYsIGZhbHNlKTsKIAl9CiAKLQlpZiAoIW5lZWRzX21vZGVzZXQoJnBp
cGVfY29uZmlnLT5iYXNlKSAmJiBwaXBlX2NvbmZpZy0+d21fY2hhbmdlZCkKKwlpZiAoIW1vZGVz
ZXQgJiYgcGlwZV9jb25maWctPndtX2NoYW5nZWQpCiAJCWludGVsX3VwZGF0ZV93YXRlcm1hcmtz
KCZjcnRjLT5iYXNlKTsKIH0KIApAQCAtMTE2NjUsNyArMTE2NzksNiBAQCBpbnQgaW50ZWxfcGxh
bmVfYXRvbWljX2NhbGNfY2hhbmdlcyhzdHJ1Y3QgZHJtX2NydGNfc3RhdGUgKmNydGNfc3RhdGUs
CiAKIAlzd2l0Y2ggKHBsYW5lLT50eXBlKSB7CiAJY2FzZSBEUk1fUExBTkVfVFlQRV9QUklNQVJZ
OgotCQlpbnRlbF9jcnRjLT5hdG9taWMucHJlX2Rpc2FibGVfcHJpbWFyeSA9IHR1cm5fb2ZmOwog
CQlpbnRlbF9jcnRjLT5hdG9taWMucG9zdF9lbmFibGVfcHJpbWFyeSA9IHR1cm5fb247CiAKIAkJ
aWYgKHR1cm5fb2ZmKQpAQCAtMTMxODQsNyArMTMxOTcsNyBAQCBzdGF0aWMgaW50IGludGVsX2F0
b21pY19jb21taXQoc3RydWN0IGRybV9kZXZpY2UgKmRldiwKIAkJCWNvbnRpbnVlOwogCiAJCWFu
eV9tcyA9IHRydWU7Ci0JCWludGVsX3ByZV9wbGFuZV91cGRhdGUoaW50ZWxfY3J0Yyk7CisJCWlu
dGVsX3ByZV9wbGFuZV91cGRhdGUodG9faW50ZWxfY3J0Y19zdGF0ZShjcnRjX3N0YXRlKSk7CiAK
IAkJaWYgKGNydGNfc3RhdGUtPmFjdGl2ZSkgewogCQkJaW50ZWxfY3J0Y19kaXNhYmxlX3BsYW5l
cyhjcnRjLCBjcnRjX3N0YXRlLT5wbGFuZV9tYXNrKTsKQEAgLTEzMjA3LDcgKzEzMjIwLDYgQEAg
c3RhdGljIGludCBpbnRlbF9hdG9taWNfY29tbWl0KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsCiAK
IAkvKiBOb3cgZW5hYmxlIHRoZSBjbG9ja3MsIHBsYW5lLCBwaXBlLCBhbmQgY29ubmVjdG9ycyB0
aGF0IHdlIHNldCB1cC4gKi8KIAlmb3JfZWFjaF9jcnRjX2luX3N0YXRlKHN0YXRlLCBjcnRjLCBj
cnRjX3N0YXRlLCBpKSB7Ci0JCXN0cnVjdCBpbnRlbF9jcnRjICppbnRlbF9jcnRjID0gdG9faW50
ZWxfY3J0YyhjcnRjKTsKIAkJYm9vbCBtb2Rlc2V0ID0gbmVlZHNfbW9kZXNldChjcnRjLT5zdGF0
ZSk7CiAJCWJvb2wgdXBkYXRlX3BpcGUgPSAhbW9kZXNldCAmJgogCQkJdG9faW50ZWxfY3J0Y19z
dGF0ZShjcnRjLT5zdGF0ZSktPnVwZGF0ZV9waXBlOwpAQCAtMTMyMjYsNyArMTMyMzgsNyBAQCBz
dGF0aWMgaW50IGludGVsX2F0b21pY19jb21taXQoc3RydWN0IGRybV9kZXZpY2UgKmRldiwKIAkJ
fQogCiAJCWlmICghbW9kZXNldCkKLQkJCWludGVsX3ByZV9wbGFuZV91cGRhdGUoaW50ZWxfY3J0
Yyk7CisJCQlpbnRlbF9wcmVfcGxhbmVfdXBkYXRlKHRvX2ludGVsX2NydGNfc3RhdGUoY3J0Y19z
dGF0ZSkpOwogCiAJCWlmIChjcnRjLT5zdGF0ZS0+YWN0aXZlICYmCiAJCSAgICAoY3J0Yy0+c3Rh
dGUtPnBsYW5lc19jaGFuZ2VkIHx8IHVwZGF0ZV9waXBlKSkKZGlmZiAtLWdpdCBhL2RyaXZlcnMv
Z3B1L2RybS9pOTE1L2ludGVsX2Rydi5oIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHJ2
LmgKaW5kZXggMGY3NDVhMTQ3N2I5Li5lOWU0ODUzMzZjOTAgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMv
Z3B1L2RybS9pOTE1L2ludGVsX2Rydi5oCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVs
X2Rydi5oCkBAIC01MTcsNyArNTE3LDYgQEAgc3RydWN0IHNrbF9waXBlX3dtIHsKIHN0cnVjdCBp
bnRlbF9jcnRjX2F0b21pY19jb21taXQgewogCS8qIFNsZWVwYWJsZSBvcGVyYXRpb25zIHRvIHBl
cmZvcm0gYmVmb3JlIGNvbW1pdCAqLwogCWJvb2wgZGlzYWJsZV9mYmM7Ci0JYm9vbCBwcmVfZGlz
YWJsZV9wcmltYXJ5OwogCiAJLyogU2xlZXBhYmxlIG9wZXJhdGlvbnMgdG8gcGVyZm9ybSBhZnRl
ciBjb21taXQgKi8KIAl1bnNpZ25lZCBmYl9iaXRzOwotLSAKMi4xLjAKCl9fX19fX19fX19fX19f
X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCkludGVsLWdmeCBtYWlsaW5nIGxpc3QK
SW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwOi8vbGlzdHMuZnJlZWRlc2t0b3Au
b3JnL21haWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4Cg==