From mboxrd@z Thu Jan  1 00:00:00 1970
From: Chris Wilson <chris@chris-wilson.co.uk>
Subject: [PATCH 10/37] drm/i915: Always set the vma->pages
Date: Fri, 12 Aug 2016 07:54:00 +0100
Message-ID: <1470984867-7132-10-git-send-email-chris@chris-wilson.co.uk>
References: <1470984867-7132-1-git-send-email-chris@chris-wilson.co.uk>
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 mail-wm0-x241.google.com (mail-wm0-x241.google.com
 [IPv6:2a00:1450:400c:c09::241])
 by gabe.freedesktop.org (Postfix) with ESMTPS id 4104E6EA7E
 for <intel-gfx@lists.freedesktop.org>; Fri, 12 Aug 2016 06:54:45 +0000 (UTC)
Received: by mail-wm0-x241.google.com with SMTP id i138so1157665wmf.3
 for <intel-gfx@lists.freedesktop.org>; Thu, 11 Aug 2016 23:54:45 -0700 (PDT)
In-Reply-To: <1470984867-7132-1-git-send-email-chris@chris-wilson.co.uk>
List-Unsubscribe: <https://lists.freedesktop.org/mailman/options/intel-gfx>,
 <mailto:intel-gfx-request@lists.freedesktop.org?subject=unsubscribe>
List-Archive: <https://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: <https://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

