From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ander Conselvan de Oliveira Subject: [PATCH 13/35] drm/i915: Don't pretend we can calculate multiple pipe_configs Date: Tue, 21 Apr 2015 17:13:02 +0300 Message-ID: <1429625604-22252-14-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: Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) by gabe.freedesktop.org (Postfix) with ESMTP id 8923C6E5D1 for ; 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: , 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 VGhlIGNvZGUgaW4gaW50ZWxfbW9kZXNldF9waXBlX2NvbmZpZygpIHN0aWxsIG5lZWRzIGNoYW5n ZXMgYmVmb3JlIGl0CmNhbiBjYWxjdWxhdGUgbW9yZSB0aGFuIGp1c3Qgb25lIHBpcGVfY29uZmln LCBhbmQgcHJldGVuZGluZyBpdCBjYW4gd2lsbApvbmx5IG1ha2UgdGhvc2UgY2hhbmdlcyBtb3Jl IGRpZmZpY3VsdC4KClNpZ25lZC1vZmYtYnk6IEFuZGVyIENvbnNlbHZhbiBkZSBPbGl2ZWlyYSA8 YW5kZXIuY29uc2VsdmFuLmRlLm9saXZlaXJhQGludGVsLmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9k cm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMgfCA0NSArKysrKysrKysrKysrKystLS0tLS0tLS0tLS0t LS0tLS0tLS0KIDEgZmlsZSBjaGFuZ2VkLCAxOSBpbnNlcnRpb25zKCspLCAyNiBkZWxldGlvbnMo LSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMgYi9k cml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMKaW5kZXggZTZlN2M2My4uZDEyNTNi MSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jCisrKyBi L2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYwpAQCAtMTEzMTAsMzMgKzExMzEw LDI5IEBAIGNsZWFyX2ludGVsX2NydGNfc3RhdGUoc3RydWN0IGludGVsX2NydGNfc3RhdGUgKmNy dGNfc3RhdGUpCiAJY3J0Y19zdGF0ZS0+c2NhbGVyX3N0YXRlID0gc2NhbGVyX3N0YXRlOwogfQog Ci1zdGF0aWMgc3RydWN0IGludGVsX2NydGNfc3RhdGUgKgorc3RhdGljIGludAogaW50ZWxfbW9k ZXNldF9waXBlX2NvbmZpZyhzdHJ1Y3QgZHJtX2NydGMgKmNydGMsCiAJCQkgIHN0cnVjdCBkcm1f ZGlzcGxheV9tb2RlICptb2RlLAotCQkJICBzdHJ1Y3QgZHJtX2F0b21pY19zdGF0ZSAqc3RhdGUp CisJCQkgIHN0cnVjdCBkcm1fYXRvbWljX3N0YXRlICpzdGF0ZSwKKwkJCSAgc3RydWN0IGludGVs X2NydGNfc3RhdGUgKnBpcGVfY29uZmlnKQogewogCXN0cnVjdCBpbnRlbF9lbmNvZGVyICplbmNv ZGVyOwogCXN0cnVjdCBkcm1fY29ubmVjdG9yICpjb25uZWN0b3I7CiAJc3RydWN0IGRybV9jb25u ZWN0b3Jfc3RhdGUgKmNvbm5lY3Rvcl9zdGF0ZTsKLQlzdHJ1Y3QgaW50ZWxfY3J0Y19zdGF0ZSAq cGlwZV9jb25maWc7CiAJaW50IGJhc2VfYnBwLCByZXQgPSAtRUlOVkFMOwogCWludCBpOwogCWJv b2wgcmV0cnkgPSB0cnVlOwogCiAJaWYgKCFjaGVja19lbmNvZGVyX2Nsb25pbmcoc3RhdGUsIHRv X2ludGVsX2NydGMoY3J0YykpKSB7CiAJCURSTV9ERUJVR19LTVMoInJlamVjdGluZyBpbnZhbGlk IGNsb25pbmcgY29uZmlndXJhdGlvblxuIik7Ci0JCXJldHVybiBFUlJfUFRSKC1FSU5WQUwpOwor CQlyZXR1cm4gLUVJTlZBTDsKIAl9CiAKIAlpZiAoIWNoZWNrX2RpZ2l0YWxfcG9ydF9jb25mbGlj dHMoc3RhdGUpKSB7CiAJCURSTV9ERUJVR19LTVMoInJlamVjdGluZyBjb25mbGljdGluZyBkaWdp dGFsIHBvcnQgY29uZmlndXJhdGlvblxuIik7Ci0JCXJldHVybiBFUlJfUFRSKC1FSU5WQUwpOwor CQlyZXR1cm4gLUVJTlZBTDsKIAl9CiAKLQlwaXBlX2NvbmZpZyA9IGludGVsX2F0b21pY19nZXRf Y3J0Y19zdGF0ZShzdGF0ZSwgdG9faW50ZWxfY3J0YyhjcnRjKSk7Ci0JaWYgKElTX0VSUihwaXBl X2NvbmZpZykpCi0JCXJldHVybiBwaXBlX2NvbmZpZzsKLQogCWNsZWFyX2ludGVsX2NydGNfc3Rh dGUocGlwZV9jb25maWcpOwogCiAJcGlwZV9jb25maWctPmJhc2UuY3J0YyA9IGNydGM7CkBAIC0x MTQzMyw5ICsxMTQyOSw5IEBAIGVuY29kZXJfcmV0cnk6CiAJRFJNX0RFQlVHX0tNUygicGxhbmUg YnBwOiAlaSwgcGlwZSBicHA6ICVpLCBkaXRoZXJpbmc6ICVpXG4iLAogCQkgICAgICBiYXNlX2Jw cCwgcGlwZV9jb25maWctPnBpcGVfYnBwLCBwaXBlX2NvbmZpZy0+ZGl0aGVyKTsKIAotCXJldHVy biBwaXBlX2NvbmZpZzsKKwlyZXR1cm4gMDsKIGZhaWw6Ci0JcmV0dXJuIEVSUl9QVFIocmV0KTsK KwlyZXR1cm4gcmV0OwogfQogCiAvKiBDb21wdXRlcyB3aGljaCBjcnRjcyBhcmUgYWZmZWN0ZWQg YW5kIHNldHMgdGhlIHJlbGV2YW50IGJpdHMgaW4gdGhlIG1hc2suIEZvcgpAQCAtMTIxMTYsOSAr MTIxMTIsNyBAQCBpbnRlbF9tb2Rlc2V0X2NvbXB1dGVfY29uZmlnKHN0cnVjdCBkcm1fY3J0YyAq Y3J0YywKIAkJCSAgICAgdW5zaWduZWQgKnByZXBhcmVfcGlwZXMsCiAJCQkgICAgIHVuc2lnbmVk ICpkaXNhYmxlX3BpcGVzKQogewotCXN0cnVjdCBkcm1fZGV2aWNlICpkZXYgPSBjcnRjLT5kZXY7 Ci0Jc3RydWN0IGludGVsX2NydGNfc3RhdGUgKnBpcGVfY29uZmlnID0gTlVMTDsKLQlzdHJ1Y3Qg aW50ZWxfY3J0YyAqaW50ZWxfY3J0YzsKKwlzdHJ1Y3QgaW50ZWxfY3J0Y19zdGF0ZSAqcGlwZV9j b25maWc7CiAJaW50IHJldCA9IDA7CiAKIAlyZXQgPSBkcm1fYXRvbWljX2FkZF9hZmZlY3RlZF9j b25uZWN0b3JzKHN0YXRlLCBjcnRjKTsKQEAgLTEyMTM0LDIxICsxMjEyOCwyMCBAQCBpbnRlbF9t b2Rlc2V0X2NvbXB1dGVfY29uZmlnKHN0cnVjdCBkcm1fY3J0YyAqY3J0YywKIAkgKiAoaS5lLiBv bmUgcGlwZV9jb25maWcgZm9yIGVhY2ggY3J0YykgcmF0aGVyIHRoYW4ganVzdCB0aGUgb25lCiAJ ICogZm9yIHRoaXMgY3J0Yy4KIAkgKi8KLQlmb3JfZWFjaF9pbnRlbF9jcnRjX21hc2tlZChkZXYs ICptb2Rlc2V0X3BpcGVzLCBpbnRlbF9jcnRjKSB7Ci0JCS8qIEZJWE1FOiBGb3Igbm93IHdlIHN0 aWxsIGV4cGVjdCBtb2Rlc2V0X3BpcGVzIGhhcyBhdCBtb3N0Ci0JCSAqIG9uZSBiaXQgc2V0LiAq LwotCQlpZiAoV0FSTl9PTigmaW50ZWxfY3J0Yy0+YmFzZSAhPSBjcnRjKSkKLQkJCWNvbnRpbnVl OworCXBpcGVfY29uZmlnID0gaW50ZWxfYXRvbWljX2dldF9jcnRjX3N0YXRlKHN0YXRlLCB0b19p bnRlbF9jcnRjKGNydGMpKTsKKwlpZiAoSVNfRVJSKHBpcGVfY29uZmlnKSkKKwkJcmV0dXJuIHBp cGVfY29uZmlnOwogCi0JCXBpcGVfY29uZmlnID0gaW50ZWxfbW9kZXNldF9waXBlX2NvbmZpZyhj cnRjLCBtb2RlLCBzdGF0ZSk7Ci0JCWlmIChJU19FUlIocGlwZV9jb25maWcpKQotCQkJcmV0dXJu IHBpcGVfY29uZmlnOworCWlmICghKCptb2Rlc2V0X3BpcGVzICYgKDEgPDwgdG9faW50ZWxfY3J0 YyhjcnRjKS0+cGlwZSkpKQorCQlyZXR1cm4gcGlwZV9jb25maWc7CiAKLQkJaW50ZWxfZHVtcF9w aXBlX2NvbmZpZyh0b19pbnRlbF9jcnRjKGNydGMpLCBwaXBlX2NvbmZpZywKLQkJCQkgICAgICAg Ilttb2Rlc2V0XSIpOwotCX0KKwlyZXQgPSBpbnRlbF9tb2Rlc2V0X3BpcGVfY29uZmlnKGNydGMs IG1vZGUsIHN0YXRlLCBwaXBlX2NvbmZpZyk7CisJaWYgKHJldCkKKwkJcmV0dXJuIEVSUl9QVFIo cmV0KTsKKworCWludGVsX2R1bXBfcGlwZV9jb25maWcodG9faW50ZWxfY3J0YyhjcnRjKSwgcGlw ZV9jb25maWcsIlttb2Rlc2V0XSIpOwogCi0JcmV0dXJuIGludGVsX2F0b21pY19nZXRfY3J0Y19z dGF0ZShzdGF0ZSwgdG9faW50ZWxfY3J0YyhjcnRjKSk7OworCXJldHVybiBwaXBlX2NvbmZpZzsK IH0KIAogc3RhdGljIGludCBfX2ludGVsX3NldF9tb2RlX3NldHVwX3BsbHMoc3RydWN0IGRybV9h dG9taWNfc3RhdGUgKnN0YXRlLAotLSAKMi4xLjAKCl9fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fCkludGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwtZ2Z4QGxp c3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4v bGlzdGluZm8vaW50ZWwtZ2Z4Cg==