From mboxrd@z Thu Jan  1 00:00:00 1970
From: Ander Conselvan de Oliveira <ander.conselvan.de.oliveira@intel.com>
Subject: [PATCH 12/35] drm/i915: Add crtc states before calling
	compute_config()
Date: Tue, 21 Apr 2015 17:13:01 +0300
Message-ID: <1429625604-22252-13-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 mga14.intel.com (mga14.intel.com [192.55.52.115])
 by gabe.freedesktop.org (Postfix) with ESMTP id 645606E5CF
 for <intel-gfx@lists.freedesktop.org>; Tue, 21 Apr 2015 07:13:47 -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

VGhlIGZ1bmN0aW9uIGludGVsX21vZGVzZXRfY29tcHV0ZV9jb25maWcoKSBuZWVkcyB0byBldmVu
dHVhbGx5IGJlY29tZQpwYXJ0IG9mIGF0b21pY19jaGVjaygpLiBBdCB0aGF0IHBvaW50LCBhbGwg
dGhlIGFmZmVjdGVkIGNydGNzIG5lZWQgdG8gYmUKaW4gdGhlIGF0b21pYyBzdGF0ZSB3aXRoIHRo
ZSBuZXcgdmFsdWVzLiBTbyBtb3ZlIHRoZSBsb2dpYyBvZiBhZGRpbmcKY3J0YyBzdGF0ZXMgb3V0
IG9mIHRoYXQgZnVuY3Rpb24uCgp2MjogU2V0IGNydGNfc3RhdGUtPmVuYWJsZSBpbiBhbGwgY2Fz
ZXMuIChBbmRlcikKClNpZ25lZC1vZmYtYnk6IEFuZGVyIENvbnNlbHZhbiBkZSBPbGl2ZWlyYSA8
YW5kZXIuY29uc2VsdmFuLmRlLm9saXZlaXJhQGludGVsLmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9k
cm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMgfCA1MiArKysrKysrKysrKysrKysrKysrKysrKysrKysr
Ky0tLS0tLS0KIDEgZmlsZSBjaGFuZ2VkLCA0MiBpbnNlcnRpb25zKCspLCAxMCBkZWxldGlvbnMo
LSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMgYi9k
cml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMKaW5kZXggOWM0M2RmMS4uZTZlN2M2
MyAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jCisrKyBi
L2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYwpAQCAtOTYyOCw2ICs5NjI4LDcg
QEAgYm9vbCBpbnRlbF9nZXRfbG9hZF9kZXRlY3RfcGlwZShzdHJ1Y3QgZHJtX2Nvbm5lY3RvciAq
Y29ubmVjdG9yLAogCXN0cnVjdCBkcm1fbW9kZV9jb25maWcgKmNvbmZpZyA9ICZkZXYtPm1vZGVf
Y29uZmlnOwogCXN0cnVjdCBkcm1fYXRvbWljX3N0YXRlICpzdGF0ZSA9IE5VTEw7CiAJc3RydWN0
IGRybV9jb25uZWN0b3Jfc3RhdGUgKmNvbm5lY3Rvcl9zdGF0ZTsKKwlzdHJ1Y3QgaW50ZWxfY3J0
Y19zdGF0ZSAqY3J0Y19zdGF0ZTsKIAlpbnQgcmV0LCBpID0gLTE7CiAKIAlEUk1fREVCVUdfS01T
KCJbQ09OTkVDVE9SOiVkOiVzXSwgW0VOQ09ERVI6JWQ6JXNdXG4iLApAQCAtOTcyMyw2ICs5NzI0
LDE0IEBAIHJldHJ5OgogCWNvbm5lY3Rvcl9zdGF0ZS0+Y3J0YyA9IGNydGM7CiAJY29ubmVjdG9y
X3N0YXRlLT5iZXN0X2VuY29kZXIgPSAmaW50ZWxfZW5jb2Rlci0+YmFzZTsKIAorCWNydGNfc3Rh
dGUgPSBpbnRlbF9hdG9taWNfZ2V0X2NydGNfc3RhdGUoc3RhdGUsIGludGVsX2NydGMpOworCWlm
IChJU19FUlIoY3J0Y19zdGF0ZSkpIHsKKwkJcmV0ID0gUFRSX0VSUihjcnRjX3N0YXRlKTsKKwkJ
Z290byBmYWlsOworCX0KKworCWNydGNfc3RhdGUtPmJhc2UuZW5hYmxlID0gdHJ1ZTsKKwogCWlm
ICghbW9kZSkKIAkJbW9kZSA9ICZsb2FkX2RldGVjdF9tb2RlOwogCkBAIC05NzgzLDYgKzk3OTIs
NyBAQCB2b2lkIGludGVsX3JlbGVhc2VfbG9hZF9kZXRlY3RfcGlwZShzdHJ1Y3QgZHJtX2Nvbm5l
Y3RvciAqY29ubmVjdG9yLAogCXN0cnVjdCBpbnRlbF9jcnRjICppbnRlbF9jcnRjID0gdG9faW50
ZWxfY3J0YyhjcnRjKTsKIAlzdHJ1Y3QgZHJtX2F0b21pY19zdGF0ZSAqc3RhdGU7CiAJc3RydWN0
IGRybV9jb25uZWN0b3Jfc3RhdGUgKmNvbm5lY3Rvcl9zdGF0ZTsKKwlzdHJ1Y3QgaW50ZWxfY3J0
Y19zdGF0ZSAqY3J0Y19zdGF0ZTsKIAogCURSTV9ERUJVR19LTVMoIltDT05ORUNUT1I6JWQ6JXNd
LCBbRU5DT0RFUjolZDolc11cbiIsCiAJCSAgICAgIGNvbm5lY3Rvci0+YmFzZS5pZCwgY29ubmVj
dG9yLT5uYW1lLApAQCAtOTc5OSw2ICs5ODA5LDEwIEBAIHZvaWQgaW50ZWxfcmVsZWFzZV9sb2Fk
X2RldGVjdF9waXBlKHN0cnVjdCBkcm1fY29ubmVjdG9yICpjb25uZWN0b3IsCiAJCWlmIChJU19F
UlIoY29ubmVjdG9yX3N0YXRlKSkKIAkJCWdvdG8gZmFpbDsKIAorCQljcnRjX3N0YXRlID0gaW50
ZWxfYXRvbWljX2dldF9jcnRjX3N0YXRlKHN0YXRlLCBpbnRlbF9jcnRjKTsKKwkJaWYgKElTX0VS
UihjcnRjX3N0YXRlKSkKKwkJCWdvdG8gZmFpbDsKKwogCQl0b19pbnRlbF9jb25uZWN0b3IoY29u
bmVjdG9yKS0+bmV3X2VuY29kZXIgPSBOVUxMOwogCQlpbnRlbF9lbmNvZGVyLT5uZXdfY3J0YyA9
IE5VTEw7CiAJCWludGVsX2NydGMtPm5ld19lbmFibGVkID0gZmFsc2U7CkBAIC05ODA2LDYgKzk4
MjAsOCBAQCB2b2lkIGludGVsX3JlbGVhc2VfbG9hZF9kZXRlY3RfcGlwZShzdHJ1Y3QgZHJtX2Nv
bm5lY3RvciAqY29ubmVjdG9yLAogCQljb25uZWN0b3Jfc3RhdGUtPmJlc3RfZW5jb2RlciA9IE5V
TEw7CiAJCWNvbm5lY3Rvcl9zdGF0ZS0+Y3J0YyA9IE5VTEw7CiAKKwkJY3J0Y19zdGF0ZS0+YmFz
ZS5lbmFibGUgPSBmYWxzZTsKKwogCQlpbnRlbF9zZXRfbW9kZShjcnRjLCBOVUxMLCAwLCAwLCBO
VUxMLCBzdGF0ZSk7CiAKIAkJZHJtX2F0b21pY19zdGF0ZV9mcmVlKHN0YXRlKTsKQEAgLTEyMTEy
LDE0ICsxMjEyOCw2IEBAIGludGVsX21vZGVzZXRfY29tcHV0ZV9jb25maWcoc3RydWN0IGRybV9j
cnRjICpjcnRjLAogCWludGVsX21vZGVzZXRfYWZmZWN0ZWRfcGlwZXMoY3J0YywgbW9kZXNldF9w
aXBlcywKIAkJCQkgICAgIHByZXBhcmVfcGlwZXMsIGRpc2FibGVfcGlwZXMpOwogCi0JZm9yX2Vh
Y2hfaW50ZWxfY3J0Y19tYXNrZWQoZGV2LCAqZGlzYWJsZV9waXBlcywgaW50ZWxfY3J0Yykgewot
CQlwaXBlX2NvbmZpZyA9IGludGVsX2F0b21pY19nZXRfY3J0Y19zdGF0ZShzdGF0ZSwgaW50ZWxf
Y3J0Yyk7Ci0JCWlmIChJU19FUlIocGlwZV9jb25maWcpKQotCQkJcmV0dXJuIHBpcGVfY29uZmln
OwotCi0JCXBpcGVfY29uZmlnLT5iYXNlLmVuYWJsZSA9IGZhbHNlOwotCX0KLQogCS8qCiAJICog
Tm90ZSB0aGlzIG5lZWRzIGNoYW5nZXMgd2hlbiB3ZSBzdGFydCB0cmFja2luZyBtdWx0aXBsZSBt
b2RlcwogCSAqIGFuZCBjcnRjcy4gIEF0IHRoYXQgcG9pbnQgd2UnbGwgbmVlZCB0byBjb21wdXRl
IHRoZSB3aG9sZSBjb25maWcKQEAgLTEyMTM2LDggKzEyMTQ0LDYgQEAgaW50ZWxfbW9kZXNldF9j
b21wdXRlX2NvbmZpZyhzdHJ1Y3QgZHJtX2NydGMgKmNydGMsCiAJCWlmIChJU19FUlIocGlwZV9j
b25maWcpKQogCQkJcmV0dXJuIHBpcGVfY29uZmlnOwogCi0JCXBpcGVfY29uZmlnLT5iYXNlLmVu
YWJsZSA9IHRydWU7Ci0KIAkJaW50ZWxfZHVtcF9waXBlX2NvbmZpZyh0b19pbnRlbF9jcnRjKGNy
dGMpLCBwaXBlX2NvbmZpZywKIAkJCQkgICAgICAgIlttb2Rlc2V0XSIpOwogCX0KQEAgLTEyMzYy
LDkgKzEyMzY4LDExIEBAIHZvaWQgaW50ZWxfY3J0Y19yZXN0b3JlX21vZGUoc3RydWN0IGRybV9j
cnRjICpjcnRjKQogewogCXN0cnVjdCBkcm1fZGV2aWNlICpkZXYgPSBjcnRjLT5kZXY7CiAJc3Ry
dWN0IGRybV9hdG9taWNfc3RhdGUgKnN0YXRlOworCXN0cnVjdCBpbnRlbF9jcnRjICppbnRlbF9j
cnRjOwogCXN0cnVjdCBpbnRlbF9lbmNvZGVyICplbmNvZGVyOwogCXN0cnVjdCBpbnRlbF9jb25u
ZWN0b3IgKmNvbm5lY3RvcjsKIAlzdHJ1Y3QgZHJtX2Nvbm5lY3Rvcl9zdGF0ZSAqY29ubmVjdG9y
X3N0YXRlOworCXN0cnVjdCBpbnRlbF9jcnRjX3N0YXRlICpjcnRjX3N0YXRlOwogCiAJc3RhdGUg
PSBkcm1fYXRvbWljX3N0YXRlX2FsbG9jKGRldik7CiAJaWYgKCFzdGF0ZSkgewpAQCAtMTI0MDIs
NiArMTI0MTAsMjEgQEAgdm9pZCBpbnRlbF9jcnRjX3Jlc3RvcmVfbW9kZShzdHJ1Y3QgZHJtX2Ny
dGMgKmNydGMpCiAJCX0KIAl9CiAKKwlmb3JfZWFjaF9pbnRlbF9jcnRjKGRldiwgaW50ZWxfY3J0
YykgeworCQlpZiAoaW50ZWxfY3J0Yy0+bmV3X2VuYWJsZWQgPT0gaW50ZWxfY3J0Yy0+YmFzZS5l
bmFibGVkKQorCQkJY29udGludWU7CisKKwkJY3J0Y19zdGF0ZSA9IGludGVsX2F0b21pY19nZXRf
Y3J0Y19zdGF0ZShzdGF0ZSwgaW50ZWxfY3J0Yyk7CisJCWlmIChJU19FUlIoY3J0Y19zdGF0ZSkp
IHsKKwkJCURSTV9ERUJVR19LTVMoIkZhaWxlZCB0byBhZGQgW0NSVEM6JWRdIHRvIHN0YXRlOiAl
bGRcbiIsCisJCQkJICAgICAgaW50ZWxfY3J0Yy0+YmFzZS5iYXNlLmlkLAorCQkJCSAgICAgIFBU
Ul9FUlIoY3J0Y19zdGF0ZSkpOworCQkJY29udGludWU7CisJCX0KKworCQljcnRjX3N0YXRlLT5i
YXNlLmVuYWJsZSA9IGludGVsX2NydGMtPm5ld19lbmFibGVkOworCX0KKwogCWludGVsX3NldF9t
b2RlKGNydGMsICZjcnRjLT5tb2RlLCBjcnRjLT54LCBjcnRjLT55LCBjcnRjLT5wcmltYXJ5LT5m
YiwKIAkJICAgICAgIHN0YXRlKTsKIApAQCAtMTI2MDksNiArMTI2MzIsNyBAQCBpbnRlbF9tb2Rl
c2V0X3N0YWdlX291dHB1dF9zdGF0ZShzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LAogCXN0cnVjdCBk
cm1fY29ubmVjdG9yX3N0YXRlICpjb25uZWN0b3Jfc3RhdGU7CiAJc3RydWN0IGludGVsX2VuY29k
ZXIgKmVuY29kZXI7CiAJc3RydWN0IGludGVsX2NydGMgKmNydGM7CisJc3RydWN0IGludGVsX2Ny
dGNfc3RhdGUgKmNydGNfc3RhdGU7CiAJaW50IHJvOwogCiAJLyogVGhlIHVwcGVyIGxheWVycyBl
bnN1cmUgdGhhdCB3ZSBlaXRoZXIgZGlzYWJsZSBhIGNydGMgb3IgaGF2ZSBhIGxpc3QKQEAgLTEy
NzE1LDYgKzEyNzM5LDE0IEBAIGludGVsX21vZGVzZXRfc3RhZ2Vfb3V0cHV0X3N0YXRlKHN0cnVj
dCBkcm1fZGV2aWNlICpkZXYsCiAJCQkJYnJlYWs7CiAJCQl9CiAJCX0KKworCQlpZiAoY3J0Yy0+
bmV3X2VuYWJsZWQgIT0gY3J0Yy0+YmFzZS5zdGF0ZS0+ZW5hYmxlKSB7CisJCQljcnRjX3N0YXRl
ID0gaW50ZWxfYXRvbWljX2dldF9jcnRjX3N0YXRlKHN0YXRlLCBjcnRjKTsKKwkJCWlmIChJU19F
UlIoY3J0Y19zdGF0ZSkpCisJCQkJcmV0dXJuIFBUUl9FUlIoY3J0Y19zdGF0ZSk7CisKKwkJCWNy
dGNfc3RhdGUtPmJhc2UuZW5hYmxlID0gY3J0Yy0+bmV3X2VuYWJsZWQ7CisJCX0KIAl9CiAKIAly
ZXR1cm4gMDsKLS0gCjIuMS4wCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f
X19fX19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVz
a3RvcC5vcmcKaHR0cDovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2lu
dGVsLWdmeAo=