From mboxrd@z Thu Jan  1 00:00:00 1970
From: Nick Hoath <nicholas.hoath@intel.com>
Subject: [PATCH 3/4] drm/i915: Add the CPU mapping of the hw
	context to the pinned items.
Date: Tue,  6 Oct 2015 15:52:03 +0100
Message-ID: <1444143124-16030-4-git-send-email-nicholas.hoath@intel.com>
References: <1444143124-16030-1-git-send-email-nicholas.hoath@intel.com>
Mime-Version: 1.0
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: base64
Return-path: <intel-gfx-bounces@lists.freedesktop.org>
Received: from mga11.intel.com (mga11.intel.com [192.55.52.93])
 by gabe.freedesktop.org (Postfix) with ESMTP id A24996EB00
 for <intel-gfx@lists.freedesktop.org>; Tue,  6 Oct 2015 07:52:35 -0700 (PDT)
In-Reply-To: <1444143124-16030-1-git-send-email-nicholas.hoath@intel.com>
List-Unsubscribe: <http://lists.freedesktop.org/mailman/options/intel-gfx>,
 <mailto:intel-gfx-request@lists.freedesktop.org?subject=unsubscribe>
List-Archive: <http://lists.freedesktop.org/archives/intel-gfx>
List-Post: <mailto:intel-gfx@lists.freedesktop.org>
List-Help: <mailto:intel-gfx-request@lists.freedesktop.org?subject=help>
List-Subscribe: <http://lists.freedesktop.org/mailman/listinfo/intel-gfx>,
 <mailto:intel-gfx-request@lists.freedesktop.org?subject=subscribe>
Errors-To: intel-gfx-bounces@lists.freedesktop.org
Sender: "Intel-gfx" <intel-gfx-bounces@lists.freedesktop.org>
To: intel-gfx@lists.freedesktop.org
List-Id: intel-gfx@lists.freedesktop.org

