From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ander Conselvan de Oliveira Subject: [PATCH 18/35] drm/i915: Simplify error handling in __intel_set_mode() Date: Tue, 21 Apr 2015 17:13:07 +0300 Message-ID: <1429625604-22252-19-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 mga03.intel.com (mga03.intel.com [134.134.136.65]) by gabe.freedesktop.org (Postfix) with ESMTP id 1395F6E5DB for ; Tue, 21 Apr 2015 07:13:56 -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 VGhlIHJlbWFpbmluZyBwYXJ0cyBvZiB0aGUgZmFpbHVyZSBwYXRoIGNvdWxkIG9ubHkgYmUgcmVh Y2hlZCBpZiB0aGUKYWxsb2NhdGlvbiBvZiBjcnRjX3N0YXRlX2NvcHkgd291bGQgZmFpbC4gSW4g dGhhdCBjYXNlLCB0aGVyZSBpcyBub3RoaW5nCnRvIHVuZG8sIHNvIGp1c3QgZ2V0IHJpZCBvZiB0 aGUgbGFiZWwgZm9yIGVycm9yIGhhbmRsaW5nIGFuZCByZXR1cm4gYW4KZXJyb3IgY29kZSBpbW1l ZGlhdGVseS4KCldlIGFsc28gYWx3YXlzIGFsbG9jYXRlIGEgcGlwZV9jb25maWcsIGV2ZW4gaWYg dGhlIHBpcGUgaXMgYmVpbmcKZGlzYWJsZWQsIHNvIHRoZSByZW1haW5pbmcgcGFydCBvZiB3aGF0 IHdhcyB0aGUgZXJyb3IvZG9uZSBjYXNlIGNhbiBiZQpzaW1wbGlmaWVkIGEgbGl0dGxlIHRvby4K CnYyOiBJZ25vcmUgcmV0dXJuIHZhbHVlIGZyb20gZHJtX3BsYW5lX2hlbHBlcl91cGRhdGUoKS4g KEFuZGVyKQoKU2lnbmVkLW9mZi1ieTogQW5kZXIgQ29uc2VsdmFuIGRlIE9saXZlaXJhIDxhbmRl ci5jb25zZWx2YW4uZGUub2xpdmVpcmFAaW50ZWwuY29tPgotLS0KIGRyaXZlcnMvZ3B1L2RybS9p OTE1L2ludGVsX2Rpc3BsYXkuYyB8IDMwICsrKysrKysrKysrKy0tLS0tLS0tLS0tLS0tLS0tLQog MSBmaWxlIGNoYW5nZWQsIDEyIGluc2VydGlvbnMoKyksIDE4IGRlbGV0aW9ucygtKQoKZGlmZiAt LWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYyBiL2RyaXZlcnMvZ3B1 L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYwppbmRleCA0NzY3ZmY2Li4wODNjZjIzIDEwMDY0NAot LS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMKKysrIGIvZHJpdmVycy9n cHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jCkBAIC0xMjE5MCwxMCArMTIxOTAsOCBAQCBzdGF0 aWMgaW50IF9faW50ZWxfc2V0X21vZGUoc3RydWN0IGRybV9jcnRjICptb2Rlc2V0X2NydGMsCiAJ CXJldHVybiByZXQ7CiAKIAljcnRjX3N0YXRlX2NvcHkgPSBrbWFsbG9jKHNpemVvZigqY3J0Y19z dGF0ZV9jb3B5KSwgR0ZQX0tFUk5FTCk7Ci0JaWYgKCFjcnRjX3N0YXRlX2NvcHkpIHsKLQkJcmV0 ID0gLUVOT01FTTsKLQkJZ290byBkb25lOwotCX0KKwlpZiAoIWNydGNfc3RhdGVfY29weSkKKwkJ cmV0dXJuIC1FTk9NRU07CiAKIAlmb3JfZWFjaF9jcnRjX2luX3N0YXRlKHN0YXRlLCBjcnRjLCBj cnRjX3N0YXRlLCBpKSB7CiAJCWlmICghbmVlZHNfbW9kZXNldChjcnRjX3N0YXRlKSkKQEAgLTEy MjQ5LDYgKzEyMjQ3LDcgQEAgc3RhdGljIGludCBfX2ludGVsX3NldF9tb2RlKHN0cnVjdCBkcm1f Y3J0YyAqbW9kZXNldF9jcnRjLAogCQkJCQkgICAgICBoZGlzcGxheSwgdmRpc3BsYXksCiAJCQkJ CSAgICAgIHggPDwgMTYsIHkgPDwgMTYsCiAJCQkJCSAgICAgIGhkaXNwbGF5IDw8IDE2LCB2ZGlz cGxheSA8PCAxNik7CisJCVdBUk5fT04ocmV0ICE9IDApOwogCX0KIAogCS8qIE5vdyBlbmFibGUg dGhlIGNsb2NrcywgcGxhbmUsIHBpcGUsIGFuZCBjb25uZWN0b3JzIHRoYXQgd2Ugc2V0IHVwLiAq LwpAQCAtMTIyNjMsMjEgKzEyMjYyLDE2IEBAIHN0YXRpYyBpbnQgX19pbnRlbF9zZXRfbW9kZShz dHJ1Y3QgZHJtX2NydGMgKm1vZGVzZXRfY3J0YywKIAl9CiAKIAkvKiBGSVhNRTogYWRkIHN1YnBp eGVsIG9yZGVyICovCi1kb25lOgotCWlmIChyZXQgPT0gMCAmJiBwaXBlX2NvbmZpZykgewotCQlz dHJ1Y3QgaW50ZWxfY3J0YyAqaW50ZWxfY3J0YyA9IHRvX2ludGVsX2NydGMobW9kZXNldF9jcnRj KTsKLQotCQkvKiBUaGUgcGlwZV9jb25maWcgd2lsbCBiZSBmcmVlZCB3aXRoIHRoZSBhdG9taWMg c3RhdGUsIHNvCi0JCSAqIG1ha2UgYSBjb3B5LiAqLwotCQltZW1jcHkoY3J0Y19zdGF0ZV9jb3B5 LCBpbnRlbF9jcnRjLT5jb25maWcsCi0JCSAgICAgICBzaXplb2YgKmNydGNfc3RhdGVfY29weSk7 Ci0JCWludGVsX2NydGMtPmNvbmZpZyA9IGNydGNfc3RhdGVfY29weTsKLQkJaW50ZWxfY3J0Yy0+ YmFzZS5zdGF0ZSA9ICZjcnRjX3N0YXRlX2NvcHktPmJhc2U7Ci0JfSBlbHNlIHsKLQkJa2ZyZWUo Y3J0Y19zdGF0ZV9jb3B5KTsKLQl9CiAKLQlyZXR1cm4gcmV0OworCWludGVsX2NydGMgPSB0b19p bnRlbF9jcnRjKG1vZGVzZXRfY3J0Yyk7CisKKwkvKiBUaGUgcGlwZV9jb25maWcgd2lsbCBiZSBm cmVlZCB3aXRoIHRoZSBhdG9taWMgc3RhdGUsIHNvCisJICogbWFrZSBhIGNvcHkuICovCisJbWVt Y3B5KGNydGNfc3RhdGVfY29weSwgaW50ZWxfY3J0Yy0+Y29uZmlnLCBzaXplb2YgKmNydGNfc3Rh dGVfY29weSk7CisJaW50ZWxfY3J0Yy0+Y29uZmlnID0gY3J0Y19zdGF0ZV9jb3B5OworCWludGVs X2NydGMtPmJhc2Uuc3RhdGUgPSAmY3J0Y19zdGF0ZV9jb3B5LT5iYXNlOworCisJcmV0dXJuIDA7 CiB9CiAKIHN0YXRpYyBpbnQgaW50ZWxfc2V0X21vZGVfd2l0aF9jb25maWcoc3RydWN0IGRybV9j cnRjICpjcnRjLAotLSAKMi4xLjAKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fCkludGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVk ZXNrdG9wLm9yZwpodHRwOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8v aW50ZWwtZ2Z4Cg==