From: Thierry Reding Subject: [PATCH 5/7] vga_switcheroo: Use pr_fmt() Date: Fri, 8 May 2015 12:50:47 +0200 Message-ID: <1431082249-18681-6-git-send-email-thierry.reding@gmail.com> References: <1431082249-18681-1-git-send-email-thierry.reding@gmail.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mail-pd0-f177.google.com (mail-pd0-f177.google.com [209.85.192.177]) by gabe.freedesktop.org (Postfix) with ESMTP id 93CB46E789 for ; Fri, 8 May 2015 03:51:27 -0700 (PDT) Received: by pdbqd1 with SMTP id qd1so76732431pdb.2 for ; Fri, 08 May 2015 03:51:27 -0700 (PDT) In-Reply-To: <1431082249-18681-1-git-send-email-thierry.reding@gmail.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: David Airlie Cc: linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org List-Id: dri-devel@lists.freedesktop.org RnJvbTogVGhpZXJyeSBSZWRpbmcgPHRyZWRpbmdAbnZpZGlhLmNvbT4KClVzZSBwcl9mbXQoKSB0 byBkZWZpbmUgdGhlICJ2Z2Ffc3dpdGNoZXJvbzogIiBwcmVmaXggdGhhdCBpcyBwcmVwZW5kZWQK dG8gYWxsIG91dHB1dCBtZXNzYWdlcyBlbWl0dGVkIGJ5IHByXyooKSBmdW5jdGlvbnMuIFRoaXMg YWxsb3dzIG1ha2luZwpleGlzdGluZyBzdHJpbmdzIG11Y2ggc2hvcnRlciBhbmQgZWxpbWluYXRl cyBhIGJ1bmNoIG9mIHdhcm5pbmdzIGZyb20KY2hlY2twYXRjaCBhYm91dCBsaW5lcyBiZWluZyBv dmVybHkgbG9uZy4KClNpZ25lZC1vZmYtYnk6IFRoaWVycnkgUmVkaW5nIDx0cmVkaW5nQG52aWRp YS5jb20+Ci0tLQogZHJpdmVycy9ncHUvdmdhL3ZnYV9zd2l0Y2hlcm9vLmMgfCAzMSArKysrKysr KysrKysrKysrKystLS0tLS0tLS0tLS0tCiAxIGZpbGUgY2hhbmdlZCwgMTggaW5zZXJ0aW9ucygr KSwgMTMgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvdmdhL3ZnYV9zd2l0 Y2hlcm9vLmMgYi9kcml2ZXJzL2dwdS92Z2EvdmdhX3N3aXRjaGVyb28uYwppbmRleCA2MTBlMmNk NzI1NjMuLmZhYTU3ZTU0NjEzOCAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvdmdhL3ZnYV9zd2l0 Y2hlcm9vLmMKKysrIGIvZHJpdmVycy9ncHUvdmdhL3ZnYV9zd2l0Y2hlcm9vLmMKQEAgLTE3LDYg KzE3LDggQEAKICAqIC0gc3dpdGNoX2NoZWNrICAtIGNoZWNrIGlmIHRoZSBkZXZpY2UgaXMgaW4g YSBwb3NpdGlvbiB0byBzd2l0Y2ggbm93CiAgKi8KIAorI2RlZmluZSBwcl9mbXQoZm10KSAidmdh X3N3aXRjaGVyb286ICIgZm10CisKICNpbmNsdWRlIDxsaW51eC9tb2R1bGUuaD4KICNpbmNsdWRl IDxsaW51eC9zZXFfZmlsZS5oPgogI2luY2x1ZGUgPGxpbnV4L3VhY2Nlc3MuaD4KQEAgLTExMSw3 ICsxMTMsNyBAQCBpbnQgdmdhX3N3aXRjaGVyb29fcmVnaXN0ZXJfaGFuZGxlcihzdHJ1Y3Qgdmdh X3N3aXRjaGVyb29faGFuZGxlciAqaGFuZGxlcikKIAogCXZnYXNyX3ByaXYuaGFuZGxlciA9IGhh bmRsZXI7CiAJaWYgKHZnYV9zd2l0Y2hlcm9vX3JlYWR5KCkpIHsKLQkJcHJfaW5mbygidmdhX3N3 aXRjaGVyb286IGVuYWJsZWRcbiIpOworCQlwcl9pbmZvKCJlbmFibGVkXG4iKTsKIAkJdmdhX3N3 aXRjaGVyb29fZW5hYmxlKCk7CiAJfQogCW11dGV4X3VubG9jaygmdmdhc3JfbXV0ZXgpOwpAQCAt MTI0LDcgKzEyNiw3IEBAIHZvaWQgdmdhX3N3aXRjaGVyb29fdW5yZWdpc3Rlcl9oYW5kbGVyKHZv aWQpCiAJbXV0ZXhfbG9jaygmdmdhc3JfbXV0ZXgpOwogCXZnYXNyX3ByaXYuaGFuZGxlciA9IE5V TEw7CiAJaWYgKHZnYXNyX3ByaXYuYWN0aXZlKSB7Ci0JCXByX2luZm8oInZnYV9zd2l0Y2hlcm9v OiBkaXNhYmxlZFxuIik7CisJCXByX2luZm8oImRpc2FibGVkXG4iKTsKIAkJdmdhX3N3aXRjaGVy b29fZGVidWdmc19maW5pKCZ2Z2Fzcl9wcml2KTsKIAkJdmdhc3JfcHJpdi5hY3RpdmUgPSBmYWxz ZTsKIAl9CkBAIC0xNTUsNyArMTU3LDcgQEAgc3RhdGljIGludCByZWdpc3Rlcl9jbGllbnQoc3Ry dWN0IHBjaV9kZXYgKnBkZXYsCiAJCXZnYXNyX3ByaXYucmVnaXN0ZXJlZF9jbGllbnRzKys7CiAK IAlpZiAodmdhX3N3aXRjaGVyb29fcmVhZHkoKSkgewotCQlwcl9pbmZvKCJ2Z2Ffc3dpdGNoZXJv bzogZW5hYmxlZFxuIik7CisJCXByX2luZm8oImVuYWJsZWRcbiIpOwogCQl2Z2Ffc3dpdGNoZXJv b19lbmFibGUoKTsKIAl9CiAJbXV0ZXhfdW5sb2NrKCZ2Z2Fzcl9tdXRleCk7CkBAIC0yMzUsNyAr MjM3LDcgQEAgdm9pZCB2Z2Ffc3dpdGNoZXJvb191bnJlZ2lzdGVyX2NsaWVudChzdHJ1Y3QgcGNp X2RldiAqcGRldikKIAkJa2ZyZWUoY2xpZW50KTsKIAl9CiAJaWYgKHZnYXNyX3ByaXYuYWN0aXZl ICYmIHZnYXNyX3ByaXYucmVnaXN0ZXJlZF9jbGllbnRzIDwgMikgewotCQlwcl9pbmZvKCJ2Z2Ff c3dpdGNoZXJvbzogZGlzYWJsZWRcbiIpOworCQlwcl9pbmZvKCJkaXNhYmxlZFxuIik7CiAJCXZn YV9zd2l0Y2hlcm9vX2RlYnVnZnNfZmluaSgmdmdhc3JfcHJpdik7CiAJCXZnYXNyX3ByaXYuYWN0 aXZlID0gZmFsc2U7CiAJfQpAQCAtMzc1LDcgKzM3Nyw3IEBAIHN0YXRpYyBib29sIGNoZWNrX2Nh bl9zd2l0Y2godm9pZCkKIAogCWxpc3RfZm9yX2VhY2hfZW50cnkoY2xpZW50LCAmdmdhc3JfcHJp di5jbGllbnRzLCBsaXN0KSB7CiAJCWlmICghY2xpZW50LT5vcHMtPmNhbl9zd2l0Y2goY2xpZW50 LT5wZGV2KSkgewotCQkJcHJfZXJyKCJ2Z2Ffc3dpdGNoZXJvbzogY2xpZW50ICV4IHJlZnVzZWQg c3dpdGNoXG4iLCBjbGllbnQtPmlkKTsKKwkJCXByX2VycigiY2xpZW50ICV4IHJlZnVzZWQgc3dp dGNoXG4iLCBjbGllbnQtPmlkKTsKIAkJCXJldHVybiBmYWxzZTsKIAkJfQogCX0KQEAgLTQ4NCwy MCArNDg2LDIwIEBAIHZnYV9zd2l0Y2hlcm9vX2RlYnVnZnNfd3JpdGUoc3RydWN0IGZpbGUgKmZp bHAsIGNvbnN0IGNoYXIgX191c2VyICp1YnVmLAogCWlmIChjYW5fc3dpdGNoKSB7CiAJCXJldCA9 IHZnYV9zd2l0Y2h0b19zdGFnZTEoY2xpZW50KTsKIAkJaWYgKHJldCkKLQkJCXByX2Vycigidmdh X3N3aXRjaGVyb286IHN3aXRjaGluZyBmYWlsZWQgc3RhZ2UgMSAlZFxuIiwgcmV0KTsKKwkJCXBy X2Vycigic3dpdGNoaW5nIGZhaWxlZCBzdGFnZSAxICVkXG4iLCByZXQpOwogCiAJCXJldCA9IHZn YV9zd2l0Y2h0b19zdGFnZTIoY2xpZW50KTsKIAkJaWYgKHJldCkKLQkJCXByX2VycigidmdhX3N3 aXRjaGVyb286IHN3aXRjaGluZyBmYWlsZWQgc3RhZ2UgMiAlZFxuIiwgcmV0KTsKKwkJCXByX2Vy cigic3dpdGNoaW5nIGZhaWxlZCBzdGFnZSAyICVkXG4iLCByZXQpOwogCiAJfSBlbHNlIHsKLQkJ cHJfaW5mbygidmdhX3N3aXRjaGVyb286IHNldHRpbmcgZGVsYXllZCBzd2l0Y2ggdG8gY2xpZW50 ICVkXG4iLCBjbGllbnQtPmlkKTsKKwkJcHJfaW5mbygic2V0dGluZyBkZWxheWVkIHN3aXRjaCB0 byBjbGllbnQgJWRcbiIsIGNsaWVudC0+aWQpOwogCQl2Z2Fzcl9wcml2LmRlbGF5ZWRfc3dpdGNo X2FjdGl2ZSA9IHRydWU7CiAJCXZnYXNyX3ByaXYuZGVsYXllZF9jbGllbnRfaWQgPSBjbGllbnRf aWQ7CiAKIAkJcmV0ID0gdmdhX3N3aXRjaHRvX3N0YWdlMShjbGllbnQpOwogCQlpZiAocmV0KQot CQkJcHJfZXJyKCJ2Z2Ffc3dpdGNoZXJvbzogZGVsYXllZCBzd2l0Y2hpbmcgc3RhZ2UgMSBmYWls ZWQgJWRcbiIsIHJldCk7CisJCQlwcl9lcnIoImRlbGF5ZWQgc3dpdGNoaW5nIHN0YWdlIDEgZmFp bGVkICVkXG4iLCByZXQpOwogCX0KIAogb3V0OgpAQCAtNTI4LDIwICs1MzAsMjIgQEAgc3RhdGlj IHZvaWQgdmdhX3N3aXRjaGVyb29fZGVidWdmc19maW5pKHN0cnVjdCB2Z2Fzcl9wcml2ICpwcml2 KQogCiBzdGF0aWMgaW50IHZnYV9zd2l0Y2hlcm9vX2RlYnVnZnNfaW5pdChzdHJ1Y3Qgdmdhc3Jf cHJpdiAqcHJpdikKIHsKKwlzdGF0aWMgY29uc3QgY2hhciBtcFtdID0gIi9zeXMva2VybmVsL2Rl YnVnIjsKKwogCS8qIGFscmVhZHkgaW5pdGlhbGlzZWQgKi8KIAlpZiAocHJpdi0+ZGVidWdmc19y b290KQogCQlyZXR1cm4gMDsKIAlwcml2LT5kZWJ1Z2ZzX3Jvb3QgPSBkZWJ1Z2ZzX2NyZWF0ZV9k aXIoInZnYXN3aXRjaGVyb28iLCBOVUxMKTsKIAogCWlmICghcHJpdi0+ZGVidWdmc19yb290KSB7 Ci0JCXByX2VycigidmdhX3N3aXRjaGVyb286IENhbm5vdCBjcmVhdGUgL3N5cy9rZXJuZWwvZGVi dWcvdmdhc3dpdGNoZXJvb1xuIik7CisJCXByX2VycigiQ2Fubm90IGNyZWF0ZSAlcy92Z2Fzd2l0 Y2hlcm9vXG4iLCBtcCk7CiAJCWdvdG8gZmFpbDsKIAl9CiAKIAlwcml2LT5zd2l0Y2hfZmlsZSA9 IGRlYnVnZnNfY3JlYXRlX2ZpbGUoInN3aXRjaCIsIDA2NDQsCiAJCQkJCQlwcml2LT5kZWJ1Z2Zz X3Jvb3QsIE5VTEwsICZ2Z2Ffc3dpdGNoZXJvb19kZWJ1Z2ZzX2ZvcHMpOwogCWlmICghcHJpdi0+ c3dpdGNoX2ZpbGUpIHsKLQkJcHJfZXJyKCJ2Z2Ffc3dpdGNoZXJvbzogY2Fubm90IGNyZWF0ZSAv c3lzL2tlcm5lbC9kZWJ1Zy92Z2Fzd2l0Y2hlcm9vL3N3aXRjaFxuIik7CisJCXByX2VycigiY2Fu bm90IGNyZWF0ZSAlcy92Z2Fzd2l0Y2hlcm9vL3N3aXRjaFxuIiwgbXApOwogCQlnb3RvIGZhaWw7 CiAJfQogCXJldHVybiAwOwpAQCAtNTYwLDcgKzU2NCw4IEBAIGludCB2Z2Ffc3dpdGNoZXJvb19w cm9jZXNzX2RlbGF5ZWRfc3dpdGNoKHZvaWQpCiAJaWYgKCF2Z2Fzcl9wcml2LmRlbGF5ZWRfc3dp dGNoX2FjdGl2ZSkKIAkJZ290byBlcnI7CiAKLQlwcl9pbmZvKCJ2Z2Ffc3dpdGNoZXJvbzogcHJv Y2Vzc2luZyBkZWxheWVkIHN3aXRjaCB0byAlZFxuIiwgdmdhc3JfcHJpdi5kZWxheWVkX2NsaWVu dF9pZCk7CisJcHJfaW5mbygicHJvY2Vzc2luZyBkZWxheWVkIHN3aXRjaCB0byAlZFxuIiwKKwkJ dmdhc3JfcHJpdi5kZWxheWVkX2NsaWVudF9pZCk7CiAKIAljbGllbnQgPSBmaW5kX2NsaWVudF9m cm9tX2lkKCZ2Z2Fzcl9wcml2LmNsaWVudHMsCiAJCQkJICAgICB2Z2Fzcl9wcml2LmRlbGF5ZWRf Y2xpZW50X2lkKTsKQEAgLTU2OSw3ICs1NzQsNyBAQCBpbnQgdmdhX3N3aXRjaGVyb29fcHJvY2Vz c19kZWxheWVkX3N3aXRjaCh2b2lkKQogCiAJcmV0ID0gdmdhX3N3aXRjaHRvX3N0YWdlMihjbGll bnQpOwogCWlmIChyZXQpCi0JCXByX2VycigidmdhX3N3aXRjaGVyb286IGRlbGF5ZWQgc3dpdGNo aW5nIGZhaWxlZCBzdGFnZSAyICVkXG4iLCByZXQpOworCQlwcl9lcnIoImRlbGF5ZWQgc3dpdGNo aW5nIGZhaWxlZCBzdGFnZSAyICVkXG4iLCByZXQpOwogCiAJdmdhc3JfcHJpdi5kZWxheWVkX3N3 aXRjaF9hY3RpdmUgPSBmYWxzZTsKIAllcnIgPSAwOwotLSAKMi4zLjUKCl9fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCmRyaS1kZXZlbCBtYWlsaW5nIGxpc3QK ZHJpLWRldmVsQGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwOi8vbGlzdHMuZnJlZWRlc2t0b3Au b3JnL21haWxtYW4vbGlzdGluZm8vZHJpLWRldmVsCg==