From mboxrd@z Thu Jan 1 00:00:00 1970 From: Imre Deak Subject: [PATCH v3 05/13] drm/i915/gen9: Align line continuations in intel_csr.c. Date: Wed, 28 Oct 2015 23:58:59 +0200 Message-ID: <1446069547-24760-6-git-send-email-imre.deak@intel.com> References: <1446069547-24760-1-git-send-email-imre.deak@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) by gabe.freedesktop.org (Postfix) with ESMTP id C1C5C6EB5C for ; Wed, 28 Oct 2015 14:59:36 -0700 (PDT) In-Reply-To: <1446069547-24760-1-git-send-email-imre.deak@intel.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: Daniel Vetter List-Id: intel-gfx@lists.freedesktop.org RnJvbTogRGFuaWVsIFZldHRlciA8ZGFuaWVsLnZldHRlckBpbnRlbC5jb20+CgpTdGFuZGFyZCBp cyB0byBhbGlnbiBjb250aW51YXRpb25zIG9mIHBhcmFtZXRlciBsaXN0cyBhbmQgaWYKY29uZGl0 aW9ucyB0byB0aGUgb3BlbmluZyAoIGluIGk5MTUgYW5kIGRybSBjb2RlLgoKQXBwbHkgdGhpcyBh Y3Jvc3MgdGhlIGVudGlyZSBmaWxlIHNpbmNlIGl0IHdhcyBzdGlja2luZyBvdXQgYSBiaXQgdG9v Cm11Y2guCgpDYzogRGFtaWVuIExlc3BpYXUgPGRhbWllbi5sZXNwaWF1QGludGVsLmNvbT4KQ2M6 IEltcmUgRGVhayA8aW1yZS5kZWFrQGludGVsLmNvbT4KQ2M6IFN1bmlsIEthbWF0aCA8c3VuaWwu a2FtYXRoQGludGVsLmNvbT4KU2lnbmVkLW9mZi1ieTogRGFuaWVsIFZldHRlciA8ZGFuaWVsLnZl dHRlckBpbnRlbC5jb20+ClNpZ25lZC1vZmYtYnk6IEFuaW1lc2ggTWFubmEgPGFuaW1lc2gubWFu bmFAaW50ZWwuY29tPgpbaW1yZTogcmVtb3ZlZCBub3RlIGFib3V0IHJlZyBkZWZpbml0aW9ucyBm cm9tIHRoZSBjb21taXQgbWVzc2FnZSwgaXQncwogbm90IHJlbGV2YW50IGFueSBtb3JlXQpSZXZp ZXdlZC1ieTogSW1yZSBEZWFrIDxpbXJlLmRlYWtAaW50ZWwuY29tPgotLS0KIGRyaXZlcnMvZ3B1 L2RybS9pOTE1L2ludGVsX2Nzci5jIHwgMzAgKysrKysrKysrKysrKysrLS0tLS0tLS0tLS0tLS0t CiAxIGZpbGUgY2hhbmdlZCwgMTUgaW5zZXJ0aW9ucygrKSwgMTUgZGVsZXRpb25zKC0pCgpkaWZm IC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfY3NyLmMgYi9kcml2ZXJzL2dwdS9k cm0vaTkxNS9pbnRlbF9jc3IuYwppbmRleCBlZGRhZDYyLi40ODllY2ZlIDEwMDY0NAotLS0gYS9k cml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9jc3IuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkx NS9pbnRlbF9jc3IuYwpAQCAtMjM2LDcgKzIzNiw3IEBAIHZvaWQgaW50ZWxfY3NyX2xvYWRfcHJv Z3JhbShzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KQogCiAJZm9yIChpID0gMDsgaSA8IGRldl9wcml2 LT5jc3IubW1pb19jb3VudDsgaSsrKSB7CiAJCUk5MTVfV1JJVEUoZGV2X3ByaXYtPmNzci5tbWlv YWRkcltpXSwKLQkJCWRldl9wcml2LT5jc3IubW1pb2RhdGFbaV0pOworCQkJICAgZGV2X3ByaXYt PmNzci5tbWlvZGF0YVtpXSk7CiAJfQogfQogCkBAIC0yNjYsOSArMjY2LDkgQEAgc3RhdGljIHZv aWQgZmluaXNoX2Nzcl9sb2FkKGNvbnN0IHN0cnVjdCBmaXJtd2FyZSAqZncsIHZvaWQgKmNvbnRl eHQpCiAJLyogRXh0cmFjdCBDU1MgSGVhZGVyIGluZm9ybWF0aW9uKi8KIAljc3NfaGVhZGVyID0g KHN0cnVjdCBpbnRlbF9jc3NfaGVhZGVyICopZnctPmRhdGE7CiAJaWYgKHNpemVvZihzdHJ1Y3Qg aW50ZWxfY3NzX2hlYWRlcikgIT0KLQkJKGNzc19oZWFkZXItPmhlYWRlcl9sZW4gKiA0KSkgewor CSAgICAoY3NzX2hlYWRlci0+aGVhZGVyX2xlbiAqIDQpKSB7CiAJCURSTV9FUlJPUigiRmlybXdh cmUgaGFzIHdyb25nIENTUyBoZWFkZXIgbGVuZ3RoICV1IGJ5dGVzXG4iLAotCQkJKGNzc19oZWFk ZXItPmhlYWRlcl9sZW4gKiA0KSk7CisJCQkgIChjc3NfaGVhZGVyLT5oZWFkZXJfbGVuICogNCkp OwogCQlnb3RvIG91dDsKIAl9CiAKQEAgLTI5MSwxMSArMjkxLDExIEBAIHN0YXRpYyB2b2lkIGZp bmlzaF9jc3JfbG9hZChjb25zdCBzdHJ1Y3QgZmlybXdhcmUgKmZ3LCB2b2lkICpjb250ZXh0KQog CiAJLyogRXh0cmFjdCBQYWNrYWdlIEhlYWRlciBpbmZvcm1hdGlvbiovCiAJcGFja2FnZV9oZWFk ZXIgPSAoc3RydWN0IGludGVsX3BhY2thZ2VfaGVhZGVyICopCi0JCQkJCSZmdy0+ZGF0YVtyZWFk Y291bnRdOworCQkmZnctPmRhdGFbcmVhZGNvdW50XTsKIAlpZiAoc2l6ZW9mKHN0cnVjdCBpbnRl bF9wYWNrYWdlX2hlYWRlcikgIT0KLQkJKHBhY2thZ2VfaGVhZGVyLT5oZWFkZXJfbGVuICogNCkp IHsKKwkgICAgKHBhY2thZ2VfaGVhZGVyLT5oZWFkZXJfbGVuICogNCkpIHsKIAkJRFJNX0VSUk9S KCJGaXJtd2FyZSBoYXMgd3JvbmcgcGFja2FnZSBoZWFkZXIgbGVuZ3RoICV1IGJ5dGVzXG4iLAot CQkJKHBhY2thZ2VfaGVhZGVyLT5oZWFkZXJfbGVuICogNCkpOworCQkJICAocGFja2FnZV9oZWFk ZXItPmhlYWRlcl9sZW4gKiA0KSk7CiAJCWdvdG8gb3V0OwogCX0KIAlyZWFkY291bnQgKz0gc2l6 ZW9mKHN0cnVjdCBpbnRlbF9wYWNrYWdlX2hlYWRlcik7CkBAIC0zMDMsNyArMzAzLDcgQEAgc3Rh dGljIHZvaWQgZmluaXNoX2Nzcl9sb2FkKGNvbnN0IHN0cnVjdCBmaXJtd2FyZSAqZncsIHZvaWQg KmNvbnRleHQpCiAJLyogU2VhcmNoIGZvciBkbWNfb2Zmc2V0IHRvIGZpbmQgZmlyd2FyZSBiaW5h cnkuICovCiAJZm9yIChpID0gMDsgaSA8IHBhY2thZ2VfaGVhZGVyLT5udW1fZW50cmllczsgaSsr KSB7CiAJCWlmIChwYWNrYWdlX2hlYWRlci0+ZndfaW5mb1tpXS5zdWJzdGVwcGluZyA9PSAnKicg JiYKLQkJCXN0ZXBwaW5nID09IHBhY2thZ2VfaGVhZGVyLT5md19pbmZvW2ldLnN0ZXBwaW5nKSB7 CisJCSAgICBzdGVwcGluZyA9PSBwYWNrYWdlX2hlYWRlci0+ZndfaW5mb1tpXS5zdGVwcGluZykg ewogCQkJZG1jX29mZnNldCA9IHBhY2thZ2VfaGVhZGVyLT5md19pbmZvW2ldLm9mZnNldDsKIAkJ CWJyZWFrOwogCQl9IGVsc2UgaWYgKHN0ZXBwaW5nID09IHBhY2thZ2VfaGVhZGVyLT5md19pbmZv W2ldLnN0ZXBwaW5nICYmCkBAIC0zMTEsNyArMzExLDcgQEAgc3RhdGljIHZvaWQgZmluaXNoX2Nz cl9sb2FkKGNvbnN0IHN0cnVjdCBmaXJtd2FyZSAqZncsIHZvaWQgKmNvbnRleHQpCiAJCQlkbWNf b2Zmc2V0ID0gcGFja2FnZV9oZWFkZXItPmZ3X2luZm9baV0ub2Zmc2V0OwogCQkJYnJlYWs7CiAJ CX0gZWxzZSBpZiAocGFja2FnZV9oZWFkZXItPmZ3X2luZm9baV0uc3RlcHBpbmcgPT0gJyonICYm Ci0JCQlwYWNrYWdlX2hlYWRlci0+ZndfaW5mb1tpXS5zdWJzdGVwcGluZyA9PSAnKicpCisJCQkg ICBwYWNrYWdlX2hlYWRlci0+ZndfaW5mb1tpXS5zdWJzdGVwcGluZyA9PSAnKicpCiAJCQlkbWNf b2Zmc2V0ID0gcGFja2FnZV9oZWFkZXItPmZ3X2luZm9baV0ub2Zmc2V0OwogCX0KIAlpZiAoZG1j X29mZnNldCA9PSBDU1JfREVGQVVMVF9GV19PRkZTRVQpIHsKQEAgLTMyNCw3ICszMjQsNyBAQCBz dGF0aWMgdm9pZCBmaW5pc2hfY3NyX2xvYWQoY29uc3Qgc3RydWN0IGZpcm13YXJlICpmdywgdm9p ZCAqY29udGV4dCkKIAlkbWNfaGVhZGVyID0gKHN0cnVjdCBpbnRlbF9kbWNfaGVhZGVyICopJmZ3 LT5kYXRhW3JlYWRjb3VudF07CiAJaWYgKHNpemVvZihzdHJ1Y3QgaW50ZWxfZG1jX2hlYWRlcikg IT0gKGRtY19oZWFkZXItPmhlYWRlcl9sZW4pKSB7CiAJCURSTV9FUlJPUigiRmlybXdhcmUgaGFz IHdyb25nIGRtYyBoZWFkZXIgbGVuZ3RoICV1IGJ5dGVzXG4iLAotCQkJCShkbWNfaGVhZGVyLT5o ZWFkZXJfbGVuKSk7CisJCQkgIChkbWNfaGVhZGVyLT5oZWFkZXJfbGVuKSk7CiAJCWdvdG8gb3V0 OwogCX0KIAlyZWFkY291bnQgKz0gc2l6ZW9mKHN0cnVjdCBpbnRlbF9kbWNfaGVhZGVyKTsKQEAg LTMzMiwxNSArMzMyLDE1IEBAIHN0YXRpYyB2b2lkIGZpbmlzaF9jc3JfbG9hZChjb25zdCBzdHJ1 Y3QgZmlybXdhcmUgKmZ3LCB2b2lkICpjb250ZXh0KQogCS8qIENhY2hlIHRoZSBkbWMgaGVhZGVy IGluZm8uICovCiAJaWYgKGRtY19oZWFkZXItPm1taW9fY291bnQgPiBBUlJBWV9TSVpFKGNzci0+ bW1pb2FkZHIpKSB7CiAJCURSTV9FUlJPUigiRmlybXdhcmUgaGFzIHdyb25nIG1taW8gY291bnQg JXVcbiIsCi0JCQkJCQlkbWNfaGVhZGVyLT5tbWlvX2NvdW50KTsKKwkJCSAgZG1jX2hlYWRlci0+ bW1pb19jb3VudCk7CiAJCWdvdG8gb3V0OwogCX0KIAljc3ItPm1taW9fY291bnQgPSBkbWNfaGVh ZGVyLT5tbWlvX2NvdW50OwogCWZvciAoaSA9IDA7IGkgPCBkbWNfaGVhZGVyLT5tbWlvX2NvdW50 OyBpKyspIHsKIAkJaWYgKGRtY19oZWFkZXItPm1taW9hZGRyW2ldIDwgQ1NSX01NSU9fU1RBUlRf UkFOR0UgfHwKLQkJCWRtY19oZWFkZXItPm1taW9hZGRyW2ldID4gQ1NSX01NSU9fRU5EX1JBTkdF KSB7CisJCSAgICBkbWNfaGVhZGVyLT5tbWlvYWRkcltpXSA+IENTUl9NTUlPX0VORF9SQU5HRSkg ewogCQkJRFJNX0VSUk9SKCIgRmlybXdhcmUgaGFzIHdyb25nIG1taW8gYWRkcmVzcyAweCV4XG4i LAotCQkJCQkJZG1jX2hlYWRlci0+bW1pb2FkZHJbaV0pOworCQkJCSAgZG1jX2hlYWRlci0+bW1p b2FkZHJbaV0pOwogCQkJZ290byBvdXQ7CiAJCX0KIAkJY3NyLT5tbWlvYWRkcltpXSA9IGRtY19o ZWFkZXItPm1taW9hZGRyW2ldOwpAQCAtNDE4LDkgKzQxOCw5IEBAIHZvaWQgaW50ZWxfY3NyX3Vj b2RlX2luaXQoc3RydWN0IGRybV9kZXZpY2UgKmRldikKIAogCS8qIENTUiBzdXBwb3J0ZWQgZm9y IHBsYXRmb3JtLCBsb2FkIGZpcm13YXJlICovCiAJcmV0ID0gcmVxdWVzdF9maXJtd2FyZV9ub3dh aXQoVEhJU19NT0RVTEUsIHRydWUsIGNzci0+ZndfcGF0aCwKLQkJCQkmZGV2X3ByaXYtPmRldi0+ cGRldi0+ZGV2LAotCQkJCUdGUF9LRVJORUwsIGRldl9wcml2LAotCQkJCWZpbmlzaF9jc3JfbG9h ZCk7CisJCQkJICAgICAgJmRldl9wcml2LT5kZXYtPnBkZXYtPmRldiwKKwkJCQkgICAgICBHRlBf S0VSTkVMLCBkZXZfcHJpdiwKKwkJCQkgICAgICBmaW5pc2hfY3NyX2xvYWQpOwogCWlmIChyZXQp CiAJCWk5MTVfZmlybXdhcmVfbG9hZF9lcnJvcl9wcmludChjc3ItPmZ3X3BhdGgsIHJldCk7CiB9 Ci0tIAoyLjEuNAoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3Jn Cmh0dHA6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK