From: Dave Gordon Subject: [PATCH 2/3] drm/i915/guc: stop using kmap_atomic() during request submission Date: Thu, 14 Apr 2016 18:19:01 +0100 Message-ID: <1460654342-6071-2-git-send-email-david.s.gordon@intel.com> References: <1460654342-6071-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 mga11.intel.com (mga11.intel.com [192.55.52.93]) by gabe.freedesktop.org (Postfix) with ESMTP id 101EE6EAA4 for ; Thu, 14 Apr 2016 17:19:24 +0000 (UTC) In-Reply-To: <1460654342-6071-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 Cc: daniel.vetter@ffwll.ch List-Id: intel-gfx@lists.freedesktop.org RnJvbTogQWxleCBEYWkgPHl1LmRhaUBpbnRlbC5jb20+CgpOb3cgdGhhdCB3ZSBrZWVwIEd1QyBz aGFyZWQgb2JqZWN0cyBtYXBwZWQgaW50byBrZXJuZWwgc3BhY2UgZm9yIHRoZWlyCmVudGlyZSBs aWZldGltZSwgd2UgY2FuIHNpbXBsaWZ5IHRoZSBjb2RlIGZvciBhY2Nlc3NpbmcgdGhlIGRvb3Ji ZWxscwphbmQgd29yayBxdWV1ZSwgd2hpY2ggd2VyZSBwcmV2aW91c2x5IGNhbGxpbmcga21hcF9h dG9taWMoKSBvbiAqZWFjaCoKcmVxdWVzdCBzdWJtaXNzaW9uLgoKVGhpcyBwYXRjaCBmaXhlcyB0 aGUgQlVHIHNob3duIGJlbG93LCB3aGVyZSB0aGUgdGhyZWFkIGNvdWxkIHNsZWVwCndoaWxlIGhv bGRpbmcgdGhlIGttYXBfYXRvbWljIG1hcHBpbmcuCgpbICAgMzQuMDk4Nzk4XSBCVUc6IHNjaGVk dWxpbmcgd2hpbGUgYXRvbWljOgpnZW1fY2xvc2VfcmFjZS8xOTQxLzB4MDAwMDAwMDIKWyAgIDM0 LjA5ODgyMl0gTW9kdWxlcyBsaW5rZWQgaW46IGhpZF9nZW5lcmljIHVzYmhpZCBpOTE1IGFzaXgg dXNibmV0CmxpYnBoeSBtaWkgaTJjX2FsZ29fYml0IGRybV9rbXNfaGVscGVyIGNmYmZpbGxyZWN0 IHN5c2NvcHlhcmVhIGNmYmltZ2JsdApzeXNmaWxscmVjdCBzeXNpbWdibHQgZmJfc3lzX2ZvcHMg Y2ZiY29weWFyZWEgZHJtIGNvcmV0ZW1wIGkyY19oaWQgaGlkCnZpZGVvIHBpbmN0cmxfc3Vucmlz ZXBvaW50IHBpbmN0cmxfaW50ZWwgYWNwaV9wYWQgbmxzX2lzbzg4NTlfMSBlMTAwMGUKcHRwIHBz bW91c2UgcHBzX2NvcmUgYWhjaSBsaWJhaGNpClsgICAzNC4wOTg4MjRdIENQVTogMCBQSUQ6IDE5 NDEgQ29tbTogZ2VtX2Nsb3NlX3JhY2UgVGFpbnRlZDogRyAgICAgVQogICAgICAgICAgNC40LjAt MTYwMTIxKyAjMTIzClsgICAzNC4wOTg4MjRdIEhhcmR3YXJlIG5hbWU6IEludGVsIENvcnBvcmF0 aW9uIFNreWxha2UgQ2xpZW50CnBsYXRmb3JtL1NreWxha2UgQUlPIEREUjNMIFJWUDEwLCBCSU9T IFNLTFNFMlIxLlIwMC5YMTAwLkIwMS4xNTA5MjIwNTUxCjA5LzIyLzIwMTUKWyAgIDM0LjA5ODgy NV0gIDAwMDAwMDAwMDAwMTNlNDAgZmZmZjg4MDE2NmMyN2E3OCBmZmZmZmZmZjgxMjgwZDAyCmZm ZmY4ODAxNzJjMTNlNDAKWyAgIDM0LjA5ODgyNl0gIGZmZmY4ODAxNjZjMjdhODggZmZmZmZmZmY4 MTBjMjAzYSBmZmZmODgwMTY2YzI3YWM4CmZmZmZmZmZmODE0ZWM4MDgKWyAgIDM0LjA5ODgyN10g IGZmZmY4ODAxNmI3YzYwMDAgZmZmZjg4MDE2NmMyODAwMCAwMDAwMDAwMDAwMGY0MjQwCjAwMDAw MDAwMDAwMDAwMDEKWyAgIDM0LjA5ODgyN10gQ2FsbCBUcmFjZToKWyAgIDM0LjA5ODgzMV0gIFs8 ZmZmZmZmZmY4MTI4MGQwMj5dIGR1bXBfc3RhY2srMHg0Yi8weDc5ClsgICAzNC4wOTg4MzNdICBb PGZmZmZmZmZmODEwYzIwM2E+XSBfX3NjaGVkdWxlX2J1ZysweDQxLzB4NGYKWyAgIDM0LjA5ODgz NF0gIFs8ZmZmZmZmZmY4MTRlYzgwOD5dIF9fc2NoZWR1bGUrMHg1YTgvMHg2OTAKWyAgIDM0LjA5 ODgzNV0gIFs8ZmZmZmZmZmY4MTRlYzkyNz5dIHNjaGVkdWxlKzB4MzcvMHg4MApbICAgMzQuMDk4 ODM2XSAgWzxmZmZmZmZmZjgxNGVmM2ZkPl0Kc2NoZWR1bGVfaHJ0aW1lb3V0X3JhbmdlX2Nsb2Nr KzB4YWQvMHgxMzAKWyAgIDM0LjA5ODgzN10gIFs8ZmZmZmZmZmY4MTA5MGJlMD5dID8gaHJ0aW1l cl9pbml0KzB4MTAvMHgxMApbICAgMzQuMDk4ODM4XSAgWzxmZmZmZmZmZjgxNGVmM2YxPl0gPwpz Y2hlZHVsZV9ocnRpbWVvdXRfcmFuZ2VfY2xvY2srMHhhMS8weDEzMApbICAgMzQuMDk4ODM5XSAg WzxmZmZmZmZmZjgxNGVmNDhlPl0gc2NoZWR1bGVfaHJ0aW1lb3V0X3JhbmdlKzB4ZS8weDEwClsg ICAzNC4wOTg4NDBdICBbPGZmZmZmZmZmODE0ZWVmOWI+XSB1c2xlZXBfcmFuZ2UrMHgzYi8weDQw ClsgICAzNC4wOTg4NTNdICBbPGZmZmZmZmZmYTAxZWMxMDk+XSBpOTE1X2d1Y193cV9jaGVja19z cGFjZSsweDExOS8weDIxMApbaTkxNV0KWyAgIDM0LjA5ODg2MV0gIFs8ZmZmZmZmZmZhMDFkYTQ3 Yz5dCmludGVsX2xvZ2ljYWxfcmluZ19hbGxvY19yZXF1ZXN0X2V4dHJhcysweDVjLzB4NzAgW2k5 MTVdClsgICAzNC4wOTg4NjldICBbPGZmZmZmZmZmYTAxY2RiZjE+XSBpOTE1X2dlbV9yZXF1ZXN0 X2FsbG9jKzB4OTEvMHgxNzAKW2k5MTVdClsgICAzNC4wOTg4NzVdICBbPGZmZmZmZmZmYTAxYzFj MDc+XQppOTE1X2dlbV9kb19leGVjYnVmZmVyLmlzcmEuMjUrMHhiYzcvMHgxMmEwIFtpOTE1XQpb ICAgMzQuMDk4ODgyXSAgWzxmZmZmZmZmZmEwMWNiNzg1Pl0gPwppOTE1X2dlbV9vYmplY3RfZ2V0 X3BhZ2VzX2d0dCsweDIyNS8weDNjMCBbaTkxNV0KWyAgIDM0LjA5ODg4OV0gIFs8ZmZmZmZmZmZh MDFkMWZiNj5dID8gaTkxNV9nZW1fcHdyaXRlX2lvY3RsKzB4ZDYvMHg5ZjAKW2k5MTVdClsgICAz NC4wOTg4OTVdICBbPGZmZmZmZmZmYTAxYzJlNjg+XSBpOTE1X2dlbV9leGVjYnVmZmVyMisweGE4 LzB4MjUwCltpOTE1XQpbICAgMzQuMDk4OTAwXSAgWzxmZmZmZmZmZmEwMGY2NWQ4Pl0gZHJtX2lv Y3RsKzB4MjU4LzB4NGYwIFtkcm1dClsgICAzNC4wOTg5MDZdICBbPGZmZmZmZmZmYTAxYzJkYzA+ XSA/IGk5MTVfZ2VtX2V4ZWNidWZmZXIrMHgzNDAvMHgzNDAKW2k5MTVdClsgICAzNC4wOTg5MDhd ICBbPGZmZmZmZmZmODExMTU5MGQ+XSBkb192ZnNfaW9jdGwrMHgyY2QvMHg0YTAKWyAgIDM0LjA5 ODkwOV0gIFs8ZmZmZmZmZmY4MTExZWFjMj5dID8gX19mZ2V0KzB4NzIvMHhiMApbICAgMzQuMDk4 OTEwXSAgWzxmZmZmZmZmZjgxMTE1YjFjPl0gU3lTX2lvY3RsKzB4M2MvMHg3MApbICAgMzQuMDk4 OTExXSAgWzxmZmZmZmZmZjgxNGVmZmQ3Pl0gZW50cnlfU1lTQ0FMTF82NF9mYXN0cGF0aCsweDEy LzB4NmEKWyAgIDM0LjEwMDIwOF0gLS0tLS0tLS0tLS0tWyBjdXQgaGVyZSBdLS0tLS0tLS0tLS0t CgpCdWd6aWxsYTogaHR0cHM6Ly9idWdzLmZyZWVkZXNrdG9wLm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 OTM4NDcKQ2M6IDxkYW5pZWwudmV0dGVyQGZmd2xsLmNoPgpDYzogPHR2cnRrby51cnN1bGluQGlu dGVsLmNvbT4KU2lnbmVkLW9mZi1ieTogQWxleCBEYWkgPHl1LmRhaUBpbnRlbC5jb20+ClNpZ25l ZC1vZmYtYnk6IERhdmUgR29yZG9uIDxkYXZpZC5zLmdvcmRvbkBpbnRlbC5jb20+Ci0tLQogZHJp dmVycy9ncHUvZHJtL2k5MTUvaTkxNV9ndWNfc3VibWlzc2lvbi5jIHwgMjEgKysrKy0tLS0tLS0t LS0tLS0tLS0tCiAxIGZpbGUgY2hhbmdlZCwgNCBpbnNlcnRpb25zKCspLCAxNyBkZWxldGlvbnMo LSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2d1Y19zdWJtaXNzaW9u LmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2d1Y19zdWJtaXNzaW9uLmMKaW5kZXggZjgw ZjU3Ny4uZmJkNTdjYSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9ndWNf c3VibWlzc2lvbi5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ3VjX3N1Ym1pc3Np b24uYwpAQCAtMTkxLDExICsxOTEsOSBAQCBzdGF0aWMgaW50IGd1Y19yaW5nX2Rvb3JiZWxsKHN0 cnVjdCBpOTE1X2d1Y19jbGllbnQgKmdjKQogCXN0cnVjdCBndWNfcHJvY2Vzc19kZXNjICpkZXNj OwogCXVuaW9uIGd1Y19kb29yYmVsbF9xdyBkYl9jbXAsIGRiX2V4YywgZGJfcmV0OwogCXVuaW9u IGd1Y19kb29yYmVsbF9xdyAqZGI7Ci0Jdm9pZCAqYmFzZTsKIAlpbnQgYXR0ZW1wdCA9IDIsIHJl dCA9IC1FQUdBSU47CiAKLQliYXNlID0ga21hcF9hdG9taWMoaTkxNV9nZW1fb2JqZWN0X2dldF9w YWdlKGdjLT5jbGllbnRfb2JqLCAwKSk7Ci0JZGVzYyA9IGJhc2UgKyBnYy0+cHJvY19kZXNjX29m ZnNldDsKKwlkZXNjID0gZ2MtPmNsaWVudF9iYXNlICsgZ2MtPnByb2NfZGVzY19vZmZzZXQ7CiAK IAkvKiBVcGRhdGUgdGhlIHRhaWwgc28gaXQgaXMgdmlzaWJsZSB0byBHdUMgKi8KIAlkZXNjLT50 YWlsID0gZ2MtPndxX3RhaWw7CkBAIC0yMTEsNyArMjA5LDcgQEAgc3RhdGljIGludCBndWNfcmlu Z19kb29yYmVsbChzdHJ1Y3QgaTkxNV9ndWNfY2xpZW50ICpnYykKIAkJZGJfZXhjLmNvb2tpZSA9 IDE7CiAKIAkvKiBwb2ludGVyIG9mIGN1cnJlbnQgZG9vcmJlbGwgY2FjaGVsaW5lICovCi0JZGIg PSBiYXNlICsgZ2MtPmRvb3JiZWxsX29mZnNldDsKKwlkYiA9IGdjLT5jbGllbnRfYmFzZSArIGdj LT5kb29yYmVsbF9vZmZzZXQ7CiAKIAl3aGlsZSAoYXR0ZW1wdC0tKSB7CiAJCS8qIGxldHMgcmlu ZyB0aGUgZG9vcmJlbGwgKi8KQEAgLTI0Myw3ICsyNDEsNiBAQCBzdGF0aWMgaW50IGd1Y19yaW5n X2Rvb3JiZWxsKHN0cnVjdCBpOTE1X2d1Y19jbGllbnQgKmdjKQogCS8qIEZpbmFsbHksIHVwZGF0 ZSB0aGUgY2FjaGVkIGNvcHkgb2YgdGhlIEd1QydzIFdRIGhlYWQgKi8KIAlnYy0+d3FfaGVhZCA9 IGRlc2MtPmhlYWQ7CiAKLQlrdW5tYXBfYXRvbWljKGJhc2UpOwogCXJldHVybiByZXQ7CiB9CiAK QEAgLTQ2Miw3ICs0NTksNiBAQCBzdGF0aWMgdm9pZCBndWNfZmluaV9jdHhfZGVzYyhzdHJ1Y3Qg aW50ZWxfZ3VjICpndWMsCiBpbnQgaTkxNV9ndWNfd3FfY2hlY2tfc3BhY2Uoc3RydWN0IGk5MTVf Z3VjX2NsaWVudCAqZ2MpCiB7CiAJc3RydWN0IGd1Y19wcm9jZXNzX2Rlc2MgKmRlc2M7Ci0Jdm9p ZCAqYmFzZTsKIAl1MzIgc2l6ZSA9IHNpemVvZihzdHJ1Y3QgZ3VjX3dxX2l0ZW0pOwogCWludCBy ZXQgPSAtRVRJTUVET1VULCB0aW1lb3V0X2NvdW50ZXIgPSAyMDA7CiAKQEAgLTQ3NCw4ICs0NzAs NyBAQCBpbnQgaTkxNV9ndWNfd3FfY2hlY2tfc3BhY2Uoc3RydWN0IGk5MTVfZ3VjX2NsaWVudCAq Z2MpCiAJaWYgKENJUkNfU1BBQ0UoZ2MtPndxX3RhaWwsIGdjLT53cV9oZWFkLCBnYy0+d3Ffc2l6 ZSkgPj0gc2l6ZSkKIAkJcmV0dXJuIDA7CiAKLQliYXNlID0ga21hcF9hdG9taWMoaTkxNV9nZW1f b2JqZWN0X2dldF9wYWdlKGdjLT5jbGllbnRfb2JqLCAwKSk7Ci0JZGVzYyA9IGJhc2UgKyBnYy0+ cHJvY19kZXNjX29mZnNldDsKKwlkZXNjID0gZ2MtPmNsaWVudF9iYXNlICsgZ2MtPnByb2NfZGVz Y19vZmZzZXQ7CiAKIAl3aGlsZSAodGltZW91dF9jb3VudGVyLS0gPiAwKSB7CiAJCWdjLT53cV9o ZWFkID0gZGVzYy0+aGVhZDsKQEAgLTQ4OSw4ICs0ODQsNiBAQCBpbnQgaTkxNV9ndWNfd3FfY2hl Y2tfc3BhY2Uoc3RydWN0IGk5MTVfZ3VjX2NsaWVudCAqZ2MpCiAJCQl1c2xlZXBfcmFuZ2UoMTAw MCwgMjAwMCk7CiAJfTsKIAotCWt1bm1hcF9hdG9taWMoYmFzZSk7Ci0KIAlyZXR1cm4gcmV0Owog fQogCkBAIC00OTgsNyArNDkxLDYgQEAgc3RhdGljIGludCBndWNfYWRkX3dvcmtxdWV1ZV9pdGVt KHN0cnVjdCBpOTE1X2d1Y19jbGllbnQgKmdjLAogCQkJCSAgc3RydWN0IGRybV9pOTE1X2dlbV9y ZXF1ZXN0ICpycSkKIHsKIAlzdHJ1Y3QgZ3VjX3dxX2l0ZW0gKndxaTsKLQl2b2lkICpiYXNlOwog CXUzMiB0YWlsLCB3cV9sZW4sIHdxX29mZiwgc3BhY2U7CiAKIAlzcGFjZSA9IENJUkNfU1BBQ0Uo Z2MtPndxX3RhaWwsIGdjLT53cV9oZWFkLCBnYy0+d3Ffc2l6ZSk7CkBAIC01MjEsMTAgKzUxMyw3 IEBAIHN0YXRpYyBpbnQgZ3VjX2FkZF93b3JrcXVldWVfaXRlbShzdHJ1Y3QgaTkxNV9ndWNfY2xp ZW50ICpnYywKIAlXQVJOX09OKHdxX29mZiAmIDMpOwogCiAJLyogd3Egc3RhcnRzIGZyb20gdGhl IHBhZ2UgYWZ0ZXIgZG9vcmJlbGwgLyBwcm9jZXNzX2Rlc2MgKi8KLQliYXNlID0ga21hcF9hdG9t aWMoaTkxNV9nZW1fb2JqZWN0X2dldF9wYWdlKGdjLT5jbGllbnRfb2JqLAotCQkJKHdxX29mZiAr IEdVQ19EQl9TSVpFKSA+PiBQQUdFX1NISUZUKSk7Ci0Jd3Ffb2ZmICY9IFBBR0VfU0laRSAtIDE7 Ci0Jd3FpID0gKHN0cnVjdCBndWNfd3FfaXRlbSAqKSgoY2hhciAqKWJhc2UgKyB3cV9vZmYpOwor CXdxaSA9IGdjLT5jbGllbnRfYmFzZSArIEdVQ19EQl9TSVpFICsgd3Ffb2ZmOwogCiAJLyogbGVu IGRvZXMgbm90IGluY2x1ZGUgdGhlIGhlYWRlciAqLwogCXdxX2xlbiA9IHNpemVvZihzdHJ1Y3Qg Z3VjX3dxX2l0ZW0pIC8gc2l6ZW9mKHUzMikgLSAxOwpAQCAtNTQyLDggKzUzMSw2IEBAIHN0YXRp YyBpbnQgZ3VjX2FkZF93b3JrcXVldWVfaXRlbShzdHJ1Y3QgaTkxNV9ndWNfY2xpZW50ICpnYywK IAl3cWktPnJpbmdfdGFpbCA9IHRhaWwgPDwgV1FfUklOR19UQUlMX1NISUZUOwogCXdxaS0+ZmVu Y2VfaWQgPSAwOyAvKlhYWDogd2hhdCBmZW5jZSB0byBiZSBoZXJlICovCiAKLQlrdW5tYXBfYXRv bWljKGJhc2UpOwotCiAJcmV0dXJuIDA7CiB9CiAKLS0gCjEuOS4xCgpfX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0Cklu dGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5v cmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK