From mboxrd@z Thu Jan 1 00:00:00 1970 From: Thierry Reding Subject: [PATCH 6/7] vga_switcheroo: Wrap overly long lines Date: Fri, 8 May 2015 12:50:48 +0200 Message-ID: <1431082249-18681-7-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-f181.google.com (mail-pd0-f181.google.com [209.85.192.181]) by gabe.freedesktop.org (Postfix) with ESMTP id C1FEC6E78D for ; Fri, 8 May 2015 03:51:31 -0700 (PDT) Received: by pdbqd1 with SMTP id qd1so76735311pdb.2 for ; Fri, 08 May 2015 03:51:31 -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 RnJvbTogVGhpZXJyeSBSZWRpbmcgPHRyZWRpbmdAbnZpZGlhLmNvbT4KCldyYXAgb3Zlcmx5IGxv bmcgbGluZXMgdG8gbWFrZSBjaGVja3BhdGNoIGhhcHB5LiBXaGlsZSBhdCBpdCwgYWxzbyBhZGQK YmxhbmsgbGluZXMgYWZ0ZXIgZGVjbGFyYXRpb25zIHRvIGVsaW1pbmF0ZSBhZGRpdGlvbmFsIHBy b2JsZW1zIGZsYWdnZWQKYnkgY2hlY2twYXRjaC4KClNpZ25lZC1vZmYtYnk6IFRoaWVycnkgUmVk aW5nIDx0cmVkaW5nQG52aWRpYS5jb20+Ci0tLQogZHJpdmVycy9ncHUvdmdhL3ZnYV9zd2l0Y2hl cm9vLmMgfCAzMyArKysrKysrKysrKysrKysrKysrKysrKystLS0tLS0tLS0KIDEgZmlsZSBjaGFu Z2VkLCAyNCBpbnNlcnRpb25zKCspLCA5IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZl cnMvZ3B1L3ZnYS92Z2Ffc3dpdGNoZXJvby5jIGIvZHJpdmVycy9ncHUvdmdhL3ZnYV9zd2l0Y2hl cm9vLmMKaW5kZXggZmFhNTdlNTQ2MTM4Li5jNzc3MTQ2NjU5NWYgMTAwNjQ0Ci0tLSBhL2RyaXZl cnMvZ3B1L3ZnYS92Z2Ffc3dpdGNoZXJvby5jCisrKyBiL2RyaXZlcnMvZ3B1L3ZnYS92Z2Ffc3dp dGNoZXJvby5jCkBAIC0xNjksNyArMTY5LDggQEAgaW50IHZnYV9zd2l0Y2hlcm9vX3JlZ2lzdGVy X2NsaWVudChzdHJ1Y3QgcGNpX2RldiAqcGRldiwKIAkJCQkgICBib29sIGRyaXZlcl9wb3dlcl9j b250cm9sKQogewogCXJldHVybiByZWdpc3Rlcl9jbGllbnQocGRldiwgb3BzLCAtMSwKLQkJCSAg ICAgICBwZGV2ID09IHZnYV9kZWZhdWx0X2RldmljZSgpLCBkcml2ZXJfcG93ZXJfY29udHJvbCk7 CisJCQkgICAgICAgcGRldiA9PSB2Z2FfZGVmYXVsdF9kZXZpY2UoKSwKKwkJCSAgICAgICBkcml2 ZXJfcG93ZXJfY29udHJvbCk7CiB9CiBFWFBPUlRfU1lNQk9MKHZnYV9zd2l0Y2hlcm9vX3JlZ2lz dGVyX2NsaWVudCk7CiAKQEAgLTE4NSw2ICsxODYsNyBAQCBzdGF0aWMgc3RydWN0IHZnYV9zd2l0 Y2hlcm9vX2NsaWVudCAqCiBmaW5kX2NsaWVudF9mcm9tX3BjaShzdHJ1Y3QgbGlzdF9oZWFkICpo ZWFkLCBzdHJ1Y3QgcGNpX2RldiAqcGRldikKIHsKIAlzdHJ1Y3QgdmdhX3N3aXRjaGVyb29fY2xp ZW50ICpjbGllbnQ7CisKIAlsaXN0X2Zvcl9lYWNoX2VudHJ5KGNsaWVudCwgaGVhZCwgbGlzdCkK IAkJaWYgKGNsaWVudC0+cGRldiA9PSBwZGV2KQogCQkJcmV0dXJuIGNsaWVudDsKQEAgLTE5NSw2 ICsxOTcsNyBAQCBzdGF0aWMgc3RydWN0IHZnYV9zd2l0Y2hlcm9vX2NsaWVudCAqCiBmaW5kX2Ns aWVudF9mcm9tX2lkKHN0cnVjdCBsaXN0X2hlYWQgKmhlYWQsIGludCBjbGllbnRfaWQpCiB7CiAJ c3RydWN0IHZnYV9zd2l0Y2hlcm9vX2NsaWVudCAqY2xpZW50OworCiAJbGlzdF9mb3JfZWFjaF9l bnRyeShjbGllbnQsIGhlYWQsIGxpc3QpCiAJCWlmIChjbGllbnQtPmlkID09IGNsaWVudF9pZCkK IAkJCXJldHVybiBjbGllbnQ7CkBAIC0yMDUsNiArMjA4LDcgQEAgc3RhdGljIHN0cnVjdCB2Z2Ff c3dpdGNoZXJvb19jbGllbnQgKgogZmluZF9hY3RpdmVfY2xpZW50KHN0cnVjdCBsaXN0X2hlYWQg KmhlYWQpCiB7CiAJc3RydWN0IHZnYV9zd2l0Y2hlcm9vX2NsaWVudCAqY2xpZW50OworCiAJbGlz dF9mb3JfZWFjaF9lbnRyeShjbGllbnQsIGhlYWQsIGxpc3QpCiAJCWlmIChjbGllbnQtPmFjdGl2 ZSAmJiBjbGllbnRfaXNfdmdhKGNsaWVudCkpCiAJCQlyZXR1cm4gY2xpZW50OwpAQCAtMjYyLDEw ICsyNjYsMTIgQEAgc3RhdGljIGludCB2Z2Ffc3dpdGNoZXJvb19zaG93KHN0cnVjdCBzZXFfZmls ZSAqbSwgdm9pZCAqdikKIHsKIAlzdHJ1Y3QgdmdhX3N3aXRjaGVyb29fY2xpZW50ICpjbGllbnQ7 CiAJaW50IGkgPSAwOworCiAJbXV0ZXhfbG9jaygmdmdhc3JfbXV0ZXgpOwogCWxpc3RfZm9yX2Vh Y2hfZW50cnkoY2xpZW50LCAmdmdhc3JfcHJpdi5jbGllbnRzLCBsaXN0KSB7CiAJCXNlcV9wcmlu dGYobSwgIiVkOiVzJXM6JWM6JXMlczolc1xuIiwgaSwKLQkJCSAgIGNsaWVudF9pZChjbGllbnQp ID09IFZHQV9TV0lUQ0hFUk9PX0RJUyA/ICJESVMiIDogIklHRCIsCisJCQkgICBjbGllbnRfaWQo Y2xpZW50KSA9PSBWR0FfU1dJVENIRVJPT19ESVMgPyAiRElTIiA6CisJCQkJCQkJCSAgICAgIklH RCIsCiAJCQkgICBjbGllbnRfaXNfdmdhKGNsaWVudCkgPyAiIiA6ICItQXVkaW8iLAogCQkJICAg Y2xpZW50LT5hY3RpdmUgPyAnKycgOiAnICcsCiAJCQkgICBjbGllbnQtPmRyaXZlcl9wb3dlcl9j b250cm9sID8gIkR5biIgOiAiIiwKQEAgLTM0OSw2ICszNTUsNyBAQCBzdGF0aWMgaW50IHZnYV9z d2l0Y2h0b19zdGFnZTIoc3RydWN0IHZnYV9zd2l0Y2hlcm9vX2NsaWVudCAqbmV3X2NsaWVudCkK IAogCWlmIChuZXdfY2xpZW50LT5mYl9pbmZvKSB7CiAJCXN0cnVjdCBmYl9ldmVudCBldmVudDsK KwogCQljb25zb2xlX2xvY2soKTsKIAkJZXZlbnQuaW5mbyA9IG5ld19jbGllbnQtPmZiX2luZm87 CiAJCWZiX25vdGlmaWVyX2NhbGxfY2hhaW4oRkJfRVZFTlRfUkVNQVBfQUxMX0NPTlNPTEUsICZl dmVudCk7CkBAIC01NDMsNyArNTUwLDggQEAgc3RhdGljIGludCB2Z2Ffc3dpdGNoZXJvb19kZWJ1 Z2ZzX2luaXQoc3RydWN0IHZnYXNyX3ByaXYgKnByaXYpCiAJfQogCiAJcHJpdi0+c3dpdGNoX2Zp bGUgPSBkZWJ1Z2ZzX2NyZWF0ZV9maWxlKCJzd2l0Y2giLCAwNjQ0LAotCQkJCQkJcHJpdi0+ZGVi dWdmc19yb290LCBOVUxMLCAmdmdhX3N3aXRjaGVyb29fZGVidWdmc19mb3BzKTsKKwkJCQkJCXBy aXYtPmRlYnVnZnNfcm9vdCwgTlVMTCwKKwkJCQkJCSZ2Z2Ffc3dpdGNoZXJvb19kZWJ1Z2ZzX2Zv cHMpOwogCWlmICghcHJpdi0+c3dpdGNoX2ZpbGUpIHsKIAkJcHJfZXJyKCJjYW5ub3QgY3JlYXRl ICVzL3ZnYXN3aXRjaGVyb28vc3dpdGNoXG4iLCBtcCk7CiAJCWdvdG8gZmFpbDsKQEAgLTU4NCw3 ICs1OTIsOCBAQCBlcnI6CiB9CiBFWFBPUlRfU1lNQk9MKHZnYV9zd2l0Y2hlcm9vX3Byb2Nlc3Nf ZGVsYXllZF9zd2l0Y2gpOwogCi1zdGF0aWMgdm9pZCB2Z2Ffc3dpdGNoZXJvb19wb3dlcl9zd2l0 Y2goc3RydWN0IHBjaV9kZXYgKnBkZXYsIGVudW0gdmdhX3N3aXRjaGVyb29fc3RhdGUgc3RhdGUp CitzdGF0aWMgdm9pZCB2Z2Ffc3dpdGNoZXJvb19wb3dlcl9zd2l0Y2goc3RydWN0IHBjaV9kZXYg KnBkZXYsCisJCQkJCWVudW0gdmdhX3N3aXRjaGVyb29fc3RhdGUgc3RhdGUpCiB7CiAJc3RydWN0 IHZnYV9zd2l0Y2hlcm9vX2NsaWVudCAqY2xpZW50OwogCkBAIC02MDMsNyArNjEyLDggQEAgc3Rh dGljIHZvaWQgdmdhX3N3aXRjaGVyb29fcG93ZXJfc3dpdGNoKHN0cnVjdCBwY2lfZGV2ICpwZGV2 LCBlbnVtIHZnYV9zd2l0Y2hlcm8KIAogLyogZm9yY2UgYSBQQ0kgZGV2aWNlIHRvIGEgY2VydGFp biBzdGF0ZSAtIG1haW5seSB0byB0dXJuIG9mZiBhdWRpbyBjbGllbnRzICovCiAKLXZvaWQgdmdh X3N3aXRjaGVyb29fc2V0X2R5bmFtaWNfc3dpdGNoKHN0cnVjdCBwY2lfZGV2ICpwZGV2LCBlbnVt IHZnYV9zd2l0Y2hlcm9vX3N0YXRlIGR5bmFtaWMpCit2b2lkIHZnYV9zd2l0Y2hlcm9vX3NldF9k eW5hbWljX3N3aXRjaChzdHJ1Y3QgcGNpX2RldiAqcGRldiwKKwkJCQkgICAgICAgZW51bSB2Z2Ff c3dpdGNoZXJvb19zdGF0ZSBkeW5hbWljKQogewogCXN0cnVjdCB2Z2Ffc3dpdGNoZXJvb19jbGll bnQgKmNsaWVudDsKIApAQCAtNjQ5LDcgKzY1OSw4IEBAIHN0YXRpYyBpbnQgdmdhX3N3aXRjaGVy b29fcnVudGltZV9yZXN1bWUoc3RydWN0IGRldmljZSAqZGV2KQogCiAvKiB0aGlzIHZlcnNpb24g aXMgZm9yIHRoZSBjYXNlIHdoZXJlIHRoZSBwb3dlciBzd2l0Y2ggaXMgc2VwYXJhdGUKICAgIHRv IHRoZSBkZXZpY2UgYmVpbmcgcG93ZXJlZCBkb3duLiAqLwotaW50IHZnYV9zd2l0Y2hlcm9vX2lu aXRfZG9tYWluX3BtX29wcyhzdHJ1Y3QgZGV2aWNlICpkZXYsIHN0cnVjdCBkZXZfcG1fZG9tYWlu ICpkb21haW4pCitpbnQgdmdhX3N3aXRjaGVyb29faW5pdF9kb21haW5fcG1fb3BzKHN0cnVjdCBk ZXZpY2UgKmRldiwKKwkJCQkgICAgICBzdHJ1Y3QgZGV2X3BtX2RvbWFpbiAqZG9tYWluKQogewog CS8qIGNvcHkgb3ZlciBhbGwgdGhlIGJ1cyB2ZXJzaW9ucyAqLwogCWlmIChkZXYtPmJ1cyAmJiBk ZXYtPmJ1cy0+cG0pIHsKQEAgLTY4MCw3ICs2OTEsOCBAQCBzdGF0aWMgaW50IHZnYV9zd2l0Y2hl cm9vX3J1bnRpbWVfcmVzdW1lX2hkbWlfYXVkaW8oc3RydWN0IGRldmljZSAqZGV2KQogCS8qIHdl IG5lZWQgdG8gY2hlY2sgaWYgd2UgaGF2ZSB0byBzd2l0Y2ggYmFjayBvbiB0aGUgdmlkZW8KIAkg ICBkZXZpY2Ugc28gdGhlIGF1ZGlvIGRldmljZSBjYW4gY29tZSBiYWNrICovCiAJbGlzdF9mb3Jf ZWFjaF9lbnRyeShjbGllbnQsICZ2Z2Fzcl9wcml2LmNsaWVudHMsIGxpc3QpIHsKLQkJaWYgKFBD SV9TTE9UKGNsaWVudC0+cGRldi0+ZGV2Zm4pID09IFBDSV9TTE9UKHBkZXYtPmRldmZuKSAmJiBj bGllbnRfaXNfdmdhKGNsaWVudCkpIHsKKwkJaWYgKFBDSV9TTE9UKGNsaWVudC0+cGRldi0+ZGV2 Zm4pID09IFBDSV9TTE9UKHBkZXYtPmRldmZuKSAmJgorCQkgICAgY2xpZW50X2lzX3ZnYShjbGll bnQpKSB7CiAJCQlmb3VuZCA9IGNsaWVudDsKIAkJCXJldCA9IHBtX3J1bnRpbWVfZ2V0X3N5bmMo JmNsaWVudC0+cGRldi0+ZGV2KTsKIAkJCWlmIChyZXQpIHsKQEAgLTcwMCwxMiArNzEyLDE1IEBA IHN0YXRpYyBpbnQgdmdhX3N3aXRjaGVyb29fcnVudGltZV9yZXN1bWVfaGRtaV9hdWRpbyhzdHJ1 Y3QgZGV2aWNlICpkZXYpCiAJcmV0dXJuIHJldDsKIH0KIAotaW50IHZnYV9zd2l0Y2hlcm9vX2lu aXRfZG9tYWluX3BtX29wdGltdXNfaGRtaV9hdWRpbyhzdHJ1Y3QgZGV2aWNlICpkZXYsIHN0cnVj dCBkZXZfcG1fZG9tYWluICpkb21haW4pCitpbnQKK3ZnYV9zd2l0Y2hlcm9vX2luaXRfZG9tYWlu X3BtX29wdGltdXNfaGRtaV9hdWRpbyhzdHJ1Y3QgZGV2aWNlICpkZXYsCisJCQkJCQkgc3RydWN0 IGRldl9wbV9kb21haW4gKmRvbWFpbikKIHsKIAkvKiBjb3B5IG92ZXIgYWxsIHRoZSBidXMgdmVy c2lvbnMgKi8KIAlpZiAoZGV2LT5idXMgJiYgZGV2LT5idXMtPnBtKSB7CiAJCWRvbWFpbi0+b3Bz ID0gKmRldi0+YnVzLT5wbTsKLQkJZG9tYWluLT5vcHMucnVudGltZV9yZXN1bWUgPSB2Z2Ffc3dp dGNoZXJvb19ydW50aW1lX3Jlc3VtZV9oZG1pX2F1ZGlvOworCQlkb21haW4tPm9wcy5ydW50aW1l X3Jlc3VtZSA9CisJCQl2Z2Ffc3dpdGNoZXJvb19ydW50aW1lX3Jlc3VtZV9oZG1pX2F1ZGlvOwog CiAJCWRldi0+cG1fZG9tYWluID0gZG9tYWluOwogCQlyZXR1cm4gMDsKLS0gCjIuMy41CgpfX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpkcmktZGV2ZWwgbWFp bGluZyBsaXN0CmRyaS1kZXZlbEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cDovL2xpc3RzLmZy ZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2RyaS1kZXZlbAo=