From mboxrd@z Thu Jan  1 00:00:00 1970
From: John.C.Harrison@Intel.com
Subject: [PATCH 50/53] drm/i915: Update
	intel_logical_ring_begin() to take a request structure
Date: Thu, 19 Feb 2015 17:18:02 +0000
Message-ID: <1424366285-29232-51-git-send-email-John.C.Harrison@Intel.com>
References: <1423828140-10653-1-git-send-email-John.C.Harrison@Intel.com>
 <1424366285-29232-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 mga03.intel.com (mga03.intel.com [134.134.136.65])
 by gabe.freedesktop.org (Postfix) with ESMTP id 1C535720B8
 for <Intel-GFX@lists.freedesktop.org>; Thu, 19 Feb 2015 09:19:01 -0800 (PST)
In-Reply-To: <1424366285-29232-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
Sm9obiBIYXJyaXNvbiA8Sm9obi5DLkhhcnJpc29uQEludGVsLmNvbT4KLS0tCiBkcml2ZXJzL2dw
dS9kcm0vaTkxNS9pbnRlbF9scmMuYyB8ICAgMzMgKysrKysrKysrKysrKysrLS0tLS0tLS0tLS0t
LS0tLS0tCiAxIGZpbGUgY2hhbmdlZCwgMTUgaW5zZXJ0aW9ucygrKSwgMTggZGVsZXRpb25zKC0p
CgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfbHJjLmMgYi9kcml2ZXJz
L2dwdS9kcm0vaTkxNS9pbnRlbF9scmMuYwppbmRleCBiNDA1MDFkLi4yOTExY2Y2IDEwMDY0NAot
LS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9scmMuYworKysgYi9kcml2ZXJzL2dwdS9k
cm0vaTkxNS9pbnRlbF9scmMuYwpAQCAtNzY2LDcgKzc2Niw3IEBAIHN0YXRpYyBpbnQgbG9naWNh
bF9yaW5nX3ByZXBhcmUoc3RydWN0IGludGVsX3JpbmdidWZmZXIgKnJpbmdidWYsCiAvKioKICAq
IGludGVsX2xvZ2ljYWxfcmluZ19iZWdpbigpIC0gcHJlcGFyZSB0aGUgbG9naWNhbCByaW5nYnVm
ZmVyIHRvIGFjY2VwdCBzb21lIGNvbW1hbmRzCiAgKgotICogQHJpbmdidWY6IExvZ2ljYWwgcmlu
Z2J1ZmZlci4KKyAqIEByZXF1ZXN0OiBUaGUgcmVxdWVzdCB0byBzdGFydCBzb21lIG5ldyB3b3Jr
IGZvcgogICogQG51bV9kd29yZHM6IG51bWJlciBvZiBEV09SRHMgdGhhdCB3ZSBwbGFuIHRvIHdy
aXRlIHRvIHRoZSByaW5nYnVmZmVyLgogICoKICAqIFRoZSByaW5nYnVmZmVyIG1pZ2h0IG5vdCBi
ZSByZWFkeSB0byBhY2NlcHQgdGhlIGNvbW1hbmRzIHJpZ2h0IGF3YXkgKG1heWJlIGl0IG5lZWRz
IHRvCkBAIC03NzYsMzAgKzc3NiwyNyBAQCBzdGF0aWMgaW50IGxvZ2ljYWxfcmluZ19wcmVwYXJl
KHN0cnVjdCBpbnRlbF9yaW5nYnVmZmVyICpyaW5nYnVmLAogICoKICAqIFJldHVybjogbm9uLXpl
cm8gaWYgdGhlIHJpbmdidWZmZXIgaXMgbm90IHJlYWR5IHRvIGJlIHdyaXR0ZW4gdG8uCiAgKi8K
LXN0YXRpYyBpbnQgaW50ZWxfbG9naWNhbF9yaW5nX2JlZ2luKHN0cnVjdCBpbnRlbF9yaW5nYnVm
ZmVyICpyaW5nYnVmLAotCQkJCSAgICBzdHJ1Y3QgaW50ZWxfY29udGV4dCAqY3R4LCBpbnQgbnVt
X2R3b3JkcykKK3N0YXRpYyBpbnQgaW50ZWxfbG9naWNhbF9yaW5nX2JlZ2luKHN0cnVjdCBkcm1f
aTkxNV9nZW1fcmVxdWVzdCAqcmVxLAorCQkJCSAgICBpbnQgbnVtX2R3b3JkcykKIHsKLQlzdHJ1
Y3QgZHJtX2k5MTVfZ2VtX3JlcXVlc3QgKnJlcTsKLQlzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICpy
aW5nID0gcmluZ2J1Zi0+cmluZzsKKwlzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICpyaW5nID0gcmVx
LT5yaW5nOwogCXN0cnVjdCBkcm1fZGV2aWNlICpkZXYgPSByaW5nLT5kZXY7CiAJc3RydWN0IGRy
bV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0gZGV2LT5kZXZfcHJpdmF0ZTsKIAlpbnQgcmV0Owog
CisJV0FSTl9PTihyZXEgPT0gTlVMTCk7CisKIAlyZXQgPSBpOTE1X2dlbV9jaGVja193ZWRnZSgm
ZGV2X3ByaXYtPmdwdV9lcnJvciwKIAkJCQkgICBkZXZfcHJpdi0+bW0uaW50ZXJydXB0aWJsZSk7
CiAJaWYgKHJldCkKIAkJcmV0dXJuIHJldDsKIAotCXJldCA9IGxvZ2ljYWxfcmluZ19wcmVwYXJl
KHJpbmdidWYsIGN0eCwgbnVtX2R3b3JkcyAqIHNpemVvZih1aW50MzJfdCkpOwotCWlmIChyZXQp
Ci0JCXJldHVybiByZXQ7Ci0KLQkvKiBQcmVhbGxvY2F0ZSB0aGUgb2xyIGJlZm9yZSB0b3VjaGlu
ZyB0aGUgcmluZyAqLwotCXJldCA9IGludGVsX2xvZ2ljYWxfcmluZ19hbGxvY19yZXF1ZXN0KHJp
bmcsIGN0eCwgJnJlcSk7CisJcmV0ID0gbG9naWNhbF9yaW5nX3ByZXBhcmUocmVxLT5yaW5nYnVm
LCByZXEtPmN0eCwKKwkJCQkgICBudW1fZHdvcmRzICogc2l6ZW9mKHVpbnQzMl90KSk7CiAJaWYg
KHJldCkKIAkJcmV0dXJuIHJldDsKIAotCXJpbmdidWYtPnNwYWNlIC09IG51bV9kd29yZHMgKiBz
aXplb2YodWludDMyX3QpOworCXJlcS0+cmluZ2J1Zi0+c3BhY2UgLT0gbnVtX2R3b3JkcyAqIHNp
emVvZih1aW50MzJfdCk7CiAJcmV0dXJuIDA7CiB9CiAKQEAgLTg4NSw3ICs4ODIsNyBAQCBpbnQg
aW50ZWxfZXhlY2xpc3RzX3N1Ym1pc3Npb24oc3RydWN0IGk5MTVfZXhlY2J1ZmZlcl9wYXJhbXMg
KnBhcmFtcywKIAogCWlmIChyaW5nID09ICZkZXZfcHJpdi0+cmluZ1tSQ1NdICYmCiAJICAgIGlu
c3RwX21vZGUgIT0gZGV2X3ByaXYtPnJlbGF0aXZlX2NvbnN0YW50c19tb2RlKSB7Ci0JCXJldCA9
IGludGVsX2xvZ2ljYWxfcmluZ19iZWdpbihyaW5nYnVmLCBwYXJhbXMtPmN0eCwgNCk7CisJCXJl
dCA9IGludGVsX2xvZ2ljYWxfcmluZ19iZWdpbihwYXJhbXMtPnJlcXVlc3QsIDQpOwogCQlpZiAo
cmV0KQogCQkJcmV0dXJuIHJldDsKIApAQCAtMTA5MSw3ICsxMDg4LDcgQEAgc3RhdGljIGludCBp
bnRlbF9sb2dpY2FsX3Jpbmdfd29ya2Fyb3VuZHNfZW1pdChzdHJ1Y3QgZHJtX2k5MTVfZ2VtX3Jl
cXVlc3QgKnJlcSkKIAlpZiAocmV0KQogCQlyZXR1cm4gcmV0OwogCi0JcmV0ID0gaW50ZWxfbG9n
aWNhbF9yaW5nX2JlZ2luKHJpbmdidWYsIHJlcS0+Y3R4LCB3LT5jb3VudCAqIDIgKyAyKTsKKwly
ZXQgPSBpbnRlbF9sb2dpY2FsX3JpbmdfYmVnaW4ocmVxLCB3LT5jb3VudCAqIDIgKyAyKTsKIAlp
ZiAocmV0KQogCQlyZXR1cm4gcmV0OwogCkBAIC0xMTczLDcgKzExNzAsNyBAQCBzdGF0aWMgaW50
IGdlbjhfZW1pdF9iYl9zdGFydChzdHJ1Y3QgZHJtX2k5MTVfZ2VtX3JlcXVlc3QgKnJlcSwKIAli
b29sIHBwZ3R0ID0gIShkaXNwYXRjaF9mbGFncyAmIEk5MTVfRElTUEFUQ0hfU0VDVVJFKTsKIAlp
bnQgcmV0OwogCi0JcmV0ID0gaW50ZWxfbG9naWNhbF9yaW5nX2JlZ2luKHJpbmdidWYsIHJlcS0+
Y3R4LCA0KTsKKwlyZXQgPSBpbnRlbF9sb2dpY2FsX3JpbmdfYmVnaW4ocmVxLCA0KTsKIAlpZiAo
cmV0KQogCQlyZXR1cm4gcmV0OwogCkBAIC0xMjMxLDcgKzEyMjgsNyBAQCBzdGF0aWMgaW50IGdl
bjhfZW1pdF9mbHVzaChzdHJ1Y3QgZHJtX2k5MTVfZ2VtX3JlcXVlc3QgKnJlcXVlc3QsCiAJdWlu
dDMyX3QgY21kOwogCWludCByZXQ7CiAKLQlyZXQgPSBpbnRlbF9sb2dpY2FsX3JpbmdfYmVnaW4o
cmluZ2J1ZiwgcmVxdWVzdC0+Y3R4LCA0KTsKKwlyZXQgPSBpbnRlbF9sb2dpY2FsX3JpbmdfYmVn
aW4ocmVxdWVzdCwgNCk7CiAJaWYgKHJldCkKIAkJcmV0dXJuIHJldDsKIApAQCAtMTI4OSw3ICsx
Mjg2LDcgQEAgc3RhdGljIGludCBnZW44X2VtaXRfZmx1c2hfcmVuZGVyKHN0cnVjdCBkcm1faTkx
NV9nZW1fcmVxdWVzdCAqcmVxdWVzdCwKIAkJZmxhZ3MgfD0gUElQRV9DT05UUk9MX0dMT0JBTF9H
VFRfSVZCOwogCX0KIAotCXJldCA9IGludGVsX2xvZ2ljYWxfcmluZ19iZWdpbihyaW5nYnVmLCBy
ZXF1ZXN0LT5jdHgsIDYpOworCXJldCA9IGludGVsX2xvZ2ljYWxfcmluZ19iZWdpbihyZXF1ZXN0
LCA2KTsKIAlpZiAocmV0KQogCQlyZXR1cm4gcmV0OwogCkBAIC0xMzIxLDcgKzEzMTgsNyBAQCBz
dGF0aWMgaW50IGdlbjhfZW1pdF9yZXF1ZXN0KHN0cnVjdCBkcm1faTkxNV9nZW1fcmVxdWVzdCAq
cmVxdWVzdCkKIAl1MzIgY21kOwogCWludCByZXQ7CiAKLQlyZXQgPSBpbnRlbF9sb2dpY2FsX3Jp
bmdfYmVnaW4ocmluZ2J1ZiwgcmVxdWVzdC0+Y3R4LCA2KTsKKwlyZXQgPSBpbnRlbF9sb2dpY2Fs
X3JpbmdfYmVnaW4ocmVxdWVzdCwgNik7CiAJaWYgKHJldCkKIAkJcmV0dXJuIHJldDsKIAotLSAK
MS43LjkuNQoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18K
SW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0
dHA6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK