From mboxrd@z Thu Jan 1 00:00:00 1970 From: Dave Gordon Subject: Re: [PATCH v2] drm/i915/guc: Move GuC wq_reserve_space to alloc_request_extras Date: Thu, 10 Dec 2015 17:14:28 +0000 Message-ID: <5669B2F4.4030904@intel.com> References: <1449623090-1461-1-git-send-email-yu.dai@intel.com> <1449687054-16903-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 mga11.intel.com (mga11.intel.com [192.55.52.93]) by gabe.freedesktop.org (Postfix) with ESMTP id 0AACB7A14A for ; Thu, 10 Dec 2015 09:14:30 -0800 (PST) In-Reply-To: <1449687054-16903-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 T24gMDkvMTIvMTUgMTg6NTAsIHl1LmRhaUBpbnRlbC5jb20gd3JvdGU6Cj4gRnJvbTogQWxleCBE YWkgPHl1LmRhaUBpbnRlbC5jb20+Cj4KPiBTcGxpdCBHdUMgd29yayBxdWV1ZSBzcGFjZSByZXNl cnZlIGZyb20gc3VibWlzc2lvbiBhbmQgbW92ZSBpdCB0bwo+IHJpbmdfYWxsb2NfcmVxdWVzdF9l eHRyYXMuIFRoZSByZWFzb24gaXMgdGhhdCBmYWlsdXJlIGluIGxhdGVyCj4gaTkxNV9hZGRfcmVx dWVzdCgpIHdvbid0IGJlIGhhbmRsZWQuIEluIHRoZSBjYXNlIHRpbWVvdXQgaGFwcGVucywKPiBk cml2ZXIgY2FuIHJldHVybiBlYXJseSBpbiBvcmRlciB0byBoYW5kbGUgdGhlIGVycm9yLgo+Cj4g djE6IE1vdmUgd3FfcmVzZXJ2ZV9zcGFjZSB0byByaW5nX3Jlc2VydmVfc3BhY2UKPiB2MjogTW92 ZSB3cV9yZXNlcnZlX3NwYWNlIHRvIGFsbG9jX3JlcXVlc3RfZXh0cmFzIChDaHJpcyBXaWxzb24p Cj4KPiBTaWduZWQtb2ZmLWJ5OiBBbGV4IERhaSA8eXUuZGFpQGludGVsLmNvbT4KPiAtLS0KPiAg IGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ3VjX3N1Ym1pc3Npb24uYyB8IDIxICsrKysrKysr Ky0tLS0tLS0tLS0tLQo+ICAgZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZ3VjLmggICAgICAg ICAgIHwgIDEgKwo+ICAgZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfbHJjLmMgICAgICAgICAg IHwgIDYgKysrKysrCj4gICAzIGZpbGVzIGNoYW5nZWQsIDE2IGluc2VydGlvbnMoKyksIDEyIGRl bGV0aW9ucygtKQo+Cj4gZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ3Vj X3N1Ym1pc3Npb24uYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ3VjX3N1Ym1pc3Npb24u Ywo+IGluZGV4IDIyNmU5YzAuLmY3YmQwMzggMTAwNjQ0Cj4gLS0tIGEvZHJpdmVycy9ncHUvZHJt L2k5MTUvaTkxNV9ndWNfc3VibWlzc2lvbi5jCj4gKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUv aTkxNV9ndWNfc3VibWlzc2lvbi5jCj4gQEAgLTQ3MiwyNSArNDcyLDIxIEBAIHN0YXRpYyB2b2lk IGd1Y19maW5pX2N0eF9kZXNjKHN0cnVjdCBpbnRlbF9ndWMgKmd1YywKPiAgIAkJCSAgICAgc2l6 ZW9mKGRlc2MpICogY2xpZW50LT5jdHhfaW5kZXgpOwo+ICAgfQo+Cj4gLS8qIEdldCB2YWxpZCB3 b3JrcXVldWUgaXRlbSBhbmQgcmV0dXJuIGl0IGJhY2sgdG8gb2Zmc2V0ICovCj4gLXN0YXRpYyBp bnQgZ3VjX2dldF93b3JrcXVldWVfc3BhY2Uoc3RydWN0IGk5MTVfZ3VjX2NsaWVudCAqZ2MsIHUz MiAqb2Zmc2V0KQo+ICtpbnQgaTkxNV9ndWNfd3FfcmVzZXJ2ZV9zcGFjZShzdHJ1Y3QgaTkxNV9n dWNfY2xpZW50ICpnYykKCkkgdGhpbmsgdGhlIG5hbWUgaXMgbWlzbGVhZGluZywgYmVjYXVzZSB3 ZSBkb24ndCBhY3R1YWxseSByZXNlcnZlIAphbnl0aGluZyBoZXJlLCBqdXN0IGNoZWNrIHRoYXQg dGhlcmUgaXMgc29tZSBmcmVlIHNwYWNlIGluIHRoZSBXUS4KCihXZSBjZXJ0YWlubHkgZG9uJ3Qg V0FOVCB0byByZXNlcnZlIGFueXRoaW5nLCBiZWNhdXNlIHRoYXQgd291bGQgYmUgCmRpZmZpY3Vs dCB0byBjbGVhbiB1cCBpbiB0aGUgZXZlbnQgb2Ygc3VibWlzc2lvbiBmYWlsdXJlIGZvciBhbnkg b3RoZXIgCnJlYXNvbi4gU28gSSB0aGluayBpdCdzIG9ubHkgdGhlIG5hbWUgbmVlZHMgY2hhbmdp bmcuIEFsdGhvdWdoIC4uLgoKPiAgIHsKPiAgIAlzdHJ1Y3QgZ3VjX3Byb2Nlc3NfZGVzYyAqZGVz YzsKPiAgIAl2b2lkICpiYXNlOwo+ICAgCXUzMiBzaXplID0gc2l6ZW9mKHN0cnVjdCBndWNfd3Ff aXRlbSk7Cj4gICAJaW50IHJldCA9IC1FVElNRURPVVQsIHRpbWVvdXRfY291bnRlciA9IDIwMDsK Pgo+ICsJaWYgKCFnYykKPiArCQlyZXR1cm4gMDsKPiArCj4gICAJYmFzZSA9IGttYXBfYXRvbWlj KGk5MTVfZ2VtX29iamVjdF9nZXRfcGFnZShnYy0+Y2xpZW50X29iaiwgMCkpOwo+ICAgCWRlc2Mg PSBiYXNlICsgZ2MtPnByb2NfZGVzY19vZmZzZXQ7Cj4KPiAgIAl3aGlsZSAodGltZW91dF9jb3Vu dGVyLS0gPiAwKSB7Cj4gICAJCWlmIChDSVJDX1NQQUNFKGdjLT53cV90YWlsLCBkZXNjLT5oZWFk LCBnYy0+d3Ffc2l6ZSkgPj0gc2l6ZSkgewoKLi4uIGFzIGFuIGFsdGVybmF0aXZlIHN0cmF0ZWd5 LCB3ZSBjb3VsZCBjYWNoZSB0aGUgY2FsY3VsYXRlZCBmcmVlc3BhY2UgCmluIHRoZSBjbGllbnQg c3RydWN0dXJlOyB0aGVuIGlmIHdlIGFscmVhZHkga25vdyB0aGVyZSdzIGF0IGxlYXN0IDEgc2xv dCAKZnJlZSBmcm9tIGxhc3QgdGltZSB3ZSBjaGVja2VkLCB3ZSBjb3VsZCB0aGVuIGp1c3QgZGVj cmVtZW50IHRoZSBjYWNoZWQgCnZhbHVlIGFuZCBhdm9pZCB0aGUga21hcCtzcGlud2FpdCBvdmVy aGVhZC4gT25seSB3aGVuIHdlIHJlYWNoIDAgd291bGQgCndlIGhhdmUgdG8gZ28gdGhyb3VnaCB0 aGlzIGNvZGUgdG8gcmVmcmVzaCBvdXIgdmlldyBvZiBkZXNjLT5oZWFkIGFuZCAKcmVjYWxjdWxh dGUgdGhlIGFjdHVhbCBjdXJyZW50IGZyZWVzcGFjZS4gW05COiBjbGVhciBjYWNoZWQgdmFsdWUg b24gcmVzZXQ/XQoKRG9lcyB0aGF0IHNvdW5kIGxpa2UgYSB1c2VmdWwgb3B0aW1pc2F0aW9uPwoK PiAtCQkJKm9mZnNldCA9IGdjLT53cV90YWlsOwo+IC0KPiAtCQkJLyogYWR2YW5jZSB0aGUgdGFp bCBmb3IgbmV4dCB3b3JrcXVldWUgaXRlbSAqLwo+IC0JCQlnYy0+d3FfdGFpbCArPSBzaXplOwo+ IC0JCQlnYy0+d3FfdGFpbCAmPSBnYy0+d3Ffc2l6ZSAtIDE7Cj4gLQo+ICAgCQkJLyogdGhpcyB3 aWxsIGJyZWFrIHRoZSBsb29wICovCj4gICAJCQl0aW1lb3V0X2NvdW50ZXIgPSAwOwo+ICAgCQkJ cmV0ID0gMDsKPiBAQCAtNTEyLDExICs1MDgsMTIgQEAgc3RhdGljIGludCBndWNfYWRkX3dvcmtx dWV1ZV9pdGVtKHN0cnVjdCBpOTE1X2d1Y19jbGllbnQgKmdjLAo+ICAgCXN0cnVjdCBndWNfd3Ff aXRlbSAqd3FpOwo+ICAgCXZvaWQgKmJhc2U7Cj4gICAJdTMyIHRhaWwsIHdxX2xlbiwgd3Ffb2Zm ID0gMDsKPiAtCWludCByZXQ7Cj4KPiAtCXJldCA9IGd1Y19nZXRfd29ya3F1ZXVlX3NwYWNlKGdj LCAmd3Ffb2ZmKTsKPiAtCWlmIChyZXQpCj4gLQkJcmV0dXJuIHJldDsKPiArCXdxX29mZiA9IGdj LT53cV90YWlsOwo+ICsKPiArCS8qIGFkdmFuY2UgdGhlIHRhaWwgZm9yIG5leHQgd29ya3F1ZXVl IGl0ZW0gKi8KPiArCWdjLT53cV90YWlsICs9IHNpemVvZihzdHJ1Y3QgZ3VjX3dxX2l0ZW0pOwo+ ICsJZ2MtPndxX3RhaWwgJj0gZ2MtPndxX3NpemUgLSAxOwoKSSB3YXMgYSBiaXQgdW5oYXBweSBh Ym91dCB0aGlzIGNvZGUganVzdCBhc3N1bWluZyB0aGF0IHRoZXJlICptdXN0KiBiZSAKc3BhY2Ug KGJlY2F1c2Ugd2UgS05PVyB3ZSd2ZSBjaGVja2VkIGFib3ZlKSAtLSB1bmxlc3Mgc29tZW9uZSB2 aW9sYXRlZCAKdGhlIHByb3BlciBjYWxsaW5nIHNlcXVlbmNlIChURFI/KS4gT1RPSCwgaXQgd291 bGQgYmUgdG9vIGV4cGVuc2l2ZSB0byAKZ28gdGhyb3VnaCB0aGUgbWFwLWFuZC1jYWxjdWxhdGUg Y29kZSBhbGwgb3ZlciBhZ2FpbiBqdXN0IHRvIGNhdGNoIGFuIAp1bmxpa2VseSBzY2VuYXJpby4g QnV0LCBpZiB3ZSBjYWNoZSB0aGUgbGFzdC1jYWxjdWxhdGVkIHZhbHVlIGFzIGFib3ZlLCAKdGhl biB0aGUgY2hlY2sgY291bGQgYmUgY2hlYXAgOikgRm9yIGV4YW1wbGUsIGp1c3QgYWRkIGEgcHJl X2NoZWNrZWQgCnNpemUgZmllbGQgdGhhdCdzIHNldCBieSB0aGUgcHJlLWNoZWNrIGFuZCB0aGVu IGNoZWNrZWQgYW5kIGRlY3JlbWVudGVkIApvbiBzdWJtaXNzaW9uOyB0aGVyZSBzaG91bGRuJ3Qg YmUgbW9yZSB0aGFuIG9uZSBzdWJtaXNzaW9uIGluIHByb2dyZXNzIAphdCBhIHRpbWUsIGJlY2F1 c2UgZGV2LT5zdHJ1Y3RfbXV0ZXggaXMgaGVsZCBhY3Jvc3MgdGhlIHdob2xlIHNlcXVlbmNlIAoo YnV0IGl0J3Mgbm90IGFuIGVycm9yIHRvIHNlZSB0d28gcHJlLWNoZWNrcyBpbiBhIHJvdywgYmVj YXVzZSBhIHJlcXVlc3QgCmNhbiBiZSBhYmFuZG9uZWQgcGFydHdheSkuCgo+ICAgCS8qIEZvciBu b3cgd29ya3F1ZXVlIGl0ZW0gaXMgNCBEV3M7IHdvcmtxdWV1ZSBidWZmZXIgaXMgMiBwYWdlcy4g U28gd2UKPiAgIAkgKiBzaG91bGQgbm90IGhhdmUgdGhlIGNhc2Ugd2hlcmUgc3RydWN0dXJlIHdx aSBpcyBhY3Jvc3MgcGFnZSwgbmVpdGhlcgo+IGRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0v aTkxNS9pbnRlbF9ndWMuaCBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2d1Yy5oCj4gaW5k ZXggMGUwNDhiZi4uNTljOGUyMSAxMDA2NDQKPiAtLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9p bnRlbF9ndWMuaAo+ICsrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2d1Yy5oCj4gQEAg LTEyMyw1ICsxMjMsNiBAQCBpbnQgaTkxNV9ndWNfc3VibWl0KHN0cnVjdCBpOTE1X2d1Y19jbGll bnQgKmNsaWVudCwKPiAgIAkJICAgIHN0cnVjdCBkcm1faTkxNV9nZW1fcmVxdWVzdCAqcnEpOwo+ ICAgdm9pZCBpOTE1X2d1Y19zdWJtaXNzaW9uX2Rpc2FibGUoc3RydWN0IGRybV9kZXZpY2UgKmRl dik7Cj4gICB2b2lkIGk5MTVfZ3VjX3N1Ym1pc3Npb25fZmluaShzdHJ1Y3QgZHJtX2RldmljZSAq ZGV2KTsKPiAraW50IGk5MTVfZ3VjX3dxX3Jlc2VydmVfc3BhY2Uoc3RydWN0IGk5MTVfZ3VjX2Ns aWVudCAqY2xpZW50KTsKPgo+ICAgI2VuZGlmCj4gZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2Ry bS9pOTE1L2ludGVsX2xyYy5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfbHJjLmMKPiBp bmRleCBmOTZmYjUxLi43ZDUzZDI3IDEwMDY0NAo+IC0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1 L2ludGVsX2xyYy5jCj4gKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfbHJjLmMKPiBA QCAtNjY3LDYgKzY2NywxMiBAQCBpbnQgaW50ZWxfbG9naWNhbF9yaW5nX2FsbG9jX3JlcXVlc3Rf ZXh0cmFzKHN0cnVjdCBkcm1faTkxNV9nZW1fcmVxdWVzdCAqcmVxdWVzdAo+ICAgCQkJcmV0dXJu IHJldDsKPiAgIAl9Cj4KPiArCS8qIFJlc2VydmUgR3VDIFdRIHNwYWNlIGhlcmUgKG9uZSByZXF1 ZXN0IG5lZWRzIG9uZSBXUSBpdGVtKSBiZWNhdXNlCj4gKwkgKiB0aGUgbGF0ZXIgaTkxNV9hZGRf cmVxdWVzdCgpIGNhbGwgY2FuJ3QgZmFpbC4gKi8KPiArCXJldCA9IGk5MTVfZ3VjX3dxX3Jlc2Vy dmVfc3BhY2UocmVxdWVzdC0+aTkxNS0+Z3VjLmV4ZWNidWZfY2xpZW50KTsKPiArCWlmIChyZXQp Cj4gKwkJcmV0dXJuIHJldDsKPiArCj4gICAJcmV0dXJuIDA7Cj4gICB9CgpXb3J0aCBjaGVja2lu ZyBmb3IgR3VDIHN1Ym1pc3Npb24gYmVmb3JlIHRoYXQgY2FsbD8gTWF5YmUgbm90IC4uLgoKLkRh dmUuCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCkludGVs LWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwOi8v bGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4Cg==