From mboxrd@z Thu Jan  1 00:00:00 1970
From: Ander Conselvan de Oliveira <ander.conselvan.de.oliveira@intel.com>
Subject: [PATCH 07/20] drm/i915: Copy the staged connector
	config to the legacy atomic state
Date: Fri, 20 Mar 2015 16:18:07 +0200
Message-ID: <1426861099-28445-8-git-send-email-ander.conselvan.de.oliveira@intel.com>
References: <1426861099-28445-1-git-send-email-ander.conselvan.de.oliveira@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 mga14.intel.com (mga14.intel.com [192.55.52.115])
 by gabe.freedesktop.org (Postfix) with ESMTP id 16CA56EC34
 for <intel-gfx@lists.freedesktop.org>; Fri, 20 Mar 2015 07:19:36 -0700 (PDT)
In-Reply-To: <1426861099-28445-1-git-send-email-ander.conselvan.de.oliveira@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

V2l0aCB0aGlzIGluIHBsYWNlLCB3ZSBjYW4gc3RhcnQgY29udmVydGluZyBwaWVjZXMgb2YgdGhl
IG1vZGVzZXQgY29kZQp0byBsb29rIGF0IHRoZSBjb25uZWN0b3IgYXRvbWljIHN0YXRlIGluc3Rl
YWQgb2YgdGhlIHN0YWdlZCBjb25maWcuCgp2MjogSGFuZGxlIHRoZSBsb2FkIGRldGVjdCBzdGFn
ZWQgY29uZmlnIGNoYW5nZXMgdG9vLiAoQW5kZXIpCiAgICBSZW1vdmUgdW5uZWNlc3NhcnkgYmxh
bmsgbGluZS4gKERhbmllbCkKClNpZ25lZC1vZmYtYnk6IEFuZGVyIENvbnNlbHZhbiBkZSBPbGl2
ZWlyYSA8YW5kZXIuY29uc2VsdmFuLmRlLm9saXZlaXJhQGludGVsLmNvbT4KLS0tCiBkcml2ZXJz
L2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMgfCA1MiArKysrKysrKysrKysrKysrKysrKysr
KysrKysrKysrLS0tLS0KIDEgZmlsZSBjaGFuZ2VkLCA0NSBpbnNlcnRpb25zKCspLCA3IGRlbGV0
aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXku
YyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYwppbmRleCAwZWQ3ODIyLi5i
NzY3MjZmIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMK
KysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jCkBAIC04ODA0LDYgKzg4
MDQsNyBAQCBib29sIGludGVsX2dldF9sb2FkX2RldGVjdF9waXBlKHN0cnVjdCBkcm1fY29ubmVj
dG9yICpjb25uZWN0b3IsCiAJc3RydWN0IGRybV9mcmFtZWJ1ZmZlciAqZmI7CiAJc3RydWN0IGRy
bV9tb2RlX2NvbmZpZyAqY29uZmlnID0gJmRldi0+bW9kZV9jb25maWc7CiAJc3RydWN0IGRybV9h
dG9taWNfc3RhdGUgKnN0YXRlID0gTlVMTDsKKwlzdHJ1Y3QgZHJtX2Nvbm5lY3Rvcl9zdGF0ZSAq
Y29ubmVjdG9yX3N0YXRlOwogCWludCByZXQsIGkgPSAtMTsKIAogCURSTV9ERUJVR19LTVMoIltD
T05ORUNUT1I6JWQ6JXNdLCBbRU5DT0RFUjolZDolc11cbiIsCkBAIC04ODkxLDYgKzg4OTIsMTUg
QEAgcmV0cnk6CiAKIAlzdGF0ZS0+YWNxdWlyZV9jdHggPSBjdHg7CiAKKwljb25uZWN0b3Jfc3Rh
dGUgPSBkcm1fYXRvbWljX2dldF9jb25uZWN0b3Jfc3RhdGUoc3RhdGUsIGNvbm5lY3Rvcik7CisJ
aWYgKElTX0VSUihjb25uZWN0b3Jfc3RhdGUpKSB7CisJCXJldCA9IFBUUl9FUlIoY29ubmVjdG9y
X3N0YXRlKTsKKwkJZ290byBmYWlsOworCX0KKworCWNvbm5lY3Rvcl9zdGF0ZS0+Y3J0YyA9IGNy
dGM7CisJY29ubmVjdG9yX3N0YXRlLT5iZXN0X2VuY29kZXIgPSAmaW50ZWxfZW5jb2Rlci0+YmFz
ZTsKKwogCWlmICghbW9kZSkKIAkJbW9kZSA9ICZsb2FkX2RldGVjdF9tb2RlOwogCkBAIC04OTU2
LDYgKzg5NjYsNyBAQCB2b2lkIGludGVsX3JlbGVhc2VfbG9hZF9kZXRlY3RfcGlwZShzdHJ1Y3Qg
ZHJtX2Nvbm5lY3RvciAqY29ubmVjdG9yLAogCXN0cnVjdCBkcm1fY3J0YyAqY3J0YyA9IGVuY29k
ZXItPmNydGM7CiAJc3RydWN0IGludGVsX2NydGMgKmludGVsX2NydGMgPSB0b19pbnRlbF9jcnRj
KGNydGMpOwogCXN0cnVjdCBkcm1fYXRvbWljX3N0YXRlICpzdGF0ZTsKKwlzdHJ1Y3QgZHJtX2Nv
bm5lY3Rvcl9zdGF0ZSAqY29ubmVjdG9yX3N0YXRlOwogCiAJRFJNX0RFQlVHX0tNUygiW0NPTk5F
Q1RPUjolZDolc10sIFtFTkNPREVSOiVkOiVzXVxuIiwKIAkJICAgICAgY29ubmVjdG9yLT5iYXNl
LmlkLCBjb25uZWN0b3ItPm5hbWUsCkBAIC04OTYzLDE3ICs4OTc0LDIzIEBAIHZvaWQgaW50ZWxf
cmVsZWFzZV9sb2FkX2RldGVjdF9waXBlKHN0cnVjdCBkcm1fY29ubmVjdG9yICpjb25uZWN0b3Is
CiAKIAlpZiAob2xkLT5sb2FkX2RldGVjdF90ZW1wKSB7CiAJCXN0YXRlID0gZHJtX2F0b21pY19z
dGF0ZV9hbGxvYyhkZXYpOwotCQlpZiAoIXN0YXRlKSB7Ci0JCQlEUk1fREVCVUdfS01TKCJjYW4n
dCByZWxlYXNlIGxvYWQgZGV0ZWN0IHBpcGVcbiIpOwotCQkJcmV0dXJuOwotCQl9CisJCWlmICgh
c3RhdGUpCisJCQlnb3RvIGZhaWw7CiAKIAkJc3RhdGUtPmFjcXVpcmVfY3R4ID0gY3R4OwogCisJ
CWNvbm5lY3Rvcl9zdGF0ZSA9IGRybV9hdG9taWNfZ2V0X2Nvbm5lY3Rvcl9zdGF0ZShzdGF0ZSwg
Y29ubmVjdG9yKTsKKwkJaWYgKElTX0VSUihjb25uZWN0b3Jfc3RhdGUpKQorCQkJZ290byBmYWls
OworCiAJCXRvX2ludGVsX2Nvbm5lY3Rvcihjb25uZWN0b3IpLT5uZXdfZW5jb2RlciA9IE5VTEw7
CiAJCWludGVsX2VuY29kZXItPm5ld19jcnRjID0gTlVMTDsKIAkJaW50ZWxfY3J0Yy0+bmV3X2Vu
YWJsZWQgPSBmYWxzZTsKIAkJaW50ZWxfY3J0Yy0+bmV3X2NvbmZpZyA9IE5VTEw7CisKKwkJY29u
bmVjdG9yX3N0YXRlLT5iZXN0X2VuY29kZXIgPSBOVUxMOworCQljb25uZWN0b3Jfc3RhdGUtPmNy
dGMgPSBOVUxMOworCiAJCWludGVsX3NldF9tb2RlKGNydGMsIE5VTEwsIDAsIDAsIE5VTEwsIHN0
YXRlKTsKIAogCQlkcm1fYXRvbWljX3N0YXRlX2ZyZWUoc3RhdGUpOwpAQCAtODk4OSw2ICs5MDA2
LDExIEBAIHZvaWQgaW50ZWxfcmVsZWFzZV9sb2FkX2RldGVjdF9waXBlKHN0cnVjdCBkcm1fY29u
bmVjdG9yICpjb25uZWN0b3IsCiAJLyogU3dpdGNoIGNydGMgYW5kIGVuY29kZXIgYmFjayBvZmYg
aWYgbmVjZXNzYXJ5ICovCiAJaWYgKG9sZC0+ZHBtc19tb2RlICE9IERSTV9NT0RFX0RQTVNfT04p
CiAJCWNvbm5lY3Rvci0+ZnVuY3MtPmRwbXMoY29ubmVjdG9yLCBvbGQtPmRwbXNfbW9kZSk7CisK
KwlyZXR1cm47CitmYWlsOgorCURSTV9ERUJVR19LTVMoIkNvdWxkbid0IHJlbGVhc2UgbG9hZCBk
ZXRlY3QgcGlwZS5cbiIpOworCWRybV9hdG9taWNfc3RhdGVfZnJlZShzdGF0ZSk7CiB9CiAKIHN0
YXRpYyBpbnQgaTl4eF9wbGxfcmVmY2xrKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsCkBAIC0xMTY3
NCw5ICsxMTY5NiwxMSBAQCBpbnRlbF9zZXRfY29uZmlnX2NvbXB1dGVfbW9kZV9jaGFuZ2VzKHN0
cnVjdCBkcm1fbW9kZV9zZXQgKnNldCwKIHN0YXRpYyBpbnQKIGludGVsX21vZGVzZXRfc3RhZ2Vf
b3V0cHV0X3N0YXRlKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsCiAJCQkJIHN0cnVjdCBkcm1fbW9k
ZV9zZXQgKnNldCwKLQkJCQkgc3RydWN0IGludGVsX3NldF9jb25maWcgKmNvbmZpZykKKwkJCQkg
c3RydWN0IGludGVsX3NldF9jb25maWcgKmNvbmZpZywKKwkJCQkgc3RydWN0IGRybV9hdG9taWNf
c3RhdGUgKnN0YXRlKQogewogCXN0cnVjdCBpbnRlbF9jb25uZWN0b3IgKmNvbm5lY3RvcjsKKwlz
dHJ1Y3QgZHJtX2Nvbm5lY3Rvcl9zdGF0ZSAqY29ubmVjdG9yX3N0YXRlOwogCXN0cnVjdCBpbnRl
bF9lbmNvZGVyICplbmNvZGVyOwogCXN0cnVjdCBpbnRlbF9jcnRjICpjcnRjOwogCWludCBybzsK
QEAgLTExNzQwLDYgKzExNzY0LDE0IEBAIGludGVsX21vZGVzZXRfc3RhZ2Vfb3V0cHV0X3N0YXRl
KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsCiAJCX0KIAkJY29ubmVjdG9yLT5uZXdfZW5jb2Rlci0+
bmV3X2NydGMgPSB0b19pbnRlbF9jcnRjKG5ld19jcnRjKTsKIAorCQljb25uZWN0b3Jfc3RhdGUg
PQorCQkJZHJtX2F0b21pY19nZXRfY29ubmVjdG9yX3N0YXRlKHN0YXRlLCAmY29ubmVjdG9yLT5i
YXNlKTsKKwkJaWYgKElTX0VSUihjb25uZWN0b3Jfc3RhdGUpKQorCQkJcmV0dXJuIFBUUl9FUlIo
Y29ubmVjdG9yX3N0YXRlKTsKKworCQljb25uZWN0b3Jfc3RhdGUtPmNydGMgPSBuZXdfY3J0YzsK
KwkJY29ubmVjdG9yX3N0YXRlLT5iZXN0X2VuY29kZXIgPSAmY29ubmVjdG9yLT5uZXdfZW5jb2Rl
ci0+YmFzZTsKKwogCQlEUk1fREVCVUdfS01TKCJbQ09OTkVDVE9SOiVkOiVzXSB0byBbQ1JUQzol
ZF1cbiIsCiAJCQljb25uZWN0b3ItPmJhc2UuYmFzZS5pZCwKIAkJCWNvbm5lY3Rvci0+YmFzZS5u
YW1lLApAQCAtMTE3NzIsOSArMTE4MDQsMTUgQEAgaW50ZWxfbW9kZXNldF9zdGFnZV9vdXRwdXRf
c3RhdGUoc3RydWN0IGRybV9kZXZpY2UgKmRldiwKIAl9CiAJLyogTm93IHdlJ3ZlIGFsc28gdXBk
YXRlZCBlbmNvZGVyLT5uZXdfY3J0YyBmb3IgYWxsIGVuY29kZXJzLiAqLwogCWZvcl9lYWNoX2lu
dGVsX2Nvbm5lY3RvcihkZXYsIGNvbm5lY3RvcikgewotCQlpZiAoY29ubmVjdG9yLT5uZXdfZW5j
b2RlcikKKwkJY29ubmVjdG9yX3N0YXRlID0KKwkJCWRybV9hdG9taWNfZ2V0X2Nvbm5lY3Rvcl9z
dGF0ZShzdGF0ZSwgJmNvbm5lY3Rvci0+YmFzZSk7CisKKwkJaWYgKGNvbm5lY3Rvci0+bmV3X2Vu
Y29kZXIpIHsKIAkJCWlmIChjb25uZWN0b3ItPm5ld19lbmNvZGVyICE9IGNvbm5lY3Rvci0+ZW5j
b2RlcikKIAkJCQljb25uZWN0b3ItPmVuY29kZXIgPSBjb25uZWN0b3ItPm5ld19lbmNvZGVyOwor
CQl9IGVsc2UgeworCQkJY29ubmVjdG9yX3N0YXRlLT5jcnRjID0gTlVMTDsKKwkJfQogCX0KIAlm
b3JfZWFjaF9pbnRlbF9jcnRjKGRldiwgY3J0YykgewogCQljcnRjLT5uZXdfZW5hYmxlZCA9IGZh
bHNlOwpAQCAtMTE4ODMsNyArMTE5MjEsNyBAQCBzdGF0aWMgaW50IGludGVsX2NydGNfc2V0X2Nv
bmZpZyhzdHJ1Y3QgZHJtX21vZGVfc2V0ICpzZXQpCiAKIAlzdGF0ZS0+YWNxdWlyZV9jdHggPSBk
ZXYtPm1vZGVfY29uZmlnLmFjcXVpcmVfY3R4OwogCi0JcmV0ID0gaW50ZWxfbW9kZXNldF9zdGFn
ZV9vdXRwdXRfc3RhdGUoZGV2LCBzZXQsIGNvbmZpZyk7CisJcmV0ID0gaW50ZWxfbW9kZXNldF9z
dGFnZV9vdXRwdXRfc3RhdGUoZGV2LCBzZXQsIGNvbmZpZywgc3RhdGUpOwogCWlmIChyZXQpCiAJ
CWdvdG8gZmFpbDsKIAotLSAKMi4xLjAKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f
X19fX19fX19fX19fX19fCkludGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZy
ZWVkZXNrdG9wLm9yZwpodHRwOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGlu
Zm8vaW50ZWwtZ2Z4Cg==