From: Oscar Mateo Subject: [PATCH RFC 2/2] drm/i915/guc: Rename has_guc to has_uc Date: Fri, 5 May 2017 13:23:18 +0000 Message-ID: <1493990598-36155-2-git-send-email-oscar.mateo@intel.com> References: <1493990598-36155-1-git-send-email-oscar.mateo@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 ESMTPS id A5E9C6E185 for ; Fri, 5 May 2017 20:23:44 +0000 (UTC) In-Reply-To: <1493990598-36155-1-git-send-email-oscar.mateo@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 QUZBSUssIGV2ZXJ5IHBsYXRmb3JtIHdpdGggYSBIdUMgaGFzIGEgR3VDIGFuZCB2aWNldmVyc2Es IHNvCm1ha2UgaXQgZXhwbGljaXQuCgpDYzogQW51c2hhIFNyaXZhdHNhIDxhbnVzaGEuc3JpdmF0 c2FAaW50ZWwuY29tPgpDYzogRGFuaWVsZSBDZXJhb2xvIFNwdXJpbyA8ZGFuaWVsZS5jZXJhb2xv c3B1cmlvQGludGVsLmNvbT4KQ2M6IENocmlzIFdpbHNvbiA8Y2hyaXNAY2hyaXMtd2lsc29uLmNv LnVrPgpDQzogQXJrYWRpdXN6IEhpbGVyIDxhcmthZGl1c3ouaGlsZXJAaW50ZWwuY29tPgpTaWdu ZWQtb2ZmLWJ5OiBPc2NhciBNYXRlbyA8b3NjYXIubWF0ZW9AaW50ZWwuY29tPgotLS0KIGRyaXZl cnMvZ3B1L2RybS9pOTE1L2k5MTVfZGVidWdmcy5jICAgICB8ICA2ICsrKy0tLQogZHJpdmVycy9n cHUvZHJtL2k5MTUvaTkxNV9kcnYuaCAgICAgICAgIHwgIDYgKysrLS0tCiBkcml2ZXJzL2dwdS9k cm0vaTkxNS9pOTE1X3BjaS5jICAgICAgICAgfCAxMCArKysrKy0tLS0tCiBkcml2ZXJzL2dwdS9k cm0vaTkxNS9pbnRlbF9ndWNfbG9hZGVyLmMgfCAgNCArKy0tCiBkcml2ZXJzL2dwdS9kcm0vaTkx NS9pbnRlbF9odWMuYyAgICAgICAgfCAgMyArLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVs X3BtLmMgICAgICAgICB8ICAyICstCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF91Yy5jICAg ICAgICAgfCAgMiArLQogNyBmaWxlcyBjaGFuZ2VkLCAxNiBpbnNlcnRpb25zKCspLCAxNyBkZWxl dGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2RlYnVnZnMu YyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZGVidWdmcy5jCmluZGV4IGUwMzBiNDEuLjQ1 MzhhNWIgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZGVidWdmcy5jCisr KyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZGVidWdmcy5jCkBAIC0yMzY2LDcgKzIzNjYs NyBAQCBzdGF0aWMgaW50IGk5MTVfaHVjX2xvYWRfc3RhdHVzX2luZm8oc3RydWN0IHNlcV9maWxl ICptLCB2b2lkICpkYXRhKQogCXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9IG5v ZGVfdG9faTkxNShtLT5wcml2YXRlKTsKIAlzdHJ1Y3QgaW50ZWxfdWNfZncgKmh1Y19mdyA9ICZk ZXZfcHJpdi0+aHVjLmZ3OwogCi0JaWYgKCFIQVNfR1VDKGRldl9wcml2KSkgeworCWlmICghSEFT X1VDKGRldl9wcml2KSkgewogCQlzZXFfcHV0cyhtLCAiTm8gSHVDIHN1cHBvcnQgaW4gSFdcbiIp OwogCQlyZXR1cm4gMDsKIAl9CkBAIC0yNDAxLDcgKzI0MDEsNyBAQCBzdGF0aWMgaW50IGk5MTVf Z3VjX2xvYWRfc3RhdHVzX2luZm8oc3RydWN0IHNlcV9maWxlICptLCB2b2lkICpkYXRhKQogCXN0 cnVjdCBpbnRlbF91Y19mdyAqZ3VjX2Z3ID0gJmRldl9wcml2LT5ndWMuZnc7CiAJdTMyIHRtcCwg aTsKIAotCWlmICghSEFTX0dVQyhkZXZfcHJpdikpIHsKKwlpZiAoIUhBU19VQyhkZXZfcHJpdikp IHsKIAkJc2VxX3B1dHMobSwgIk5vIEd1QyBzdXBwb3J0IGluIEhXXG4iKTsKIAkJcmV0dXJuIDA7 CiAJfQpAQCAtMjUwOCw3ICsyNTA4LDcgQEAgc3RhdGljIGludCBpOTE1X2d1Y19pbmZvKHN0cnVj dCBzZXFfZmlsZSAqbSwgdm9pZCAqZGF0YSkKIAogCWlmICghZ3VjLT5leGVjYnVmX2NsaWVudCkg ewogCQlzZXFfcHJpbnRmKG0sICJHdUMgc3VibWlzc2lvbiAlc1xuIiwKLQkJCSAgIEhBU19HVUMo ZGV2X3ByaXYpID8KKwkJCSAgIEhBU19VQyhkZXZfcHJpdikgPwogCQkJICAgImRpc2FibGVkIiA6 CiAJCQkgICAibm90IHN1cHBvcnRlZCIpOwogCQlyZXR1cm4gMDsKZGlmZiAtLWdpdCBhL2RyaXZl cnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmggYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Ry di5oCmluZGV4IDVkMDAxMjAuLmE0ZDRhYzYgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9p OTE1L2k5MTVfZHJ2LmgKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuaApAQCAt ODIwLDcgKzgyMCw3IEBAIHN0cnVjdCBpbnRlbF9jc3IgewogCWZ1bmMoaGFzX2Z1bGxfNDhiaXRf cHBndHQpOyBcCiAJZnVuYyhoYXNfZ21idXNfaXJxKTsgXAogCWZ1bmMoaGFzX2dtY2hfZGlzcGxh eSk7IFwKLQlmdW5jKGhhc19ndWMpOyBcCisJZnVuYyhoYXNfdWMpOyBcCiAJZnVuYyhoYXNfaG90 cGx1Zyk7IFwKIAlmdW5jKGhhc19sM19kcGYpOyBcCiAJZnVuYyhoYXNfbGxjKTsgXApAQCAtMjky MSw3ICsyOTIxLDcgQEAgc3RhdGljIGlubGluZSBzdHJ1Y3Qgc2NhdHRlcmxpc3QgKl9fc2dfbmV4 dChzdHJ1Y3Qgc2NhdHRlcmxpc3QgKnNnKQogI2RlZmluZSBIQVNfUlVOVElNRV9QTShkZXZfcHJp dikgKChkZXZfcHJpdiktPmluZm8uaGFzX3J1bnRpbWVfcG0pCiAjZGVmaW5lIEhBU182NEJJVF9S RUxPQyhkZXZfcHJpdikgKChkZXZfcHJpdiktPmluZm8uaGFzXzY0Yml0X3JlbG9jKQogCi0jZGVm aW5lIEhBU19HVUMoZGV2X3ByaXYpCSgoZGV2X3ByaXYpLT5pbmZvLmhhc19ndWMpCisjZGVmaW5l IEhBU19VQyhkZXZfcHJpdikJKChkZXZfcHJpdiktPmluZm8uaGFzX3VjKQogI2RlZmluZSBIQVNf R1VDX1VDT0RFKGRldl9wcml2KQkoKGRldl9wcml2KS0+Z3VjLmZ3LnBhdGggIT0gTlVMTCkKICNk ZWZpbmUgSEFTX0hVQ19VQ09ERShkZXZfcHJpdikJKChkZXZfcHJpdiktPmh1Yy5mdy5wYXRoICE9 IE5VTEwpCiAKQEAgLTI5MzAsNyArMjkzMCw3IEBAIHN0YXRpYyBpbmxpbmUgc3RydWN0IHNjYXR0 ZXJsaXN0ICpfX3NnX25leHQoc3RydWN0IHNjYXR0ZXJsaXN0ICpzZykKICAqIHRvIGVuYWJsZSBH dUMgc3VibWlzc2lvbiBvciB3ZSBuZWVkIGl0IHRvIHRvIHZhbGlkYXRlIGEgSHVDIGZpcm13YXJl CiAgKi8KICNkZWZpbmUgTkVFRFNfR1VDX0xPQURJTkcoZGV2X3ByaXYpIFwKLQkoSEFTX0dVQyhk ZXZfcHJpdikgJiYgXAorCShIQVNfVUMoZGV2X3ByaXYpICYmIFwKIAkoaTkxNS5lbmFibGVfZ3Vj X3N1Ym1pc3Npb24gfHwgSEFTX0hVQ19VQ09ERShkZXZfcHJpdikpKQogCiAjZGVmaW5lIEhBU19S RVNPVVJDRV9TVFJFQU1FUihkZXZfcHJpdikgKChkZXZfcHJpdiktPmluZm8uaGFzX3Jlc291cmNl X3N0cmVhbWVyKQpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9wY2kuYyBi L2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfcGNpLmMKaW5kZXggZjgwZGIyYy4uMjYxZWQzYSAx MDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9wY2kuYworKysgYi9kcml2ZXJz L2dwdS9kcm0vaTkxNS9pOTE1X3BjaS5jCkBAIC0zNTIsNyArMzUyLDcgQEAKIAkucGxhdGZvcm0g PSBJTlRFTF9TS1lMQUtFLAogCS5nZW4gPSA5LAogCS5oYXNfY3NyID0gMSwKLQkuaGFzX2d1YyA9 IDEsCisJLmhhc191YyA9IDEsCiAJLmRkYl9zaXplID0gODk2LAogfTsKIApAQCAtMzYxLDcgKzM2 MSw3IEBACiAJLnBsYXRmb3JtID0gSU5URUxfU0tZTEFLRSwKIAkuZ2VuID0gOSwKIAkuaGFzX2Nz ciA9IDEsCi0JLmhhc19ndWMgPSAxLAorCS5oYXNfdWMgPSAxLAogCS5kZGJfc2l6ZSA9IDg5NiwK IAkucmluZ19tYXNrID0gUkVOREVSX1JJTkcgfCBCU0RfUklORyB8IEJMVF9SSU5HIHwgVkVCT1hf UklORyB8IEJTRDJfUklORywKIH07CkBAIC0zODQsNyArMzg0LDcgQEAKIAkuaGFzX2RwX21zdCA9 IDEsIFwKIAkuaGFzX2dtYnVzX2lycSA9IDEsIFwKIAkuaGFzX2xvZ2ljYWxfcmluZ19jb250ZXh0 cyA9IDEsIFwKLQkuaGFzX2d1YyA9IDEsIFwKKwkuaGFzX3VjID0gMSwgXAogCS5oYXNfZGVjb3Vw bGVkX21taW8gPSAxLCBcCiAJLmhhc19hbGlhc2luZ19wcGd0dCA9IDEsIFwKIAkuaGFzX2Z1bGxf cHBndHQgPSAxLCBcCkBAIC00MTIsNyArNDEyLDcgQEAKIAkucGxhdGZvcm0gPSBJTlRFTF9LQUJZ TEFLRSwKIAkuZ2VuID0gOSwKIAkuaGFzX2NzciA9IDEsCi0JLmhhc19ndWMgPSAxLAorCS5oYXNf dWMgPSAxLAogCS5kZGJfc2l6ZSA9IDg5NiwKIH07CiAKQEAgLTQyMSw3ICs0MjEsNyBAQAogCS5w bGF0Zm9ybSA9IElOVEVMX0tBQllMQUtFLAogCS5nZW4gPSA5LAogCS5oYXNfY3NyID0gMSwKLQku aGFzX2d1YyA9IDEsCisJLmhhc191YyA9IDEsCiAJLmRkYl9zaXplID0gODk2LAogCS5yaW5nX21h c2sgPSBSRU5ERVJfUklORyB8IEJTRF9SSU5HIHwgQkxUX1JJTkcgfCBWRUJPWF9SSU5HIHwgQlNE Ml9SSU5HLAogfTsKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2d1Y19s b2FkZXIuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2d1Y19sb2FkZXIuYwppbmRleCA3 NjJmMGYyLi5mZmU3ZmI1YSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxf Z3VjX2xvYWRlci5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2d1Y19sb2FkZXIu YwpAQCAtMzc4LDcgKzM3OCw3IEBAIGludCBpbnRlbF9ndWNfaW5pdF9odyhzdHJ1Y3QgaW50ZWxf Z3VjICpndWMpCiB2b2lkIGludGVsX2d1Y19zYW5pdGl6ZV9zdWJtaXNzaW9uKHN0cnVjdCBkcm1f aTkxNV9wcml2YXRlICpkZXZfcHJpdikKIHsKIAkvKiBWZXJpZnkgaGFyZHdhcmUgc3VwcG9ydCAq LwotCWlmICghSEFTX0dVQyhkZXZfcHJpdikpIHsKKwlpZiAoIUhBU19VQyhkZXZfcHJpdikpIHsK IAkJaWYgKGk5MTUuZW5hYmxlX2d1Y19zdWJtaXNzaW9uID4gMCkKIAkJCURSTV9JTkZPKCJJZ25v cmluZyBHdUMgc3VibWlzc2lvbiBlbmFibGUsIG5vIEhXXG4iKTsKIAkJaTkxNS5lbmFibGVfZ3Vj X3N1Ym1pc3Npb24gPSAwOwpAQCAtNDQ2LDcgKzQ0Niw3IEBAIHZvaWQgaW50ZWxfZ3VjX3NlbGVj dF9mdyhzdHJ1Y3QgaW50ZWxfZ3VjICpndWMpCiAJCWd1Yy0+ZncubWFqb3JfdmVyX3dhbnRlZCA9 IEdMS19GV19NQUpPUjsKIAkJZ3VjLT5mdy5taW5vcl92ZXJfd2FudGVkID0gR0xLX0ZXX01JTk9S OwogCX0gZWxzZSB7Ci0JCWlmIChIQVNfR1VDKGRldl9wcml2KSkKKwkJaWYgKEhBU19VQyhkZXZf cHJpdikpCiAJCQlEUk1fRVJST1IoIk5vIEd1QyBGVyBrbm93biBmb3IgYSBwbGF0Zm9ybSB3aXRo IEd1QyFcbiIpOwogCQlyZXR1cm47CiAJfQpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5 MTUvaW50ZWxfaHVjLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9odWMuYwppbmRleCA0 OWE2ZDg4Li4xOTE5MWIyIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9o dWMuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9odWMuYwpAQCAtMTc2LDggKzE3 Niw3IEBAIHZvaWQgaW50ZWxfaHVjX3NlbGVjdF9mdyhzdHJ1Y3QgaW50ZWxfaHVjICpodWMpCiAJ CWh1Yy0+ZncubWFqb3JfdmVyX3dhbnRlZCA9IEdMS19IVUNfRldfTUFKT1I7CiAJCWh1Yy0+Zncu bWlub3JfdmVyX3dhbnRlZCA9IEdMS19IVUNfRldfTUlOT1I7CiAJfSBlbHNlIHsKLQkJLyogRm9y IG5vdywgZXZlcnl0aGluZyB3aXRoIGEgR3VDIGFsc28gaGFzIGEgSHVDICovCi0JCWlmIChIQVNf R1VDKGRldl9wcml2KSkKKwkJaWYgKEhBU19VQyhkZXZfcHJpdikpCiAJCQlEUk1fRVJST1IoIk5v IEh1QyBGVyBrbm93biBmb3IgYSBwbGF0Zm9ybSB3aXRoIEh1QyFcbiIpOwogCQlyZXR1cm47CiAJ fQpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcG0uYyBiL2RyaXZlcnMv Z3B1L2RybS9pOTE1L2ludGVsX3BtLmMKaW5kZXggY2FjYjY1Zi4uNTBiZGYyZSAxMDA2NDQKLS0t IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcG0uYworKysgYi9kcml2ZXJzL2dwdS9kcm0v aTkxNS9pbnRlbF9wbS5jCkBAIC01NjkwLDcgKzU2OTAsNyBAQCBzdGF0aWMgdm9pZCBnZW45X2Vu YWJsZV9yYzYoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KQogCWZvcl9lYWNoX2Vu Z2luZShlbmdpbmUsIGRldl9wcml2LCBpZCkKIAkJSTkxNV9XUklURShSSU5HX01BWF9JRExFKGVu Z2luZS0+bW1pb19iYXNlKSwgMTApOwogCi0JaWYgKEhBU19HVUMoZGV2X3ByaXYpKQorCWlmIChI QVNfVUMoZGV2X3ByaXYpKQogCQlJOTE1X1dSSVRFKEdVQ19NQVhfSURMRV9DT1VOVCwgMHhBKTsK IAogCUk5MTVfV1JJVEUoR0VONl9SQ19TTEVFUCwgMCk7CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dw dS9kcm0vaTkxNS9pbnRlbF91Yy5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfdWMuYwpp bmRleCAyZjFmNzliLi5mMTI2ZDdlIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9p bnRlbF91Yy5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3VjLmMKQEAgLTIxMSw3 ICsyMTEsNyBAQCBzdGF0aWMgdm9pZCBmZXRjaF91Y19mdyhzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0 ZSAqZGV2X3ByaXYsCiAKIHZvaWQgaW50ZWxfdWNfaW5pdF9mdyhzdHJ1Y3QgZHJtX2k5MTVfcHJp dmF0ZSAqZGV2X3ByaXYpCiB7Ci0JaWYgKCFIQVNfR1VDKGRldl9wcml2KSkKKwlpZiAoIUhBU19V QyhkZXZfcHJpdikpCiAJCXJldHVybjsKIAogCWZldGNoX3VjX2Z3KGRldl9wcml2LCAmZGV2X3By aXYtPmh1Yy5mdyk7Ci0tIAoxLjkuMQoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJl ZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGlu Zm8vaW50ZWwtZ2Z4Cg==