From mboxrd@z Thu Jan  1 00:00:00 1970
From: Ander Conselvan de Oliveira <ander.conselvan.de.oliveira@intel.com>
Subject: [PATCH 20/35] drm/i915: Add primary plane to atomic
	state in legacy modeset
Date: Tue, 21 Apr 2015 17:13:09 +0300
Message-ID: <1429625604-22252-21-git-send-email-ander.conselvan.de.oliveira@intel.com>
References: <1429625604-22252-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 mga11.intel.com (mga11.intel.com [192.55.52.93])
 by gabe.freedesktop.org (Postfix) with ESMTP id A12B16E5DB
 for <intel-gfx@lists.freedesktop.org>; Tue, 21 Apr 2015 07:14:00 -0700 (PDT)
In-Reply-To: <1429625604-22252-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

QWRkIHRoZSBwcmltYXJ5IHBsYW5lIHN0YXRlIHRvIHRoZSBsZWdhY3kgbW9kZXNldCBhdG9taWMg
c3RhdGUgYW5kIHVzZQppdCB3aGVuIGNvbmZpZ3VyaW5nIHRoZSBwcmltYXJ5IHBsYW5lIGluIF9f
aW50ZWxfc2V0X21vZGUoKS4gVGhpcyBpcyBhCmZpcnN0IHN0ZXAgdG93YXJkcyBtZXJnaW5nIHRo
ZSBmbGlwIHBhdGggaW4gaW50ZWxfY3J0Y19zZXRfY29uZmlnKCkgYW5kCl9faW50ZWxfc2V0X21v
ZGUoKS4KCnYyOiBTZXQgY3J0YyB0byBOVUxMIGlmIGZiIGlzIE5VTEwuIChNYWFydGVuKQoKU2ln
bmVkLW9mZi1ieTogQW5kZXIgQ29uc2VsdmFuIGRlIE9saXZlaXJhIDxhbmRlci5jb25zZWx2YW4u
ZGUub2xpdmVpcmFAaW50ZWwuY29tPgotLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rp
c3BsYXkuYyB8IDgzICsrKysrKysrKysrKysrKysrKysrKysrKysrKysrKy0tLS0tLQogMSBmaWxl
IGNoYW5nZWQsIDcxIGluc2VydGlvbnMoKyksIDEyIGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBh
L2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYyBiL2RyaXZlcnMvZ3B1L2RybS9p
OTE1L2ludGVsX2Rpc3BsYXkuYwppbmRleCA5MDI4NzBhLi4zODJiNjIxIDEwMDY0NAotLS0gYS9k
cml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMKKysrIGIvZHJpdmVycy9ncHUvZHJt
L2k5MTUvaW50ZWxfZGlzcGxheS5jCkBAIC05NjIyLDYgKzk2MjIsNDEgQEAgbW9kZV9maXRzX2lu
X2ZiZGV2KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsCiAjZW5kaWYKIH0KIAorc3RhdGljIGludCBp
bnRlbF9tb2Rlc2V0X3NldHVwX3BsYW5lX3N0YXRlKHN0cnVjdCBkcm1fYXRvbWljX3N0YXRlICpz
dGF0ZSwKKwkJCQkJICAgc3RydWN0IGRybV9jcnRjICpjcnRjLAorCQkJCQkgICBzdHJ1Y3QgZHJt
X2Rpc3BsYXlfbW9kZSAqbW9kZSwKKwkJCQkJICAgc3RydWN0IGRybV9mcmFtZWJ1ZmZlciAqZmIs
CisJCQkJCSAgIGludCB4LCBpbnQgeSkKK3sKKwlzdHJ1Y3QgZHJtX3BsYW5lX3N0YXRlICpwbGFu
ZV9zdGF0ZTsKKwlpbnQgaGRpc3BsYXksIHZkaXNwbGF5OworCWludCByZXQ7CisKKwlwbGFuZV9z
dGF0ZSA9IGRybV9hdG9taWNfZ2V0X3BsYW5lX3N0YXRlKHN0YXRlLCBjcnRjLT5wcmltYXJ5KTsK
KwlpZiAoSVNfRVJSKHBsYW5lX3N0YXRlKSkKKwkJcmV0dXJuIFBUUl9FUlIocGxhbmVfc3RhdGUp
OworCisJaWYgKG1vZGUpCisJCWRybV9jcnRjX2dldF9odl90aW1pbmcobW9kZSwgJmhkaXNwbGF5
LCAmdmRpc3BsYXkpOworCWVsc2UKKwkJaGRpc3BsYXkgPSB2ZGlzcGxheSA9IDA7CisKKwlyZXQg
PSBkcm1fYXRvbWljX3NldF9jcnRjX2Zvcl9wbGFuZShwbGFuZV9zdGF0ZSwgZmIgPyBjcnRjIDog
TlVMTCk7CisJaWYgKHJldCkKKwkJcmV0dXJuIHJldDsKKwlkcm1fYXRvbWljX3NldF9mYl9mb3Jf
cGxhbmUocGxhbmVfc3RhdGUsIGZiKTsKKwlwbGFuZV9zdGF0ZS0+Y3J0Y194ID0gMDsKKwlwbGFu
ZV9zdGF0ZS0+Y3J0Y195ID0gMDsKKwlwbGFuZV9zdGF0ZS0+Y3J0Y193ID0gaGRpc3BsYXk7CisJ
cGxhbmVfc3RhdGUtPmNydGNfaCA9IHZkaXNwbGF5OworCXBsYW5lX3N0YXRlLT5zcmNfeCA9IHgg
PDwgMTY7CisJcGxhbmVfc3RhdGUtPnNyY195ID0geSA8PCAxNjsKKwlwbGFuZV9zdGF0ZS0+c3Jj
X3cgPSBoZGlzcGxheSA8PCAxNjsKKwlwbGFuZV9zdGF0ZS0+c3JjX2ggPSB2ZGlzcGxheSA8PCAx
NjsKKworCXJldHVybiAwOworfQorCiBib29sIGludGVsX2dldF9sb2FkX2RldGVjdF9waXBlKHN0
cnVjdCBkcm1fY29ubmVjdG9yICpjb25uZWN0b3IsCiAJCQkJc3RydWN0IGRybV9kaXNwbGF5X21v
ZGUgKm1vZGUsCiAJCQkJc3RydWN0IGludGVsX2xvYWRfZGV0ZWN0X3BpcGUgKm9sZCwKQEAgLTk3
NjQsNiArOTc5OSwxMCBAQCByZXRyeToKIAkJZ290byBmYWlsOwogCX0KIAorCXJldCA9IGludGVs
X21vZGVzZXRfc2V0dXBfcGxhbmVfc3RhdGUoc3RhdGUsIGNydGMsIG1vZGUsIGZiLCAwLCAwKTsK
KwlpZiAocmV0KQorCQlnb3RvIGZhaWw7CisKIAlpZiAoaW50ZWxfc2V0X21vZGUoY3J0YywgbW9k
ZSwgMCwgMCwgZmIsIHN0YXRlKSkgewogCQlEUk1fREVCVUdfS01TKCJmYWlsZWQgdG8gc2V0IG1v
ZGUgb24gbG9hZC1kZXRlY3QgcGlwZVxuIik7CiAJCWlmIChvbGQtPnJlbGVhc2VfZmIpCkBAIC05
ODAzLDYgKzk4NDIsNyBAQCB2b2lkIGludGVsX3JlbGVhc2VfbG9hZF9kZXRlY3RfcGlwZShzdHJ1
Y3QgZHJtX2Nvbm5lY3RvciAqY29ubmVjdG9yLAogCXN0cnVjdCBkcm1fYXRvbWljX3N0YXRlICpz
dGF0ZTsKIAlzdHJ1Y3QgZHJtX2Nvbm5lY3Rvcl9zdGF0ZSAqY29ubmVjdG9yX3N0YXRlOwogCXN0
cnVjdCBpbnRlbF9jcnRjX3N0YXRlICpjcnRjX3N0YXRlOworCWludCByZXQ7CiAKIAlEUk1fREVC
VUdfS01TKCJbQ09OTkVDVE9SOiVkOiVzXSwgW0VOQ09ERVI6JWQ6JXNdXG4iLAogCQkgICAgICBj
b25uZWN0b3ItPmJhc2UuaWQsIGNvbm5lY3Rvci0+bmFtZSwKQEAgLTk4MzIsNiArOTg3MiwxMSBA
QCB2b2lkIGludGVsX3JlbGVhc2VfbG9hZF9kZXRlY3RfcGlwZShzdHJ1Y3QgZHJtX2Nvbm5lY3Rv
ciAqY29ubmVjdG9yLAogCiAJCWNydGNfc3RhdGUtPmJhc2UuZW5hYmxlID0gZmFsc2U7CiAKKwkJ
cmV0ID0gaW50ZWxfbW9kZXNldF9zZXR1cF9wbGFuZV9zdGF0ZShzdGF0ZSwgY3J0YywgTlVMTCwg
TlVMTCwKKwkJCQkJCSAgICAgIDAsIDApOworCQlpZiAocmV0KQorCQkJZ290byBmYWlsOworCiAJ
CWludGVsX3NldF9tb2RlKGNydGMsIE5VTEwsIDAsIDAsIE5VTEwsIHN0YXRlKTsKIAogCQlkcm1f
YXRvbWljX3N0YXRlX2ZyZWUoc3RhdGUpOwpAQCAtMTIxODIsNiArMTIyMjcsOCBAQCBzdGF0aWMg
aW50IF9faW50ZWxfc2V0X21vZGUoc3RydWN0IGRybV9jcnRjICptb2Rlc2V0X2NydGMsCiAJc3Ry
dWN0IGludGVsX2NydGMgKmludGVsX2NydGM7CiAJc3RydWN0IGRybV9jcnRjICpjcnRjOwogCXN0
cnVjdCBkcm1fY3J0Y19zdGF0ZSAqY3J0Y19zdGF0ZTsKKwlzdHJ1Y3QgZHJtX3BsYW5lICpwbGFu
ZTsKKwlzdHJ1Y3QgZHJtX3BsYW5lX3N0YXRlICpwbGFuZV9zdGF0ZTsKIAlpbnQgcmV0ID0gMDsK
IAlpbnQgaTsKIApAQCAtMTIyMzMsMjAgKzEyMjgwLDI0IEBAIHN0YXRpYyBpbnQgX19pbnRlbF9z
ZXRfbW9kZShzdHJ1Y3QgZHJtX2NydGMgKm1vZGVzZXRfY3J0YywKIAogCW1vZGVzZXRfdXBkYXRl
X2NydGNfcG93ZXJfZG9tYWlucyhzdGF0ZSk7CiAKLQlpZiAocGlwZV9jb25maWctPmJhc2UuZW5h
YmxlICYmIG5lZWRzX21vZGVzZXQoJnBpcGVfY29uZmlnLT5iYXNlKSkgewotCQlzdHJ1Y3QgZHJt
X3BsYW5lICpwcmltYXJ5OwotCQlpbnQgdmRpc3BsYXksIGhkaXNwbGF5OwotCi0JCWludGVsX2Ny
dGMgPSB0b19pbnRlbF9jcnRjKG1vZGVzZXRfY3J0Yyk7Ci0JCXByaW1hcnkgPSBpbnRlbF9jcnRj
LT5iYXNlLnByaW1hcnk7CisJZm9yX2VhY2hfcGxhbmVfaW5fc3RhdGUoc3RhdGUsIHBsYW5lLCBw
bGFuZV9zdGF0ZSwgaSkgeworCQlpZiAoV0FSTl9PTihwbGFuZSAhPSBtb2Rlc2V0X2NydGMtPnBy
aW1hcnkpKQorCQkJY29udGludWU7CiAKLQkJZHJtX2NydGNfZ2V0X2h2X3RpbWluZyhtb2RlLCAm
aGRpc3BsYXksICZ2ZGlzcGxheSk7CisJCS8qIFByaW1hcnkgcGxhbmUgaXMgZGlzYWJsZWQgaW4g
aW50ZWxfY3J0Y19kaXNhYmxlKCkgKi8KKwkJaWYgKCFwaXBlX2NvbmZpZy0+YmFzZS5lbmFibGUp
CisJCQljb250aW51ZTsKIAotCQlyZXQgPSBkcm1fcGxhbmVfaGVscGVyX3VwZGF0ZShwcmltYXJ5
LCAmaW50ZWxfY3J0Yy0+YmFzZSwKLQkJCQkJICAgICAgZmIsIDAsIDAsCi0JCQkJCSAgICAgIGhk
aXNwbGF5LCB2ZGlzcGxheSwKLQkJCQkJICAgICAgeCA8PCAxNiwgeSA8PCAxNiwKLQkJCQkJICAg
ICAgaGRpc3BsYXkgPDwgMTYsIHZkaXNwbGF5IDw8IDE2KTsKKwkJcmV0ID0gZHJtX3BsYW5lX2hl
bHBlcl91cGRhdGUocGxhbmUsIHBsYW5lX3N0YXRlLT5jcnRjLAorCQkJCQkgICAgICBwbGFuZV9z
dGF0ZS0+ZmIsCisJCQkJCSAgICAgIHBsYW5lX3N0YXRlLT5jcnRjX3gsCisJCQkJCSAgICAgIHBs
YW5lX3N0YXRlLT5jcnRjX3ksCisJCQkJCSAgICAgIHBsYW5lX3N0YXRlLT5jcnRjX3csCisJCQkJ
CSAgICAgIHBsYW5lX3N0YXRlLT5jcnRjX2gsCisJCQkJCSAgICAgIHBsYW5lX3N0YXRlLT5zcmNf
eCwKKwkJCQkJICAgICAgcGxhbmVfc3RhdGUtPnNyY195LAorCQkJCQkgICAgICBwbGFuZV9zdGF0
ZS0+c3JjX3csCisJCQkJCSAgICAgIHBsYW5lX3N0YXRlLT5zcmNfaCk7CiAJCVdBUk5fT04ocmV0
ICE9IDApOwogCX0KIApAQCAtMTIzNzIsNiArMTI0MjMsOSBAQCB2b2lkIGludGVsX2NydGNfcmVz
dG9yZV9tb2RlKHN0cnVjdCBkcm1fY3J0YyAqY3J0YykKIAkJY3J0Y19zdGF0ZS0+YmFzZS5lbmFi
bGUgPSBpbnRlbF9jcnRjLT5uZXdfZW5hYmxlZDsKIAl9CiAKKwlpbnRlbF9tb2Rlc2V0X3NldHVw
X3BsYW5lX3N0YXRlKHN0YXRlLCBjcnRjLCAmY3J0Yy0+bW9kZSwKKwkJCQkJY3J0Yy0+cHJpbWFy
eS0+ZmIsIGNydGMtPngsIGNydGMtPnkpOworCiAJaW50ZWxfc2V0X21vZGUoY3J0YywgJmNydGMt
Pm1vZGUsIGNydGMtPngsIGNydGMtPnksIGNydGMtPnByaW1hcnktPmZiLAogCQkgICAgICAgc3Rh
dGUpOwogCkBAIC0xMjc0Niw2ICsxMjgwMCwxMSBAQCBzdGF0aWMgaW50IGludGVsX2NydGNfc2V0
X2NvbmZpZyhzdHJ1Y3QgZHJtX21vZGVfc2V0ICpzZXQpCiAJaWYgKHJldCkKIAkJZ290byBmYWls
OwogCisJcmV0ID0gaW50ZWxfbW9kZXNldF9zZXR1cF9wbGFuZV9zdGF0ZShzdGF0ZSwgc2V0LT5j
cnRjLCBzZXQtPm1vZGUsCisJCQkJCSAgICAgIHNldC0+ZmIsIHNldC0+eCwgc2V0LT55KTsKKwlp
ZiAocmV0KQorCQlnb3RvIGZhaWw7CisKIAkvKiBDb21wdXRlIHdoZXRoZXIgd2UgbmVlZCBhIGZ1
bGwgbW9kZXNldCwgb25seSBhbiBmYiBiYXNlIHVwZGF0ZSBvciBubwogCSAqIGNoYW5nZSBhdCBh
bGwuIEluIHRoZSBmdXR1cmUgd2UgbWlnaHQgYWxzbyBjaGVjayB3aGV0aGVyIG9ubHkgdGhlCiAJ
ICogbW9kZSBjaGFuZ2VkLCBlLmcuIGZvciBMVkRTIHdoZXJlIHdlIG9ubHkgY2hhbmdlIHRoZSBw
YW5lbCBmaXR0ZXIgaW4KLS0gCjIuMS4wCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f
X19fX19fX19fX19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5m
cmVlZGVza3RvcC5vcmcKaHR0cDovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3Rp
bmZvL2ludGVsLWdmeAo=