From mboxrd@z Thu Jan 1 00:00:00 1970 From: Dave Gordon Subject: Re: [PATCH v3] drm/i915/guc: Move GuC wq_check_space to alloc_request_extras Date: Tue, 15 Dec 2015 15:45:38 +0000 Message-ID: <567035A2.9000200@intel.com> References: <1449623090-1461-1-git-send-email-yu.dai@intel.com> <1449796655-21384-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 mga03.intel.com (mga03.intel.com [134.134.136.65]) by gabe.freedesktop.org (Postfix) with ESMTP id 56DAA6E2F5 for ; Tue, 15 Dec 2015 07:45:53 -0800 (PST) In-Reply-To: <1449796655-21384-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 T24gMTEvMTIvMTUgMDE6MTcsIHl1LmRhaUBpbnRlbC5jb20gd3JvdGU6Cj4gRnJvbTogQWxleCBE YWkgPHl1LmRhaUBpbnRlbC5jb20+Cj4KPiBTcGxpdCBHdUMgd29yayBxdWV1ZSBzcGFjZSBjaGVj a2luZyBmcm9tIHN1Ym1pc3Npb24gYW5kIG1vdmUgaXQgdG8KPiByaW5nX2FsbG9jX3JlcXVlc3Rf ZXh0cmFzLiBUaGUgcmVhc29uIGlzIHRoYXQgZmFpbHVyZSBpbiBsYXRlcgo+IGk5MTVfYWRkX3Jl cXVlc3QoKSB3b24ndCBiZSBoYW5kbGVkLiBJbiB0aGUgY2FzZSB0aW1lb3V0IGhhcHBlbnMsCj4g ZHJpdmVyIGNhbiByZXR1cm4gZWFybHkgaW4gb3JkZXIgdG8gaGFuZGxlIHRoZSBlcnJvci4KPgo+ IHYxOiBNb3ZlIHdxX3Jlc2VydmVfc3BhY2UgdG8gcmluZ19yZXNlcnZlX3NwYWNlCj4gdjI6IE1v dmUgd3FfcmVzZXJ2ZV9zcGFjZSB0byBhbGxvY19yZXF1ZXN0X2V4dHJhcyAoQ2hyaXMgV2lsc29u KQo+IHYzOiBUaGUgd29yayBxdWV1ZSBoZWFkIHBvaW50ZXIgaXMgY2FjaGVkIGJ5IGRyaXZlciBu b3cuIFNvIHdlIGNhbgo+ICAgICAgcXVpY2tseSByZXR1cm4gaWYgc3BhY2UgaXMgYXZhaWxhYmxl Lgo+ICAgICAgcy9yZXNlcnZlL2NoZWNrL2cgKERhdmUgR29yZG9uKQo+Cj4gU2lnbmVkLW9mZi1i eTogQWxleCBEYWkgPHl1LmRhaUBpbnRlbC5jb20+Cj4gLS0tCj4gICBkcml2ZXJzL2dwdS9kcm0v aTkxNS9pOTE1X2d1Y19zdWJtaXNzaW9uLmMgfCAzNCArKysrKysrKysrKysrKysrKystLS0tLS0t LS0tLS0KPiAgIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2d1Yy5oICAgICAgICAgICB8ICAy ICsrCj4gICBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9scmMuYyAgICAgICAgICAgfCAgNiAr KysrKysKPiAgIDMgZmlsZXMgY2hhbmdlZCwgMjggaW5zZXJ0aW9ucygrKSwgMTQgZGVsZXRpb25z KC0pCj4KPiBkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9ndWNfc3VibWlz c2lvbi5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9ndWNfc3VibWlzc2lvbi5jCj4gaW5k ZXggMjI2ZTljMC4uY2I4ZTFmNzEgMTAwNjQ0Cj4gLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUv aTkxNV9ndWNfc3VibWlzc2lvbi5jCj4gKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9n dWNfc3VibWlzc2lvbi5jCj4gQEAgLTIwNyw2ICsyMDcsOSBAQCBzdGF0aWMgaW50IGd1Y19yaW5n X2Rvb3JiZWxsKHN0cnVjdCBpOTE1X2d1Y19jbGllbnQgKmdjKQo+ICAgCS8qIFVwZGF0ZSB0aGUg dGFpbCBzbyBpdCBpcyB2aXNpYmxlIHRvIEd1QyAqLwo+ICAgCWRlc2MtPnRhaWwgPSBnYy0+d3Ff dGFpbDsKPgo+ICsJLyogQ2FjaGUgdGhlIGhlYWQgd2hlcmUgR3VDIGlzIHByb2Nlc3NpbmcgKi8K PiArCWdjLT53cV9oZWFkID0gZGVzYy0+aGVhZDsKPiArCgpUaGlzIGNvdWxkIGJlIGF0IHRoZSBl bmQgb2YgdGhpcyBmdW5jdGlvbiwgdGh1czoKCgkJLyogdXBkYXRlIHRoZSBjb29raWUgdG8gbmV3 bHkgcmVhZCBjb29raWUgZnJvbSBHdUMgKi8KCQlkYl9jbXAuY29va2llID0gZGJfcmV0LmNvb2tp ZTsKCQlkYl9leGMuY29va2llID0gZGJfcmV0LmNvb2tpZSArIDE7CgkJaWYgKGRiX2V4Yy5jb29r aWUgPT0gMCkKCQkJZGJfZXhjLmNvb2tpZSA9IDE7Cgl9CgorCS8qIEZpbmFsbHksIHVwZGF0ZSB0 aGUgY2FjaGVkIGNvcHkgb2YgdGhlIEd1QydzIFdRIGhlYWQgKi8KKwlnYy0+d3FfaGVhZCA9IGRl c2MtPmhlYWQ7CisKCWt1bm1hcF9hdG9taWMoYmFzZSk7CglyZXR1cm4gcmV0Owp9Cgp3aGljaCBt aWdodCBpbmNyZWFzZSB0aGUgY2hhbmNlIHRoYXQgd2Ugd2lsbCBnZXQgYW4gdXBkYXRlZCB2YWx1 ZSBhbmQgCnRodXMgYXZvaWQgaGF2aW5nIHRvIHNwaW53YWl0IG9uIHRoZSBuZXh0IGNoZWNrKCku Cgo+ICAgCS8qIGN1cnJlbnQgY29va2llICovCj4gICAJZGJfY21wLmRiX3N0YXR1cyA9IEdVQ19E T09SQkVMTF9FTkFCTEVEOwo+ICAgCWRiX2NtcC5jb29raWUgPSBnYy0+Y29va2llOwo+IEBAIC00 NzIsMjggKzQ3NSwzMCBAQCBzdGF0aWMgdm9pZCBndWNfZmluaV9jdHhfZGVzYyhzdHJ1Y3QgaW50 ZWxfZ3VjICpndWMsCj4gICAJCQkgICAgIHNpemVvZihkZXNjKSAqIGNsaWVudC0+Y3R4X2luZGV4 KTsKPiAgIH0KPgo+IC0vKiBHZXQgdmFsaWQgd29ya3F1ZXVlIGl0ZW0gYW5kIHJldHVybiBpdCBi YWNrIHRvIG9mZnNldCAqLwo+IC1zdGF0aWMgaW50IGd1Y19nZXRfd29ya3F1ZXVlX3NwYWNlKHN0 cnVjdCBpOTE1X2d1Y19jbGllbnQgKmdjLCB1MzIgKm9mZnNldCkKPiAraW50IGk5MTVfZ3VjX3dx X2NoZWNrX3NwYWNlKHN0cnVjdCBpOTE1X2d1Y19jbGllbnQgKmdjKQo+ICAgewo+ICAgCXN0cnVj dCBndWNfcHJvY2Vzc19kZXNjICpkZXNjOwo+ICAgCXZvaWQgKmJhc2U7Cj4gICAJdTMyIHNpemUg PSBzaXplb2Yoc3RydWN0IGd1Y193cV9pdGVtKTsKPiAgIAlpbnQgcmV0ID0gLUVUSU1FRE9VVCwg dGltZW91dF9jb3VudGVyID0gMjAwOwo+Cj4gKwlpZiAoIWdjKQo+ICsJCXJldHVybiAwOwo+ICsK PiArCS8qIFF1aWNrbHkgcmV0dXJuIGlmIHdxIHNwYWNlIGlzIGF2YWlsYWJsZSBzaW5jZSBsYXN0 IHRpbWUgd2UgY2FjaGUgdGhlCj4gKwkgKiBoZWFkIHBvc2l0aW9uLiAqLwo+ICsJaWYgKENJUkNf U1BBQ0UoZ2MtPndxX3RhaWwsIGdjLT53cV9oZWFkLCBnYy0+d3Ffc2l6ZSkgPj0gc2l6ZSkKPiAr CQlyZXR1cm4gMDsKPiArCj4gICAJYmFzZSA9IGttYXBfYXRvbWljKGk5MTVfZ2VtX29iamVjdF9n ZXRfcGFnZShnYy0+Y2xpZW50X29iaiwgMCkpOwo+ICAgCWRlc2MgPSBiYXNlICsgZ2MtPnByb2Nf ZGVzY19vZmZzZXQ7Cj4KPiAgIAl3aGlsZSAodGltZW91dF9jb3VudGVyLS0gPiAwKSB7Cj4gLQkJ aWYgKENJUkNfU1BBQ0UoZ2MtPndxX3RhaWwsIGRlc2MtPmhlYWQsIGdjLT53cV9zaXplKSA+PSBz aXplKSB7Cj4gLQkJCSpvZmZzZXQgPSBnYy0+d3FfdGFpbDsKPiArCQlnYy0+d3FfaGVhZCA9IGRl c2MtPmhlYWQ7Cj4KPiAtCQkJLyogYWR2YW5jZSB0aGUgdGFpbCBmb3IgbmV4dCB3b3JrcXVldWUg aXRlbSAqLwo+IC0JCQlnYy0+d3FfdGFpbCArPSBzaXplOwo+IC0JCQlnYy0+d3FfdGFpbCAmPSBn Yy0+d3Ffc2l6ZSAtIDE7Cj4gLQo+IC0JCQkvKiB0aGlzIHdpbGwgYnJlYWsgdGhlIGxvb3AgKi8K PiAtCQkJdGltZW91dF9jb3VudGVyID0gMDsKPiArCQlpZiAoQ0lSQ19TUEFDRShnYy0+d3FfdGFp bCwgZ2MtPndxX2hlYWQsIGdjLT53cV9zaXplKSA+PSBzaXplKSB7Cj4gICAJCQlyZXQgPSAwOwo+ ICsJCQlicmVhazsKPiAgIAkJfQo+Cj4gICAJCWlmICh0aW1lb3V0X2NvdW50ZXIpCj4gQEAgLTUx MiwxMSArNTE3LDggQEAgc3RhdGljIGludCBndWNfYWRkX3dvcmtxdWV1ZV9pdGVtKHN0cnVjdCBp OTE1X2d1Y19jbGllbnQgKmdjLAo+ICAgCXN0cnVjdCBndWNfd3FfaXRlbSAqd3FpOwo+ICAgCXZv aWQgKmJhc2U7Cj4gICAJdTMyIHRhaWwsIHdxX2xlbiwgd3Ffb2ZmID0gMDsKPiAtCWludCByZXQ7 Cj4KPiAtCXJldCA9IGd1Y19nZXRfd29ya3F1ZXVlX3NwYWNlKGdjLCAmd3Ffb2ZmKTsKPiAtCWlm IChyZXQpCj4gLQkJcmV0dXJuIHJldDsKPiArCXdxX29mZiA9IGdjLT53cV90YWlsOwoKQ29udmVy c2VseSwgSSdkIHByZWZlciB0aGUgdXBkYXRlcyBiZWxvdyB0byBiZSBoZXJlIGluc3RlYWQ7IGFs c28gdGhlIApjaGVjayB0aGF0IEkgbWVudGlvbmVkIGxhc3QgdGltZToKCisJdTMyIHNwYWNlID0g Q0lSQ19TUEFDRShnYy0+d3FfdGFpbCwgZ2MtPndxX2hlYWQsIGdjLT53cV9zaXplKTsKKwlpZiAo V0FSTl9PTihzcGFjZSA8IHNpemVvZihzdHJ1Y3QgZ3VjX3dxX2l0ZW0pKQorCQlyZXR1cm4gLUVO T1NQQzsJCS8qIHNob3VsZG4ndCBoYXBwZW4JKi8KKworCS8qIHBvc3RpbmNyZW1lbnQgV1EgdGFp bCBmb3IgbmV4dCB0aW1lICovCisJd3Ffb2ZmID0gZ2MtPndxX3RhaWw7CisJZ2MtPndxX3RhaWwg Kz0gc2l6ZW9mKHN0cnVjdCBndWNfd3FfaXRlbSk7CisJZ2MtPndxX3RhaWwgJj0gZ2MtPndxX3Np emUgLSAxOwoKPgo+ICAgCS8qIEZvciBub3cgd29ya3F1ZXVlIGl0ZW0gaXMgNCBEV3M7IHdvcmtx dWV1ZSBidWZmZXIgaXMgMiBwYWdlcy4gU28gd2UKPiAgIAkgKiBzaG91bGQgbm90IGhhdmUgdGhl IGNhc2Ugd2hlcmUgc3RydWN0dXJlIHdxaSBpcyBhY3Jvc3MgcGFnZSwgbmVpdGhlcgo+IEBAIC01 NTEsNiArNTUzLDEwIEBAIHN0YXRpYyBpbnQgZ3VjX2FkZF93b3JrcXVldWVfaXRlbShzdHJ1Y3Qg aTkxNV9ndWNfY2xpZW50ICpnYywKPgo+ICAgCWt1bm1hcF9hdG9taWMoYmFzZSk7Cj4KPiArCS8q IGFkdmFuY2UgdGhlIHRhaWwgZm9yIG5leHQgd29ya3F1ZXVlIGl0ZW0gKi8KPiArCWdjLT53cV90 YWlsICs9IHNpemVvZihzdHJ1Y3QgZ3VjX3dxX2l0ZW0pOwo+ICsJZ2MtPndxX3RhaWwgJj0gZ2Mt PndxX3NpemUgLSAxOwoKKG1vdmVkIHRvIGFib3ZlKQoKPiArCj4gICAJcmV0dXJuIDA7Cj4gICB9 Cj4KPiBkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZ3VjLmggYi9kcml2 ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9ndWMuaAo+IGluZGV4IDBlMDQ4YmYuLjVjZjU1NWQgMTAw NjQ0Cj4gLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZ3VjLmgKPiArKysgYi9kcml2 ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9ndWMuaAo+IEBAIC00Myw2ICs0Myw3IEBAIHN0cnVjdCBp OTE1X2d1Y19jbGllbnQgewo+ICAgCXVpbnQzMl90IHdxX29mZnNldDsKPiAgIAl1aW50MzJfdCB3 cV9zaXplOwo+ICAgCXVpbnQzMl90IHdxX3RhaWw7Cj4gKwl1aW50MzJfdCB3cV9oZWFkOwo+Cj4g ICAJLyogR3VDIHN1Ym1pc3Npb24gc3RhdGlzdGljcyAmIHN0YXR1cyAqLwo+ICAgCXVpbnQ2NF90 IHN1Ym1pc3Npb25zW0k5MTVfTlVNX1JJTkdTXTsKPiBAQCAtMTIzLDUgKzEyNCw2IEBAIGludCBp OTE1X2d1Y19zdWJtaXQoc3RydWN0IGk5MTVfZ3VjX2NsaWVudCAqY2xpZW50LAo+ICAgCQkgICAg c3RydWN0IGRybV9pOTE1X2dlbV9yZXF1ZXN0ICpycSk7Cj4gICB2b2lkIGk5MTVfZ3VjX3N1Ym1p c3Npb25fZGlzYWJsZShzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KTsKPiAgIHZvaWQgaTkxNV9ndWNf c3VibWlzc2lvbl9maW5pKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpOwo+ICtpbnQgaTkxNV9ndWNf d3FfY2hlY2tfc3BhY2Uoc3RydWN0IGk5MTVfZ3VjX2NsaWVudCAqY2xpZW50KTsKPgo+ICAgI2Vu ZGlmCj4gZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2xyYy5jIGIvZHJp dmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfbHJjLmMKPiBpbmRleCBmOTZmYjUxLi45NjA1Y2U5IDEw MDY0NAo+IC0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2xyYy5jCj4gKysrIGIvZHJp dmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfbHJjLmMKPiBAQCAtNjY3LDYgKzY2NywxMiBAQCBpbnQg aW50ZWxfbG9naWNhbF9yaW5nX2FsbG9jX3JlcXVlc3RfZXh0cmFzKHN0cnVjdCBkcm1faTkxNV9n ZW1fcmVxdWVzdCAqcmVxdWVzdAo+ICAgCQkJcmV0dXJuIHJldDsKPiAgIAl9Cj4KPiArCS8qIFJl c2VydmUgR3VDIFdRIHNwYWNlIGhlcmUgKG9uZSByZXF1ZXN0IG5lZWRzIG9uZSBXUSBpdGVtKSBi ZWNhdXNlCj4gKwkgKiB0aGUgbGF0ZXIgaTkxNV9hZGRfcmVxdWVzdCgpIGNhbGwgY2FuJ3QgZmFp bC4gKi8KPiArCXJldCA9IGk5MTVfZ3VjX3dxX2NoZWNrX3NwYWNlKHJlcXVlc3QtPmk5MTUtPmd1 Yy5leGVjYnVmX2NsaWVudCk7Cj4gKwlpZiAocmV0KQo+ICsJCXJldHVybiByZXQ7Cj4gKwo+ICAg CXJldHVybiAwOwo+ICAgfQoKSXQgbG9va3Mgb2RkIHRvIGNhbGwgYSBHdUMtb25seSBmdW5jdGlv biByZWdhcmRsZXNzIG9mIHdoZXRoZXIgd2UncmUgCnVzaW5nIHRoZSBHdUMsIHNvOgoKKwlpZiAo aTkxNS5lbmFibGVfZ3VjX3N1Ym1pc3Npb24pIHsKKwkJLyoKKwkJICogQ2hlY2sgdGhhdCB0aGUg R3VDIGhhcyBzcGFjZSBmb3IgdGhlIHJlcXVlc3QgYmVmb3JlCisJCSAqIGdvaW5nIGFueSBmdXJ0 aGVyLCBhcyB0aGUgaTkxNV9hZGRfcmVxdWVzdCgpIGNhbGwKKwkJICogbGF0ZXIgb24gbXVzdG4n dCBmYWlsIC4uLgorCQkgKi8KKwkJc3RydWN0IGludGVsX2d1YyAqZ3VjID0gJnJlcXVlc3QtPmk5 MTUtPmd1YzsKKworCQlyZXQgPSBpOTE1X2d1Y193cV9jaGVja19zcGFjZShndWMtPmV4ZWNidWZf Y2xpZW50KTsKKwkJaWYgKHJldCkKKwkJCXJldHVybiByZXQ7CisJfQoKLkRhdmUuCl9fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCkludGVsLWdmeCBtYWlsaW5n IGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwOi8vbGlzdHMuZnJlZWRl c2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4Cg==