From: Dave Gordon Subject: [PATCH 4/4] drm/i915: fix relocation of secure buffers Date: Fri, 15 Apr 2016 12:32:57 +0100 Message-ID: <1460719977-12435-4-git-send-email-david.s.gordon@intel.com> References: <1460719977-12435-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 mga03.intel.com (mga03.intel.com [134.134.136.65]) by gabe.freedesktop.org (Postfix) with ESMTP id 116066E127 for ; Fri, 15 Apr 2016 11:33:05 +0000 (UTC) In-Reply-To: <1460719977-12435-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: Miguel Reche List-Id: intel-gfx@lists.freedesktop.org VGhlcmUgaXMgYSBwcm9ibGVtIHdpdGggdGhlIHJlbG9jYXRpb24gb2YgYmF0Y2hlcyBzdWJtaXR0 ZWQgd2l0aCB0aGUKSTkxNV9FWEVDX1NFQ1VSRSBmbGFnOiBhbHRob3VnaCB0aGUgYmF0Y2ggaXRz ZWxmIHdpbGwgYmUgbWFwcGVkIGludG8gdGhlCkdHVFQsIGFueSByZWxvY2F0aW9ucyByZWZlcnJp bmcgdG8gaXQgd2lsbCB1c2UgaXRzIGFkZHJlc3MgaW4gdGhlIFBQR1RULAp3aGljaCBhbG1vc3Qg Y2VydGFpbmx5IHdvbid0IGJlIHRoZSBzYW1lLgoKSGVuY2UgYSBiYXRjaCBjb250YWluaW5nIGFu IE1JX0JBVENIX0JVRkZFUl9TVEFSVCBpbnN0cnVjdGlvbiB0aGF0CnJlZmVyZW5jZXMgYW5vdGhl ciBwYXJ0IG9mIHRoZSBzYW1lIGJhdGNoYnVmZmVyIHdpbGwgcnVuIGNvcnJlY3RseQppbiB1bnBy aXZpbGVnZWQgbW9kZSwgYnV0IHdpbGwgZmFpbCB3aXRoIGEgcmFuZG9tIGp1bXAgd2hlbiBleGVj dXRlZAppbiBwcml2aWxlZ2VkIG1vZGUuCgpUaGlzIHBhdGNoIGZpeGVzIHRoZSBpc3N1ZSBieSBj aGFuZ2luZyBlYl9sb29rdXBfdm1hcygpIHRvIHRha2UgVFdPCmFkZHJlc3Mgc3BhY2Ugc3BlY2lm aWVycywgb25lIGEgbmV3IG9uZSBmb3IgdGhlIGJhdGNoIGl0c2VsZiBhbmQgdGhlCmV4aXN0aW5n IG9uZSB1c2VkIGZvciBhbGwgb3RoZXIgYnVmZmVyIG9iamVjdHMgaW4gdGhlIGxpc3QuCgpUaGlz IGRvZXMgbm90IGFkZHJlc3MgdGhlIGtub3duIGxpbWl0YXRpb24gb24gYmF0Y2hlcyAqcHJvbW90 ZWQqIHRvCnNlY3VyZSBtb2RlIGJ5IHRoZSBjb21tYW5kIHBhcnNlciwgd2hpY2ggYXJlIG5vdCBh bGxvd2VkIHRvIGNvbnRhaW4KTUlfQkFUQ0hfQlVGRkVSX1NUQVJUIG9yIHZhcmlvdXMgb3RoZXIg b3Bjb2Rlcy4KCkRpc2NvdmVyZWQtYnk6IE1pZ3VlbCBSZWNoZSA8bWlndWVsLnJlY2hlQGludGVs LmNvbT4KU2lnbmVkLW9mZi1ieTogRGF2ZSBHb3Jkb24gPGRhdmlkLnMuZ29yZG9uQGludGVsLmNv bT4KQ2M6IE1pZ3VlbCBSZWNoZSA8bWlndWVsLnJlY2hlQGludGVsLmNvbT4KLS0tCiBkcml2ZXJz L2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9leGVjYnVmZmVyLmMgfCAyNyArKysrKysrKysrKysrKysr KysrLS0tLS0tLS0KIDEgZmlsZSBjaGFuZ2VkLCAxOSBpbnNlcnRpb25zKCspLCA4IGRlbGV0aW9u cygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2V4ZWNidWZm ZXIuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2V4ZWNidWZmZXIuYwppbmRleCAz YTYwMTQ2Li5jMGI0MzYxIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dl bV9leGVjYnVmZmVyLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fZXhlY2J1 ZmZlci5jCkBAIC05NSwxNyArOTUsMTkgQEAgc3RydWN0IGViX3ZtYXMgewogCSAgICAgICBzdHJ1 Y3QgZHJtX2k5MTVfZ2VtX2V4ZWNfb2JqZWN0MiAqZXhlYywKIAkgICAgICAgY29uc3Qgc3RydWN0 IGRybV9pOTE1X2dlbV9leGVjYnVmZmVyMiAqYXJncywKIAkgICAgICAgc3RydWN0IGk5MTVfYWRk cmVzc19zcGFjZSAqdm0sCisJICAgICAgIHN0cnVjdCBpOTE1X2FkZHJlc3Nfc3BhY2UgKnZtYiwK IAkgICAgICAgc3RydWN0IGRybV9maWxlICpmaWxlKQogewogCXN0cnVjdCBkcm1faTkxNV9nZW1f b2JqZWN0ICpvYmo7CiAJc3RydWN0IGxpc3RfaGVhZCBvYmplY3RzOworCWludCBuX29iaiA9IGFy Z3MtPmJ1ZmZlcl9jb3VudDsKIAlpbnQgaSwgcmV0OwogCiAJSU5JVF9MSVNUX0hFQUQoJm9iamVj dHMpOwogCXNwaW5fbG9jaygmZmlsZS0+dGFibGVfbG9jayk7CiAJLyogR3JhYiBhIHJlZmVyZW5j ZSB0byB0aGUgb2JqZWN0IGFuZCByZWxlYXNlIHRoZSBsb2NrIHNvIHdlIGNhbiBsb29rdXAKIAkg KiBvciBjcmVhdGUgdGhlIFZNQSB3aXRob3V0IHVzaW5nIEdGUF9BVE9NSUMgKi8KLQlmb3IgKGkg PSAwOyBpIDwgYXJncy0+YnVmZmVyX2NvdW50OyBpKyspIHsKKwlmb3IgKGkgPSAwOyBpIDwgbl9v Ymo7IGkrKykgewogCQlvYmogPSB0b19pbnRlbF9ibyhpZHJfZmluZCgmZmlsZS0+b2JqZWN0X2lk ciwgZXhlY1tpXS5oYW5kbGUpKTsKIAkJaWYgKG9iaiA9PSBOVUxMKSB7CiAJCQlzcGluX3VubG9j aygmZmlsZS0+dGFibGVfbG9jayk7CkBAIC0xMjgsMTQgKzEzMCwxNyBAQCBzdHJ1Y3QgZWJfdm1h cyB7CiAJfQogCXNwaW5fdW5sb2NrKCZmaWxlLT50YWJsZV9sb2NrKTsKIAotCWkgPSAwOwotCXdo aWxlICghbGlzdF9lbXB0eSgmb2JqZWN0cykpIHsKKwlmb3IgKGkgPSAwOyAhbGlzdF9lbXB0eSgm b2JqZWN0cyk7IC0tbl9vYmosICsraSkgewogCQlzdHJ1Y3QgaTkxNV92bWEgKnZtYTsKIAogCQlv YmogPSBsaXN0X2ZpcnN0X2VudHJ5KCZvYmplY3RzLAogCQkJCSAgICAgICBzdHJ1Y3QgZHJtX2k5 MTVfZ2VtX29iamVjdCwKIAkJCQkgICAgICAgb2JqX2V4ZWNfbGluayk7CiAKKwkJLyogU3dpdGNo IHRvIHZtYiBmb3IgdGhlIGxhc3QgaXRlbSAqLworCQlpZiAobl9vYmogPT0gMSkKKwkJCXZtID0g dm1iOworCiAJCS8qCiAJCSAqIE5PVEU6IFdlIGNhbiBsZWFrIGFueSB2bWFzIGNyZWF0ZWQgaGVy ZSB3aGVuIHNvbWV0aGluZyBmYWlscwogCQkgKiBsYXRlciBvbi4gQnV0IHRoYXQncyBubyBpc3N1 ZSBzaW5jZSB2bWFfdW5iaW5kIGNhbiBkZWFsIHdpdGgKQEAgLTE2NCw3ICsxNjksNiBAQCBzdHJ1 Y3QgZWJfdm1hcyB7CiAJCQlobGlzdF9hZGRfaGVhZCgmdm1hLT5leGVjX25vZGUsCiAJCQkJICAg ICAgICZlYi0+YnVja2V0c1toYW5kbGUgJiBlYi0+YW5kXSk7CiAJCX0KLQkJKytpOwogCX0KIAog CXJldHVybiAwOwpAQCAtODYxLDcgKzg2NSw3IEBAIHN0YXRpYyBib29sIG9ubHlfbWFwcGFibGVf Zm9yX3JlbG9jKHVuc2lnbmVkIGludCBmbGFncykKIAkJCQkgIHN0cnVjdCBpbnRlbF9jb250ZXh0 ICpjdHgpCiB7CiAJc3RydWN0IGRybV9pOTE1X2dlbV9yZWxvY2F0aW9uX2VudHJ5ICpyZWxvYzsK LQlzdHJ1Y3QgaTkxNV9hZGRyZXNzX3NwYWNlICp2bTsKKwlzdHJ1Y3QgaTkxNV9hZGRyZXNzX3Nw YWNlICp2bSwgKnZtYjsKIAlzdHJ1Y3QgaTkxNV92bWEgKnZtYTsKIAlib29sIG5lZWRfcmVsb2Nz OwogCWludCAqcmVsb2Nfb2Zmc2V0OwpAQCAtODY5LDYgKzg3Myw3IEBAIHN0YXRpYyBib29sIG9u bHlfbWFwcGFibGVfZm9yX3JlbG9jKHVuc2lnbmVkIGludCBmbGFncykKIAl1bnNpZ25lZCBjb3Vu dCA9IGFyZ3MtPmJ1ZmZlcl9jb3VudDsKIAogCXZtID0gbGlzdF9maXJzdF9lbnRyeSgmZWItPnZt YXMsIHN0cnVjdCBpOTE1X3ZtYSwgZXhlY19saXN0KS0+dm07CisJdm1iID0gZWJfZ2V0X2JhdGNo X3ZtYShlYiktPnZtOwogCiAJLyogV2UgbWF5IHByb2Nlc3MgYW5vdGhlciBleGVjYnVmZmVyIGR1 cmluZyB0aGUgdW5sb2NrLi4uICovCiAJd2hpbGUgKCFsaXN0X2VtcHR5KCZlYi0+dm1hcykpIHsK QEAgLTkzOSw3ICs5NDQsNyBAQCBzdGF0aWMgYm9vbCBvbmx5X21hcHBhYmxlX2Zvcl9yZWxvYyh1 bnNpZ25lZCBpbnQgZmxhZ3MpCiAKIAkvKiByZWFjcXVpcmUgdGhlIG9iamVjdHMgKi8KIAllYl9y ZXNldChlYik7Ci0JcmV0ID0gZWJfbG9va3VwX3ZtYXMoZWIsIGV4ZWMsIGFyZ3MsIHZtLCBmaWxl KTsKKwlyZXQgPSBlYl9sb29rdXBfdm1hcyhlYiwgZXhlYywgYXJncywgdm0sIHZtYiwgZmlsZSk7 CiAJaWYgKHJldCkKIAkJZ290byBlcnI7CiAKQEAgLTE0NTIsNyArMTQ1Nyw3IEBAIHN0YXRpYyBi b29sIG9ubHlfbWFwcGFibGVfZm9yX3JlbG9jKHVuc2lnbmVkIGludCBmbGFncykKIAlzdHJ1Y3Qg ZHJtX2k5MTVfZ2VtX2V4ZWNfb2JqZWN0MiBzaGFkb3dfZXhlY19lbnRyeTsKIAlzdHJ1Y3QgaW50 ZWxfZW5naW5lX2NzICplbmdpbmU7CiAJc3RydWN0IGludGVsX2NvbnRleHQgKmN0eDsKLQlzdHJ1 Y3QgaTkxNV9hZGRyZXNzX3NwYWNlICp2bTsKKwlzdHJ1Y3QgaTkxNV9hZGRyZXNzX3NwYWNlICp2 bSwgKnZtYjsKIAlzdHJ1Y3QgaTkxNV9leGVjYnVmZmVyX3BhcmFtcyBwYXJhbXNfbWFzdGVyOyAv KiBYWFg6IHdpbGwgYmUgcmVtb3ZlZCBsYXRlciAqLwogCXN0cnVjdCBpOTE1X2V4ZWNidWZmZXJf cGFyYW1zICpwYXJhbXMgPSAmcGFyYW1zX21hc3RlcjsKIAljb25zdCB1MzIgY3R4X2lkID0gaTkx NV9leGVjYnVmZmVyMl9nZXRfY29udGV4dF9pZCgqYXJncyk7CkBAIC0xNTIwLDYgKzE1MjUsMTIg QEAgc3RhdGljIGJvb2wgb25seV9tYXBwYWJsZV9mb3JfcmVsb2ModW5zaWduZWQgaW50IGZsYWdz KQogCWVsc2UKIAkJdm0gPSAmZ2d0dC0+YmFzZTsKIAorCS8qIFNlY3VyZSBiYXRjaGVzIG11c3Qg bGl2ZSBpbiBHR1RUICovCisJaWYgKGRpc3BhdGNoX2ZsYWdzICYgSTkxNV9ESVNQQVRDSF9TRUNV UkUpCisJCXZtYiA9ICZkZXZfcHJpdi0+Z2d0dC5iYXNlOworCWVsc2UKKwkJdm1iID0gdm07CisK IAltZW1zZXQoJnBhcmFtc19tYXN0ZXIsIDB4MDAsIHNpemVvZihwYXJhbXNfbWFzdGVyKSk7CiAK IAllYiA9IGViX2NyZWF0ZShhcmdzKTsKQEAgLTE1MzEsNyArMTU0Miw3IEBAIHN0YXRpYyBib29s IG9ubHlfbWFwcGFibGVfZm9yX3JlbG9jKHVuc2lnbmVkIGludCBmbGFncykKIAl9CiAKIAkvKiBM b29rIHVwIG9iamVjdCBoYW5kbGVzICovCi0JcmV0ID0gZWJfbG9va3VwX3ZtYXMoZWIsIGV4ZWMs IGFyZ3MsIHZtLCBmaWxlKTsKKwlyZXQgPSBlYl9sb29rdXBfdm1hcyhlYiwgZXhlYywgYXJncywg dm0sIHZtYiwgZmlsZSk7CiAJaWYgKHJldCkKIAkJZ290byBlcnI7CiAKLS0gCjEuOS4xCgpfX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpJbnRlbC1nZnggbWFp bGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5m cmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK