From mboxrd@z Thu Jan 1 00:00:00 1970 From: Tvrtko Ursulin Subject: Re: [PATCH 2/4] drm/i915/selftests: Include arbitration points in preemption smoketest Date: Mon, 1 Oct 2018 15:01:05 +0100 Message-ID: References: <20181001123204.23982-1-chris@chris-wilson.co.uk> <20181001123204.23982-2-chris@chris-wilson.co.uk> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8"; Format="flowed" Content-Transfer-Encoding: base64 Return-path: Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by gabe.freedesktop.org (Postfix) with ESMTPS id 36B6B6E1E8 for ; Mon, 1 Oct 2018 14:01:08 +0000 (UTC) In-Reply-To: <20181001123204.23982-2-chris@chris-wilson.co.uk> Content-Language: en-GB List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" To: Chris Wilson , intel-gfx@lists.freedesktop.org List-Id: intel-gfx@lists.freedesktop.org Ck9uIDAxLzEwLzIwMTggMTM6MzIsIENocmlzIFdpbHNvbiB3cm90ZToKPiBJbmNsdWRlIGEgYmF0 Y2ggZnVsbCBvZiBhIHBhZ2Ugb2YgYXJiaXRyYXRpb24gcG9pbnRzIGluIG9yZGVyIHRvIHByb3Zp ZGUKPiBhIHdpbmRvdyBmb3IgaW5qZWN0X3ByZWVtcHRfY29udGV4dCgpIGluIHRoZSBwcmVlbXB0 aW9uIHNtb2tldGVzdHMuCj4gCj4gU2lnbmVkLW9mZi1ieTogQ2hyaXMgV2lsc29uIDxjaHJpc0Bj aHJpcy13aWxzb24uY28udWs+Cj4gLS0tCj4gICBkcml2ZXJzL2dwdS9kcm0vaTkxNS9zZWxmdGVz dHMvaW50ZWxfbHJjLmMgfCAxMzQgKysrKysrKysrKysrKysrKy0tLS0tCj4gICAxIGZpbGUgY2hh bmdlZCwgMTAxIGluc2VydGlvbnMoKyksIDMzIGRlbGV0aW9ucygtKQo+IAo+IGRpZmYgLS1naXQg YS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9zZWxmdGVzdHMvaW50ZWxfbHJjLmMgYi9kcml2ZXJzL2dw dS9kcm0vaTkxNS9zZWxmdGVzdHMvaW50ZWxfbHJjLmMKPiBpbmRleCBkNjhhOTI0YzUzMGUuLmQ2 N2ZlODMzNWNlYiAxMDA2NDQKPiAtLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9zZWxmdGVzdHMv aW50ZWxfbHJjLmMKPiArKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9zZWxmdGVzdHMvaW50ZWxf bHJjLmMKPiBAQCAtNTg4LDYgKzU4OCw3IEBAIHN0cnVjdCBwcmVlbXB0X3Ntb2tlIHsKPiAgIAlz dHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqaTkxNTsKPiAgIAlzdHJ1Y3QgaTkxNV9nZW1fY29udGV4 dCAqKmNvbnRleHRzOwo+ICAgCXN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKmVuZ2luZTsKPiArCXN0 cnVjdCBkcm1faTkxNV9nZW1fb2JqZWN0ICpiYXRjaDsKPiAgIAl1bnNpZ25lZCBpbnQgbmNvbnRl eHQ7Cj4gICAJc3RydWN0IHJuZF9zdGF0ZSBwcm5nOwo+ICAgCXVuc2lnbmVkIGxvbmcgY291bnQ7 Cj4gQEAgLTU5OSw2ICs2MDAsNDkgQEAgc3RhdGljIHN0cnVjdCBpOTE1X2dlbV9jb250ZXh0ICpz bW9rZV9jb250ZXh0KHN0cnVjdCBwcmVlbXB0X3Ntb2tlICpzbW9rZSkKPiAgIAkJCQkJCQkgICZz bW9rZS0+cHJuZyldOwo+ICAgfQo+ICAgCj4gK3N0YXRpYyBpbnQgc21va2Vfc3VibWl0KHN0cnVj dCBwcmVlbXB0X3Ntb2tlICpzbW9rZSwKPiArCQkJc3RydWN0IGk5MTVfZ2VtX2NvbnRleHQgKmN0 eCwgaW50IHByaW8sCj4gKwkJCXN0cnVjdCBkcm1faTkxNV9nZW1fb2JqZWN0ICpiYXRjaCkKPiAr ewo+ICsJc3RydWN0IGk5MTVfcmVxdWVzdCAqcnE7Cj4gKwlzdHJ1Y3QgaTkxNV92bWEgKnZtYSA9 IE5VTEw7Cj4gKwlpbnQgZXJyID0gMDsKPiArCj4gKwlpZiAoYmF0Y2gpIHsKPiArCQl2bWEgPSBp OTE1X3ZtYV9pbnN0YW5jZShiYXRjaCwgJmN0eC0+cHBndHQtPnZtLCBOVUxMKTsKPiArCQlpZiAo SVNfRVJSKHZtYSkpCj4gKwkJCXJldHVybiBQVFJfRVJSKHZtYSk7Cj4gKwo+ICsJCWVyciA9IGk5 MTVfdm1hX3Bpbih2bWEsIDAsIDAsIFBJTl9VU0VSKTsKPiArCQlpZiAoZXJyKQo+ICsJCQlyZXR1 cm4gZXJyOwo+ICsJfQo+ICsKPiArCWN0eC0+c2NoZWQucHJpb3JpdHkgPSBwcmlvOwo+ICsKPiAr CXJxID0gaTkxNV9yZXF1ZXN0X2FsbG9jKHNtb2tlLT5lbmdpbmUsIGN0eCk7Cj4gKwlpZiAoSVNf RVJSKHJxKSkgewo+ICsJCWVyciA9IFBUUl9FUlIocnEpOwo+ICsJCWdvdG8gdW5waW47Cj4gKwl9 Cj4gKwo+ICsJaWYgKHZtYSkgewo+ICsJCWVyciA9IHJxLT5lbmdpbmUtPmVtaXRfYmJfc3RhcnQo cnEsCj4gKwkJCQkJCXZtYS0+bm9kZS5zdGFydCwKPiArCQkJCQkJUEFHRV9TSVpFLCAwKTsKPiAr CQlpZiAoIWVycikKPiArCQkJZXJyID0gaTkxNV92bWFfbW92ZV90b19hY3RpdmUodm1hLCBycSwg MCk7Cj4gKwl9Cj4gKwo+ICsJaTkxNV9yZXF1ZXN0X2FkZChycSk7Cj4gKwo+ICt1bnBpbjoKPiAr CWlmICh2bWEpCj4gKwkJaTkxNV92bWFfdW5waW4odm1hKTsKPiArCj4gKwlyZXR1cm4gZXJyOwo+ ICt9Cj4gKwo+ICAgc3RhdGljIGludCBzbW9rZV9jcmVzY2VuZG9fdGhyZWFkKHZvaWQgKmFyZykK PiAgIHsKPiAgIAlzdHJ1Y3QgcHJlZW1wdF9zbW9rZSAqc21va2UgPSBhcmc7Cj4gQEAgLTYwOCwy MSArNjUyLDE1IEBAIHN0YXRpYyBpbnQgc21va2VfY3Jlc2NlbmRvX3RocmVhZCh2b2lkICphcmcp Cj4gICAJY291bnQgPSAwOwo+ICAgCWRvIHsKPiAgIAkJc3RydWN0IGk5MTVfZ2VtX2NvbnRleHQg KmN0eCA9IHNtb2tlX2NvbnRleHQoc21va2UpOwo+IC0JCXN0cnVjdCBpOTE1X3JlcXVlc3QgKnJx Owo+ICsJCWludCBlcnI7Cj4gICAKPiAgIAkJbXV0ZXhfbG9jaygmc21va2UtPmk5MTUtPmRybS5z dHJ1Y3RfbXV0ZXgpOwo+IC0KPiAtCQljdHgtPnNjaGVkLnByaW9yaXR5ID0gY291bnQgJSBJOTE1 X1BSSU9SSVRZX01BWDsKPiAtCj4gLQkJcnEgPSBpOTE1X3JlcXVlc3RfYWxsb2Moc21va2UtPmVu Z2luZSwgY3R4KTsKPiAtCQlpZiAoSVNfRVJSKHJxKSkgewo+IC0JCQltdXRleF91bmxvY2soJnNt b2tlLT5pOTE1LT5kcm0uc3RydWN0X211dGV4KTsKPiAtCQkJcmV0dXJuIFBUUl9FUlIocnEpOwo+ IC0JCX0KPiAtCj4gLQkJaTkxNV9yZXF1ZXN0X2FkZChycSk7Cj4gLQo+ICsJCWVyciA9IHNtb2tl X3N1Ym1pdChzbW9rZSwKPiArCQkJCSAgIGN0eCwgY291bnQgJSBJOTE1X1BSSU9SSVRZX01BWCwK PiArCQkJCSAgIHNtb2tlLT5iYXRjaCk7Cj4gICAJCW11dGV4X3VubG9jaygmc21va2UtPmk5MTUt PmRybS5zdHJ1Y3RfbXV0ZXgpOwo+ICsJCWlmIChlcnIpCj4gKwkJCXJldHVybiBlcnI7Cj4gICAK PiAgIAkJY291bnQrKzsKPiAgIAl9IHdoaWxlICghX19pZ3RfdGltZW91dChlbmRfdGltZSwgTlVM TCkpOwo+IEBAIC02MzEsNyArNjY5LDggQEAgc3RhdGljIGludCBzbW9rZV9jcmVzY2VuZG9fdGhy ZWFkKHZvaWQgKmFyZykKPiAgIAlyZXR1cm4gMDsKPiAgIH0KPiAgIAo+IC1zdGF0aWMgaW50IHNt b2tlX2NyZXNjZW5kbyhzdHJ1Y3QgcHJlZW1wdF9zbW9rZSAqc21va2UpCj4gK3N0YXRpYyBpbnQg c21va2VfY3Jlc2NlbmRvKHN0cnVjdCBwcmVlbXB0X3Ntb2tlICpzbW9rZSwgdW5zaWduZWQgaW50 IGZsYWdzKQo+ICsjZGVmaW5lIEJBVENIIEJJVCgwKQo+ICAgewo+ICAgCXN0cnVjdCB0YXNrX3N0 cnVjdCAqdHNrW0k5MTVfTlVNX0VOR0lORVNdID0ge307Cj4gICAJc3RydWN0IHByZWVtcHRfc21v a2UgYXJnW0k5MTVfTlVNX0VOR0lORVNdOwo+IEBAIC02NDUsNiArNjg0LDggQEAgc3RhdGljIGlu dCBzbW9rZV9jcmVzY2VuZG8oc3RydWN0IHByZWVtcHRfc21va2UgKnNtb2tlKQo+ICAgCWZvcl9l YWNoX2VuZ2luZShlbmdpbmUsIHNtb2tlLT5pOTE1LCBpZCkgewo+ICAgCQlhcmdbaWRdID0gKnNt b2tlOwo+ICAgCQlhcmdbaWRdLmVuZ2luZSA9IGVuZ2luZTsKPiArCQlpZiAoIShmbGFncyAmIEJB VENIKSkKPiArCQkJYXJnW2lkXS5iYXRjaCA9IE5VTEw7Cj4gICAJCWFyZ1tpZF0uY291bnQgPSAw Owo+ICAgCj4gICAJCXRza1tpZF0gPSBrdGhyZWFkX3J1bihzbW9rZV9jcmVzY2VuZG9fdGhyZWFk LCAmYXJnLAo+IEBAIC02NzEsMzcgKzcxMiwzNyBAQCBzdGF0aWMgaW50IHNtb2tlX2NyZXNjZW5k byhzdHJ1Y3QgcHJlZW1wdF9zbW9rZSAqc21va2UpCj4gICAKPiAgIAltdXRleF9sb2NrKCZzbW9r ZS0+aTkxNS0+ZHJtLnN0cnVjdF9tdXRleCk7Cj4gICAKPiAtCXByX2luZm8oIlN1Ym1pdHRlZCAl bHUgY3Jlc2NlbmRvIHJlcXVlc3RzIGFjcm9zcyAlZCBlbmdpbmVzIGFuZCAlZCBjb250ZXh0c1xu IiwKPiAtCQljb3VudCwgSU5URUxfSU5GTyhzbW9rZS0+aTkxNSktPm51bV9yaW5ncywgc21va2Ut Pm5jb250ZXh0KTsKPiArCXByX2luZm8oIlN1Ym1pdHRlZCAlbHUgY3Jlc2NlbmRvOiV4IHJlcXVl c3RzIGFjcm9zcyAlZCBlbmdpbmVzIGFuZCAlZCBjb250ZXh0c1xuIiwKPiArCQljb3VudCwgZmxh Z3MsCj4gKwkJSU5URUxfSU5GTyhzbW9rZS0+aTkxNSktPm51bV9yaW5ncywgc21va2UtPm5jb250 ZXh0KTsKPiAgIAlyZXR1cm4gMDsKPiAgIH0KPiAgIAo+IC1zdGF0aWMgaW50IHNtb2tlX3JhbmRv bShzdHJ1Y3QgcHJlZW1wdF9zbW9rZSAqc21va2UpCj4gK3N0YXRpYyBpbnQgc21va2VfcmFuZG9t KHN0cnVjdCBwcmVlbXB0X3Ntb2tlICpzbW9rZSwgdW5zaWduZWQgaW50IGZsYWdzKQo+ICAgewo+ IC0Jc3RydWN0IGludGVsX2VuZ2luZV9jcyAqZW5naW5lOwo+ICAgCWVudW0gaW50ZWxfZW5naW5l X2lkIGlkOwo+ICAgCUlHVF9USU1FT1VUKGVuZF90aW1lKTsKPiAgIAl1bnNpZ25lZCBsb25nIGNv dW50Owo+ICAgCj4gICAJY291bnQgPSAwOwo+ICAgCWRvIHsKPiAtCQlmb3JfZWFjaF9lbmdpbmUo ZW5naW5lLCBzbW9rZS0+aTkxNSwgaWQpIHsKPiArCQlmb3JfZWFjaF9lbmdpbmUoc21va2UtPmVu Z2luZSwgc21va2UtPmk5MTUsIGlkKSB7Cj4gICAJCQlzdHJ1Y3QgaTkxNV9nZW1fY29udGV4dCAq Y3R4ID0gc21va2VfY29udGV4dChzbW9rZSk7Cj4gLQkJCXN0cnVjdCBpOTE1X3JlcXVlc3QgKnJx Owo+IC0KPiAtCQkJY3R4LT5zY2hlZC5wcmlvcml0eSA9IHJhbmRvbV9wcmlvcml0eSgmc21va2Ut PnBybmcpOwo+ICsJCQlpbnQgZXJyOwo+ICAgCj4gLQkJCXJxID0gaTkxNV9yZXF1ZXN0X2FsbG9j KGVuZ2luZSwgY3R4KTsKPiAtCQkJaWYgKElTX0VSUihycSkpCj4gLQkJCQlyZXR1cm4gUFRSX0VS UihycSk7Cj4gKwkJCWVyciA9IHNtb2tlX3N1Ym1pdChzbW9rZSwKPiArCQkJCQkgICBjdHgsIHJh bmRvbV9wcmlvcml0eSgmc21va2UtPnBybmcpLAo+ICsJCQkJCSAgIGZsYWdzICYgQkFUQ0ggPyBz bW9rZS0+YmF0Y2ggOiBOVUxMKTsKPiArCQkJaWYgKGVycikKPiArCQkJCXJldHVybiBlcnI7Cj4g ICAKPiAtCQkJaTkxNV9yZXF1ZXN0X2FkZChycSk7Cj4gICAJCQljb3VudCsrOwo+ICAgCQl9Cj4g ICAJfSB3aGlsZSAoIV9faWd0X3RpbWVvdXQoZW5kX3RpbWUsIE5VTEwpKTsKPiAgIAo+IC0JcHJf aW5mbygiU3VibWl0dGVkICVsdSByYW5kb20gcmVxdWVzdHMgYWNyb3NzICVkIGVuZ2luZXMgYW5k ICVkIGNvbnRleHRzXG4iLAo+IC0JCWNvdW50LCBJTlRFTF9JTkZPKHNtb2tlLT5pOTE1KS0+bnVt X3JpbmdzLCBzbW9rZS0+bmNvbnRleHQpOwo+ICsJcHJfaW5mbygiU3VibWl0dGVkICVsdSByYW5k b206JXggcmVxdWVzdHMgYWNyb3NzICVkIGVuZ2luZXMgYW5kICVkIGNvbnRleHRzXG4iLAo+ICsJ CWNvdW50LCBmbGFncywKPiArCQlJTlRFTF9JTkZPKHNtb2tlLT5pOTE1KS0+bnVtX3JpbmdzLCBz bW9rZS0+bmNvbnRleHQpOwo+ICAgCXJldHVybiAwOwo+ICAgfQo+ICAgCj4gQEAgLTcxMiw3ICs3 NTMsOSBAQCBzdGF0aWMgaW50IGxpdmVfcHJlZW1wdF9zbW9rZSh2b2lkICphcmcpCj4gICAJCS5w cm5nID0gSTkxNV9STkRfU1RBVEVfSU5JVElBTElaRVIoaTkxNV9zZWxmdGVzdC5yYW5kb21fc2Vl ZCksCj4gICAJCS5uY29udGV4dCA9IDEwMjQsCj4gICAJfTsKPiArCWNvbnN0IHVuc2lnbmVkIGlu dCBwaGFzZVtdID0geyAwLCBCQVRDSCB9Owo+ICAgCWludCBlcnIgPSAtRU5PTUVNOwo+ICsJdTMy ICpjczsKPiAgIAlpbnQgbjsKPiAgIAo+ICAgCWlmICghSEFTX0xPR0lDQUxfUklOR19QUkVFTVBU SU9OKHNtb2tlLmk5MTUpKQo+IEBAIC03MjcsMTkgKzc3MCw0MSBAQCBzdGF0aWMgaW50IGxpdmVf cHJlZW1wdF9zbW9rZSh2b2lkICphcmcpCj4gICAJbXV0ZXhfbG9jaygmc21va2UuaTkxNS0+ZHJt LnN0cnVjdF9tdXRleCk7Cj4gICAJaW50ZWxfcnVudGltZV9wbV9nZXQoc21va2UuaTkxNSk7Cj4g ICAKPiArCXNtb2tlLmJhdGNoID0gaTkxNV9nZW1fb2JqZWN0X2NyZWF0ZV9pbnRlcm5hbChzbW9r ZS5pOTE1LCBQQUdFX1NJWkUpOwo+ICsJaWYgKElTX0VSUihzbW9rZS5iYXRjaCkpIHsKPiArCQll cnIgPSBQVFJfRVJSKHNtb2tlLmJhdGNoKTsKPiArCQlnb3RvIGVycl91bmxvY2s7Cj4gKwl9Cj4g Kwo+ICsJY3MgPSBpOTE1X2dlbV9vYmplY3RfcGluX21hcChzbW9rZS5iYXRjaCwgSTkxNV9NQVBf V0IpOwo+ICsJaWYgKElTX0VSUihjcykpIHsKPiArCQllcnIgPSBQVFJfRVJSKGNzKTsKPiArCQln b3RvIGVycl9iYXRjaDsKPiArCX0KPiArCWZvciAobiA9IDA7IG4gPCBQQUdFX1NJWkUgLyBzaXpl b2YoKmNzKSAtIDE7IG4rKykKPiArCQljc1tuXSA9IE1JX0FSQl9DSEVDSzsKPiArCWNzW25dID0g TUlfQkFUQ0hfQlVGRkVSX0VORDsKPiArCWk5MTVfZ2VtX29iamVjdF91bnBpbl9tYXAoc21va2Uu YmF0Y2gpOwo+ICsKPiArCWVyciA9IGk5MTVfZ2VtX29iamVjdF9zZXRfdG9fZ3R0X2RvbWFpbihz bW9rZS5iYXRjaCwgZmFsc2UpOwo+ICsJaWYgKGVycikKPiArCQlnb3RvIGVycl9iYXRjaDsKPiAr Cj4gICAJZm9yIChuID0gMDsgbiA8IHNtb2tlLm5jb250ZXh0OyBuKyspIHsKPiAgIAkJc21va2Uu Y29udGV4dHNbbl0gPSBrZXJuZWxfY29udGV4dChzbW9rZS5pOTE1KTsKPiAgIAkJaWYgKCFzbW9r ZS5jb250ZXh0c1tuXSkKPiAgIAkJCWdvdG8gZXJyX2N0eDsKPiAgIAl9Cj4gICAKPiAtCWVyciA9 IHNtb2tlX2NyZXNjZW5kbygmc21va2UpOwo+IC0JaWYgKGVycikKPiAtCQlnb3RvIGVycl9jdHg7 Cj4gKwlmb3IgKG4gPSAwOyBuIDwgQVJSQVlfU0laRShwaGFzZSk7IG4rKykgewo+ICsJCWVyciA9 IHNtb2tlX2NyZXNjZW5kbygmc21va2UsIHBoYXNlW25dKTsKPiArCQlpZiAoZXJyKQo+ICsJCQln b3RvIGVycl9jdHg7Cj4gICAKPiAtCWVyciA9IHNtb2tlX3JhbmRvbSgmc21va2UpOwo+IC0JaWYg KGVycikKPiAtCQlnb3RvIGVycl9jdHg7Cj4gKwkJZXJyID0gc21va2VfcmFuZG9tKCZzbW9rZSwg cGhhc2Vbbl0pOwo+ICsJCWlmIChlcnIpCj4gKwkJCWdvdG8gZXJyX2N0eDsKPiArCX0KPiAgIAo+ ICAgZXJyX2N0eDoKPiAgIAlpZiAoaWd0X2ZsdXNoX3Rlc3Qoc21va2UuaTkxNSwgSTkxNV9XQUlU X0xPQ0tFRCkpCj4gQEAgLTc1MSw2ICs4MTYsOSBAQCBzdGF0aWMgaW50IGxpdmVfcHJlZW1wdF9z bW9rZSh2b2lkICphcmcpCj4gICAJCWtlcm5lbF9jb250ZXh0X2Nsb3NlKHNtb2tlLmNvbnRleHRz W25dKTsKPiAgIAl9Cj4gICAKPiArZXJyX2JhdGNoOgo+ICsJaTkxNV9nZW1fb2JqZWN0X3B1dChz bW9rZS5iYXRjaCk7Cj4gK2Vycl91bmxvY2s6Cj4gICAJaW50ZWxfcnVudGltZV9wbV9wdXQoc21v a2UuaTkxNSk7Cj4gICAJbXV0ZXhfdW5sb2NrKCZzbW9rZS5pOTE1LT5kcm0uc3RydWN0X211dGV4 KTsKPiAgIAlrZnJlZShzbW9rZS5jb250ZXh0cyk7Cj4gCgpSZXZpZXdlZC1ieTogVHZydGtvIFVy c3VsaW4gPHR2cnRrby51cnN1bGluQGludGVsLmNvbT4KClJlZ2FyZHMsCgpUdnJ0a28KX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4IG1haWxp bmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJl ZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4Cg==