From: Michal Wajdeczko Subject: [PATCH 8/9] drm/i915: Move intel_guc_suspend/resume to guc.c Date: Fri, 29 Sep 2017 17:41:46 +0000 Message-ID: <20170929174147.41324-9-michal.wajdeczko@intel.com> References: <20170929174147.41324-1-michal.wajdeczko@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 AA20B6EC18 for ; Fri, 29 Sep 2017 17:42:22 +0000 (UTC) In-Reply-To: <20170929174147.41324-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 V2Ugd2FudCB0byBrZWVwIEd1QyBmdW5jdGlvbnMgdG9nZXRoZXIuClNpZ25hdHVyZXMgb2YgdGhl IGZ1bmN0aW9uIHdpbGwgYmUgY2hhbmdlZCBpbiB1cGNvbWluZyBwYXRjaC4KClNpZ25lZC1vZmYt Ynk6IE1pY2hhbCBXYWpkZWN6a28gPG1pY2hhbC53YWpkZWN6a29AaW50ZWwuY29tPgpDYzogSm9v bmFzIExhaHRpbmVuIDxqb29uYXMubGFodGluZW5AbGludXguaW50ZWwuY29tPgpDYzogQ2hyaXMg V2lsc29uIDxjaHJpc0BjaHJpcy13aWxzb24uY28udWs+CkNjOiBTYWdhciBBcnVuIEthbWJsZSA8 c2FnYXIuYS5rYW1ibGVAaW50ZWwuY29tPgotLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVf Z3VjX3N1Ym1pc3Npb24uYyB8IDUyIC0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0KIGRyaXZl cnMvZ3B1L2RybS9pOTE1L2ludGVsX2d1Yy5jICAgICAgICAgICB8IDU0ICsrKysrKysrKysrKysr KysrKysrKysrKysrKysrKwogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZ3VjLmggICAgICAg ICAgIHwgIDQgKy0tCiAzIGZpbGVzIGNoYW5nZWQsIDU2IGluc2VydGlvbnMoKyksIDU0IGRlbGV0 aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ3VjX3N1Ym1p c3Npb24uYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ3VjX3N1Ym1pc3Npb24uYwppbmRl eCAwNGYxMjgxLi5mNzBhODc1IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1 X2d1Y19zdWJtaXNzaW9uLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9ndWNfc3Vi bWlzc2lvbi5jCkBAIC0xMjEyLDU1ICsxMjEyLDMgQEAgdm9pZCBpOTE1X2d1Y19zdWJtaXNzaW9u X2Rpc2FibGUoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KQogCWd1Y19jbGllbnRf ZnJlZShndWMtPmV4ZWNidWZfY2xpZW50KTsKIAlndWMtPmV4ZWNidWZfY2xpZW50ID0gTlVMTDsK IH0KLQotLyoqCi0gKiBpbnRlbF9ndWNfc3VzcGVuZCgpIC0gbm90aWZ5IEd1QyBlbnRlcmluZyBz dXNwZW5kIHN0YXRlCi0gKiBAZGV2X3ByaXY6CWk5MTUgZGV2aWNlIHByaXZhdGUKLSAqLwotaW50 IGludGVsX2d1Y19zdXNwZW5kKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdikKLXsK LQlzdHJ1Y3QgaW50ZWxfZ3VjICpndWMgPSAmZGV2X3ByaXYtPmd1YzsKLQlzdHJ1Y3QgaTkxNV9n ZW1fY29udGV4dCAqY3R4OwotCXUzMiBkYXRhWzNdOwotCi0JaWYgKGd1Yy0+ZncubG9hZF9zdGF0 dXMgIT0gSU5URUxfVUNfRklSTVdBUkVfU1VDQ0VTUykKLQkJcmV0dXJuIDA7Ci0KLQlnZW45X2Rp c2FibGVfZ3VjX2ludGVycnVwdHMoZGV2X3ByaXYpOwotCi0JY3R4ID0gZGV2X3ByaXYtPmtlcm5l bF9jb250ZXh0OwotCi0JZGF0YVswXSA9IElOVEVMX0dVQ19BQ1RJT05fRU5URVJfU19TVEFURTsK LQkvKiBhbnkgdmFsdWUgZ3JlYXRlciB0aGFuIEdVQ19QT1dFUl9EMCAqLwotCWRhdGFbMV0gPSBH VUNfUE9XRVJfRDE7Ci0JLyogZmlyc3QgcGFnZSBpcyBzaGFyZWQgZGF0YSB3aXRoIEd1QyAqLwot CWRhdGFbMl0gPSBndWNfZ2d0dF9vZmZzZXQoY3R4LT5lbmdpbmVbUkNTXS5zdGF0ZSkgKyBMUkNf R1VDU0hSX1BOICogUEFHRV9TSVpFOwotCi0JcmV0dXJuIGludGVsX2d1Y19zZW5kKGd1YywgZGF0 YSwgQVJSQVlfU0laRShkYXRhKSk7Ci19Ci0KLS8qKgotICogaW50ZWxfZ3VjX3Jlc3VtZSgpIC0g bm90aWZ5IEd1QyByZXN1bWluZyBmcm9tIHN1c3BlbmQgc3RhdGUKLSAqIEBkZXZfcHJpdjoJaTkx NSBkZXZpY2UgcHJpdmF0ZQotICovCi1pbnQgaW50ZWxfZ3VjX3Jlc3VtZShzdHJ1Y3QgZHJtX2k5 MTVfcHJpdmF0ZSAqZGV2X3ByaXYpCi17Ci0Jc3RydWN0IGludGVsX2d1YyAqZ3VjID0gJmRldl9w cml2LT5ndWM7Ci0Jc3RydWN0IGk5MTVfZ2VtX2NvbnRleHQgKmN0eDsKLQl1MzIgZGF0YVszXTsK LQotCWlmIChndWMtPmZ3LmxvYWRfc3RhdHVzICE9IElOVEVMX1VDX0ZJUk1XQVJFX1NVQ0NFU1Mp Ci0JCXJldHVybiAwOwotCi0JaWYgKGk5MTVfbW9kcGFyYW1zLmd1Y19sb2dfbGV2ZWwgPj0gMCkK LQkJZ2VuOV9lbmFibGVfZ3VjX2ludGVycnVwdHMoZGV2X3ByaXYpOwotCi0JY3R4ID0gZGV2X3By aXYtPmtlcm5lbF9jb250ZXh0OwotCi0JZGF0YVswXSA9IElOVEVMX0dVQ19BQ1RJT05fRVhJVF9T X1NUQVRFOwotCWRhdGFbMV0gPSBHVUNfUE9XRVJfRDA7Ci0JLyogZmlyc3QgcGFnZSBpcyBzaGFy ZWQgZGF0YSB3aXRoIEd1QyAqLwotCWRhdGFbMl0gPSBndWNfZ2d0dF9vZmZzZXQoY3R4LT5lbmdp bmVbUkNTXS5zdGF0ZSkgKyBMUkNfR1VDU0hSX1BOICogUEFHRV9TSVpFOwotCi0JcmV0dXJuIGlu dGVsX2d1Y19zZW5kKGd1YywgZGF0YSwgQVJSQVlfU0laRShkYXRhKSk7Ci19CmRpZmYgLS1naXQg YS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9ndWMuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1 L2ludGVsX2d1Yy5jCmluZGV4IDkxYTBlNGQuLjc5M2NmNDkgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMv Z3B1L2RybS9pOTE1L2ludGVsX2d1Yy5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVs X2d1Yy5jCkBAIC0xNjUsMyArMTY1LDU3IEBAIGludCBpbnRlbF9ndWNfYXV0aF9odWMoc3RydWN0 IGludGVsX2d1YyAqZ3VjLCB1MzIgcnNhX29mZnNldCkKIAogCXJldHVybiBpbnRlbF9ndWNfc2Vu ZChndWMsIGFjdGlvbiwgQVJSQVlfU0laRShhY3Rpb24pKTsKIH0KKworLyoqCisgKiBpbnRlbF9n dWNfc3VzcGVuZCgpIC0gbm90aWZ5IEd1QyBlbnRlcmluZyBzdXNwZW5kIHN0YXRlCisgKiBAZGV2 X3ByaXY6CWk5MTUgZGV2aWNlIHByaXZhdGUKKyAqLworaW50IGludGVsX2d1Y19zdXNwZW5kKHN0 cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdikKK3sKKwlzdHJ1Y3QgaW50ZWxfZ3VjICpn dWMgPSAmZGV2X3ByaXYtPmd1YzsKKwlzdHJ1Y3QgaTkxNV9nZW1fY29udGV4dCAqY3R4OworCXUz MiBkYXRhWzNdOworCisJaWYgKGd1Yy0+ZncubG9hZF9zdGF0dXMgIT0gSU5URUxfVUNfRklSTVdB UkVfU1VDQ0VTUykKKwkJcmV0dXJuIDA7CisKKwlnZW45X2Rpc2FibGVfZ3VjX2ludGVycnVwdHMo ZGV2X3ByaXYpOworCisJY3R4ID0gZGV2X3ByaXYtPmtlcm5lbF9jb250ZXh0OworCisJZGF0YVsw XSA9IElOVEVMX0dVQ19BQ1RJT05fRU5URVJfU19TVEFURTsKKwkvKiBhbnkgdmFsdWUgZ3JlYXRl ciB0aGFuIEdVQ19QT1dFUl9EMCAqLworCWRhdGFbMV0gPSBHVUNfUE9XRVJfRDE7CisJLyogZmly c3QgcGFnZSBpcyBzaGFyZWQgZGF0YSB3aXRoIEd1QyAqLworCWRhdGFbMl0gPSBndWNfZ2d0dF9v ZmZzZXQoY3R4LT5lbmdpbmVbUkNTXS5zdGF0ZSkgKworCQkgIExSQ19HVUNTSFJfUE4gKiBQQUdF X1NJWkU7CisKKwlyZXR1cm4gaW50ZWxfZ3VjX3NlbmQoZ3VjLCBkYXRhLCBBUlJBWV9TSVpFKGRh dGEpKTsKK30KKworLyoqCisgKiBpbnRlbF9ndWNfcmVzdW1lKCkgLSBub3RpZnkgR3VDIHJlc3Vt aW5nIGZyb20gc3VzcGVuZCBzdGF0ZQorICogQGRldl9wcml2OglpOTE1IGRldmljZSBwcml2YXRl CisgKi8KK2ludCBpbnRlbF9ndWNfcmVzdW1lKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZf cHJpdikKK3sKKwlzdHJ1Y3QgaW50ZWxfZ3VjICpndWMgPSAmZGV2X3ByaXYtPmd1YzsKKwlzdHJ1 Y3QgaTkxNV9nZW1fY29udGV4dCAqY3R4OworCXUzMiBkYXRhWzNdOworCisJaWYgKGd1Yy0+Zncu bG9hZF9zdGF0dXMgIT0gSU5URUxfVUNfRklSTVdBUkVfU1VDQ0VTUykKKwkJcmV0dXJuIDA7CisK KwlpZiAoaTkxNV9tb2RwYXJhbXMuZ3VjX2xvZ19sZXZlbCA+PSAwKQorCQlnZW45X2VuYWJsZV9n dWNfaW50ZXJydXB0cyhkZXZfcHJpdik7CisKKwljdHggPSBkZXZfcHJpdi0+a2VybmVsX2NvbnRl eHQ7CisKKwlkYXRhWzBdID0gSU5URUxfR1VDX0FDVElPTl9FWElUX1NfU1RBVEU7CisJZGF0YVsx XSA9IEdVQ19QT1dFUl9EMDsKKwkvKiBmaXJzdCBwYWdlIGlzIHNoYXJlZCBkYXRhIHdpdGggR3VD ICovCisJZGF0YVsyXSA9IGd1Y19nZ3R0X29mZnNldChjdHgtPmVuZ2luZVtSQ1NdLnN0YXRlKSAr CisJCSAgTFJDX0dVQ1NIUl9QTiAqIFBBR0VfU0laRTsKKworCXJldHVybiBpbnRlbF9ndWNfc2Vu ZChndWMsIGRhdGEsIEFSUkFZX1NJWkUoZGF0YSkpOworfQpkaWZmIC0tZ2l0IGEvZHJpdmVycy9n cHUvZHJtL2k5MTUvaW50ZWxfZ3VjLmggYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9ndWMu aAppbmRleCBkNTA4YjM1Li5mZmVkYjA2IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkx NS9pbnRlbF9ndWMuaAorKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9ndWMuaApAQCAt MTQ5LDYgKzE0OSw4IEBAIGludCBpbnRlbF9ndWNfc2VuZF9ub3Aoc3RydWN0IGludGVsX2d1YyAq Z3VjLCBjb25zdCB1MzIgKmFjdGlvbiwgdTMyIGxlbik7CiBpbnQgaW50ZWxfZ3VjX3NlbmRfbW1p byhzdHJ1Y3QgaW50ZWxfZ3VjICpndWMsIGNvbnN0IHUzMiAqYWN0aW9uLCB1MzIgbGVuKTsKIGlu dCBpbnRlbF9ndWNfc2FtcGxlX2ZvcmNld2FrZShzdHJ1Y3QgaW50ZWxfZ3VjICpndWMpOwogaW50 IGludGVsX2d1Y19hdXRoX2h1YyhzdHJ1Y3QgaW50ZWxfZ3VjICpndWMsIHUzMiByc2Ffb2Zmc2V0 KTsKK2ludCBpbnRlbF9ndWNfc3VzcGVuZChzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3By aXYpOworaW50IGludGVsX2d1Y19yZXN1bWUoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9w cml2KTsKIAogLyogaW50ZWxfZ3VjX2xvYWRlci5jICovCiBpbnQgaW50ZWxfZ3VjX3NlbGVjdF9m dyhzdHJ1Y3QgaW50ZWxfZ3VjICpndWMpOwpAQCAtMTYxLDggKzE2Myw2IEBAIGludCBpOTE1X2d1 Y19zdWJtaXNzaW9uX2VuYWJsZShzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpOwog dm9pZCBpOTE1X2d1Y19zdWJtaXNzaW9uX2Rpc2FibGUoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUg KmRldl9wcml2KTsKIHZvaWQgaTkxNV9ndWNfc3VibWlzc2lvbl9maW5pKHN0cnVjdCBkcm1faTkx NV9wcml2YXRlICpkZXZfcHJpdik7CiBzdHJ1Y3QgaTkxNV92bWEgKmludGVsX2d1Y19hbGxvY2F0 ZV92bWEoc3RydWN0IGludGVsX2d1YyAqZ3VjLCB1MzIgc2l6ZSk7Ci1pbnQgaW50ZWxfZ3VjX3N1 c3BlbmQoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KTsKLWludCBpbnRlbF9ndWNf cmVzdW1lKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdik7CiAKIC8qIGludGVsX2d1 Y19sb2cuYyAqLwogaW50IGludGVsX2d1Y19sb2dfY3JlYXRlKHN0cnVjdCBpbnRlbF9ndWMgKmd1 Yyk7Ci0tIAoyLjcuNAoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Au b3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50ZWwt Z2Z4Cg==