From mboxrd@z Thu Jan 1 00:00:00 1970 From: Daniel Vetter Subject: Re: [PATCH v4] drm/i915/guc: Move GuC wq_check_space to alloc_request_extras Date: Tue, 5 Jan 2016 11:07:53 +0100 Message-ID: <20160105100753.GP8076@phenom.ffwll.local> References: <1449623090-1461-1-git-send-email-yu.dai@intel.com> <1450295155-10050-1-git-send-email-yu.dai@intel.com> <567AC018.2050700@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mail-wm0-f47.google.com (mail-wm0-f47.google.com [74.125.82.47]) by gabe.freedesktop.org (Postfix) with ESMTPS id 6D7E88A081 for ; Tue, 5 Jan 2016 02:07:56 -0800 (PST) Received: by mail-wm0-f47.google.com with SMTP id f206so21145360wmf.0 for ; Tue, 05 Jan 2016 02:07:56 -0800 (PST) Content-Disposition: inline In-Reply-To: <567AC018.2050700@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 Cc: intel-gfx@lists.freedesktop.org List-Id: intel-gfx@lists.freedesktop.org T24gV2VkLCBEZWMgMjMsIDIwMTUgYXQgMDM6Mzk6MDRQTSArMDAwMCwgRGF2ZSBHb3Jkb24gd3Jv dGU6Cj4gT24gMTYvMTIvMTUgMTk6NDUsIHl1LmRhaUBpbnRlbC5jb20gd3JvdGU6Cj4gPkZyb206 IEFsZXggRGFpIDx5dS5kYWlAaW50ZWwuY29tPgo+ID4KPiA+U3BsaXQgR3VDIHdvcmsgcXVldWUg c3BhY2UgY2hlY2tpbmcgZnJvbSBzdWJtaXNzaW9uIGFuZCBtb3ZlIGl0IHRvCj4gPnJpbmdfYWxs b2NfcmVxdWVzdF9leHRyYXMuIFRoZSByZWFzb24gaXMgdGhhdCBmYWlsdXJlIGluIGxhdGVyCj4g Pmk5MTVfYWRkX3JlcXVlc3QoKSB3b24ndCBiZSBoYW5kbGVkLiBJbiB0aGUgY2FzZSB0aW1lb3V0 IGhhcHBlbnMsCj4gPmRyaXZlciBjYW4gcmV0dXJuIGVhcmx5IGluIG9yZGVyIHRvIGhhbmRsZSB0 aGUgZXJyb3IuCj4gPgo+ID52MTogTW92ZSB3cV9yZXNlcnZlX3NwYWNlIHRvIHJpbmdfcmVzZXJ2 ZV9zcGFjZQo+ID52MjogTW92ZSB3cV9yZXNlcnZlX3NwYWNlIHRvIGFsbG9jX3JlcXVlc3RfZXh0 cmFzIChDaHJpcyBXaWxzb24pCj4gPnYzOiBUaGUgd29yayBxdWV1ZSBoZWFkIHBvaW50ZXIgaXMg Y2FjaGVkIGJ5IGRyaXZlciBub3cuIFNvIHdlIGNhbgo+ID4gICAgIHF1aWNrbHkgcmV0dXJuIGlm IHNwYWNlIGlzIGF2YWlsYWJsZS4KPiA+ICAgICBzL3Jlc2VydmUvY2hlY2svZyAoRGF2ZSBHb3Jk b24pCj4gPnY0OiBVcGRhdGUgY2FjaGVkIHdxIGhlYWQgYWZ0ZXIgcmluZyBkb29yYmVsbDsgY2hl Y2sgd3Egc3BhY2UgYmVmb3JlCj4gPiAgICAgcmluZyBkb29yYmVsbCBpbiBjYXNlIHVuZXhwZWN0 ZWQgZXJyb3IgaGFwcGVuczsgY2FsbCB3cSBzcGFjZQo+ID4gICAgIGNoZWNrIG9ubHkgd2hlbiBH dUMgc3VibWlzc2lvbiBpcyBlbmFibGVkLiAoRGF2ZSBHb3Jkb24pCj4gPgo+ID5TaWduZWQtb2Zm LWJ5OiBBbGV4IERhaSA8eXUuZGFpQGludGVsLmNvbT4KPiAKPiBMR1RNLgo+IFJldmlld2VkLWJ5 OiBEYXZlIEdvcmRvbiA8ZGF2aWQucy5nb3Jkb25AaW50ZWwuY29tPgoKUXVldWVkIGZvciAtbmV4 dCwgdGhhbmtzIGZvciB0aGUgcGF0Y2guCi1EYW5pZWwKCj4gCj4gPmRpZmYgLS1naXQgYS9kcml2 ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2d1Y19zdWJtaXNzaW9uLmMgYi9kcml2ZXJzL2dwdS9kcm0v aTkxNS9pOTE1X2d1Y19zdWJtaXNzaW9uLmMKPiA+aW5kZXggZWYyMDA3MS4uNzU1NGQxNiAxMDA2 NDQKPiA+LS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9ndWNfc3VibWlzc2lvbi5jCj4g PisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ3VjX3N1Ym1pc3Npb24uYwo+ID5AQCAt MjQ3LDYgKzI0Nyw5IEBAIHN0YXRpYyBpbnQgZ3VjX3JpbmdfZG9vcmJlbGwoc3RydWN0IGk5MTVf Z3VjX2NsaWVudCAqZ2MpCj4gPiAgCQkJZGJfZXhjLmNvb2tpZSA9IDE7Cj4gPiAgCX0KPiA+Cj4g PisJLyogRmluYWxseSwgdXBkYXRlIHRoZSBjYWNoZWQgY29weSBvZiB0aGUgR3VDJ3MgV1EgaGVh ZCAqLwo+ID4rCWdjLT53cV9oZWFkID0gZGVzYy0+aGVhZDsKPiA+Kwo+ID4gIAlrdW5tYXBfYXRv bWljKGJhc2UpOwo+ID4gIAlyZXR1cm4gcmV0Owo+ID4gIH0KPiA+QEAgLTQ3MiwyOCArNDc1LDMw IEBAIHN0YXRpYyB2b2lkIGd1Y19maW5pX2N0eF9kZXNjKHN0cnVjdCBpbnRlbF9ndWMgKmd1YywK PiA+ICAJCQkgICAgIHNpemVvZihkZXNjKSAqIGNsaWVudC0+Y3R4X2luZGV4KTsKPiA+ICB9Cj4g Pgo+ID4tLyogR2V0IHZhbGlkIHdvcmtxdWV1ZSBpdGVtIGFuZCByZXR1cm4gaXQgYmFjayB0byBv ZmZzZXQgKi8KPiA+LXN0YXRpYyBpbnQgZ3VjX2dldF93b3JrcXVldWVfc3BhY2Uoc3RydWN0IGk5 MTVfZ3VjX2NsaWVudCAqZ2MsIHUzMiAqb2Zmc2V0KQo+ID4raW50IGk5MTVfZ3VjX3dxX2NoZWNr X3NwYWNlKHN0cnVjdCBpOTE1X2d1Y19jbGllbnQgKmdjKQo+ID4gIHsKPiA+ICAJc3RydWN0IGd1 Y19wcm9jZXNzX2Rlc2MgKmRlc2M7Cj4gPiAgCXZvaWQgKmJhc2U7Cj4gPiAgCXUzMiBzaXplID0g c2l6ZW9mKHN0cnVjdCBndWNfd3FfaXRlbSk7Cj4gPiAgCWludCByZXQgPSAtRVRJTUVET1VULCB0 aW1lb3V0X2NvdW50ZXIgPSAyMDA7Cj4gPgo+ID4rCWlmICghZ2MpCj4gPisJCXJldHVybiAwOwo+ ID4rCj4gPisJLyogUXVpY2tseSByZXR1cm4gaWYgd3Egc3BhY2UgaXMgYXZhaWxhYmxlIHNpbmNl IGxhc3QgdGltZSB3ZSBjYWNoZSB0aGUKPiA+KwkgKiBoZWFkIHBvc2l0aW9uLiAqLwo+ID4rCWlm IChDSVJDX1NQQUNFKGdjLT53cV90YWlsLCBnYy0+d3FfaGVhZCwgZ2MtPndxX3NpemUpID49IHNp emUpCj4gPisJCXJldHVybiAwOwo+ID4rCj4gPiAgCWJhc2UgPSBrbWFwX2F0b21pYyhpOTE1X2dl bV9vYmplY3RfZ2V0X3BhZ2UoZ2MtPmNsaWVudF9vYmosIDApKTsKPiA+ICAJZGVzYyA9IGJhc2Ug KyBnYy0+cHJvY19kZXNjX29mZnNldDsKPiA+Cj4gPiAgCXdoaWxlICh0aW1lb3V0X2NvdW50ZXIt LSA+IDApIHsKPiA+LQkJaWYgKENJUkNfU1BBQ0UoZ2MtPndxX3RhaWwsIGRlc2MtPmhlYWQsIGdj LT53cV9zaXplKSA+PSBzaXplKSB7Cj4gPi0JCQkqb2Zmc2V0ID0gZ2MtPndxX3RhaWw7Cj4gPisJ CWdjLT53cV9oZWFkID0gZGVzYy0+aGVhZDsKPiA+Cj4gPi0JCQkvKiBhZHZhbmNlIHRoZSB0YWls IGZvciBuZXh0IHdvcmtxdWV1ZSBpdGVtICovCj4gPi0JCQlnYy0+d3FfdGFpbCArPSBzaXplOwo+ ID4tCQkJZ2MtPndxX3RhaWwgJj0gZ2MtPndxX3NpemUgLSAxOwo+ID4tCj4gPi0JCQkvKiB0aGlz IHdpbGwgYnJlYWsgdGhlIGxvb3AgKi8KPiA+LQkJCXRpbWVvdXRfY291bnRlciA9IDA7Cj4gPisJ CWlmIChDSVJDX1NQQUNFKGdjLT53cV90YWlsLCBnYy0+d3FfaGVhZCwgZ2MtPndxX3NpemUpID49 IHNpemUpIHsKPiA+ICAJCQlyZXQgPSAwOwo+ID4rCQkJYnJlYWs7Cj4gPiAgCQl9Cj4gPgo+ID4g IAkJaWYgKHRpbWVvdXRfY291bnRlcikKPiA+QEAgLTUxMSwxMiArNTE2LDE2IEBAIHN0YXRpYyBp bnQgZ3VjX2FkZF93b3JrcXVldWVfaXRlbShzdHJ1Y3QgaTkxNV9ndWNfY2xpZW50ICpnYywKPiA+ ICAJZW51bSBpbnRlbF9yaW5nX2lkIHJpbmdfaWQgPSBycS0+cmluZy0+aWQ7Cj4gPiAgCXN0cnVj dCBndWNfd3FfaXRlbSAqd3FpOwo+ID4gIAl2b2lkICpiYXNlOwo+ID4tCXUzMiB0YWlsLCB3cV9s ZW4sIHdxX29mZiA9IDA7Cj4gPi0JaW50IHJldDsKPiA+Kwl1MzIgdGFpbCwgd3FfbGVuLCB3cV9v ZmYsIHNwYWNlOwo+ID4rCj4gPisJc3BhY2UgPSBDSVJDX1NQQUNFKGdjLT53cV90YWlsLCBnYy0+ d3FfaGVhZCwgZ2MtPndxX3NpemUpOwo+ID4rCWlmIChXQVJOX09OKHNwYWNlIDwgc2l6ZW9mKHN0 cnVjdCBndWNfd3FfaXRlbSkpKQo+ID4rCQlyZXR1cm4gLUVOT1NQQzsgLyogc2hvdWxkbid0IGhh cHBlbiAqLwo+ID4KPiA+LQlyZXQgPSBndWNfZ2V0X3dvcmtxdWV1ZV9zcGFjZShnYywgJndxX29m Zik7Cj4gPi0JaWYgKHJldCkKPiA+LQkJcmV0dXJuIHJldDsKPiA+KwkvKiBwb3N0aW5jcmVtZW50 IFdRIHRhaWwgZm9yIG5leHQgdGltZSAqLwo+ID4rCXdxX29mZiA9IGdjLT53cV90YWlsOwo+ID4r CWdjLT53cV90YWlsICs9IHNpemVvZihzdHJ1Y3QgZ3VjX3dxX2l0ZW0pOwo+ID4rCWdjLT53cV90 YWlsICY9IGdjLT53cV9zaXplIC0gMTsKPiA+Cj4gPiAgCS8qIEZvciBub3cgd29ya3F1ZXVlIGl0 ZW0gaXMgNCBEV3M7IHdvcmtxdWV1ZSBidWZmZXIgaXMgMiBwYWdlcy4gU28gd2UKPiA+ICAJICog c2hvdWxkIG5vdCBoYXZlIHRoZSBjYXNlIHdoZXJlIHN0cnVjdHVyZSB3cWkgaXMgYWNyb3NzIHBh Z2UsIG5laXRoZXIKPiA+ZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2d1 Yy5oIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZ3VjLmgKPiA+aW5kZXggMGUwNDhiZi4u NWNmNTU1ZCAxMDA2NDQKPiA+LS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZ3VjLmgK PiA+KysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZ3VjLmgKPiA+QEAgLTQzLDYgKzQz LDcgQEAgc3RydWN0IGk5MTVfZ3VjX2NsaWVudCB7Cj4gPiAgCXVpbnQzMl90IHdxX29mZnNldDsK PiA+ICAJdWludDMyX3Qgd3Ffc2l6ZTsKPiA+ICAJdWludDMyX3Qgd3FfdGFpbDsKPiA+Kwl1aW50 MzJfdCB3cV9oZWFkOwo+ID4KPiA+ICAJLyogR3VDIHN1Ym1pc3Npb24gc3RhdGlzdGljcyAmIHN0 YXR1cyAqLwo+ID4gIAl1aW50NjRfdCBzdWJtaXNzaW9uc1tJOTE1X05VTV9SSU5HU107Cj4gPkBA IC0xMjMsNSArMTI0LDYgQEAgaW50IGk5MTVfZ3VjX3N1Ym1pdChzdHJ1Y3QgaTkxNV9ndWNfY2xp ZW50ICpjbGllbnQsCj4gPiAgCQkgICAgc3RydWN0IGRybV9pOTE1X2dlbV9yZXF1ZXN0ICpycSk7 Cj4gPiAgdm9pZCBpOTE1X2d1Y19zdWJtaXNzaW9uX2Rpc2FibGUoc3RydWN0IGRybV9kZXZpY2Ug KmRldik7Cj4gPiAgdm9pZCBpOTE1X2d1Y19zdWJtaXNzaW9uX2Zpbmkoc3RydWN0IGRybV9kZXZp Y2UgKmRldik7Cj4gPitpbnQgaTkxNV9ndWNfd3FfY2hlY2tfc3BhY2Uoc3RydWN0IGk5MTVfZ3Vj X2NsaWVudCAqY2xpZW50KTsKPiA+Cj4gPiAgI2VuZGlmCj4gPmRpZmYgLS1naXQgYS9kcml2ZXJz L2dwdS9kcm0vaTkxNS9pbnRlbF9scmMuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2xy Yy5jCj4gPmluZGV4IDI3MmYzNmYuLmNkMjMyZDIgMTAwNjQ0Cj4gPi0tLSBhL2RyaXZlcnMvZ3B1 L2RybS9pOTE1L2ludGVsX2xyYy5jCj4gPisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVs X2xyYy5jCj4gPkBAIC02NjcsNiArNjY3LDE5IEBAIGludCBpbnRlbF9sb2dpY2FsX3JpbmdfYWxs b2NfcmVxdWVzdF9leHRyYXMoc3RydWN0IGRybV9pOTE1X2dlbV9yZXF1ZXN0ICpyZXF1ZXN0Cj4g PiAgCQkJcmV0dXJuIHJldDsKPiA+ICAJfQo+ID4KPiA+KwlpZiAoaTkxNS5lbmFibGVfZ3VjX3N1 Ym1pc3Npb24pIHsKPiA+KwkJLyoKPiA+KwkJICogQ2hlY2sgdGhhdCB0aGUgR3VDIGhhcyBzcGFj ZSBmb3IgdGhlIHJlcXVlc3QgYmVmb3JlCj4gPisJCSAqIGdvaW5nIGFueSBmdXJ0aGVyLCBhcyB0 aGUgaTkxNV9hZGRfcmVxdWVzdCgpIGNhbGwKPiA+KwkJICogbGF0ZXIgb24gbXVzdG4ndCBmYWls IC4uLgo+ID4rCQkgKi8KPiA+KwkJc3RydWN0IGludGVsX2d1YyAqZ3VjID0gJnJlcXVlc3QtPmk5 MTUtPmd1YzsKPiA+Kwo+ID4rCQlyZXQgPSBpOTE1X2d1Y193cV9jaGVja19zcGFjZShndWMtPmV4 ZWNidWZfY2xpZW50KTsKPiA+KwkJaWYgKHJldCkKPiA+KwkJCXJldHVybiByZXQ7Cj4gPisJfQo+ ID4rCj4gPiAgCXJldHVybiAwOwo+ID4gIH0KPiA+Cj4gPgo+IAo+IF9fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCj4gSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdAo+ IEludGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKPiBodHRwOi8vbGlzdHMuZnJlZWRlc2t0 b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4CgotLSAKRGFuaWVsIFZldHRlcgpTb2Z0 d2FyZSBFbmdpbmVlciwgSW50ZWwgQ29ycG9yYXRpb24KaHR0cDovL2Jsb2cuZmZ3bGwuY2gKX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4IG1h aWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHA6Ly9saXN0cy5m cmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK