From mboxrd@z Thu Jan 1 00:00:00 1970 From: Thierry Reding Subject: [PATCH 3/7] vga_switcheroo: Use pr_*() instead of printk() Date: Fri, 8 May 2015 12:50:45 +0200 Message-ID: <1431082249-18681-4-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-f173.google.com (mail-pd0-f173.google.com [209.85.192.173]) by gabe.freedesktop.org (Postfix) with ESMTP id A2E786E327 for ; Fri, 8 May 2015 03:51:17 -0700 (PDT) Received: by pdea3 with SMTP id a3so77685783pde.3 for ; Fri, 08 May 2015 03:51:17 -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 RnJvbTogVGhpZXJyeSBSZWRpbmcgPHRyZWRpbmdAbnZpZGlhLmNvbT4KClRoaXMgc2lsZW5jZXMg YSBidW5jaCBvZiBjaGVja3BhdGNoIHdhcm5pbmdzIGFuZCBtYWtlcyB0aGUgY29kZSBzaG9ydGVy LgoKU2lnbmVkLW9mZi1ieTogVGhpZXJyeSBSZWRpbmcgPHRyZWRpbmdAbnZpZGlhLmNvbT4KLS0t CiBkcml2ZXJzL2dwdS92Z2EvdmdhX3N3aXRjaGVyb28uYyB8IDI0ICsrKysrKysrKysrKy0tLS0t LS0tLS0tLQogMSBmaWxlIGNoYW5nZWQsIDEyIGluc2VydGlvbnMoKyksIDEyIGRlbGV0aW9ucygt KQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L3ZnYS92Z2Ffc3dpdGNoZXJvby5jIGIvZHJpdmVy cy9ncHUvdmdhL3ZnYV9zd2l0Y2hlcm9vLmMKaW5kZXggMzdhYzdiNWRiZDA2Li4wNjExZWE4YTVj NDkgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L3ZnYS92Z2Ffc3dpdGNoZXJvby5jCisrKyBiL2Ry aXZlcnMvZ3B1L3ZnYS92Z2Ffc3dpdGNoZXJvby5jCkBAIC0xMTEsNyArMTExLDcgQEAgaW50IHZn YV9zd2l0Y2hlcm9vX3JlZ2lzdGVyX2hhbmRsZXIoc3RydWN0IHZnYV9zd2l0Y2hlcm9vX2hhbmRs ZXIgKmhhbmRsZXIpCiAKIAl2Z2Fzcl9wcml2LmhhbmRsZXIgPSBoYW5kbGVyOwogCWlmICh2Z2Ff c3dpdGNoZXJvb19yZWFkeSgpKSB7Ci0JCXByaW50ayhLRVJOX0lORk8gInZnYV9zd2l0Y2hlcm9v OiBlbmFibGVkXG4iKTsKKwkJcHJfaW5mbygidmdhX3N3aXRjaGVyb286IGVuYWJsZWRcbiIpOwog CQl2Z2Ffc3dpdGNoZXJvb19lbmFibGUoKTsKIAl9CiAJbXV0ZXhfdW5sb2NrKCZ2Z2Fzcl9tdXRl eCk7CkBAIC0xNTUsNyArMTU1LDcgQEAgc3RhdGljIGludCByZWdpc3Rlcl9jbGllbnQoc3RydWN0 IHBjaV9kZXYgKnBkZXYsCiAJCXZnYXNyX3ByaXYucmVnaXN0ZXJlZF9jbGllbnRzKys7CiAKIAlp ZiAodmdhX3N3aXRjaGVyb29fcmVhZHkoKSkgewotCQlwcmludGsoS0VSTl9JTkZPICJ2Z2Ffc3dp dGNoZXJvbzogZW5hYmxlZFxuIik7CisJCXByX2luZm8oInZnYV9zd2l0Y2hlcm9vOiBlbmFibGVk XG4iKTsKIAkJdmdhX3N3aXRjaGVyb29fZW5hYmxlKCk7CiAJfQogCW11dGV4X3VubG9jaygmdmdh c3JfbXV0ZXgpOwpAQCAtMjM1LDcgKzIzNSw3IEBAIHZvaWQgdmdhX3N3aXRjaGVyb29fdW5yZWdp c3Rlcl9jbGllbnQoc3RydWN0IHBjaV9kZXYgKnBkZXYpCiAJCWtmcmVlKGNsaWVudCk7CiAJfQog CWlmICh2Z2Fzcl9wcml2LmFjdGl2ZSAmJiB2Z2Fzcl9wcml2LnJlZ2lzdGVyZWRfY2xpZW50cyA8 IDIpIHsKLQkJcHJpbnRrKEtFUk5fSU5GTyAidmdhX3N3aXRjaGVyb286IGRpc2FibGVkXG4iKTsK KwkJcHJfaW5mbygidmdhX3N3aXRjaGVyb286IGRpc2FibGVkXG4iKTsKIAkJdmdhX3N3aXRjaGVy b29fZGVidWdmc19maW5pKCZ2Z2Fzcl9wcml2KTsKIAkJdmdhc3JfcHJpdi5hY3RpdmUgPSBmYWxz ZTsKIAl9CkBAIC0zNzUsNyArMzc1LDcgQEAgc3RhdGljIGJvb2wgY2hlY2tfY2FuX3N3aXRjaCh2 b2lkKQogCiAJbGlzdF9mb3JfZWFjaF9lbnRyeShjbGllbnQsICZ2Z2Fzcl9wcml2LmNsaWVudHMs IGxpc3QpIHsKIAkJaWYgKCFjbGllbnQtPm9wcy0+Y2FuX3N3aXRjaChjbGllbnQtPnBkZXYpKSB7 Ci0JCQlwcmludGsoS0VSTl9FUlIgInZnYV9zd2l0Y2hlcm9vOiBjbGllbnQgJXggcmVmdXNlZCBz d2l0Y2hcbiIsIGNsaWVudC0+aWQpOworCQkJcHJfZXJyKCJ2Z2Ffc3dpdGNoZXJvbzogY2xpZW50 ICV4IHJlZnVzZWQgc3dpdGNoXG4iLCBjbGllbnQtPmlkKTsKIAkJCXJldHVybiBmYWxzZTsKIAkJ fQogCX0KQEAgLTQ4NCwyMCArNDg0LDIwIEBAIHZnYV9zd2l0Y2hlcm9vX2RlYnVnZnNfd3JpdGUo c3RydWN0IGZpbGUgKmZpbHAsIGNvbnN0IGNoYXIgX191c2VyICp1YnVmLAogCWlmIChjYW5fc3dp dGNoKSB7CiAJCXJldCA9IHZnYV9zd2l0Y2h0b19zdGFnZTEoY2xpZW50KTsKIAkJaWYgKHJldCkK LQkJCXByaW50ayhLRVJOX0VSUiAidmdhX3N3aXRjaGVyb286IHN3aXRjaGluZyBmYWlsZWQgc3Rh Z2UgMSAlZFxuIiwgcmV0KTsKKwkJCXByX2VycigidmdhX3N3aXRjaGVyb286IHN3aXRjaGluZyBm YWlsZWQgc3RhZ2UgMSAlZFxuIiwgcmV0KTsKIAogCQlyZXQgPSB2Z2Ffc3dpdGNodG9fc3RhZ2Uy KGNsaWVudCk7CiAJCWlmIChyZXQpCi0JCQlwcmludGsoS0VSTl9FUlIgInZnYV9zd2l0Y2hlcm9v OiBzd2l0Y2hpbmcgZmFpbGVkIHN0YWdlIDIgJWRcbiIsIHJldCk7CisJCQlwcl9lcnIoInZnYV9z d2l0Y2hlcm9vOiBzd2l0Y2hpbmcgZmFpbGVkIHN0YWdlIDIgJWRcbiIsIHJldCk7CiAKIAl9IGVs c2UgewotCQlwcmludGsoS0VSTl9JTkZPICJ2Z2Ffc3dpdGNoZXJvbzogc2V0dGluZyBkZWxheWVk IHN3aXRjaCB0byBjbGllbnQgJWRcbiIsIGNsaWVudC0+aWQpOworCQlwcl9pbmZvKCJ2Z2Ffc3dp dGNoZXJvbzogc2V0dGluZyBkZWxheWVkIHN3aXRjaCB0byBjbGllbnQgJWRcbiIsIGNsaWVudC0+ aWQpOwogCQl2Z2Fzcl9wcml2LmRlbGF5ZWRfc3dpdGNoX2FjdGl2ZSA9IHRydWU7CiAJCXZnYXNy X3ByaXYuZGVsYXllZF9jbGllbnRfaWQgPSBjbGllbnRfaWQ7CiAKIAkJcmV0ID0gdmdhX3N3aXRj aHRvX3N0YWdlMShjbGllbnQpOwogCQlpZiAocmV0KQotCQkJcHJpbnRrKEtFUk5fRVJSICJ2Z2Ff c3dpdGNoZXJvbzogZGVsYXllZCBzd2l0Y2hpbmcgc3RhZ2UgMSBmYWlsZWQgJWRcbiIsIHJldCk7 CisJCQlwcl9lcnIoInZnYV9zd2l0Y2hlcm9vOiBkZWxheWVkIHN3aXRjaGluZyBzdGFnZSAxIGZh aWxlZCAlZFxuIiwgcmV0KTsKIAl9CiAKIG91dDoKQEAgLTUzNCwxNCArNTM0LDE0IEBAIHN0YXRp YyBpbnQgdmdhX3N3aXRjaGVyb29fZGVidWdmc19pbml0KHN0cnVjdCB2Z2Fzcl9wcml2ICpwcml2 KQogCXByaXYtPmRlYnVnZnNfcm9vdCA9IGRlYnVnZnNfY3JlYXRlX2Rpcigidmdhc3dpdGNoZXJv byIsIE5VTEwpOwogCiAJaWYgKCFwcml2LT5kZWJ1Z2ZzX3Jvb3QpIHsKLQkJcHJpbnRrKEtFUk5f RVJSICJ2Z2Ffc3dpdGNoZXJvbzogQ2Fubm90IGNyZWF0ZSAvc3lzL2tlcm5lbC9kZWJ1Zy92Z2Fz d2l0Y2hlcm9vXG4iKTsKKwkJcHJfZXJyKCJ2Z2Ffc3dpdGNoZXJvbzogQ2Fubm90IGNyZWF0ZSAv c3lzL2tlcm5lbC9kZWJ1Zy92Z2Fzd2l0Y2hlcm9vXG4iKTsKIAkJZ290byBmYWlsOwogCX0KIAog CXByaXYtPnN3aXRjaF9maWxlID0gZGVidWdmc19jcmVhdGVfZmlsZSgic3dpdGNoIiwgMDY0NCwK IAkJCQkJCXByaXYtPmRlYnVnZnNfcm9vdCwgTlVMTCwgJnZnYV9zd2l0Y2hlcm9vX2RlYnVnZnNf Zm9wcyk7CiAJaWYgKCFwcml2LT5zd2l0Y2hfZmlsZSkgewotCQlwcmludGsoS0VSTl9FUlIgInZn YV9zd2l0Y2hlcm9vOiBjYW5ub3QgY3JlYXRlIC9zeXMva2VybmVsL2RlYnVnL3ZnYXN3aXRjaGVy b28vc3dpdGNoXG4iKTsKKwkJcHJfZXJyKCJ2Z2Ffc3dpdGNoZXJvbzogY2Fubm90IGNyZWF0ZSAv c3lzL2tlcm5lbC9kZWJ1Zy92Z2Fzd2l0Y2hlcm9vL3N3aXRjaFxuIik7CiAJCWdvdG8gZmFpbDsK IAl9CiAJcmV0dXJuIDA7CkBAIC01NjAsNyArNTYwLDcgQEAgaW50IHZnYV9zd2l0Y2hlcm9vX3By b2Nlc3NfZGVsYXllZF9zd2l0Y2godm9pZCkKIAlpZiAoIXZnYXNyX3ByaXYuZGVsYXllZF9zd2l0 Y2hfYWN0aXZlKQogCQlnb3RvIGVycjsKIAotCXByaW50ayhLRVJOX0lORk8gInZnYV9zd2l0Y2hl cm9vOiBwcm9jZXNzaW5nIGRlbGF5ZWQgc3dpdGNoIHRvICVkXG4iLCB2Z2Fzcl9wcml2LmRlbGF5 ZWRfY2xpZW50X2lkKTsKKwlwcl9pbmZvKCJ2Z2Ffc3dpdGNoZXJvbzogcHJvY2Vzc2luZyBkZWxh eWVkIHN3aXRjaCB0byAlZFxuIiwgdmdhc3JfcHJpdi5kZWxheWVkX2NsaWVudF9pZCk7CiAKIAlj bGllbnQgPSBmaW5kX2NsaWVudF9mcm9tX2lkKCZ2Z2Fzcl9wcml2LmNsaWVudHMsCiAJCQkJICAg ICB2Z2Fzcl9wcml2LmRlbGF5ZWRfY2xpZW50X2lkKTsKQEAgLTU2OSw3ICs1NjksNyBAQCBpbnQg dmdhX3N3aXRjaGVyb29fcHJvY2Vzc19kZWxheWVkX3N3aXRjaCh2b2lkKQogCiAJcmV0ID0gdmdh X3N3aXRjaHRvX3N0YWdlMihjbGllbnQpOwogCWlmIChyZXQpCi0JCXByaW50ayhLRVJOX0VSUiAi dmdhX3N3aXRjaGVyb286IGRlbGF5ZWQgc3dpdGNoaW5nIGZhaWxlZCBzdGFnZSAyICVkXG4iLCBy ZXQpOworCQlwcl9lcnIoInZnYV9zd2l0Y2hlcm9vOiBkZWxheWVkIHN3aXRjaGluZyBmYWlsZWQg c3RhZ2UgMiAlZFxuIiwgcmV0KTsKIAogCXZnYXNyX3ByaXYuZGVsYXllZF9zd2l0Y2hfYWN0aXZl ID0gZmFsc2U7CiAJZXJyID0gMDsKLS0gCjIuMy41CgpfX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fXwpkcmktZGV2ZWwgbWFpbGluZyBsaXN0CmRyaS1kZXZlbEBs aXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cDovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFu L2xpc3RpbmZvL2RyaS1kZXZlbAo=