From: Sagar Arun Kamble Subject: [PATCH v4 2/9] drm/i915/guc: Update prototype/name of GuC suspend/resume fns and move to intel_uc.c Date: Wed, 20 Sep 2017 23:08:17 +0530 Message-ID: <1505929104-28823-3-git-send-email-sagar.a.kamble@intel.com> References: <1505929104-28823-1-git-send-email-sagar.a.kamble@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by gabe.freedesktop.org (Postfix) with ESMTPS id 8371E89A5E for ; Wed, 20 Sep 2017 17:35:02 +0000 (UTC) In-Reply-To: <1505929104-28823-1-git-send-email-sagar.a.kamble@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 UmVuYW1lZCBpbnRlbF9ndWNfc3VzcGVuZCB0byBpbnRlbF9ndWNfZW50ZXJfc2xlZXAgYW5kIGlu dGVsX2d1Y19yZXN1bWUKdG8gaW50ZWxfZ3VjX2V4aXRfc2xlZXAgdG8gbWF0Y2ggR3VDIG5vbWVu Y2xhdHVyZSBjb21wYXRpYmlsaXR5LgpXZSBwbGFuIHRvIHVzZSBpbnRlbF9ndWNfc3VzcGVuZCBh bmQgaW50ZWxfZ3VjX3Jlc3VtZSB0aHJvdWdoCmludGVsX3VjX3N1c3BlbmQgYW5kIGludGVsX3Vj X3Jlc3VtZSBpbiB0aGUgcGF0aCBpOTE1X2RybV9zdXNwZW5kIGFuZAppOTE1X2RybV9yZXN1bWUg cmVzcGVjdGl2ZWx5IGZvciBiZXR0ZXIgbmFtaW5nLgpBbHNvLCB3aXRoIHRoaXMgcGF0Y2ggd2Ug cGFzcyBpbnRlbF9ndWMgc3RydWN0IGFzIHBhcmFtZXRlciB0byBlbnRlcl9zbGVlcAphbmQgZXhp dF9zbGVlcCBmdW5jdGlvbnMgYXMgdGhleSBhcmUgR3VDIHNwZWNpZmljIGFuZCB0aGV5IGFyZSBt b3ZlZCB0bwppbnRlbF91Yy5jIGFzIHN0YXRpYyBmdW5jdGlvbnMgY2FsbGVkIGZyb20gdWMgZ2Vu ZXJpYyBmdW5jdGlvbnMuCgp2MjogUmViYXNlIHcuci50IHJlbW92YWwgb2YgR3VDIGNvZGUgcmVz dHJ1Y3R1cmluZy4KCkNjOiBNaWNoYWwgV2FqZGVjemtvIDxtaWNoYWwud2FqZGVjemtvQGludGVs LmNvbT4KQ2M6IE1pY2hhxYIgV2luaWFyc2tpIDxtaWNoYWwud2luaWFyc2tpQGludGVsLmNvbT4K U2lnbmVkLW9mZi1ieTogU2FnYXIgQXJ1biBLYW1ibGUgPHNhZ2FyLmEua2FtYmxlQGludGVsLmNv bT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2d1Y19zdWJtaXNzaW9uLmMgfCA1MiAt LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3Vj LmMgICAgICAgICAgICB8IDU4ICsrKysrKysrKysrKysrKysrKysrKysrKysrKystLQogZHJpdmVy cy9ncHUvZHJtL2k5MTUvaW50ZWxfdWMuaCAgICAgICAgICAgIHwgIDIgLS0KIDMgZmlsZXMgY2hh bmdlZCwgNTUgaW5zZXJ0aW9ucygrKSwgNTcgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJp dmVycy9ncHUvZHJtL2k5MTUvaTkxNV9ndWNfc3VibWlzc2lvbi5jIGIvZHJpdmVycy9ncHUvZHJt L2k5MTUvaTkxNV9ndWNfc3VibWlzc2lvbi5jCmluZGV4IGUxOTFkNTYuLjk0ZWZlMzIgMTAwNjQ0 Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ3VjX3N1Ym1pc3Npb24uYworKysgYi9k cml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2d1Y19zdWJtaXNzaW9uLmMKQEAgLTEyMDUsNTUgKzEy MDUsMyBAQCB2b2lkIGk5MTVfZ3VjX3N1Ym1pc3Npb25fZGlzYWJsZShzdHJ1Y3QgZHJtX2k5MTVf cHJpdmF0ZSAqZGV2X3ByaXYpCiAJZ3VjX2NsaWVudF9mcmVlKGd1Yy0+ZXhlY2J1Zl9jbGllbnQp OwogCWd1Yy0+ZXhlY2J1Zl9jbGllbnQgPSBOVUxMOwogfQotCi0vKioKLSAqIGludGVsX2d1Y19z dXNwZW5kKCkgLSBub3RpZnkgR3VDIGVudGVyaW5nIHN1c3BlbmQgc3RhdGUKLSAqIEBkZXZfcHJp djoJaTkxNSBkZXZpY2UgcHJpdmF0ZQotICovCi1pbnQgaW50ZWxfZ3VjX3N1c3BlbmQoc3RydWN0 IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KQotewotCXN0cnVjdCBpbnRlbF9ndWMgKmd1YyA9 ICZkZXZfcHJpdi0+Z3VjOwotCXN0cnVjdCBpOTE1X2dlbV9jb250ZXh0ICpjdHg7Ci0JdTMyIGRh dGFbM107Ci0KLQlpZiAoZ3VjLT5mdy5sb2FkX3N0YXR1cyAhPSBJTlRFTF9VQ19GSVJNV0FSRV9T VUNDRVNTKQotCQlyZXR1cm4gMDsKLQotCWdlbjlfZGlzYWJsZV9ndWNfaW50ZXJydXB0cyhkZXZf cHJpdik7Ci0KLQljdHggPSBkZXZfcHJpdi0+a2VybmVsX2NvbnRleHQ7Ci0KLQlkYXRhWzBdID0g SU5URUxfR1VDX0FDVElPTl9FTlRFUl9TX1NUQVRFOwotCS8qIGFueSB2YWx1ZSBncmVhdGVyIHRo YW4gR1VDX1BPV0VSX0QwICovCi0JZGF0YVsxXSA9IEdVQ19QT1dFUl9EMTsKLQkvKiBmaXJzdCBw YWdlIGlzIHNoYXJlZCBkYXRhIHdpdGggR3VDICovCi0JZGF0YVsyXSA9IGd1Y19nZ3R0X29mZnNl dChjdHgtPmVuZ2luZVtSQ1NdLnN0YXRlKSArIExSQ19HVUNTSFJfUE4gKiBQQUdFX1NJWkU7Ci0K LQlyZXR1cm4gaW50ZWxfZ3VjX3NlbmQoZ3VjLCBkYXRhLCBBUlJBWV9TSVpFKGRhdGEpKTsKLX0K LQotLyoqCi0gKiBpbnRlbF9ndWNfcmVzdW1lKCkgLSBub3RpZnkgR3VDIHJlc3VtaW5nIGZyb20g c3VzcGVuZCBzdGF0ZQotICogQGRldl9wcml2OglpOTE1IGRldmljZSBwcml2YXRlCi0gKi8KLWlu dCBpbnRlbF9ndWNfcmVzdW1lKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdikKLXsK LQlzdHJ1Y3QgaW50ZWxfZ3VjICpndWMgPSAmZGV2X3ByaXYtPmd1YzsKLQlzdHJ1Y3QgaTkxNV9n ZW1fY29udGV4dCAqY3R4OwotCXUzMiBkYXRhWzNdOwotCi0JaWYgKGd1Yy0+ZncubG9hZF9zdGF0 dXMgIT0gSU5URUxfVUNfRklSTVdBUkVfU1VDQ0VTUykKLQkJcmV0dXJuIDA7Ci0KLQlpZiAoaTkx NS5ndWNfbG9nX2xldmVsID49IDApCi0JCWdlbjlfZW5hYmxlX2d1Y19pbnRlcnJ1cHRzKGRldl9w cml2KTsKLQotCWN0eCA9IGRldl9wcml2LT5rZXJuZWxfY29udGV4dDsKLQotCWRhdGFbMF0gPSBJ TlRFTF9HVUNfQUNUSU9OX0VYSVRfU19TVEFURTsKLQlkYXRhWzFdID0gR1VDX1BPV0VSX0QwOwot CS8qIGZpcnN0IHBhZ2UgaXMgc2hhcmVkIGRhdGEgd2l0aCBHdUMgKi8KLQlkYXRhWzJdID0gZ3Vj X2dndHRfb2Zmc2V0KGN0eC0+ZW5naW5lW1JDU10uc3RhdGUpICsgTFJDX0dVQ1NIUl9QTiAqIFBB R0VfU0laRTsKLQotCXJldHVybiBpbnRlbF9ndWNfc2VuZChndWMsIGRhdGEsIEFSUkFZX1NJWkUo ZGF0YSkpOwotfQpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfdWMuYyBi L2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3VjLmMKaW5kZXggOGU0ZDhiMC4uMGRiYjRiOSAx MDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfdWMuYworKysgYi9kcml2ZXJz L2dwdS9kcm0vaTkxNS9pbnRlbF91Yy5jCkBAIC01MzgsMTkgKzUzOCw3MSBAQCBpbnQgaW50ZWxf Z3VjX3NhbXBsZV9mb3JjZXdha2Uoc3RydWN0IGludGVsX2d1YyAqZ3VjKQogCXJldHVybiBpbnRl bF9ndWNfc2VuZChndWMsIGFjdGlvbiwgQVJSQVlfU0laRShhY3Rpb24pKTsKIH0KIAorLyoqCisg KiBpbnRlbF9ndWNfZW50ZXJfc2xlZXAoKSAtIG5vdGlmeSBHdUMgZW50ZXJpbmcgc2xlZXAgc3Rh dGUKKyAqIEBndWM6CWd1YyBzdHJ1Y3R1cmUKKyAqLworc3RhdGljIGludCBpbnRlbF9ndWNfZW50 ZXJfc2xlZXAoc3RydWN0IGludGVsX2d1YyAqZ3VjKQoreworCXN0cnVjdCBkcm1faTkxNV9wcml2 YXRlICpkZXZfcHJpdiA9IGd1Y190b19pOTE1KGd1Yyk7CisJc3RydWN0IGk5MTVfZ2VtX2NvbnRl eHQgKmN0eDsKKwl1MzIgZGF0YVszXTsKKworCWlmIChndWMtPmZ3LmxvYWRfc3RhdHVzICE9IElO VEVMX1VDX0ZJUk1XQVJFX1NVQ0NFU1MpCisJCXJldHVybiAwOworCisJZ2VuOV9kaXNhYmxlX2d1 Y19pbnRlcnJ1cHRzKGRldl9wcml2KTsKKworCWN0eCA9IGRldl9wcml2LT5rZXJuZWxfY29udGV4 dDsKKworCWRhdGFbMF0gPSBJTlRFTF9HVUNfQUNUSU9OX0VOVEVSX1NfU1RBVEU7CisJLyogYW55 IHZhbHVlIGdyZWF0ZXIgdGhhbiBHVUNfUE9XRVJfRDAgKi8KKwlkYXRhWzFdID0gR1VDX1BPV0VS X0QxOworCS8qIGZpcnN0IHBhZ2UgaXMgc2hhcmVkIGRhdGEgd2l0aCBHdUMgKi8KKwlkYXRhWzJd ID0gZ3VjX2dndHRfb2Zmc2V0KGN0eC0+ZW5naW5lW1JDU10uc3RhdGUpICsgTFJDX0dVQ1NIUl9Q TiAqIFBBR0VfU0laRTsKKworCXJldHVybiBpbnRlbF9ndWNfc2VuZChndWMsIGRhdGEsIEFSUkFZ X1NJWkUoZGF0YSkpOworfQorCisvKioKKyAqIGludGVsX2d1Y19leGl0X3NsZWVwKCkgLSBub3Rp ZnkgR3VDIGV4aXQgZnJvbSBzbGVlcCBzdGF0ZQorICogQGd1YzoJZ3VjIHN0cnVjdHVyZQorICov CitzdGF0aWMgaW50IGludGVsX2d1Y19leGl0X3NsZWVwKHN0cnVjdCBpbnRlbF9ndWMgKmd1YykK K3sKKwlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSBndWNfdG9faTkxNShndWMp OworCXN0cnVjdCBpOTE1X2dlbV9jb250ZXh0ICpjdHg7CisJdTMyIGRhdGFbM107CisKKwlpZiAo Z3VjLT5mdy5sb2FkX3N0YXR1cyAhPSBJTlRFTF9VQ19GSVJNV0FSRV9TVUNDRVNTKQorCQlyZXR1 cm4gMDsKKworCWlmIChpOTE1Lmd1Y19sb2dfbGV2ZWwgPj0gMCkKKwkJZ2VuOV9lbmFibGVfZ3Vj X2ludGVycnVwdHMoZGV2X3ByaXYpOworCisJY3R4ID0gZGV2X3ByaXYtPmtlcm5lbF9jb250ZXh0 OworCisJZGF0YVswXSA9IElOVEVMX0dVQ19BQ1RJT05fRVhJVF9TX1NUQVRFOworCWRhdGFbMV0g PSBHVUNfUE9XRVJfRDA7CisJLyogZmlyc3QgcGFnZSBpcyBzaGFyZWQgZGF0YSB3aXRoIEd1QyAq LworCWRhdGFbMl0gPSBndWNfZ2d0dF9vZmZzZXQoY3R4LT5lbmdpbmVbUkNTXS5zdGF0ZSkgKyBM UkNfR1VDU0hSX1BOICogUEFHRV9TSVpFOworCisJcmV0dXJuIGludGVsX2d1Y19zZW5kKGd1Yywg ZGF0YSwgQVJSQVlfU0laRShkYXRhKSk7Cit9CisKIGludCBpbnRlbF91Y19ydW50aW1lX3N1c3Bl bmQoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KQogewotCXJldHVybiBpbnRlbF9n dWNfc3VzcGVuZChkZXZfcHJpdik7CisJcmV0dXJuIGludGVsX2d1Y19lbnRlcl9zbGVlcCgmZGV2 X3ByaXYtPmd1Yyk7CiB9CiAKIGludCBpbnRlbF91Y19ydW50aW1lX3Jlc3VtZShzdHJ1Y3QgZHJt X2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpCiB7Ci0JcmV0dXJuIGludGVsX2d1Y19yZXN1bWUoZGV2 X3ByaXYpOworCXJldHVybiBpbnRlbF9ndWNfZXhpdF9zbGVlcCgmZGV2X3ByaXYtPmd1Yyk7CiB9 CiAKIGludCBpbnRlbF91Y19zdXNwZW5kKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJp dikKIHsKLQlyZXR1cm4gaW50ZWxfZ3VjX3N1c3BlbmQoZGV2X3ByaXYpOworCXJldHVybiBpbnRl bF9ndWNfZW50ZXJfc2xlZXAoJmRldl9wcml2LT5ndWMpOwogfQogCiBpbnQgaW50ZWxfdWNfcmVz dW1lKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdikKZGlmZiAtLWdpdCBhL2RyaXZl cnMvZ3B1L2RybS9pOTE1L2ludGVsX3VjLmggYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF91 Yy5oCmluZGV4IDNkMzNhNTEuLjVmNDlkMTMgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9p OTE1L2ludGVsX3VjLmgKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfdWMuaApAQCAt MjI5LDggKzIyOSw2IEBAIHN0YXRpYyBpbmxpbmUgdm9pZCBpbnRlbF9ndWNfbm90aWZ5KHN0cnVj dCBpbnRlbF9ndWMgKmd1YykKIC8qIGludGVsX2d1Y19sb2FkZXIuYyAqLwogaW50IGludGVsX2d1 Y19zZWxlY3RfZncoc3RydWN0IGludGVsX2d1YyAqZ3VjKTsKIGludCBpbnRlbF9ndWNfaW5pdF9o dyhzdHJ1Y3QgaW50ZWxfZ3VjICpndWMpOwotaW50IGludGVsX2d1Y19zdXNwZW5kKHN0cnVjdCBk cm1faTkxNV9wcml2YXRlICpkZXZfcHJpdik7Ci1pbnQgaW50ZWxfZ3VjX3Jlc3VtZShzdHJ1Y3Qg ZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpOwogdTMyIGludGVsX2d1Y193b3BjbV9zaXplKHN0 cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdik7CiAKIC8qIGk5MTVfZ3VjX3N1Ym1pc3Np b24uYyAqLwotLSAKMS45LjEKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fCkludGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNr dG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2lu dGVsLWdmeAo=