From mboxrd@z Thu Jan  1 00:00:00 1970
From: John.C.Harrison@Intel.com
Subject: [PATCH 47/55] drm/i915: Update
	intel_logical_ring_begin() to take a request structure
Date: Fri, 29 May 2015 17:44:08 +0100
Message-ID: <1432917856-12261-48-git-send-email-John.C.Harrison@Intel.com>
References: <1432917856-12261-1-git-send-email-John.C.Harrison@Intel.com>
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 mga09.intel.com (mga09.intel.com [134.134.136.24])
 by gabe.freedesktop.org (Postfix) with ESMTP id C0FB17215A
 for <Intel-GFX@lists.freedesktop.org>; Fri, 29 May 2015 09:45:34 -0700 (PDT)
In-Reply-To: <1432917856-12261-1-git-send-email-John.C.Harrison@Intel.com>
List-Unsubscribe: <http://lists.freedesktop.org/mailman/options/intel-gfx>,
 <mailto:intel-gfx-request@lists.freedesktop.org?subject=unsubscribe>
List-Archive: <http://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: <http://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

RnJvbTogSm9obiBIYXJyaXNvbiA8Sm9obi5DLkhhcnJpc29uQEludGVsLmNvbT4KCk5vdyB0aGF0
IGV2ZXJ5dGhpbmcgYWJvdmUgaGFzIGJlZW4gY29udmVydGVkIHRvIHVzZSByZXF1ZXN0cywKaW50
ZWxfbG9naWNhbF9yaW5nX2JlZ2luKCkgY2FuIGJlIHVwZGF0ZWQgdG8gdGFrZSBhIHJlcXVlc3Qg
aW5zdGVhZCBvZiBhCnJpbmdidWYvY29udGV4dCBwYWlyLiBUaGlzIGFsc28gbWVhbnMgdGhhdCBp
dCBubyBsb25nZXIgbmVlZHMgdG8gbGF6aWx5IGFsbG9jYXRlCmEgcmVxdWVzdCBpZiBuby1vbmUg
aGFwcGVucyB0byBoYXZlIGRvbmUgaXQgZWFybGllci4KCk5vdGUgdGhhdCB0aGlzIGNoYW5nZSBt
YWtlcyB0aGUgZXhlY2xpc3Qgc2lnbmF0dXJlIHRoZSBzYW1lIGFzIHRoZSBsZWdhY3kKdmVyc2lv
bi4gVGh1cyB0aGUgdHdvIGZ1bmN0aW9ucyBjb3VsZCBiZSBtZXJnZWQgaW50byBhIHJpbmctPmJl
Z2luKCkgd3JhcHBlciBpZgpyZXF1aXJlZC4KCkZvcjogVklaLTUxMTUKU2lnbmVkLW9mZi1ieTog
Sm9obiBIYXJyaXNvbiA8Sm9obi5DLkhhcnJpc29uQEludGVsLmNvbT4KUmV2aWV3ZWQtYnk6IFRv
bWFzIEVsZiA8dG9tYXMuZWxmQGludGVsLmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9p
bnRlbF9scmMuYyB8ICAgMzYgKysrKysrKysrKysrKysrKy0tLS0tLS0tLS0tLS0tLS0tLS0tCiAx
IGZpbGUgY2hhbmdlZCwgMTYgaW5zZXJ0aW9ucygrKSwgMjAgZGVsZXRpb25zKC0pCgpkaWZmIC0t
Z2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfbHJjLmMgYi9kcml2ZXJzL2dwdS9kcm0v
aTkxNS9pbnRlbF9scmMuYwppbmRleCA2NDhhY2E3Li41NDhjNTNkIDEwMDY0NAotLS0gYS9kcml2
ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9scmMuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9p
bnRlbF9scmMuYwpAQCAtNzkwLDcgKzc5MCw3IEBAIHN0YXRpYyBpbnQgbG9naWNhbF9yaW5nX3By
ZXBhcmUoc3RydWN0IGludGVsX3JpbmdidWZmZXIgKnJpbmdidWYsCiAvKioKICAqIGludGVsX2xv
Z2ljYWxfcmluZ19iZWdpbigpIC0gcHJlcGFyZSB0aGUgbG9naWNhbCByaW5nYnVmZmVyIHRvIGFj
Y2VwdCBzb21lIGNvbW1hbmRzCiAgKgotICogQHJpbmdidWY6IExvZ2ljYWwgcmluZ2J1ZmZlci4K
KyAqIEByZXF1ZXN0OiBUaGUgcmVxdWVzdCB0byBzdGFydCBzb21lIG5ldyB3b3JrIGZvcgogICog
QG51bV9kd29yZHM6IG51bWJlciBvZiBEV09SRHMgdGhhdCB3ZSBwbGFuIHRvIHdyaXRlIHRvIHRo
ZSByaW5nYnVmZmVyLgogICoKICAqIFRoZSByaW5nYnVmZmVyIG1pZ2h0IG5vdCBiZSByZWFkeSB0
byBhY2NlcHQgdGhlIGNvbW1hbmRzIHJpZ2h0IGF3YXkgKG1heWJlIGl0IG5lZWRzIHRvCkBAIC04
MDAsMzAgKzgwMCwyNiBAQCBzdGF0aWMgaW50IGxvZ2ljYWxfcmluZ19wcmVwYXJlKHN0cnVjdCBp
bnRlbF9yaW5nYnVmZmVyICpyaW5nYnVmLAogICoKICAqIFJldHVybjogbm9uLXplcm8gaWYgdGhl
IHJpbmdidWZmZXIgaXMgbm90IHJlYWR5IHRvIGJlIHdyaXR0ZW4gdG8uCiAgKi8KLXN0YXRpYyBp
bnQgaW50ZWxfbG9naWNhbF9yaW5nX2JlZ2luKHN0cnVjdCBpbnRlbF9yaW5nYnVmZmVyICpyaW5n
YnVmLAotCQkJCSAgICBzdHJ1Y3QgaW50ZWxfY29udGV4dCAqY3R4LCBpbnQgbnVtX2R3b3JkcykK
K3N0YXRpYyBpbnQgaW50ZWxfbG9naWNhbF9yaW5nX2JlZ2luKHN0cnVjdCBkcm1faTkxNV9nZW1f
cmVxdWVzdCAqcmVxLAorCQkJCSAgICBpbnQgbnVtX2R3b3JkcykKIHsKLQlzdHJ1Y3QgZHJtX2k5
MTVfZ2VtX3JlcXVlc3QgKnJlcTsKLQlzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICpyaW5nID0gcmlu
Z2J1Zi0+cmluZzsKLQlzdHJ1Y3QgZHJtX2RldmljZSAqZGV2ID0gcmluZy0+ZGV2OwotCXN0cnVj
dCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9IGRldi0+ZGV2X3ByaXZhdGU7CisJc3RydWN0
IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2OwogCWludCByZXQ7CiAKKwlXQVJOX09OKHJlcSA9
PSBOVUxMKTsKKwlkZXZfcHJpdiA9IHJlcS0+cmluZy0+ZGV2LT5kZXZfcHJpdmF0ZTsKKwogCXJl
dCA9IGk5MTVfZ2VtX2NoZWNrX3dlZGdlKCZkZXZfcHJpdi0+Z3B1X2Vycm9yLAogCQkJCSAgIGRl
dl9wcml2LT5tbS5pbnRlcnJ1cHRpYmxlKTsKIAlpZiAocmV0KQogCQlyZXR1cm4gcmV0OwogCi0J
cmV0ID0gbG9naWNhbF9yaW5nX3ByZXBhcmUocmluZ2J1ZiwgY3R4LCBudW1fZHdvcmRzICogc2l6
ZW9mKHVpbnQzMl90KSk7Ci0JaWYgKHJldCkKLQkJcmV0dXJuIHJldDsKLQotCS8qIFByZWFsbG9j
YXRlIHRoZSBvbHIgYmVmb3JlIHRvdWNoaW5nIHRoZSByaW5nICovCi0JcmV0ID0gaTkxNV9nZW1f
cmVxdWVzdF9hbGxvYyhyaW5nLCBjdHgsICZyZXEpOworCXJldCA9IGxvZ2ljYWxfcmluZ19wcmVw
YXJlKHJlcS0+cmluZ2J1ZiwgcmVxLT5jdHgsCisJCQkJICAgbnVtX2R3b3JkcyAqIHNpemVvZih1
aW50MzJfdCkpOwogCWlmIChyZXQpCiAJCXJldHVybiByZXQ7CiAKLQlyaW5nYnVmLT5zcGFjZSAt
PSBudW1fZHdvcmRzICogc2l6ZW9mKHVpbnQzMl90KTsKKwlyZXEtPnJpbmdidWYtPnNwYWNlIC09
IG51bV9kd29yZHMgKiBzaXplb2YodWludDMyX3QpOwogCXJldHVybiAwOwogfQogCkBAIC05MDks
NyArOTA1LDcgQEAgaW50IGludGVsX2V4ZWNsaXN0c19zdWJtaXNzaW9uKHN0cnVjdCBpOTE1X2V4
ZWNidWZmZXJfcGFyYW1zICpwYXJhbXMsCiAKIAlpZiAocmluZyA9PSAmZGV2X3ByaXYtPnJpbmdb
UkNTXSAmJgogCSAgICBpbnN0cF9tb2RlICE9IGRldl9wcml2LT5yZWxhdGl2ZV9jb25zdGFudHNf
bW9kZSkgewotCQlyZXQgPSBpbnRlbF9sb2dpY2FsX3JpbmdfYmVnaW4ocmluZ2J1ZiwgcGFyYW1z
LT5jdHgsIDQpOworCQlyZXQgPSBpbnRlbF9sb2dpY2FsX3JpbmdfYmVnaW4ocGFyYW1zLT5yZXF1
ZXN0LCA0KTsKIAkJaWYgKHJldCkKIAkJCXJldHVybiByZXQ7CiAKQEAgLTEwNjIsNyArMTA1OCw3
IEBAIHN0YXRpYyBpbnQgaW50ZWxfbG9naWNhbF9yaW5nX3dvcmthcm91bmRzX2VtaXQoc3RydWN0
IGRybV9pOTE1X2dlbV9yZXF1ZXN0ICpyZXEpCiAJaWYgKHJldCkKIAkJcmV0dXJuIHJldDsKIAot
CXJldCA9IGludGVsX2xvZ2ljYWxfcmluZ19iZWdpbihyaW5nYnVmLCByZXEtPmN0eCwgdy0+Y291
bnQgKiAyICsgMik7CisJcmV0ID0gaW50ZWxfbG9naWNhbF9yaW5nX2JlZ2luKHJlcSwgdy0+Y291
bnQgKiAyICsgMik7CiAJaWYgKHJldCkKIAkJcmV0dXJuIHJldDsKIApAQCAtMTE0NCw3ICsxMTQw
LDcgQEAgc3RhdGljIGludCBnZW44X2VtaXRfYmJfc3RhcnQoc3RydWN0IGRybV9pOTE1X2dlbV9y
ZXF1ZXN0ICpyZXEsCiAJYm9vbCBwcGd0dCA9ICEoZGlzcGF0Y2hfZmxhZ3MgJiBJOTE1X0RJU1BB
VENIX1NFQ1VSRSk7CiAJaW50IHJldDsKIAotCXJldCA9IGludGVsX2xvZ2ljYWxfcmluZ19iZWdp
bihyaW5nYnVmLCByZXEtPmN0eCwgNCk7CisJcmV0ID0gaW50ZWxfbG9naWNhbF9yaW5nX2JlZ2lu
KHJlcSwgNCk7CiAJaWYgKHJldCkKIAkJcmV0dXJuIHJldDsKIApAQCAtMTIwMiw3ICsxMTk4LDcg
QEAgc3RhdGljIGludCBnZW44X2VtaXRfZmx1c2goc3RydWN0IGRybV9pOTE1X2dlbV9yZXF1ZXN0
ICpyZXF1ZXN0LAogCXVpbnQzMl90IGNtZDsKIAlpbnQgcmV0OwogCi0JcmV0ID0gaW50ZWxfbG9n
aWNhbF9yaW5nX2JlZ2luKHJpbmdidWYsIHJlcXVlc3QtPmN0eCwgNCk7CisJcmV0ID0gaW50ZWxf
bG9naWNhbF9yaW5nX2JlZ2luKHJlcXVlc3QsIDQpOwogCWlmIChyZXQpCiAJCXJldHVybiByZXQ7
CiAKQEAgLTEyNjgsNyArMTI2NCw3IEBAIHN0YXRpYyBpbnQgZ2VuOF9lbWl0X2ZsdXNoX3JlbmRl
cihzdHJ1Y3QgZHJtX2k5MTVfZ2VtX3JlcXVlc3QgKnJlcXVlc3QsCiAJdmZfZmx1c2hfd2EgPSBJ
TlRFTF9JTkZPKHJpbmctPmRldiktPmdlbiA+PSA5ICYmCiAJCSAgICAgIGZsYWdzICYgUElQRV9D
T05UUk9MX1ZGX0NBQ0hFX0lOVkFMSURBVEU7CiAKLQlyZXQgPSBpbnRlbF9sb2dpY2FsX3Jpbmdf
YmVnaW4ocmluZ2J1ZiwgcmVxdWVzdC0+Y3R4LCB2Zl9mbHVzaF93YSA/IDEyIDogNik7CisJcmV0
ID0gaW50ZWxfbG9naWNhbF9yaW5nX2JlZ2luKHJlcXVlc3QsIHZmX2ZsdXNoX3dhID8gMTIgOiA2
KTsKIAlpZiAocmV0KQogCQlyZXR1cm4gcmV0OwogCkBAIC0xMzE0LDcgKzEzMTAsNyBAQCBzdGF0
aWMgaW50IGdlbjhfZW1pdF9yZXF1ZXN0KHN0cnVjdCBkcm1faTkxNV9nZW1fcmVxdWVzdCAqcmVx
dWVzdCkKIAkgKiB1c2VkIGFzIGEgd29ya2Fyb3VuZCBmb3Igbm90IGJlaW5nIGFsbG93ZWQgdG8g
ZG8gbGl0ZQogCSAqIHJlc3RvcmUgd2l0aCBIRUFEPT1UQUlMIChXYUlkbGVMaXRlUmVzdG9yZSku
CiAJICovCi0JcmV0ID0gaW50ZWxfbG9naWNhbF9yaW5nX2JlZ2luKHJpbmdidWYsIHJlcXVlc3Qt
PmN0eCwgOCk7CisJcmV0ID0gaW50ZWxfbG9naWNhbF9yaW5nX2JlZ2luKHJlcXVlc3QsIDgpOwog
CWlmIChyZXQpCiAJCXJldHVybiByZXQ7CiAKLS0gCjEuNy45LjUKCl9fX19fX19fX19fX19fX19f
X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCkludGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50
ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3Jn
L21haWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4Cg==