UGluIHRoZSBodyBjdHggbWFwcGluZyBzbyB0aGF0IGl0IGlzIG5vdCBtYXBwZWQvdW5tYXBwZWQg
cGVyIGJiCndoZW4gZG9pbmcgR3VDIHN1Ym1pc3Npb24uCgpJc3N1ZTogVklaLTQyNzcKQ2M6IERh
dmlkIEdvcmRvbiA8ZGF2aWQucy5nb3Jkb25AaW50ZWwuY29tPgpTaWduZWQtb2ZmLWJ5OiBOaWNr
IEhvYXRoIDxuaWNob2xhcy5ob2F0aEBpbnRlbC5jb20+Ci0tLQogZHJpdmVycy9ncHUvZHJtL2k5
MTUvaTkxNV9kZWJ1Z2ZzLmMgfCAxNCArKysrLS0tLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9p
OTE1X2Rydi5oICAgICB8ICA0ICsrLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfbHJjLmMg
ICAgfCA1NiArKysrKysrKysrKysrKysrKysrKysrKysrKystLS0tLS0tLS0tCiAzIGZpbGVzIGNo
YW5nZWQsIDUwIGluc2VydGlvbnMoKyksIDI0IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2Ry
aXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZGVidWdmcy5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUv
aTkxNV9kZWJ1Z2ZzLmMKaW5kZXggM2YyYTdhNy4uZTY4Y2Y1ZmEgMTAwNjQ0Ci0tLSBhL2RyaXZl
cnMvZ3B1L2RybS9pOTE1L2k5MTVfZGVidWdmcy5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1
L2k5MTVfZGVidWdmcy5jCkBAIC0xOTcwLDEwICsxOTcwLDkgQEAgc3RhdGljIGludCBpOTE1X2Nv
bnRleHRfc3RhdHVzKHN0cnVjdCBzZXFfZmlsZSAqbSwgdm9pZCAqdW51c2VkKQogCiBzdGF0aWMg
dm9pZCBpOTE1X2R1bXBfbHJjX29iaihzdHJ1Y3Qgc2VxX2ZpbGUgKm0sCiAJCQkgICAgICBzdHJ1
Y3QgaW50ZWxfZW5naW5lX2NzICpyaW5nLAotCQkJICAgICAgc3RydWN0IGRybV9pOTE1X2dlbV9v
YmplY3QgKmN0eF9vYmopCisJCQkgICAgICBzdHJ1Y3QgZHJtX2k5MTVfZ2VtX29iamVjdCAqY3R4
X29iaiwKKwkJCSAgICAgIHVpbnQzMl90ICpyZWdfc3RhdGUpCiB7Ci0Jc3RydWN0IHBhZ2UgKnBh
Z2U7Ci0JdWludDMyX3QgKnJlZ19zdGF0ZTsKIAlpbnQgajsKIAl1bnNpZ25lZCBsb25nIGdndHRf
b2Zmc2V0ID0gMDsKIApAQCAtMTk5NiwxNyArMTk5NSwxMyBAQCBzdGF0aWMgdm9pZCBpOTE1X2R1
bXBfbHJjX29iaihzdHJ1Y3Qgc2VxX2ZpbGUgKm0sCiAJCXJldHVybjsKIAl9CiAKLQlwYWdlID0g
aTkxNV9nZW1fb2JqZWN0X2dldF9wYWdlKGN0eF9vYmosIExSQ19TVEFURV9QTik7Ci0JaWYgKCFX
QVJOX09OKHBhZ2UgPT0gTlVMTCkpIHsKLQkJcmVnX3N0YXRlID0ga21hcF9hdG9taWMocGFnZSk7
Ci0KKwlpZiAoIVdBUk5fT04ocmVnX3N0YXRlID09IE5VTEwpKSB7CiAJCWZvciAoaiA9IDA7IGog
PCAweDYwMCAvIHNpemVvZih1MzIpIC8gNDsgaiArPSA0KSB7CiAJCQlzZXFfcHJpbnRmKG0sICJc
dFsweCUwOGx4XSAweCUwOHggMHglMDh4IDB4JTA4eCAweCUwOHhcbiIsCiAJCQkJICAgZ2d0dF9v
ZmZzZXQgKyA0MDk2ICsgKGogKiA0KSwKIAkJCQkgICByZWdfc3RhdGVbal0sIHJlZ19zdGF0ZVtq
ICsgMV0sCiAJCQkJICAgcmVnX3N0YXRlW2ogKyAyXSwgcmVnX3N0YXRlW2ogKyAzXSk7CiAJCX0K
LQkJa3VubWFwX2F0b21pYyhyZWdfc3RhdGUpOwogCX0KIAogCXNlcV9wdXRjKG0sICdcbicpOwpA
QCAtMjAzNCw3ICsyMDI5LDggQEAgc3RhdGljIGludCBpOTE1X2R1bXBfbHJjKHN0cnVjdCBzZXFf
ZmlsZSAqbSwgdm9pZCAqdW51c2VkKQogCQlmb3JfZWFjaF9yaW5nKHJpbmcsIGRldl9wcml2LCBp
KSB7CiAJCQlpZiAocmluZy0+ZGVmYXVsdF9jb250ZXh0ICE9IGN0eCkKIAkJCQlpOTE1X2R1bXBf
bHJjX29iaihtLCByaW5nLAotCQkJCQkJICBjdHgtPmVuZ2luZVtpXS5zdGF0ZSk7CisJCQkJCQkg
IGN0eC0+ZW5naW5lW2ldLnN0YXRlLAorCQkJCQkJICBjdHgtPmVuZ2luZVtpXS5yZWdfc3RhdGUp
OwogCQl9CiAJfQogCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5o
IGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuaAppbmRleCBkNjYwZWUzLi5iNDlmZDEy
IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5oCisrKyBiL2RyaXZl
cnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmgKQEAgLTg3OSw4ICs4NzksMTAgQEAgc3RydWN0IGlu
dGVsX2NvbnRleHQgewogCX0gbGVnYWN5X2h3X2N0eDsKIAogCS8qIEV4ZWNsaXN0cyAqLwotCXN0
cnVjdCB7CisJc3RydWN0IGludGVsX2NvbnRleHRfZW5naW5lIHsKIAkJc3RydWN0IGRybV9pOTE1
X2dlbV9vYmplY3QgKnN0YXRlOworCQl1aW50MzJfdCAqcmVnX3N0YXRlOworCQlzdHJ1Y3QgcGFn
ZSAqcGFnZTsKIAkJc3RydWN0IGludGVsX3JpbmdidWZmZXIgKnJpbmdidWY7CiAJCWludCBwaW5f
Y291bnQ7CiAJfSBlbmdpbmVbSTkxNV9OVU1fUklOR1NdOwpkaWZmIC0tZ2l0IGEvZHJpdmVycy9n
cHUvZHJtL2k5MTUvaW50ZWxfbHJjLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9scmMu
YwppbmRleCBiODA3OTI4Li41NWE0ZGU1NiAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5
MTUvaW50ZWxfbHJjLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfbHJjLmMKQEAg
LTM2MCwxNiArMzYwLDEzIEBAIHN0YXRpYyBpbnQgZXhlY2xpc3RzX3VwZGF0ZV9jb250ZXh0KHN0
cnVjdCBkcm1faTkxNV9nZW1fcmVxdWVzdCAqcnEpCiAJc3RydWN0IGk5MTVfaHdfcHBndHQgKnBw
Z3R0ID0gcnEtPmN0eC0+cHBndHQ7CiAJc3RydWN0IGRybV9pOTE1X2dlbV9vYmplY3QgKmN0eF9v
YmogPSBycS0+Y3R4LT5lbmdpbmVbcmluZy0+aWRdLnN0YXRlOwogCXN0cnVjdCBkcm1faTkxNV9n
ZW1fb2JqZWN0ICpyYl9vYmogPSBycS0+cmluZ2J1Zi0+b2JqOwotCXN0cnVjdCBwYWdlICpwYWdl
OwotCXVpbnQzMl90ICpyZWdfc3RhdGU7CisJdWludDMyX3QgKnJlZ19zdGF0ZSA9IHJxLT5jdHgt
PmVuZ2luZVtyaW5nLT5pZF0ucmVnX3N0YXRlOwogCiAJQlVHX09OKCFjdHhfb2JqKTsKKwlXQVJO
X09OKCFyZWdfc3RhdGUpOwogCVdBUk5fT04oIWk5MTVfZ2VtX29ial9pc19waW5uZWQoY3R4X29i
aikpOwogCVdBUk5fT04oIWk5MTVfZ2VtX29ial9pc19waW5uZWQocmJfb2JqKSk7CiAKLQlwYWdl
ID0gaTkxNV9nZW1fb2JqZWN0X2dldF9wYWdlKGN0eF9vYmosIExSQ19TVEFURV9QTik7Ci0JcmVn
X3N0YXRlID0ga21hcF9hdG9taWMocGFnZSk7Ci0KIAlyZWdfc3RhdGVbQ1RYX1JJTkdfVEFJTCsx
XSA9IHJxLT50YWlsOwogCXJlZ19zdGF0ZVtDVFhfUklOR19CVUZGRVJfU1RBUlQrMV0gPSBpOTE1
X2dlbV9vYmpfZ2d0dF9vZmZzZXQocmJfb2JqKTsKIApAQCAtMzg1LDggKzM4Miw2IEBAIHN0YXRp
YyBpbnQgZXhlY2xpc3RzX3VwZGF0ZV9jb250ZXh0KHN0cnVjdCBkcm1faTkxNV9nZW1fcmVxdWVz
dCAqcnEpCiAJCUFTU0lHTl9DVFhfUERQKHBwZ3R0LCByZWdfc3RhdGUsIDApOwogCX0KIAotCWt1
bm1hcF9hdG9taWMocmVnX3N0YXRlKTsKLQogCXJldHVybiAwOwogfQogCkBAIC0xMDA0LDcgKzk5
OSwzMSBAQCBpbnQgbG9naWNhbF9yaW5nX2ZsdXNoX2FsbF9jYWNoZXMoc3RydWN0IGRybV9pOTE1
X2dlbV9yZXF1ZXN0ICpyZXEpCiAJcmV0dXJuIDA7CiB9CiAKLXN0YXRpYyBpbnQgaW50ZWxfbHJf
Y29udGV4dF9kb19waW4oc3RydWN0IGludGVsX2VuZ2luZV9jcyAqcmluZywKK3N0YXRpYyBpbnQg
aW50ZWxfbW1hcF9od19jb250ZXh0KHN0cnVjdCBkcm1faTkxNV9nZW1fb2JqZWN0ICpvYmosCisJ
CWJvb2wgdW5tYXApCit7CisJaW50IHJldCA9IDA7CisJc3RydWN0IGludGVsX2NvbnRleHRfZW5n
aW5lICppY2UgPQorCQkJKHN0cnVjdCBpbnRlbF9jb250ZXh0X2VuZ2luZSAqKW9iai0+bWFwcGFi
bGU7CisJc3RydWN0IHBhZ2UgKnBhZ2U7CisJdWludDMyX3QgKnJlZ19zdGF0ZTsKKworCWlmICh1
bm1hcCkgeworCQlrdW5tYXAoaWNlLT5wYWdlKTsKKwkJaWNlLT5yZWdfc3RhdGUgPSBOVUxMOwor
CQlpY2UtPnBhZ2UgPSBOVUxMOworCX0gZWxzZSB7CisJCXBhZ2UgPSBpOTE1X2dlbV9vYmplY3Rf
Z2V0X3BhZ2Uob2JqLCBMUkNfU1RBVEVfUE4pOworCQlyZWdfc3RhdGUgPSBrbWFwKHBhZ2UpOwor
CQlpY2UtPnJlZ19zdGF0ZSA9IHJlZ19zdGF0ZTsKKwkJaWNlLT5wYWdlID0gcGFnZTsKKwl9CisJ
cmV0dXJuIHJldDsKK30KKworc3RhdGljIGludCBpbnRlbF9scl9jb250ZXh0X2RvX3BpbigKKwkJ
c3RydWN0IGludGVsX2NvbnRleHQgKmN0eCwKKwkJc3RydWN0IGludGVsX2VuZ2luZV9jcyAqcmlu
ZywKIAkJc3RydWN0IGRybV9pOTE1X2dlbV9vYmplY3QgKmN0eF9vYmosCiAJCXN0cnVjdCBpbnRl
bF9yaW5nYnVmZmVyICpyaW5nYnVmKQogewpAQCAtMTA1MSw3ICsxMDcwLDcgQEAgc3RhdGljIGlu
dCBpbnRlbF9scl9jb250ZXh0X3BpbihzdHJ1Y3QgZHJtX2k5MTVfZ2VtX3JlcXVlc3QgKnJxKQog
CXN0cnVjdCBpbnRlbF9yaW5nYnVmZmVyICpyaW5nYnVmID0gcnEtPnJpbmdidWY7CiAKIAlpZiAo
cnEtPmN0eC0+ZW5naW5lW3JpbmctPmlkXS5waW5fY291bnQrKyA9PSAwKSB7Ci0JCXJldCA9IGlu
dGVsX2xyX2NvbnRleHRfZG9fcGluKHJpbmcsIGN0eF9vYmosIHJpbmdidWYpOworCQlyZXQgPSBp
bnRlbF9scl9jb250ZXh0X2RvX3BpbihycS0+Y3R4LCByaW5nLCBjdHhfb2JqLCByaW5nYnVmKTsK
IAkJaWYgKHJldCkKIAkJCWdvdG8gcmVzZXRfcGluX2NvdW50OwogCX0KQEAgLTE5MTUsNiArMTkz
NCw4IEBAIHZvaWQgaW50ZWxfbG9naWNhbF9yaW5nX2NsZWFudXAoc3RydWN0IGludGVsX2VuZ2lu
ZV9jcyAqcmluZykKIAogc3RhdGljIGludCBsb2dpY2FsX3JpbmdfaW5pdChzdHJ1Y3QgZHJtX2Rl
dmljZSAqZGV2LCBzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICpyaW5nKQogeworCXN0cnVjdCBwYWdl
ICpwYWdlOworCXVpbnQzMl90ICpyZWdfc3RhdGU7CiAJaW50IHJldDsKIAogCS8qIEludGVudGlv
bmFsbHkgbGVmdCBibGFuay4gKi8KQEAgLTE5MzksNiArMTk2MCw3IEBAIHN0YXRpYyBpbnQgbG9n
aWNhbF9yaW5nX2luaXQoc3RydWN0IGRybV9kZXZpY2UgKmRldiwgc3RydWN0IGludGVsX2VuZ2lu
ZV9jcyAqcmluCiAKIAkvKiBBcyB0aGlzIGlzIHRoZSBkZWZhdWx0IGNvbnRleHQsIGFsd2F5cyBw
aW4gaXQgKi8KIAlyZXQgPSBpbnRlbF9scl9jb250ZXh0X2RvX3BpbigKKwkJCXJpbmctPmRlZmF1
bHRfY29udGV4dCwKIAkJCXJpbmcsCiAJCQlyaW5nLT5kZWZhdWx0X2NvbnRleHQtPmVuZ2luZVty
aW5nLT5pZF0uc3RhdGUsCiAJCQlyaW5nLT5kZWZhdWx0X2NvbnRleHQtPmVuZ2luZVtyaW5nLT5p
ZF0ucmluZ2J1Zik7CkBAIC0xOTQ5LDYgKzE5NzEsMTMgQEAgc3RhdGljIGludCBsb2dpY2FsX3Jp
bmdfaW5pdChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LCBzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICpy
aW4KIAkJcmV0dXJuIHJldDsKIAl9CiAKKwlwYWdlID0gaTkxNV9nZW1fb2JqZWN0X2dldF9wYWdl
KAorCQkJcmluZy0+ZGVmYXVsdF9jb250ZXh0LT5lbmdpbmVbcmluZy0+aWRdLnN0YXRlLAorCQkJ
TFJDX1NUQVRFX1BOKTsKKwlyZWdfc3RhdGUgPSBrbWFwKHBhZ2UpOworCXJpbmctPmRlZmF1bHRf
Y29udGV4dC0+ZW5naW5lW3JpbmctPmlkXS5yZWdfc3RhdGUgPSByZWdfc3RhdGU7CisJcmluZy0+
ZGVmYXVsdF9jb250ZXh0LT5lbmdpbmVbcmluZy0+aWRdLnBhZ2UgPSBwYWdlOworCiAJcmV0dXJu
IHJldDsKIH0KIApAQCAtMjM4OCw2ICsyNDE3LDcgQEAgdm9pZCBpbnRlbF9scl9jb250ZXh0X2Zy
ZWUoc3RydWN0IGludGVsX2NvbnRleHQgKmN0eCkKIAkJCXN0cnVjdCBpbnRlbF9lbmdpbmVfY3Mg
KnJpbmcgPSByaW5nYnVmLT5yaW5nOwogCiAJCQlpZiAoY3R4ID09IHJpbmctPmRlZmF1bHRfY29u
dGV4dCkgeworCQkJCWt1bm1hcChjdHgtPmVuZ2luZVtyaW5nLT5pZF0ucGFnZSk7CiAJCQkJaTkx
NV9nZW1fb2JqZWN0X2dndHRfdW5waW4ocmluZ2J1Zi0+b2JqKTsKIAkJCQlpOTE1X2dlbV9vYmpl
Y3RfZ2d0dF91bnBpbihjdHhfb2JqKTsKIAkJCX0KQEAgLTI0ODksNiArMjUxOSw4IEBAIGludCBp
bnRlbF9scl9jb250ZXh0X2RlZmVycmVkX2FsbG9jKHN0cnVjdCBpbnRlbF9jb250ZXh0ICpjdHgs
CiAJCWdvdG8gZXJyb3JfcmluZ2J1ZjsKIAl9CiAKKwljdHhfb2JqLT5tbWFwID0gaW50ZWxfbW1h
cF9od19jb250ZXh0OworCWN0eF9vYmotPm1hcHBhYmxlID0gJihjdHgtPmVuZ2luZVtyaW5nLT5p
ZF0pOwogCWN0eC0+ZW5naW5lW3JpbmctPmlkXS5yaW5nYnVmID0gcmluZ2J1ZjsKIAljdHgtPmVu
Z2luZVtyaW5nLT5pZF0uc3RhdGUgPSBjdHhfb2JqOwogCkBAIC0yNTM2LDcgKzI1NjgsNiBAQCB2
b2lkIGludGVsX2xyX2NvbnRleHRfcmVzZXQoc3RydWN0IGRybV9kZXZpY2UgKmRldiwKIAkJc3Ry
dWN0IGludGVsX3JpbmdidWZmZXIgKnJpbmdidWYgPQogCQkJCWN0eC0+ZW5naW5lW3JpbmctPmlk
XS5yaW5nYnVmOwogCQl1aW50MzJfdCAqcmVnX3N0YXRlOwotCQlzdHJ1Y3QgcGFnZSAqcGFnZTsK
IAogCQlpZiAoIWN0eF9vYmopCiAJCQljb250aW51ZTsKQEAgLTI1NDUsMTQgKzI1NzYsMTEgQEAg
dm9pZCBpbnRlbF9scl9jb250ZXh0X3Jlc2V0KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsCiAJCQlX
QVJOKDEsICJGYWlsZWQgZ2V0X3BhZ2VzIGZvciBjb250ZXh0IG9ialxuIik7CiAJCQljb250aW51
ZTsKIAkJfQotCQlwYWdlID0gaTkxNV9nZW1fb2JqZWN0X2dldF9wYWdlKGN0eF9vYmosIExSQ19T
VEFURV9QTik7Ci0JCXJlZ19zdGF0ZSA9IGttYXBfYXRvbWljKHBhZ2UpOworCQlyZWdfc3RhdGUg
PSBjdHgtPmVuZ2luZVtyaW5nLT5pZF0ucmVnX3N0YXRlOwogCiAJCXJlZ19zdGF0ZVtDVFhfUklO
R19IRUFEKzFdID0gMDsKIAkJcmVnX3N0YXRlW0NUWF9SSU5HX1RBSUwrMV0gPSAwOwogCi0JCWt1
bm1hcF9hdG9taWMocmVnX3N0YXRlKTsKLQogCQlyaW5nYnVmLT5oZWFkID0gMDsKIAkJcmluZ2J1
Zi0+dGFpbCA9IDA7CiAKLS0gCjEuOS4xCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f
X19fX19fX19fX19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5m
cmVlZGVza3RvcC5vcmcKaHR0cDovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3Rp
bmZvL2ludGVsLWdmeAo=