From mboxrd@z Thu Jan  1 00:00:00 1970
From: John.C.Harrison@Intel.com
Subject: [PATCH 37/55] drm/i915: Update some flush helpers to
	take request structures
Date: Fri, 29 May 2015 17:43:58 +0100
Message-ID: <1432917856-12261-38-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 6820E72147
 for <Intel-GFX@lists.freedesktop.org>; Fri, 29 May 2015 09:44:58 -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

RnJvbTogSm9obiBIYXJyaXNvbiA8Sm9obi5DLkhhcnJpc29uQEludGVsLmNvbT4KClVwZGF0ZWQg
aW50ZWxfZW1pdF9wb3N0X3N5bmNfbm9uemVyb19mbHVzaCgpLCBnZW43X3JlbmRlcl9yaW5nX2Nz
X3N0YWxsX3dhKCkgYW5kCmdlbjhfZW1pdF9waXBlX2NvbnRyb2woKSB0byB0YWtlIHJlcXVlc3Rz
IGluc3RlYWQgb2YgcmluZ3MuCgpGb3I6IFZJWi01MTE1ClNpZ25lZC1vZmYtYnk6IEpvaG4gSGFy
cmlzb24gPEpvaG4uQy5IYXJyaXNvbkBJbnRlbC5jb20+ClJldmlld2VkLWJ5OiBUb21hcyBFbGYg
PHRvbWFzLmVsZkBpbnRlbC5jb20+Ci0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcmlu
Z2J1ZmZlci5jIHwgICAyMCArKysrKysrKysrKy0tLS0tLS0tLQogMSBmaWxlIGNoYW5nZWQsIDEx
IGluc2VydGlvbnMoKyksIDkgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUv
ZHJtL2k5MTUvaW50ZWxfcmluZ2J1ZmZlci5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxf
cmluZ2J1ZmZlci5jCmluZGV4IGI5MGYyZDguLjMyM2IyOTUgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMv
Z3B1L2RybS9pOTE1L2ludGVsX3JpbmdidWZmZXIuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkx
NS9pbnRlbF9yaW5nYnVmZmVyLmMKQEAgLTIxNCw4ICsyMTQsOSBAQCBnZW40X3JlbmRlcl9yaW5n
X2ZsdXNoKHN0cnVjdCBkcm1faTkxNV9nZW1fcmVxdWVzdCAqcmVxLAogICogcmVhbGx5IG91ciBi
dXNpbmVzcy4gIFRoYXQgbGVhdmVzIG9ubHkgc3RhbGwgYXQgc2NvcmVib2FyZC4KICAqLwogc3Rh
dGljIGludAotaW50ZWxfZW1pdF9wb3N0X3N5bmNfbm9uemVyb19mbHVzaChzdHJ1Y3QgaW50ZWxf
ZW5naW5lX2NzICpyaW5nKQoraW50ZWxfZW1pdF9wb3N0X3N5bmNfbm9uemVyb19mbHVzaChzdHJ1
Y3QgZHJtX2k5MTVfZ2VtX3JlcXVlc3QgKnJlcSkKIHsKKwlzdHJ1Y3QgaW50ZWxfZW5naW5lX2Nz
ICpyaW5nID0gcmVxLT5yaW5nOwogCXUzMiBzY3JhdGNoX2FkZHIgPSByaW5nLT5zY3JhdGNoLmd0
dF9vZmZzZXQgKyAyICogQ0FDSEVMSU5FX0JZVEVTOwogCWludCByZXQ7CiAKQEAgLTI1OCw3ICsy
NTksNyBAQCBnZW42X3JlbmRlcl9yaW5nX2ZsdXNoKHN0cnVjdCBkcm1faTkxNV9nZW1fcmVxdWVz
dCAqcmVxLAogCWludCByZXQ7CiAKIAkvKiBGb3JjZSBTTkIgd29ya2Fyb3VuZHMgZm9yIFBJUEVf
Q09OVFJPTCBmbHVzaGVzICovCi0JcmV0ID0gaW50ZWxfZW1pdF9wb3N0X3N5bmNfbm9uemVyb19m
bHVzaChyaW5nKTsKKwlyZXQgPSBpbnRlbF9lbWl0X3Bvc3Rfc3luY19ub256ZXJvX2ZsdXNoKHJl
cSk7CiAJaWYgKHJldCkKIAkJcmV0dXJuIHJldDsKIApAQCAtMzAyLDggKzMwMyw5IEBAIGdlbjZf
cmVuZGVyX3JpbmdfZmx1c2goc3RydWN0IGRybV9pOTE1X2dlbV9yZXF1ZXN0ICpyZXEsCiB9CiAK
IHN0YXRpYyBpbnQKLWdlbjdfcmVuZGVyX3JpbmdfY3Nfc3RhbGxfd2Eoc3RydWN0IGludGVsX2Vu
Z2luZV9jcyAqcmluZykKK2dlbjdfcmVuZGVyX3JpbmdfY3Nfc3RhbGxfd2Eoc3RydWN0IGRybV9p
OTE1X2dlbV9yZXF1ZXN0ICpyZXEpCiB7CisJc3RydWN0IGludGVsX2VuZ2luZV9jcyAqcmluZyA9
IHJlcS0+cmluZzsKIAlpbnQgcmV0OwogCiAJcmV0ID0gaW50ZWxfcmluZ19iZWdpbihyaW5nLCA0
KTsKQEAgLTM2Niw3ICszNjgsNyBAQCBnZW43X3JlbmRlcl9yaW5nX2ZsdXNoKHN0cnVjdCBkcm1f
aTkxNV9nZW1fcmVxdWVzdCAqcmVxLAogCQkvKiBXb3JrYXJvdW5kOiB3ZSBtdXN0IGlzc3VlIGEg
cGlwZV9jb250cm9sIHdpdGggQ1Mtc3RhbGwgYml0CiAJCSAqIHNldCBiZWZvcmUgYSBwaXBlX2Nv
bnRyb2wgY29tbWFuZCB0aGF0IGhhcyB0aGUgc3RhdGUgY2FjaGUKIAkJICogaW52YWxpZGF0ZSBi
aXQgc2V0LiAqLwotCQlnZW43X3JlbmRlcl9yaW5nX2NzX3N0YWxsX3dhKHJpbmcpOworCQlnZW43
X3JlbmRlcl9yaW5nX2NzX3N0YWxsX3dhKHJlcSk7CiAJfQogCiAJcmV0ID0gaW50ZWxfcmluZ19i
ZWdpbihyaW5nLCA0KTsKQEAgLTM4Myw5ICszODUsMTAgQEAgZ2VuN19yZW5kZXJfcmluZ19mbHVz
aChzdHJ1Y3QgZHJtX2k5MTVfZ2VtX3JlcXVlc3QgKnJlcSwKIH0KIAogc3RhdGljIGludAotZ2Vu
OF9lbWl0X3BpcGVfY29udHJvbChzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICpyaW5nLAorZ2VuOF9l
bWl0X3BpcGVfY29udHJvbChzdHJ1Y3QgZHJtX2k5MTVfZ2VtX3JlcXVlc3QgKnJlcSwKIAkJICAg
ICAgIHUzMiBmbGFncywgdTMyIHNjcmF0Y2hfYWRkcikKIHsKKwlzdHJ1Y3QgaW50ZWxfZW5naW5l
X2NzICpyaW5nID0gcmVxLT5yaW5nOwogCWludCByZXQ7CiAKIAlyZXQgPSBpbnRlbF9yaW5nX2Jl
Z2luKHJpbmcsIDYpOwpAQCAtNDA3LDkgKzQxMCw4IEBAIHN0YXRpYyBpbnQKIGdlbjhfcmVuZGVy
X3JpbmdfZmx1c2goc3RydWN0IGRybV9pOTE1X2dlbV9yZXF1ZXN0ICpyZXEsCiAJCSAgICAgICB1
MzIgaW52YWxpZGF0ZV9kb21haW5zLCB1MzIgZmx1c2hfZG9tYWlucykKIHsKLQlzdHJ1Y3QgaW50
ZWxfZW5naW5lX2NzICpyaW5nID0gcmVxLT5yaW5nOwogCXUzMiBmbGFncyA9IDA7Ci0JdTMyIHNj
cmF0Y2hfYWRkciA9IHJpbmctPnNjcmF0Y2guZ3R0X29mZnNldCArIDIgKiBDQUNIRUxJTkVfQllU
RVM7CisJdTMyIHNjcmF0Y2hfYWRkciA9IHJlcS0+cmluZy0+c2NyYXRjaC5ndHRfb2Zmc2V0ICsg
MiAqIENBQ0hFTElORV9CWVRFUzsKIAlpbnQgcmV0OwogCiAJZmxhZ3MgfD0gUElQRV9DT05UUk9M
X0NTX1NUQUxMOwpAQCAtNDI5LDcgKzQzMSw3IEBAIGdlbjhfcmVuZGVyX3JpbmdfZmx1c2goc3Ry
dWN0IGRybV9pOTE1X2dlbV9yZXF1ZXN0ICpyZXEsCiAJCWZsYWdzIHw9IFBJUEVfQ09OVFJPTF9H
TE9CQUxfR1RUX0lWQjsKIAogCQkvKiBXYUNzU3RhbGxCZWZvcmVTdGF0ZUNhY2hlSW52YWxpZGF0
ZTpiZHcsY2h2ICovCi0JCXJldCA9IGdlbjhfZW1pdF9waXBlX2NvbnRyb2wocmluZywKKwkJcmV0
ID0gZ2VuOF9lbWl0X3BpcGVfY29udHJvbChyZXEsCiAJCQkJCSAgICAgUElQRV9DT05UUk9MX0NT
X1NUQUxMIHwKIAkJCQkJICAgICBQSVBFX0NPTlRST0xfU1RBTExfQVRfU0NPUkVCT0FSRCwKIAkJ
CQkJICAgICAwKTsKQEAgLTQzNyw3ICs0MzksNyBAQCBnZW44X3JlbmRlcl9yaW5nX2ZsdXNoKHN0
cnVjdCBkcm1faTkxNV9nZW1fcmVxdWVzdCAqcmVxLAogCQkJcmV0dXJuIHJldDsKIAl9CiAKLQly
ZXR1cm4gZ2VuOF9lbWl0X3BpcGVfY29udHJvbChyaW5nLCBmbGFncywgc2NyYXRjaF9hZGRyKTsK
KwlyZXR1cm4gZ2VuOF9lbWl0X3BpcGVfY29udHJvbChyZXEsIGZsYWdzLCBzY3JhdGNoX2FkZHIp
OwogfQogCiBzdGF0aWMgdm9pZCByaW5nX3dyaXRlX3RhaWwoc3RydWN0IGludGVsX2VuZ2luZV9j
cyAqcmluZywKLS0gCjEuNy45LjUKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f
X19fX19fX19fX19fCkludGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVk
ZXNrdG9wLm9yZwpodHRwOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8v
aW50ZWwtZ2Z4Cg==