From: Dave Gordon Subject: [PATCH 1/3] drm/i915/guc: keep GuC objects mapped in kernel Date: Thu, 14 Apr 2016 18:19:00 +0100 Message-ID: <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 E7E826EAA3 for ; Thu, 14 Apr 2016 17:19:23 +0000 (UTC) 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 V2l0aCB0aGUgbmV3IGk5MTVfZ2VtX29ial9waW5fbWFwKCkgaW50ZXJmYWNlLCBpdCBtYWtlcyBz ZW5zZSB0byBrZWVwCkd1QyBvYmplY3RzICh3aGljaCBhcmUgYWx3YXlzIHBpbm5lZCBpbiBtZW1v cnkgYW5kIGluIHRoZSBHR1RUIGFueXdheSkKbWFwcGVkIGludG8ga2VybmVsIGFkZHJlc3Mgc3Bh Y2UsIHJhdGhlciB0aGFuIG1hcHBpbmcgYW5kIHVubWFwcGluZyB0aGVtCm9uIGVhY2ggYWNjZXNz LgoKVGhpcyBwcmVsaW1pbmFyeSBwYXRjaCBzZXRzIHVwIHRoZSBwaW4tYW5kLW1hcCBmb3IgYWxs IEd1Qy1zcGVjaWZpYwpvYmplY3RzLCBhbmQgdXBkYXRlcyB0aGUgdmFyaW91cyBzZXR1cC9zaHV0 ZG93biBmdW5jdGlvbnMgdG8gdXNlIHRoZXNlCmxvbmctdGVybSBtYXBwaW5ncyByYXRoZXIgdGhh biBkb2luZyB0aGVpciBvd24ga21hcF9hdG9taWMoKSBjYWxscy4KCkNjOiA8dHZydGtvLnVyc3Vs aW5AaW50ZWwuY29tPgpTaWduZWQtb2ZmLWJ5OiBBbGV4IERhaSA8eXUuZGFpQGludGVsLmNvbT4K U2lnbmVkLW9mZi1ieTogRGF2ZSBHb3Jkb24gPGRhdmlkLnMuZ29yZG9uQGludGVsLmNvbT4KLS0t CiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2d1Y19zdWJtaXNzaW9uLmMgfCAzNyArKysrKysr KysrKy0tLS0tLS0tLS0tLS0tLS0tLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2d1Yy5o ICAgICAgICAgICB8ICAxICsKIDIgZmlsZXMgY2hhbmdlZCwgMTQgaW5zZXJ0aW9ucygrKSwgMjQg ZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9ndWNf c3VibWlzc2lvbi5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9ndWNfc3VibWlzc2lvbi5j CmluZGV4IGRhODZiZGIuLmY4MGY1NzcgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1 L2k5MTVfZ3VjX3N1Ym1pc3Npb24uYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2d1 Y19zdWJtaXNzaW9uLmMKQEAgLTE3OSwxNSArMTc5LDExIEBAIHN0YXRpYyB2b2lkIGd1Y19pbml0 X2Rvb3JiZWxsKHN0cnVjdCBpbnRlbF9ndWMgKmd1YywKIAkJCSAgICAgIHN0cnVjdCBpOTE1X2d1 Y19jbGllbnQgKmNsaWVudCkKIHsKIAlzdHJ1Y3QgZ3VjX2Rvb3JiZWxsX2luZm8gKmRvb3JiZWxs OwotCXZvaWQgKmJhc2U7CiAKLQliYXNlID0ga21hcF9hdG9taWMoaTkxNV9nZW1fb2JqZWN0X2dl dF9wYWdlKGNsaWVudC0+Y2xpZW50X29iaiwgMCkpOwotCWRvb3JiZWxsID0gYmFzZSArIGNsaWVu dC0+ZG9vcmJlbGxfb2Zmc2V0OworCWRvb3JiZWxsID0gY2xpZW50LT5jbGllbnRfYmFzZSArIGNs aWVudC0+ZG9vcmJlbGxfb2Zmc2V0OwogCi0JZG9vcmJlbGwtPmRiX3N0YXR1cyA9IDE7CisJZG9v cmJlbGwtPmRiX3N0YXR1cyA9IEdVQ19ET09SQkVMTF9FTkFCTEVEOwogCWRvb3JiZWxsLT5jb29r aWUgPSAwOwotCi0Ja3VubWFwX2F0b21pYyhiYXNlKTsKIH0KIAogc3RhdGljIGludCBndWNfcmlu Z19kb29yYmVsbChzdHJ1Y3QgaTkxNV9ndWNfY2xpZW50ICpnYykKQEAgLTI1NiwxNiArMjUyLDEy IEBAIHN0YXRpYyB2b2lkIGd1Y19kaXNhYmxlX2Rvb3JiZWxsKHN0cnVjdCBpbnRlbF9ndWMgKmd1 YywKIHsKIAlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSBndWNfdG9faTkxNShn dWMpOwogCXN0cnVjdCBndWNfZG9vcmJlbGxfaW5mbyAqZG9vcmJlbGw7Ci0Jdm9pZCAqYmFzZTsK IAlpOTE1X3JlZ190IGRyYnJlZyA9IEdFTjhfRFJCUkVHTChjbGllbnQtPmRvb3JiZWxsX2lkKTsK IAlpbnQgdmFsdWU7CiAKLQliYXNlID0ga21hcF9hdG9taWMoaTkxNV9nZW1fb2JqZWN0X2dldF9w YWdlKGNsaWVudC0+Y2xpZW50X29iaiwgMCkpOwotCWRvb3JiZWxsID0gYmFzZSArIGNsaWVudC0+ ZG9vcmJlbGxfb2Zmc2V0OwotCi0JZG9vcmJlbGwtPmRiX3N0YXR1cyA9IDA7CisJZG9vcmJlbGwg PSBjbGllbnQtPmNsaWVudF9iYXNlICsgY2xpZW50LT5kb29yYmVsbF9vZmZzZXQ7CiAKLQlrdW5t YXBfYXRvbWljKGJhc2UpOworCWRvb3JiZWxsLT5kYl9zdGF0dXMgPSBHVUNfRE9PUkJFTExfRElT QUJMRUQ7CiAKIAlJOTE1X1dSSVRFKGRyYnJlZywgSTkxNV9SRUFEKGRyYnJlZykgJiB+R0VOOF9E UkJfVkFMSUQpOwogCkBAIC0zNDEsMTAgKzMzMyw4IEBAIHN0YXRpYyB2b2lkIGd1Y19pbml0X3By b2NfZGVzYyhzdHJ1Y3QgaW50ZWxfZ3VjICpndWMsCiAJCQkgICAgICAgc3RydWN0IGk5MTVfZ3Vj X2NsaWVudCAqY2xpZW50KQogewogCXN0cnVjdCBndWNfcHJvY2Vzc19kZXNjICpkZXNjOwotCXZv aWQgKmJhc2U7CiAKLQliYXNlID0ga21hcF9hdG9taWMoaTkxNV9nZW1fb2JqZWN0X2dldF9wYWdl KGNsaWVudC0+Y2xpZW50X29iaiwgMCkpOwotCWRlc2MgPSBiYXNlICsgY2xpZW50LT5wcm9jX2Rl c2Nfb2Zmc2V0OworCWRlc2MgPSBjbGllbnQtPmNsaWVudF9iYXNlICsgY2xpZW50LT5wcm9jX2Rl c2Nfb2Zmc2V0OwogCiAJbWVtc2V0KGRlc2MsIDAsIHNpemVvZigqZGVzYykpOwogCkBAIC0zNjEs OCArMzUxLDYgQEAgc3RhdGljIHZvaWQgZ3VjX2luaXRfcHJvY19kZXNjKHN0cnVjdCBpbnRlbF9n dWMgKmd1YywKIAlkZXNjLT53cV9zaXplX2J5dGVzID0gY2xpZW50LT53cV9zaXplOwogCWRlc2Mt PndxX3N0YXR1cyA9IFdRX1NUQVRVU19BQ1RJVkU7CiAJZGVzYy0+cHJpb3JpdHkgPSBjbGllbnQt PnByaW9yaXR5OwotCi0Ja3VubWFwX2F0b21pYyhiYXNlKTsKIH0KIAogLyoKQEAgLTYwNyw2ICs1 OTUsNyBAQCBpbnQgaTkxNV9ndWNfc3VibWl0KHN0cnVjdCBpOTE1X2d1Y19jbGllbnQgKmNsaWVu dCwKICAqIFRoaXMgaXMgYSB3cmFwcGVyIHRvIGNyZWF0ZSBhIGdlbSBvYmouIEluIG9yZGVyIHRv IHVzZSBpdCBpbnNpZGUgR3VDLCB0aGUKICAqIG9iamVjdCBuZWVkcyB0byBiZSBwaW5uZWQgbGlm ZXRpbWUuIEFsc28gd2UgbXVzdCBwaW4gaXQgdG8gZ3R0IHNwYWNlIG90aGVyCiAgKiB0aGFuIFsw LCBHVUNfV09QQ01fVE9QKSBiZWNhdXNlIHRoaXMgcmFuZ2UgaXMgcmVzZXJ2ZWQgaW5zaWRlIEd1 Qy4KKyAqIFRoZSBvYmplY3QgaXMgYWxzbyBwaW5uZWQgJiBtYXBwZWQgaW50byBrZXJuZWwgYWRk cmVzcyBzcGFjZS4KICAqCiAgKiBSZXR1cm46CUEgZHJtX2k5MTVfZ2VtX29iamVjdCBpZiBzdWNj ZXNzZnVsLCBvdGhlcndpc2UgTlVMTC4KICAqLwpAQCAtNjIwLDEzICs2MDksMTQgQEAgc3RhdGlj IHN0cnVjdCBkcm1faTkxNV9nZW1fb2JqZWN0ICpnZW1fYWxsb2NhdGVfZ3VjX29iaihzdHJ1Y3Qg ZHJtX2RldmljZSAqZGV2LAogCWlmICghb2JqKQogCQlyZXR1cm4gTlVMTDsKIAotCWlmIChpOTE1 X2dlbV9vYmplY3RfZ2V0X3BhZ2VzKG9iaikpIHsKKwlpZiAoaTkxNV9nZW1fb2JqZWN0X3Bpbl9t YXAob2JqKSA9PSBOVUxMKSB7CiAJCWRybV9nZW1fb2JqZWN0X3VucmVmZXJlbmNlKCZvYmotPmJh c2UpOwogCQlyZXR1cm4gTlVMTDsKIAl9CiAKIAlpZiAoaTkxNV9nZW1fb2JqX2dndHRfcGluKG9i aiwgUEFHRV9TSVpFLAogCQkJUElOX09GRlNFVF9CSUFTIHwgR1VDX1dPUENNX1RPUCkpIHsKKwkJ aTkxNV9nZW1fb2JqZWN0X3VucGluX21hcChvYmopOwogCQlkcm1fZ2VtX29iamVjdF91bnJlZmVy ZW5jZSgmb2JqLT5iYXNlKTsKIAkJcmV0dXJuIE5VTEw7CiAJfQpAQCAtNjQ5LDYgKzYzOSw4IEBA IHN0YXRpYyB2b2lkIGdlbV9yZWxlYXNlX2d1Y19vYmooc3RydWN0IGRybV9pOTE1X2dlbV9vYmpl Y3QgKm9iaikKIAlpZiAoaTkxNV9nZW1fb2JqX2lzX3Bpbm5lZChvYmopKQogCQlpOTE1X2dlbV9v YmplY3RfZ2d0dF91bnBpbihvYmopOwogCisJaTkxNV9nZW1fb2JqZWN0X3VucGluX21hcChvYmop OworCiAJZHJtX2dlbV9vYmplY3RfdW5yZWZlcmVuY2UoJm9iai0+YmFzZSk7CiB9CiAKQEAgLTcy OSw2ICs3MjEsOCBAQCBzdGF0aWMgc3RydWN0IGk5MTVfZ3VjX2NsaWVudCAqZ3VjX2NsaWVudF9h bGxvYyhzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LAogCQlnb3RvIGVycjsKIAogCWNsaWVudC0+Y2xp ZW50X29iaiA9IG9iajsKKwljbGllbnQtPmNsaWVudF9iYXNlID0gb2JqLT5tYXBwaW5nOworCVdB Uk5fT04oIWNsaWVudC0+Y2xpZW50X2Jhc2UpOwogCWNsaWVudC0+d3Ffb2Zmc2V0ID0gR1VDX0RC X1NJWkU7CiAJY2xpZW50LT53cV9zaXplID0gR1VDX1dRX1NJWkU7CiAKQEAgLTg0MSw3ICs4MzUs NiBAQCBzdGF0aWMgdm9pZCBndWNfY3JlYXRlX2FkcyhzdHJ1Y3QgaW50ZWxfZ3VjICpndWMpCiAJ c3RydWN0IGd1Y19wb2xpY2llcyAqcG9saWNpZXM7CiAJc3RydWN0IGd1Y19tbWlvX3JlZ19zdGF0 ZSAqcmVnX3N0YXRlOwogCXN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKmVuZ2luZTsKLQlzdHJ1Y3Qg cGFnZSAqcGFnZTsKIAl1MzIgc2l6ZTsKIAogCS8qIFRoZSBhZHMgb2JqIGluY2x1ZGVzIHRoZSBz dHJ1Y3QgaXRzZWxmIGFuZCBidWZmZXJzIHBhc3NlZCB0byBHdUMgKi8KQEAgLTg1Nyw5ICs4NTAs NyBAQCBzdGF0aWMgdm9pZCBndWNfY3JlYXRlX2FkcyhzdHJ1Y3QgaW50ZWxfZ3VjICpndWMpCiAK IAkJZ3VjLT5hZHNfb2JqID0gb2JqOwogCX0KLQotCXBhZ2UgPSBpOTE1X2dlbV9vYmplY3RfZ2V0 X3BhZ2Uob2JqLCAwKTsKLQlhZHMgPSBrbWFwKHBhZ2UpOworCWFkcyA9IG9iai0+bWFwcGluZzsK IAogCS8qCiAJICogVGhlIEd1QyByZXF1aXJlcyBhICJHb2xkZW4gQ29udGV4dCIgd2hlbiBpdCBy ZWluaXRpYWxpc2VzCkBAIC04OTcsOCArODg4LDYgQEAgc3RhdGljIHZvaWQgZ3VjX2NyZWF0ZV9h ZHMoc3RydWN0IGludGVsX2d1YyAqZ3VjKQogCiAJYWRzLT5yZWdfc3RhdGVfYnVmZmVyID0gYWRz LT5yZWdfc3RhdGVfYWRkciArCiAJCQlzaXplb2Yoc3RydWN0IGd1Y19tbWlvX3JlZ19zdGF0ZSk7 Ci0KLQlrdW5tYXAocGFnZSk7CiB9CiAKIC8qCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0v aTkxNS9pbnRlbF9ndWMuaCBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2d1Yy5oCmluZGV4 IDNiYjg1YjEuLjlhYjM1NjQgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVs X2d1Yy5oCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2d1Yy5oCkBAIC0zMSw2ICsz MSw3IEBAIHN0cnVjdCBkcm1faTkxNV9nZW1fcmVxdWVzdDsKIAogc3RydWN0IGk5MTVfZ3VjX2Ns aWVudCB7CiAJc3RydWN0IGRybV9pOTE1X2dlbV9vYmplY3QgKmNsaWVudF9vYmo7CisJdm9pZCAq Y2xpZW50X2Jhc2U7CQkvKiBNYXBwZWQgYWRkcmVzcyBvZiBhYm92ZQkqLwogCXN0cnVjdCBpbnRl bF9jb250ZXh0ICpvd25lcjsKIAlzdHJ1Y3QgaW50ZWxfZ3VjICpndWM7CiAJdWludDMyX3QgcHJp b3JpdHk7Ci0tIAoxLjkuMQoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0 b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50 ZWwtZ2Z4Cg==