From mboxrd@z Thu Jan 1 00:00:00 1970 From: Chris Wilson Subject: [PATCH v2] drm/i915: Stop storing ctx->user_handle Date: Tue, 19 Mar 2019 12:58:13 +0000 Message-ID: <20190319125813.16438-1-chris@chris-wilson.co.uk> References: <20190319115742.21844-6-chris@chris-wilson.co.uk> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from fireflyinternet.com (mail.fireflyinternet.com [109.228.58.192]) by gabe.freedesktop.org (Postfix) with ESMTPS id 41B0189134 for ; Tue, 19 Mar 2019 12:58:21 +0000 (UTC) In-Reply-To: <20190319115742.21844-6-chris@chris-wilson.co.uk> 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 VGhlIHVzZXJfaGFuZGxlIG5lZWQgb25seSBiZSBrbm93biBieSB1c2Vyc3BhY2UgZm9yIGl0IHRv IGxvb2t1cCB0aGUKY29udGV4dCB2aWEgdGhlIGlkcjsgaW50ZXJuYWxseSB3ZSBoYXZlIG5vIHVz ZSBmb3IgaXQuCgpTaWduZWQtb2ZmLWJ5OiBDaHJpcyBXaWxzb24gPGNocmlzQGNocmlzLXdpbHNv bi5jby51az4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2RlYnVnZnMuYyAgICAgICAg ICAgfCAgNSArKy0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9jb250ZXh0LmMgICAg ICAgfCAyMyArKysrKysrKy0tLS0tLS0tLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dl bV9jb250ZXh0LmggICAgICAgfCAgNSAtLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dl bV9jb250ZXh0X3R5cGVzLmggfCAgOSAtLS0tLS0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkx NV9ncHVfZXJyb3IuYyAgICAgICAgIHwgMTEgKysrKy0tLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkx NS9pOTE1X2dwdV9lcnJvci5oICAgICAgICAgfCAgMSAtCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9z ZWxmdGVzdHMvbW9ja19jb250ZXh0LmMgfCAgMiArLQogNyBmaWxlcyBjaGFuZ2VkLCAxNiBpbnNl cnRpb25zKCspLCA0MCBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0v aTkxNS9pOTE1X2RlYnVnZnMuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZGVidWdmcy5j CmluZGV4IGY0YTA3MTkwYTBlOC4uNzk3MDc3MGYyM2E5IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dw dS9kcm0vaTkxNS9pOTE1X2RlYnVnZnMuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1 X2RlYnVnZnMuYwpAQCAtNDA5LDkgKzQwOSw4IEBAIHN0YXRpYyB2b2lkIHByaW50X2NvbnRleHRf c3RhdHMoc3RydWN0IHNlcV9maWxlICptLAogCiAJCQlyY3VfcmVhZF9sb2NrKCk7CiAJCQl0YXNr ID0gcGlkX3Rhc2soY3R4LT5waWQgPzogZmlsZS0+cGlkLCBQSURUWVBFX1BJRCk7Ci0JCQlzbnBy aW50ZihuYW1lLCBzaXplb2YobmFtZSksICIlcy8lZCIsCi0JCQkJIHRhc2sgPyB0YXNrLT5jb21t IDogIjx1bmtub3duPiIsCi0JCQkJIGN0eC0+dXNlcl9oYW5kbGUpOworCQkJc25wcmludGYobmFt ZSwgc2l6ZW9mKG5hbWUpLCAiJXMiLAorCQkJCSB0YXNrID8gdGFzay0+Y29tbSA6ICI8dW5rbm93 bj4iKTsKIAkJCXJjdV9yZWFkX3VubG9jaygpOwogCiAJCQlwcmludF9maWxlX3N0YXRzKG0sIG5h bWUsIHN0YXRzKTsKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2Nv bnRleHQuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2NvbnRleHQuYwppbmRleCA3 OTk2ODRkMDU3MDQuLjk1YzUxMDNlMTVhNSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5 MTUvaTkxNV9nZW1fY29udGV4dC5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2Vt X2NvbnRleHQuYwpAQCAtNjAyLDIwICs2MDIsMTUgQEAgc3RhdGljIGludCBnZW1fY29udGV4dF9y ZWdpc3RlcihzdHJ1Y3QgaTkxNV9nZW1fY29udGV4dCAqY3R4LAogCiAJLyogQW5kIGZpbmFsbHkg ZXhwb3NlIG91cnNlbHZlcyB0byB1c2Vyc3BhY2UgdmlhIHRoZSBpZHIgKi8KIAltdXRleF9sb2Nr KCZmcHJpdi0+Y29udGV4dF9pZHJfbG9jayk7Ci0JcmV0ID0gaWRyX2FsbG9jKCZmcHJpdi0+Y29u dGV4dF9pZHIsIGN0eCwKLQkJCURFRkFVTFRfQ09OVEVYVF9IQU5ETEUsIDAsIEdGUF9LRVJORUwp OwotCWlmIChyZXQgPj0gMCkKLQkJY3R4LT51c2VyX2hhbmRsZSA9IHJldDsKKwlyZXQgPSBpZHJf YWxsb2MoJmZwcml2LT5jb250ZXh0X2lkciwgY3R4LCAwLCAwLCBHRlBfS0VSTkVMKTsKIAltdXRl eF91bmxvY2soJmZwcml2LT5jb250ZXh0X2lkcl9sb2NrKTsKLQlpZiAocmV0IDwgMCkKLQkJZ290 byBlcnJfbmFtZTsKLQotCXJldHVybiAwOworCWlmIChyZXQgPj0gMCkKKwkJZ290byBvdXQ7CiAK LWVycl9uYW1lOgogCWtmcmVlKGZldGNoX2FuZF96ZXJvKCZjdHgtPm5hbWUpKTsKIGVycl9waWQ6 CiAJcHV0X3BpZChmZXRjaF9hbmRfemVybygmY3R4LT5waWQpKTsKK291dDoKIAlyZXR1cm4gcmV0 OwogfQogCkBAIC02MzgsMTEgKzYzMywxMSBAQCBpbnQgaTkxNV9nZW1fY29udGV4dF9vcGVuKHN0 cnVjdCBkcm1faTkxNV9wcml2YXRlICppOTE1LAogCX0KIAogCWVyciA9IGdlbV9jb250ZXh0X3Jl Z2lzdGVyKGN0eCwgZmlsZV9wcml2KTsKLQlpZiAoZXJyKQorCWlmIChlcnIgPCAwKQogCQlnb3Rv IGVycl9jdHg7CiAKLQlHRU1fQlVHX09OKGN0eC0+dXNlcl9oYW5kbGUgIT0gREVGQVVMVF9DT05U RVhUX0hBTkRMRSk7CiAJR0VNX0JVR19PTihpOTE1X2dlbV9jb250ZXh0X2lzX2tlcm5lbChjdHgp KTsKKwlHRU1fQlVHX09OKGVyciA+IDApOwogCiAJcmV0dXJuIDA7CiAKQEAgLTg1MiwxMCArODQ3 LDEwIEBAIGludCBpOTE1X2dlbV9jb250ZXh0X2NyZWF0ZV9pb2N0bChzdHJ1Y3QgZHJtX2Rldmlj ZSAqZGV2LCB2b2lkICpkYXRhLAogCQlyZXR1cm4gUFRSX0VSUihjdHgpOwogCiAJcmV0ID0gZ2Vt X2NvbnRleHRfcmVnaXN0ZXIoY3R4LCBmaWxlX3ByaXYpOwotCWlmIChyZXQpCisJaWYgKHJldCA8 IDApCiAJCWdvdG8gZXJyX2N0eDsKIAotCWFyZ3MtPmN0eF9pZCA9IGN0eC0+dXNlcl9oYW5kbGU7 CisJYXJncy0+Y3R4X2lkID0gcmV0OwogCURSTV9ERUJVRygiSFcgY29udGV4dCAlZCBjcmVhdGVk XG4iLCBhcmdzLT5jdHhfaWQpOwogCiAJcmV0dXJuIDA7CkBAIC04NzcsNyArODcyLDcgQEAgaW50 IGk5MTVfZ2VtX2NvbnRleHRfZGVzdHJveV9pb2N0bChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LCB2 b2lkICpkYXRhLAogCWlmIChhcmdzLT5wYWQgIT0gMCkKIAkJcmV0dXJuIC1FSU5WQUw7CiAKLQlp ZiAoYXJncy0+Y3R4X2lkID09IERFRkFVTFRfQ09OVEVYVF9IQU5ETEUpCisJaWYgKCFhcmdzLT5j dHhfaWQpCiAJCXJldHVybiAtRU5PRU5UOwogCiAJaWYgKG11dGV4X2xvY2tfaW50ZXJydXB0aWJs ZSgmZmlsZV9wcml2LT5jb250ZXh0X2lkcl9sb2NrKSkKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1 L2RybS9pOTE1L2k5MTVfZ2VtX2NvbnRleHQuaCBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVf Z2VtX2NvbnRleHQuaAppbmRleCA4YTEzNzc2OTFkNmQuLjg0OWIyYTgzYzFlYyAxMDA2NDQKLS0t IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fY29udGV4dC5oCisrKyBiL2RyaXZlcnMv Z3B1L2RybS9pOTE1L2k5MTVfZ2VtX2NvbnRleHQuaApAQCAtMTI2LDExICsxMjYsNiBAQCBzdGF0 aWMgaW5saW5lIHZvaWQgaTkxNV9nZW1fY29udGV4dF91bnBpbl9od19pZChzdHJ1Y3QgaTkxNV9n ZW1fY29udGV4dCAqY3R4KQogCWF0b21pY19kZWMoJmN0eC0+aHdfaWRfcGluX2NvdW50KTsKIH0K IAotc3RhdGljIGlubGluZSBib29sIGk5MTVfZ2VtX2NvbnRleHRfaXNfZGVmYXVsdChjb25zdCBz dHJ1Y3QgaTkxNV9nZW1fY29udGV4dCAqYykKLXsKLQlyZXR1cm4gYy0+dXNlcl9oYW5kbGUgPT0g REVGQVVMVF9DT05URVhUX0hBTkRMRTsKLX0KLQogc3RhdGljIGlubGluZSBib29sIGk5MTVfZ2Vt X2NvbnRleHRfaXNfa2VybmVsKHN0cnVjdCBpOTE1X2dlbV9jb250ZXh0ICpjdHgpCiB7CiAJcmV0 dXJuICFjdHgtPmZpbGVfcHJpdjsKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5 MTVfZ2VtX2NvbnRleHRfdHlwZXMuaCBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2Nv bnRleHRfdHlwZXMuaAppbmRleCAyYmYxOTczMGVhYTkuLjYzYWU4ZWIyMTkzOSAxMDA2NDQKLS0t IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fY29udGV4dF90eXBlcy5oCisrKyBiL2Ry aXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2NvbnRleHRfdHlwZXMuaApAQCAtMTI5LDE1ICsx MjksNiBAQCBzdHJ1Y3QgaTkxNV9nZW1fY29udGV4dCB7CiAJc3RydWN0IGxpc3RfaGVhZCBhY3Rp dmVfZW5naW5lczsKIAlzdHJ1Y3QgbXV0ZXggbXV0ZXg7CiAKLQkvKioKLQkgKiBAdXNlcl9oYW5k bGU6IHVzZXJzcGFjZSBpZGVudGlmaWVyCi0JICoKLQkgKiBBIHVuaXF1ZSBwZXItZmlsZSBpZGVu dGlmaWVyIGlzIGdlbmVyYXRlZCBmcm9tCi0JICogJmRybV9pOTE1X2ZpbGVfcHJpdmF0ZS5jb250 ZXh0cy4KLQkgKi8KLQl1MzIgdXNlcl9oYW5kbGU7Ci0jZGVmaW5lIERFRkFVTFRfQ09OVEVYVF9I QU5ETEUgMAotCiAJc3RydWN0IGk5MTVfc2NoZWRfYXR0ciBzY2hlZDsKIAogCS8qKiBod19jb250 ZXh0czogcGVyLWVuZ2luZSBsb2dpY2FsIEhXIHN0YXRlICovCmRpZmYgLS1naXQgYS9kcml2ZXJz L2dwdS9kcm0vaTkxNS9pOTE1X2dwdV9lcnJvci5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkx NV9ncHVfZXJyb3IuYwppbmRleCBlODY3NDM0N2Y1ODkuLmIxMDFmMDM3YjYxZiAxMDA2NDQKLS0t IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9ncHVfZXJyb3IuYworKysgYi9kcml2ZXJzL2dw dS9kcm0vaTkxNS9pOTE1X2dwdV9lcnJvci5jCkBAIC00NTQsOCArNDU0LDggQEAgc3RhdGljIHZv aWQgZXJyb3JfcHJpbnRfY29udGV4dChzdHJ1Y3QgZHJtX2k5MTVfZXJyb3Jfc3RhdGVfYnVmICpt LAogCQkJCWNvbnN0IGNoYXIgKmhlYWRlciwKIAkJCQljb25zdCBzdHJ1Y3QgZHJtX2k5MTVfZXJy b3JfY29udGV4dCAqY3R4KQogewotCWVycl9wcmludGYobSwgIiVzJXNbJWRdIHVzZXJfaGFuZGxl ICVkIGh3X2lkICVkLCBwcmlvICVkLCBndWlsdHkgJWQgYWN0aXZlICVkXG4iLAotCQkgICBoZWFk ZXIsIGN0eC0+Y29tbSwgY3R4LT5waWQsIGN0eC0+aGFuZGxlLCBjdHgtPmh3X2lkLAorCWVycl9w cmludGYobSwgIiVzJXNbJWRdIGh3X2lkICVkLCBwcmlvICVkLCBndWlsdHkgJWQgYWN0aXZlICVk XG4iLAorCQkgICBoZWFkZXIsIGN0eC0+Y29tbSwgY3R4LT5waWQsIGN0eC0+aHdfaWQsCiAJCSAg IGN0eC0+c2NoZWRfYXR0ci5wcmlvcml0eSwgY3R4LT5ndWlsdHksIGN0eC0+YWN0aXZlKTsKIH0K IApAQCAtNzU4LDExICs3NTgsOSBAQCBzdGF0aWMgdm9pZCBfX2Vycl9wcmludF90b19zZ2woc3Ry dWN0IGRybV9pOTE1X2Vycm9yX3N0YXRlX2J1ZiAqbSwKIAkJaWYgKG9iaikgewogCQkJZXJyX3B1 dHMobSwgbS0+aTkxNS0+ZW5naW5lW2ldLT5uYW1lKTsKIAkJCWlmIChlZS0+Y29udGV4dC5waWQp Ci0JCQkJZXJyX3ByaW50ZihtLCAiIChzdWJtaXR0ZWQgYnkgJXMgWyVkXSwgY3R4ICVkIFslZF0p IiwKKwkJCQllcnJfcHJpbnRmKG0sICIgKHN1Ym1pdHRlZCBieSAlcyBbJWRdKSIsCiAJCQkJCSAg IGVlLT5jb250ZXh0LmNvbW0sCi0JCQkJCSAgIGVlLT5jb250ZXh0LnBpZCwKLQkJCQkJICAgZWUt PmNvbnRleHQuaGFuZGxlLAotCQkJCQkgICBlZS0+Y29udGV4dC5od19pZCk7CisJCQkJCSAgIGVl LT5jb250ZXh0LnBpZCk7CiAJCQllcnJfcHJpbnRmKG0sICIgLS0tIGd0dF9vZmZzZXQgPSAweCUw OHggJTA4eFxuIiwKIAkJCQkgICB1cHBlcl8zMl9iaXRzKG9iai0+Z3R0X29mZnNldCksCiAJCQkJ ICAgbG93ZXJfMzJfYml0cyhvYmotPmd0dF9vZmZzZXQpKTsKQEAgLTEzMzAsNyArMTMyOCw2IEBA IHN0YXRpYyB2b2lkIHJlY29yZF9jb250ZXh0KHN0cnVjdCBkcm1faTkxNV9lcnJvcl9jb250ZXh0 ICplLAogCQlyY3VfcmVhZF91bmxvY2soKTsKIAl9CiAKLQllLT5oYW5kbGUgPSBjdHgtPnVzZXJf aGFuZGxlOwogCWUtPmh3X2lkID0gY3R4LT5od19pZDsKIAllLT5zY2hlZF9hdHRyID0gY3R4LT5z Y2hlZDsKIAllLT5ndWlsdHkgPSBhdG9taWNfcmVhZCgmY3R4LT5ndWlsdHlfY291bnQpOwpkaWZm IC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9ncHVfZXJyb3IuaCBiL2RyaXZlcnMv Z3B1L2RybS9pOTE1L2k5MTVfZ3B1X2Vycm9yLmgKaW5kZXggZDAxMWNiOTBiZWUxLi41ZGM3NjFl ODVkOWQgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ3B1X2Vycm9yLmgK KysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9ncHVfZXJyb3IuaApAQCAtMTE2LDcgKzEx Niw2IEBAIHN0cnVjdCBpOTE1X2dwdV9zdGF0ZSB7CiAJCXN0cnVjdCBkcm1faTkxNV9lcnJvcl9j b250ZXh0IHsKIAkJCWNoYXIgY29tbVtUQVNLX0NPTU1fTEVOXTsKIAkJCXBpZF90IHBpZDsKLQkJ CXUzMiBoYW5kbGU7CiAJCQl1MzIgaHdfaWQ7CiAJCQlpbnQgYWN0aXZlOwogCQkJaW50IGd1aWx0 eTsKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L3NlbGZ0ZXN0cy9tb2NrX2NvbnRl eHQuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L3NlbGZ0ZXN0cy9tb2NrX2NvbnRleHQuYwppbmRl eCAxY2M4YmU3MzI0MzUuLmQ2MzAyNWRjMWQ4MyAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJt L2k5MTUvc2VsZnRlc3RzL21vY2tfY29udGV4dC5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1 L3NlbGZ0ZXN0cy9tb2NrX2NvbnRleHQuYwpAQCAtOTgsNyArOTgsNyBAQCBsaXZlX2NvbnRleHQo c3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmk5MTUsIHN0cnVjdCBkcm1fZmlsZSAqZmlsZSkKIAkJ cmV0dXJuIGN0eDsKIAogCWVyciA9IGdlbV9jb250ZXh0X3JlZ2lzdGVyKGN0eCwgZmlsZS0+ZHJp dmVyX3ByaXYpOwotCWlmIChlcnIpCisJaWYgKGVyciA8IDApCiAJCWdvdG8gZXJyX2N0eDsKIAog CXJldHVybiBjdHg7Ci0tIAoyLjIwLjEKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fCkludGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZy ZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3Rp bmZvL2ludGVsLWdmeA==