From mboxrd@z Thu Jan  1 00:00:00 1970
From: John.C.Harrison@Intel.com
Subject: [PATCH 12/29] drm/i915: Convert __wait_seqno() to
	__wait_request()
Date: Thu, 30 Oct 2014 18:41:04 +0000
Message-ID: <1414694481-15724-13-git-send-email-John.C.Harrison@Intel.com>
References: <1414694481-15724-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 mga11.intel.com (mga11.intel.com [192.55.52.93])
 by gabe.freedesktop.org (Postfix) with ESMTP id A56A76E0DA
 for <Intel-GFX@lists.freedesktop.org>; Thu, 30 Oct 2014 11:41:38 -0700 (PDT)
In-Reply-To: <1414694481-15724-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
IGFsbCBjb2RlIGFib3ZlIGlzIHVzaW5nIHJlcXVlc3Qgc3RydWN0dXJlcyBpbnN0ZWFkIG9mIHNl
cW5vIHZhbHVlcywgaXQKaXMgcG9zc2libGUgdG8gY29udmVydCAgX193YWl0X3NlcW5vKCkgaXRz
ZWxmLiBJbnRlcm5hbGx5LCBpdCBpcyBzdGlsbCBjYWxsaW5nCmk5MTVfc2Vxbm9fcGFzc2VkKCks
IHRoaXMgd2lsbCBiZSB1cGRhdGVkIGxhdGVyIGluIHRoZSBzZXJpZXMuIFRoaXMgc3RlcCBpcyBq
dXN0CmNoYW5naW5nIHRoZSBwYXJhbWV0ZXIgbGlzdCBhbmQgZnVuY3Rpb24gbmFtZS4KCkZvcjog
VklaLTQzNzcKU2lnbmVkLW9mZi1ieTogSm9obiBIYXJyaXNvbiA8Sm9obi5DLkhhcnJpc29uQElu
dGVsLmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbS5jIHwgICA1MCArKysr
KysrKysrKysrKysrLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0KIDEgZmlsZSBjaGFuZ2VkLCAyMSBp
bnNlcnRpb25zKCspLCAyOSBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9k
cm0vaTkxNS9pOTE1X2dlbS5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW0uYwppbmRl
eCAzMWJkMzg1Li4yZGNiOGJmIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1
X2dlbS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtLmMKQEAgLTExMzMsMTAg
KzExMzMsOSBAQCBzdGF0aWMgYm9vbCBjYW5fd2FpdF9ib29zdChzdHJ1Y3QgZHJtX2k5MTVfZmls
ZV9wcml2YXRlICpmaWxlX3ByaXYpCiB9CiAKIC8qKgotICogX193YWl0X3NlcW5vIC0gd2FpdCB1
bnRpbCBleGVjdXRpb24gb2Ygc2Vxbm8gaGFzIGZpbmlzaGVkCi0gKiBAcmluZzogdGhlIHJpbmcg
ZXhwZWN0ZWQgdG8gcmVwb3J0IHNlcW5vCi0gKiBAc2Vxbm86IGR1aCEKLSAqIEByZXNldF9jb3Vu
dGVyOiByZXNldCBzZXF1ZW5jZSBhc3NvY2lhdGVkIHdpdGggdGhlIGdpdmVuIHNlcW5vCisgKiBf
X3dhaXRfcmVxdWVzdCAtIHdhaXQgdW50aWwgZXhlY3V0aW9uIG9mIHJlcXVlc3QgaGFzIGZpbmlz
aGVkCisgKiBAcmVxOiBkdWghCisgKiBAcmVzZXRfY291bnRlcjogcmVzZXQgc2VxdWVuY2UgYXNz
b2NpYXRlZCB3aXRoIHRoZSBnaXZlbiByZXF1ZXN0CiAgKiBAaW50ZXJydXB0aWJsZTogZG8gYW4g
aW50ZXJydXB0aWJsZSB3YWl0IChub3JtYWxseSB5ZXMpCiAgKiBAdGltZW91dDogaW4gLSBob3cg
bG9uZyB0byB3YWl0IChOVUxMIGZvcmV2ZXIpOyBvdXQgLSBob3cgbXVjaCB0aW1lIHJlbWFpbmlu
ZwogICoKQEAgLTExNDcsMTUgKzExNDYsMTYgQEAgc3RhdGljIGJvb2wgY2FuX3dhaXRfYm9vc3Qo
c3RydWN0IGRybV9pOTE1X2ZpbGVfcHJpdmF0ZSAqZmlsZV9wcml2KQogICogcmVzZXRfY291bnRl
ciBfbXVzdF8gYmUgcmVhZCBiZWZvcmUsIGFuZCBhbiBhcHByb3ByaWF0ZSBzbXBfcm1iIG11c3Qg
YmUKICAqIGluc2VydGVkLgogICoKLSAqIFJldHVybnMgMCBpZiB0aGUgc2Vxbm8gd2FzIGZvdW5k
IHdpdGhpbiB0aGUgYWxsb3RlZCB0aW1lLiBFbHNlIHJldHVybnMgdGhlCisgKiBSZXR1cm5zIDAg
aWYgdGhlIHJlcXVlc3Qgd2FzIGZvdW5kIHdpdGhpbiB0aGUgYWxsb3RlZCB0aW1lLiBFbHNlIHJl
dHVybnMgdGhlCiAgKiBlcnJubyB3aXRoIHJlbWFpbmluZyB0aW1lIGZpbGxlZCBpbiB0aW1lb3V0
IGFyZ3VtZW50LgogICovCi1zdGF0aWMgaW50IF9fd2FpdF9zZXFubyhzdHJ1Y3QgaW50ZWxfZW5n
aW5lX2NzICpyaW5nLCB1MzIgc2Vxbm8sCi0JCQl1bnNpZ25lZCByZXNldF9jb3VudGVyLAotCQkJ
Ym9vbCBpbnRlcnJ1cHRpYmxlLAotCQkJczY0ICp0aW1lb3V0LAotCQkJc3RydWN0IGRybV9pOTE1
X2ZpbGVfcHJpdmF0ZSAqZmlsZV9wcml2KQorc3RhdGljIGludCBfX3dhaXRfcmVxdWVzdChzdHJ1
Y3QgZHJtX2k5MTVfZ2VtX3JlcXVlc3QgKnJlcSwKKwkJCSAgdW5zaWduZWQgcmVzZXRfY291bnRl
ciwKKwkJCSAgYm9vbCBpbnRlcnJ1cHRpYmxlLAorCQkJICBzNjQgKnRpbWVvdXQsCisJCQkgIHN0
cnVjdCBkcm1faTkxNV9maWxlX3ByaXZhdGUgKmZpbGVfcHJpdikKIHsKKwlzdHJ1Y3QgaW50ZWxf
ZW5naW5lX2NzICpyaW5nID0gaTkxNV9nZW1fcmVxdWVzdF9nZXRfcmluZyhyZXEpOwogCXN0cnVj
dCBkcm1fZGV2aWNlICpkZXYgPSByaW5nLT5kZXY7CiAJc3RydWN0IGRybV9pOTE1X3ByaXZhdGUg
KmRldl9wcml2ID0gZGV2LT5kZXZfcHJpdmF0ZTsKIAljb25zdCBib29sIGlycV90ZXN0X2luX3By
b2dyZXNzID0KQEAgLTExNjcsNyArMTE2Nyw3IEBAIHN0YXRpYyBpbnQgX193YWl0X3NlcW5vKHN0
cnVjdCBpbnRlbF9lbmdpbmVfY3MgKnJpbmcsIHUzMiBzZXFubywKIAogCVdBUk4oIWludGVsX2ly
cXNfZW5hYmxlZChkZXZfcHJpdiksICJJUlFzIGRpc2FibGVkIik7CiAKLQlpZiAoaTkxNV9zZXFu
b19wYXNzZWQocmluZy0+Z2V0X3NlcW5vKHJpbmcsIHRydWUpLCBzZXFubykpCisJaWYgKGk5MTVf
c2Vxbm9fcGFzc2VkKHJpbmctPmdldF9zZXFubyhyaW5nLCB0cnVlKSwgcmVxLT5zZXFubykpCiAJ
CXJldHVybiAwOwogCiAJdGltZW91dF9leHBpcmUgPSB0aW1lb3V0ID8gamlmZmllcyArIG5zZWNz
X3RvX2ppZmZpZXMoKHU2NCkqdGltZW91dCkgOiAwOwpAQCAtMTE4NCw3ICsxMTg0LDcgQEAgc3Rh
dGljIGludCBfX3dhaXRfc2Vxbm8oc3RydWN0IGludGVsX2VuZ2luZV9jcyAqcmluZywgdTMyIHNl
cW5vLAogCQlyZXR1cm4gLUVOT0RFVjsKIAogCS8qIFJlY29yZCBjdXJyZW50IHRpbWUgaW4gY2Fz
ZSBpbnRlcnJ1cHRlZCBieSBzaWduYWwsIG9yIHdlZGdlZCAqLwotCXRyYWNlX2k5MTVfZ2VtX3Jl
cXVlc3Rfd2FpdF9iZWdpbihyaW5nLCBzZXFubyk7CisJdHJhY2VfaTkxNV9nZW1fcmVxdWVzdF93
YWl0X2JlZ2luKGk5MTVfZ2VtX3JlcXVlc3RfZ2V0X3JpbmcocmVxKSwgaTkxNV9nZW1fcmVxdWVz
dF9nZXRfc2Vxbm8ocmVxKSk7CiAJYmVmb3JlID0ga3RpbWVfZ2V0X3Jhd19ucygpOwogCWZvciAo
OzspIHsKIAkJc3RydWN0IHRpbWVyX2xpc3QgdGltZXI7CkBAIC0xMjAzLDcgKzEyMDMsNyBAQCBz
dGF0aWMgaW50IF9fd2FpdF9zZXFubyhzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICpyaW5nLCB1MzIg
c2Vxbm8sCiAJCQlicmVhazsKIAkJfQogCi0JCWlmIChpOTE1X3NlcW5vX3Bhc3NlZChyaW5nLT5n
ZXRfc2Vxbm8ocmluZywgZmFsc2UpLCBzZXFubykpIHsKKwkJaWYgKGk5MTVfc2Vxbm9fcGFzc2Vk
KHJpbmctPmdldF9zZXFubyhyaW5nLCBmYWxzZSksIHJlcS0+c2Vxbm8pKSB7CiAJCQlyZXQgPSAw
OwogCQkJYnJlYWs7CiAJCX0KQEAgLTEyMzUsNyArMTIzNSw3IEBAIHN0YXRpYyBpbnQgX193YWl0
X3NlcW5vKHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKnJpbmcsIHUzMiBzZXFubywKIAkJfQogCX0K
IAlub3cgPSBrdGltZV9nZXRfcmF3X25zKCk7Ci0JdHJhY2VfaTkxNV9nZW1fcmVxdWVzdF93YWl0
X2VuZChyaW5nLCBzZXFubyk7CisJdHJhY2VfaTkxNV9nZW1fcmVxdWVzdF93YWl0X2VuZChpOTE1
X2dlbV9yZXF1ZXN0X2dldF9yaW5nKHJlcSksIGk5MTVfZ2VtX3JlcXVlc3RfZ2V0X3NlcW5vKHJl
cSkpOwogCiAJaWYgKCFpcnFfdGVzdF9pbl9wcm9ncmVzcykKIAkJcmluZy0+aXJxX3B1dChyaW5n
KTsKQEAgLTEyNzksOSArMTI3OSw5IEBAIGk5MTVfd2FpdF9yZXF1ZXN0KHN0cnVjdCBkcm1faTkx
NV9nZW1fcmVxdWVzdCAqcmVxKQogCWlmIChyZXQpCiAJCXJldHVybiByZXQ7CiAKLQlyZXR1cm4g
X193YWl0X3NlcW5vKHJlcS0+cmluZywgaTkxNV9nZW1fcmVxdWVzdF9nZXRfc2Vxbm8ocmVxKSwK
LQkJCSAgICBhdG9taWNfcmVhZCgmZGV2X3ByaXYtPmdwdV9lcnJvci5yZXNldF9jb3VudGVyKSwK
LQkJCSAgICBpbnRlcnJ1cHRpYmxlLCBOVUxMLCBOVUxMKTsKKwlyZXR1cm4gX193YWl0X3JlcXVl
c3QocmVxLAorCQkJICAgICAgYXRvbWljX3JlYWQoJmRldl9wcml2LT5ncHVfZXJyb3IucmVzZXRf
Y291bnRlciksCisJCQkgICAgICBpbnRlcnJ1cHRpYmxlLCBOVUxMLCBOVUxMKTsKIH0KIAogc3Rh
dGljIGludApAQCAtMTMzNSw3ICsxMzM1LDYgQEAgaTkxNV9nZW1fb2JqZWN0X3dhaXRfcmVuZGVy
aW5nX19ub25ibG9ja2luZyhzdHJ1Y3QgZHJtX2k5MTVfZ2VtX29iamVjdCAqb2JqLAogCXN0cnVj
dCBkcm1faTkxNV9nZW1fcmVxdWVzdCAqcmVxOwogCXN0cnVjdCBkcm1fZGV2aWNlICpkZXYgPSBv
YmotPmJhc2UuZGV2OwogCXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9IGRldi0+
ZGV2X3ByaXZhdGU7Ci0Jc3RydWN0IGludGVsX2VuZ2luZV9jcyAqcmluZyA9IG9iai0+cmluZzsK
IAl1bnNpZ25lZCByZXNldF9jb3VudGVyOwogCWludCByZXQ7CiAKQEAgLTEzNTcsNyArMTM1Niw3
IEBAIGk5MTVfZ2VtX29iamVjdF93YWl0X3JlbmRlcmluZ19fbm9uYmxvY2tpbmcoc3RydWN0IGRy
bV9pOTE1X2dlbV9vYmplY3QgKm9iaiwKIAlyZXNldF9jb3VudGVyID0gYXRvbWljX3JlYWQoJmRl
dl9wcml2LT5ncHVfZXJyb3IucmVzZXRfY291bnRlcik7CiAJaTkxNV9nZW1fcmVxdWVzdF9yZWZl
cmVuY2UocmVxKTsKIAltdXRleF91bmxvY2soJmRldi0+c3RydWN0X211dGV4KTsKLQlyZXQgPSBf
X3dhaXRfc2Vxbm8ocmluZywgaTkxNV9nZW1fcmVxdWVzdF9nZXRfc2Vxbm8ocmVxKSwgcmVzZXRf
Y291bnRlciwgdHJ1ZSwgTlVMTCwgZmlsZV9wcml2KTsKKwlyZXQgPSBfX3dhaXRfcmVxdWVzdChy
ZXEsIHJlc2V0X2NvdW50ZXIsIHRydWUsIE5VTEwsIGZpbGVfcHJpdik7CiAJbXV0ZXhfbG9jaygm
ZGV2LT5zdHJ1Y3RfbXV0ZXgpOwogCWk5MTVfZ2VtX3JlcXVlc3RfdW5yZWZlcmVuY2UocmVxKTsK
IAlpZiAocmV0KQpAQCAtMjgxNCw5ICsyODEzLDcgQEAgaTkxNV9nZW1fd2FpdF9pb2N0bChzdHJ1
Y3QgZHJtX2RldmljZSAqZGV2LCB2b2lkICpkYXRhLCBzdHJ1Y3QgZHJtX2ZpbGUgKmZpbGUpCiAJ
c3RydWN0IGRybV9pOTE1X2dlbV93YWl0ICphcmdzID0gZGF0YTsKIAlzdHJ1Y3QgZHJtX2k5MTVf
Z2VtX29iamVjdCAqb2JqOwogCXN0cnVjdCBkcm1faTkxNV9nZW1fcmVxdWVzdCAqcmVxOwotCXN0
cnVjdCBpbnRlbF9lbmdpbmVfY3MgKnJpbmcgPSBOVUxMOwogCXVuc2lnbmVkIHJlc2V0X2NvdW50
ZXI7Ci0JdTMyIHNlcW5vID0gMDsKIAlpbnQgcmV0ID0gMDsKIAogCWlmIChhcmdzLT5mbGFncyAh
PSAwKQpAQCAtMjg0MSw5ICsyODM4LDYgQEAgaTkxNV9nZW1fd2FpdF9pb2N0bChzdHJ1Y3QgZHJt
X2RldmljZSAqZGV2LCB2b2lkICpkYXRhLCBzdHJ1Y3QgZHJtX2ZpbGUgKmZpbGUpCiAJCWdvdG8g
b3V0OwogCiAJcmVxID0gb2JqLT5sYXN0X3JlYWRfcmVxOwotCXNlcW5vID0gaTkxNV9nZW1fcmVx
dWVzdF9nZXRfc2Vxbm8ocmVxKTsKLQlXQVJOX09OKHNlcW5vID09IDApOwotCXJpbmcgPSBvYmot
PnJpbmc7CiAKIAkvKiBEbyB0aGlzIGFmdGVyIE9MUiBjaGVjayB0byBtYWtlIHN1cmUgd2UgbWFr
ZSBmb3J3YXJkIHByb2dyZXNzIHBvbGxpbmcKIAkgKiBvbiB0aGlzIElPQ1RMIHdpdGggYSB0aW1l
b3V0IDw9MCAobGlrZSBidXN5IGlvY3RsKQpAQCAtMjg1OCw4ICsyODUyLDggQEAgaTkxNV9nZW1f
d2FpdF9pb2N0bChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LCB2b2lkICpkYXRhLCBzdHJ1Y3QgZHJt
X2ZpbGUgKmZpbGUpCiAJaTkxNV9nZW1fcmVxdWVzdF9yZWZlcmVuY2UocmVxKTsKIAltdXRleF91
bmxvY2soJmRldi0+c3RydWN0X211dGV4KTsKIAotCXJldCA9IF9fd2FpdF9zZXFubyhyaW5nLCBz
ZXFubywgcmVzZXRfY291bnRlciwgdHJ1ZSwgJmFyZ3MtPnRpbWVvdXRfbnMsCi0JCQkgICBmaWxl
LT5kcml2ZXJfcHJpdik7CisJcmV0ID0gX193YWl0X3JlcXVlc3QocmVxLCByZXNldF9jb3VudGVy
LCB0cnVlLCAmYXJncy0+dGltZW91dF9ucywKKwkJCSAgICAgZmlsZS0+ZHJpdmVyX3ByaXYpOwog
CW11dGV4X2xvY2soJmRldi0+c3RydWN0X211dGV4KTsKIAlpOTE1X2dlbV9yZXF1ZXN0X3VucmVm
ZXJlbmNlKHJlcSk7CiAJbXV0ZXhfdW5sb2NrKCZkZXYtPnN0cnVjdF9tdXRleCk7CkBAIC00MDQy
LDkgKzQwMzYsNyBAQCBpOTE1X2dlbV9yaW5nX3Rocm90dGxlKHN0cnVjdCBkcm1fZGV2aWNlICpk
ZXYsIHN0cnVjdCBkcm1fZmlsZSAqZmlsZSkKIAlpZiAodGFyZ2V0ID09IE5VTEwpCiAJCXJldHVy
biAwOwogCi0JcmV0ID0gX193YWl0X3NlcW5vKGk5MTVfZ2VtX3JlcXVlc3RfZ2V0X3JpbmcodGFy
Z2V0KSwKLQkJCSAgIGk5MTVfZ2VtX3JlcXVlc3RfZ2V0X3NlcW5vKHRhcmdldCksCi0JCQkgICBy
ZXNldF9jb3VudGVyLCB0cnVlLCBOVUxMLCBOVUxMKTsKKwlyZXQgPSBfX3dhaXRfcmVxdWVzdCh0
YXJnZXQsIHJlc2V0X2NvdW50ZXIsIHRydWUsIE5VTEwsIE5VTEwpOwogCWlmIChyZXQgPT0gMCkK
IAkJcXVldWVfZGVsYXllZF93b3JrKGRldl9wcml2LT53cSwgJmRldl9wcml2LT5tbS5yZXRpcmVf
d29yaywgMCk7CiAKLS0gCjEuNy45LjUKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f
X19fX19fX19fX19fX19fCkludGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZy
ZWVkZXNrdG9wLm9yZwpodHRwOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGlu
Zm8vaW50ZWwtZ2Z4Cg==