From: Dave Gordon Subject: [PATCH v4 2/5] drm/i915/guc: symbolic names for GuC firmare loading preferences Date: Thu, 18 Aug 2016 18:10:49 +0100 Message-ID: <1471540252-16928-3-git-send-email-david.s.gordon@intel.com> References: <1471540252-16928-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 4F7236EADE for ; Thu, 18 Aug 2016 17:11:06 +0000 (UTC) In-Reply-To: <1471540252-16928-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 VGhlIGV4aXN0aW5nIGNvZGUgdGhhdCBhY2Nlc3NlcyB0aGUgImVuYWJsZV9ndWNfbG9hZGluZyIK cGFyYW1ldGVyIHVzZXMgZXhwbGljaXQgbnVtZXJpY2FsIHZhbHVlcyBmb3IgdGhlIHZhcmlvdXMK cG9zc2liaWxpdGllcywgIGluY2x1ZGluZyBpbiBvbmUgY2FzZSByZWx5aW5nIG9uIGJvb2xlYW4K MC8xIG1hcHBpbmcgdG8gc3BlY2lmaWMgdmFsdWVzICh3aGljaCBjb3VsZCBiZSBjb25mdXNpbmcK Zm9yIG1haW50YWluZXJzKS4KClNvIHRoaXMgcGF0Y2gganVzdCBwcm92aWRlcyBhbmQgdXNlcyBu YW1lcyBmb3IgdGhlIHZhbHVlcwpyZXByZXNlbnRpbmcgdGhlIERFRkFVTFQsIERJU0FCTEVELCBQ UkVGRVJSRUQsIGFuZCBNQU5EQVRPUlkKb3B0aW9ucyB0aGF0IHRoZSB1c2VyIGNhbiBzZWxlY3Qg KC0xLCAwLCAxLCAyIHJlc3BlY3RpdmVseSkuCgpUaGlzIHNob3VsZCBwcm9kdWNlIGlkZW50aWNh bCBjb2RlIHRvIHRoZSBwcmV2aW91cyB2ZXJzaW9uIQoKU2lnbmVkLW9mZi1ieTogRGF2ZSBHb3Jk b24gPGRhdmlkLnMuZ29yZG9uQGludGVsLmNvbT4KQ2M6IFR2cnRrbyBVcnN1bGluIDx0dnJ0a28u dXJzdWxpbkBsaW51eC5pbnRlbC5jb20+CkNjOiBKYW5pIE5pa3VsYSA8amFuaS5uaWt1bGFAbGlu dXguaW50ZWwuY29tPgotLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2d1Yy5oICAgICAg ICB8IDE0ICsrKysrKysrKysrKysrCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9ndWNfbG9h ZGVyLmMgfCAxMyArKysrKysrLS0tLS0tCiAyIGZpbGVzIGNoYW5nZWQsIDIxIGluc2VydGlvbnMo KyksIDYgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50 ZWxfZ3VjLmggYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9ndWMuaAppbmRleCA5NDFkNzBl Li44M2MyZjI5NSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZ3VjLmgK KysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZ3VjLmgKQEAgLTg5LDEyICs4OSwyNiBA QCBzdHJ1Y3QgaTkxNV9ndWNfY2xpZW50IHsKIAl1aW50NjRfdCBzdWJtaXNzaW9uc1tJOTE1X05V TV9FTkdJTkVTXTsKIH07CiAKKy8qCisgKiBUaGVzZSBzaWduZWQgcmFuZ2VzIHJlcHJlc2VudCB1 c2VyLXJlcXVlc3RlZCBwcmVmZXJlbmNlcy4KKyAqIE91dC1vZi1yYW5nZSB2YWx1ZXMgZnJvbSB0 aGUgdXNlciB3aWxsIGJlIGNsaXBwZWQgdG93YXJkcworICogemVybzogYW55IG5lZ2F0aXZlIHZh bHVlIGlzIHRyZWF0ZWQgYXMgLTEsIGFueXRoaW5nIG92ZXIgMgorICogaXMganVzdCAyLiBBTlkg dXNlci1zdXBwbGllZCB2YWx1ZSBhbHNvIHRhaW50cyB0aGUga2VybmVsLgorICovCiBlbnVtIHsK IAlHVUNfU1VCTUlTU0lPTl9ERUZBVUxUID0gLTEsCiAJR1VDX1NVQk1JU1NJT05fRElTQUJMRUQg PSAwLAogCUdVQ19TVUJNSVNTSU9OX1BSRUZFUlJFRCwKIAlHVUNfU1VCTUlTU0lPTl9NQU5EQVRP UlkKIH07CitlbnVtIHsKKwlGSVJNV0FSRV9MT0FEX0RFRkFVTFQgPSAtMSwKKwlGSVJNV0FSRV9M T0FEX0RJU0FCTEVEID0gMCwKKwlGSVJNV0FSRV9MT0FEX1BSRUZFUlJFRCwKKwlGSVJNV0FSRV9M T0FEX01BTkRBVE9SWQorfTsKKworLyogVGhlc2UgcmVwcmVzZW50IHRoZSBhY3R1YWwgZmlybXdh cmUgc3RhdHVzICAqLwogZW51bSBpbnRlbF9ndWNfZndfc3RhdHVzIHsKIAlHVUNfRklSTVdBUkVf RkFJTCA9IC0xLAogCUdVQ19GSVJNV0FSRV9OT05FID0gMCwKZGlmZiAtLWdpdCBhL2RyaXZlcnMv Z3B1L2RybS9pOTE1L2ludGVsX2d1Y19sb2FkZXIuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2lu dGVsX2d1Y19sb2FkZXIuYwppbmRleCA0OWY4NDZjLi5kYTA0N2E4IDEwMDY0NAotLS0gYS9kcml2 ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9ndWNfbG9hZGVyLmMKKysrIGIvZHJpdmVycy9ncHUvZHJt L2k5MTUvaW50ZWxfZ3VjX2xvYWRlci5jCkBAIC00MzgsNyArNDM4LDcgQEAgaW50IGludGVsX2d1 Y19zZXR1cChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KQogCQlpbnRlbF9ndWNfZndfc3RhdHVzX3Jl cHIoZ3VjX2Z3LT5ndWNfZndfbG9hZF9zdGF0dXMpKTsKIAogCS8qIExvYWRpbmcgZm9yYmlkZGVu LCBvciBubyBmaXJtd2FyZSB0byBsb2FkPyAqLwotCWlmICghaTkxNS5lbmFibGVfZ3VjX2xvYWRp bmcpIHsKKwlpZiAoaTkxNS5lbmFibGVfZ3VjX2xvYWRpbmcgPT0gRklSTVdBUkVfTE9BRF9ESVNB QkxFRCkgewogCQllcnIgPSAwOwogCQlnb3RvIGZhaWw7CiAJfSBlbHNlIGlmIChmd19wYXRoID09 IE5VTEwpIHsKQEAgLTUzMyw3ICs1MzMsNyBAQCBpbnQgaW50ZWxfZ3VjX3NldHVwKHN0cnVjdCBk cm1fZGV2aWNlICpkZXYpCiAJICogbm9uZmF0YWwgZXJyb3IgKGkuZS4gaXQgZG9lc24ndCBwcmV2 ZW50IGRyaXZlciBsb2FkLCBidXQKIAkgKiBtYXJrcyB0aGUgR1BVIGFzIHdlZGdlZCB1bnRpbCBy ZXNldCkuCiAJICovCi0JaWYgKGk5MTUuZW5hYmxlX2d1Y19sb2FkaW5nID4gMSkgeworCWlmIChp OTE1LmVuYWJsZV9ndWNfbG9hZGluZyA+PSBGSVJNV0FSRV9MT0FEX01BTkRBVE9SWSkgewogCQly ZXQgPSAtRUlPOwogCX0gZWxzZSBpZiAoaTkxNS5lbmFibGVfZ3VjX3N1Ym1pc3Npb24gPj0gR1VD X1NVQk1JU1NJT05fTUFOREFUT1JZKSB7CiAJCXJldCA9IC1FSU87CkBAIC02OTksOSArNjk5LDEw IEBAIHZvaWQgaW50ZWxfZ3VjX2luaXQoc3RydWN0IGRybV9kZXZpY2UgKmRldikKIAlzdHJ1Y3Qg aW50ZWxfZ3VjX2Z3ICpndWNfZncgPSAmZGV2X3ByaXYtPmd1Yy5ndWNfZnc7CiAJY29uc3QgY2hh ciAqZndfcGF0aDsKIAotCS8qIEEgbmVnYXRpdmUgdmFsdWUgbWVhbnMgInVzZSBwbGF0Zm9ybSBk ZWZhdWx0IiAqLwotCWlmIChpOTE1LmVuYWJsZV9ndWNfbG9hZGluZyA8IDApCi0JCWk5MTUuZW5h YmxlX2d1Y19sb2FkaW5nID0gSEFTX0dVQ19VQ09ERShkZXYpOworCS8qIEFueSBuZWdhdGl2ZSB2 YWx1ZSBtZWFucyAidXNlIHBsYXRmb3JtIGRlZmF1bHQiICovCisJaWYgKGk5MTUuZW5hYmxlX2d1 Y19sb2FkaW5nIDw9IEZJUk1XQVJFX0xPQURfREVGQVVMVCkKKwkJaTkxNS5lbmFibGVfZ3VjX2xv YWRpbmcgPSBIQVNfR1VDX1VDT0RFKGRldikgPworCQkJRklSTVdBUkVfTE9BRF9QUkVGRVJSRUQg OiBGSVJNV0FSRV9MT0FEX0RJU0FCTEVEOwogCWlmIChpOTE1LmVuYWJsZV9ndWNfc3VibWlzc2lv biA8PSBHVUNfU1VCTUlTU0lPTl9ERUZBVUxUKQogCQlpOTE1LmVuYWJsZV9ndWNfc3VibWlzc2lv biA9IEhBU19HVUNfU0NIRUQoZGV2KSA/CiAJCQlHVUNfU1VCTUlTU0lPTl9QUkVGRVJSRUQgOiBH VUNfU1VCTUlTU0lPTl9ESVNBQkxFRDsKQEAgLTczMCw3ICs3MzEsNyBAQCB2b2lkIGludGVsX2d1 Y19pbml0KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCiAJZ3VjX2Z3LT5ndWNfZndfbG9hZF9zdGF0 dXMgPSBHVUNfRklSTVdBUkVfTk9ORTsKIAogCS8qIEVhcmx5IChhbmQgc2lsZW50KSByZXR1cm4g aWYgR3VDIGxvYWRpbmcgaXMgZGlzYWJsZWQgKi8KLQlpZiAoIWk5MTUuZW5hYmxlX2d1Y19sb2Fk aW5nKQorCWlmIChpOTE1LmVuYWJsZV9ndWNfbG9hZGluZyA9PSBGSVJNV0FSRV9MT0FEX0RJU0FC TEVEKQogCQlyZXR1cm47CiAJaWYgKGZ3X3BhdGggPT0gTlVMTCkKIAkJcmV0dXJuOwotLSAKMS45 LjEKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCkludGVs LWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczov L2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeAo=