From mboxrd@z Thu Jan  1 00:00:00 1970
From: Chris Wilson <chris@chris-wilson.co.uk>
Subject: [PATCH 2/3] drm/i915: Move common scratch
	allocation/destroy to intel_engine_cs.c
Date: Mon,  8 Aug 2016 09:00:01 +0100
Message-ID: <1470643202-3038-2-git-send-email-chris@chris-wilson.co.uk>
References: <1470581141-14432-22-git-send-email-chris@chris-wilson.co.uk>
 <1470643202-3038-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 1EF316E34E
 for <intel-gfx@lists.freedesktop.org>; Mon,  8 Aug 2016 08:00:11 +0000 (UTC)
Received: by mail-wm0-x242.google.com with SMTP id q128so13860618wma.1
 for <intel-gfx@lists.freedesktop.org>; Mon, 08 Aug 2016 01:00:11 -0700 (PDT)
In-Reply-To: <1470643202-3038-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

U2luY2UgdGhlIHNjcmF0Y2ggYWxsb2NhdGlvbiBhbmQgY2xlYW51cCBpcyBzaGFyZWQgYnkgYWxs
IGVuZ2luZQpzdWJtaXNzaW9uIGJhY2tlbmRzLCBtb3ZlIGl0IG91dCBvZiB0aGUgbGVnYWN5IGlu
dGVsX3JpbmdidWZmZXIuYyBhbmQKaW50byB0aGUgbmV3IGhvbWUgZm9yIGNvbW1vbiByb3V0aW5l
cywgaW50ZWxfZW5naW5lX2NzLmMKClNpZ25lZC1vZmYtYnk6IENocmlzIFdpbHNvbiA8Y2hyaXNA
Y2hyaXMtd2lsc29uLmNvLnVrPgotLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2VuZ2lu
ZV9jcy5jICB8IDUwICsrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKwogZHJpdmVycy9n
cHUvZHJtL2k5MTUvaW50ZWxfbHJjLmMgICAgICAgIHwgIDEgLQogZHJpdmVycy9ncHUvZHJtL2k5
MTUvaW50ZWxfcmluZ2J1ZmZlci5jIHwgNTAgLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t
LS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9yaW5nYnVmZmVyLmggfCAgNCArLS0KIDQg
ZmlsZXMgY2hhbmdlZCwgNTEgaW5zZXJ0aW9ucygrKSwgNTQgZGVsZXRpb25zKC0pCgpkaWZmIC0t
Z2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZW5naW5lX2NzLmMgYi9kcml2ZXJzL2dw
dS9kcm0vaTkxNS9pbnRlbF9lbmdpbmVfY3MuYwppbmRleCAwZGQzZDFkZTE4YWEuLjFkZWMzNTQ0
MWFiNSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZW5naW5lX2NzLmMK
KysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZW5naW5lX2NzLmMKQEAgLTE5NSw2ICsx
OTUsNTQgQEAgdm9pZCBpbnRlbF9lbmdpbmVfc2V0dXBfY29tbW9uKHN0cnVjdCBpbnRlbF9lbmdp
bmVfY3MgKmVuZ2luZSkKIAlpOTE1X2dlbV9iYXRjaF9wb29sX2luaXQoZW5naW5lLCAmZW5naW5l
LT5iYXRjaF9wb29sKTsKIH0KIAoraW50IGludGVsX2VuZ2luZV9jcmVhdGVfc2NyYXRjaChzdHJ1
Y3QgaW50ZWxfZW5naW5lX2NzICplbmdpbmUsIGludCBzaXplKQoreworCXN0cnVjdCBkcm1faTkx
NV9nZW1fb2JqZWN0ICpvYmo7CisJc3RydWN0IGk5MTVfdm1hICp2bWE7CisJaW50IHJldDsKKwor
CVdBUk5fT04oZW5naW5lLT5zY3JhdGNoKTsKKworCW9iaiA9IGk5MTVfZ2VtX29iamVjdF9jcmVh
dGVfc3RvbGVuKCZlbmdpbmUtPmk5MTUtPmRybSwgc2l6ZSk7CisJaWYgKCFvYmopCisJCW9iaiA9
IGk5MTVfZ2VtX29iamVjdF9jcmVhdGUoJmVuZ2luZS0+aTkxNS0+ZHJtLCBzaXplKTsKKwlpZiAo
SVNfRVJSKG9iaikpIHsKKwkJRFJNX0VSUk9SKCJGYWlsZWQgdG8gYWxsb2NhdGUgc2NyYXRjaCBw
YWdlXG4iKTsKKwkJcmV0dXJuIFBUUl9FUlIob2JqKTsKKwl9CisKKwl2bWEgPSBpOTE1X3ZtYV9j
cmVhdGUob2JqLCAmZW5naW5lLT5pOTE1LT5nZ3R0LmJhc2UsIE5VTEwpOworCWlmIChJU19FUlIo
dm1hKSkgeworCQlyZXQgPSBQVFJfRVJSKHZtYSk7CisJCWdvdG8gZXJyX3VucmVmOworCX0KKwor
CXJldCA9IGk5MTVfdm1hX3Bpbih2bWEsIDAsIDQwOTYsIFBJTl9HTE9CQUwgfCBQSU5fSElHSCk7
CisJaWYgKHJldCkKKwkJZ290byBlcnJfdW5yZWY7CisKKwllbmdpbmUtPnNjcmF0Y2ggPSB2bWE7
CisJRFJNX0RFQlVHX0RSSVZFUigiJXMgcGlwZSBjb250cm9sIG9mZnNldDogMHglMDhsbHhcbiIs
CisJCQkgZW5naW5lLT5uYW1lLCB2bWEtPm5vZGUuc3RhcnQpOworCXJldHVybiAwOworCitlcnJf
dW5yZWY6CisJaTkxNV9nZW1fb2JqZWN0X3B1dChvYmopOworCXJldHVybiByZXQ7Cit9CisKK3N0
YXRpYyB2b2lkIGludGVsX2VuZ2luZV9jbGVhbnVwX3NjcmF0Y2goc3RydWN0IGludGVsX2VuZ2lu
ZV9jcyAqZW5naW5lKQoreworCXN0cnVjdCBpOTE1X3ZtYSAqdm1hOworCisJdm1hID0gbnVsbGlm
eSgmZW5naW5lLT5zY3JhdGNoKTsKKwlpZiAoIXZtYSkKKwkJcmV0dXJuOworCisJaTkxNV92bWFf
dW5waW4odm1hKTsKKwlpOTE1X2dlbV9vYmplY3RfcHV0KHZtYS0+b2JqKTsKK30KKwogLyoqCiAg
KiBpbnRlbF9lbmdpbmVzX2luaXRfY29tbW9uIC0gaW5pdGlhbGl6ZSBjZW5naW5lIHN0YXRlIHdo
aWNoIG1pZ2h0IHJlcXVpcmUgaHcgYWNjZXNzCiAgKiBAZW5naW5lOiBFbmdpbmUgdG8gaW5pdGlh
bGl6ZS4KQEAgLTIyNiw2ICsyNzQsOCBAQCBpbnQgaW50ZWxfZW5naW5lX2luaXRfY29tbW9uKHN0
cnVjdCBpbnRlbF9lbmdpbmVfY3MgKmVuZ2luZSkKICAqLwogdm9pZCBpbnRlbF9lbmdpbmVfY2xl
YW51cF9jb21tb24oc3RydWN0IGludGVsX2VuZ2luZV9jcyAqZW5naW5lKQogeworCWludGVsX2Vu
Z2luZV9jbGVhbnVwX3NjcmF0Y2goZW5naW5lKTsKKwogCWludGVsX2VuZ2luZV9jbGVhbnVwX2Nt
ZF9wYXJzZXIoZW5naW5lKTsKIAlpbnRlbF9lbmdpbmVfZmluaV9icmVhZGNydW1icyhlbmdpbmUp
OwogCWk5MTVfZ2VtX2JhdGNoX3Bvb2xfZmluaSgmZW5naW5lLT5iYXRjaF9wb29sKTsKZGlmZiAt
LWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2xyYy5jIGIvZHJpdmVycy9ncHUvZHJt
L2k5MTUvaW50ZWxfbHJjLmMKaW5kZXggNGRjNzc3NDc5MTFkLi4wOTZlYjhjMmRhMTcgMTAwNjQ0
Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2xyYy5jCisrKyBiL2RyaXZlcnMvZ3B1
L2RybS9pOTE1L2ludGVsX2xyYy5jCkBAIC0xODQ0LDcgKzE4NDQsNiBAQCBpbnQgbG9naWNhbF9y
ZW5kZXJfcmluZ19pbml0KHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKmVuZ2luZSkKIAllbHNlCiAJ
CWVuZ2luZS0+aW5pdF9odyA9IGdlbjhfaW5pdF9yZW5kZXJfcmluZzsKIAllbmdpbmUtPmluaXRf
Y29udGV4dCA9IGdlbjhfaW5pdF9yY3NfY29udGV4dDsKLQllbmdpbmUtPmNsZWFudXAgPSBpbnRl
bF9lbmdpbmVfY2xlYW51cF9zY3JhdGNoOwogCWVuZ2luZS0+ZW1pdF9mbHVzaCA9IGdlbjhfZW1p
dF9mbHVzaF9yZW5kZXI7CiAJZW5naW5lLT5lbWl0X3JlcXVlc3QgPSBnZW44X2VtaXRfcmVxdWVz
dF9yZW5kZXI7CiAKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3Jpbmdi
dWZmZXIuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3JpbmdidWZmZXIuYwppbmRleCBm
Njg0ZmVmODk1YzEuLmFmMmQ4MWFlM2U3ZCAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5
MTUvaW50ZWxfcmluZ2J1ZmZlci5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3Jp
bmdidWZmZXIuYwpAQCAtNjEzLDU0ICs2MTMsNiBAQCBvdXQ6CiAJcmV0dXJuIHJldDsKIH0KIAot
dm9pZCBpbnRlbF9lbmdpbmVfY2xlYW51cF9zY3JhdGNoKHN0cnVjdCBpbnRlbF9lbmdpbmVfY3Mg
KmVuZ2luZSkKLXsKLQlzdHJ1Y3QgaTkxNV92bWEgKnZtYTsKLQotCXZtYSA9IG51bGxpZnkoJmVu
Z2luZS0+c2NyYXRjaCk7Ci0JaWYgKCF2bWEpCi0JCXJldHVybjsKLQotCWk5MTVfdm1hX3VucGlu
KHZtYSk7Ci0JaTkxNV9nZW1fb2JqZWN0X3B1dCh2bWEtPm9iaik7Ci19Ci0KLWludCBpbnRlbF9l
bmdpbmVfY3JlYXRlX3NjcmF0Y2goc3RydWN0IGludGVsX2VuZ2luZV9jcyAqZW5naW5lLCBpbnQg
c2l6ZSkKLXsKLQlzdHJ1Y3QgZHJtX2k5MTVfZ2VtX29iamVjdCAqb2JqOwotCXN0cnVjdCBpOTE1
X3ZtYSAqdm1hOwotCWludCByZXQ7Ci0KLQlXQVJOX09OKGVuZ2luZS0+c2NyYXRjaCk7Ci0KLQlv
YmogPSBpOTE1X2dlbV9vYmplY3RfY3JlYXRlX3N0b2xlbigmZW5naW5lLT5pOTE1LT5kcm0sIHNp
emUpOwotCWlmICghb2JqKQotCQlvYmogPSBpOTE1X2dlbV9vYmplY3RfY3JlYXRlKCZlbmdpbmUt
Pmk5MTUtPmRybSwgc2l6ZSk7Ci0JaWYgKElTX0VSUihvYmopKSB7Ci0JCURSTV9FUlJPUigiRmFp
bGVkIHRvIGFsbG9jYXRlIHNjcmF0Y2ggcGFnZVxuIik7Ci0JCXJldHVybiBQVFJfRVJSKG9iaik7
Ci0JfQotCi0Jdm1hID0gaTkxNV92bWFfY3JlYXRlKG9iaiwgJmVuZ2luZS0+aTkxNS0+Z2d0dC5i
YXNlLCBOVUxMKTsKLQlpZiAoSVNfRVJSKHZtYSkpIHsKLQkJcmV0ID0gUFRSX0VSUih2bWEpOwot
CQlnb3RvIGVycl91bnJlZjsKLQl9Ci0KLQlyZXQgPSBpOTE1X3ZtYV9waW4odm1hLCAwLCA0MDk2
LCBQSU5fR0xPQkFMIHwgUElOX0hJR0gpOwotCWlmIChyZXQpCi0JCWdvdG8gZXJyX3VucmVmOwot
Ci0JZW5naW5lLT5zY3JhdGNoID0gdm1hOwotCURSTV9ERUJVR19EUklWRVIoIiVzIHBpcGUgY29u
dHJvbCBvZmZzZXQ6IDB4JTA4bGx4XG4iLAotCQkJIGVuZ2luZS0+bmFtZSwgdm1hLT5ub2RlLnN0
YXJ0KTsKLQlyZXR1cm4gMDsKLQotZXJyX3VucmVmOgotCWk5MTVfZ2VtX29iamVjdF9wdXQob2Jq
KTsKLQlyZXR1cm4gcmV0OwotfQotCiBzdGF0aWMgaW50IGludGVsX3Jpbmdfd29ya2Fyb3VuZHNf
ZW1pdChzdHJ1Y3QgZHJtX2k5MTVfZ2VtX3JlcXVlc3QgKnJlcSkKIHsKIAlzdHJ1Y3QgaW50ZWxf
cmluZyAqcmluZyA9IHJlcS0+cmluZzsKQEAgLTEzMTEsOCArMTI2Myw2IEBAIHN0YXRpYyB2b2lk
IHJlbmRlcl9yaW5nX2NsZWFudXAoc3RydWN0IGludGVsX2VuZ2luZV9jcyAqZW5naW5lKQogCQlp
OTE1X2dlbV9vYmplY3RfcHV0KGRldl9wcml2LT5zZW1hcGhvcmVfb2JqKTsKIAkJZGV2X3ByaXYt
PnNlbWFwaG9yZV9vYmogPSBOVUxMOwogCX0KLQotCWludGVsX2VuZ2luZV9jbGVhbnVwX3NjcmF0
Y2goZW5naW5lKTsKIH0KIAogc3RhdGljIGludCBnZW44X3Jjc19zaWduYWwoc3RydWN0IGRybV9p
OTE1X2dlbV9yZXF1ZXN0ICpyZXEpCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9p
bnRlbF9yaW5nYnVmZmVyLmggYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9yaW5nYnVmZmVy
LmgKaW5kZXggNmEyMzZjNGMzZjg5Li45ZTNhYjgxMjk3MzQgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMv
Z3B1L2RybS9pOTE1L2ludGVsX3JpbmdidWZmZXIuaAorKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkx
NS9pbnRlbF9yaW5nYnVmZmVyLmgKQEAgLTQ3MiwxMSArNDcyLDkgQEAgdm9pZCBpbnRlbF9yaW5n
X3VwZGF0ZV9zcGFjZShzdHJ1Y3QgaW50ZWxfcmluZyAqcmluZyk7CiAKIHZvaWQgaW50ZWxfZW5n
aW5lX2luaXRfc2Vxbm8oc3RydWN0IGludGVsX2VuZ2luZV9jcyAqZW5naW5lLCB1MzIgc2Vxbm8p
OwogCi1pbnQgaW50ZWxfZW5naW5lX2NyZWF0ZV9zY3JhdGNoKHN0cnVjdCBpbnRlbF9lbmdpbmVf
Y3MgKmVuZ2luZSwgaW50IHNpemUpOwotdm9pZCBpbnRlbF9lbmdpbmVfY2xlYW51cF9zY3JhdGNo
KHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKmVuZ2luZSk7Ci0KIHZvaWQgaW50ZWxfZW5naW5lX3Nl
dHVwX2NvbW1vbihzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICplbmdpbmUpOwogaW50IGludGVsX2Vu
Z2luZV9pbml0X2NvbW1vbihzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICplbmdpbmUpOworaW50IGlu
dGVsX2VuZ2luZV9jcmVhdGVfc2NyYXRjaChzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICplbmdpbmUs
IGludCBzaXplKTsKIHZvaWQgaW50ZWxfZW5naW5lX2NsZWFudXBfY29tbW9uKHN0cnVjdCBpbnRl
bF9lbmdpbmVfY3MgKmVuZ2luZSk7CiAKIHN0YXRpYyBpbmxpbmUgaW50IGludGVsX2VuZ2luZV9p
ZGxlKHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKmVuZ2luZSwKLS0gCjIuOC4xCgpfX19fX19fX19f
X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBs
aXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVz
a3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK