From: Ander Conselvan de Oliveira Subject: [PATCH 06/11] drm/i915: Add crtc states before calling compute_config() Date: Fri, 10 Apr 2015 11:38:35 +0300 Message-ID: <1428655120-22494-7-git-send-email-ander.conselvan.de.oliveira@intel.com> References: <1428655120-22494-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: Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) by gabe.freedesktop.org (Postfix) with ESMTP id 294456E8E1 for ; Fri, 10 Apr 2015 01:39:15 -0700 (PDT) In-Reply-To: <1428655120-22494-1-git-send-email-ander.conselvan.de.oliveira@intel.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" To: intel-gfx@lists.freedesktop.org Cc: Ander Conselvan de Oliveira List-Id: intel-gfx@lists.freedesktop.org VGhlIGZ1bmN0aW9uIGludGVsX21vZGVzZXRfY29tcHV0ZV9jb25maWcoKSBuZWVkcyB0byBldmVu dHVhbGx5IGJlY29tZQpwYXJ0IG9mIGF0b21pY19jaGVjaygpLiBBdCB0aGF0IHBvaW50LCBhbGwg dGhlIGFmZmVjdGVkIGNydGNzIG5lZWQgdG8gYmUKaW4gdGhlIGF0b21pYyBzdGF0ZSB3aXRoIHRo ZSBuZXcgdmFsdWVzLiBTbyBtb3ZlIHRoZSBsb2dpYyBvZiBhZGRpbmcKY3J0YyBzdGF0ZXMgb3V0 IG9mIHRoYXQgZnVuY3Rpb24uCi0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxh eS5jIHwgNDggKysrKysrKysrKysrKysrKysrKysrKysrKysrKy0tLS0tLS0tCiAxIGZpbGUgY2hh bmdlZCwgMzggaW5zZXJ0aW9ucygrKSwgMTAgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJp dmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUv aW50ZWxfZGlzcGxheS5jCmluZGV4IDcyY2ViNmQuLjIzMmVmNTYgMTAwNjQ0Ci0tLSBhL2RyaXZl cnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkx NS9pbnRlbF9kaXNwbGF5LmMKQEAgLTkxMTEsNiArOTExMSw3IEBAIGJvb2wgaW50ZWxfZ2V0X2xv YWRfZGV0ZWN0X3BpcGUoc3RydWN0IGRybV9jb25uZWN0b3IgKmNvbm5lY3RvciwKIAlzdHJ1Y3Qg ZHJtX21vZGVfY29uZmlnICpjb25maWcgPSAmZGV2LT5tb2RlX2NvbmZpZzsKIAlzdHJ1Y3QgZHJt X2F0b21pY19zdGF0ZSAqc3RhdGUgPSBOVUxMOwogCXN0cnVjdCBkcm1fY29ubmVjdG9yX3N0YXRl ICpjb25uZWN0b3Jfc3RhdGU7CisJc3RydWN0IGludGVsX2NydGNfc3RhdGUgKmNydGNfc3RhdGU7 CiAJaW50IHJldCwgaSA9IC0xOwogCiAJRFJNX0RFQlVHX0tNUygiW0NPTk5FQ1RPUjolZDolc10s IFtFTkNPREVSOiVkOiVzXVxuIiwKQEAgLTkyMDYsNiArOTIwNywxNCBAQCByZXRyeToKIAljb25u ZWN0b3Jfc3RhdGUtPmNydGMgPSBjcnRjOwogCWNvbm5lY3Rvcl9zdGF0ZS0+YmVzdF9lbmNvZGVy ID0gJmludGVsX2VuY29kZXItPmJhc2U7CiAKKwljcnRjX3N0YXRlID0gaW50ZWxfYXRvbWljX2dl dF9jcnRjX3N0YXRlKHN0YXRlLCBpbnRlbF9jcnRjKTsKKwlpZiAoSVNfRVJSKGNydGNfc3RhdGUp KSB7CisJCXJldCA9IFBUUl9FUlIoY3J0Y19zdGF0ZSk7CisJCWdvdG8gZmFpbDsKKwl9CisKKwlj cnRjX3N0YXRlLT5iYXNlLmVuYWJsZSA9IHRydWU7CisKIAlpZiAoIW1vZGUpCiAJCW1vZGUgPSAm bG9hZF9kZXRlY3RfbW9kZTsKIApAQCAtOTI2OCw2ICs5Mjc3LDcgQEAgdm9pZCBpbnRlbF9yZWxl YXNlX2xvYWRfZGV0ZWN0X3BpcGUoc3RydWN0IGRybV9jb25uZWN0b3IgKmNvbm5lY3RvciwKIAlz dHJ1Y3QgaW50ZWxfY3J0YyAqaW50ZWxfY3J0YyA9IHRvX2ludGVsX2NydGMoY3J0Yyk7CiAJc3Ry dWN0IGRybV9hdG9taWNfc3RhdGUgKnN0YXRlOwogCXN0cnVjdCBkcm1fY29ubmVjdG9yX3N0YXRl ICpjb25uZWN0b3Jfc3RhdGU7CisJc3RydWN0IGludGVsX2NydGNfc3RhdGUgKmNydGNfc3RhdGU7 CiAKIAlEUk1fREVCVUdfS01TKCJbQ09OTkVDVE9SOiVkOiVzXSwgW0VOQ09ERVI6JWQ6JXNdXG4i LAogCQkgICAgICBjb25uZWN0b3ItPmJhc2UuaWQsIGNvbm5lY3Rvci0+bmFtZSwKQEAgLTkyODQs NiArOTI5NCwxMCBAQCB2b2lkIGludGVsX3JlbGVhc2VfbG9hZF9kZXRlY3RfcGlwZShzdHJ1Y3Qg ZHJtX2Nvbm5lY3RvciAqY29ubmVjdG9yLAogCQlpZiAoSVNfRVJSKGNvbm5lY3Rvcl9zdGF0ZSkp CiAJCQlnb3RvIGZhaWw7CiAKKwkJY3J0Y19zdGF0ZSA9IGludGVsX2F0b21pY19nZXRfY3J0Y19z dGF0ZShzdGF0ZSwgaW50ZWxfY3J0Yyk7CisJCWlmIChJU19FUlIoY3J0Y19zdGF0ZSkpCisJCQln b3RvIGZhaWw7CisKIAkJdG9faW50ZWxfY29ubmVjdG9yKGNvbm5lY3RvciktPm5ld19lbmNvZGVy ID0gTlVMTDsKIAkJaW50ZWxfZW5jb2Rlci0+bmV3X2NydGMgPSBOVUxMOwogCQlpbnRlbF9jcnRj LT5uZXdfZW5hYmxlZCA9IGZhbHNlOwpAQCAtMTE1NTQsMTQgKzExNTY4LDYgQEAgaW50ZWxfbW9k ZXNldF9jb21wdXRlX2NvbmZpZyhzdHJ1Y3QgZHJtX2NydGMgKmNydGMsCiAJaW50ZWxfbW9kZXNl dF9hZmZlY3RlZF9waXBlcyhjcnRjLCBtb2Rlc2V0X3BpcGVzLAogCQkJCSAgICAgcHJlcGFyZV9w aXBlcywgZGlzYWJsZV9waXBlcyk7CiAKLQlmb3JfZWFjaF9pbnRlbF9jcnRjX21hc2tlZChkZXYs ICpkaXNhYmxlX3BpcGVzLCBpbnRlbF9jcnRjKSB7Ci0JCXBpcGVfY29uZmlnID0gaW50ZWxfYXRv bWljX2dldF9jcnRjX3N0YXRlKHN0YXRlLCBpbnRlbF9jcnRjKTsKLQkJaWYgKElTX0VSUihwaXBl X2NvbmZpZykpCi0JCQlyZXR1cm4gcGlwZV9jb25maWc7Ci0KLQkJcGlwZV9jb25maWctPmJhc2Uu ZW5hYmxlID0gZmFsc2U7Ci0JfQotCiAJLyoKIAkgKiBOb3RlIHRoaXMgbmVlZHMgY2hhbmdlcyB3 aGVuIHdlIHN0YXJ0IHRyYWNraW5nIG11bHRpcGxlIG1vZGVzCiAJICogYW5kIGNydGNzLiAgQXQg dGhhdCBwb2ludCB3ZSdsbCBuZWVkIHRvIGNvbXB1dGUgdGhlIHdob2xlIGNvbmZpZwpAQCAtMTE1 NzgsOCArMTE1ODQsNiBAQCBpbnRlbF9tb2Rlc2V0X2NvbXB1dGVfY29uZmlnKHN0cnVjdCBkcm1f Y3J0YyAqY3J0YywKIAkJaWYgKElTX0VSUihwaXBlX2NvbmZpZykpCiAJCQlyZXR1cm4gcGlwZV9j b25maWc7CiAKLQkJcGlwZV9jb25maWctPmJhc2UuZW5hYmxlID0gdHJ1ZTsKLQogCQlpbnRlbF9k dW1wX3BpcGVfY29uZmlnKHRvX2ludGVsX2NydGMoY3J0YyksIHBpcGVfY29uZmlnLAogCQkJCSAg ICAgICAiW21vZGVzZXRdIik7CiAJfQpAQCAtMTE4MDEsOSArMTE4MDUsMTEgQEAgdm9pZCBpbnRl bF9jcnRjX3Jlc3RvcmVfbW9kZShzdHJ1Y3QgZHJtX2NydGMgKmNydGMpCiB7CiAJc3RydWN0IGRy bV9kZXZpY2UgKmRldiA9IGNydGMtPmRldjsKIAlzdHJ1Y3QgZHJtX2F0b21pY19zdGF0ZSAqc3Rh dGU7CisJc3RydWN0IGludGVsX2NydGMgKmludGVsX2NydGM7CiAJc3RydWN0IGludGVsX2VuY29k ZXIgKmVuY29kZXI7CiAJc3RydWN0IGludGVsX2Nvbm5lY3RvciAqY29ubmVjdG9yOwogCXN0cnVj dCBkcm1fY29ubmVjdG9yX3N0YXRlICpjb25uZWN0b3Jfc3RhdGU7CisJc3RydWN0IGludGVsX2Ny dGNfc3RhdGUgKmNydGNfc3RhdGU7CiAKIAlzdGF0ZSA9IGRybV9hdG9taWNfc3RhdGVfYWxsb2Mo ZGV2KTsKIAlpZiAoIXN0YXRlKSB7CkBAIC0xMTg0MSw2ICsxMTg0NywxOSBAQCB2b2lkIGludGVs X2NydGNfcmVzdG9yZV9tb2RlKHN0cnVjdCBkcm1fY3J0YyAqY3J0YykKIAkJfQogCX0KIAorCWZv cl9lYWNoX2ludGVsX2NydGMoZGV2LCBpbnRlbF9jcnRjKSB7CisJCWlmIChpbnRlbF9jcnRjLT5u ZXdfZW5hYmxlZCA9PSBpbnRlbF9jcnRjLT5iYXNlLmVuYWJsZWQpCisJCQljb250aW51ZTsKKwor CQljcnRjX3N0YXRlID0gaW50ZWxfYXRvbWljX2dldF9jcnRjX3N0YXRlKHN0YXRlLCBpbnRlbF9j cnRjKTsKKwkJaWYgKElTX0VSUihjcnRjX3N0YXRlKSkgeworCQkJRFJNX0RFQlVHX0tNUygiRmFp bGVkIHRvIGFkZCBbQ1JUQzolZF0gdG8gc3RhdGU6ICVsZFxuIiwKKwkJCQkgICAgICBpbnRlbF9j cnRjLT5iYXNlLmJhc2UuaWQsCisJCQkJICAgICAgUFRSX0VSUihjcnRjX3N0YXRlKSk7CisJCQlj b250aW51ZTsKKwkJfQorCX0KKwogCWludGVsX3NldF9tb2RlKGNydGMsICZjcnRjLT5tb2RlLCBj cnRjLT54LCBjcnRjLT55LCBjcnRjLT5wcmltYXJ5LT5mYiwKIAkJICAgICAgIHN0YXRlKTsKIApA QCAtMTIwNDgsNiArMTIwNjcsNyBAQCBpbnRlbF9tb2Rlc2V0X3N0YWdlX291dHB1dF9zdGF0ZShz dHJ1Y3QgZHJtX2RldmljZSAqZGV2LAogCXN0cnVjdCBkcm1fY29ubmVjdG9yX3N0YXRlICpjb25u ZWN0b3Jfc3RhdGU7CiAJc3RydWN0IGludGVsX2VuY29kZXIgKmVuY29kZXI7CiAJc3RydWN0IGlu dGVsX2NydGMgKmNydGM7CisJc3RydWN0IGludGVsX2NydGNfc3RhdGUgKmNydGNfc3RhdGU7CiAJ aW50IHJvOwogCiAJLyogVGhlIHVwcGVyIGxheWVycyBlbnN1cmUgdGhhdCB3ZSBlaXRoZXIgZGlz YWJsZSBhIGNydGMgb3IgaGF2ZSBhIGxpc3QKQEAgLTEyMTU0LDYgKzEyMTc0LDE0IEBAIGludGVs X21vZGVzZXRfc3RhZ2Vfb3V0cHV0X3N0YXRlKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsCiAJCQkJ YnJlYWs7CiAJCQl9CiAJCX0KKworCQlpZiAoY3J0Yy0+bmV3X2VuYWJsZWQgIT0gY3J0Yy0+YmFz ZS5zdGF0ZS0+ZW5hYmxlKSB7CisJCQljcnRjX3N0YXRlID0gaW50ZWxfYXRvbWljX2dldF9jcnRj X3N0YXRlKHN0YXRlLCBjcnRjKTsKKwkJCWlmIChJU19FUlIoY3J0Y19zdGF0ZSkpCisJCQkJcmV0 dXJuIFBUUl9FUlIoY3J0Y19zdGF0ZSk7CisKKwkJCWNydGNfc3RhdGUtPmJhc2UuZW5hYmxlID0g Y3J0Yy0+bmV3X2VuYWJsZWQ7CisJCX0KIAl9CiAKIAlyZXR1cm4gMDsKLS0gCjIuMS4wCgpfX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpJbnRlbC1nZnggbWFp bGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cDovL2xpc3RzLmZy ZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeAo=