From mboxrd@z Thu Jan  1 00:00:00 1970
From: John.C.Harrison@Intel.com
Subject: [PATCH 38/53] drm/i915: Update some flush helpers to
	take request structures
Date: Thu, 19 Feb 2015 17:17:50 +0000
Message-ID: <1424366285-29232-39-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 E65567209F
 for <Intel-GFX@lists.freedesktop.org>; Thu, 19 Feb 2015 09:18:45 -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

RnJvbTogSm9obiBIYXJyaXNvbiA8Sm9obi5DLkhhcnJpc29uQEludGVsLmNvbT4KClVwZGF0ZWQg
aW50ZWxfZW1pdF9wb3N0X3N5bmNfbm9uemVyb19mbHVzaCgpLCBnZW43X3JlbmRlcl9yaW5nX2Nz
X3N0YWxsX3dhKCksCmdlbjdfcmluZ19mYmNfZmx1c2goKSBhbmQgZ2VuOF9lbWl0X3BpcGVfY29u
dHJvbCgpIHRvIHRha2UgcmVxdWVzdHMgaW5zdGVhZCBvZgpyaW5ncy4KCkZvcjogVklaLTUxMTUK
U2lnbmVkLW9mZi1ieTogSm9obiBIYXJyaXNvbiA8Sm9obi5DLkhhcnJpc29uQEludGVsLmNvbT4K
LS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9yaW5nYnVmZmVyLmMgfCAgIDI5ICsrKysr
KysrKysrKysrKystLS0tLS0tLS0tLS0tCiAxIGZpbGUgY2hhbmdlZCwgMTYgaW5zZXJ0aW9ucygr
KSwgMTMgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50
ZWxfcmluZ2J1ZmZlci5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcmluZ2J1ZmZlci5j
CmluZGV4IGNhOGYwMzkuLjQ3MGZhOTMgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1
L2ludGVsX3JpbmdidWZmZXIuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9yaW5n
YnVmZmVyLmMKQEAgLTIxNCw4ICsyMTQsOSBAQCBnZW40X3JlbmRlcl9yaW5nX2ZsdXNoKHN0cnVj
dCBkcm1faTkxNV9nZW1fcmVxdWVzdCAqcmVxLAogICogcmVhbGx5IG91ciBidXNpbmVzcy4gIFRo
YXQgbGVhdmVzIG9ubHkgc3RhbGwgYXQgc2NvcmVib2FyZC4KICAqLwogc3RhdGljIGludAotaW50
ZWxfZW1pdF9wb3N0X3N5bmNfbm9uemVyb19mbHVzaChzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICpy
aW5nKQoraW50ZWxfZW1pdF9wb3N0X3N5bmNfbm9uemVyb19mbHVzaChzdHJ1Y3QgZHJtX2k5MTVf
Z2VtX3JlcXVlc3QgKnJlcSkKIHsKKwlzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICpyaW5nID0gcmVx
LT5yaW5nOwogCXUzMiBzY3JhdGNoX2FkZHIgPSByaW5nLT5zY3JhdGNoLmd0dF9vZmZzZXQgKyAy
ICogQ0FDSEVMSU5FX0JZVEVTOwogCWludCByZXQ7CiAKQEAgLTI1OCw3ICsyNTksNyBAQCBnZW42
X3JlbmRlcl9yaW5nX2ZsdXNoKHN0cnVjdCBkcm1faTkxNV9nZW1fcmVxdWVzdCAqcmVxLAogCWlu
dCByZXQ7CiAKIAkvKiBGb3JjZSBTTkIgd29ya2Fyb3VuZHMgZm9yIFBJUEVfQ09OVFJPTCBmbHVz
aGVzICovCi0JcmV0ID0gaW50ZWxfZW1pdF9wb3N0X3N5bmNfbm9uemVyb19mbHVzaChyaW5nKTsK
KwlyZXQgPSBpbnRlbF9lbWl0X3Bvc3Rfc3luY19ub256ZXJvX2ZsdXNoKHJlcSk7CiAJaWYgKHJl
dCkKIAkJcmV0dXJuIHJldDsKIApAQCAtMzAyLDggKzMwMyw5IEBAIGdlbjZfcmVuZGVyX3Jpbmdf
Zmx1c2goc3RydWN0IGRybV9pOTE1X2dlbV9yZXF1ZXN0ICpyZXEsCiB9CiAKIHN0YXRpYyBpbnQK
LWdlbjdfcmVuZGVyX3JpbmdfY3Nfc3RhbGxfd2Eoc3RydWN0IGludGVsX2VuZ2luZV9jcyAqcmlu
ZykKK2dlbjdfcmVuZGVyX3JpbmdfY3Nfc3RhbGxfd2Eoc3RydWN0IGRybV9pOTE1X2dlbV9yZXF1
ZXN0ICpyZXEpCiB7CisJc3RydWN0IGludGVsX2VuZ2luZV9jcyAqcmluZyA9IHJlcS0+cmluZzsK
IAlpbnQgcmV0OwogCiAJcmV0ID0gaW50ZWxfcmluZ19iZWdpbihyaW5nLCA0KTsKQEAgLTMyMCw4
ICszMjIsOSBAQCBnZW43X3JlbmRlcl9yaW5nX2NzX3N0YWxsX3dhKHN0cnVjdCBpbnRlbF9lbmdp
bmVfY3MgKnJpbmcpCiAJcmV0dXJuIDA7CiB9CiAKLXN0YXRpYyBpbnQgZ2VuN19yaW5nX2ZiY19m
bHVzaChzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICpyaW5nLCB1MzIgdmFsdWUpCitzdGF0aWMgaW50
IGdlbjdfcmluZ19mYmNfZmx1c2goc3RydWN0IGRybV9pOTE1X2dlbV9yZXF1ZXN0ICpyZXEsIHUz
MiB2YWx1ZSkKIHsKKwlzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICpyaW5nID0gcmVxLT5yaW5nOwog
CWludCByZXQ7CiAKIAlpZiAoIXJpbmctPmZiY19kaXJ0eSkKQEAgLTM4OSw3ICszOTIsNyBAQCBn
ZW43X3JlbmRlcl9yaW5nX2ZsdXNoKHN0cnVjdCBkcm1faTkxNV9nZW1fcmVxdWVzdCAqcmVxLAog
CQkvKiBXb3JrYXJvdW5kOiB3ZSBtdXN0IGlzc3VlIGEgcGlwZV9jb250cm9sIHdpdGggQ1Mtc3Rh
bGwgYml0CiAJCSAqIHNldCBiZWZvcmUgYSBwaXBlX2NvbnRyb2wgY29tbWFuZCB0aGF0IGhhcyB0
aGUgc3RhdGUgY2FjaGUKIAkJICogaW52YWxpZGF0ZSBiaXQgc2V0LiAqLwotCQlnZW43X3JlbmRl
cl9yaW5nX2NzX3N0YWxsX3dhKHJpbmcpOworCQlnZW43X3JlbmRlcl9yaW5nX2NzX3N0YWxsX3dh
KHJlcSk7CiAJfQogCiAJcmV0ID0gaW50ZWxfcmluZ19iZWdpbihyaW5nLCA0KTsKQEAgLTQwMywx
NSArNDA2LDE2IEBAIGdlbjdfcmVuZGVyX3JpbmdfZmx1c2goc3RydWN0IGRybV9pOTE1X2dlbV9y
ZXF1ZXN0ICpyZXEsCiAJaW50ZWxfcmluZ19hZHZhbmNlKHJpbmcpOwogCiAJaWYgKCFpbnZhbGlk
YXRlX2RvbWFpbnMgJiYgZmx1c2hfZG9tYWlucykKLQkJcmV0dXJuIGdlbjdfcmluZ19mYmNfZmx1
c2gocmluZywgRkJDX1JFTkRfTlVLRSk7CisJCXJldHVybiBnZW43X3JpbmdfZmJjX2ZsdXNoKHJl
cSwgRkJDX1JFTkRfTlVLRSk7CiAKIAlyZXR1cm4gMDsKIH0KIAogc3RhdGljIGludAotZ2VuOF9l
bWl0X3BpcGVfY29udHJvbChzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICpyaW5nLAorZ2VuOF9lbWl0
X3BpcGVfY29udHJvbChzdHJ1Y3QgZHJtX2k5MTVfZ2VtX3JlcXVlc3QgKnJlcSwKIAkJICAgICAg
IHUzMiBmbGFncywgdTMyIHNjcmF0Y2hfYWRkcikKIHsKKwlzdHJ1Y3QgaW50ZWxfZW5naW5lX2Nz
ICpyaW5nID0gcmVxLT5yaW5nOwogCWludCByZXQ7CiAKIAlyZXQgPSBpbnRlbF9yaW5nX2JlZ2lu
KHJpbmcsIDYpOwpAQCAtNDMzLDkgKzQzNyw4IEBAIHN0YXRpYyBpbnQKIGdlbjhfcmVuZGVyX3Jp
bmdfZmx1c2goc3RydWN0IGRybV9pOTE1X2dlbV9yZXF1ZXN0ICpyZXEsCiAJCSAgICAgICB1MzIg
aW52YWxpZGF0ZV9kb21haW5zLCB1MzIgZmx1c2hfZG9tYWlucykKIHsKLQlzdHJ1Y3QgaW50ZWxf
ZW5naW5lX2NzICpyaW5nID0gcmVxLT5yaW5nOwogCXUzMiBmbGFncyA9IDA7Ci0JdTMyIHNjcmF0
Y2hfYWRkciA9IHJpbmctPnNjcmF0Y2guZ3R0X29mZnNldCArIDIgKiBDQUNIRUxJTkVfQllURVM7
CisJdTMyIHNjcmF0Y2hfYWRkciA9IHJlcS0+cmluZy0+c2NyYXRjaC5ndHRfb2Zmc2V0ICsgMiAq
IENBQ0hFTElORV9CWVRFUzsKIAlpbnQgcmV0OwogCiAJZmxhZ3MgfD0gUElQRV9DT05UUk9MX0NT
X1NUQUxMOwpAQCAtNDU1LDcgKzQ1OCw3IEBAIGdlbjhfcmVuZGVyX3JpbmdfZmx1c2goc3RydWN0
IGRybV9pOTE1X2dlbV9yZXF1ZXN0ICpyZXEsCiAJCWZsYWdzIHw9IFBJUEVfQ09OVFJPTF9HTE9C
QUxfR1RUX0lWQjsKIAogCQkvKiBXYUNzU3RhbGxCZWZvcmVTdGF0ZUNhY2hlSW52YWxpZGF0ZTpi
ZHcsY2h2ICovCi0JCXJldCA9IGdlbjhfZW1pdF9waXBlX2NvbnRyb2wocmluZywKKwkJcmV0ID0g
Z2VuOF9lbWl0X3BpcGVfY29udHJvbChyZXEsCiAJCQkJCSAgICAgUElQRV9DT05UUk9MX0NTX1NU
QUxMIHwKIAkJCQkJICAgICBQSVBFX0NPTlRST0xfU1RBTExfQVRfU0NPUkVCT0FSRCwKIAkJCQkJ
ICAgICAwKTsKQEAgLTQ2MywxMiArNDY2LDEyIEBAIGdlbjhfcmVuZGVyX3JpbmdfZmx1c2goc3Ry
dWN0IGRybV9pOTE1X2dlbV9yZXF1ZXN0ICpyZXEsCiAJCQlyZXR1cm4gcmV0OwogCX0KIAotCXJl
dCA9IGdlbjhfZW1pdF9waXBlX2NvbnRyb2wocmluZywgZmxhZ3MsIHNjcmF0Y2hfYWRkcik7CisJ
cmV0ID0gZ2VuOF9lbWl0X3BpcGVfY29udHJvbChyZXEsIGZsYWdzLCBzY3JhdGNoX2FkZHIpOwog
CWlmIChyZXQpCiAJCXJldHVybiByZXQ7CiAKIAlpZiAoIWludmFsaWRhdGVfZG9tYWlucyAmJiBm
bHVzaF9kb21haW5zKQotCQlyZXR1cm4gZ2VuN19yaW5nX2ZiY19mbHVzaChyaW5nLCBGQkNfUkVO
RF9OVUtFKTsKKwkJcmV0dXJuIGdlbjdfcmluZ19mYmNfZmx1c2gocmVxLCBGQkNfUkVORF9OVUtF
KTsKIAogCXJldHVybiAwOwogfQpAQCAtMjQ4Miw3ICsyNDg1LDcgQEAgc3RhdGljIGludCBnZW42
X3JpbmdfZmx1c2goc3RydWN0IGRybV9pOTE1X2dlbV9yZXF1ZXN0ICpyZXEsCiAKIAlpZiAoIWlu
dmFsaWRhdGUgJiYgZmx1c2gpIHsKIAkJaWYgKElTX0dFTjcoZGV2KSkKLQkJCXJldHVybiBnZW43
X3JpbmdfZmJjX2ZsdXNoKHJpbmcsIEZCQ19SRU5EX0NBQ0hFX0NMRUFOKTsKKwkJCXJldHVybiBn
ZW43X3JpbmdfZmJjX2ZsdXNoKHJlcSwgRkJDX1JFTkRfQ0FDSEVfQ0xFQU4pOwogCQllbHNlIGlm
IChJU19CUk9BRFdFTEwoZGV2KSkKIAkJCWRldl9wcml2LT5mYmMubmVlZF9zd19jYWNoZV9jbGVh
biA9IHRydWU7CiAJfQotLSAKMS43LjkuNQoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f
X19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMu
ZnJlZWRlc2t0b3Aub3JnCmh0dHA6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0
aW5mby9pbnRlbC1nZngK