UHJldmlvdXNseSwgd2Ugd291bGQgb25seSBzZXQgdGhlIHZtYS0+cGFnZXMgcG9pbnRlciBmb3Ig
R0dUVCBlbnRyaWVzLgpIb3dldmVyLCBpZiB3ZSBhbHdheXMgc2V0IGl0LCB3ZSBjYW4gdXNlIGl0
IHRvIHByZXR0aWZ5IHNvbWUgY29kZSB0aGF0Cm1heSB3YW50IHRvIGFjY2VzcyB0aGUgYmFja2lu
ZyBzdG9yZSBhc3NvY2lhdGVkIHdpdGggdGhlIFZNQSAoYXMKYXNzaWduZWQgdG8gdGhlIFZNQSku
CgpTaWduZWQtb2ZmLWJ5OiBDaHJpcyBXaWxzb24gPGNocmlzQGNocmlzLXdpbHNvbi5jby51az4K
LS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbS5jICAgICB8ICA4ICsrKystLS0tCiBk
cml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9ndHQuYyB8IDMwICsrKysrKysrKysrKysrLS0t
LS0tLS0tLS0tLS0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fZ3R0LmggfCAgMyAr
LS0KIDMgZmlsZXMgY2hhbmdlZCwgMTkgaW5zZXJ0aW9ucygrKSwgMjIgZGVsZXRpb25zKC0pCgpk
aWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW0uYyBiL2RyaXZlcnMvZ3B1
L2RybS9pOTE1L2k5MTVfZ2VtLmMKaW5kZXggMDM1NDhkYjU0ZTZiLi5iNDI3OTY5MzI1ZWMgMTAw
NjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtLmMKKysrIGIvZHJpdmVycy9n
cHUvZHJtL2k5MTUvaTkxNV9nZW0uYwpAQCAtMjgyMSwxMiArMjgyMSwxMiBAQCBpbnQgaTkxNV92
bWFfdW5iaW5kKHN0cnVjdCBpOTE1X3ZtYSAqdm1hKQogCWlmIChpOTE1X3ZtYV9pc19nZ3R0KHZt
YSkpIHsKIAkJaWYgKHZtYS0+Z2d0dF92aWV3LnR5cGUgPT0gSTkxNV9HR1RUX1ZJRVdfTk9STUFM
KSB7CiAJCQlvYmotPm1hcF9hbmRfZmVuY2VhYmxlID0gZmFsc2U7Ci0JCX0gZWxzZSBpZiAodm1h
LT5nZ3R0X3ZpZXcucGFnZXMpIHsKLQkJCXNnX2ZyZWVfdGFibGUodm1hLT5nZ3R0X3ZpZXcucGFn
ZXMpOwotCQkJa2ZyZWUodm1hLT5nZ3R0X3ZpZXcucGFnZXMpOworCQl9IGVsc2UgaWYgKHZtYS0+
cGFnZXMpIHsKKwkJCXNnX2ZyZWVfdGFibGUodm1hLT5wYWdlcyk7CisJCQlrZnJlZSh2bWEtPnBh
Z2VzKTsKIAkJfQotCQl2bWEtPmdndHRfdmlldy5wYWdlcyA9IE5VTEw7CiAJfQorCXZtYS0+cGFn
ZXMgPSBOVUxMOwogCiAJLyogU2luY2UgdGhlIHVuYm91bmQgbGlzdCBpcyBnbG9iYWwsIG9ubHkg
bW92ZSB0byB0aGF0IGxpc3QgaWYKIAkgKiBubyBtb3JlIFZNQXMgZXhpc3QuICovCmRpZmYgLS1n
aXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9ndHQuYyBiL2RyaXZlcnMvZ3B1L2Ry
bS9pOTE1L2k5MTVfZ2VtX2d0dC5jCmluZGV4IGQ4NzY1MDE2OTRjNi4uOWMxNzhiMGM0MGI1IDEw
MDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9ndHQuYworKysgYi9kcml2
ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9ndHQuYwpAQCAtMTcwLDExICsxNzAsMTMgQEAgc3Rh
dGljIGludCBwcGd0dF9iaW5kX3ZtYShzdHJ1Y3QgaTkxNV92bWEgKnZtYSwKIHsKIAl1MzIgcHRl
X2ZsYWdzID0gMDsKIAorCXZtYS0+cGFnZXMgPSB2bWEtPm9iai0+cGFnZXM7CisKIAkvKiBDdXJy
ZW50bHkgYXBwbGljYWJsZSBvbmx5IHRvIFZMViAqLwogCWlmICh2bWEtPm9iai0+Z3Rfcm8pCiAJ
CXB0ZV9mbGFncyB8PSBQVEVfUkVBRF9PTkxZOwogCi0Jdm1hLT52bS0+aW5zZXJ0X2VudHJpZXMo
dm1hLT52bSwgdm1hLT5vYmotPnBhZ2VzLCB2bWEtPm5vZGUuc3RhcnQsCisJdm1hLT52bS0+aW5z
ZXJ0X2VudHJpZXModm1hLT52bSwgdm1hLT5wYWdlcywgdm1hLT5ub2RlLnN0YXJ0LAogCQkJCWNh
Y2hlX2xldmVsLCBwdGVfZmxhZ3MpOwogCiAJcmV0dXJuIDA7CkBAIC0yNjE4LDggKzI2MjAsNyBA
QCBzdGF0aWMgaW50IGdndHRfYmluZF92bWEoc3RydWN0IGk5MTVfdm1hICp2bWEsCiAJaWYgKG9i
ai0+Z3Rfcm8pCiAJCXB0ZV9mbGFncyB8PSBQVEVfUkVBRF9PTkxZOwogCi0Jdm1hLT52bS0+aW5z
ZXJ0X2VudHJpZXModm1hLT52bSwgdm1hLT5nZ3R0X3ZpZXcucGFnZXMsCi0JCQkJdm1hLT5ub2Rl
LnN0YXJ0LAorCXZtYS0+dm0tPmluc2VydF9lbnRyaWVzKHZtYS0+dm0sIHZtYS0+cGFnZXMsIHZt
YS0+bm9kZS5zdGFydCwKIAkJCQljYWNoZV9sZXZlbCwgcHRlX2ZsYWdzKTsKIAogCS8qCkBAIC0y
NjUxLDggKzI2NTIsNyBAQCBzdGF0aWMgaW50IGFsaWFzaW5nX2d0dF9iaW5kX3ZtYShzdHJ1Y3Qg
aTkxNV92bWEgKnZtYSwKIAogCWlmIChmbGFncyAmIEk5MTVfVk1BX0dMT0JBTF9CSU5EKSB7CiAJ
CXZtYS0+dm0tPmluc2VydF9lbnRyaWVzKHZtYS0+dm0sCi0JCQkJCXZtYS0+Z2d0dF92aWV3LnBh
Z2VzLAotCQkJCQl2bWEtPm5vZGUuc3RhcnQsCisJCQkJCXZtYS0+cGFnZXMsIHZtYS0+bm9kZS5z
dGFydCwKIAkJCQkJY2FjaGVfbGV2ZWwsIHB0ZV9mbGFncyk7CiAJfQogCkBAIC0yNjYwLDggKzI2
NjAsNyBAQCBzdGF0aWMgaW50IGFsaWFzaW5nX2d0dF9iaW5kX3ZtYShzdHJ1Y3QgaTkxNV92bWEg
KnZtYSwKIAkJc3RydWN0IGk5MTVfaHdfcHBndHQgKmFwcGd0dCA9CiAJCQl0b19pOTE1KHZtYS0+
dm0tPmRldiktPm1tLmFsaWFzaW5nX3BwZ3R0OwogCQlhcHBndHQtPmJhc2UuaW5zZXJ0X2VudHJp
ZXMoJmFwcGd0dC0+YmFzZSwKLQkJCQkJICAgIHZtYS0+Z2d0dF92aWV3LnBhZ2VzLAotCQkJCQkg
ICAgdm1hLT5ub2RlLnN0YXJ0LAorCQkJCQkgICAgdm1hLT5wYWdlcywgdm1hLT5ub2RlLnN0YXJ0
LAogCQkJCQkgICAgY2FjaGVfbGV2ZWwsIHB0ZV9mbGFncyk7CiAJfQogCkBAIC0zNTU3LDI4ICsz
NTU2LDI3IEBAIGk5MTVfZ2V0X2dndHRfdm1hX3BhZ2VzKHN0cnVjdCBpOTE1X3ZtYSAqdm1hKQog
ewogCWludCByZXQgPSAwOwogCi0JaWYgKHZtYS0+Z2d0dF92aWV3LnBhZ2VzKQorCWlmICh2bWEt
PnBhZ2VzKQogCQlyZXR1cm4gMDsKIAogCWlmICh2bWEtPmdndHRfdmlldy50eXBlID09IEk5MTVf
R0dUVF9WSUVXX05PUk1BTCkKLQkJdm1hLT5nZ3R0X3ZpZXcucGFnZXMgPSB2bWEtPm9iai0+cGFn
ZXM7CisJCXZtYS0+cGFnZXMgPSB2bWEtPm9iai0+cGFnZXM7CiAJZWxzZSBpZiAodm1hLT5nZ3R0
X3ZpZXcudHlwZSA9PSBJOTE1X0dHVFRfVklFV19ST1RBVEVEKQotCQl2bWEtPmdndHRfdmlldy5w
YWdlcyA9CisJCXZtYS0+cGFnZXMgPQogCQkJaW50ZWxfcm90YXRlX2ZiX29ial9wYWdlcygmdm1h
LT5nZ3R0X3ZpZXcucGFyYW1zLnJvdGF0ZWQsIHZtYS0+b2JqKTsKIAllbHNlIGlmICh2bWEtPmdn
dHRfdmlldy50eXBlID09IEk5MTVfR0dUVF9WSUVXX1BBUlRJQUwpCi0JCXZtYS0+Z2d0dF92aWV3
LnBhZ2VzID0KLQkJCWludGVsX3BhcnRpYWxfcGFnZXMoJnZtYS0+Z2d0dF92aWV3LCB2bWEtPm9i
aik7CisJCXZtYS0+cGFnZXMgPSBpbnRlbF9wYXJ0aWFsX3BhZ2VzKCZ2bWEtPmdndHRfdmlldywg
dm1hLT5vYmopOwogCWVsc2UKIAkJV0FSTl9PTkNFKDEsICJHR1RUIHZpZXcgJXUgbm90IGltcGxl
bWVudGVkIVxuIiwKIAkJCSAgdm1hLT5nZ3R0X3ZpZXcudHlwZSk7CiAKLQlpZiAoIXZtYS0+Z2d0
dF92aWV3LnBhZ2VzKSB7CisJaWYgKCF2bWEtPnBhZ2VzKSB7CiAJCURSTV9FUlJPUigiRmFpbGVk
IHRvIGdldCBwYWdlcyBmb3IgR0dUVCB2aWV3IHR5cGUgJXUhXG4iLAogCQkJICB2bWEtPmdndHRf
dmlldy50eXBlKTsKIAkJcmV0ID0gLUVJTlZBTDsKLQl9IGVsc2UgaWYgKElTX0VSUih2bWEtPmdn
dHRfdmlldy5wYWdlcykpIHsKLQkJcmV0ID0gUFRSX0VSUih2bWEtPmdndHRfdmlldy5wYWdlcyk7
Ci0JCXZtYS0+Z2d0dF92aWV3LnBhZ2VzID0gTlVMTDsKKwl9IGVsc2UgaWYgKElTX0VSUih2bWEt
PnBhZ2VzKSkgeworCQlyZXQgPSBQVFJfRVJSKHZtYS0+cGFnZXMpOworCQl2bWEtPnBhZ2VzID0g
TlVMTDsKIAkJRFJNX0VSUk9SKCJGYWlsZWQgdG8gZ2V0IHBhZ2VzIGZvciBWTUEgdmlldyB0eXBl
ICV1ICglZCkhXG4iLAogCQkJICB2bWEtPmdndHRfdmlldy50eXBlLCByZXQpOwogCX0KZGlmZiAt
LWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2d0dC5oIGIvZHJpdmVycy9ncHUv
ZHJtL2k5MTUvaTkxNV9nZW1fZ3R0LmgKaW5kZXggNTZlNjRhNTM1NWU4Li5iNTgwZThhMDEzY2Ug
MTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2d0dC5oCisrKyBiL2Ry
aXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2d0dC5oCkBAIC0xNTUsOCArMTU1LDYgQEAgc3Ry
dWN0IGk5MTVfZ2d0dF92aWV3IHsKIAkJfSBwYXJ0aWFsOwogCQlzdHJ1Y3QgaW50ZWxfcm90YXRp
b25faW5mbyByb3RhdGVkOwogCX0gcGFyYW1zOwotCi0Jc3RydWN0IHNnX3RhYmxlICpwYWdlczsK
IH07CiAKIGV4dGVybiBjb25zdCBzdHJ1Y3QgaTkxNV9nZ3R0X3ZpZXcgaTkxNV9nZ3R0X3ZpZXdf
bm9ybWFsOwpAQCAtMTc2LDYgKzE3NCw3IEBAIHN0cnVjdCBpOTE1X3ZtYSB7CiAJc3RydWN0IGRy
bV9tbV9ub2RlIG5vZGU7CiAJc3RydWN0IGRybV9pOTE1X2dlbV9vYmplY3QgKm9iajsKIAlzdHJ1
Y3QgaTkxNV9hZGRyZXNzX3NwYWNlICp2bTsKKwlzdHJ1Y3Qgc2dfdGFibGUgKnBhZ2VzOwogCXZv
aWQgX19pb21lbSAqaW9tYXA7CiAJdTY0IHNpemU7CiAKLS0gCjIuOC4xCgpfX19fX19fX19fX19f
X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0
CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3Rv
cC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK