From mboxrd@z Thu Jan 1 00:00:00 1970 From: Dave Gordon Subject: [Resend-for-CI] drm/i915/guc: index host arrays by i915 engine ID, not guc_id Date: Mon, 20 Jun 2016 15:18:07 +0100 Message-ID: <1466432287-5799-1-git-send-email-david.s.gordon@intel.com> References: <1466180952-6488-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 mga14.intel.com (mga14.intel.com [192.55.52.115]) by gabe.freedesktop.org (Postfix) with ESMTP id 8C0C26E125 for ; Mon, 20 Jun 2016 14:23:27 +0000 (UTC) In-Reply-To: <1466180952-6488-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 VGhlIE9OTFkgcGxhY2VzIHRoYXQgZ3VjX2lkIChha2EgaHdfaWQpIHNob3VsZCBiZSB1c2VkIGFy ZSB0aG9zZSB3aGVyZQp0aGUgdmFsdWUgb3IgYWRkcmVzcyBpcyBkZXRlcm1pbmVkIGJ5IGFuZCBz aGFyZWQgd2l0aCB0aGUgR3VDIGZpcm13YXJlOwpzcGVjaWZpY2FsbHksIHdoZW4gZmlsbGluZyBp biB0aGUgR3VDLWNvbnRleHQtZGVzY3JpcHRvciBvciB0aGUgR3VDCmFkZG9uIGRhdGEsIG9yIHB1 dHRpbmcgYW4gZW50cnkgaW4gdGhlIEd1QydzIHdvcmsgcXVldWUuCgpJdCBuZWVkIG5vdCAoYW5k IHRoZXJlZm9yZSBzaG91bGQgbm90KSBiZSB1c2VkIHRvIGluZGV4IEd1QyBzdGF0aXN0aWNzCm9y IHNpbWlsYXIgaG9zdC1tYW5hZ2VkIHRyYWNraW5nIGRhdGEuIEluIHBhcnRpY3VsYXIsIGk5MTVf Z3VjX3N1Ym1pdCgpCnByb2R1Y2VzIChhbmQgZGVidWdmcyBkZWNvZGVzKSBHdUMgc3VibWlzc2lv biBzdGF0aXN0aWNzIHdoaWNoIHNob3VsZCBiZQppbmRleGVkIGJ5IGRyaXZlci1lbmdpbmUtaWQg cmF0aGVyIHRoZW4gZ3VjLWVuZ2luZS1pZC4KClNpZ25lZC1vZmYtYnk6IERhdmUgR29yZG9uIDxk YXZpZC5zLmdvcmRvbkBpbnRlbC5jb20+ClJldmlld2VkLWJ5OiBDaHJpcyBXaWxzb24gPGNocmlz QGNocmlzLXdpbHNvbi5jby51az4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2RlYnVn ZnMuYyAgICAgICAgfCAxMCArKysrKy0tLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2d1 Y19zdWJtaXNzaW9uLmMgfCAgMiArLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZ3VjLmgg ICAgICAgICAgIHwgIDcgKysrKy0tLQogMyBmaWxlcyBjaGFuZ2VkLCAxMCBpbnNlcnRpb25zKCsp LCA5IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVf ZGVidWdmcy5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kZWJ1Z2ZzLmMKaW5kZXggNWI3 NTI2Ni4uN2Q2M2FmMCAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kZWJ1 Z2ZzLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kZWJ1Z2ZzLmMKQEAgLTI1NDQs OSArMjU0NCw5IEBAIHN0YXRpYyB2b2lkIGk5MTVfZ3VjX2NsaWVudF9pbmZvKHN0cnVjdCBzZXFf ZmlsZSAqbSwKIAogCWZvcl9lYWNoX2VuZ2luZShlbmdpbmUsIGRldl9wcml2KSB7CiAJCXNlcV9w cmludGYobSwgIlx0U3VibWlzc2lvbnM6ICVsbHUgJXNcbiIsCi0JCQkJY2xpZW50LT5zdWJtaXNz aW9uc1tlbmdpbmUtPmd1Y19pZF0sCisJCQkJY2xpZW50LT5zdWJtaXNzaW9uc1tlbmdpbmUtPmlk XSwKIAkJCQllbmdpbmUtPm5hbWUpOwotCQl0b3QgKz0gY2xpZW50LT5zdWJtaXNzaW9uc1tlbmdp bmUtPmd1Y19pZF07CisJCXRvdCArPSBjbGllbnQtPnN1Ym1pc3Npb25zW2VuZ2luZS0+aWRdOwog CX0KIAlzZXFfcHJpbnRmKG0sICJcdFRvdGFsOiAlbGx1XG4iLCB0b3QpOwogfQpAQCAtMjU4Nyw5 ICsyNTg3LDkgQEAgc3RhdGljIGludCBpOTE1X2d1Y19pbmZvKHN0cnVjdCBzZXFfZmlsZSAqbSwg dm9pZCAqZGF0YSkKIAlzZXFfcHJpbnRmKG0sICJcbkd1QyBzdWJtaXNzaW9uczpcbiIpOwogCWZv cl9lYWNoX2VuZ2luZShlbmdpbmUsIGRldl9wcml2KSB7CiAJCXNlcV9wcmludGYobSwgIlx0JS0y NHM6ICUxMGxsdSwgbGFzdCBzZXFubyAweCUwOHhcbiIsCi0JCQllbmdpbmUtPm5hbWUsIGd1Yy5z dWJtaXNzaW9uc1tlbmdpbmUtPmd1Y19pZF0sCi0JCQlndWMubGFzdF9zZXFub1tlbmdpbmUtPmd1 Y19pZF0pOwotCQl0b3RhbCArPSBndWMuc3VibWlzc2lvbnNbZW5naW5lLT5ndWNfaWRdOworCQkJ ZW5naW5lLT5uYW1lLCBndWMuc3VibWlzc2lvbnNbZW5naW5lLT5pZF0sCisJCQlndWMubGFzdF9z ZXFub1tlbmdpbmUtPmlkXSk7CisJCXRvdGFsICs9IGd1Yy5zdWJtaXNzaW9uc1tlbmdpbmUtPmlk XTsKIAl9CiAJc2VxX3ByaW50ZihtLCAiXHQlczogJWxsdVxuIiwgIlRvdGFsIiwgdG90YWwpOwog CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2d1Y19zdWJtaXNzaW9uLmMg Yi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2d1Y19zdWJtaXNzaW9uLmMKaW5kZXggMjJhNTVh Yy4uMDFjN2NkZiAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9ndWNfc3Vi bWlzc2lvbi5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ3VjX3N1Ym1pc3Npb24u YwpAQCAtNTgyLDcgKzU4Miw3IEBAIHN0YXRpYyBpbnQgZ3VjX3JpbmdfZG9vcmJlbGwoc3RydWN0 IGk5MTVfZ3VjX2NsaWVudCAqZ2MpCiAgKi8KIGludCBpOTE1X2d1Y19zdWJtaXQoc3RydWN0IGRy bV9pOTE1X2dlbV9yZXF1ZXN0ICpycSkKIHsKLQl1bnNpZ25lZCBpbnQgZW5naW5lX2lkID0gcnEt PmVuZ2luZS0+Z3VjX2lkOworCXVuc2lnbmVkIGludCBlbmdpbmVfaWQgPSBycS0+ZW5naW5lLT5p ZDsKIAlzdHJ1Y3QgaW50ZWxfZ3VjICpndWMgPSAmcnEtPmk5MTUtPmd1YzsKIAlzdHJ1Y3QgaTkx NV9ndWNfY2xpZW50ICpjbGllbnQgPSBndWMtPmV4ZWNidWZfY2xpZW50OwogCWludCBiX3JldDsK ZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2d1Yy5oIGIvZHJpdmVycy9n cHUvZHJtL2k5MTUvaW50ZWxfZ3VjLmgKaW5kZXggNGRmODBjYy4uM2UzZTc0MyAxMDA2NDQKLS0t IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZ3VjLmgKKysrIGIvZHJpdmVycy9ncHUvZHJt L2k5MTUvaW50ZWxfZ3VjLmgKQEAgLTI2LDYgKzI2LDcgQEAKIAogI2luY2x1ZGUgImludGVsX2d1 Y19md2lmLmgiCiAjaW5jbHVkZSAiaTkxNV9ndWNfcmVnLmgiCisjaW5jbHVkZSAiaW50ZWxfcmlu Z2J1ZmZlci5oIgogCiBzdHJ1Y3QgZHJtX2k5MTVfZ2VtX3JlcXVlc3Q7CiAKQEAgLTg2LDcgKzg3 LDcgQEAgc3RydWN0IGk5MTVfZ3VjX2NsaWVudCB7CiAJaW50IHJldGNvZGU7CiAKIAkvKiBQZXIt ZW5naW5lIGNvdW50cyBvZiBHdUMgc3VibWlzc2lvbnMgKi8KLQl1aW50NjRfdCBzdWJtaXNzaW9u c1tHVUNfTUFYX0VOR0lORVNfTlVNXTsKKwl1aW50NjRfdCBzdWJtaXNzaW9uc1tJOTE1X05VTV9F TkdJTkVTXTsKIH07CiAKIGVudW0gaW50ZWxfZ3VjX2Z3X3N0YXR1cyB7CkBAIC0xNDMsOCArMTQ0 LDggQEAgc3RydWN0IGludGVsX2d1YyB7CiAJdWludDMyX3QgYWN0aW9uX2ZhaWw7CQkvKiBUb3Rh bCBudW1iZXIgb2YgZmFpbHVyZXMJKi8KIAlpbnQzMl90IGFjdGlvbl9lcnI7CQkvKiBMYXN0IGVy cm9yIGNvZGUJCSovCiAKLQl1aW50NjRfdCBzdWJtaXNzaW9uc1tHVUNfTUFYX0VOR0lORVNfTlVN XTsKLQl1aW50MzJfdCBsYXN0X3NlcW5vW0dVQ19NQVhfRU5HSU5FU19OVU1dOworCXVpbnQ2NF90 IHN1Ym1pc3Npb25zW0k5MTVfTlVNX0VOR0lORVNdOworCXVpbnQzMl90IGxhc3Rfc2Vxbm9bSTkx NV9OVU1fRU5HSU5FU107CiB9OwogCiAvKiBpbnRlbF9ndWNfbG9hZGVyLmMgKi8KLS0gCjEuOS4x CgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpJbnRlbC1n ZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9s aXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK