From: Dave Gordon Subject: [PATCH v3 2/4] drm/i915/guc: symbolic names for GuC firmare loading preferences Date: Fri, 22 Jul 2016 14:32:20 +0100 Message-ID: <1469194342-8102-3-git-send-email-david.s.gordon@intel.com> References: <1469194342-8102-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 mga03.intel.com (mga03.intel.com [134.134.136.65]) by gabe.freedesktop.org (Postfix) with ESMTP id 5E16F6EB6B for ; Fri, 22 Jul 2016 13:32:29 +0000 (UTC) In-Reply-To: <1469194342-8102-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+Ci0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxf Z3VjLmggICAgICAgIHwgMTQgKysrKysrKysrKysrKysKIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2lu dGVsX2d1Y19sb2FkZXIuYyB8IDEzICsrKysrKystLS0tLS0KIDIgZmlsZXMgY2hhbmdlZCwgMjEg aW5zZXJ0aW9ucygrKSwgNiBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9k cm0vaTkxNS9pbnRlbF9ndWMuaCBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2d1Yy5oCmlu ZGV4IDUyZWNiYmEuLjQ5NjM1MjIgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2lu dGVsX2d1Yy5oCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2d1Yy5oCkBAIC05MCwx MiArOTAsMjYgQEAgc3RydWN0IGk5MTVfZ3VjX2NsaWVudCB7CiAJdWludDY0X3Qgc3VibWlzc2lv bnNbSTkxNV9OVU1fRU5HSU5FU107CiB9OwogCisvKgorICogVGhlc2Ugc2lnbmVkIHJhbmdlcyBy ZXByZXNlbnQgdXNlci1yZXF1ZXN0ZWQgcHJlZmVyZW5jZXMuCisgKiBPdXQtb2YtcmFuZ2UgdmFs dWVzIGZyb20gdGhlIHVzZXIgd2lsbCBiZSBjbGlwcGVkIHRvd2FyZHMKKyAqIHplcm86IGFueSBu ZWdhdGl2ZSB2YWx1ZSBpcyB0cmVhdGVkIGFzIC0xLCBhbnl0aGluZyBvdmVyIDIKKyAqIGlzIGp1 c3QgMi4gQU5ZIHVzZXItc3VwcGxpZWQgdmFsdWUgYWxzbyB0YWludHMgdGhlIGtlcm5lbC4KKyAq LwogZW51bSB7CiAJR1VDX1NVQk1JU1NJT05fREVGQVVMVCA9IC0xLAogCUdVQ19TVUJNSVNTSU9O X0RJU0FCTEVEID0gMCwKIAlHVUNfU1VCTUlTU0lPTl9QUkVGRVJSRUQsCiAJR1VDX1NVQk1JU1NJ T05fTUFOREFUT1JZCiB9OworZW51bSB7CisJRklSTVdBUkVfTE9BRF9ERUZBVUxUID0gLTEsCisJ RklSTVdBUkVfTE9BRF9ESVNBQkxFRCA9IDAsCisJRklSTVdBUkVfTE9BRF9QUkVGRVJSRUQsCisJ RklSTVdBUkVfTE9BRF9NQU5EQVRPUlkKK307CisKKy8qIFRoZXNlIHJlcHJlc2VudCB0aGUgYWN0 dWFsIGZpcm13YXJlIHN0YXR1cyAgKi8KIGVudW0gaW50ZWxfZ3VjX2Z3X3N0YXR1cyB7CiAJR1VD X0ZJUk1XQVJFX0ZBSUwgPSAtMSwKIAlHVUNfRklSTVdBUkVfTk9ORSA9IDAsCmRpZmYgLS1naXQg YS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9ndWNfbG9hZGVyLmMgYi9kcml2ZXJzL2dwdS9k cm0vaTkxNS9pbnRlbF9ndWNfbG9hZGVyLmMKaW5kZXggZDhiZDRjYi4uYzIwMDViNSAxMDA2NDQK LS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZ3VjX2xvYWRlci5jCisrKyBiL2RyaXZl cnMvZ3B1L2RybS9pOTE1L2ludGVsX2d1Y19sb2FkZXIuYwpAQCAtNDI2LDcgKzQyNiw3IEBAIGlu dCBpbnRlbF9ndWNfc2V0dXAoc3RydWN0IGRybV9kZXZpY2UgKmRldikKIAkJaW50ZWxfZ3VjX2Z3 X3N0YXR1c19yZXByKGd1Y19mdy0+Z3VjX2Z3X2xvYWRfc3RhdHVzKSk7CiAKIAkvKiBMb2FkaW5n IGZvcmJpZGRlbiwgb3Igbm8gZmlybXdhcmUgdG8gbG9hZD8gKi8KLQlpZiAoIWk5MTUuZW5hYmxl X2d1Y19sb2FkaW5nKSB7CisJaWYgKGk5MTUuZW5hYmxlX2d1Y19sb2FkaW5nID09IEZJUk1XQVJF X0xPQURfRElTQUJMRUQpIHsKIAkJZXJyID0gMDsKIAkJZ290byBmYWlsOwogCX0gZWxzZSBpZiAo ZndfcGF0aCA9PSBOVUxMKSB7CkBAIC01MjEsNyArNTIxLDcgQEAgaW50IGludGVsX2d1Y19zZXR1 cChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KQogCSAqIG5vbmZhdGFsIGVycm9yIChpLmUuIGl0IGRv ZXNuJ3QgcHJldmVudCBkcml2ZXIgbG9hZCwgYnV0CiAJICogbWFya3MgdGhlIEdQVSBhcyB3ZWRn ZWQgdW50aWwgcmVzZXQpLgogCSAqLwotCWlmIChpOTE1LmVuYWJsZV9ndWNfbG9hZGluZyA+IDEp IHsKKwlpZiAoaTkxNS5lbmFibGVfZ3VjX2xvYWRpbmcgPj0gRklSTVdBUkVfTE9BRF9NQU5EQVRP UlkpIHsKIAkJcmV0ID0gLUVJTzsKIAl9IGVsc2UgaWYgKGk5MTUuZW5hYmxlX2d1Y19zdWJtaXNz aW9uID49IEdVQ19TVUJNSVNTSU9OX01BTkRBVE9SWSkgewogCQlyZXQgPSAtRUlPOwpAQCAtNjg3 LDkgKzY4NywxMCBAQCB2b2lkIGludGVsX2d1Y19pbml0KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYp CiAJc3RydWN0IGludGVsX2d1Y19mdyAqZ3VjX2Z3ID0gJmRldl9wcml2LT5ndWMuZ3VjX2Z3Owog CWNvbnN0IGNoYXIgKmZ3X3BhdGg7CiAKLQkvKiBBIG5lZ2F0aXZlIHZhbHVlIG1lYW5zICJ1c2Ug cGxhdGZvcm0gZGVmYXVsdCIgKi8KLQlpZiAoaTkxNS5lbmFibGVfZ3VjX2xvYWRpbmcgPCAwKQot CQlpOTE1LmVuYWJsZV9ndWNfbG9hZGluZyA9IEhBU19HVUNfVUNPREUoZGV2KTsKKwkvKiBBbnkg bmVnYXRpdmUgdmFsdWUgbWVhbnMgInVzZSBwbGF0Zm9ybSBkZWZhdWx0IiAqLworCWlmIChpOTE1 LmVuYWJsZV9ndWNfbG9hZGluZyA8PSBGSVJNV0FSRV9MT0FEX0RFRkFVTFQpCisJCWk5MTUuZW5h YmxlX2d1Y19sb2FkaW5nID0gSEFTX0dVQ19VQ09ERShkZXYpID8KKwkJCUZJUk1XQVJFX0xPQURf UFJFRkVSUkVEIDogRklSTVdBUkVfTE9BRF9ESVNBQkxFRDsKIAlpZiAoaTkxNS5lbmFibGVfZ3Vj X3N1Ym1pc3Npb24gPD0gR1VDX1NVQk1JU1NJT05fREVGQVVMVCkKIAkJaTkxNS5lbmFibGVfZ3Vj X3N1Ym1pc3Npb24gPSBIQVNfR1VDX1NDSEVEKGRldikgPwogCQkJR1VDX1NVQk1JU1NJT05fUFJF RkVSUkVEIDogR1VDX1NVQk1JU1NJT05fRElTQUJMRUQ7CkBAIC03MTgsNyArNzE5LDcgQEAgdm9p ZCBpbnRlbF9ndWNfaW5pdChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KQogCWd1Y19mdy0+Z3VjX2Z3 X2xvYWRfc3RhdHVzID0gR1VDX0ZJUk1XQVJFX05PTkU7CiAKIAkvKiBFYXJseSAoYW5kIHNpbGVu dCkgcmV0dXJuIGlmIEd1QyBsb2FkaW5nIGlzIGRpc2FibGVkICovCi0JaWYgKCFpOTE1LmVuYWJs ZV9ndWNfbG9hZGluZykKKwlpZiAoaTkxNS5lbmFibGVfZ3VjX2xvYWRpbmcgPT0gRklSTVdBUkVf TE9BRF9ESVNBQkxFRCkKIAkJcmV0dXJuOwogCWlmIChmd19wYXRoID09IE5VTEwpCiAJCXJldHVy bjsKLS0gCjEuOS4xCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5v cmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1n ZngK