From mboxrd@z Thu Jan 1 00:00:00 1970 From: John Harrison Subject: Re: [RFC 16/25] drm/i915: Convert most 'i915_seqno_passed' calls into 'i915_gem_request_completed' Date: Tue, 28 Oct 2014 14:02:16 +0000 Message-ID: <544FA1E8.7040901@Intel.com> References: <1412604925-11290-16-git-send-email-John.C.Harrison@Intel.com> <1412941189-5254-1-git-send-email-John.C.Harrison@Intel.com> <20141019140419.GB26941@phenom.ffwll.local> 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 06C3C6E3F4 for ; Tue, 28 Oct 2014 07:10:51 -0700 (PDT) In-Reply-To: <20141019140419.GB26941@phenom.ffwll.local> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" To: Daniel Vetter Cc: Intel-GFX@Lists.FreeDesktop.Org List-Id: intel-gfx@lists.freedesktop.org T24gMTkvMTAvMjAxNCAxNTowNCwgRGFuaWVsIFZldHRlciB3cm90ZToKPiBPbiBGcmksIE9jdCAx MCwgMjAxNCBhdCAxMjozOTo0OVBNICswMTAwLCBKb2huLkMuSGFycmlzb25ASW50ZWwuY29tIHdy b3RlOgo+PiBGcm9tOiBKb2huIEhhcnJpc29uIDxKb2huLkMuSGFycmlzb25ASW50ZWwuY29tPgo+ Pgo+PiBGb3I6IFZJWi00Mzc3Cj4+IFNpZ25lZC1vZmYtYnk6IEpvaG4uQy5IYXJyaXNvbkBJbnRl bC5jb20KPj4gLS0tCj4+ICAgZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kZWJ1Z2ZzLmMgIHwg ICAgMyArLS0KPj4gICBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5oICAgICAgfCAgIDE4 ICsrKysrKysrKysrKysrKysrKwo+PiAgIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtLmMg ICAgICB8ICAgMTIgKysrKy0tLS0tLS0tCj4+ICAgZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxf ZGlzcGxheS5jIHwgICAxMSArKystLS0tLS0tLQo+PiAgIDQgZmlsZXMgY2hhbmdlZCwgMjYgaW5z ZXJ0aW9ucygrKSwgMTggZGVsZXRpb25zKC0pCj4+Cj4+IGRpZmYgLS1naXQgYS9kcml2ZXJzL2dw dS9kcm0vaTkxNS9pOTE1X2RlYnVnZnMuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZGVi dWdmcy5jCj4+IGluZGV4IDUyZGRkMTkuLmU3NjRhZjkgMTAwNjQ0Cj4+IC0tLSBhL2RyaXZlcnMv Z3B1L2RybS9pOTE1L2k5MTVfZGVidWdmcy5jCj4+ICsrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1 L2k5MTVfZGVidWdmcy5jCj4+IEBAIC01NTAsOCArNTUwLDcgQEAgc3RhdGljIGludCBpOTE1X2dl bV9wYWdlZmxpcF9pbmZvKHN0cnVjdCBzZXFfZmlsZSAqbSwgdm9pZCAqZGF0YSkKPj4gICAJCQkJ CSAgIGk5MTVfZ2VtX3JlcXVlc3RfZ2V0X3NlcW5vKHdvcmstPmZsaXBfcXVldWVkX3JlcSksCj4+ ICAgCQkJCQkgICBkZXZfcHJpdi0+bmV4dF9zZXFubywKPj4gICAJCQkJCSAgIHdvcmstPmZsaXBf cXVldWVkX3JpbmctPmdldF9zZXFubyh3b3JrLT5mbGlwX3F1ZXVlZF9yaW5nLCB0cnVlKSwKPj4g LQkJCQkJICAgaTkxNV9zZXFub19wYXNzZWQod29yay0+ZmxpcF9xdWV1ZWRfcmluZy0+Z2V0X3Nl cW5vKHdvcmstPmZsaXBfcXVldWVkX3JpbmcsIHRydWUpLAo+PiAtCQkJCQkJCSAgICAgaTkxNV9n ZW1fcmVxdWVzdF9nZXRfc2Vxbm8od29yay0+ZmxpcF9xdWV1ZWRfcmVxKSkpOwo+PiArCQkJCQkg ICBpOTE1X2dlbV9yZXF1ZXN0X2NvbXBsZXRlZCh3b3JrLT5mbGlwX3F1ZXVlZF9yZXEsIHRydWUp KTsKPj4gICAJCQl9IGVsc2UKPj4gICAJCQkJc2VxX3ByaW50ZihtLCAiRmxpcCBub3QgYXNzb2Np YXRlZCB3aXRoIGFueSByaW5nXG4iKTsKPj4gICAJCQlzZXFfcHJpbnRmKG0sICJGbGlwIHF1ZXVl ZCBvbiBmcmFtZSAlZCwgKHdhcyByZWFkeSBvbiBmcmFtZSAlZCksIG5vdyAlZFxuIiwKPj4gZGlm ZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmggYi9kcml2ZXJzL2dwdS9k cm0vaTkxNS9pOTE1X2Rydi5oCj4+IGluZGV4IDZmZTNiZTAuLjY1MGY3MTIgMTAwNjQ0Cj4+IC0t LSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmgKPj4gKysrIGIvZHJpdmVycy9ncHUv ZHJtL2k5MTUvaTkxNV9kcnYuaAo+PiBAQCAtMTk3MCw2ICsxOTcwLDEyIEBAIGk5MTVfZ2VtX3Jl cXVlc3RfdW5yZWZlcmVuY2Uoc3RydWN0IGRybV9pOTE1X2dlbV9yZXF1ZXN0ICpyZXEpCj4+ICAg CWtyZWZfcHV0KCZyZXEtPnJlZiwgaTkxNV9nZW1fcmVxdWVzdF9mcmVlKTsKPj4gICB9Cj4+ICAg Cj4+ICsvKgo+PiArICogTkI6IGk5MTVfZ2VtX3JlcXVlc3RfY29tcGxldGVkIHNob3VsZCBiZSBo ZXJlIGJ1dCBjdXJyZW50bHkgbmVlZHMgdGhlCj4+ICsgKiBkZWZpbml0aW9uIG9mIGk5MTVfc2Vx bm9fcGFzc2VkKCkgd2hpY2ggaXMgYmVsb3cuIEl0IHdpbGwgYmUgbW92ZWQgaW4KPj4gKyAqIGEg bGF0ZXIgcGF0Y2ggd2hlbiB0aGUgY2FsbCB0byBpOTE1X3NlcW5vX3Bhc3NlZCgpIGlzIG9ic29s ZXRlZC4uLgo+PiArICovCj4+ICsKPj4gICBzdHJ1Y3QgZHJtX2k5MTVfZmlsZV9wcml2YXRlIHsK Pj4gICAJc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2Owo+PiAgIAlzdHJ1Y3QgZHJt X2ZpbGUgKmZpbGU7Cj4+IEBAIC0zMDE5LDQgKzMwMjUsMTYgQEAgd2FpdF9yZW1haW5pbmdfbXNf ZnJvbV9qaWZmaWVzKHVuc2lnbmVkIGxvbmcgdGltZXN0YW1wX2ppZmZpZXMsIGludCB0b193YWl0 X21zKQo+PiAgIAl9Cj4+ICAgfQo+PiAgIAo+PiArc3RhdGljIGlubGluZSBib29sIGk5MTVfZ2Vt X3JlcXVlc3RfY29tcGxldGVkKHN0cnVjdCBkcm1faTkxNV9nZW1fcmVxdWVzdCAqcmVxLAo+PiAr CQkJCQkgICAgICBib29sIGxhenlfY29oZXJlbmN5KQo+PiArewo+PiArCXUzMiBzZXFubzsKPj4g Kwo+PiArCUJVR19PTihyZXEgPT0gTlVMTCk7Cj4+ICsKPj4gKwlzZXFubyA9IHJlcS0+cmluZy0+ Z2V0X3NlcW5vKHJlcS0+cmluZywgbGF6eV9jb2hlcmVuY3kpOwo+PiArCj4+ICsJcmV0dXJuIGk5 MTVfc2Vxbm9fcGFzc2VkKHNlcW5vLCByZXEtPnNlcW5vKTsKPj4gK30KPiBUYmggdGhpcyB0aGlu ZyBsb29rcyBhIGJpdCBiaWcgZm9yIGEgc3RhdGljIGlubGluZS4gSGF2ZSB5b3UKPiBkb3VibGUt Y2hlY2tlZCB0aGF0IGlubGluaW5nIHRoaXMgZG9lc24ndCBpbmNyZWFzZSBiaW5hcnkgc2l6ZT8g SWYgaXQKPiBkb2VzIHRoZW4gd2UgbmVlZCBwZXJmb3JtYW5jZSBkYXRhIGp1c3RpZnlpbmcgdGhl IGNvc3QuIFNhbWUgcHJvYmFibHkKPiBhcHBsaWVzIHRvIHNvbWUgb2YgdGhlIG90aGVyIHN0YXRp YyBpbmxpbmUgZnVuY3Rpb25zIHlvdSd2ZSBhZGRlZC4KPiAtRGFuaWVsCgpJdCBpcyBhIHJlcGxh Y2VtZW50IGZvciBpOTE1X3NlcW5vX3Bhc3NlZCgpIHdoaWNoIGlzIGEgc3RhdGljIGlubGluZSBz byAKaXQgc2VlbWVkIHNlbnNpYmxlIHRoYXQgdGhpcyBzaG91bGQgYmUgdG9vLiBOb3RlIHRoYXQg dGhlIHVsdGltYXRlIGFpbSAKaXMgZm9yIHRoaXMgdG8gYmUgYSBzaW1wbGUgJ3JldHVybiByZXEt PmNvbXBsZXRlZCcuIEF0IHdoaWNoIHBvaW50IGl0IApzaG91bGQgY2VydGFpbmx5IGJlIHdvcnRo eSBvZiBpbmxpbmluZy4KCkJ1dCBubyBJIGhhdmVuJ3QgZG9uZSBhbnkgYWN0dWFsIGFuYWx5c2lz IG9mIHRoZSBiZW5lZml0L2Nvc3QgeWV0LiBBcyAKaGFzIGJlZW4gbWVudGlvbmVkLCB0aGlzIFJG QyB3YXMgYSBxdWljayBrbm9jayB1cCB0byBnZXQgc29tZXRoaW5nIHRvIApkaXNjdXNzIGFzIHNv b24gYXMgcG9zc2libGUuCgo+PiArCj4+ICAgI2VuZGlmCj4+IGRpZmYgLS1naXQgYS9kcml2ZXJz L2dwdS9kcm0vaTkxNS9pOTE1X2dlbS5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW0u Ywo+PiBpbmRleCBlMWE1OGYxLi5iNjAyZThjIDEwMDY0NAo+PiAtLS0gYS9kcml2ZXJzL2dwdS9k cm0vaTkxNS9pOTE1X2dlbS5jCj4+ICsrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2Vt LmMKPj4gQEAgLTIyNTMsOCArMjI1Myw3IEBAIGk5MTVfZ2VtX29iamVjdF9yZXRpcmUoc3RydWN0 IGRybV9pOTE1X2dlbV9vYmplY3QgKm9iaikKPj4gICAJaWYgKHJpbmcgPT0gTlVMTCkKPj4gICAJ CXJldHVybjsKPj4gICAKPj4gLQlpZiAoaTkxNV9zZXFub19wYXNzZWQocmluZy0+Z2V0X3NlcW5v KHJpbmcsIHRydWUpLAo+PiAtCQkJICAgICAgaTkxNV9nZW1fcmVxdWVzdF9nZXRfc2Vxbm8ob2Jq LT5sYXN0X3JlYWRfcmVxKSkpCj4+ICsJaWYgKGk5MTVfZ2VtX3JlcXVlc3RfY29tcGxldGVkKG9i ai0+bGFzdF9yZWFkX3JlcSwgdHJ1ZSkpCj4+ICAgCQlpOTE1X2dlbV9vYmplY3RfbW92ZV90b19p bmFjdGl2ZShvYmopOwo+PiAgIH0KPj4gICAKPj4gQEAgLTI1MjEsMTIgKzI1MjAsOSBAQCBzdHJ1 Y3QgZHJtX2k5MTVfZ2VtX3JlcXVlc3QgKgo+PiAgIGk5MTVfZ2VtX2ZpbmRfYWN0aXZlX3JlcXVl c3Qoc3RydWN0IGludGVsX2VuZ2luZV9jcyAqcmluZykKPj4gICB7Cj4+ICAgCXN0cnVjdCBkcm1f aTkxNV9nZW1fcmVxdWVzdCAqcmVxdWVzdDsKPj4gLQl1MzIgY29tcGxldGVkX3NlcW5vOwo+PiAt Cj4+IC0JY29tcGxldGVkX3NlcW5vID0gcmluZy0+Z2V0X3NlcW5vKHJpbmcsIGZhbHNlKTsKPj4g ICAKPj4gICAJbGlzdF9mb3JfZWFjaF9lbnRyeShyZXF1ZXN0LCAmcmluZy0+cmVxdWVzdF9saXN0 LCBsaXN0KSB7Cj4+IC0JCWlmIChpOTE1X3NlcW5vX3Bhc3NlZChjb21wbGV0ZWRfc2Vxbm8sIHJl cXVlc3QtPnNlcW5vKSkKPj4gKwkJaWYgKGk5MTVfZ2VtX3JlcXVlc3RfY29tcGxldGVkKHJlcXVl c3QsIGZhbHNlKSkKPj4gICAJCQljb250aW51ZTsKPj4gICAKPj4gICAJCXJldHVybiByZXF1ZXN0 Owo+PiBAQCAtMjY3MCw3ICsyNjY2LDcgQEAgaTkxNV9nZW1fcmV0aXJlX3JlcXVlc3RzX3Jpbmco c3RydWN0IGludGVsX2VuZ2luZV9jcyAqcmluZykKPj4gICAJCQkJICAgICAgc3RydWN0IGRybV9p OTE1X2dlbV9vYmplY3QsCj4+ICAgCQkJCSAgICAgIHJpbmdfbGlzdCk7Cj4+ICAgCj4+IC0JCWlm ICghaTkxNV9zZXFub19wYXNzZWQoc2Vxbm8sIGk5MTVfZ2VtX3JlcXVlc3RfZ2V0X3NlcW5vKG9i ai0+bGFzdF9yZWFkX3JlcSkpKQo+PiArCQlpZiAoIWk5MTVfZ2VtX3JlcXVlc3RfY29tcGxldGVk KG9iai0+bGFzdF9yZWFkX3JlcSwgdHJ1ZSkpCj4+ICAgCQkJYnJlYWs7Cj4+ICAgCj4+ICAgCQlp OTE1X2dlbV9vYmplY3RfbW92ZV90b19pbmFjdGl2ZShvYmopOwo+PiBAQCAtMjY4NSw3ICsyNjgx LDcgQEAgaTkxNV9nZW1fcmV0aXJlX3JlcXVlc3RzX3Jpbmcoc3RydWN0IGludGVsX2VuZ2luZV9j cyAqcmluZykKPj4gICAJCQkJCSAgIHN0cnVjdCBkcm1faTkxNV9nZW1fcmVxdWVzdCwKPj4gICAJ CQkJCSAgIGxpc3QpOwo+PiAgIAo+PiAtCQlpZiAoIWk5MTVfc2Vxbm9fcGFzc2VkKHNlcW5vLCBy ZXF1ZXN0LT5zZXFubykpCj4+ICsJCWlmICghaTkxNV9nZW1fcmVxdWVzdF9jb21wbGV0ZWQocmVx dWVzdCwgdHJ1ZSkpCj4+ICAgCQkJYnJlYWs7Cj4+ICAgCj4+ICAgCQl0cmFjZV9pOTE1X2dlbV9y ZXF1ZXN0X3JldGlyZShyaW5nLCByZXF1ZXN0LT5zZXFubyk7Cj4+IGRpZmYgLS1naXQgYS9kcml2 ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9p bnRlbF9kaXNwbGF5LmMKPj4gaW5kZXggMjZmZGQ5Ni4uOWNhOGY5NCAxMDA2NDQKPj4gLS0tIGEv ZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jCj4+ICsrKyBiL2RyaXZlcnMvZ3B1 L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYwo+PiBAQCAtOTc3MSw4ICs5NzcxLDcgQEAgc3RhdGlj IGludCBpbnRlbF9wb3N0cG9uZV9mbGlwKHN0cnVjdCBkcm1faTkxNV9nZW1fb2JqZWN0ICpvYmop Cj4+ICAgCj4+ICAgCXJpbmcgPSBvYmotPnJpbmc7Cj4+ICAgCj4+IC0JaWYgKGk5MTVfc2Vxbm9f cGFzc2VkKHJpbmctPmdldF9zZXFubyhyaW5nLCB0cnVlKSwKPj4gLQkJCSAgICAgIGk5MTVfZ2Vt X3JlcXVlc3RfZ2V0X3NlcW5vKG9iai0+bGFzdF93cml0ZV9yZXEpKSkKPj4gKwlpZiAoaTkxNV9n ZW1fcmVxdWVzdF9jb21wbGV0ZWQob2JqLT5sYXN0X3dyaXRlX3JlcSwgdHJ1ZSkpCj4+ICAgCQly ZXR1cm4gMDsKPj4gICAKPj4gICAJcmV0ID0gaTkxNV9nZW1fY2hlY2tfb2xyKG9iai0+bGFzdF93 cml0ZV9yZXEpOwo+PiBAQCAtOTc5MCw5ICs5Nzg5LDYgQEAgdm9pZCBpbnRlbF9ub3RpZnlfbW1p b19mbGlwKHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKnJpbmcpCj4+ICAgCXN0cnVjdCBkcm1faTkx NV9wcml2YXRlICpkZXZfcHJpdiA9IHRvX2k5MTUocmluZy0+ZGV2KTsKPj4gICAJc3RydWN0IGlu dGVsX2NydGMgKmludGVsX2NydGM7Cj4+ICAgCXVuc2lnbmVkIGxvbmcgaXJxX2ZsYWdzOwo+PiAt CXUzMiBzZXFubzsKPj4gLQo+PiAtCXNlcW5vID0gcmluZy0+Z2V0X3NlcW5vKHJpbmcsIGZhbHNl KTsKPj4gICAKPj4gICAJc3Bpbl9sb2NrX2lycXNhdmUoJmRldl9wcml2LT5tbWlvX2ZsaXBfbG9j aywgaXJxX2ZsYWdzKTsKPj4gICAJZm9yX2VhY2hfaW50ZWxfY3J0YyhyaW5nLT5kZXYsIGludGVs X2NydGMpIHsKPj4gQEAgLTk4MDUsNyArOTgwMSw3IEBAIHZvaWQgaW50ZWxfbm90aWZ5X21taW9f ZmxpcChzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICpyaW5nKQo+PiAgIAkJaWYgKHJpbmctPmlkICE9 IG1taW9fZmxpcC0+cmluZ19pZCkKPj4gICAJCQljb250aW51ZTsKPj4gICAKPj4gLQkJaWYgKGk5 MTVfc2Vxbm9fcGFzc2VkKHNlcW5vLCBpOTE1X2dlbV9yZXF1ZXN0X2dldF9zZXFubyhtbWlvX2Zs aXAtPnJlcSkpKSB7Cj4+ICsJCWlmIChpOTE1X2dlbV9yZXF1ZXN0X2NvbXBsZXRlZChtbWlvX2Zs aXAtPnJlcSwgZmFsc2UpKSB7Cj4+ICAgCQkJaW50ZWxfZG9fbW1pb19mbGlwKGludGVsX2NydGMp Owo+PiAgIAkJCWk5MTVfZ2VtX3JlcXVlc3RfdW5yZWZlcmVuY2UobW1pb19mbGlwLT5yZXEpOwo+ PiAgIAkJCW1taW9fZmxpcC0+cmVxID0gTlVMTDsKPj4gQEAgLTk4NzgsOCArOTg3NCw3IEBAIHN0 YXRpYyBib29sIF9faW50ZWxfcGFnZWZsaXBfc3RhbGxfY2hlY2soc3RydWN0IGRybV9kZXZpY2Ug KmRldiwKPj4gICAKPj4gICAJaWYgKHdvcmstPmZsaXBfcmVhZHlfdmJsYW5rID09IDApIHsKPj4g ICAJCWlmICh3b3JrLT5mbGlwX3F1ZXVlZF9yaW5nICYmCj4+IC0JCSAgICAhaTkxNV9zZXFub19w YXNzZWQod29yay0+ZmxpcF9xdWV1ZWRfcmluZy0+Z2V0X3NlcW5vKHdvcmstPmZsaXBfcXVldWVk X3JpbmcsIHRydWUpLAo+PiAtCQkJCSAgICAgICBpOTE1X2dlbV9yZXF1ZXN0X2dldF9zZXFubyh3 b3JrLT5mbGlwX3F1ZXVlZF9yZXEpKSkKPj4gKwkJICAgICFpOTE1X2dlbV9yZXF1ZXN0X2NvbXBs ZXRlZCh3b3JrLT5mbGlwX3F1ZXVlZF9yZXEsIHRydWUpKQo+PiAgIAkJCXJldHVybiBmYWxzZTsK Pj4gICAKPj4gICAJCXdvcmstPmZsaXBfcmVhZHlfdmJsYW5rID0gZHJtX3ZibGFua19jb3VudChk ZXYsIGludGVsX2NydGMtPnBpcGUpOwo+PiAtLSAKPj4gMS43LjkuNQo+Pgo+PiBfX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwo+PiBJbnRlbC1nZnggbWFpbGlu ZyBsaXN0Cj4+IEludGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKPj4gaHR0cDovL2xpc3Rz LmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeAoKX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlz dApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHA6Ly9saXN0cy5mcmVlZGVza3Rv cC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK