From mboxrd@z Thu Jan 1 00:00:00 1970 From: Yu Dai Subject: Re: [PATCH v2] drm/i915/guc: Move GuC wq_reserve_space to alloc_request_extras Date: Thu, 10 Dec 2015 16:22:51 -0800 Message-ID: <566A175B.9040501@intel.com> References: <1449623090-1461-1-git-send-email-yu.dai@intel.com> <1449687054-16903-1-git-send-email-yu.dai@intel.com> <5669B2F4.4030904@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8"; Format="flowed" Content-Transfer-Encoding: base64 Return-path: Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by gabe.freedesktop.org (Postfix) with ESMTP id 1FA9D6ED0D for ; Thu, 10 Dec 2015 16:25:23 -0800 (PST) In-Reply-To: <5669B2F4.4030904@intel.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" To: Dave Gordon , intel-gfx@lists.freedesktop.org List-Id: intel-gfx@lists.freedesktop.org CgpPbiAxMi8xMC8yMDE1IDA5OjE0IEFNLCBEYXZlIEdvcmRvbiB3cm90ZToKPiBPbiAwOS8xMi8x NSAxODo1MCwgeXUuZGFpQGludGVsLmNvbSB3cm90ZToKPiA+IEZyb206IEFsZXggRGFpIDx5dS5k YWlAaW50ZWwuY29tPgo+ID4KPiA+IFNwbGl0IEd1QyB3b3JrIHF1ZXVlIHNwYWNlIHJlc2VydmUg ZnJvbSBzdWJtaXNzaW9uIGFuZCBtb3ZlIGl0IHRvCj4gPiByaW5nX2FsbG9jX3JlcXVlc3RfZXh0 cmFzLiBUaGUgcmVhc29uIGlzIHRoYXQgZmFpbHVyZSBpbiBsYXRlcgo+ID4gaTkxNV9hZGRfcmVx dWVzdCgpIHdvbid0IGJlIGhhbmRsZWQuIEluIHRoZSBjYXNlIHRpbWVvdXQgaGFwcGVucywKPiA+ IGRyaXZlciBjYW4gcmV0dXJuIGVhcmx5IGluIG9yZGVyIHRvIGhhbmRsZSB0aGUgZXJyb3IuCj4g Pgo+ID4gdjE6IE1vdmUgd3FfcmVzZXJ2ZV9zcGFjZSB0byByaW5nX3Jlc2VydmVfc3BhY2UKPiA+ IHYyOiBNb3ZlIHdxX3Jlc2VydmVfc3BhY2UgdG8gYWxsb2NfcmVxdWVzdF9leHRyYXMgKENocmlz IFdpbHNvbikKPiA+Cj4gPiBTaWduZWQtb2ZmLWJ5OiBBbGV4IERhaSA8eXUuZGFpQGludGVsLmNv bT4KPiA+IC0tLQo+ID4gICBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2d1Y19zdWJtaXNzaW9u LmMgfCAyMSArKysrKysrKystLS0tLS0tLS0tLS0KPiA+ICAgZHJpdmVycy9ncHUvZHJtL2k5MTUv aW50ZWxfZ3VjLmggICAgICAgICAgIHwgIDEgKwo+ID4gICBkcml2ZXJzL2dwdS9kcm0vaTkxNS9p bnRlbF9scmMuYyAgICAgICAgICAgfCAgNiArKysrKysKPiA+ICAgMyBmaWxlcyBjaGFuZ2VkLCAx NiBpbnNlcnRpb25zKCspLCAxMiBkZWxldGlvbnMoLSkKPiA+Cj4gPiBkaWZmIC0tZ2l0IGEvZHJp dmVycy9ncHUvZHJtL2k5MTUvaTkxNV9ndWNfc3VibWlzc2lvbi5jIGIvZHJpdmVycy9ncHUvZHJt L2k5MTUvaTkxNV9ndWNfc3VibWlzc2lvbi5jCj4gPiBpbmRleCAyMjZlOWMwLi5mN2JkMDM4IDEw MDY0NAo+ID4gLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9ndWNfc3VibWlzc2lvbi5j Cj4gPiArKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2d1Y19zdWJtaXNzaW9uLmMKPiA+ IEBAIC00NzIsMjUgKzQ3MiwyMSBAQCBzdGF0aWMgdm9pZCBndWNfZmluaV9jdHhfZGVzYyhzdHJ1 Y3QgaW50ZWxfZ3VjICpndWMsCj4gPiAgIAkJCSAgICAgc2l6ZW9mKGRlc2MpICogY2xpZW50LT5j dHhfaW5kZXgpOwo+ID4gICB9Cj4gPgo+ID4gLS8qIEdldCB2YWxpZCB3b3JrcXVldWUgaXRlbSBh bmQgcmV0dXJuIGl0IGJhY2sgdG8gb2Zmc2V0ICovCj4gPiAtc3RhdGljIGludCBndWNfZ2V0X3dv cmtxdWV1ZV9zcGFjZShzdHJ1Y3QgaTkxNV9ndWNfY2xpZW50ICpnYywgdTMyICpvZmZzZXQpCj4g PiAraW50IGk5MTVfZ3VjX3dxX3Jlc2VydmVfc3BhY2Uoc3RydWN0IGk5MTVfZ3VjX2NsaWVudCAq Z2MpCj4KPiBJIHRoaW5rIHRoZSBuYW1lIGlzIG1pc2xlYWRpbmcsIGJlY2F1c2Ugd2UgZG9uJ3Qg YWN0dWFsbHkgcmVzZXJ2ZQo+IGFueXRoaW5nIGhlcmUsIGp1c3QgY2hlY2sgdGhhdCB0aGVyZSBp cyBzb21lIGZyZWUgc3BhY2UgaW4gdGhlIFdRLgo+Cj4gKFdlIGNlcnRhaW5seSBkb24ndCBXQU5U IHRvIHJlc2VydmUgYW55dGhpbmcsIGJlY2F1c2UgdGhhdCB3b3VsZCBiZQo+IGRpZmZpY3VsdCB0 byBjbGVhbiB1cCBpbiB0aGUgZXZlbnQgb2Ygc3VibWlzc2lvbiBmYWlsdXJlIGZvciBhbnkgb3Ro ZXIKPiByZWFzb24uIFNvIEkgdGhpbmsgaXQncyBvbmx5IHRoZSBuYW1lIG5lZWRzIGNoYW5naW5n LiBBbHRob3VnaCAuLi4KCkkgd2FzIHRyeWluZyB0byB1c2Ugc2ltaWxhciBuYW1lIGFzIHJpbmdf cmVzZXJ2ZV9zcGFjZS4gSXQgZm9sbG93cyB0aGUgCnNhbWUgcGF0dGVybiBhcyBmaWxsaW5nIHJp bmcgYnVmZmVyIC0gcmVzZXJ2ZSwgZW1pdCBhbmQgYWR2YW5jZS4gVGhlIApvbmx5IGRpZmZlcmVu Y2UgaXMgaXQgcmVzZXJ2ZXMgNCBkd29yZHMgKG9yIGNoZWNrcyBzcGFjZSkgcmF0aGVyIHRoYW4g CnZhcmlvdXMgc2l6ZSBvZiBieXRlcyBmb3IgcmluZyBidWZmZXIgY2FzZS4gTWF5YmUgdXNpbmcg J2NoZWNrJyBpcyAKYmV0dGVyIGZvciB0aGlzIGNhc2UgYmVjYXVzZSA0IGR3b3JkcyBpbiB3cSBp cyB3aGF0IHdlIG5lZWQgZm9yIApzdWJtaXNzaW9uIHZpYSBHdUMuCj4gPiAgIHsKPiA+ICAgCXN0 cnVjdCBndWNfcHJvY2Vzc19kZXNjICpkZXNjOwo+ID4gICAJdm9pZCAqYmFzZTsKPiA+ICAgCXUz MiBzaXplID0gc2l6ZW9mKHN0cnVjdCBndWNfd3FfaXRlbSk7Cj4gPiAgIAlpbnQgcmV0ID0gLUVU SU1FRE9VVCwgdGltZW91dF9jb3VudGVyID0gMjAwOwo+ID4KPiA+ICsJaWYgKCFnYykKPiA+ICsJ CXJldHVybiAwOwo+ID4gKwo+ID4gICAJYmFzZSA9IGttYXBfYXRvbWljKGk5MTVfZ2VtX29iamVj dF9nZXRfcGFnZShnYy0+Y2xpZW50X29iaiwgMCkpOwo+ID4gICAJZGVzYyA9IGJhc2UgKyBnYy0+ cHJvY19kZXNjX29mZnNldDsKPiA+Cj4gPiAgIAl3aGlsZSAodGltZW91dF9jb3VudGVyLS0gPiAw KSB7Cj4gPiAgIAkJaWYgKENJUkNfU1BBQ0UoZ2MtPndxX3RhaWwsIGRlc2MtPmhlYWQsIGdjLT53 cV9zaXplKSA+PSBzaXplKSB7Cj4KPiAuLi4gYXMgYW4gYWx0ZXJuYXRpdmUgc3RyYXRlZ3ksIHdl IGNvdWxkIGNhY2hlIHRoZSBjYWxjdWxhdGVkIGZyZWVzcGFjZQo+IGluIHRoZSBjbGllbnQgc3Ry dWN0dXJlOyB0aGVuIGlmIHdlIGFscmVhZHkga25vdyB0aGVyZSdzIGF0IGxlYXN0IDEgc2xvdAo+ IGZyZWUgZnJvbSBsYXN0IHRpbWUgd2UgY2hlY2tlZCwgd2UgY291bGQgdGhlbiBqdXN0IGRlY3Jl bWVudCB0aGUgY2FjaGVkCj4gdmFsdWUgYW5kIGF2b2lkIHRoZSBrbWFwK3NwaW53YWl0IG92ZXJo ZWFkLiBPbmx5IHdoZW4gd2UgcmVhY2ggMCB3b3VsZAo+IHdlIGhhdmUgdG8gZ28gdGhyb3VnaCB0 aGlzIGNvZGUgdG8gcmVmcmVzaCBvdXIgdmlldyBvZiBkZXNjLT5oZWFkIGFuZAo+IHJlY2FsY3Vs YXRlIHRoZSBhY3R1YWwgY3VycmVudCBmcmVlc3BhY2UuIFtOQjogY2xlYXIgY2FjaGVkIHZhbHVl IG9uIHJlc2V0P10KPgo+IERvZXMgdGhhdCBzb3VuZCBsaWtlIGEgdXNlZnVsIG9wdGltaXNhdGlv bj8KCkkgdGhpbmsgaXQgaXMgYSBnb29kIGlkZWEuCj4gPiAtCQkJKm9mZnNldCA9IGdjLT53cV90 YWlsOwo+ID4gLQo+ID4gLQkJCS8qIGFkdmFuY2UgdGhlIHRhaWwgZm9yIG5leHQgd29ya3F1ZXVl IGl0ZW0gKi8KPiA+IC0JCQlnYy0+d3FfdGFpbCArPSBzaXplOwo+ID4gLQkJCWdjLT53cV90YWls ICY9IGdjLT53cV9zaXplIC0gMTsKPiA+IC0KPiA+ICAgCQkJLyogdGhpcyB3aWxsIGJyZWFrIHRo ZSBsb29wICovCj4gPiAgIAkJCXRpbWVvdXRfY291bnRlciA9IDA7Cj4gPiAgIAkJCXJldCA9IDA7 Cj4gPiBAQCAtNTEyLDExICs1MDgsMTIgQEAgc3RhdGljIGludCBndWNfYWRkX3dvcmtxdWV1ZV9p dGVtKHN0cnVjdCBpOTE1X2d1Y19jbGllbnQgKmdjLAo+ID4gICAJc3RydWN0IGd1Y193cV9pdGVt ICp3cWk7Cj4gPiAgIAl2b2lkICpiYXNlOwo+ID4gICAJdTMyIHRhaWwsIHdxX2xlbiwgd3Ffb2Zm ID0gMDsKPiA+IC0JaW50IHJldDsKPiA+Cj4gPiAtCXJldCA9IGd1Y19nZXRfd29ya3F1ZXVlX3Nw YWNlKGdjLCAmd3Ffb2ZmKTsKPiA+IC0JaWYgKHJldCkKPiA+IC0JCXJldHVybiByZXQ7Cj4gPiAr CXdxX29mZiA9IGdjLT53cV90YWlsOwo+ID4gKwo+ID4gKwkvKiBhZHZhbmNlIHRoZSB0YWlsIGZv ciBuZXh0IHdvcmtxdWV1ZSBpdGVtICovCj4gPiArCWdjLT53cV90YWlsICs9IHNpemVvZihzdHJ1 Y3QgZ3VjX3dxX2l0ZW0pOwo+ID4gKwlnYy0+d3FfdGFpbCAmPSBnYy0+d3Ffc2l6ZSAtIDE7Cj4K PiBJIHdhcyBhIGJpdCB1bmhhcHB5IGFib3V0IHRoaXMgY29kZSBqdXN0IGFzc3VtaW5nIHRoYXQg dGhlcmUgKm11c3QqIGJlCj4gc3BhY2UgKGJlY2F1c2Ugd2UgS05PVyB3ZSd2ZSBjaGVja2VkIGFi b3ZlKSAtLSB1bmxlc3Mgc29tZW9uZSB2aW9sYXRlZAo+IHRoZSBwcm9wZXIgY2FsbGluZyBzZXF1 ZW5jZSAoVERSPykuIE9UT0gsIGl0IHdvdWxkIGJlIHRvbyBleHBlbnNpdmUgdG8KPiBnbyB0aHJv dWdoIHRoZSBtYXAtYW5kLWNhbGN1bGF0ZSBjb2RlIGFsbCBvdmVyIGFnYWluIGp1c3QgdG8gY2F0 Y2ggYW4KPiB1bmxpa2VseSBzY2VuYXJpby4gQnV0LCBpZiB3ZSBjYWNoZSB0aGUgbGFzdC1jYWxj dWxhdGVkIHZhbHVlIGFzIGFib3ZlLAo+IHRoZW4gdGhlIGNoZWNrIGNvdWxkIGJlIGNoZWFwIDop IEZvciBleGFtcGxlLCBqdXN0IGFkZCBhIHByZV9jaGVja2VkCj4gc2l6ZSBmaWVsZCB0aGF0J3Mg c2V0IGJ5IHRoZSBwcmUtY2hlY2sgYW5kIHRoZW4gY2hlY2tlZCBhbmQgZGVjcmVtZW50ZWQKPiBv biBzdWJtaXNzaW9uOyB0aGVyZSBzaG91bGRuJ3QgYmUgbW9yZSB0aGFuIG9uZSBzdWJtaXNzaW9u IGluIHByb2dyZXNzCj4gYXQgYSB0aW1lLCBiZWNhdXNlIGRldi0+c3RydWN0X211dGV4IGlzIGhl bGQgYWNyb3NzIHRoZSB3aG9sZSBzZXF1ZW5jZQo+IChidXQgaXQncyBub3QgYW4gZXJyb3IgdG8g c2VlIHR3byBwcmUtY2hlY2tzIGluIGEgcm93LCBiZWNhdXNlIGEgcmVxdWVzdAo+IGNhbiBiZSBh YmFuZG9uZWQgcGFydHdheSkuCgpJIGRvbid0IHVuZGVyc3RhbmQgdGhlIGNvbmNlcm5zIGhlcmUu IEFzIEkgc2FpZCBhYm92ZSwgZmlsbGluZyBHdUMgV1EgaXMgCnNhbWUgYXMgZmlsbGluZyByaW5n IGJ1ZmZlciAtIHJlc2VydmUgKGNoZWNrKSwgZW1pdCBhbmQgYWR2YW5jZS4gVGhlc2UgCnR3byBs aW5lcyBhcmUgR3VDIHZlcnNpb24gb2YgaW50ZWxfbG9naWNhbF9yaW5nX2VtaXQgYW5kIAppbnRl bF9sb2dpY2FsX3JpbmdfYWR2YW5jZS4gTWF5YmUgaWYgSSBtb3ZlIHRoZXNlIHR3byBsaW5lcyB0 byBlbmQgb2YgCmd1Y19hZGRfd29ya3F1ZXVlX2l0ZW0sIHBlb3BsZSBjYW4gdW5kZXJzdGFuZCBp dCBtb3JlIGVhc2lseS4KCj4gPiAgIAkvKiBGb3Igbm93IHdvcmtxdWV1ZSBpdGVtIGlzIDQgRFdz OyB3b3JrcXVldWUgYnVmZmVyIGlzIDIgcGFnZXMuIFNvIHdlCj4gPiAgIAkgKiBzaG91bGQgbm90 IGhhdmUgdGhlIGNhc2Ugd2hlcmUgc3RydWN0dXJlIHdxaSBpcyBhY3Jvc3MgcGFnZSwgbmVpdGhl cgo+ID4gZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2d1Yy5oIGIvZHJp dmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZ3VjLmgKPiA+IGluZGV4IDBlMDQ4YmYuLjU5YzhlMjEg MTAwNjQ0Cj4gPiAtLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9ndWMuaAo+ID4gKysr IGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZ3VjLmgKPiA+IEBAIC0xMjMsNSArMTIzLDYg QEAgaW50IGk5MTVfZ3VjX3N1Ym1pdChzdHJ1Y3QgaTkxNV9ndWNfY2xpZW50ICpjbGllbnQsCj4g PiAgIAkJICAgIHN0cnVjdCBkcm1faTkxNV9nZW1fcmVxdWVzdCAqcnEpOwo+ID4gICB2b2lkIGk5 MTVfZ3VjX3N1Ym1pc3Npb25fZGlzYWJsZShzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KTsKPiA+ICAg dm9pZCBpOTE1X2d1Y19zdWJtaXNzaW9uX2Zpbmkoc3RydWN0IGRybV9kZXZpY2UgKmRldik7Cj4g PiAraW50IGk5MTVfZ3VjX3dxX3Jlc2VydmVfc3BhY2Uoc3RydWN0IGk5MTVfZ3VjX2NsaWVudCAq Y2xpZW50KTsKPiA+Cj4gPiAgICNlbmRpZgo+ID4gZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2Ry bS9pOTE1L2ludGVsX2xyYy5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfbHJjLmMKPiA+ IGluZGV4IGY5NmZiNTEuLjdkNTNkMjcgMTAwNjQ0Cj4gPiAtLS0gYS9kcml2ZXJzL2dwdS9kcm0v aTkxNS9pbnRlbF9scmMuYwo+ID4gKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfbHJj LmMKPiA+IEBAIC02NjcsNiArNjY3LDEyIEBAIGludCBpbnRlbF9sb2dpY2FsX3JpbmdfYWxsb2Nf cmVxdWVzdF9leHRyYXMoc3RydWN0IGRybV9pOTE1X2dlbV9yZXF1ZXN0ICpyZXF1ZXN0Cj4gPiAg IAkJCXJldHVybiByZXQ7Cj4gPiAgIAl9Cj4gPgo+ID4gKwkvKiBSZXNlcnZlIEd1QyBXUSBzcGFj ZSBoZXJlIChvbmUgcmVxdWVzdCBuZWVkcyBvbmUgV1EgaXRlbSkgYmVjYXVzZQo+ID4gKwkgKiB0 aGUgbGF0ZXIgaTkxNV9hZGRfcmVxdWVzdCgpIGNhbGwgY2FuJ3QgZmFpbC4gKi8KPiA+ICsJcmV0 ID0gaTkxNV9ndWNfd3FfcmVzZXJ2ZV9zcGFjZShyZXF1ZXN0LT5pOTE1LT5ndWMuZXhlY2J1Zl9j bGllbnQpOwo+ID4gKwlpZiAocmV0KQo+ID4gKwkJcmV0dXJuIHJldDsKPiA+ICsKPiA+ICAgCXJl dHVybiAwOwo+ID4gICB9Cj4KPiBXb3J0aCBjaGVja2luZyBmb3IgR3VDIHN1Ym1pc3Npb24gYmVm b3JlIHRoYXQgY2FsbD8gTWF5YmUgbm90IC4uLgoKSXQgaXMgcHVyZWx5IGNvZGUgYWxpZ25tZW50 IGlzc3VlIGlmIEkgYWRkIGEgaWYoKSBibG9jay4gVGhlIApleGVjYnVmX2NsaWVudCBpcyB2YWxp ZCBvbmx5IHdoZW4gR3VDIHN1Ym1pc3Npb24gaXMgZW5hYmxlZCBhbmQgdGhlIApjaGVjayBpcyBk b25lIGluc2lkZSB0aGF0IGZ1bmN0aW9uIGNhbGwuCgpBbGV4Cl9fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fCkludGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwt Z2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21h aWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4Cg==