From: Dave Gordon Subject: [PATCH v3 4/6] drm/i915/guc: use for_each_engine_id() where appropriate Date: Tue, 9 Aug 2016 15:19:22 +0100 Message-ID: <1470752364-26940-5-git-send-email-david.s.gordon@intel.com> References: <1470752364-26940-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 mga01.intel.com (mga01.intel.com [192.55.52.88]) by gabe.freedesktop.org (Postfix) with ESMTP id 6D3856E5C4 for ; Tue, 9 Aug 2016 14:19:45 +0000 (UTC) In-Reply-To: <1470752364-26940-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 MTggKysrKysrKysrKy0tLS0tLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2d1Y19zdWJt aXNzaW9uLmMgfCAxMyArKysrKysrLS0tLS0tCiAyIGZpbGVzIGNoYW5nZWQsIDE3IGluc2VydGlv bnMoKyksIDE0IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1 L2k5MTVfZGVidWdmcy5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kZWJ1Z2ZzLmMKaW5k ZXggZjYyMjg1Yy4uMTVjNWI0ZSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkx NV9kZWJ1Z2ZzLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kZWJ1Z2ZzLmMKQEAg LTI1NDcsNiArMjU0Nyw3IEBAIHN0YXRpYyB2b2lkIGk5MTVfZ3VjX2NsaWVudF9pbmZvKHN0cnVj dCBzZXFfZmlsZSAqbSwKIAkJCQkgc3RydWN0IGk5MTVfZ3VjX2NsaWVudCAqY2xpZW50KQogewog CXN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKmVuZ2luZTsKKwllbnVtIGludGVsX2VuZ2luZV9pZCBp ZDsKIAl1aW50NjRfdCB0b3QgPSAwOwogCiAJc2VxX3ByaW50ZihtLCAiXHRQcmlvcml0eSAlZCwg R3VDIGN0eCBpbmRleDogJXUsIFBEIG9mZnNldCAweCV4XG4iLApAQCAtMjU2MSwxMSArMjU2Miwx MSBAQCBzdGF0aWMgdm9pZCBpOTE1X2d1Y19jbGllbnRfaW5mbyhzdHJ1Y3Qgc2VxX2ZpbGUgKm0s CiAJc2VxX3ByaW50ZihtLCAiXHRGYWlsZWQgZG9vcmJlbGw6ICV1XG4iLCBjbGllbnQtPmJfZmFp bCk7CiAJc2VxX3ByaW50ZihtLCAiXHRMYXN0IHN1Ym1pc3Npb24gcmVzdWx0OiAlZFxuIiwgY2xp ZW50LT5yZXRjb2RlKTsKIAotCWZvcl9lYWNoX2VuZ2luZShlbmdpbmUsIGRldl9wcml2KSB7CisJ Zm9yX2VhY2hfZW5naW5lX2lkKGVuZ2luZSwgZGV2X3ByaXYsIGlkKSB7CisJCXU2NCBzdWJtaXNz aW9ucyA9IGNsaWVudC0+c3VibWlzc2lvbnNbaWRdOworCQl0b3QgKz0gc3VibWlzc2lvbnM7CiAJ CXNlcV9wcmludGYobSwgIlx0U3VibWlzc2lvbnM6ICVsbHUgJXNcbiIsCi0JCQkJY2xpZW50LT5z dWJtaXNzaW9uc1tlbmdpbmUtPmlkXSwKLQkJCQllbmdpbmUtPm5hbWUpOwotCQl0b3QgKz0gY2xp ZW50LT5zdWJtaXNzaW9uc1tlbmdpbmUtPmlkXTsKKwkJCQlzdWJtaXNzaW9ucywgZW5naW5lLT5u YW1lKTsKIAl9CiAJc2VxX3ByaW50ZihtLCAiXHRUb3RhbDogJWxsdVxuIiwgdG90KTsKIH0KQEAg LTI1NzgsNiArMjU3OSw3IEBAIHN0YXRpYyBpbnQgaTkxNV9ndWNfaW5mbyhzdHJ1Y3Qgc2VxX2Zp bGUgKm0sIHZvaWQgKmRhdGEpCiAJc3RydWN0IGludGVsX2d1YyBndWM7CiAJc3RydWN0IGk5MTVf Z3VjX2NsaWVudCBjbGllbnQgPSB7fTsKIAlzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICplbmdpbmU7 CisJZW51bSBpbnRlbF9lbmdpbmVfaWQgaWQ7CiAJdTY0IHRvdGFsID0gMDsKIAogCWlmICghSEFT X0dVQ19TQ0hFRChkZXZfcHJpdikpCkBAIC0yNjA0LDExICsyNjA2LDExIEBAIHN0YXRpYyBpbnQg aTkxNV9ndWNfaW5mbyhzdHJ1Y3Qgc2VxX2ZpbGUgKm0sIHZvaWQgKmRhdGEpCiAJc2VxX3ByaW50 ZihtLCAiR3VDIGxhc3QgYWN0aW9uIGVycm9yIGNvZGU6ICVkXG4iLCBndWMuYWN0aW9uX2Vycik7 CiAKIAlzZXFfcHJpbnRmKG0sICJcbkd1QyBzdWJtaXNzaW9uczpcbiIpOwotCWZvcl9lYWNoX2Vu Z2luZShlbmdpbmUsIGRldl9wcml2KSB7CisJZm9yX2VhY2hfZW5naW5lX2lkKGVuZ2luZSwgZGV2 X3ByaXYsIGlkKSB7CisJCXU2NCBzdWJtaXNzaW9ucyA9IGd1Yy5zdWJtaXNzaW9uc1tpZF07CisJ CXRvdGFsICs9IHN1Ym1pc3Npb25zOwogCQlzZXFfcHJpbnRmKG0sICJcdCUtMjRzOiAlMTBsbHUs IGxhc3Qgc2Vxbm8gMHglMDh4XG4iLAotCQkJZW5naW5lLT5uYW1lLCBndWMuc3VibWlzc2lvbnNb ZW5naW5lLT5pZF0sCi0JCQlndWMubGFzdF9zZXFub1tlbmdpbmUtPmlkXSk7Ci0JCXRvdGFsICs9 IGd1Yy5zdWJtaXNzaW9uc1tlbmdpbmUtPmlkXTsKKwkJCWVuZ2luZS0+bmFtZSwgc3VibWlzc2lv bnMsIGd1Yy5sYXN0X3NlcW5vW2lkXSk7CiAJfQogCXNlcV9wcmludGYobSwgIlx0JXM6ICVsbHVc biIsICJUb3RhbCIsIHRvdGFsKTsKIApkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUv aTkxNV9ndWNfc3VibWlzc2lvbi5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9ndWNfc3Vi bWlzc2lvbi5jCmluZGV4IDQwNWU0NDUuLjY4MzEzMjEgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1 L2RybS9pOTE1L2k5MTVfZ3VjX3N1Ym1pc3Npb24uYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkx NS9pOTE1X2d1Y19zdWJtaXNzaW9uLmMKQEAgLTM0Miw3ICszNDIsOCBAQCBzdGF0aWMgdm9pZCBn dWNfaW5pdF9jdHhfZGVzYyhzdHJ1Y3QgaW50ZWxfZ3VjICpndWMsCiAKIAlmb3JfZWFjaF9lbmdp bmVfbWFza2VkKGVuZ2luZSwgZGV2X3ByaXYsIGNsaWVudC0+ZW5naW5lcykgewogCQlzdHJ1Y3Qg aW50ZWxfY29udGV4dCAqY2UgPSAmY3R4LT5lbmdpbmVbZW5naW5lLT5pZF07Ci0JCXN0cnVjdCBn dWNfZXhlY2xpc3RfY29udGV4dCAqbHJjID0gJmRlc2MubHJjW2VuZ2luZS0+Z3VjX2lkXTsKKwkJ dWludDMyX3QgZ3VjX2VuZ2luZV9pZCA9IGVuZ2luZS0+Z3VjX2lkOworCQlzdHJ1Y3QgZ3VjX2V4 ZWNsaXN0X2NvbnRleHQgKmxyYyA9ICZkZXNjLmxyY1tndWNfZW5naW5lX2lkXTsKIAkJc3RydWN0 IGRybV9pOTE1X2dlbV9vYmplY3QgKm9iajsKIAogCQkvKiBUT0RPOiBXZSBoYXZlIGEgZGVzaWdu IGlzc3VlIHRvIGJlIHNvbHZlZCBoZXJlLiBPbmx5IHdoZW4gd2UKQEAgLTM2MSw3ICszNjIsNyBA QCBzdGF0aWMgdm9pZCBndWNfaW5pdF9jdHhfZGVzYyhzdHJ1Y3QgaW50ZWxfZ3VjICpndWMsCiAJ CWdmeF9hZGRyID0gaTkxNV9nZW1fb2JqX2dndHRfb2Zmc2V0KGNlLT5zdGF0ZSk7CiAJCWxyYy0+ cmluZ19sY3JhID0gZ2Z4X2FkZHIgKyBMUkNfU1RBVEVfUE4gKiBQQUdFX1NJWkU7CiAJCWxyYy0+ Y29udGV4dF9pZCA9IChjbGllbnQtPmN0eF9pbmRleCA8PCBHVUNfRUxDX0NUWElEX09GRlNFVCkg fAotCQkJCShlbmdpbmUtPmd1Y19pZCA8PCBHVUNfRUxDX0VOR0lORV9PRkZTRVQpOworCQkJCShn dWNfZW5naW5lX2lkIDw8IEdVQ19FTENfRU5HSU5FX09GRlNFVCk7CiAKIAkJb2JqID0gY2UtPnJp bmctPm9iajsKIAkJZ2Z4X2FkZHIgPSBpOTE1X2dlbV9vYmpfZ2d0dF9vZmZzZXQob2JqKTsKQEAg LTM3MSw3ICszNzIsNyBAQCBzdGF0aWMgdm9pZCBndWNfaW5pdF9jdHhfZGVzYyhzdHJ1Y3QgaW50 ZWxfZ3VjICpndWMsCiAJCWxyYy0+cmluZ19uZXh0X2ZyZWVfbG9jYXRpb24gPSBnZnhfYWRkcjsK IAkJbHJjLT5yaW5nX2N1cnJlbnRfdGFpbF9wb2ludGVyX3ZhbHVlID0gMDsKIAotCQlkZXNjLmVu Z2luZXNfdXNlZCB8PSAoMSA8PCBlbmdpbmUtPmd1Y19pZCk7CisJCWRlc2MuZW5naW5lc191c2Vk IHw9ICgxIDw8IGd1Y19lbmdpbmVfaWQpOwogCX0KIAogCURSTV9ERUJVR19EUklWRVIoIkhvc3Qg ZW5naW5lcyAweCV4ID0+IEd1QyBlbmdpbmVzIHVzZWQgMHgleFxuIiwKQEAgLTQ1OSw2ICs0NjAs NyBAQCBzdGF0aWMgdm9pZCBndWNfYWRkX3dvcmtxdWV1ZV9pdGVtKHN0cnVjdCBpOTE1X2d1Y19j bGllbnQgKmdjLAogCS8qIHdxaV9sZW4gaXMgaW4gRFdvcmRzLCBhbmQgZG9lcyBub3QgaW5jbHVk ZSB0aGUgb25lLXdvcmQgaGVhZGVyICovCiAJY29uc3Qgc2l6ZV90IHdxaV9zaXplID0gc2l6ZW9m KHN0cnVjdCBndWNfd3FfaXRlbSk7CiAJY29uc3QgdTMyIHdxaV9sZW4gPSB3cWlfc2l6ZS9zaXpl b2YodTMyKSAtIDE7CisJc3RydWN0IGludGVsX2VuZ2luZV9jcyAqZW5naW5lID0gcnEtPmVuZ2lu ZTsKIAlzdHJ1Y3QgZ3VjX3Byb2Nlc3NfZGVzYyAqZGVzYzsKIAlzdHJ1Y3QgZ3VjX3dxX2l0ZW0g KndxaTsKIAl2b2lkICpiYXNlOwpAQCAtNTAwLDEyICs1MDIsMTEgQEAgc3RhdGljIHZvaWQgZ3Vj X2FkZF93b3JrcXVldWVfaXRlbShzdHJ1Y3QgaTkxNV9ndWNfY2xpZW50ICpnYywKIAkvKiBOb3cg ZmlsbCBpbiB0aGUgNC13b3JkIHdvcmsgcXVldWUgaXRlbSAqLwogCXdxaS0+aGVhZGVyID0gV1Ff VFlQRV9JTk9SREVSIHwKIAkJCSh3cWlfbGVuIDw8IFdRX0xFTl9TSElGVCkgfAotCQkJKHJxLT5l bmdpbmUtPmd1Y19pZCA8PCBXUV9UQVJHRVRfU0hJRlQpIHwKKwkJCShlbmdpbmUtPmd1Y19pZCA8 PCBXUV9UQVJHRVRfU0hJRlQpIHwKIAkJCVdRX05PX1dDRkxVU0hfV0FJVDsKIAogCS8qIFRoZSBH dUMgd2FudHMgb25seSB0aGUgbG93LW9yZGVyIHdvcmQgb2YgdGhlIGNvbnRleHQgZGVzY3JpcHRv ciAqLwotCXdxaS0+Y29udGV4dF9kZXNjID0gKHUzMilpbnRlbF9scl9jb250ZXh0X2Rlc2NyaXB0 b3IocnEtPmN0eCwKLQkJCQkJCQkgICAgIHJxLT5lbmdpbmUpOworCXdxaS0+Y29udGV4dF9kZXNj ID0gKHUzMilpbnRlbF9scl9jb250ZXh0X2Rlc2NyaXB0b3IocnEtPmN0eCwgZW5naW5lKTsKIAog CXdxaS0+cmluZ190YWlsID0gdGFpbCA8PCBXUV9SSU5HX1RBSUxfU0hJRlQ7CiAJd3FpLT5mZW5j ZV9pZCA9IHJxLT5mZW5jZS5zZXFubzsKLS0gCjEuOS4xCgpfX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdm eEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFp bG1hbi9saXN0aW5mby9pbnRlbC1nZngK