From: John.C.Harrison@Intel.com Subject: [PATCH 8/11 v2] NOT_UPSTREAM: drm/i915: Disable extra engines on older GuC FW Date: Tue, 2 Apr 2019 16:33:41 -0700 Message-ID: <20190402233341.27612-1-John.C.Harrison@Intel.com> References: <20190401230556.10719-1-John.C.Harrison@Intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) by gabe.freedesktop.org (Postfix) with ESMTPS id A1FB16E499 for ; Tue, 2 Apr 2019 23:33:42 +0000 (UTC) In-Reply-To: <20190401230556.10719-1-John.C.Harrison@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 RnJvbTogSm9obiBIYXJyaXNvbiA8Sm9obi5DLkhhcnJpc29uQEludGVsLmNvbT4KClRoZSBjdXJy ZW50IEd1QyBGVyByZWxlYXNlICgzMS4wLjEpIGRpZXMgd2hlbiBwcmVzZW50ZWQgd2l0aCB0b28g bWFueQptZWRpYSBlbmdpbmVzLiBUaGUgaXNzdWUgd2FzIGZpeGVkIGJ5IDMyLjAuMyAod2hpY2gg aXMgdGhlIG5leHQgRlcgdGhlCmRyaXZlciBpcyBpbnRlbmRpbmcgdG8gc3dpdGNoIHRvKS4gSXQg aXMgZGVzaXJhYmxlIHRvIG1lcmdlIHRoZSB0aGUKcGF0Y2hlcyB3aGljaCBhbGxvdyB1c2Ugb2Yg dGhlIG5ldyBlbmdpbmVzIGJlZm9yZSB0aGUgbmV3IEd1QyBGVwpwYXRjaGVzIGNhbiBiZSBtZXJn ZWQuIEUuZy4gZm9yIHJ1bm5pbmcgaW4gbm9uLUd1QyBtb2RlIGFuZC9vciBydW5uaW5nCndpdGgg YSBsb2NhbGx5IHBhdGNoZWQgZHJpdmVyIGZvciB0aGUgbmV3ZXIgRlcuIEhlbmNlIHRoaXMgcGF0 Y2gKZGlzYWJsZXMgdGhlIGV4dHJhIGVuZ2luZXMgaWYgdGhlIG5ld2VyIEZXIGlzIG5vdCBmb3Vu ZC4KCnYyOiBDb3BlIHdpdGggR3VDIEZXcyBsb2FkZWQgdmlhIHRoZSBtb2R1bGUgcGFyYW0gKGJ5 IGp1c3QgaWdub3JpbmcgaXQKYW5kIHdhcm5pbmcgdGhlIHVzZXIpLiBbRGFuaWVsZV0KClNpZ25l ZC1vZmYtYnk6IEpvaG4gSGFycmlzb24gPEpvaG4uQy5IYXJyaXNvbkBJbnRlbC5jb20+CkNDOiBE YW5pZWxlIENlcmFvbG8gU3B1cmlvIDxkYW5pZWxlLmNlcmFvbG9zcHVyaW9AaW50ZWwuY29tPgot LS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2RldmljZV9pbmZvLmMgfCAyNCArKysrKysr KysrKysrKysrKysrKysrKysKIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2d1Y19mdy5jICAg ICAgfCAgMSArCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF91Y19mdy5oICAgICAgIHwgIDEg KwogMyBmaWxlcyBjaGFuZ2VkLCAyNiBpbnNlcnRpb25zKCspCgpkaWZmIC0tZ2l0IGEvZHJpdmVy cy9ncHUvZHJtL2k5MTUvaW50ZWxfZGV2aWNlX2luZm8uYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1 L2ludGVsX2RldmljZV9pbmZvLmMKaW5kZXggMDRhM2ZkZGFiYjBkLi42MDM1ZjljYmM3NjEgMTAw NjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2RldmljZV9pbmZvLmMKKysrIGIv ZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGV2aWNlX2luZm8uYwpAQCAtOTQ1LDYgKzk0NSwz MCBAQCB2b2lkIGludGVsX2RldmljZV9pbmZvX2luaXRfbW1pbyhzdHJ1Y3QgZHJtX2k5MTVfcHJp dmF0ZSAqZGV2X3ByaXYpCiAJdmVib3hfbWFzayA9IChtZWRpYV9mdXNlICYgR0VOMTFfR1RfVkVC T1hfRElTQUJMRV9NQVNLKSA+PgogCQkgICAgICBHRU4xMV9HVF9WRUJPWF9ESVNBQkxFX1NISUZU OwogCisJaWYgKFVTRVNfR1VDX1NVQk1JU1NJT04oZGV2X3ByaXYpKSB7CisJCXN0cnVjdCBpbnRl bF9ndWMgKmd1YyA9ICZkZXZfcHJpdi0+Z3VjOworCQlzdHJ1Y3QgaW50ZWxfdWNfZncgKmd1Y19m dyA9ICZndWMtPmZ3OworCQl1MzIgZ3VjX3ZlciwgZ3VjX3JlcTsKKworCQkvKiBHdUMgPCAzMi4w LjMgYmFyZnMgb24gdG9vIG1hbnkgbWVkaWEgZW5naW5lcyAqLworCQkvKiBOQjogKl92ZXJfZm91 bmQgaXMgbm90IGF2YWlsYWJsZSB5ZXQgc28gbmVlZCB0byB1c2UgX3Zlcl93YW50ZWQuICovCisK KwkJaWYgKCFndWNfZnctPm1ham9yX3Zlcl93YW50ZWQgJiYgIWd1Y19mdy0+bWlub3JfdmVyX3dh bnRlZCkgeworCQkJRFJNX0lORk8oIkd1QyBGVyB2ZXJzaW9uIHVua25vd24gKG92ZXJyaWRkZW4g YnkgbW9kdWxlIHBhcmFtPykuXG4iKTsKKwkJCURSTV9JTkZPKCJOQjogRlcgZWFybGllciB0aGFu IDMyLjAuMyBtYXkgYnJlYWsgVkNTNC03IGFuZCBWRUNTMi0zIVxuIik7CisJCX0gZWxzZSB7CisJ CQlndWNfdmVyID0gKGd1Y19mdy0+bWFqb3JfdmVyX3dhbnRlZCA8PCAxNikgfAorCQkJCSAgKGd1 Y19mdy0+bWlub3JfdmVyX3dhbnRlZCA8PCA4KSB8CisJCQkJICBndWNfZnctPnBhdGNoX3Zlcl93 YW50ZWQ7CisKKwkJCWd1Y19yZXEgPSAoMzIgPDwgMTYpIHwgKDAgPDwgOCkgfCAzOworCQkJaWYg KGd1Y192ZXIgPCBndWNfcmVxKSB7CisJCQkJdmRib3hfbWFzayAmPSAweEY7CisJCQkJdmVib3hf bWFzayAmPSAweDM7CisJCQl9CisJCX0KKwl9CisKIAlmb3IgKGkgPSAwOyBpIDwgSTkxNV9NQVhf VkNTOyBpKyspIHsKIAkJaWYgKCFIQVNfRU5HSU5FKGRldl9wcml2LCBfVkNTKGkpKSkKIAkJCWNv bnRpbnVlOwpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZ3VjX2Z3LmMg Yi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9ndWNfZncuYwppbmRleCAzMTk1ZDIzYTZiNWYu LmZmYTA4M2I3MjU2OCAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZ3Vj X2Z3LmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZ3VjX2Z3LmMKQEAgLTk4LDYg Kzk4LDcgQEAgc3RhdGljIHZvaWQgZ3VjX2Z3X3NlbGVjdChzdHJ1Y3QgaW50ZWxfdWNfZncgKmd1 Y19mdykKIAkJZ3VjX2Z3LT5wYXRoID0gQVRTX0dVQ19GSVJNV0FSRV9QQVRIOwogCQlndWNfZnct Pm1ham9yX3Zlcl93YW50ZWQgPSBBVFNfR1VDX0ZXX01BSk9SOwogCQlndWNfZnctPm1pbm9yX3Zl cl93YW50ZWQgPSBBVFNfR1VDX0ZXX01JTk9SOworCQlndWNfZnctPnBhdGNoX3Zlcl93YW50ZWQg PSBBVFNfR1VDX0ZXX1BBVENIOwogCX0gZWxzZSBpZiAoSVNfVElHRVJMQUtFKGk5MTUpKSB7CiAJ CWd1Y19mdy0+cGF0aCA9IFRHTF9HVUNfRklSTVdBUkVfUEFUSDsKIAkJZ3VjX2Z3LT5tYWpvcl92 ZXJfd2FudGVkID0gVEdMX0dVQ19GV19NQUpPUjsKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2Ry bS9pOTE1L2ludGVsX3VjX2Z3LmggYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF91Y19mdy5o CmluZGV4IDBlM2JkNTgwZTI2Ny4uNjhmMzliMTI5YTk2IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dw dS9kcm0vaTkxNS9pbnRlbF91Y19mdy5oCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVs X3VjX2Z3LmgKQEAgLTYyLDYgKzYyLDcgQEAgc3RydWN0IGludGVsX3VjX2Z3IHsKIAkgKi8KIAl1 MTYgbWFqb3JfdmVyX3dhbnRlZDsKIAl1MTYgbWlub3JfdmVyX3dhbnRlZDsKKwl1MTYgcGF0Y2hf dmVyX3dhbnRlZDsKIAl1MTYgbWFqb3JfdmVyX2ZvdW5kOwogCXUxNiBtaW5vcl92ZXJfZm91bmQ7 CiAKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KSW50ZWwt Z2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8v bGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4