From mboxrd@z Thu Jan  1 00:00:00 1970
From: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Subject: [PATCH 09/42] drm/i915: Make intel_modeset_fixup_state
	similar to the atomic helper.
Date: Mon, 11 May 2015 16:24:45 +0200
Message-ID: <1431354318-11995-10-git-send-email-maarten.lankhorst@linux.intel.com>
References: <1431354318-11995-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 1A6BE6E3F4
 for <intel-gfx@lists.freedesktop.org>; Mon, 11 May 2015 07:25:44 -0700 (PDT)
In-Reply-To: <1431354318-11995-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
Cc: Ander Conselvan de Oliveira <ander.conselvan.de.oliveira@intel.com>
List-Id: intel-gfx@lists.freedesktop.org

VGhpcyBzaG91bGQgYmUgc2FmZS4KClNpZ25lZC1vZmYtYnk6IE1hYXJ0ZW4gTGFua2hvcnN0IDxt
YWFydGVuLmxhbmtob3JzdEBsaW51eC5pbnRlbC5jb20+Ci0tLQogZHJpdmVycy9ncHUvZHJtL2k5
MTUvaW50ZWxfZGlzcGxheS5jIHwgODIgKysrKysrKysrKysrKysrKysrLS0tLS0tLS0tLS0tLS0t
LS0tCiAxIGZpbGUgY2hhbmdlZCwgNDEgaW5zZXJ0aW9ucygrKSwgNDEgZGVsZXRpb25zKC0pCgpk
aWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jIGIvZHJpdmVy
cy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jCmluZGV4IGEyMWIyZTUxYzA1NC4uOTU2Yzk5
NjQyNzVkIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMK
KysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jCkBAIC0xMTA4NCwzNiAr
MTEwODQsNDggQEAgc3RhdGljIHZvaWQgaW50ZWxfbW9kZXNldF91cGRhdGVfY29ubmVjdG9yX2F0
b21pY19zdGF0ZShzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KQogCX0KIH0KIAotLyogRml4dXAgbGVn
YWN5IHN0YXRlIGFmdGVyIGFuIGF0b21pYyBzdGF0ZSBzd2FwLgorLyoKKyAqIEZpeHVwIGxlZ2Fj
eSBzdGF0ZSBpbiBhIHNpbWlsYXIgd2F5IHRvCisgKiBkcm1fYXRvbWljX2hlbHBlci5jOnNldF9y
b3V0aW5nX2xpbmtzLgogICovCiBzdGF0aWMgdm9pZCBpbnRlbF9tb2Rlc2V0X2ZpeHVwX3N0YXRl
KHN0cnVjdCBkcm1fYXRvbWljX3N0YXRlICpzdGF0ZSkKIHsKLQlzdHJ1Y3QgaW50ZWxfY3J0YyAq
Y3J0YzsKLQlzdHJ1Y3QgaW50ZWxfZW5jb2RlciAqZW5jb2RlcjsKLQlzdHJ1Y3QgaW50ZWxfY29u
bmVjdG9yICpjb25uZWN0b3I7CisJc3RydWN0IGRybV9jb25uZWN0b3IgKmNvbm5lY3RvcjsKKwlz
dHJ1Y3QgZHJtX2NydGNfc3RhdGUgKmNydGNfc3RhdGU7CisJc3RydWN0IGRybV9jb25uZWN0b3Jf
c3RhdGUgKmNvbm5fc3RhdGU7CisJc3RydWN0IGRybV9jcnRjICpjcnRjOworCWludCBpOwogCi0J
Zm9yX2VhY2hfaW50ZWxfY29ubmVjdG9yKHN0YXRlLT5kZXYsIGNvbm5lY3RvcikgewotCQljb25u
ZWN0b3ItPmJhc2UuZW5jb2RlciA9IGNvbm5lY3Rvci0+YmFzZS5zdGF0ZS0+YmVzdF9lbmNvZGVy
OwotCQlpZiAoY29ubmVjdG9yLT5iYXNlLmVuY29kZXIpCi0JCQljb25uZWN0b3ItPmJhc2UuZW5j
b2Rlci0+Y3J0YyA9Ci0JCQkJY29ubmVjdG9yLT5iYXNlLnN0YXRlLT5jcnRjOworCS8qCisJICog
c3dhcCBjcnRjIGFuZCBjb25uZWN0b3IgYW5kIHVwZGF0ZSBsZWdhY3kgc3RhdGUsCisJICogcGxh
bmUgc3RhdGUgYWxyZWFkeSBnZXRzIHN3YXBwZWQKKwkgKiBieSB0aGUgcGxhbmUgaGVscGVycy4g
T25jZSAuY3J0Y19kaXNhYmxlIGlzIGZpeGVkCisJICogYWxsIHN0YXRlIHNob3VsZCBiZSBzd2Fw
cGVkIGJlZm9yZSBkaXNhYmxpbmcgY3J0YydzLgorCSAqLworCWZvcl9lYWNoX2NydGNfaW5fc3Rh
dGUoc3RhdGUsIGNydGMsIGNydGNfc3RhdGUsIGkpIHsKKwkJY3J0Yy0+ZW5hYmxlZCA9IGNydGMt
PnN0YXRlLT5lbmFibGU7CisJCWNydGMtPm1vZGUgPSBjcnRjLT5zdGF0ZS0+bW9kZTsKIAl9CiAK
LQkvKiBVcGRhdGUgY3J0YyBvZiBkaXNhYmxlZCBlbmNvZGVycyAqLwotCWZvcl9lYWNoX2ludGVs
X2VuY29kZXIoc3RhdGUtPmRldiwgZW5jb2RlcikgewotCQlpbnQgbnVtX2Nvbm5lY3RvcnMgPSAw
OwotCi0JCWZvcl9lYWNoX2ludGVsX2Nvbm5lY3RvcihzdGF0ZS0+ZGV2LCBjb25uZWN0b3IpCi0J
CQlpZiAoY29ubmVjdG9yLT5iYXNlLmVuY29kZXIgPT0gJmVuY29kZXItPmJhc2UpCi0JCQkJbnVt
X2Nvbm5lY3RvcnMrKzsKKwkvKiBjbGVhciBvdXQgZXhpc3RpbmcgbGlua3MgKi8KKwlmb3JfZWFj
aF9jb25uZWN0b3JfaW5fc3RhdGUoc3RhdGUsIGNvbm5lY3RvciwgY29ubl9zdGF0ZSwgaSkgewor
CQlpZiAoIWNvbm5lY3Rvci0+ZW5jb2RlcikKKwkJCWNvbnRpbnVlOwogCi0JCWlmIChudW1fY29u
bmVjdG9ycyA9PSAwKQotCQkJZW5jb2Rlci0+YmFzZS5jcnRjID0gTlVMTDsKKwkJV0FSTl9PTigh
Y29ubmVjdG9yLT5lbmNvZGVyLT5jcnRjKTsKKwkJY29ubmVjdG9yLT5lbmNvZGVyLT5jcnRjID0g
TlVMTDsKKwkJY29ubmVjdG9yLT5lbmNvZGVyID0gTlVMTDsKIAl9CiAKLQlmb3JfZWFjaF9pbnRl
bF9jcnRjKHN0YXRlLT5kZXYsIGNydGMpIHsKLQkJY3J0Yy0+YmFzZS5lbmFibGVkID0gY3J0Yy0+
YmFzZS5zdGF0ZS0+ZW5hYmxlOwotCQljcnRjLT5jb25maWcgPSB0b19pbnRlbF9jcnRjX3N0YXRl
KGNydGMtPmJhc2Uuc3RhdGUpOworCWZvcl9lYWNoX2Nvbm5lY3Rvcl9pbl9zdGF0ZShzdGF0ZSwg
Y29ubmVjdG9yLCBjb25uX3N0YXRlLCBpKSB7CisJCWlmICghY29ubmVjdG9yLT5zdGF0ZS0+Y3J0
YykKKwkJCWNvbnRpbnVlOworCisJCWlmIChXQVJOX09OKCFjb25uZWN0b3ItPnN0YXRlLT5iZXN0
X2VuY29kZXIpKQorCQkJY29udGludWU7CisKKwkJY29ubmVjdG9yLT5lbmNvZGVyID0gY29ubmVj
dG9yLT5zdGF0ZS0+YmVzdF9lbmNvZGVyOworCQljb25uZWN0b3ItPmVuY29kZXItPmNydGMgPSBj
b25uZWN0b3ItPnN0YXRlLT5jcnRjOwogCX0KIH0KIApAQCAtMTE1NTksOSArMTE1NzEsMTYgQEAg
aW50ZWxfbW9kZXNldF91cGRhdGVfc3RhdGUoc3RydWN0IGRybV9hdG9taWNfc3RhdGUgKnN0YXRl
KQogCiAJaW50ZWxfbW9kZXNldF9maXh1cF9zdGF0ZShzdGF0ZSk7CiAKLQkvKiBEb3VibGUgY2hl
Y2sgc3RhdGUuICovCiAJZm9yX2VhY2hfY3J0YyhkZXYsIGNydGMpIHsKKwkJLyogRG91YmxlIGNo
ZWNrIHN0YXRlLiAqLwogCQlXQVJOX09OKGNydGMtPnN0YXRlLT5lbmFibGUgIT0gaW50ZWxfY3J0
Y19pbl91c2UoY3J0YykpOworCisJCWlmICghc3RhdGUtPmNydGNzW2RybV9jcnRjX2luZGV4KGNy
dGMpXSkKKwkJCWNvbnRpbnVlOworCisJCXRvX2ludGVsX2NydGMoY3J0YyktPmNvbmZpZyA9IHRv
X2ludGVsX2NydGNfc3RhdGUoY3J0Yy0+c3RhdGUpOworCQlpZiAoY3J0Yy0+c3RhdGUtPmFjdGl2
ZSAmJiBuZWVkc19tb2Rlc2V0KGNydGMtPnN0YXRlKSkKKwkJCWRybV9jYWxjX3RpbWVzdGFtcGlu
Z19jb25zdGFudHMoY3J0YywgJmNydGMtPnN0YXRlLT5hZGp1c3RlZF9tb2RlKTsKIAl9CiAKIAls
aXN0X2Zvcl9lYWNoX2VudHJ5KGNvbm5lY3RvciwgJmRldi0+bW9kZV9jb25maWcuY29ubmVjdG9y
X2xpc3QsIGhlYWQpIHsKQEAgLTEyMjc3LDI1ICsxMjI5Niw2IEBAIHN0YXRpYyBpbnQgX19pbnRl
bF9zZXRfbW9kZShzdHJ1Y3QgZHJtX2NydGMgKm1vZGVzZXRfY3J0YywKIAkJCWRybV9wbGFuZV9o
ZWxwZXJfZGlzYWJsZShjcnRjLT5wcmltYXJ5KTsKIAl9CiAKLQkvKiBjcnRjLT5tb2RlIGlzIGFs
cmVhZHkgdXNlZCBieSB0aGUgLT5tb2RlX3NldCBjYWxsYmFja3MsIGhlbmNlIHdlIG5lZWQKLQkg
KiB0byBzZXQgaXQgaGVyZSBhbHJlYWR5IGRlc3BpdGUgdGhhdCB3ZSBwYXNzIGl0IGRvd24gdGhl
IGNhbGxjaGFpbi4KLQkgKgotCSAqIE5vdGUgd2UnbGwgbmVlZCB0byBmaXggdGhpcyB1cCB3aGVu
IHdlIHN0YXJ0IHRyYWNraW5nIG11bHRpcGxlCi0JICogcGlwZXM7IGhlcmUgd2UgYXNzdW1lIGEg
c2luZ2xlIG1vZGVzZXRfcGlwZSBhbmQgb25seSB0cmFjayB0aGUKLQkgKiBzaW5nbGUgY3J0YyBh
bmQgbW9kZS4KLQkgKi8KLQlpZiAocGlwZV9jb25maWctPmJhc2UuYWN0aXZlICYmIG5lZWRzX21v
ZGVzZXQoJnBpcGVfY29uZmlnLT5iYXNlKSkgewotCQltb2Rlc2V0X2NydGMtPm1vZGUgPSBwaXBl
X2NvbmZpZy0+YmFzZS5tb2RlOwotCi0JCS8qCi0JCSAqIENhbGN1bGF0ZSBhbmQgc3RvcmUgdmFy
aW91cyBjb25zdGFudHMgd2hpY2gKLQkJICogYXJlIGxhdGVyIG5lZWRlZCBieSB2YmxhbmsgYW5k
IHN3YXAtY29tcGxldGlvbgotCQkgKiB0aW1lc3RhbXBpbmcuIFRoZXkgYXJlIGRlcml2ZWQgZnJv
bSB0cnVlIGh3bW9kZS4KLQkJICovCi0JCWRybV9jYWxjX3RpbWVzdGFtcGluZ19jb25zdGFudHMo
bW9kZXNldF9jcnRjLAotCQkJCQkJJnBpcGVfY29uZmlnLT5iYXNlLmFkanVzdGVkX21vZGUpOwot
CX0KLQogCS8qIE9ubHkgYWZ0ZXIgZGlzYWJsaW5nIGFsbCBvdXRwdXQgcGlwZWxpbmVzIHRoYXQg
d2lsbCBiZSBjaGFuZ2VkIGNhbiB3ZQogCSAqIHVwZGF0ZSB0aGUgdGhlIG91dHB1dCBjb25maWd1
cmF0aW9uLiAqLwogCWludGVsX21vZGVzZXRfdXBkYXRlX3N0YXRlKHN0YXRlKTsKLS0gCjIuMS4w
CgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpJbnRlbC1n
ZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cDovL2xp
c3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeAo=