From mboxrd@z Thu Jan  1 00:00:00 1970
From: yu.dai@intel.com
Subject: [PATCH v3] drm/i915/guc: Move GuC wq_check_space to
	alloc_request_extras
Date: Thu, 10 Dec 2015 17:17:35 -0800
Message-ID: <1449796655-21384-1-git-send-email-yu.dai@intel.com>
References: <1449623090-1461-1-git-send-email-yu.dai@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 4F2736ED59
 for <intel-gfx@lists.freedesktop.org>; Thu, 10 Dec 2015 17:20:15 -0800 (PST)
In-Reply-To: <1449623090-1461-1-git-send-email-yu.dai@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

RnJvbTogQWxleCBEYWkgPHl1LmRhaUBpbnRlbC5jb20+CgpTcGxpdCBHdUMgd29yayBxdWV1ZSBz
cGFjZSBjaGVja2luZyBmcm9tIHN1Ym1pc3Npb24gYW5kIG1vdmUgaXQgdG8KcmluZ19hbGxvY19y
ZXF1ZXN0X2V4dHJhcy4gVGhlIHJlYXNvbiBpcyB0aGF0IGZhaWx1cmUgaW4gbGF0ZXIKaTkxNV9h
ZGRfcmVxdWVzdCgpIHdvbid0IGJlIGhhbmRsZWQuIEluIHRoZSBjYXNlIHRpbWVvdXQgaGFwcGVu
cywKZHJpdmVyIGNhbiByZXR1cm4gZWFybHkgaW4gb3JkZXIgdG8gaGFuZGxlIHRoZSBlcnJvci4K
CnYxOiBNb3ZlIHdxX3Jlc2VydmVfc3BhY2UgdG8gcmluZ19yZXNlcnZlX3NwYWNlCnYyOiBNb3Zl
IHdxX3Jlc2VydmVfc3BhY2UgdG8gYWxsb2NfcmVxdWVzdF9leHRyYXMgKENocmlzIFdpbHNvbikK
djM6IFRoZSB3b3JrIHF1ZXVlIGhlYWQgcG9pbnRlciBpcyBjYWNoZWQgYnkgZHJpdmVyIG5vdy4g
U28gd2UgY2FuCiAgICBxdWlja2x5IHJldHVybiBpZiBzcGFjZSBpcyBhdmFpbGFibGUuCiAgICBz
L3Jlc2VydmUvY2hlY2svZyAoRGF2ZSBHb3Jkb24pCgpTaWduZWQtb2ZmLWJ5OiBBbGV4IERhaSA8
eXUuZGFpQGludGVsLmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2d1Y19zdWJt
aXNzaW9uLmMgfCAzNCArKysrKysrKysrKysrKysrKystLS0tLS0tLS0tLS0KIGRyaXZlcnMvZ3B1
L2RybS9pOTE1L2ludGVsX2d1Yy5oICAgICAgICAgICB8ICAyICsrCiBkcml2ZXJzL2dwdS9kcm0v
aTkxNS9pbnRlbF9scmMuYyAgICAgICAgICAgfCAgNiArKysrKysKIDMgZmlsZXMgY2hhbmdlZCwg
MjggaW5zZXJ0aW9ucygrKSwgMTQgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9n
cHUvZHJtL2k5MTUvaTkxNV9ndWNfc3VibWlzc2lvbi5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUv
aTkxNV9ndWNfc3VibWlzc2lvbi5jCmluZGV4IDIyNmU5YzAuLmNiOGUxZjcxIDEwMDY0NAotLS0g
YS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2d1Y19zdWJtaXNzaW9uLmMKKysrIGIvZHJpdmVy
cy9ncHUvZHJtL2k5MTUvaTkxNV9ndWNfc3VibWlzc2lvbi5jCkBAIC0yMDcsNiArMjA3LDkgQEAg
c3RhdGljIGludCBndWNfcmluZ19kb29yYmVsbChzdHJ1Y3QgaTkxNV9ndWNfY2xpZW50ICpnYykK
IAkvKiBVcGRhdGUgdGhlIHRhaWwgc28gaXQgaXMgdmlzaWJsZSB0byBHdUMgKi8KIAlkZXNjLT50
YWlsID0gZ2MtPndxX3RhaWw7CiAKKwkvKiBDYWNoZSB0aGUgaGVhZCB3aGVyZSBHdUMgaXMgcHJv
Y2Vzc2luZyAqLworCWdjLT53cV9oZWFkID0gZGVzYy0+aGVhZDsKKwogCS8qIGN1cnJlbnQgY29v
a2llICovCiAJZGJfY21wLmRiX3N0YXR1cyA9IEdVQ19ET09SQkVMTF9FTkFCTEVEOwogCWRiX2Nt
cC5jb29raWUgPSBnYy0+Y29va2llOwpAQCAtNDcyLDI4ICs0NzUsMzAgQEAgc3RhdGljIHZvaWQg
Z3VjX2ZpbmlfY3R4X2Rlc2Moc3RydWN0IGludGVsX2d1YyAqZ3VjLAogCQkJICAgICBzaXplb2Yo
ZGVzYykgKiBjbGllbnQtPmN0eF9pbmRleCk7CiB9CiAKLS8qIEdldCB2YWxpZCB3b3JrcXVldWUg
aXRlbSBhbmQgcmV0dXJuIGl0IGJhY2sgdG8gb2Zmc2V0ICovCi1zdGF0aWMgaW50IGd1Y19nZXRf
d29ya3F1ZXVlX3NwYWNlKHN0cnVjdCBpOTE1X2d1Y19jbGllbnQgKmdjLCB1MzIgKm9mZnNldCkK
K2ludCBpOTE1X2d1Y193cV9jaGVja19zcGFjZShzdHJ1Y3QgaTkxNV9ndWNfY2xpZW50ICpnYykK
IHsKIAlzdHJ1Y3QgZ3VjX3Byb2Nlc3NfZGVzYyAqZGVzYzsKIAl2b2lkICpiYXNlOwogCXUzMiBz
aXplID0gc2l6ZW9mKHN0cnVjdCBndWNfd3FfaXRlbSk7CiAJaW50IHJldCA9IC1FVElNRURPVVQs
IHRpbWVvdXRfY291bnRlciA9IDIwMDsKIAorCWlmICghZ2MpCisJCXJldHVybiAwOworCisJLyog
UXVpY2tseSByZXR1cm4gaWYgd3Egc3BhY2UgaXMgYXZhaWxhYmxlIHNpbmNlIGxhc3QgdGltZSB3
ZSBjYWNoZSB0aGUKKwkgKiBoZWFkIHBvc2l0aW9uLiAqLworCWlmIChDSVJDX1NQQUNFKGdjLT53
cV90YWlsLCBnYy0+d3FfaGVhZCwgZ2MtPndxX3NpemUpID49IHNpemUpCisJCXJldHVybiAwOwor
CiAJYmFzZSA9IGttYXBfYXRvbWljKGk5MTVfZ2VtX29iamVjdF9nZXRfcGFnZShnYy0+Y2xpZW50
X29iaiwgMCkpOwogCWRlc2MgPSBiYXNlICsgZ2MtPnByb2NfZGVzY19vZmZzZXQ7CiAKIAl3aGls
ZSAodGltZW91dF9jb3VudGVyLS0gPiAwKSB7Ci0JCWlmIChDSVJDX1NQQUNFKGdjLT53cV90YWls
LCBkZXNjLT5oZWFkLCBnYy0+d3Ffc2l6ZSkgPj0gc2l6ZSkgewotCQkJKm9mZnNldCA9IGdjLT53
cV90YWlsOworCQlnYy0+d3FfaGVhZCA9IGRlc2MtPmhlYWQ7CiAKLQkJCS8qIGFkdmFuY2UgdGhl
IHRhaWwgZm9yIG5leHQgd29ya3F1ZXVlIGl0ZW0gKi8KLQkJCWdjLT53cV90YWlsICs9IHNpemU7
Ci0JCQlnYy0+d3FfdGFpbCAmPSBnYy0+d3Ffc2l6ZSAtIDE7Ci0KLQkJCS8qIHRoaXMgd2lsbCBi
cmVhayB0aGUgbG9vcCAqLwotCQkJdGltZW91dF9jb3VudGVyID0gMDsKKwkJaWYgKENJUkNfU1BB
Q0UoZ2MtPndxX3RhaWwsIGdjLT53cV9oZWFkLCBnYy0+d3Ffc2l6ZSkgPj0gc2l6ZSkgewogCQkJ
cmV0ID0gMDsKKwkJCWJyZWFrOwogCQl9CiAKIAkJaWYgKHRpbWVvdXRfY291bnRlcikKQEAgLTUx
MiwxMSArNTE3LDggQEAgc3RhdGljIGludCBndWNfYWRkX3dvcmtxdWV1ZV9pdGVtKHN0cnVjdCBp
OTE1X2d1Y19jbGllbnQgKmdjLAogCXN0cnVjdCBndWNfd3FfaXRlbSAqd3FpOwogCXZvaWQgKmJh
c2U7CiAJdTMyIHRhaWwsIHdxX2xlbiwgd3Ffb2ZmID0gMDsKLQlpbnQgcmV0OwogCi0JcmV0ID0g
Z3VjX2dldF93b3JrcXVldWVfc3BhY2UoZ2MsICZ3cV9vZmYpOwotCWlmIChyZXQpCi0JCXJldHVy
biByZXQ7CisJd3Ffb2ZmID0gZ2MtPndxX3RhaWw7CiAKIAkvKiBGb3Igbm93IHdvcmtxdWV1ZSBp
dGVtIGlzIDQgRFdzOyB3b3JrcXVldWUgYnVmZmVyIGlzIDIgcGFnZXMuIFNvIHdlCiAJICogc2hv
dWxkIG5vdCBoYXZlIHRoZSBjYXNlIHdoZXJlIHN0cnVjdHVyZSB3cWkgaXMgYWNyb3NzIHBhZ2Us
IG5laXRoZXIKQEAgLTU1MSw2ICs1NTMsMTAgQEAgc3RhdGljIGludCBndWNfYWRkX3dvcmtxdWV1
ZV9pdGVtKHN0cnVjdCBpOTE1X2d1Y19jbGllbnQgKmdjLAogCiAJa3VubWFwX2F0b21pYyhiYXNl
KTsKIAorCS8qIGFkdmFuY2UgdGhlIHRhaWwgZm9yIG5leHQgd29ya3F1ZXVlIGl0ZW0gKi8KKwln
Yy0+d3FfdGFpbCArPSBzaXplb2Yoc3RydWN0IGd1Y193cV9pdGVtKTsKKwlnYy0+d3FfdGFpbCAm
PSBnYy0+d3Ffc2l6ZSAtIDE7CisKIAlyZXR1cm4gMDsKIH0KIApkaWZmIC0tZ2l0IGEvZHJpdmVy
cy9ncHUvZHJtL2k5MTUvaW50ZWxfZ3VjLmggYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9n
dWMuaAppbmRleCAwZTA0OGJmLi41Y2Y1NTVkIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0v
aTkxNS9pbnRlbF9ndWMuaAorKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9ndWMuaApA
QCAtNDMsNiArNDMsNyBAQCBzdHJ1Y3QgaTkxNV9ndWNfY2xpZW50IHsKIAl1aW50MzJfdCB3cV9v
ZmZzZXQ7CiAJdWludDMyX3Qgd3Ffc2l6ZTsKIAl1aW50MzJfdCB3cV90YWlsOworCXVpbnQzMl90
IHdxX2hlYWQ7CiAKIAkvKiBHdUMgc3VibWlzc2lvbiBzdGF0aXN0aWNzICYgc3RhdHVzICovCiAJ
dWludDY0X3Qgc3VibWlzc2lvbnNbSTkxNV9OVU1fUklOR1NdOwpAQCAtMTIzLDUgKzEyNCw2IEBA
IGludCBpOTE1X2d1Y19zdWJtaXQoc3RydWN0IGk5MTVfZ3VjX2NsaWVudCAqY2xpZW50LAogCQkg
ICAgc3RydWN0IGRybV9pOTE1X2dlbV9yZXF1ZXN0ICpycSk7CiB2b2lkIGk5MTVfZ3VjX3N1Ym1p
c3Npb25fZGlzYWJsZShzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KTsKIHZvaWQgaTkxNV9ndWNfc3Vi
bWlzc2lvbl9maW5pKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpOworaW50IGk5MTVfZ3VjX3dxX2No
ZWNrX3NwYWNlKHN0cnVjdCBpOTE1X2d1Y19jbGllbnQgKmNsaWVudCk7CiAKICNlbmRpZgpkaWZm
IC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfbHJjLmMgYi9kcml2ZXJzL2dwdS9k
cm0vaTkxNS9pbnRlbF9scmMuYwppbmRleCBmOTZmYjUxLi45NjA1Y2U5IDEwMDY0NAotLS0gYS9k
cml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9scmMuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkx
NS9pbnRlbF9scmMuYwpAQCAtNjY3LDYgKzY2NywxMiBAQCBpbnQgaW50ZWxfbG9naWNhbF9yaW5n
X2FsbG9jX3JlcXVlc3RfZXh0cmFzKHN0cnVjdCBkcm1faTkxNV9nZW1fcmVxdWVzdCAqcmVxdWVz
dAogCQkJcmV0dXJuIHJldDsKIAl9CiAKKwkvKiBSZXNlcnZlIEd1QyBXUSBzcGFjZSBoZXJlIChv
bmUgcmVxdWVzdCBuZWVkcyBvbmUgV1EgaXRlbSkgYmVjYXVzZQorCSAqIHRoZSBsYXRlciBpOTE1
X2FkZF9yZXF1ZXN0KCkgY2FsbCBjYW4ndCBmYWlsLiAqLworCXJldCA9IGk5MTVfZ3VjX3dxX2No
ZWNrX3NwYWNlKHJlcXVlc3QtPmk5MTUtPmd1Yy5leGVjYnVmX2NsaWVudCk7CisJaWYgKHJldCkK
KwkJcmV0dXJuIHJldDsKKwogCXJldHVybiAwOwogfQogCi0tIAoyLjUuMAoKX19fX19fX19fX19f
X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlz
dApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHA6Ly9saXN0cy5mcmVlZGVza3Rv
cC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK