From mboxrd@z Thu Jan  1 00:00:00 1970
From: Chris Wilson <chris@chris-wilson.co.uk>
Subject: [PATCH 11/21] drm/i915: Refactor scratch object
	allocation for gen2 w/a buffer
Date: Fri,  3 Jun 2016 17:08:43 +0100
Message-ID: <1464970133-29859-12-git-send-email-chris@chris-wilson.co.uk>
References: <1464970133-29859-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 36DDD6EE05
 for <intel-gfx@lists.freedesktop.org>; Fri,  3 Jun 2016 16:09:13 +0000 (UTC)
Received: by mail-wm0-x244.google.com with SMTP id n184so448631wmn.1
 for <intel-gfx@lists.freedesktop.org>; Fri, 03 Jun 2016 09:09:13 -0700 (PDT)
In-Reply-To: <1464970133-29859-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

VGhlIGdlbjIgdy9hIGJ1ZmZlciBpcyBzdHVmZmVkIGludG8gdGhlIHNhbWUgc2xvdCBhcyB0aGUg
Z2VuNSsgc2NyYXRjaApidWZmZXIuIElmIHdlIHBhc3MgaW4gdGhlIHNpemUgd2Ugd2FudCB0byBh
bGxvY2F0ZSBmb3IgdGhlIHNjcmF0Y2gKYnVmZmVyLCBib3RoIGNhbGxlcnMgY2FuIHVzZSB0aGUg
c2FtZSByb3V0aW5lLgoKU2lnbmVkLW9mZi1ieTogQ2hyaXMgV2lsc29uIDxjaHJpc0BjaHJpcy13
aWxzb24uY28udWs+Ci0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfbHJjLmMgICAgICAg
IHwgIDIgKy0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3JpbmdidWZmZXIuYyB8IDMxICsr
KysrKysrLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVs
X3JpbmdidWZmZXIuaCB8ICAyICstCiAzIGZpbGVzIGNoYW5nZWQsIDEwIGluc2VydGlvbnMoKyks
IDI1IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVs
X2xyYy5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfbHJjLmMKaW5kZXggZTQ4Njg3ODM3
YTk1Li4zMmI1ZWFlN2RkMTEgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVs
X2xyYy5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2xyYy5jCkBAIC0yMDc4LDcg
KzIwNzgsNyBAQCBzdGF0aWMgaW50IGxvZ2ljYWxfcmVuZGVyX3JpbmdfaW5pdChzdHJ1Y3QgZHJt
X2RldmljZSAqZGV2KQogCWVuZ2luZS0+ZW1pdF9mbHVzaCA9IGdlbjhfZW1pdF9mbHVzaF9yZW5k
ZXI7CiAJZW5naW5lLT5lbWl0X3JlcXVlc3QgPSBnZW44X2VtaXRfcmVxdWVzdF9yZW5kZXI7CiAK
LQlyZXQgPSBpbnRlbF9pbml0X3BpcGVfY29udHJvbChlbmdpbmUpOworCXJldCA9IGludGVsX2lu
aXRfcGlwZV9jb250cm9sKGVuZ2luZSwgNDA5Nik7CiAJaWYgKHJldCkKIAkJcmV0dXJuIHJldDsK
IApkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcmluZ2J1ZmZlci5jIGIv
ZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcmluZ2J1ZmZlci5jCmluZGV4IGI3ZWViYmVkOTQ1
ZC4uY2EyZTU5NDA1OTk4IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9y
aW5nYnVmZmVyLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcmluZ2J1ZmZlci5j
CkBAIC02NTMsMTYgKzY1MywxNiBAQCB2b2lkIGludGVsX2ZpbmlfcGlwZV9jb250cm9sKHN0cnVj
dCBpbnRlbF9lbmdpbmVfY3MgKmVuZ2luZSkKIAllbmdpbmUtPnNjcmF0Y2gub2JqID0gTlVMTDsK
IH0KIAotaW50IGludGVsX2luaXRfcGlwZV9jb250cm9sKHN0cnVjdCBpbnRlbF9lbmdpbmVfY3Mg
KmVuZ2luZSkKK2ludCBpbnRlbF9pbml0X3BpcGVfY29udHJvbChzdHJ1Y3QgaW50ZWxfZW5naW5l
X2NzICplbmdpbmUsIGludCBzaXplKQogewogCXN0cnVjdCBkcm1faTkxNV9nZW1fb2JqZWN0ICpv
Ymo7CiAJaW50IHJldDsKIAogCVdBUk5fT04oZW5naW5lLT5zY3JhdGNoLm9iaik7CiAKLQlvYmog
PSBpOTE1X2dlbV9vYmplY3RfY3JlYXRlX3N0b2xlbihlbmdpbmUtPmk5MTUtPmRldiwgNDA5Nik7
CisJb2JqID0gaTkxNV9nZW1fb2JqZWN0X2NyZWF0ZV9zdG9sZW4oZW5naW5lLT5pOTE1LT5kZXYs
IHNpemUpOwogCWlmIChvYmogPT0gTlVMTCkKLQkJb2JqID0gaTkxNV9nZW1fb2JqZWN0X2NyZWF0
ZShlbmdpbmUtPmk5MTUtPmRldiwgNDA5Nik7CisJCW9iaiA9IGk5MTVfZ2VtX29iamVjdF9jcmVh
dGUoZW5naW5lLT5pOTE1LT5kZXYsIHNpemUpOwogCWlmIChJU19FUlIob2JqKSkgewogCQlEUk1f
RVJST1IoIkZhaWxlZCB0byBhbGxvY2F0ZSBzY3JhdGNoIHBhZ2VcbiIpOwogCQlyZXQgPSBQVFJf
RVJSKG9iaik7CkBAIC0yODYzLDMxICsyODYzLDE2IEBAIGludCBpbnRlbF9pbml0X3JlbmRlcl9y
aW5nX2J1ZmZlcihzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KQogCWVuZ2luZS0+aW5pdF9odyA9IGlu
aXRfcmVuZGVyX3Jpbmc7CiAJZW5naW5lLT5jbGVhbnVwID0gcmVuZGVyX3JpbmdfY2xlYW51cDsK
IAotCS8qIFdvcmthcm91bmQgYmF0Y2hidWZmZXIgdG8gY29tYmF0IENTIHRsYiBidWcuICovCi0J
aWYgKEhBU19CUk9LRU5fQ1NfVExCKGRldl9wcml2KSkgewotCQlvYmogPSBpOTE1X2dlbV9vYmpl
Y3RfY3JlYXRlKGRldiwgSTgzMF9XQV9TSVpFKTsKLQkJaWYgKElTX0VSUihvYmopKSB7Ci0JCQlE
Uk1fRVJST1IoIkZhaWxlZCB0byBhbGxvY2F0ZSBiYXRjaCBib1xuIik7Ci0JCQlyZXR1cm4gUFRS
X0VSUihvYmopOwotCQl9Ci0KLQkJcmV0ID0gaTkxNV9nZW1fb2JqX2dndHRfcGluKG9iaiwgMCwg
MCk7Ci0JCWlmIChyZXQgIT0gMCkgewotCQkJZHJtX2dlbV9vYmplY3RfdW5yZWZlcmVuY2UoJm9i
ai0+YmFzZSk7Ci0JCQlEUk1fRVJST1IoIkZhaWxlZCB0byBwaW5nIGJhdGNoIGJvXG4iKTsKLQkJ
CXJldHVybiByZXQ7Ci0JCX0KLQotCQllbmdpbmUtPnNjcmF0Y2gub2JqID0gb2JqOwotCQllbmdp
bmUtPnNjcmF0Y2guZ3R0X29mZnNldCA9IGk5MTVfZ2VtX29ial9nZ3R0X29mZnNldChvYmopOwot
CX0KLQogCXJldCA9IGludGVsX2luaXRfcmluZ19idWZmZXIoZGV2LCBlbmdpbmUpOwogCWlmIChy
ZXQpCiAJCXJldHVybiByZXQ7CiAKIAlpZiAoSU5URUxfR0VOKGRldl9wcml2KSA+PSA1KSB7Ci0J
CXJldCA9IGludGVsX2luaXRfcGlwZV9jb250cm9sKGVuZ2luZSk7CisJCXJldCA9IGludGVsX2lu
aXRfcGlwZV9jb250cm9sKGVuZ2luZSwgNDA5Nik7CisJCWlmIChyZXQpCisJCQlyZXR1cm4gcmV0
OworCX0gZWxzZSBpZiAoSEFTX0JST0tFTl9DU19UTEIoZGV2X3ByaXYpKSB7CisJCXJldCA9IGlu
dGVsX2luaXRfcGlwZV9jb250cm9sKGVuZ2luZSwgSTgzMF9XQV9TSVpFKTsKIAkJaWYgKHJldCkK
IAkJCXJldHVybiByZXQ7CiAJfQpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50
ZWxfcmluZ2J1ZmZlci5oIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcmluZ2J1ZmZlci5o
CmluZGV4IDRiMmYxOWRlY2IzMC4uY2I1OTlhNTQ5MzFhIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dw
dS9kcm0vaTkxNS9pbnRlbF9yaW5nYnVmZmVyLmgKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUv
aW50ZWxfcmluZ2J1ZmZlci5oCkBAIC00ODMsOCArNDgzLDggQEAgdm9pZCBpbnRlbF9yaW5nX2lu
aXRfc2Vxbm8oc3RydWN0IGludGVsX2VuZ2luZV9jcyAqZW5naW5lLCB1MzIgc2Vxbm8pOwogaW50
IGludGVsX3JpbmdfZmx1c2hfYWxsX2NhY2hlcyhzdHJ1Y3QgZHJtX2k5MTVfZ2VtX3JlcXVlc3Qg
KnJlcSk7CiBpbnQgaW50ZWxfcmluZ19pbnZhbGlkYXRlX2FsbF9jYWNoZXMoc3RydWN0IGRybV9p
OTE1X2dlbV9yZXF1ZXN0ICpyZXEpOwogCitpbnQgaW50ZWxfaW5pdF9waXBlX2NvbnRyb2woc3Ry
dWN0IGludGVsX2VuZ2luZV9jcyAqZW5naW5lLCBpbnQgc2l6ZSk7CiB2b2lkIGludGVsX2Zpbmlf
cGlwZV9jb250cm9sKHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKmVuZ2luZSk7Ci1pbnQgaW50ZWxf
aW5pdF9waXBlX2NvbnRyb2woc3RydWN0IGludGVsX2VuZ2luZV9jcyAqZW5naW5lKTsKIAogaW50
IGludGVsX2luaXRfcmVuZGVyX3JpbmdfYnVmZmVyKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpOwog
aW50IGludGVsX2luaXRfYnNkX3JpbmdfYnVmZmVyKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpOwot
LSAKMi44LjEKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f
CkludGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpo
dHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeAo=