From mboxrd@z Thu Jan 1 00:00:00 1970 From: Daniel Stone Subject: [RFC PATCH 20/37] DRM: mode: Rename and combine drm_crtc_convert_umode Date: Thu, 19 Mar 2015 04:33:19 +0000 Message-ID: <1426739616-10635-20-git-send-email-daniels@collabora.com> References: <1426739556-10429-1-git-send-email-daniels@collabora.com> <1426739616-10635-1-git-send-email-daniels@collabora.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from bhuna.collabora.co.uk (bhuna.collabora.co.uk [93.93.135.160]) by gabe.freedesktop.org (Postfix) with ESMTP id 5DDD089C93 for ; Wed, 18 Mar 2015 21:33:55 -0700 (PDT) In-Reply-To: <1426739616-10635-1-git-send-email-daniels@collabora.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: dri-devel@lists.freedesktop.org List-Id: dri-devel@lists.freedesktop.org Q2hhbmdlIGRybV9jcnRjX2NvbnZlcnRfdW1vZGUgaW50byBhIGhlbHBlciB3aGljaCBjcmVhdGVz IGEgbmV3IG1vZGUKb2JqZWN0IGFuZCBhbHNvIHBlcmZvcm1zIHZhbGlkYXRpb24uCgpTaWduZWQt b2ZmLWJ5OiBEYW5pZWwgU3RvbmUgPGRhbmllbHNAY29sbGFib3JhLmNvbT4KLS0tCiBkcml2ZXJz L2dwdS9kcm0vZHJtX2NydGMuYyB8IDQwICsrKysrKysrKysrKysrKysrKysrKy0tLS0tLS0tLS0t LS0tLS0tLS0KIDEgZmlsZSBjaGFuZ2VkLCAyMSBpbnNlcnRpb25zKCspLCAxOSBkZWxldGlvbnMo LSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vZHJtX2NydGMuYyBiL2RyaXZlcnMvZ3B1 L2RybS9kcm1fY3J0Yy5jCmluZGV4IGNmNDQ0MDMuLmM3ZWUxNzIgMTAwNjQ0Ci0tLSBhL2RyaXZl cnMvZ3B1L2RybS9kcm1fY3J0Yy5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9kcm1fY3J0Yy5jCkBA IC0xNzQ3LDI0ICsxNzQ3LDMwIEBAIHN0YXRpYyB2b2lkIGRybV9jcnRjX2NvbnZlcnRfdG9fdW1v ZGUoc3RydWN0IGRybV9tb2RlX21vZGVpbmZvICpvdXQsCiB9CiAKIC8qKgotICogZHJtX2NydGNf Y29udmVydF91bW9kZSAtIGNvbnZlcnQgYSBtb2RlaW5mbyBpbnRvIGEgZHJtX2Rpc3BsYXlfbW9k ZQotICogQG91dDogZHJtX2Rpc3BsYXlfbW9kZSB0byByZXR1cm4gdG8gdGhlIHVzZXIKKyAqIGRy bV9tb2RlX25ld19mcm9tX3Vtb2RlIC0gY29udmVydCBhIG1vZGVpbmZvIGludG8gYSBkcm1fZGlz cGxheV9tb2RlCisgKiBAZGV2OiBEUk0gZGV2aWNlIHRvIGNyZWF0ZSBtb2RlIGZvcgogICogQGlu OiBkcm1fbW9kZV9tb2RlaW5mbyB0byB1c2UKICAqCiAgKiBDb252ZXJ0IGEgZHJtX21vZGVfbW9k ZWluZm8gaW50byBhIGRybV9kaXNwbGF5X21vZGUgc3RydWN0dXJlIHRvIHJldHVybiB0bwogICog dGhlIGNhbGxlci4KICAqCiAgKiBSZXR1cm5zOgotICogWmVybyBvbiBzdWNjZXNzLCBuZWdhdGl2 ZSBlcnJubyBvbiBmYWlsdXJlLgorICogTmV3IGRybV9kaXNwbGF5X21vZGUgb24gc3VjY2Vzcywg TlVMTCBvbiBmYWlsdXJlCiAgKi8KLXN0YXRpYyBpbnQgZHJtX2NydGNfY29udmVydF91bW9kZShz dHJ1Y3QgZHJtX2Rpc3BsYXlfbW9kZSAqb3V0LAorc3RhdGljIHN0cnVjdCBkcm1fZGlzcGxheV9t b2RlICpkcm1fbW9kZV9uZXdfZnJvbV91bW9kZShzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LAogCQkJ CSAgY29uc3Qgc3RydWN0IGRybV9tb2RlX21vZGVpbmZvICppbikKIHsKKwlzdHJ1Y3QgZHJtX2Rp c3BsYXlfbW9kZSAqb3V0OworCisJb3V0ID0gZHJtX21vZGVfY3JlYXRlKGRldik7CisJaWYgKCFv dXQpCisJCXJldHVybiBOVUxMOworCiAJaWYgKGluLT5jbG9jayA+IElOVF9NQVggfHwgaW4tPnZy ZWZyZXNoID4gSU5UX01BWCkKLQkJcmV0dXJuIC1FUkFOR0U7CisJCWdvdG8gZXJyOwogCiAJaWYg KChpbi0+ZmxhZ3MgJiBEUk1fTU9ERV9GTEFHXzNEX01BU0spID4gRFJNX01PREVfRkxBR18zRF9N QVgpCi0JCXJldHVybiAtRUlOVkFMOworCQlnb3RvIGVycjsKIAogCW91dC0+Y2xvY2sgPSBpbi0+ Y2xvY2s7CiAJb3V0LT5oZGlzcGxheSA9IGluLT5oZGlzcGxheTsKQEAgLTE3ODMsNyArMTc4OSwx NCBAQCBzdGF0aWMgaW50IGRybV9jcnRjX2NvbnZlcnRfdW1vZGUoc3RydWN0IGRybV9kaXNwbGF5 X21vZGUgKm91dCwKIAlzdHJuY3B5KG91dC0+bmFtZSwgaW4tPm5hbWUsIERSTV9ESVNQTEFZX01P REVfTEVOKTsKIAlvdXQtPm5hbWVbRFJNX0RJU1BMQVlfTU9ERV9MRU4tMV0gPSAwOwogCi0JcmV0 dXJuIDA7CisJb3V0LT5zdGF0dXMgPSBkcm1fbW9kZV92YWxpZGF0ZV9iYXNpYyhvdXQpOworCWlm IChvdXQtPnN0YXR1cyAhPSBNT0RFX09LKQorCQlnb3RvIGVycjsKKworCXJldHVybiBvdXQ7Citl cnI6CisJZHJtX21vZGVfZGVzdHJveShkZXYsIG91dCk7CisJcmV0dXJuIE5VTEw7CiB9CiAKIC8q KgpAQCAtMjc4NSwyMCArMjc5OCw5IEBAIGludCBkcm1fbW9kZV9zZXRjcnRjKHN0cnVjdCBkcm1f ZGV2aWNlICpkZXYsIHZvaWQgKmRhdGEsCiAJCQl9CiAJCX0KIAotCQltb2RlID0gZHJtX21vZGVf Y3JlYXRlKGRldik7CisJCW1vZGUgPSBkcm1fbW9kZV9uZXdfZnJvbV91bW9kZShkZXYsICZjcnRj X3JlcS0+bW9kZSk7CiAJCWlmICghbW9kZSkgewotCQkJcmV0ID0gLUVOT01FTTsKLQkJCWdvdG8g b3V0OwotCQl9Ci0KLQkJcmV0ID0gZHJtX2NydGNfY29udmVydF91bW9kZShtb2RlLCAmY3J0Y19y ZXEtPm1vZGUpOwotCQlpZiAocmV0KSB7CiAJCQlEUk1fREVCVUdfS01TKCJJbnZhbGlkIG1vZGVc biIpOwotCQkJZ290byBvdXQ7Ci0JCX0KLQotCQltb2RlLT5zdGF0dXMgPSBkcm1fbW9kZV92YWxp ZGF0ZV9iYXNpYyhtb2RlKTsKLQkJaWYgKG1vZGUtPnN0YXR1cyAhPSBNT0RFX09LKSB7CiAJCQly ZXQgPSAtRUlOVkFMOwogCQkJZ290byBvdXQ7CiAJCX0KLS0gCjIuMy4yCgpfX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpkcmktZGV2ZWwgbWFpbGluZyBsaXN0 CmRyaS1kZXZlbEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cDovL2xpc3RzLmZyZWVkZXNrdG9w Lm9yZy9tYWlsbWFuL2xpc3RpbmZvL2RyaS1kZXZlbAo=