From mboxrd@z Thu Jan 1 00:00:00 1970 From: Dave Gordon Subject: Re: [PATCH v4] drm/i915/guc: Move GuC wq_check_space to alloc_request_extras Date: Wed, 23 Dec 2015 15:39:04 +0000 Message-ID: <567AC018.2050700@intel.com> References: <1449623090-1461-1-git-send-email-yu.dai@intel.com> <1450295155-10050-1-git-send-email-yu.dai@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8"; Format="flowed" Content-Transfer-Encoding: base64 Return-path: Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by gabe.freedesktop.org (Postfix) with ESMTP id B74886E5AB for ; Wed, 23 Dec 2015 07:39:14 -0800 (PST) In-Reply-To: <1450295155-10050-1-git-send-email-yu.dai@intel.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" To: yu.dai@intel.com, intel-gfx@lists.freedesktop.org List-Id: intel-gfx@lists.freedesktop.org T24gMTYvMTIvMTUgMTk6NDUsIHl1LmRhaUBpbnRlbC5jb20gd3JvdGU6Cj4gRnJvbTogQWxleCBE YWkgPHl1LmRhaUBpbnRlbC5jb20+Cj4KPiBTcGxpdCBHdUMgd29yayBxdWV1ZSBzcGFjZSBjaGVj a2luZyBmcm9tIHN1Ym1pc3Npb24gYW5kIG1vdmUgaXQgdG8KPiByaW5nX2FsbG9jX3JlcXVlc3Rf ZXh0cmFzLiBUaGUgcmVhc29uIGlzIHRoYXQgZmFpbHVyZSBpbiBsYXRlcgo+IGk5MTVfYWRkX3Jl cXVlc3QoKSB3b24ndCBiZSBoYW5kbGVkLiBJbiB0aGUgY2FzZSB0aW1lb3V0IGhhcHBlbnMsCj4g ZHJpdmVyIGNhbiByZXR1cm4gZWFybHkgaW4gb3JkZXIgdG8gaGFuZGxlIHRoZSBlcnJvci4KPgo+ IHYxOiBNb3ZlIHdxX3Jlc2VydmVfc3BhY2UgdG8gcmluZ19yZXNlcnZlX3NwYWNlCj4gdjI6IE1v dmUgd3FfcmVzZXJ2ZV9zcGFjZSB0byBhbGxvY19yZXF1ZXN0X2V4dHJhcyAoQ2hyaXMgV2lsc29u KQo+IHYzOiBUaGUgd29yayBxdWV1ZSBoZWFkIHBvaW50ZXIgaXMgY2FjaGVkIGJ5IGRyaXZlciBu b3cuIFNvIHdlIGNhbgo+ICAgICAgcXVpY2tseSByZXR1cm4gaWYgc3BhY2UgaXMgYXZhaWxhYmxl Lgo+ICAgICAgcy9yZXNlcnZlL2NoZWNrL2cgKERhdmUgR29yZG9uKQo+IHY0OiBVcGRhdGUgY2Fj aGVkIHdxIGhlYWQgYWZ0ZXIgcmluZyBkb29yYmVsbDsgY2hlY2sgd3Egc3BhY2UgYmVmb3JlCj4g ICAgICByaW5nIGRvb3JiZWxsIGluIGNhc2UgdW5leHBlY3RlZCBlcnJvciBoYXBwZW5zOyBjYWxs IHdxIHNwYWNlCj4gICAgICBjaGVjayBvbmx5IHdoZW4gR3VDIHN1Ym1pc3Npb24gaXMgZW5hYmxl ZC4gKERhdmUgR29yZG9uKQo+Cj4gU2lnbmVkLW9mZi1ieTogQWxleCBEYWkgPHl1LmRhaUBpbnRl bC5jb20+CgpMR1RNLgpSZXZpZXdlZC1ieTogRGF2ZSBHb3Jkb24gPGRhdmlkLnMuZ29yZG9uQGlu dGVsLmNvbT4KCj4gZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ3VjX3N1 Ym1pc3Npb24uYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ3VjX3N1Ym1pc3Npb24uYwo+ IGluZGV4IGVmMjAwNzEuLjc1NTRkMTYgMTAwNjQ0Cj4gLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5 MTUvaTkxNV9ndWNfc3VibWlzc2lvbi5jCj4gKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkx NV9ndWNfc3VibWlzc2lvbi5jCj4gQEAgLTI0Nyw2ICsyNDcsOSBAQCBzdGF0aWMgaW50IGd1Y19y aW5nX2Rvb3JiZWxsKHN0cnVjdCBpOTE1X2d1Y19jbGllbnQgKmdjKQo+ICAgCQkJZGJfZXhjLmNv b2tpZSA9IDE7Cj4gICAJfQo+Cj4gKwkvKiBGaW5hbGx5LCB1cGRhdGUgdGhlIGNhY2hlZCBjb3B5 IG9mIHRoZSBHdUMncyBXUSBoZWFkICovCj4gKwlnYy0+d3FfaGVhZCA9IGRlc2MtPmhlYWQ7Cj4g Kwo+ICAgCWt1bm1hcF9hdG9taWMoYmFzZSk7Cj4gICAJcmV0dXJuIHJldDsKPiAgIH0KPiBAQCAt NDcyLDI4ICs0NzUsMzAgQEAgc3RhdGljIHZvaWQgZ3VjX2ZpbmlfY3R4X2Rlc2Moc3RydWN0IGlu dGVsX2d1YyAqZ3VjLAo+ICAgCQkJICAgICBzaXplb2YoZGVzYykgKiBjbGllbnQtPmN0eF9pbmRl eCk7Cj4gICB9Cj4KPiAtLyogR2V0IHZhbGlkIHdvcmtxdWV1ZSBpdGVtIGFuZCByZXR1cm4gaXQg YmFjayB0byBvZmZzZXQgKi8KPiAtc3RhdGljIGludCBndWNfZ2V0X3dvcmtxdWV1ZV9zcGFjZShz dHJ1Y3QgaTkxNV9ndWNfY2xpZW50ICpnYywgdTMyICpvZmZzZXQpCj4gK2ludCBpOTE1X2d1Y193 cV9jaGVja19zcGFjZShzdHJ1Y3QgaTkxNV9ndWNfY2xpZW50ICpnYykKPiAgIHsKPiAgIAlzdHJ1 Y3QgZ3VjX3Byb2Nlc3NfZGVzYyAqZGVzYzsKPiAgIAl2b2lkICpiYXNlOwo+ICAgCXUzMiBzaXpl ID0gc2l6ZW9mKHN0cnVjdCBndWNfd3FfaXRlbSk7Cj4gICAJaW50IHJldCA9IC1FVElNRURPVVQs IHRpbWVvdXRfY291bnRlciA9IDIwMDsKPgo+ICsJaWYgKCFnYykKPiArCQlyZXR1cm4gMDsKPiAr Cj4gKwkvKiBRdWlja2x5IHJldHVybiBpZiB3cSBzcGFjZSBpcyBhdmFpbGFibGUgc2luY2UgbGFz dCB0aW1lIHdlIGNhY2hlIHRoZQo+ICsJICogaGVhZCBwb3NpdGlvbi4gKi8KPiArCWlmIChDSVJD X1NQQUNFKGdjLT53cV90YWlsLCBnYy0+d3FfaGVhZCwgZ2MtPndxX3NpemUpID49IHNpemUpCj4g KwkJcmV0dXJuIDA7Cj4gKwo+ICAgCWJhc2UgPSBrbWFwX2F0b21pYyhpOTE1X2dlbV9vYmplY3Rf Z2V0X3BhZ2UoZ2MtPmNsaWVudF9vYmosIDApKTsKPiAgIAlkZXNjID0gYmFzZSArIGdjLT5wcm9j X2Rlc2Nfb2Zmc2V0Owo+Cj4gICAJd2hpbGUgKHRpbWVvdXRfY291bnRlci0tID4gMCkgewo+IC0J CWlmIChDSVJDX1NQQUNFKGdjLT53cV90YWlsLCBkZXNjLT5oZWFkLCBnYy0+d3Ffc2l6ZSkgPj0g c2l6ZSkgewo+IC0JCQkqb2Zmc2V0ID0gZ2MtPndxX3RhaWw7Cj4gKwkJZ2MtPndxX2hlYWQgPSBk ZXNjLT5oZWFkOwo+Cj4gLQkJCS8qIGFkdmFuY2UgdGhlIHRhaWwgZm9yIG5leHQgd29ya3F1ZXVl IGl0ZW0gKi8KPiAtCQkJZ2MtPndxX3RhaWwgKz0gc2l6ZTsKPiAtCQkJZ2MtPndxX3RhaWwgJj0g Z2MtPndxX3NpemUgLSAxOwo+IC0KPiAtCQkJLyogdGhpcyB3aWxsIGJyZWFrIHRoZSBsb29wICov Cj4gLQkJCXRpbWVvdXRfY291bnRlciA9IDA7Cj4gKwkJaWYgKENJUkNfU1BBQ0UoZ2MtPndxX3Rh aWwsIGdjLT53cV9oZWFkLCBnYy0+d3Ffc2l6ZSkgPj0gc2l6ZSkgewo+ICAgCQkJcmV0ID0gMDsK PiArCQkJYnJlYWs7Cj4gICAJCX0KPgo+ICAgCQlpZiAodGltZW91dF9jb3VudGVyKQo+IEBAIC01 MTEsMTIgKzUxNiwxNiBAQCBzdGF0aWMgaW50IGd1Y19hZGRfd29ya3F1ZXVlX2l0ZW0oc3RydWN0 IGk5MTVfZ3VjX2NsaWVudCAqZ2MsCj4gICAJZW51bSBpbnRlbF9yaW5nX2lkIHJpbmdfaWQgPSBy cS0+cmluZy0+aWQ7Cj4gICAJc3RydWN0IGd1Y193cV9pdGVtICp3cWk7Cj4gICAJdm9pZCAqYmFz ZTsKPiAtCXUzMiB0YWlsLCB3cV9sZW4sIHdxX29mZiA9IDA7Cj4gLQlpbnQgcmV0Owo+ICsJdTMy IHRhaWwsIHdxX2xlbiwgd3Ffb2ZmLCBzcGFjZTsKPiArCj4gKwlzcGFjZSA9IENJUkNfU1BBQ0Uo Z2MtPndxX3RhaWwsIGdjLT53cV9oZWFkLCBnYy0+d3Ffc2l6ZSk7Cj4gKwlpZiAoV0FSTl9PTihz cGFjZSA8IHNpemVvZihzdHJ1Y3QgZ3VjX3dxX2l0ZW0pKSkKPiArCQlyZXR1cm4gLUVOT1NQQzsg Lyogc2hvdWxkbid0IGhhcHBlbiAqLwo+Cj4gLQlyZXQgPSBndWNfZ2V0X3dvcmtxdWV1ZV9zcGFj ZShnYywgJndxX29mZik7Cj4gLQlpZiAocmV0KQo+IC0JCXJldHVybiByZXQ7Cj4gKwkvKiBwb3N0 aW5jcmVtZW50IFdRIHRhaWwgZm9yIG5leHQgdGltZSAqLwo+ICsJd3Ffb2ZmID0gZ2MtPndxX3Rh aWw7Cj4gKwlnYy0+d3FfdGFpbCArPSBzaXplb2Yoc3RydWN0IGd1Y193cV9pdGVtKTsKPiArCWdj LT53cV90YWlsICY9IGdjLT53cV9zaXplIC0gMTsKPgo+ICAgCS8qIEZvciBub3cgd29ya3F1ZXVl IGl0ZW0gaXMgNCBEV3M7IHdvcmtxdWV1ZSBidWZmZXIgaXMgMiBwYWdlcy4gU28gd2UKPiAgIAkg KiBzaG91bGQgbm90IGhhdmUgdGhlIGNhc2Ugd2hlcmUgc3RydWN0dXJlIHdxaSBpcyBhY3Jvc3Mg cGFnZSwgbmVpdGhlcgo+IGRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9n dWMuaCBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2d1Yy5oCj4gaW5kZXggMGUwNDhiZi4u NWNmNTU1ZCAxMDA2NDQKPiAtLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9ndWMuaAo+ ICsrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2d1Yy5oCj4gQEAgLTQzLDYgKzQzLDcg QEAgc3RydWN0IGk5MTVfZ3VjX2NsaWVudCB7Cj4gICAJdWludDMyX3Qgd3Ffb2Zmc2V0Owo+ICAg CXVpbnQzMl90IHdxX3NpemU7Cj4gICAJdWludDMyX3Qgd3FfdGFpbDsKPiArCXVpbnQzMl90IHdx X2hlYWQ7Cj4KPiAgIAkvKiBHdUMgc3VibWlzc2lvbiBzdGF0aXN0aWNzICYgc3RhdHVzICovCj4g ICAJdWludDY0X3Qgc3VibWlzc2lvbnNbSTkxNV9OVU1fUklOR1NdOwo+IEBAIC0xMjMsNSArMTI0 LDYgQEAgaW50IGk5MTVfZ3VjX3N1Ym1pdChzdHJ1Y3QgaTkxNV9ndWNfY2xpZW50ICpjbGllbnQs Cj4gICAJCSAgICBzdHJ1Y3QgZHJtX2k5MTVfZ2VtX3JlcXVlc3QgKnJxKTsKPiAgIHZvaWQgaTkx NV9ndWNfc3VibWlzc2lvbl9kaXNhYmxlKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpOwo+ICAgdm9p ZCBpOTE1X2d1Y19zdWJtaXNzaW9uX2Zpbmkoc3RydWN0IGRybV9kZXZpY2UgKmRldik7Cj4gK2lu dCBpOTE1X2d1Y193cV9jaGVja19zcGFjZShzdHJ1Y3QgaTkxNV9ndWNfY2xpZW50ICpjbGllbnQp Owo+Cj4gICAjZW5kaWYKPiBkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxf bHJjLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9scmMuYwo+IGluZGV4IDI3MmYzNmYu LmNkMjMyZDIgMTAwNjQ0Cj4gLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfbHJjLmMK PiArKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9scmMuYwo+IEBAIC02NjcsNiArNjY3 LDE5IEBAIGludCBpbnRlbF9sb2dpY2FsX3JpbmdfYWxsb2NfcmVxdWVzdF9leHRyYXMoc3RydWN0 IGRybV9pOTE1X2dlbV9yZXF1ZXN0ICpyZXF1ZXN0Cj4gICAJCQlyZXR1cm4gcmV0Owo+ICAgCX0K Pgo+ICsJaWYgKGk5MTUuZW5hYmxlX2d1Y19zdWJtaXNzaW9uKSB7Cj4gKwkJLyoKPiArCQkgKiBD aGVjayB0aGF0IHRoZSBHdUMgaGFzIHNwYWNlIGZvciB0aGUgcmVxdWVzdCBiZWZvcmUKPiArCQkg KiBnb2luZyBhbnkgZnVydGhlciwgYXMgdGhlIGk5MTVfYWRkX3JlcXVlc3QoKSBjYWxsCj4gKwkJ ICogbGF0ZXIgb24gbXVzdG4ndCBmYWlsIC4uLgo+ICsJCSAqLwo+ICsJCXN0cnVjdCBpbnRlbF9n dWMgKmd1YyA9ICZyZXF1ZXN0LT5pOTE1LT5ndWM7Cj4gKwo+ICsJCXJldCA9IGk5MTVfZ3VjX3dx X2NoZWNrX3NwYWNlKGd1Yy0+ZXhlY2J1Zl9jbGllbnQpOwo+ICsJCWlmIChyZXQpCj4gKwkJCXJl dHVybiByZXQ7Cj4gKwl9Cj4gKwo+ICAgCXJldHVybiAwOwo+ICAgfQo+Cj4KCl9fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCkludGVsLWdmeCBtYWlsaW5nIGxp c3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwOi8vbGlzdHMuZnJlZWRlc2t0 b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4Cg==