From mboxrd@z Thu Jan  1 00:00:00 1970
From: Chris Wilson <chris@chris-wilson.co.uk>
Subject: [PATCH 08/33] drm/i915: Move setting of request->batch
	into its single callsite
Date: Sun,  7 Aug 2016 15:45:16 +0100
Message-ID: <1470581141-14432-9-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-x244.google.com (mail-wm0-x244.google.com
 [IPv6:2a00:1450:400c:c09::244])
 by gabe.freedesktop.org (Postfix) with ESMTPS id 8CB7C6E2F1
 for <intel-gfx@lists.freedesktop.org>; Sun,  7 Aug 2016 14:45:57 +0000 (UTC)
Received: by mail-wm0-x244.google.com with SMTP id i5so11072450wmg.2
 for <intel-gfx@lists.freedesktop.org>; Sun, 07 Aug 2016 07:45:57 -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

cmVxdWVzdC0+YmF0Y2hfb2JqIGlzIG9ubHkgc2V0IGJ5IGV4ZWNidWZmZXIgZm9yIHRoZSBjb252
ZW5pZW5jZSBvZgpkZWJ1Z2dpbmcgaGFuZ3MuIEJ5IG1vdmluZyB0aGF0IG9wZXJhdGlvbiB0byB0
aGUgY2FsbHNpdGUsIHdlIGNhbgpzaW1wbGlmeSBhbGwgb3RoZXIgY2FsbGVycyBhbmQgZnV0dXJl
IHBhdGNoZXMuIFdlIGFsc28gbW92ZSB0aGUKY29tcGxpY2F0aW9ucyBvZiByZWZlcmVuY2UgaGFu
ZGxpbmcgb2YgdGhlIHJlcXVlc3QtPmJhdGNoX29iaiBuZXh0IHRvCndoZXJlIHRoZSBhY3RpdmUg
dHJhY2tpbmcgaXMgc2V0IHVwIGZvciB0aGUgcmVxdWVzdC4KClNpZ25lZC1vZmYtYnk6IENocmlz
IFdpbHNvbiA8Y2hyaXNAY2hyaXMtd2lsc29uLmNvLnVrPgotLS0KIGRyaXZlcnMvZ3B1L2RybS9p
OTE1L2k5MTVfZ2VtX2V4ZWNidWZmZXIuYyB8IDEwICsrKysrKysrKy0KIGRyaXZlcnMvZ3B1L2Ry
bS9pOTE1L2k5MTVfZ2VtX3JlcXVlc3QuYyAgICB8IDEyICstLS0tLS0tLS0tLQogZHJpdmVycy9n
cHUvZHJtL2k5MTUvaTkxNV9nZW1fcmVxdWVzdC5oICAgIHwgIDggKysrLS0tLS0KIDMgZmlsZXMg
Y2hhbmdlZCwgMTMgaW5zZXJ0aW9ucygrKSwgMTcgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEv
ZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fZXhlY2J1ZmZlci5jIGIvZHJpdmVycy9ncHUv
ZHJtL2k5MTUvaTkxNV9nZW1fZXhlY2J1ZmZlci5jCmluZGV4IGM0OTRiNzlkZWQyMC4uYzhkMTNm
ZWE0YjI1IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9leGVjYnVm
ZmVyLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fZXhlY2J1ZmZlci5jCkBA
IC0xNzAyLDYgKzE3MDIsMTQgQEAgaTkxNV9nZW1fZG9fZXhlY2J1ZmZlcihzdHJ1Y3QgZHJtX2Rl
dmljZSAqZGV2LCB2b2lkICpkYXRhLAogCQlnb3RvIGVycl9iYXRjaF91bnBpbjsKIAl9CiAKKwkv
KiBXaGlsc3QgdGhpcyByZXF1ZXN0IGV4aXN0cywgYmF0Y2hfb2JqIHdpbGwgYmUgb24gdGhlCisJ
ICogYWN0aXZlX2xpc3QsIGFuZCBzbyB3aWxsIGhvbGQgdGhlIGFjdGl2ZSByZWZlcmVuY2UuIE9u
bHkgd2hlbiB0aGlzCisJICogcmVxdWVzdCBpcyByZXRpcmVkIHdpbGwgdGhlIHRoZSBiYXRjaF9v
YmogYmUgbW92ZWQgb250byB0aGUKKwkgKiBpbmFjdGl2ZV9saXN0IGFuZCBsb3NlIGl0cyBhY3Rp
dmUgcmVmZXJlbmNlLiBIZW5jZSB3ZSBkbyBub3QgbmVlZAorCSAqIHRvIGV4cGxpY2l0bHkgaG9s
ZCBhbm90aGVyIHJlZmVyZW5jZSBoZXJlLgorCSAqLworCXBhcmFtcy0+cmVxdWVzdC0+YmF0Y2hf
b2JqID0gcGFyYW1zLT5iYXRjaC0+b2JqOworCiAJcmV0ID0gaTkxNV9nZW1fcmVxdWVzdF9hZGRf
dG9fY2xpZW50KHBhcmFtcy0+cmVxdWVzdCwgZmlsZSk7CiAJaWYgKHJldCkKIAkJZ290byBlcnJf
cmVxdWVzdDsKQEAgLTE3MjAsNyArMTcyOCw3IEBAIGk5MTVfZ2VtX2RvX2V4ZWNidWZmZXIoc3Ry
dWN0IGRybV9kZXZpY2UgKmRldiwgdm9pZCAqZGF0YSwKIAogCXJldCA9IGV4ZWNidWZfc3VibWl0
KHBhcmFtcywgYXJncywgJmViLT52bWFzKTsKIGVycl9yZXF1ZXN0OgotCV9faTkxNV9hZGRfcmVx
dWVzdChwYXJhbXMtPnJlcXVlc3QsIHBhcmFtcy0+YmF0Y2gtPm9iaiwgcmV0ID09IDApOworCV9f
aTkxNV9hZGRfcmVxdWVzdChwYXJhbXMtPnJlcXVlc3QsIHJldCA9PSAwKTsKIAogZXJyX2JhdGNo
X3VucGluOgogCS8qCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9y
ZXF1ZXN0LmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9yZXF1ZXN0LmMKaW5kZXgg
YjdmZmRlMDAyYTYyLi5jNmY1MjNlMjg3OWMgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9p
OTE1L2k5MTVfZ2VtX3JlcXVlc3QuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dl
bV9yZXF1ZXN0LmMKQEAgLTQ2MSw5ICs0NjEsNyBAQCBzdGF0aWMgdm9pZCBpOTE1X2dlbV9tYXJr
X2J1c3koY29uc3Qgc3RydWN0IGludGVsX2VuZ2luZV9jcyAqZW5naW5lKQogICogcmVxdWVzdCBp
cyBub3QgYmVpbmcgdHJhY2tlZCBmb3IgY29tcGxldGlvbiBidXQgdGhlIHdvcmsgaXRzZWxmIGlz
CiAgKiBnb2luZyB0byBoYXBwZW4gb24gdGhlIGhhcmR3YXJlLiBUaGlzIHdvdWxkIGJlIGEgQmFk
IFRoaW5nKHRtKS4KICAqLwotdm9pZCBfX2k5MTVfYWRkX3JlcXVlc3Qoc3RydWN0IGRybV9pOTE1
X2dlbV9yZXF1ZXN0ICpyZXF1ZXN0LAotCQkJc3RydWN0IGRybV9pOTE1X2dlbV9vYmplY3QgKm9i
aiwKLQkJCWJvb2wgZmx1c2hfY2FjaGVzKQordm9pZCBfX2k5MTVfYWRkX3JlcXVlc3Qoc3RydWN0
IGRybV9pOTE1X2dlbV9yZXF1ZXN0ICpyZXF1ZXN0LCBib29sIGZsdXNoX2NhY2hlcykKIHsKIAlz
dHJ1Y3QgaW50ZWxfZW5naW5lX2NzICplbmdpbmU7CiAJc3RydWN0IGludGVsX3JpbmcgKnJpbmc7
CkBAIC01MDQsMTQgKzUwMiw2IEBAIHZvaWQgX19pOTE1X2FkZF9yZXF1ZXN0KHN0cnVjdCBkcm1f
aTkxNV9nZW1fcmVxdWVzdCAqcmVxdWVzdCwKIAogCXJlcXVlc3QtPmhlYWQgPSByZXF1ZXN0X3N0
YXJ0OwogCi0JLyogV2hpbHN0IHRoaXMgcmVxdWVzdCBleGlzdHMsIGJhdGNoX29iaiB3aWxsIGJl
IG9uIHRoZQotCSAqIGFjdGl2ZV9saXN0LCBhbmQgc28gd2lsbCBob2xkIHRoZSBhY3RpdmUgcmVm
ZXJlbmNlLiBPbmx5IHdoZW4gdGhpcwotCSAqIHJlcXVlc3QgaXMgcmV0aXJlZCB3aWxsIHRoZSB0
aGUgYmF0Y2hfb2JqIGJlIG1vdmVkIG9udG8gdGhlCi0JICogaW5hY3RpdmVfbGlzdCBhbmQgbG9z
ZSBpdHMgYWN0aXZlIHJlZmVyZW5jZS4gSGVuY2Ugd2UgZG8gbm90IG5lZWQKLQkgKiB0byBleHBs
aWNpdGx5IGhvbGQgYW5vdGhlciByZWZlcmVuY2UgaGVyZS4KLQkgKi8KLQlyZXF1ZXN0LT5iYXRj
aF9vYmogPSBvYmo7Ci0KIAkvKiBTZWFsIHRoZSByZXF1ZXN0IGFuZCBtYXJrIGl0IGFzIHBlbmRp
bmcgZXhlY3V0aW9uLiBOb3RlIHRoYXQKIAkgKiB3ZSBtYXkgaW5zcGVjdCB0aGlzIHN0YXRlLCB3
aXRob3V0IGhvbGRpbmcgYW55IGxvY2tzLCBkdXJpbmcKIAkgKiBoYW5nY2hlY2suIEhlbmNlIHdl
IGFwcGx5IHRoZSBiYXJyaWVyIHRvIGVuc3VyZSB0aGF0IHdlIGRvIG5vdApkaWZmIC0tZ2l0IGEv
ZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fcmVxdWVzdC5oIGIvZHJpdmVycy9ncHUvZHJt
L2k5MTUvaTkxNV9nZW1fcmVxdWVzdC5oCmluZGV4IDcyMWViOGNiY2U5Yi4uZDUxNzZmOWNjMjJm
IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9yZXF1ZXN0LmgKKysr
IGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fcmVxdWVzdC5oCkBAIC0yMjUsMTMgKzIy
NSwxMSBAQCBzdGF0aWMgaW5saW5lIHZvaWQgaTkxNV9nZW1fcmVxdWVzdF9hc3NpZ24oc3RydWN0
IGRybV9pOTE1X2dlbV9yZXF1ZXN0ICoqcGRzdCwKIAkqcGRzdCA9IHNyYzsKIH0KIAotdm9pZCBf
X2k5MTVfYWRkX3JlcXVlc3Qoc3RydWN0IGRybV9pOTE1X2dlbV9yZXF1ZXN0ICpyZXEsCi0JCQlz
dHJ1Y3QgZHJtX2k5MTVfZ2VtX29iamVjdCAqYmF0Y2hfb2JqLAotCQkJYm9vbCBmbHVzaF9jYWNo
ZXMpOwordm9pZCBfX2k5MTVfYWRkX3JlcXVlc3Qoc3RydWN0IGRybV9pOTE1X2dlbV9yZXF1ZXN0
ICpyZXEsIGJvb2wgZmx1c2hfY2FjaGVzKTsKICNkZWZpbmUgaTkxNV9hZGRfcmVxdWVzdChyZXEp
IFwKLQlfX2k5MTVfYWRkX3JlcXVlc3QocmVxLCBOVUxMLCB0cnVlKQorCV9faTkxNV9hZGRfcmVx
dWVzdChyZXEsIHRydWUpCiAjZGVmaW5lIGk5MTVfYWRkX3JlcXVlc3Rfbm9fZmx1c2gocmVxKSBc
Ci0JX19pOTE1X2FkZF9yZXF1ZXN0KHJlcSwgTlVMTCwgZmFsc2UpCisJX19pOTE1X2FkZF9yZXF1
ZXN0KHJlcSwgZmFsc2UpCiAKIHN0cnVjdCBpbnRlbF9ycHNfY2xpZW50OwogI2RlZmluZSBOT19X
QUlUQk9PU1QgRVJSX1BUUigtMSkKLS0gCjIuOC4xCgpfX19fX19fX19fX19fX19fX19fX19fX19f
X19fX19fX19fX19fX19fX19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBs
aXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1h
bi9saXN0aW5mby9pbnRlbC1nZngK