From: Michal Wajdeczko Subject: [PATCH v3 03/14] drm/i915/guc: Small fixups post code move Date: Thu, 12 Oct 2017 22:54:36 +0000 Message-ID: <20171012225447.256-4-michal.wajdeczko@intel.com> References: <20171012225447.256-1-michal.wajdeczko@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 66C106E9BB for ; Thu, 12 Oct 2017 22:55:04 +0000 (UTC) In-Reply-To: <20171012225447.256-1-michal.wajdeczko@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 RXhpc3RpbmcgY29kZSBuZWVkcyBzb21lIHN0eWxlIGZpeGVzLiBUbyBhdm9pZCBwb2xsdXRpbmcK cHVyZSBtb3ZlIHBhdGNoLCBkbyBpdCBub3cgYXMgc2VwYXJhdGUgc3RlcC4KClN1Z2dlc3RlZC1i eTogQ2hyaXMgV2lsc29uIDxjaHJpc0BjaHJpcy13aWxzb24uY28udWs+ClNpZ25lZC1vZmYtYnk6 IE1pY2hhbCBXYWpkZWN6a28gPG1pY2hhbC53YWpkZWN6a29AaW50ZWwuY29tPgpDYzogQ2hyaXMg V2lsc29uIDxjaHJpc0BjaHJpcy13aWxzb24uY28udWs+ClJldmlld2VkLWJ5OiBDaHJpcyBXaWxz b24gPGNocmlzQGNocmlzLXdpbHNvbi5jby51az4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9p bnRlbF9ndWMuYyAgICAgIHwgMTEgKysrKysrLS0tLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2lu dGVsX2d1Y19md2lmLmggfCAgNCArKy0tCiAyIGZpbGVzIGNoYW5nZWQsIDggaW5zZXJ0aW9ucygr KSwgNyBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRl bF9ndWMuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2d1Yy5jCmluZGV4IDcxOTE0NGEu LjEwMDM3YzAgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2d1Yy5jCisr KyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2d1Yy5jCkBAIC02Nyw3ICs2Nyw3IEBAIHZv aWQgaW50ZWxfZ3VjX2luaXRfZWFybHkoc3RydWN0IGludGVsX2d1YyAqZ3VjKQogCWd1Yy0+bm90 aWZ5ID0gZ2VuOF9ndWNfcmFpc2VfaXJxOwogfQogCi1zdGF0aWMgdTMyIGdldF9ndHR5cGUoc3Ry dWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KQorc3RhdGljIHUzMiBnZXRfZ3RfdHlwZShz dHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpCiB7CiAJLyogWFhYOiBHVCB0eXBlIGJh c2VkIG9uIFBDSSBkZXZpY2UgSUQ/IGZpZWxkIHNlZW1zIHVudXNlZCBieSBmdyAqLwogCXJldHVy biAwOwpAQCAtOTgsMTEgKzk4LDExIEBAIHZvaWQgaW50ZWxfZ3VjX2luaXRfcGFyYW1zKHN0cnVj dCBpbnRlbF9ndWMgKmd1YykKIAl1MzIgcGFyYW1zW0dVQ19DVExfTUFYX0RXT1JEU107CiAJaW50 IGk7CiAKLQltZW1zZXQoJnBhcmFtcywgMCwgc2l6ZW9mKHBhcmFtcykpOworCW1lbXNldChwYXJh bXMsIDAsIHNpemVvZihwYXJhbXMpKTsKIAogCXBhcmFtc1tHVUNfQ1RMX0RFVklDRV9JTkZPXSB8 PQotCQkoZ2V0X2d0dHlwZShkZXZfcHJpdikgPDwgR1VDX0NUTF9HVFRZUEVfU0hJRlQpIHwKLQkJ KGdldF9jb3JlX2ZhbWlseShkZXZfcHJpdikgPDwgR1VDX0NUTF9DT1JFRkFNSUxZX1NISUZUKTsK KwkJKGdldF9ndF90eXBlKGRldl9wcml2KSA8PCBHVUNfQ1RMX0dUX1RZUEVfU0hJRlQpIHwKKwkJ KGdldF9jb3JlX2ZhbWlseShkZXZfcHJpdikgPDwgR1VDX0NUTF9DT1JFX0ZBTUlMWV9TSElGVCk7 CiAKIAkvKgogCSAqIEd1QyBBUkFUIGluY3JlbWVudCBpcyAxMCBucy4gR3VDIGRlZmF1bHQgc2No ZWR1bGVyIHF1YW50dW0gaXMgb25lCkBAIC0xMjIsOCArMTIyLDkgQEAgdm9pZCBpbnRlbF9ndWNf aW5pdF9wYXJhbXMoc3RydWN0IGludGVsX2d1YyAqZ3VjKQogCWlmIChpOTE1X21vZHBhcmFtcy5n dWNfbG9nX2xldmVsID49IDApIHsKIAkJcGFyYW1zW0dVQ19DVExfREVCVUddID0KIAkJCWk5MTVf bW9kcGFyYW1zLmd1Y19sb2dfbGV2ZWwgPDwgR1VDX0xPR19WRVJCT1NJVFlfU0hJRlQ7Ci0JfSBl bHNlCisJfSBlbHNlIHsKIAkJcGFyYW1zW0dVQ19DVExfREVCVUddID0gR1VDX0xPR19ESVNBQkxF RDsKKwl9CiAKIAkvKiBJZiBHdUMgc3VibWlzc2lvbiBpcyBlbmFibGVkLCBzZXQgdXAgYWRkaXRp b25hbCBwYXJhbWV0ZXJzIGhlcmUgKi8KIAlpZiAoaTkxNV9tb2RwYXJhbXMuZW5hYmxlX2d1Y19z dWJtaXNzaW9uKSB7CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9ndWNf ZndpZi5oIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZ3VjX2Z3aWYuaAppbmRleCAxYzBh MmEzLi44MGM1MDc0IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9ndWNf ZndpZi5oCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2d1Y19md2lmLmgKQEAgLTgy LDggKzgyLDggQEAKICNkZWZpbmUgR1VDX0NUTF9BUkFUX0xPVwkJMgogCiAjZGVmaW5lIEdVQ19D VExfREVWSUNFX0lORk8JCTMKLSNkZWZpbmUgICBHVUNfQ1RMX0dUVFlQRV9TSElGVAkJMAotI2Rl ZmluZSAgIEdVQ19DVExfQ09SRUZBTUlMWV9TSElGVAk3CisjZGVmaW5lICAgR1VDX0NUTF9HVF9U WVBFX1NISUZUCQkwCisjZGVmaW5lICAgR1VDX0NUTF9DT1JFX0ZBTUlMWV9TSElGVAk3CiAKICNk ZWZpbmUgR1VDX0NUTF9MT0dfUEFSQU1TCQk0CiAjZGVmaW5lICAgR1VDX0xPR19WQUxJRAkJCSgx IDw8IDApCi0tIAoyLjcuNAoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0 b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50 ZWwtZ2Z4Cg==