From mboxrd@z Thu Jan 1 00:00:00 1970 From: Daniel Stone Subject: [RFC PATCH 08/37] drm: ast: Split register set from get_vbios_mode_info Date: Thu, 19 Mar 2015 04:33:07 +0000 Message-ID: <1426739616-10635-8-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 A98996E951 for ; Wed, 18 Mar 2015 21:33:45 -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 U3BsaXQgdGhlIHJlZ2lzdGVyLXNldHRpbmcgY29tcG9uZW50IG9mIGFzdF9nZXRfdmJpb3NfbW9k ZV9pbmZvIGludG8gYQpzZXBhcmF0ZSBmdW5jdGlvbi4KClNpZ25lZC1vZmYtYnk6IERhbmllbCBT dG9uZSA8ZGFuaWVsc0Bjb2xsYWJvcmEuY29tPgotLS0KIGRyaXZlcnMvZ3B1L2RybS9hc3QvYXN0 X2Rydi5oICB8ICAxICsKIGRyaXZlcnMvZ3B1L2RybS9hc3QvYXN0X21vZGUuYyB8IDcwICsrKysr KysrKysrKysrKysrKysrKysrKystLS0tLS0tLS0tLS0tLS0tLQogMiBmaWxlcyBjaGFuZ2VkLCA0 MyBpbnNlcnRpb25zKCspLCAyOCBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dw dS9kcm0vYXN0L2FzdF9kcnYuaCBiL2RyaXZlcnMvZ3B1L2RybS9hc3QvYXN0X2Rydi5oCmluZGV4 IDg2MjA1YTIuLjRkOGIxNmMgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9hc3QvYXN0X2Ry di5oCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9hc3QvYXN0X2Rydi5oCkBAIC0zMDIsNiArMzAyLDcg QEAgc3RydWN0IGFzdF92Ymlvc19kY2xrX2luZm8gewogc3RydWN0IGFzdF92Ymlvc19tb2RlX2lu Zm8gewogCXN0cnVjdCBhc3RfdmJpb3Nfc3RkdGFibGUgKnN0ZF90YWJsZTsKIAlzdHJ1Y3QgYXN0 X3ZiaW9zX2VuaHRhYmxlICplbmhfdGFibGU7CisJdTMyIGNvbG9yX2luZGV4OwogfTsKIAogZXh0 ZXJuIGludCBhc3RfbW9kZV9pbml0KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpOwpkaWZmIC0tZ2l0 IGEvZHJpdmVycy9ncHUvZHJtL2FzdC9hc3RfbW9kZS5jIGIvZHJpdmVycy9ncHUvZHJtL2FzdC9h c3RfbW9kZS5jCmluZGV4IGI3ZWUyNjMuLmU4YzI0YTUgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1 L2RybS9hc3QvYXN0X21vZGUuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vYXN0L2FzdF9tb2RlLmMK QEAgLTc4LDggKzc4LDcgQEAgc3RhdGljIGJvb2wgYXN0X2dldF92Ymlvc19tb2RlX2luZm8oc3Ry dWN0IGRybV9jcnRjICpjcnRjLCBzdHJ1Y3QgZHJtX2Rpc3BsYXlfbW8KIAkJCQkgICAgc3RydWN0 IGRybV9kaXNwbGF5X21vZGUgKmFkanVzdGVkX21vZGUsCiAJCQkJICAgIHN0cnVjdCBhc3RfdmJp b3NfbW9kZV9pbmZvICp2Ymlvc19tb2RlKQogewotCXN0cnVjdCBhc3RfcHJpdmF0ZSAqYXN0ID0g Y3J0Yy0+ZGV2LT5kZXZfcHJpdmF0ZTsKLQl1MzIgcmVmcmVzaF9yYXRlX2luZGV4ID0gMCwgbW9k ZV9pZCwgY29sb3JfaW5kZXgsIHJlZnJlc2hfcmF0ZTsKKwl1MzIgcmVmcmVzaF9yYXRlX2luZGV4 ID0gMCwgcmVmcmVzaF9yYXRlOwogCXUzMiBoYm9yZGVyLCB2Ym9yZGVyOwogCWJvb2wgY2hlY2tf c3luYzsKIAlzdHJ1Y3QgYXN0X3ZiaW9zX2VuaHRhYmxlICpiZXN0ID0gTlVMTDsKQEAgLTg3LDE2 ICs4NiwxNiBAQCBzdGF0aWMgYm9vbCBhc3RfZ2V0X3ZiaW9zX21vZGVfaW5mbyhzdHJ1Y3QgZHJt X2NydGMgKmNydGMsIHN0cnVjdCBkcm1fZGlzcGxheV9tbwogCXN3aXRjaCAoY3J0Yy0+cHJpbWFy eS0+ZmItPmJpdHNfcGVyX3BpeGVsKSB7CiAJY2FzZSA4OgogCQl2Ymlvc19tb2RlLT5zdGRfdGFi bGUgPSAmdmJpb3Nfc3RkdGFibGVbVkdBTW9kZUluZGV4XTsKLQkJY29sb3JfaW5kZXggPSBWR0FN b2RlSW5kZXggLSAxOworCQl2Ymlvc19tb2RlLT5jb2xvcl9pbmRleCA9IFZHQU1vZGVJbmRleCAt IDE7CiAJCWJyZWFrOwogCWNhc2UgMTY6CiAJCXZiaW9zX21vZGUtPnN0ZF90YWJsZSA9ICZ2Ymlv c19zdGR0YWJsZVtIaUNNb2RlSW5kZXhdOwotCQljb2xvcl9pbmRleCA9IEhpQ01vZGVJbmRleDsK KwkJdmJpb3NfbW9kZS0+Y29sb3JfaW5kZXggPSBIaUNNb2RlSW5kZXg7CiAJCWJyZWFrOwogCWNh c2UgMjQ6CiAJY2FzZSAzMjoKIAkJdmJpb3NfbW9kZS0+c3RkX3RhYmxlID0gJnZiaW9zX3N0ZHRh YmxlW1RydWVDTW9kZUluZGV4XTsKLQkJY29sb3JfaW5kZXggPSBUcnVlQ01vZGVJbmRleDsKKwkJ dmJpb3NfbW9kZS0+Y29sb3JfaW5kZXggPSBUcnVlQ01vZGVJbmRleDsKIAkJYnJlYWs7CiAJZGVm YXVsdDoKIAkJcmV0dXJuIGZhbHNlOwpAQCAtMTk0LDMzICsxOTMsNDUgQEAgc3RhdGljIGJvb2wg YXN0X2dldF92Ymlvc19tb2RlX2luZm8oc3RydWN0IGRybV9jcnRjICpjcnRjLCBzdHJ1Y3QgZHJt X2Rpc3BsYXlfbW8KIAkJCQkJIHZiaW9zX21vZGUtPmVuaF90YWJsZS0+dmZwICsKIAkJCQkJIHZi aW9zX21vZGUtPmVuaF90YWJsZS0+dnN5bmMpOwogCi0JcmVmcmVzaF9yYXRlX2luZGV4ID0gdmJp b3NfbW9kZS0+ZW5oX3RhYmxlLT5yZWZyZXNoX3JhdGVfaW5kZXg7Ci0JbW9kZV9pZCA9IHZiaW9z X21vZGUtPmVuaF90YWJsZS0+bW9kZV9pZDsKLQotCWlmIChhc3QtPmNoaXAgPT0gQVNUMTE4MCkg ewotCQkvKiBUT0RPIDExODAgKi8KLQl9IGVsc2UgewotCQlhc3Rfc2V0X2luZGV4X3JlZyhhc3Qs IEFTVF9JT19DUlRDX1BPUlQsIDB4OGMsICh1OCkoKGNvbG9yX2luZGV4ICYgMHhmKSA8PCA0KSk7 Ci0JCWFzdF9zZXRfaW5kZXhfcmVnKGFzdCwgQVNUX0lPX0NSVENfUE9SVCwgMHg4ZCwgcmVmcmVz aF9yYXRlX2luZGV4ICYgMHhmZik7Ci0JCWFzdF9zZXRfaW5kZXhfcmVnKGFzdCwgQVNUX0lPX0NS VENfUE9SVCwgMHg4ZSwgbW9kZV9pZCAmIDB4ZmYpOwotCi0JCWFzdF9zZXRfaW5kZXhfcmVnKGFz dCwgQVNUX0lPX0NSVENfUE9SVCwgMHg5MSwgMHgwMCk7Ci0JCWlmICh2Ymlvc19tb2RlLT5lbmhf dGFibGUtPmZsYWdzICYgTmV3TW9kZUluZm8pIHsKLQkJCWFzdF9zZXRfaW5kZXhfcmVnKGFzdCwg QVNUX0lPX0NSVENfUE9SVCwgMHg5MSwgMHhhOCk7Ci0JCQlhc3Rfc2V0X2luZGV4X3JlZyhhc3Qs IEFTVF9JT19DUlRDX1BPUlQsIDB4OTIsIGNydGMtPnByaW1hcnktPmZiLT5iaXRzX3Blcl9waXhl bCk7Ci0JCQlhc3Rfc2V0X2luZGV4X3JlZyhhc3QsIEFTVF9JT19DUlRDX1BPUlQsIDB4OTMsIGFk anVzdGVkX21vZGUtPmNsb2NrIC8gMTAwMCk7Ci0JCQlhc3Rfc2V0X2luZGV4X3JlZyhhc3QsIEFT VF9JT19DUlRDX1BPUlQsIDB4OTQsIGFkanVzdGVkX21vZGUtPmNydGNfaGRpc3BsYXkpOwotCQkJ YXN0X3NldF9pbmRleF9yZWcoYXN0LCBBU1RfSU9fQ1JUQ19QT1JULCAweDk1LCBhZGp1c3RlZF9t b2RlLT5jcnRjX2hkaXNwbGF5ID4+IDgpOwotCi0JCQlhc3Rfc2V0X2luZGV4X3JlZyhhc3QsIEFT VF9JT19DUlRDX1BPUlQsIDB4OTYsIGFkanVzdGVkX21vZGUtPmNydGNfdmRpc3BsYXkpOwotCQkJ YXN0X3NldF9pbmRleF9yZWcoYXN0LCBBU1RfSU9fQ1JUQ19QT1JULCAweDk3LCBhZGp1c3RlZF9t b2RlLT5jcnRjX3ZkaXNwbGF5ID4+IDgpOwotCQl9Ci0JfQotCiAJcmV0dXJuIHRydWU7Cit9CisK K3N0YXRpYyB2b2lkIGFzdF9zZXRfcG9ydF9yZWcoc3RydWN0IGRybV9jcnRjICpjcnRjLCBzdHJ1 Y3QgZHJtX2Rpc3BsYXlfbW9kZSAqbW9kZSwKKwkJCSAgICAgc3RydWN0IGFzdF92Ymlvc19tb2Rl X2luZm8gKnZiaW9zX21vZGUpCit7CisJc3RydWN0IGFzdF9wcml2YXRlICphc3QgPSBjcnRjLT5k ZXYtPmRldl9wcml2YXRlOworCXUzMiByZWZyZXNoX3JhdGVfaW5kZXgsIG1vZGVfaWQsIGNvbG9y X2luZGV4OwogCisJaWYgKGFzdC0+Y2hpcCA9PSBBU1QxMTgwKQorCQlyZXR1cm47CiAKKwlyZWZy ZXNoX3JhdGVfaW5kZXggPSB2Ymlvc19tb2RlLT5lbmhfdGFibGUtPnJlZnJlc2hfcmF0ZV9pbmRl eDsKKwltb2RlX2lkID0gdmJpb3NfbW9kZS0+ZW5oX3RhYmxlLT5tb2RlX2lkOworCWNvbG9yX2lu ZGV4ID0gdmJpb3NfbW9kZS0+Y29sb3JfaW5kZXg7CisKKwlhc3Rfc2V0X2luZGV4X3JlZyhhc3Qs IEFTVF9JT19DUlRDX1BPUlQsIDB4OGMsICh1OCkoKGNvbG9yX2luZGV4ICYgMHhmKSA8PCA0KSk7 CisJYXN0X3NldF9pbmRleF9yZWcoYXN0LCBBU1RfSU9fQ1JUQ19QT1JULCAweDhkLCByZWZyZXNo X3JhdGVfaW5kZXggJiAweGZmKTsKKwlhc3Rfc2V0X2luZGV4X3JlZyhhc3QsIEFTVF9JT19DUlRD X1BPUlQsIDB4OGUsIG1vZGVfaWQgJiAweGZmKTsKKworCWFzdF9zZXRfaW5kZXhfcmVnKGFzdCwg QVNUX0lPX0NSVENfUE9SVCwgMHg5MSwgMHgwMCk7CisJaWYgKHZiaW9zX21vZGUtPmVuaF90YWJs ZS0+ZmxhZ3MgJiBOZXdNb2RlSW5mbykgeworCQlhc3Rfc2V0X2luZGV4X3JlZyhhc3QsIEFTVF9J T19DUlRDX1BPUlQsIDB4OTEsIDB4YTgpOworCQlhc3Rfc2V0X2luZGV4X3JlZyhhc3QsIEFTVF9J T19DUlRDX1BPUlQsIDB4OTIsCisJCQkJICBjcnRjLT5wcmltYXJ5LT5mYi0+Yml0c19wZXJfcGl4 ZWwpOworCQlhc3Rfc2V0X2luZGV4X3JlZyhhc3QsIEFTVF9JT19DUlRDX1BPUlQsIDB4OTMsCisJ CQkJICBtb2RlLT5jbG9jayAvIDEwMDApOworCQlhc3Rfc2V0X2luZGV4X3JlZyhhc3QsIEFTVF9J T19DUlRDX1BPUlQsIDB4OTQsCisJCQkJICBtb2RlLT5jcnRjX2hkaXNwbGF5KTsKKwkJYXN0X3Nl dF9pbmRleF9yZWcoYXN0LCBBU1RfSU9fQ1JUQ19QT1JULCAweDk1LAorCQkJCSAgbW9kZS0+Y3J0 Y19oZGlzcGxheSA+PiA4KTsKKworCQlhc3Rfc2V0X2luZGV4X3JlZyhhc3QsIEFTVF9JT19DUlRD X1BPUlQsIDB4OTYsCisJCQkJICBtb2RlLT5jcnRjX3ZkaXNwbGF5KTsKKwkJYXN0X3NldF9pbmRl eF9yZWcoYXN0LCBBU1RfSU9fQ1JUQ19QT1JULCAweDk3LAorCQkJCSAgbW9kZS0+Y3J0Y192ZGlz cGxheSA+PiA4KTsKKwl9CiB9CisKIHN0YXRpYyB2b2lkIGFzdF9zZXRfc3RkX3JlZyhzdHJ1Y3Qg ZHJtX2NydGMgKmNydGMsIHN0cnVjdCBkcm1fZGlzcGxheV9tb2RlICptb2RlLAogCQkJICAgIHN0 cnVjdCBhc3RfdmJpb3NfbW9kZV9pbmZvICp2Ymlvc19tb2RlKQogewpAQCAtNTc5LDYgKzU5MCw5 IEBAIHN0YXRpYyBpbnQgYXN0X2NydGNfbW9kZV9zZXQoc3RydWN0IGRybV9jcnRjICpjcnRjLAog CXJldCA9IGFzdF9nZXRfdmJpb3NfbW9kZV9pbmZvKGNydGMsIG1vZGUsIGFkanVzdGVkX21vZGUs ICZ2Ymlvc19tb2RlKTsKIAlpZiAocmV0ID09IGZhbHNlKQogCQlyZXR1cm4gLUVJTlZBTDsKKwor CWFzdF9zZXRfcG9ydF9yZWcoY3J0YywgYWRqdXN0ZWRfbW9kZSwgJnZiaW9zX21vZGUpOworCiAJ YXN0X29wZW5fa2V5KGFzdCk7CiAKIAlhc3Rfc2V0X2luZGV4X3JlZ19tYXNrKGFzdCwgQVNUX0lP X0NSVENfUE9SVCwgMHhhMSwgMHhmZiwgMHgwNCk7Ci0tIAoyLjMuMgoKX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KZHJpLWRldmVsIG1haWxpbmcgbGlzdApk cmktZGV2ZWxAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHA6Ly9saXN0cy5mcmVlZGVza3RvcC5v cmcvbWFpbG1hbi9saXN0aW5mby9kcmktZGV2ZWwK