From mboxrd@z Thu Jan  1 00:00:00 1970
From: yu.dai@intel.com
Subject: [PATCH v4] drm/i915/guc: Move GuC wq_check_space to
	alloc_request_extras
Date: Wed, 16 Dec 2015 11:45:55 -0800
Message-ID: <1450295155-10050-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 D1CEB6E06D
 for <intel-gfx@lists.freedesktop.org>; Wed, 16 Dec 2015 11:49:01 -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
L3Jlc2VydmUvY2hlY2svZyAoRGF2ZSBHb3Jkb24pCnY0OiBVcGRhdGUgY2FjaGVkIHdxIGhlYWQg
YWZ0ZXIgcmluZyBkb29yYmVsbDsgY2hlY2sgd3Egc3BhY2UgYmVmb3JlCiAgICByaW5nIGRvb3Ji
ZWxsIGluIGNhc2UgdW5leHBlY3RlZCBlcnJvciBoYXBwZW5zOyBjYWxsIHdxIHNwYWNlCiAgICBj
aGVjayBvbmx5IHdoZW4gR3VDIHN1Ym1pc3Npb24gaXMgZW5hYmxlZC4gKERhdmUgR29yZG9uKQoK
U2lnbmVkLW9mZi1ieTogQWxleCBEYWkgPHl1LmRhaUBpbnRlbC5jb20+CgpkaWZmIC0tZ2l0IGEv
ZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9ndWNfc3VibWlzc2lvbi5jIGIvZHJpdmVycy9ncHUv
ZHJtL2k5MTUvaTkxNV9ndWNfc3VibWlzc2lvbi5jCmluZGV4IGVmMjAwNzEuLjc1NTRkMTYgMTAw
NjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ3VjX3N1Ym1pc3Npb24uYworKysg
Yi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2d1Y19zdWJtaXNzaW9uLmMKQEAgLTI0Nyw2ICsy
NDcsOSBAQCBzdGF0aWMgaW50IGd1Y19yaW5nX2Rvb3JiZWxsKHN0cnVjdCBpOTE1X2d1Y19jbGll
bnQgKmdjKQogCQkJZGJfZXhjLmNvb2tpZSA9IDE7CiAJfQogCisJLyogRmluYWxseSwgdXBkYXRl
IHRoZSBjYWNoZWQgY29weSBvZiB0aGUgR3VDJ3MgV1EgaGVhZCAqLworCWdjLT53cV9oZWFkID0g
ZGVzYy0+aGVhZDsKKwogCWt1bm1hcF9hdG9taWMoYmFzZSk7CiAJcmV0dXJuIHJldDsKIH0KQEAg
LTQ3MiwyOCArNDc1LDMwIEBAIHN0YXRpYyB2b2lkIGd1Y19maW5pX2N0eF9kZXNjKHN0cnVjdCBp
bnRlbF9ndWMgKmd1YywKIAkJCSAgICAgc2l6ZW9mKGRlc2MpICogY2xpZW50LT5jdHhfaW5kZXgp
OwogfQogCi0vKiBHZXQgdmFsaWQgd29ya3F1ZXVlIGl0ZW0gYW5kIHJldHVybiBpdCBiYWNrIHRv
IG9mZnNldCAqLwotc3RhdGljIGludCBndWNfZ2V0X3dvcmtxdWV1ZV9zcGFjZShzdHJ1Y3QgaTkx
NV9ndWNfY2xpZW50ICpnYywgdTMyICpvZmZzZXQpCitpbnQgaTkxNV9ndWNfd3FfY2hlY2tfc3Bh
Y2Uoc3RydWN0IGk5MTVfZ3VjX2NsaWVudCAqZ2MpCiB7CiAJc3RydWN0IGd1Y19wcm9jZXNzX2Rl
c2MgKmRlc2M7CiAJdm9pZCAqYmFzZTsKIAl1MzIgc2l6ZSA9IHNpemVvZihzdHJ1Y3QgZ3VjX3dx
X2l0ZW0pOwogCWludCByZXQgPSAtRVRJTUVET1VULCB0aW1lb3V0X2NvdW50ZXIgPSAyMDA7CiAK
KwlpZiAoIWdjKQorCQlyZXR1cm4gMDsKKworCS8qIFF1aWNrbHkgcmV0dXJuIGlmIHdxIHNwYWNl
IGlzIGF2YWlsYWJsZSBzaW5jZSBsYXN0IHRpbWUgd2UgY2FjaGUgdGhlCisJICogaGVhZCBwb3Np
dGlvbi4gKi8KKwlpZiAoQ0lSQ19TUEFDRShnYy0+d3FfdGFpbCwgZ2MtPndxX2hlYWQsIGdjLT53
cV9zaXplKSA+PSBzaXplKQorCQlyZXR1cm4gMDsKKwogCWJhc2UgPSBrbWFwX2F0b21pYyhpOTE1
X2dlbV9vYmplY3RfZ2V0X3BhZ2UoZ2MtPmNsaWVudF9vYmosIDApKTsKIAlkZXNjID0gYmFzZSAr
IGdjLT5wcm9jX2Rlc2Nfb2Zmc2V0OwogCiAJd2hpbGUgKHRpbWVvdXRfY291bnRlci0tID4gMCkg
ewotCQlpZiAoQ0lSQ19TUEFDRShnYy0+d3FfdGFpbCwgZGVzYy0+aGVhZCwgZ2MtPndxX3NpemUp
ID49IHNpemUpIHsKLQkJCSpvZmZzZXQgPSBnYy0+d3FfdGFpbDsKKwkJZ2MtPndxX2hlYWQgPSBk
ZXNjLT5oZWFkOwogCi0JCQkvKiBhZHZhbmNlIHRoZSB0YWlsIGZvciBuZXh0IHdvcmtxdWV1ZSBp
dGVtICovCi0JCQlnYy0+d3FfdGFpbCArPSBzaXplOwotCQkJZ2MtPndxX3RhaWwgJj0gZ2MtPndx
X3NpemUgLSAxOwotCi0JCQkvKiB0aGlzIHdpbGwgYnJlYWsgdGhlIGxvb3AgKi8KLQkJCXRpbWVv
dXRfY291bnRlciA9IDA7CisJCWlmIChDSVJDX1NQQUNFKGdjLT53cV90YWlsLCBnYy0+d3FfaGVh
ZCwgZ2MtPndxX3NpemUpID49IHNpemUpIHsKIAkJCXJldCA9IDA7CisJCQlicmVhazsKIAkJfQog
CiAJCWlmICh0aW1lb3V0X2NvdW50ZXIpCkBAIC01MTEsMTIgKzUxNiwxNiBAQCBzdGF0aWMgaW50
IGd1Y19hZGRfd29ya3F1ZXVlX2l0ZW0oc3RydWN0IGk5MTVfZ3VjX2NsaWVudCAqZ2MsCiAJZW51
bSBpbnRlbF9yaW5nX2lkIHJpbmdfaWQgPSBycS0+cmluZy0+aWQ7CiAJc3RydWN0IGd1Y193cV9p
dGVtICp3cWk7CiAJdm9pZCAqYmFzZTsKLQl1MzIgdGFpbCwgd3FfbGVuLCB3cV9vZmYgPSAwOwot
CWludCByZXQ7CisJdTMyIHRhaWwsIHdxX2xlbiwgd3Ffb2ZmLCBzcGFjZTsKKworCXNwYWNlID0g
Q0lSQ19TUEFDRShnYy0+d3FfdGFpbCwgZ2MtPndxX2hlYWQsIGdjLT53cV9zaXplKTsKKwlpZiAo
V0FSTl9PTihzcGFjZSA8IHNpemVvZihzdHJ1Y3QgZ3VjX3dxX2l0ZW0pKSkKKwkJcmV0dXJuIC1F
Tk9TUEM7IC8qIHNob3VsZG4ndCBoYXBwZW4gKi8KIAotCXJldCA9IGd1Y19nZXRfd29ya3F1ZXVl
X3NwYWNlKGdjLCAmd3Ffb2ZmKTsKLQlpZiAocmV0KQotCQlyZXR1cm4gcmV0OworCS8qIHBvc3Rp
bmNyZW1lbnQgV1EgdGFpbCBmb3IgbmV4dCB0aW1lICovCisJd3Ffb2ZmID0gZ2MtPndxX3RhaWw7
CisJZ2MtPndxX3RhaWwgKz0gc2l6ZW9mKHN0cnVjdCBndWNfd3FfaXRlbSk7CisJZ2MtPndxX3Rh
aWwgJj0gZ2MtPndxX3NpemUgLSAxOwogCiAJLyogRm9yIG5vdyB3b3JrcXVldWUgaXRlbSBpcyA0
IERXczsgd29ya3F1ZXVlIGJ1ZmZlciBpcyAyIHBhZ2VzLiBTbyB3ZQogCSAqIHNob3VsZCBub3Qg
aGF2ZSB0aGUgY2FzZSB3aGVyZSBzdHJ1Y3R1cmUgd3FpIGlzIGFjcm9zcyBwYWdlLCBuZWl0aGVy
CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9ndWMuaCBiL2RyaXZlcnMv
Z3B1L2RybS9pOTE1L2ludGVsX2d1Yy5oCmluZGV4IDBlMDQ4YmYuLjVjZjU1NWQgMTAwNjQ0Ci0t
LSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2d1Yy5oCisrKyBiL2RyaXZlcnMvZ3B1L2Ry
bS9pOTE1L2ludGVsX2d1Yy5oCkBAIC00Myw2ICs0Myw3IEBAIHN0cnVjdCBpOTE1X2d1Y19jbGll
bnQgewogCXVpbnQzMl90IHdxX29mZnNldDsKIAl1aW50MzJfdCB3cV9zaXplOwogCXVpbnQzMl90
IHdxX3RhaWw7CisJdWludDMyX3Qgd3FfaGVhZDsKIAogCS8qIEd1QyBzdWJtaXNzaW9uIHN0YXRp
c3RpY3MgJiBzdGF0dXMgKi8KIAl1aW50NjRfdCBzdWJtaXNzaW9uc1tJOTE1X05VTV9SSU5HU107
CkBAIC0xMjMsNSArMTI0LDYgQEAgaW50IGk5MTVfZ3VjX3N1Ym1pdChzdHJ1Y3QgaTkxNV9ndWNf
Y2xpZW50ICpjbGllbnQsCiAJCSAgICBzdHJ1Y3QgZHJtX2k5MTVfZ2VtX3JlcXVlc3QgKnJxKTsK
IHZvaWQgaTkxNV9ndWNfc3VibWlzc2lvbl9kaXNhYmxlKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYp
Owogdm9pZCBpOTE1X2d1Y19zdWJtaXNzaW9uX2Zpbmkoc3RydWN0IGRybV9kZXZpY2UgKmRldik7
CitpbnQgaTkxNV9ndWNfd3FfY2hlY2tfc3BhY2Uoc3RydWN0IGk5MTVfZ3VjX2NsaWVudCAqY2xp
ZW50KTsKIAogI2VuZGlmCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9s
cmMuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2xyYy5jCmluZGV4IDI3MmYzNmYuLmNk
MjMyZDIgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2xyYy5jCisrKyBi
L2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2xyYy5jCkBAIC02NjcsNiArNjY3LDE5IEBAIGlu
dCBpbnRlbF9sb2dpY2FsX3JpbmdfYWxsb2NfcmVxdWVzdF9leHRyYXMoc3RydWN0IGRybV9pOTE1
X2dlbV9yZXF1ZXN0ICpyZXF1ZXN0CiAJCQlyZXR1cm4gcmV0OwogCX0KIAorCWlmIChpOTE1LmVu
YWJsZV9ndWNfc3VibWlzc2lvbikgeworCQkvKgorCQkgKiBDaGVjayB0aGF0IHRoZSBHdUMgaGFz
IHNwYWNlIGZvciB0aGUgcmVxdWVzdCBiZWZvcmUKKwkJICogZ29pbmcgYW55IGZ1cnRoZXIsIGFz
IHRoZSBpOTE1X2FkZF9yZXF1ZXN0KCkgY2FsbAorCQkgKiBsYXRlciBvbiBtdXN0bid0IGZhaWwg
Li4uCisJCSAqLworCQlzdHJ1Y3QgaW50ZWxfZ3VjICpndWMgPSAmcmVxdWVzdC0+aTkxNS0+Z3Vj
OworCisJCXJldCA9IGk5MTVfZ3VjX3dxX2NoZWNrX3NwYWNlKGd1Yy0+ZXhlY2J1Zl9jbGllbnQp
OworCQlpZiAocmV0KQorCQkJcmV0dXJuIHJldDsKKwl9CisKIAlyZXR1cm4gMDsKIH0KIAotLSAK
Mi41LjAKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCklu
dGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRw
Oi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4Cg==