From mboxrd@z Thu Jan 1 00:00:00 1970 From: Chris Wilson Subject: [PATCH 01/20] drm/i915: Apply batch location restrictions before pinning Date: Thu, 7 Jun 2018 10:57:56 +0100 Message-ID: <20180607095815.10938-2-chris@chris-wilson.co.uk> References: <20180607095815.10938-1-chris@chris-wilson.co.uk> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from fireflyinternet.com (mail.fireflyinternet.com [109.228.58.192]) by gabe.freedesktop.org (Postfix) with ESMTPS id 7123A6F1E9 for ; Thu, 7 Jun 2018 09:59:13 +0000 (UTC) In-Reply-To: <20180607095815.10938-1-chris@chris-wilson.co.uk> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" To: intel-gfx@lists.freedesktop.org List-Id: intel-gfx@lists.freedesktop.org V2Ugc3BlY2lhbCBjYXNlIHRoZSBwb3NpdGlvbiBvZiB0aGUgYmF0Y2ggd2l0aGluIHRoZSBHVFQg dG8gcHJldmVudApuZWdhdGl2ZSBzZWxmLXJlbG9jYXRpb24gZGVsdGFzIGZyb20gdW5kZXJmbG93 aW5nLiBIb3dldmVyLCB0aGF0CnJlc3RyaWN0aW9uIGlzIGJlaW5nIGFwcGxpZWQgYWZ0ZXIgYSB0 cmlhbCBwaW4gb2YgdGhlIGJhdGNoIGluIGl0cwpjdXJyZW50IHBvc2l0aW9uLiBUaHVzIHdlIGFy ZSBub3QgcmVqZWN0aW5nIGFuIGludmFsaWQgbG9jYXRpb24gaWYgdGhlCmJhdGNoIGhhcyBiZWVu IGJlZm9yZSwgbGVhZGluZyB0byBhbiBhc3NlcnRpb24gaWYgd2UgaGFwcGVuIHRvIG5lZWQgdG8K cmVhcnJhbmdlIHRoZSBlbnRpcmUgcGF5bG9hZC4gSW4gdGhlIHdvcnN0IGNhc2UsIHRoaXMgbWF5 IGNhdXNlIGEgR1BVCmhhbmcgb24gZ2VuNyBvciBwZXJoYXBzIG1pc3Npbmcgc3RhdGUuCgpSZWZl cmVuY2VzOiBodHRwczovL2J1Z3MuZnJlZWRlc2t0b3Aub3JnL3Nob3dfYnVnLmNnaT9pZD0xMDU3 MjAKRml4ZXM6IDI4ODljYWE5MjMyMSAoImRybS9pOTE1OiBFbGltaW5hdGUgbG90cyBvZiBpdGVy YXRpb25zIG92ZXIgdGhlIGV4ZWNvYmplY3RzIGFycmF5IikKU2lnbmVkLW9mZi1ieTogQ2hyaXMg V2lsc29uIDxjaHJpc0BjaHJpcy13aWxzb24uY28udWs+CkNjOiBKb29uYXMgTGFodGluZW4gPGpv b25hcy5sYWh0aW5lbkBsaW51eC5pbnRlbC5jb20+CkNjOiBNYXJ0aW4gUGVyZXMgPG1hcnRpbi5w ZXJlc0BsaW51eC5pbnRlbC5jb20+Ci0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1f ZXhlY2J1ZmZlci5jIHwgNDkgKysrKysrKysrKysrLS0tLS0tLS0tLQogMSBmaWxlIGNoYW5nZWQs IDI3IGluc2VydGlvbnMoKyksIDIyIGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMv Z3B1L2RybS9pOTE1L2k5MTVfZ2VtX2V4ZWNidWZmZXIuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1 L2k5MTVfZ2VtX2V4ZWNidWZmZXIuYwppbmRleCBlZWZkNDQ5NTAyZTIuLjJkMmViMzA3NTk2MCAx MDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fZXhlY2J1ZmZlci5jCisr KyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2V4ZWNidWZmZXIuYwpAQCAtNDg5LDcg KzQ4OSw5IEBAIGViX3ZhbGlkYXRlX3ZtYShzdHJ1Y3QgaTkxNV9leGVjYnVmZmVyICplYiwKIH0K IAogc3RhdGljIGludAotZWJfYWRkX3ZtYShzdHJ1Y3QgaTkxNV9leGVjYnVmZmVyICplYiwgdW5z aWduZWQgaW50IGksIHN0cnVjdCBpOTE1X3ZtYSAqdm1hKQorZWJfYWRkX3ZtYShzdHJ1Y3QgaTkx NV9leGVjYnVmZmVyICplYiwKKwkgICB1bnNpZ25lZCBpbnQgaSwgdW5zaWduZWQgYmF0Y2hfaWR4 LAorCSAgIHN0cnVjdCBpOTE1X3ZtYSAqdm1hKQogewogCXN0cnVjdCBkcm1faTkxNV9nZW1fZXhl Y19vYmplY3QyICplbnRyeSA9ICZlYi0+ZXhlY1tpXTsKIAlpbnQgZXJyOwpAQCAtNTIyLDYgKzUy NCwyNCBAQCBlYl9hZGRfdm1hKHN0cnVjdCBpOTE1X2V4ZWNidWZmZXIgKmViLCB1bnNpZ25lZCBp bnQgaSwgc3RydWN0IGk5MTVfdm1hICp2bWEpCiAJZWItPmZsYWdzW2ldID0gZW50cnktPmZsYWdz OwogCXZtYS0+ZXhlY19mbGFncyA9ICZlYi0+ZmxhZ3NbaV07CiAKKwkvKgorCSAqIFNOQSBpcyBk b2luZyBmYW5jeSB0cmlja3Mgd2l0aCBjb21wcmVzc2luZyBiYXRjaCBidWZmZXJzLCB3aGljaCBs ZWFkcworCSAqIHRvIG5lZ2F0aXZlIHJlbG9jYXRpb24gZGVsdGFzLiBVc3VhbGx5IHRoYXQgd29y a3Mgb3V0IG9rIHNpbmNlIHRoZQorCSAqIHJlbG9jYXRlIGFkZHJlc3MgaXMgc3RpbGwgcG9zaXRp dmUsIGV4Y2VwdCB3aGVuIHRoZSBiYXRjaCBpcyBwbGFjZWQKKwkgKiB2ZXJ5IGxvdyBpbiB0aGUg R1RULiBFbnN1cmUgdGhpcyBkb2Vzbid0IGhhcHBlbi4KKwkgKgorCSAqIE5vdGUgdGhhdCBhY3R1 YWwgaGFuZ3MgaGF2ZSBvbmx5IGJlZW4gb2JzZXJ2ZWQgb24gZ2VuNywgYnV0IGZvcgorCSAqIHBh cmFub2lhIGRvIGl0IGV2ZXJ5d2hlcmUuCisJICovCisJaWYgKGkgPT0gYmF0Y2hfaWR4KSB7CisJ CWlmICghKGViLT5mbGFnc1tpXSAmIEVYRUNfT0JKRUNUX1BJTk5FRCkpCisJCQllYi0+ZmxhZ3Nb aV0gfD0gX19FWEVDX09CSkVDVF9ORUVEU19CSUFTOworCQlpZiAoZWItPnJlbG9jX2NhY2hlLmhh c19mZW5jZSkKKwkJCWViLT5mbGFnc1tpXSB8PSBFWEVDX09CSkVDVF9ORUVEU19GRU5DRTsKKwor CQllYi0+YmF0Y2ggPSB2bWE7CisJfQorCiAJZXJyID0gMDsKIAlpZiAoZWJfcGluX3ZtYShlYiwg ZW50cnksIHZtYSkpIHsKIAkJaWYgKGVudHJ5LT5vZmZzZXQgIT0gdm1hLT5ub2RlLnN0YXJ0KSB7 CkBAIC03MTYsNyArNzM2LDcgQEAgc3RhdGljIGludCBlYl9sb29rdXBfdm1hcyhzdHJ1Y3QgaTkx NV9leGVjYnVmZmVyICplYikKIHsKIAlzdHJ1Y3QgcmFkaXhfdHJlZV9yb290ICpoYW5kbGVzX3Zt YSA9ICZlYi0+Y3R4LT5oYW5kbGVzX3ZtYTsKIAlzdHJ1Y3QgZHJtX2k5MTVfZ2VtX29iamVjdCAq b2JqOwotCXVuc2lnbmVkIGludCBpOworCXVuc2lnbmVkIGludCBpLCBiYXRjaDsKIAlpbnQgZXJy OwogCiAJaWYgKHVubGlrZWx5KGk5MTVfZ2VtX2NvbnRleHRfaXNfY2xvc2VkKGViLT5jdHgpKSkK QEAgLTcyOCw2ICs3NDgsOCBAQCBzdGF0aWMgaW50IGViX2xvb2t1cF92bWFzKHN0cnVjdCBpOTE1 X2V4ZWNidWZmZXIgKmViKQogCUlOSVRfTElTVF9IRUFEKCZlYi0+cmVsb2NzKTsKIAlJTklUX0xJ U1RfSEVBRCgmZWItPnVuYm91bmQpOwogCisJYmF0Y2ggPSBlYl9iYXRjaF9pbmRleChlYik7CisK IAlmb3IgKGkgPSAwOyBpIDwgZWItPmJ1ZmZlcl9jb3VudDsgaSsrKSB7CiAJCXUzMiBoYW5kbGUg PSBlYi0+ZXhlY1tpXS5oYW5kbGU7CiAJCXN0cnVjdCBpOTE1X2x1dF9oYW5kbGUgKmx1dDsKQEAg LTc3MCwzMyArNzkyLDE2IEBAIHN0YXRpYyBpbnQgZWJfbG9va3VwX3ZtYXMoc3RydWN0IGk5MTVf ZXhlY2J1ZmZlciAqZWIpCiAJCWx1dC0+aGFuZGxlID0gaGFuZGxlOwogCiBhZGRfdm1hOgotCQll cnIgPSBlYl9hZGRfdm1hKGViLCBpLCB2bWEpOworCQllcnIgPSBlYl9hZGRfdm1hKGViLCBpLCBi YXRjaCwgdm1hKTsKIAkJaWYgKHVubGlrZWx5KGVycikpCiAJCQlnb3RvIGVycl92bWE7CiAKIAkJ R0VNX0JVR19PTih2bWEgIT0gZWItPnZtYVtpXSk7CiAJCUdFTV9CVUdfT04odm1hLT5leGVjX2Zs YWdzICE9ICZlYi0+ZmxhZ3NbaV0pOworCQlHRU1fQlVHX09OKGRybV9tbV9ub2RlX2FsbG9jYXRl ZCgmdm1hLT5ub2RlKSAmJgorCQkJICAgZWJfdm1hX21pc3BsYWNlZCgmZWItPmV4ZWNbaV0sIHZt YSwgZWItPmZsYWdzW2ldKSk7CiAJfQogCi0JLyogdGFrZSBub3RlIG9mIHRoZSBiYXRjaCBidWZm ZXIgYmVmb3JlIHdlIG1pZ2h0IHJlb3JkZXIgdGhlIGxpc3RzICovCi0JaSA9IGViX2JhdGNoX2lu ZGV4KGViKTsKLQllYi0+YmF0Y2ggPSBlYi0+dm1hW2ldOwotCUdFTV9CVUdfT04oZWItPmJhdGNo LT5leGVjX2ZsYWdzICE9ICZlYi0+ZmxhZ3NbaV0pOwotCi0JLyoKLQkgKiBTTkEgaXMgZG9pbmcg ZmFuY3kgdHJpY2tzIHdpdGggY29tcHJlc3NpbmcgYmF0Y2ggYnVmZmVycywgd2hpY2ggbGVhZHMK LQkgKiB0byBuZWdhdGl2ZSByZWxvY2F0aW9uIGRlbHRhcy4gVXN1YWxseSB0aGF0IHdvcmtzIG91 dCBvayBzaW5jZSB0aGUKLQkgKiByZWxvY2F0ZSBhZGRyZXNzIGlzIHN0aWxsIHBvc2l0aXZlLCBl eGNlcHQgd2hlbiB0aGUgYmF0Y2ggaXMgcGxhY2VkCi0JICogdmVyeSBsb3cgaW4gdGhlIEdUVC4g RW5zdXJlIHRoaXMgZG9lc24ndCBoYXBwZW4uCi0JICoKLQkgKiBOb3RlIHRoYXQgYWN0dWFsIGhh bmdzIGhhdmUgb25seSBiZWVuIG9ic2VydmVkIG9uIGdlbjcsIGJ1dCBmb3IKLQkgKiBwYXJhbm9p YSBkbyBpdCBldmVyeXdoZXJlLgotCSAqLwotCWlmICghKGViLT5mbGFnc1tpXSAmIEVYRUNfT0JK RUNUX1BJTk5FRCkpCi0JCWViLT5mbGFnc1tpXSB8PSBfX0VYRUNfT0JKRUNUX05FRURTX0JJQVM7 Ci0JaWYgKGViLT5yZWxvY19jYWNoZS5oYXNfZmVuY2UpCi0JCWViLT5mbGFnc1tpXSB8PSBFWEVD X09CSkVDVF9ORUVEU19GRU5DRTsKLQogCWViLT5hcmdzLT5mbGFncyB8PSBfX0VYRUNfVkFMSURB VEVEOwogCXJldHVybiBlYl9yZXNlcnZlKGViKTsKIAotLSAKMi4xNy4xCgpfX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0 CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3Rv cC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK