From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ander Conselvan de Oliveira Subject: [PATCH 4/6] drm/i915: Don't use staged config in check_digital_port_conflicts() Date: Thu, 2 Apr 2015 14:47:59 +0300 Message-ID: <1427975281-7688-5-git-send-email-ander.conselvan.de.oliveira@intel.com> References: <1427975281-7688-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 mga01.intel.com (mga01.intel.com [192.55.52.88]) by gabe.freedesktop.org (Postfix) with ESMTP id B65286E9E9 for ; Thu, 2 Apr 2015 04:48:08 -0700 (PDT) In-Reply-To: <1427975281-7688-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 UmVkdWNlIGRlcGVuZGVuY3kgb24gdGhlIHN0YWdlZCBjb25maWcgYnkgdXNpbmcgdGhlIGF0b21p YyBzdGF0ZQppbnN0ZWFkLgoKU2lnbmVkLW9mZi1ieTogQW5kZXIgQ29uc2VsdmFuIGRlIE9saXZl aXJhIDxhbmRlci5jb25zZWx2YW4uZGUub2xpdmVpcmFAaW50ZWwuY29tPgotLS0KIGRyaXZlcnMv Z3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYyB8IDIyICsrKysrKysrKysrKysrLS0tLS0tLS0K IDEgZmlsZSBjaGFuZ2VkLCAxNCBpbnNlcnRpb25zKCspLCA4IGRlbGV0aW9ucygtKQoKZGlmZiAt LWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYyBiL2RyaXZlcnMvZ3B1 L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYwppbmRleCAyMDdjNzEzLi5iMWZiZTlkIDEwMDY0NAot LS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMKKysrIGIvZHJpdmVycy9n cHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jCkBAIC0xMDY1OCwyMyArMTA2NTgsMzAgQEAgc3Rh dGljIGJvb2wgY2hlY2tfZW5jb2Rlcl9jbG9uaW5nKHN0cnVjdCBpbnRlbF9jcnRjICpjcnRjKQog CXJldHVybiB0cnVlOwogfQogCi1zdGF0aWMgYm9vbCBjaGVja19kaWdpdGFsX3BvcnRfY29uZmxp Y3RzKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCitzdGF0aWMgYm9vbCBjaGVja19kaWdpdGFsX3Bv cnRfY29uZmxpY3RzKHN0cnVjdCBkcm1fYXRvbWljX3N0YXRlICpzdGF0ZSkKIHsKLQlzdHJ1Y3Qg aW50ZWxfY29ubmVjdG9yICpjb25uZWN0b3I7CisJc3RydWN0IGRybV9kZXZpY2UgKmRldiA9IHN0 YXRlLT5kZXY7CisJc3RydWN0IGludGVsX2VuY29kZXIgKmVuY29kZXI7CisJc3RydWN0IGRybV9j b25uZWN0b3Jfc3RhdGUgKmNvbm5lY3Rvcl9zdGF0ZTsKIAl1bnNpZ25lZCBpbnQgdXNlZF9wb3J0 cyA9IDA7CisJaW50IGk7CiAKIAkvKgogCSAqIFdhbGsgdGhlIGNvbm5lY3RvciBsaXN0IGluc3Rl YWQgb2YgdGhlIGVuY29kZXIKIAkgKiBsaXN0IHRvIGRldGVjdCB0aGUgcHJvYmxlbSBvbiBkZGkg cGxhdGZvcm1zCiAJICogd2hlcmUgdGhlcmUncyBqdXN0IG9uZSBlbmNvZGVyIHBlciBkaWdpdGFs IHBvcnQuCiAJICovCi0JZm9yX2VhY2hfaW50ZWxfY29ubmVjdG9yKGRldiwgY29ubmVjdG9yKSB7 Ci0JCXN0cnVjdCBpbnRlbF9lbmNvZGVyICplbmNvZGVyID0gY29ubmVjdG9yLT5uZXdfZW5jb2Rl cjsKKwlmb3IgKGkgPSAwOyBpIDwgc3RhdGUtPm51bV9jb25uZWN0b3I7IGkrKykgeworCQlpZiAo IXN0YXRlLT5jb25uZWN0b3JzW2ldKQorCQkJY29udGludWU7CiAKLQkJaWYgKCFlbmNvZGVyKQor CQljb25uZWN0b3Jfc3RhdGUgPSBzdGF0ZS0+Y29ubmVjdG9yX3N0YXRlc1tpXTsKKwkJaWYgKCFj b25uZWN0b3Jfc3RhdGUtPmJlc3RfZW5jb2RlcikKIAkJCWNvbnRpbnVlOwogCi0JCVdBUk5fT04o IWVuY29kZXItPm5ld19jcnRjKTsKKwkJZW5jb2RlciA9IHRvX2ludGVsX2VuY29kZXIoY29ubmVj dG9yX3N0YXRlLT5iZXN0X2VuY29kZXIpOworCisJCVdBUk5fT04oIWNvbm5lY3Rvcl9zdGF0ZS0+ Y3J0Yyk7CiAKIAkJc3dpdGNoIChlbmNvZGVyLT50eXBlKSB7CiAJCQl1bnNpZ25lZCBpbnQgcG9y dF9tYXNrOwpAQCAtMTA3MTYsNyArMTA3MjMsNiBAQCBpbnRlbF9tb2Rlc2V0X3BpcGVfY29uZmln KHN0cnVjdCBkcm1fY3J0YyAqY3J0YywKIAkJCSAgc3RydWN0IGRybV9kaXNwbGF5X21vZGUgKm1v ZGUsCiAJCQkgIHN0cnVjdCBkcm1fYXRvbWljX3N0YXRlICpzdGF0ZSkKIHsKLQlzdHJ1Y3QgZHJt X2RldmljZSAqZGV2ID0gY3J0Yy0+ZGV2OwogCXN0cnVjdCBpbnRlbF9lbmNvZGVyICplbmNvZGVy OwogCXN0cnVjdCBpbnRlbF9jb25uZWN0b3IgKmNvbm5lY3RvcjsKIAlzdHJ1Y3QgZHJtX2Nvbm5l Y3Rvcl9zdGF0ZSAqY29ubmVjdG9yX3N0YXRlOwpAQCAtMTA3MzAsNyArMTA3MzYsNyBAQCBpbnRl bF9tb2Rlc2V0X3BpcGVfY29uZmlnKHN0cnVjdCBkcm1fY3J0YyAqY3J0YywKIAkJcmV0dXJuIEVS Ul9QVFIoLUVJTlZBTCk7CiAJfQogCi0JaWYgKCFjaGVja19kaWdpdGFsX3BvcnRfY29uZmxpY3Rz KGRldikpIHsKKwlpZiAoIWNoZWNrX2RpZ2l0YWxfcG9ydF9jb25mbGljdHMoc3RhdGUpKSB7CiAJ CURSTV9ERUJVR19LTVMoInJlamVjdGluZyBjb25mbGljdGluZyBkaWdpdGFsIHBvcnQgY29uZmln dXJhdGlvblxuIik7CiAJCXJldHVybiBFUlJfUFRSKC1FSU5WQUwpOwogCX0KLS0gCjIuMS4wCgpf X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpJbnRlbC1nZngg bWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cDovL2xpc3Rz LmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeAo=