From: Dave Gordon Subject: [PATCH] drm/i915/guc: index host arrays by i915 engine ID, not guc_id Date: Fri, 17 Jun 2016 17:29:12 +0100 Message-ID: <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 mga04.intel.com (mga04.intel.com [192.55.52.120]) by gabe.freedesktop.org (Postfix) with ESMTP id 6E30C6EC5E for ; Fri, 17 Jun 2016 16:29:16 +0000 (UTC) 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+Ci0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9k ZWJ1Z2ZzLmMgICAgICAgIHwgMTAgKysrKystLS0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkx NV9ndWNfc3VibWlzc2lvbi5jIHwgIDIgKy0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2d1 Yy5oICAgICAgICAgICB8ICA3ICsrKystLS0KIDMgZmlsZXMgY2hhbmdlZCwgMTAgaW5zZXJ0aW9u cygrKSwgOSBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9p OTE1X2RlYnVnZnMuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZGVidWdmcy5jCmluZGV4 IDViNzUyNjYuLjdkNjNhZjAgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVf ZGVidWdmcy5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZGVidWdmcy5jCkBAIC0y NTQ0LDkgKzI1NDQsOSBAQCBzdGF0aWMgdm9pZCBpOTE1X2d1Y19jbGllbnRfaW5mbyhzdHJ1Y3Qg c2VxX2ZpbGUgKm0sCiAKIAlmb3JfZWFjaF9lbmdpbmUoZW5naW5lLCBkZXZfcHJpdikgewogCQlz ZXFfcHJpbnRmKG0sICJcdFN1Ym1pc3Npb25zOiAlbGx1ICVzXG4iLAotCQkJCWNsaWVudC0+c3Vi bWlzc2lvbnNbZW5naW5lLT5ndWNfaWRdLAorCQkJCWNsaWVudC0+c3VibWlzc2lvbnNbZW5naW5l LT5pZF0sCiAJCQkJZW5naW5lLT5uYW1lKTsKLQkJdG90ICs9IGNsaWVudC0+c3VibWlzc2lvbnNb ZW5naW5lLT5ndWNfaWRdOworCQl0b3QgKz0gY2xpZW50LT5zdWJtaXNzaW9uc1tlbmdpbmUtPmlk XTsKIAl9CiAJc2VxX3ByaW50ZihtLCAiXHRUb3RhbDogJWxsdVxuIiwgdG90KTsKIH0KQEAgLTI1 ODcsOSArMjU4Nyw5IEBAIHN0YXRpYyBpbnQgaTkxNV9ndWNfaW5mbyhzdHJ1Y3Qgc2VxX2ZpbGUg Km0sIHZvaWQgKmRhdGEpCiAJc2VxX3ByaW50ZihtLCAiXG5HdUMgc3VibWlzc2lvbnM6XG4iKTsK IAlmb3JfZWFjaF9lbmdpbmUoZW5naW5lLCBkZXZfcHJpdikgewogCQlzZXFfcHJpbnRmKG0sICJc dCUtMjRzOiAlMTBsbHUsIGxhc3Qgc2Vxbm8gMHglMDh4XG4iLAotCQkJZW5naW5lLT5uYW1lLCBn dWMuc3VibWlzc2lvbnNbZW5naW5lLT5ndWNfaWRdLAotCQkJZ3VjLmxhc3Rfc2Vxbm9bZW5naW5l LT5ndWNfaWRdKTsKLQkJdG90YWwgKz0gZ3VjLnN1Ym1pc3Npb25zW2VuZ2luZS0+Z3VjX2lkXTsK KwkJCWVuZ2luZS0+bmFtZSwgZ3VjLnN1Ym1pc3Npb25zW2VuZ2luZS0+aWRdLAorCQkJZ3VjLmxh c3Rfc2Vxbm9bZW5naW5lLT5pZF0pOworCQl0b3RhbCArPSBndWMuc3VibWlzc2lvbnNbZW5naW5l LT5pZF07CiAJfQogCXNlcV9wcmludGYobSwgIlx0JXM6ICVsbHVcbiIsICJUb3RhbCIsIHRvdGFs KTsKIApkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9ndWNfc3VibWlzc2lv bi5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9ndWNfc3VibWlzc2lvbi5jCmluZGV4IDIy YTU1YWMuLjAxYzdjZGYgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ3Vj X3N1Ym1pc3Npb24uYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2d1Y19zdWJtaXNz aW9uLmMKQEAgLTU4Miw3ICs1ODIsNyBAQCBzdGF0aWMgaW50IGd1Y19yaW5nX2Rvb3JiZWxsKHN0 cnVjdCBpOTE1X2d1Y19jbGllbnQgKmdjKQogICovCiBpbnQgaTkxNV9ndWNfc3VibWl0KHN0cnVj dCBkcm1faTkxNV9nZW1fcmVxdWVzdCAqcnEpCiB7Ci0JdW5zaWduZWQgaW50IGVuZ2luZV9pZCA9 IHJxLT5lbmdpbmUtPmd1Y19pZDsKKwl1bnNpZ25lZCBpbnQgZW5naW5lX2lkID0gcnEtPmVuZ2lu ZS0+aWQ7CiAJc3RydWN0IGludGVsX2d1YyAqZ3VjID0gJnJxLT5pOTE1LT5ndWM7CiAJc3RydWN0 IGk5MTVfZ3VjX2NsaWVudCAqY2xpZW50ID0gZ3VjLT5leGVjYnVmX2NsaWVudDsKIAlpbnQgYl9y ZXQ7CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9ndWMuaCBiL2RyaXZl cnMvZ3B1L2RybS9pOTE1L2ludGVsX2d1Yy5oCmluZGV4IDRkZjgwY2MuLjNlM2U3NDMgMTAwNjQ0 Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2d1Yy5oCisrKyBiL2RyaXZlcnMvZ3B1 L2RybS9pOTE1L2ludGVsX2d1Yy5oCkBAIC0yNiw2ICsyNiw3IEBACiAKICNpbmNsdWRlICJpbnRl bF9ndWNfZndpZi5oIgogI2luY2x1ZGUgImk5MTVfZ3VjX3JlZy5oIgorI2luY2x1ZGUgImludGVs X3JpbmdidWZmZXIuaCIKIAogc3RydWN0IGRybV9pOTE1X2dlbV9yZXF1ZXN0OwogCkBAIC04Niw3 ICs4Nyw3IEBAIHN0cnVjdCBpOTE1X2d1Y19jbGllbnQgewogCWludCByZXRjb2RlOwogCiAJLyog UGVyLWVuZ2luZSBjb3VudHMgb2YgR3VDIHN1Ym1pc3Npb25zICovCi0JdWludDY0X3Qgc3VibWlz c2lvbnNbR1VDX01BWF9FTkdJTkVTX05VTV07CisJdWludDY0X3Qgc3VibWlzc2lvbnNbSTkxNV9O VU1fRU5HSU5FU107CiB9OwogCiBlbnVtIGludGVsX2d1Y19md19zdGF0dXMgewpAQCAtMTQzLDgg KzE0NCw4IEBAIHN0cnVjdCBpbnRlbF9ndWMgewogCXVpbnQzMl90IGFjdGlvbl9mYWlsOwkJLyog VG90YWwgbnVtYmVyIG9mIGZhaWx1cmVzCSovCiAJaW50MzJfdCBhY3Rpb25fZXJyOwkJLyogTGFz dCBlcnJvciBjb2RlCQkqLwogCi0JdWludDY0X3Qgc3VibWlzc2lvbnNbR1VDX01BWF9FTkdJTkVT X05VTV07Ci0JdWludDMyX3QgbGFzdF9zZXFub1tHVUNfTUFYX0VOR0lORVNfTlVNXTsKKwl1aW50 NjRfdCBzdWJtaXNzaW9uc1tJOTE1X05VTV9FTkdJTkVTXTsKKwl1aW50MzJfdCBsYXN0X3NlcW5v W0k5MTVfTlVNX0VOR0lORVNdOwogfTsKIAogLyogaW50ZWxfZ3VjX2xvYWRlci5jICovCi0tIAox LjkuMQoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KSW50 ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBz Oi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4Cg==