From: Dave Gordon Subject: [CI-Resend v2 5/6] drm/i915/guc: use for_each_engine_id() where appropriate Date: Fri, 22 Jul 2016 16:15:35 +0100 Message-ID: <1469200537-5279-6-git-send-email-david.s.gordon@intel.com> References: <1469200537-5279-1-git-send-email-david.s.gordon@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) by gabe.freedesktop.org (Postfix) with ESMTP id 6661C6EBD0 for ; Fri, 22 Jul 2016 15:16:15 +0000 (UTC) In-Reply-To: <1469200537-5279-1-git-send-email-david.s.gordon@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 List-Id: intel-gfx@lists.freedesktop.org Tm93IHRoYXQgaG9zdCBzdHJ1Y3R1cmVzIGFyZSBpbmRleGVkIGJ5IGhvc3QgZW5naW5lLWlkIHJh dGhlciB0aGFuCmd1Y19pZCwgd2UgY2FuIHVzZWZ1bGx5IGNvbnZlcnQgc29tZSBmb3JfZWFjaF9l bmdpbmUoKSBsb29wcyB0byB1c2UKZm9yX2VhY2hfZW5naW5lX2lkKCkgYW5kIGF2b2lkIG11bHRp cGxlIGRlcmVmZXJlbmNlcyBvZiBlbmdpbmUtPmlkLgoKQWxzbyBhIGZldyByZWxhdGVkIHR3ZWFr cyB0byBjYWNoZSBzdHJ1Y3R1cmUgbWVtYmVycyBsb2NhbGx5IHdoZXJldmVyCnRoZXkncmUgdXNl ZCBtb3JlIHRoYW4gb25jZSBvciB0d2ljZSwgaG9wZWZ1bGx5IGVsaW1pbmF0aW5nIG1lbW9yeQpy ZWZlcmVuY2VzLgoKU2lnbmVkLW9mZi1ieTogRGF2ZSBHb3Jkb24gPGRhdmlkLnMuZ29yZG9uQGlu dGVsLmNvbT4KUmV2aWV3ZWQtYnk6IFR2cnRrbyBVcnN1bGluIDx0dnJ0a28udXJzdWxpbkBpbnRl bC5jb20+Ci0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kZWJ1Z2ZzLmMgICAgICAgIHwg MTcgKysrKysrKysrLS0tLS0tLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ3VjX3N1Ym1p c3Npb24uYyB8IDIyICsrKysrKysrKysrKystLS0tLS0tLS0KIDIgZmlsZXMgY2hhbmdlZCwgMjIg aW5zZXJ0aW9ucygrKSwgMTcgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUv ZHJtL2k5MTUvaTkxNV9kZWJ1Z2ZzLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2RlYnVn ZnMuYwppbmRleCA3OTNiMWQ5Li4yMTA2NzY2IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0v aTkxNS9pOTE1X2RlYnVnZnMuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2RlYnVn ZnMuYwpAQCAtMjUzNSw2ICsyNTM1LDcgQEAgc3RhdGljIHZvaWQgaTkxNV9ndWNfY2xpZW50X2lu Zm8oc3RydWN0IHNlcV9maWxlICptLAogCQkJCSBzdHJ1Y3QgaTkxNV9ndWNfY2xpZW50ICpjbGll bnQpCiB7CiAJc3RydWN0IGludGVsX2VuZ2luZV9jcyAqZW5naW5lOworCWVudW0gaW50ZWxfZW5n aW5lX2lkIGlkOwogCXVpbnQ2NF90IHRvdCA9IDA7CiAKIAlzZXFfcHJpbnRmKG0sICJcdFByaW9y aXR5ICVkLCBHdUMgY3R4IGluZGV4OiAldSwgUEQgb2Zmc2V0IDB4JXhcbiIsCkBAIC0yNTQ5LDEx ICsyNTUwLDExIEBAIHN0YXRpYyB2b2lkIGk5MTVfZ3VjX2NsaWVudF9pbmZvKHN0cnVjdCBzZXFf ZmlsZSAqbSwKIAlzZXFfcHJpbnRmKG0sICJcdEZhaWxlZCBkb29yYmVsbDogJXVcbiIsIGNsaWVu dC0+Yl9mYWlsKTsKIAlzZXFfcHJpbnRmKG0sICJcdExhc3Qgc3VibWlzc2lvbiByZXN1bHQ6ICVk XG4iLCBjbGllbnQtPnJldGNvZGUpOwogCi0JZm9yX2VhY2hfZW5naW5lKGVuZ2luZSwgZGV2X3By aXYpIHsKKwlmb3JfZWFjaF9lbmdpbmVfaWQoZW5naW5lLCBkZXZfcHJpdiwgaWQpIHsKKwkJdTY0 IHN1Ym1pc3Npb25zID0gY2xpZW50LT5zdWJtaXNzaW9uc1tpZF07CisJCXRvdCArPSBzdWJtaXNz aW9uczsKIAkJc2VxX3ByaW50ZihtLCAiXHRTdWJtaXNzaW9uczogJWxsdSAlc1xuIiwKLQkJCQlj bGllbnQtPnN1Ym1pc3Npb25zW2VuZ2luZS0+aWRdLAotCQkJCWVuZ2luZS0+bmFtZSk7Ci0JCXRv dCArPSBjbGllbnQtPnN1Ym1pc3Npb25zW2VuZ2luZS0+aWRdOworCQkJCXN1Ym1pc3Npb25zLCBl bmdpbmUtPm5hbWUpOwogCX0KIAlzZXFfcHJpbnRmKG0sICJcdFRvdGFsOiAlbGx1XG4iLCB0b3Qp OwogfQpAQCAtMjU5OCwxMSArMjU5OSwxMSBAQCBzdGF0aWMgaW50IGk5MTVfZ3VjX2luZm8oc3Ry dWN0IHNlcV9maWxlICptLCB2b2lkICpkYXRhKQogCXNlcV9wcmludGYobSwgIkd1QyBsYXN0IGFj dGlvbiBlcnJvciBjb2RlOiAlZFxuIiwgZ3VjLmFjdGlvbl9lcnIpOwogCiAJc2VxX3ByaW50Ziht LCAiXG5HdUMgc3VibWlzc2lvbnM6XG4iKTsKLQlmb3JfZWFjaF9lbmdpbmUoZW5naW5lLCBkZXZf cHJpdikgeworCWZvcl9lYWNoX2VuZ2luZV9pZChlbmdpbmUsIGRldl9wcml2LCBpZCkgeworCQl1 NjQgc3VibWlzc2lvbnMgPSBndWMuc3VibWlzc2lvbnNbaWRdOworCQl0b3RhbCArPSBzdWJtaXNz aW9uczsKIAkJc2VxX3ByaW50ZihtLCAiXHQlLTI0czogJTEwbGx1LCBsYXN0IHNlcW5vIDB4JTA4 eFxuIiwKLQkJCWVuZ2luZS0+bmFtZSwgZ3VjLnN1Ym1pc3Npb25zW2VuZ2luZS0+aWRdLAotCQkJ Z3VjLmxhc3Rfc2Vxbm9bZW5naW5lLT5pZF0pOwotCQl0b3RhbCArPSBndWMuc3VibWlzc2lvbnNb ZW5naW5lLT5pZF07CisJCQllbmdpbmUtPm5hbWUsIHN1Ym1pc3Npb25zLCBndWMubGFzdF9zZXFu b1tpZF0pOwogCX0KIAlzZXFfcHJpbnRmKG0sICJcdCVzOiAlbGx1XG4iLCAiVG90YWwiLCB0b3Rh bCk7CiAKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ3VjX3N1Ym1pc3Np b24uYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ3VjX3N1Ym1pc3Npb24uYwppbmRleCA2 NzU2ZGIwLi5lY2UzNDc5IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2d1 Y19zdWJtaXNzaW9uLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9ndWNfc3VibWlz c2lvbi5jCkBAIC0zNDIsNyArMzQyLDggQEAgc3RhdGljIHZvaWQgZ3VjX2luaXRfY3R4X2Rlc2Mo c3RydWN0IGludGVsX2d1YyAqZ3VjLAogCiAJZm9yX2VhY2hfZW5naW5lX21hc2tlZChlbmdpbmUs IGRldl9wcml2LCBjbGllbnQtPmVuZ2luZXMpIHsKIAkJc3RydWN0IGludGVsX2NvbnRleHQgKmNl ID0gJmN0eC0+ZW5naW5lW2VuZ2luZS0+aWRdOwotCQlzdHJ1Y3QgZ3VjX2V4ZWNsaXN0X2NvbnRl eHQgKmxyYyA9ICZkZXNjLmxyY1tlbmdpbmUtPmd1Y19pZF07CisJCXVpbnQzMl90IGd1Y19lbmdp bmVfaWQgPSBlbmdpbmUtPmd1Y19pZDsKKwkJc3RydWN0IGd1Y19leGVjbGlzdF9jb250ZXh0ICps cmMgPSAmZGVzYy5scmNbZ3VjX2VuZ2luZV9pZF07CiAJCXN0cnVjdCBkcm1faTkxNV9nZW1fb2Jq ZWN0ICpvYmo7CiAKIAkJLyogVE9ETzogV2UgaGF2ZSBhIGRlc2lnbiBpc3N1ZSB0byBiZSBzb2x2 ZWQgaGVyZS4gT25seSB3aGVuIHdlCkBAIC0zNjEsNyArMzYyLDcgQEAgc3RhdGljIHZvaWQgZ3Vj X2luaXRfY3R4X2Rlc2Moc3RydWN0IGludGVsX2d1YyAqZ3VjLAogCQlnZnhfYWRkciA9IGk5MTVf Z2VtX29ial9nZ3R0X29mZnNldChjZS0+c3RhdGUpOwogCQlscmMtPnJpbmdfbGNyYSA9IGdmeF9h ZGRyICsgTFJDX1NUQVRFX1BOICogUEFHRV9TSVpFOwogCQlscmMtPmNvbnRleHRfaWQgPSAoY2xp ZW50LT5jdHhfaW5kZXggPDwgR1VDX0VMQ19DVFhJRF9PRkZTRVQpIHwKLQkJCQkoZW5naW5lLT5n dWNfaWQgPDwgR1VDX0VMQ19FTkdJTkVfT0ZGU0VUKTsKKwkJCQkoZ3VjX2VuZ2luZV9pZCA8PCBH VUNfRUxDX0VOR0lORV9PRkZTRVQpOwogCiAJCW9iaiA9IGNlLT5yaW5nYnVmLT5vYmo7CiAJCWdm eF9hZGRyID0gaTkxNV9nZW1fb2JqX2dndHRfb2Zmc2V0KG9iaik7CkBAIC0zNzEsNyArMzcyLDcg QEAgc3RhdGljIHZvaWQgZ3VjX2luaXRfY3R4X2Rlc2Moc3RydWN0IGludGVsX2d1YyAqZ3VjLAog CQlscmMtPnJpbmdfbmV4dF9mcmVlX2xvY2F0aW9uID0gZ2Z4X2FkZHI7CiAJCWxyYy0+cmluZ19j dXJyZW50X3RhaWxfcG9pbnRlcl92YWx1ZSA9IDA7CiAKLQkJZGVzYy5lbmdpbmVzX3VzZWQgfD0g KDEgPDwgZW5naW5lLT5ndWNfaWQpOworCQlkZXNjLmVuZ2luZXNfdXNlZCB8PSAoMSA8PCBndWNf ZW5naW5lX2lkKTsKIAl9CiAKIAlEUk1fREVCVUdfRFJJVkVSKCJIb3N0IGVuZ2luZXMgMHgleCA9 PiBHdUMgZW5naW5lcyB1c2VkIDB4JXhcbiIsCkBAIC00NjEsNiArNDYyLDcgQEAgc3RhdGljIHZv aWQgZ3VjX2FkZF93b3JrcXVldWVfaXRlbShzdHJ1Y3QgaTkxNV9ndWNfY2xpZW50ICpnYywKIAkv KiB3cWlfbGVuIGlzIGluIERXb3JkcywgYW5kIGRvZXMgbm90IGluY2x1ZGUgdGhlIG9uZS13b3Jk IGhlYWRlciAqLwogCWNvbnN0IHNpemVfdCB3cWlfc2l6ZSA9IHNpemVvZihzdHJ1Y3QgZ3VjX3dx X2l0ZW0pOwogCWNvbnN0IHUzMiB3cWlfbGVuID0gd3FpX3NpemUvc2l6ZW9mKHUzMikgLSAxOwor CXN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKmVuZ2luZSA9IHJxLT5lbmdpbmU7CiAJc3RydWN0IGd1 Y19wcm9jZXNzX2Rlc2MgKmRlc2M7CiAJc3RydWN0IGd1Y193cV9pdGVtICp3cWk7CiAJdm9pZCAq YmFzZTsKQEAgLTUwMiwxMiArNTA0LDExIEBAIHN0YXRpYyB2b2lkIGd1Y19hZGRfd29ya3F1ZXVl X2l0ZW0oc3RydWN0IGk5MTVfZ3VjX2NsaWVudCAqZ2MsCiAJLyogTm93IGZpbGwgaW4gdGhlIDQt d29yZCB3b3JrIHF1ZXVlIGl0ZW0gKi8KIAl3cWktPmhlYWRlciA9IFdRX1RZUEVfSU5PUkRFUiB8 CiAJCQkod3FpX2xlbiA8PCBXUV9MRU5fU0hJRlQpIHwKLQkJCShycS0+ZW5naW5lLT5ndWNfaWQg PDwgV1FfVEFSR0VUX1NISUZUKSB8CisJCQkoZW5naW5lLT5ndWNfaWQgPDwgV1FfVEFSR0VUX1NI SUZUKSB8CiAJCQlXUV9OT19XQ0ZMVVNIX1dBSVQ7CiAKIAkvKiBUaGUgR3VDIHdhbnRzIG9ubHkg dGhlIGxvdy1vcmRlciB3b3JkIG9mIHRoZSBjb250ZXh0IGRlc2NyaXB0b3IgKi8KLQl3cWktPmNv bnRleHRfZGVzYyA9ICh1MzIpaW50ZWxfbHJfY29udGV4dF9kZXNjcmlwdG9yKHJxLT5jdHgsCi0J CQkJCQkJICAgICBycS0+ZW5naW5lKTsKKwl3cWktPmNvbnRleHRfZGVzYyA9ICh1MzIpaW50ZWxf bHJfY29udGV4dF9kZXNjcmlwdG9yKHJxLT5jdHgsIGVuZ2luZSk7CiAKIAl3cWktPnJpbmdfdGFp bCA9IHRhaWwgPDwgV1FfUklOR19UQUlMX1NISUZUOwogCXdxaS0+ZmVuY2VfaWQgPSBycS0+ZmVu Y2Uuc2Vxbm87CkBAIC0xMDM1LDExICsxMDM2LDE0IEBAIGludCBpOTE1X2d1Y19zdWJtaXNzaW9u X2VuYWJsZShzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpCiB2b2lkIGk5MTVfZ3Vj X3N1Ym1pc3Npb25fZGlzYWJsZShzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpCiB7 CiAJc3RydWN0IGludGVsX2d1YyAqZ3VjID0gJmRldl9wcml2LT5ndWM7CisJc3RydWN0IGk5MTVf Z3VjX2NsaWVudCAqKmdjX3B0cjsKIAlzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICplbmdpbmU7CisJ ZW51bSBpbnRlbF9lbmdpbmVfaWQgZW5naW5lX2lkOwogCi0JZm9yX2VhY2hfZW5naW5lKGVuZ2lu ZSwgZGV2X3ByaXYpIHsKLQkJZ3VjX2NsaWVudF9mcmVlKGRldl9wcml2LCBndWMtPmV4ZWNfY2xp ZW50c1tlbmdpbmUtPmlkXSk7Ci0JCWd1Yy0+ZXhlY19jbGllbnRzW2VuZ2luZS0+aWRdID0gTlVM TDsKKwlmb3JfZWFjaF9lbmdpbmVfaWQoZW5naW5lLCBkZXZfcHJpdiwgZW5naW5lX2lkKSB7CisJ CWdjX3B0ciA9ICZndWMtPmV4ZWNfY2xpZW50c1tlbmdpbmVfaWRdOworCQlndWNfY2xpZW50X2Zy ZWUoZGV2X3ByaXYsICpnY19wdHIpOworCQkqZ2NfcHRyID0gTlVMTDsKIAl9CiB9CiAKLS0gCjEu OS4xCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpJbnRl bC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6 Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK