From: Brian Starkey Subject: [PATCH i-g-t 7/7] lib/igt_kms: Use kernel command line mode if specified Date: Tue, 25 Apr 2017 17:45:13 +0100 Message-ID: <1493138713-2319-8-git-send-email-brian.starkey@arm.com> References: <1493138713-2319-1-git-send-email-brian.starkey@arm.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from foss.arm.com (foss.arm.com [217.140.101.70]) by gabe.freedesktop.org (Postfix) with ESMTP id 8D2016E5B1 for ; Tue, 25 Apr 2017 16:45:26 +0000 (UTC) In-Reply-To: <1493138713-2319-1-git-send-email-brian.starkey@arm.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: liviu.dudau@arm.com List-Id: intel-gfx@lists.freedesktop.org SWYgInZpZGVvPSIgaXMgc3BlY2lmaWVkIG9uIHRoZSBrZXJuZWwgY29tbWFuZC1saW5lLCB1c2Ug aXQgdG8gb3ZlcnJpZGUKdGhlIGRlZmF1bHQgbW9kZSBpbiBrbXN0ZXN0X2dldF9jb25uZWN0b3Jf ZGVmYXVsdF9tb2RlLgoKSWYgYSBtb2RlIG92ZXJyaWRlIHdhcyBwcm92aWRlZCBvbiB0aGUgY29t bWFuZC1saW5lLCBpdCB3YXMgcHJvYmFibHkgZm9yCmdvb2QgcmVhc29uIHNvIHdlIHNob3VsZCBo b25vciBpdC4KClNpZ25lZC1vZmYtYnk6IEJyaWFuIFN0YXJrZXkgPGJyaWFuLnN0YXJrZXlAYXJt LmNvbT4KLS0tCiBsaWIvaWd0X2ttcy5jIHwgIDEzNSArKysrKysrKysrKysrKysrKysrKysrKysr KysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysKIDEgZmlsZSBjaGFuZ2VkLCAxMzUgaW5z ZXJ0aW9ucygrKQoKZGlmZiAtLWdpdCBhL2xpYi9pZ3Rfa21zLmMgYi9saWIvaWd0X2ttcy5jCmlu ZGV4IDQ3NGFhMDA1YjlmYS4uOTdmODBhNDYzNTRkIDEwMDY0NAotLS0gYS9saWIvaWd0X2ttcy5j CisrKyBiL2xpYi9pZ3Rfa21zLmMKQEAgLTc2Niw2ICs3NjYsMTMxIEBAIHZvaWQga21zdGVzdF9m b3JjZV9lZGlkKGludCBkcm1fZmQsIGRybU1vZGVDb25uZWN0b3IgKmNvbm5lY3RvciwKIAlpZ3Rf YXNzZXJ0KHJldCAhPSAtMSk7CiB9CiAKKy8qCisgKiBFeHRyYWN0IHhyZXMsIHlyZXMsIHJlZnJl c2ggYW5kIGludGVybGFjZWQgZnJvbSBhIHN0cmluZyBvZiB0aGUgZm9ybToKKyAqICAgPHhyZXM+ eDx5cmVzPltNXVtSXVstPGJwcD5dW0A8cmVmcmVzaD5dW2ldW21dW2VEZF0KKyAqIHhyZXMgYW5k IHlyZXMgbXVzdCBiZSBzcGVjaWZpZWQsIHJlZnJlc2ggaXMgb3B0aW9uYWwgYW5kIHdpbGwgYmUg c2V0IHRvCisgKiAtMSBpZiBub3QgcHJlc2VudC4gaW50ZXJsYWNlZCBkZWZhdWx0cyB0byBmYWxz ZS4KKyAqLworc3RhdGljIGludCBwYXJzZV9jbWRsaW5lX21vZGUoY2hhciAqdmlkZW9fc3RyLCB1 bnNpZ25lZCBpbnQgKnhyZXMsCisJCQkgICAgICB1bnNpZ25lZCBpbnQgKnlyZXMsCisJCQkgICAg ICBpbnQgKnJlZnJlc2gsIGJvb2wgKmludGVybGFjZWQpCit7CisJaW50IG1hdGNoLCBsZW4gPSBz dHJsZW4odmlkZW9fc3RyKTsKKwljaGFyICp0b2tlbiA9IHN0cnRvayh2aWRlb19zdHIsICJAIik7 CisKKwlpZiAoIXRva2VuKQorCQlyZXR1cm4gLTE7CisKKwkqaW50ZXJsYWNlZCA9IGZhbHNlOwor CSpyZWZyZXNoID0gLTE7CisKKwltYXRjaCA9IHNzY2FuZih0b2tlbiwgIiVkeCVkIiwgeHJlcywg eXJlcyk7CisJaWYgKG1hdGNoICE9IDIpCisJCXJldHVybiAtMTsKKworCWlmIChzdHJsZW4odG9r ZW4pIDwgbGVuIC0gMSkgeworCQl0b2tlbiArPSBzdHJsZW4odG9rZW4pICsgMTsKKworCQltYXRj aCA9IHNzY2FuZih0b2tlbiwgIiVkIiwgcmVmcmVzaCk7CisJCWlmIChtYXRjaCAhPSAxIHx8ICgq cmVmcmVzaCA8IDApKQorCQkJcmV0dXJuIC0xOworCisJCWlmIChzdHJjaHIodG9rZW4sICdpJykp CisJCQkqaW50ZXJsYWNlZCA9IHRydWU7CisJfQorCisJcmV0dXJuIDA7Cit9CisKK3N0YXRpYyBj b25zdCBkcm1Nb2RlTW9kZUluZm8gKgorY29ubmVjdG9yX21hdGNoX2NtZGxpbmVfbW9kZShjb25z dCBkcm1Nb2RlQ29ubmVjdG9yICpjb25uZWN0b3IsCisJCQkgICAgIHVuc2lnbmVkIGludCB4cmVz LCB1bnNpZ25lZCBpbnQgeXJlcywgaW50IHJlZnJlc2gsCisJCQkgICAgIGJvb2wgaW50ZXJsYWNl ZCkKK3sKKwljb25zdCBkcm1Nb2RlTW9kZUluZm8gKm1vZGUgPSBOVUxMOworCWludCBpOworCisJ Zm9yIChpID0gMDsgaSA8IGNvbm5lY3Rvci0+Y291bnRfbW9kZXM7IGkrKykgeworCQltb2RlID0g JmNvbm5lY3Rvci0+bW9kZXNbaV07CisJCWlmIChtb2RlLT5oZGlzcGxheSA9PSB4cmVzICYmCisJ CSAgICBtb2RlLT52ZGlzcGxheSA9PSB5cmVzICYmCisJCSAgICAocmVmcmVzaCA8IDAgfHwgcmVm cmVzaCA9PSBtb2RlLT52cmVmcmVzaCkgJiYKKwkJICAgIGludGVybGFjZWQgPT0gISEobW9kZS0+ ZmxhZ3MgJiBEUk1fTU9ERV9GTEFHX0lOVEVSTEFDRSkpCisJCQlyZXR1cm4gbW9kZTsKKwl9CisK KwlyZXR1cm4gTlVMTDsKK30KKworc3RhdGljIGNvbnN0IGRybU1vZGVNb2RlSW5mbyAqCitrbXN0 ZXN0X2dldF9jbWRsaW5lX21vZGUoaW50IGRybV9mZCwgZHJtTW9kZUNvbm5lY3RvciAqY29ubmVj dG9yKQoreworCWNoYXIgYywgKnN0ciA9IE5VTEwsICpjdXJzb3IsICpjb25uX25hbWUgPSBOVUxM OworCWNvbnN0IGRybU1vZGVNb2RlSW5mbyAqbW9kZSA9IE5VTEw7CisJdW5zaWduZWQgaW50IHNp emUgPSAwOworCUZJTEUgKmZwID0gTlVMTDsKKworCWZwID0gZm9wZW4oIi9wcm9jL2NtZGxpbmUi LCAiciIpOworCWlmICghZnApCisJCXJldHVybiBOVUxMOworCisJLyogbHNlZWsvZnNlZWsrZnRl bGwvc3RhdCBkb24ndCB3b3JrIG9uIC9wcm9jL2NtZGxpbmUgKi8KKwl3aGlsZSAoZnJlYWQoJmMs IDEsIDEsIGZwKSkKKwkJc2l6ZSsrOworCXJld2luZChmcCk7CisKKwlzdHIgPSBjYWxsb2MoMSwg c2l6ZSArIDEpOworCWlmICghc3RyKQorCQlnb3RvIGRvbmU7CisKKwlpZiAoZnJlYWQoc3RyLCAx LCBzaXplLCBmcCkgIT0gc2l6ZSkKKwkJZ290byBkb25lOworCisJaWYgKCFhc3ByaW50ZigmY29u bl9uYW1lLCAiJXMtJWQ6IiwKKwkJICAgICAga21zdGVzdF9jb25uZWN0b3JfdHlwZV9zdHIoY29u bmVjdG9yLT5jb25uZWN0b3JfdHlwZSksCisJCSAgICAgIGNvbm5lY3Rvci0+Y29ubmVjdG9yX3R5 cGVfaWQpKQorCQlnb3RvIGRvbmU7CisKKwljdXJzb3IgPSBzdHI7CisJd2hpbGUgKChjdXJzb3Ig PSBzdHJzdHIoY3Vyc29yLCAidmlkZW89IikpKSB7CisJCXVuc2lnbmVkIGludCB4cmVzLCB5cmVz OworCQlib29sIGludGVybGFjZWQ7CisJCWludCByZWZyZXNoOworCisJCWN1cnNvciArPSBzdHJs ZW4oInZpZGVvPSIpOworCQljdXJzb3IgPSBzdHJ0b2soY3Vyc29yLCAiIFxuIik7CisJCWlmICgh Y3Vyc29yKQorCQkJYnJlYWs7CisKKwkJLyogU3RyaXAgdGhlIG5hbWUgaWYgaXQgbWF0Y2hlcyBv dXJzICovCisJCWlmICghc3RybmNtcChjdXJzb3IsIGNvbm5fbmFtZSwgc3RybGVuKGNvbm5fbmFt ZSkpKQorCQkJY3Vyc29yICs9IHN0cmxlbihjb25uX25hbWUpOworCisJCS8qCisJCSAqIENvbnNp ZGVyIHRoaXMgInZpZGVvPSIgc3BlY2lmaWNhdGlvbiBvbmx5IGlmIGl0IGhhcyBubworCQkgKiBu YW1lLiBJZiB0aGUgbmFtZSBtYXRjaGVkLCB3ZSB3b3VsZCBoYXZlIGFscmVhZHkgc3RyaXBwZWQg aXQKKwkJICogYWJvdmUKKwkJICovCisJCWlmICghc3Ryc3RyKGN1cnNvciwgIjoiKSAmJgorCQkg ICAgIXBhcnNlX2NtZGxpbmVfbW9kZShjdXJzb3IsICZ4cmVzLCAmeXJlcywgJnJlZnJlc2gsICZp bnRlcmxhY2VkKSkgeworCQkJbW9kZSA9IGNvbm5lY3Rvcl9tYXRjaF9jbWRsaW5lX21vZGUoY29u bmVjdG9yLCB4cmVzLAorCQkJCQkJCSAgICB5cmVzLCByZWZyZXNoLAorCQkJCQkJCSAgICBpbnRl cmxhY2VkKTsKKwkJCWlmIChtb2RlKQorCQkJCWJyZWFrOworCQl9CisKKwkJY3Vyc29yICs9IHN0 cmxlbihjdXJzb3IpICsgMTsKKwl9CisKK2RvbmU6CisJZnJlZShjb25uX25hbWUpOworCWZyZWUo c3RyKTsKKwlmY2xvc2UoZnApOworCXJldHVybiBtb2RlOworfQorCiAvKioKICAqIGttc3Rlc3Rf Z2V0X2Nvbm5lY3Rvcl9kZWZhdWx0X21vZGU6CiAgKiBAZHJtX2ZkOiBEUk0gZmQKQEAgLTc3Myw2 ICs4OTgsOCBAQCB2b2lkIGttc3Rlc3RfZm9yY2VfZWRpZChpbnQgZHJtX2ZkLCBkcm1Nb2RlQ29u bmVjdG9yICpjb25uZWN0b3IsCiAgKiBAbW9kZTogbGliZHJtIG1vZGUKICAqCiAgKiBSZXRyaWV2 ZXMgdGhlIGRlZmF1bHQgbW9kZSBmb3IgQGNvbm5lY3RvciBhbmQgc3RvcmVzIGl0IGluIEBtb2Rl LgorICogSWYgdmlkZW89IGlzIHNwZWNpZmllZCAob3B0aW9uYWxseSBmb3IgdGhpcyBzcGVjaWZp YyBjb25uZWN0b3IpIG9uIHRoZQorICoga2VybmVsIGNvbW1hbmQgbGluZSwgdGhlbiBpdCBpcyB1 c2VkIGFzIHRoZSBkZWZhdWx0LgogICoKICAqIFJldHVybnM6IHRydWUgb24gc3VjY2VzcywgZmFs c2Ugb24gZmFpbHVyZQogICovCkBAIC03ODAsNiArOTA3LDcgQEAgYm9vbCBrbXN0ZXN0X2dldF9j b25uZWN0b3JfZGVmYXVsdF9tb2RlKGludCBkcm1fZmQsIGRybU1vZGVDb25uZWN0b3IgKmNvbm5l Y3RvciwKIAkJCQkJZHJtTW9kZU1vZGVJbmZvICptb2RlKQogewogCWludCBpOworCWNvbnN0IGRy bU1vZGVNb2RlSW5mbyAqY21kbGluZV9tb2RlOwogCiAJaWYgKCFjb25uZWN0b3ItPmNvdW50X21v ZGVzKSB7CiAJCWlndF93YXJuKCJubyBtb2RlcyBmb3IgY29ubmVjdG9yICVkXG4iLApAQCAtNzg3 LDYgKzkxNSwxMyBAQCBib29sIGttc3Rlc3RfZ2V0X2Nvbm5lY3Rvcl9kZWZhdWx0X21vZGUoaW50 IGRybV9mZCwgZHJtTW9kZUNvbm5lY3RvciAqY29ubmVjdG9yLAogCQlyZXR1cm4gZmFsc2U7CiAJ fQogCisJY21kbGluZV9tb2RlID0ga21zdGVzdF9nZXRfY21kbGluZV9tb2RlKGRybV9mZCwgY29u bmVjdG9yKTsKKwlpZiAoY21kbGluZV9tb2RlKSB7CisJCSptb2RlID0gKmNtZGxpbmVfbW9kZTsK KwkJaWd0X2RlYnVnKCJVc2luZyBjbWRsaW5lIG1vZGVcbiIpOworCQlyZXR1cm4gdHJ1ZTsKKwl9 CisKIAlmb3IgKGkgPSAwOyBpIDwgY29ubmVjdG9yLT5jb3VudF9tb2RlczsgaSsrKSB7CiAJCWlm IChpID09IDAgfHwKIAkJICAgIGNvbm5lY3Rvci0+bW9kZXNbaV0udHlwZSAmIERSTV9NT0RFX1RZ UEVfUFJFRkVSUkVEKSB7Ci0tIAoxLjcuOS41CgpfX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0 cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9s aXN0aW5mby9pbnRlbC1nZngK