From mboxrd@z Thu Jan  1 00:00:00 1970
From: Chris Wilson <chris@chris-wilson.co.uk>
Subject: [PATCH 16/33] drm/i915: Convert fence computations to
	use vma directly
Date: Sun,  7 Aug 2016 15:45:24 +0100
Message-ID: <1470581141-14432-17-git-send-email-chris@chris-wilson.co.uk>
References: <1470581141-14432-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-x242.google.com (mail-wm0-x242.google.com
 [IPv6:2a00:1450:400c:c09::242])
 by gabe.freedesktop.org (Postfix) with ESMTPS id 0BA756E2F6
 for <intel-gfx@lists.freedesktop.org>; Sun,  7 Aug 2016 14:46:08 +0000 (UTC)
Received: by mail-wm0-x242.google.com with SMTP id q128so11079858wma.1
 for <intel-gfx@lists.freedesktop.org>; Sun, 07 Aug 2016 07:46:07 -0700 (PDT)
In-Reply-To: <1470581141-14432-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

TG9va3VwIHRoZSBHR1RUIHZtYSBvbmNlIGZvciB0aGUgb2JqZWN0IGFzc2lnbmVkIHRvIHRoZSBm
ZW5jZSwgYW5kIHRoZW4KZGVyaXZlIGV2ZXJ5dGhpbmcgZnJvbSB0aGF0IHZtYS4KClNpZ25lZC1v
ZmYtYnk6IENocmlzIFdpbHNvbiA8Y2hyaXNAY2hyaXMtd2lsc29uLmNvLnVrPgotLS0KIGRyaXZl
cnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2ZlbmNlLmMgfCA1NSArKysrKysrKysrKysrKysrKy0t
LS0tLS0tLS0tLS0tLS0tLQogMSBmaWxlIGNoYW5nZWQsIDI2IGluc2VydGlvbnMoKyksIDI5IGRl
bGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2Zl
bmNlLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9mZW5jZS5jCmluZGV4IDllODE3
M2ZlMmEwOS4uNjA3NDljZDIzZjIwIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9p
OTE1X2dlbV9mZW5jZS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2ZlbmNl
LmMKQEAgLTg1LDIyICs4NSwxOSBAQCBzdGF0aWMgdm9pZCBpOTY1X3dyaXRlX2ZlbmNlX3JlZyhz
dHJ1Y3QgZHJtX2RldmljZSAqZGV2LCBpbnQgcmVnLAogCVBPU1RJTkdfUkVBRChmZW5jZV9yZWdf
bG8pOwogCiAJaWYgKG9iaikgewotCQl1MzIgc2l6ZSA9IGk5MTVfZ2VtX29ial9nZ3R0X3NpemUo
b2JqKTsKKwkJc3RydWN0IGk5MTVfdm1hICp2bWEgPSBpOTE1X2dlbV9vYmpfdG9fZ2d0dChvYmop
OwogCQl1bnNpZ25lZCBpbnQgdGlsaW5nID0gaTkxNV9nZW1fb2JqZWN0X2dldF90aWxpbmcob2Jq
KTsKIAkJdW5zaWduZWQgaW50IHN0cmlkZSA9IGk5MTVfZ2VtX29iamVjdF9nZXRfc3RyaWRlKG9i
aik7Ci0JCXVpbnQ2NF90IHZhbDsKKwkJdTY0IHNpemUgPSB2bWEtPm5vZGUuc2l6ZTsKKwkJdTMy
IHJvd19zaXplID0gc3RyaWRlICogKHRpbGluZyA9PSBJOTE1X1RJTElOR19ZID8gMzIgOiA4KTsK
KwkJdTY0IHZhbDsKIAogCQkvKiBBZGp1c3QgZmVuY2Ugc2l6ZSB0byBtYXRjaCB0aWxlZCBhcmVh
ICovCi0JCWlmICh0aWxpbmcgIT0gSTkxNV9USUxJTkdfTk9ORSkgewotCQkJdWludDMyX3Qgcm93
X3NpemUgPSBzdHJpZGUgKgotCQkJCSh0aWxpbmcgPT0gSTkxNV9USUxJTkdfWSA/IDMyIDogOCk7
Ci0JCQlzaXplID0gKHNpemUgLyByb3dfc2l6ZSkgKiByb3dfc2l6ZTsKLQkJfQorCQlzaXplID0g
c2l6ZSAvIHJvd19zaXplICogcm93X3NpemU7CiAKLQkJdmFsID0gKHVpbnQ2NF90KSgoaTkxNV9n
ZW1fb2JqX2dndHRfb2Zmc2V0KG9iaikgKyBzaXplIC0gNDA5NikgJgotCQkJCSAweGZmZmZmMDAw
KSA8PCAzMjsKLQkJdmFsIHw9IGk5MTVfZ2VtX29ial9nZ3R0X29mZnNldChvYmopICYgMHhmZmZm
ZjAwMDsKLQkJdmFsIHw9ICh1aW50NjRfdCkoKHN0cmlkZSAvIDEyOCkgLSAxKSA8PCBmZW5jZV9w
aXRjaF9zaGlmdDsKKwkJdmFsID0gKCh2bWEtPm5vZGUuc3RhcnQgKyBzaXplIC0gNDA5NikgJiAw
eGZmZmZmMDAwKSA8PCAzMjsKKwkJdmFsIHw9IHZtYS0+bm9kZS5zdGFydCAmIDB4ZmZmZmYwMDA7
CisJCXZhbCB8PSAodTY0KSgoc3RyaWRlIC8gMTI4KSAtIDEpIDw8IGZlbmNlX3BpdGNoX3NoaWZ0
OwogCQlpZiAodGlsaW5nID09IEk5MTVfVElMSU5HX1kpCiAJCQl2YWwgfD0gMSA8PCBJOTY1X0ZF
TkNFX1RJTElOR19ZX1NISUZUOwogCQl2YWwgfD0gSTk2NV9GRU5DRV9SRUdfVkFMSUQ7CkBAIC0x
MjMsMTcgKzEyMCwxNyBAQCBzdGF0aWMgdm9pZCBpOTE1X3dyaXRlX2ZlbmNlX3JlZyhzdHJ1Y3Qg
ZHJtX2RldmljZSAqZGV2LCBpbnQgcmVnLAogCXUzMiB2YWw7CiAKIAlpZiAob2JqKSB7Ci0JCXUz
MiBzaXplID0gaTkxNV9nZW1fb2JqX2dndHRfc2l6ZShvYmopOworCQlzdHJ1Y3QgaTkxNV92bWEg
KnZtYSA9IGk5MTVfZ2VtX29ial90b19nZ3R0KG9iaik7CiAJCXVuc2lnbmVkIGludCB0aWxpbmcg
PSBpOTE1X2dlbV9vYmplY3RfZ2V0X3RpbGluZyhvYmopOwogCQl1bnNpZ25lZCBpbnQgc3RyaWRl
ID0gaTkxNV9nZW1fb2JqZWN0X2dldF9zdHJpZGUob2JqKTsKIAkJaW50IHBpdGNoX3ZhbDsKIAkJ
aW50IHRpbGVfd2lkdGg7CiAKLQkJV0FSTigoaTkxNV9nZW1fb2JqX2dndHRfb2Zmc2V0KG9iaikg
JiB+STkxNV9GRU5DRV9TVEFSVF9NQVNLKSB8fAotCQkgICAgIChzaXplICYgLXNpemUpICE9IHNp
emUgfHwKLQkJICAgICAoaTkxNV9nZW1fb2JqX2dndHRfb2Zmc2V0KG9iaikgJiAoc2l6ZSAtIDEp
KSwKLQkJICAgICAib2JqZWN0IDB4JTA4bGx4IFtmZW5jZWFibGU/ICVkXSBub3QgMU0gb3IgcG90
LXNpemUgKDB4JTA4eCkgYWxpZ25lZFxuIiwKLQkJICAgICBpOTE1X2dlbV9vYmpfZ2d0dF9vZmZz
ZXQob2JqKSwgb2JqLT5tYXBfYW5kX2ZlbmNlYWJsZSwgc2l6ZSk7CisJCVdBUk4oKHZtYS0+bm9k
ZS5zdGFydCAmIH5JOTE1X0ZFTkNFX1NUQVJUX01BU0spIHx8CisJCSAgICAgIWlzX3Bvd2VyX29m
XzIodm1hLT5ub2RlLnNpemUpIHx8CisJCSAgICAgKHZtYS0+bm9kZS5zdGFydCAmICh2bWEtPm5v
ZGUuc2l6ZSAtIDEpKSwKKwkJICAgICAib2JqZWN0IDB4JTA4bGx4IFtmZW5jZWFibGU/ICVkXSBu
b3QgMU0gb3IgcG90LXNpemUgKDB4JTA4bGx4KSBhbGlnbmVkXG4iLAorCQkgICAgIHZtYS0+bm9k
ZS5zdGFydCwgb2JqLT5tYXBfYW5kX2ZlbmNlYWJsZSwgdm1hLT5ub2RlLnNpemUpOwogCiAJCWlm
ICh0aWxpbmcgPT0gSTkxNV9USUxJTkdfWSAmJiBIQVNfMTI4X0JZVEVfWV9USUxJTkcoZGV2KSkK
IAkJCXRpbGVfd2lkdGggPSAxMjg7CkBAIC0xNDQsMTAgKzE0MSwxMCBAQCBzdGF0aWMgdm9pZCBp
OTE1X3dyaXRlX2ZlbmNlX3JlZyhzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LCBpbnQgcmVnLAogCQlw
aXRjaF92YWwgPSBzdHJpZGUgLyB0aWxlX3dpZHRoOwogCQlwaXRjaF92YWwgPSBmZnMocGl0Y2hf
dmFsKSAtIDE7CiAKLQkJdmFsID0gaTkxNV9nZW1fb2JqX2dndHRfb2Zmc2V0KG9iaik7CisJCXZh
bCA9IHZtYS0+bm9kZS5zdGFydDsKIAkJaWYgKHRpbGluZyA9PSBJOTE1X1RJTElOR19ZKQogCQkJ
dmFsIHw9IDEgPDwgSTgzMF9GRU5DRV9USUxJTkdfWV9TSElGVDsKLQkJdmFsIHw9IEk5MTVfRkVO
Q0VfU0laRV9CSVRTKHNpemUpOworCQl2YWwgfD0gSTkxNV9GRU5DRV9TSVpFX0JJVFModm1hLT5u
b2RlLnNpemUpOwogCQl2YWwgfD0gcGl0Y2hfdmFsIDw8IEk4MzBfRkVOQ0VfUElUQ0hfU0hJRlQ7
CiAJCXZhbCB8PSBJODMwX0ZFTkNFX1JFR19WQUxJRDsKIAl9IGVsc2UKQEAgLTE2MSwyNyArMTU4
LDI3IEBAIHN0YXRpYyB2b2lkIGk4MzBfd3JpdGVfZmVuY2VfcmVnKHN0cnVjdCBkcm1fZGV2aWNl
ICpkZXYsIGludCByZWcsCiAJCQkJc3RydWN0IGRybV9pOTE1X2dlbV9vYmplY3QgKm9iaikKIHsK
IAlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSB0b19pOTE1KGRldik7Ci0JdWlu
dDMyX3QgdmFsOworCXUzMiB2YWw7CiAKIAlpZiAob2JqKSB7Ci0JCXUzMiBzaXplID0gaTkxNV9n
ZW1fb2JqX2dndHRfc2l6ZShvYmopOworCQlzdHJ1Y3QgaTkxNV92bWEgKnZtYSA9IGk5MTVfZ2Vt
X29ial90b19nZ3R0KG9iaik7CiAJCXVuc2lnbmVkIGludCB0aWxpbmcgPSBpOTE1X2dlbV9vYmpl
Y3RfZ2V0X3RpbGluZyhvYmopOwogCQl1bnNpZ25lZCBpbnQgc3RyaWRlID0gaTkxNV9nZW1fb2Jq
ZWN0X2dldF9zdHJpZGUob2JqKTsKLQkJdWludDMyX3QgcGl0Y2hfdmFsOworCQl1MzIgcGl0Y2hf
dmFsOwogCi0JCVdBUk4oKGk5MTVfZ2VtX29ial9nZ3R0X29mZnNldChvYmopICYgfkk4MzBfRkVO
Q0VfU1RBUlRfTUFTSykgfHwKLQkJICAgICAoc2l6ZSAmIC1zaXplKSAhPSBzaXplIHx8Ci0JCSAg
ICAgKGk5MTVfZ2VtX29ial9nZ3R0X29mZnNldChvYmopICYgKHNpemUgLSAxKSksCi0JCSAgICAg
Im9iamVjdCAweCUwOGxseCBub3QgNTEySyBvciBwb3Qtc2l6ZSAweCUwOHggYWxpZ25lZFxuIiwK
LQkJICAgICBpOTE1X2dlbV9vYmpfZ2d0dF9vZmZzZXQob2JqKSwgc2l6ZSk7CisJCVdBUk4oKHZt
YS0+bm9kZS5zdGFydCAmIH5JODMwX0ZFTkNFX1NUQVJUX01BU0spIHx8CisJCSAgICAgIWlzX3Bv
d2VyX29mXzIodm1hLT5ub2RlLnNpemUpIHx8CisJCSAgICAgKHZtYS0+bm9kZS5zdGFydCAmICh2
bWEtPm5vZGUuc2l6ZSAtIDEpKSwKKwkJICAgICAib2JqZWN0IDB4JTA4bGx4IG5vdCA1MTJLIG9y
IHBvdC1zaXplIDB4JTA4bGx4IGFsaWduZWRcbiIsCisJCSAgICAgdm1hLT5ub2RlLnN0YXJ0LCB2
bWEtPm5vZGUuc2l6ZSk7CiAKIAkJcGl0Y2hfdmFsID0gc3RyaWRlIC8gMTI4OwogCQlwaXRjaF92
YWwgPSBmZnMocGl0Y2hfdmFsKSAtIDE7CiAKLQkJdmFsID0gaTkxNV9nZW1fb2JqX2dndHRfb2Zm
c2V0KG9iaik7CisJCXZhbCA9IHZtYS0+bm9kZS5zdGFydDsKIAkJaWYgKHRpbGluZyA9PSBJOTE1
X1RJTElOR19ZKQogCQkJdmFsIHw9IDEgPDwgSTgzMF9GRU5DRV9USUxJTkdfWV9TSElGVDsKLQkJ
dmFsIHw9IEk4MzBfRkVOQ0VfU0laRV9CSVRTKHNpemUpOworCQl2YWwgfD0gSTgzMF9GRU5DRV9T
SVpFX0JJVFModm1hLT5ub2RlLnNpemUpOwogCQl2YWwgfD0gcGl0Y2hfdmFsIDw8IEk4MzBfRkVO
Q0VfUElUQ0hfU0hJRlQ7CiAJCXZhbCB8PSBJODMwX0ZFTkNFX1JFR19WQUxJRDsKIAl9IGVsc2UK
LS0gCjIuOC4xCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f
XwpJbnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcK
aHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK