From: Matt Roper Subject: [PATCH 08/16] drm/i915/gen9: Compute DDB allocation at atomic check time Date: Thu, 31 Mar 2016 18:46:30 -0700 Message-ID: <1459475198-30094-9-git-send-email-matthew.d.roper@intel.com> References: <1459475198-30094-1-git-send-email-matthew.d.roper@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by gabe.freedesktop.org (Postfix) with ESMTP id E94B76EB37 for ; Fri, 1 Apr 2016 01:47:47 +0000 (UTC) In-Reply-To: <1459475198-30094-1-git-send-email-matthew.d.roper@intel.com> 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 Q2FsY3VsYXRlIHRoZSBEREIgYmxvY2tzIG5lZWRlZCB0byBzYXRpc2Z5IHRoZSBjdXJyZW50IGF0 b21pYwp0cmFuc2FjdGlvbiBhdCBhdG9taWMgY2hlY2sgdGltZS4gIFRoaXMgaXMgYSBwcmVyZXF1 aXNpdGUgdG8gY2FsY3VsYXRpbmcKU0tMIHdhdGVybWFya3MgZHVyaW5nIHRoZSAnY2hlY2snIHBo YXNlIGFuZCByZWplY3RpbmcgYW55IGNvbmZpZ3VyYXRpb25zCnRoYXQgd2UgY2FuJ3QgZmluZCB2 YWxpZCB3YXRlcm1hcmtzIGZvci4KCkR1ZSB0byB0aGUgbmF0dXJlIG9mIEREQiBhbGxvY2F0aW9u LCBpdCdzIHBvc3NpYmxlIGZvciB0aGUgYWRkaXRpb24gb2YgYQpuZXcgQ1JUQyB0byBtYWtlIHRo ZSB3YXRlcm1hcmsgY29uZmlndXJhdGlvbiBhbHJlYWR5IGluIHVzZSBvbiBhbm90aGVyLAp1bmNo YW5nZWQgQ1JUQyBiZWNvbWUgaW52YWxpZC4gIEEgY2hhbmdlIGluIHdoaWNoIENSVEMncyBhcmUg YWN0aXZlCnRyaWdnZXJzIGEgcmVjb21wdXRlIG9mIHRoZSBlbnRpcmUgRERCLCB3aGljaCB1bmZv cnR1bmF0ZWx5IG1lYW5zIHdlCm5lZWQgdG8gZGlzYWxsb3cgYW55IG90aGVyIGF0b21pYyBjb21t aXRzIGZyb20gcmFjaW5nIHdpdGggc3VjaCBhbgp1cGRhdGUuICBJZiB0aGUgYWN0aXZlIENSVEMn cyBjaGFuZ2UsIHdlIG5lZWQgdG8gZ3JhYiB0aGUgbG9jayBvbiBhbGwKQ1JUQydzIGFuZCBydW4g YWxsIENSVEMncyB0aHJvdWdoIHRoZWlyICdjaGVjaycgaGFuZGxlciB0byByZWNvbXB1dGUgYW5k CnJlLWNoZWNrIHRoZWlyIHBlci1DUlRDIEREQiBhbGxvY2F0aW9ucy4KCk5vdGUgdGhhdCB3aXRo IHRoaXMgcGF0Y2ggd2Ugb25seSBjb21wdXRlIHRoZSBEREIgYWxsb2NhdGlvbiBidXQgd2UKZG9u J3QgYWN0dWFsbHkgdXNlIHRoZSBjb21wdXRlZCB2YWx1ZXMgZHVyaW5nIHdhdGVybWFyayBwcm9n cmFtbWluZyB5ZXQuCkZvciBlYXNlIG9mIHJldmlldy90ZXN0aW5nL2Jpc2VjdGluZywgd2Ugc3Rp bGwgcmVjb21wdXRlIHRoZSBEREIgYXQKd2F0ZXJtYXJrIHByb2dyYW1taW5nIHRpbWUgYW5kIGp1 c3QgV0FSTigpIGlmIGl0IGRvZXNuJ3QgbWF0Y2ggdGhlCnByZWNvbXB1dGVkIHZhbHVlcy4gIEEg ZnV0dXJlIHBhdGNoIHdpbGwgc3dpdGNoIG92ZXIgdG8gdXNpbmcgdGhlCnByZWNvbXB1dGVkIHZh bHVlcyBvbmNlIHdlJ3JlIHN1cmUgdGhleSdyZSBiZWluZyBwcm9wZXJseSBjb21wdXRlZC4KCkFu b3RoZXIgY2xhcmlmeWluZyBub3RlOiAgRERCIGFsbG9jYXRpb24gaXRzZWxmIHNob3VsZG4ndCBl dmVyIGZhaWwgd2l0aAp0aGUgYWxnb3JpdGhtIHdlIHVzZSB0b2RheSAoaS5lLiwgd2UgaGF2ZSBl bm91Z2ggRERCIGJsb2NrcyBvbiBCWFQgdG8Kc3VwcG9ydCB0aGUgbWluaW11bSBuZWVkcyBvZiB0 aGUgd29yc3QtY2FzZSBzY2VuYXJpbyBvZiBldmVyeSBwaXBlL3BsYW5lCmVuYWJsZWQgYXQgZnVs bCBzaXplKS4gIEhvd2V2ZXIgdGhlIHdhdGVybWFya3MgY2FsY3VsYXRpb25zIGJhc2VkIG9uIHRo ZQpEREIgbWF5IGZhaWwgYW5kIHdlJ2xsIGJlIG1vdmluZyB0aG9zZSB0byB0aGUgYXRvbWljIGNo ZWNrIGFzIHdlbGwgaW4KZnV0dXJlIHBhdGNoZXMuCgpTaWduZWQtb2ZmLWJ5OiBNYXR0IFJvcGVy IDxtYXR0aGV3LmQucm9wZXJAaW50ZWwuY29tPgotLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5 MTVfZHJ2LmggICAgICB8ICA1ICsrKysKIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3Bs YXkuYyB8IDE4ICsrKysrKysrKysrKwogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHJ2Lmgg ICAgIHwgIDMgKysKIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3BtLmMgICAgICB8IDUzICsr KysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKwogNCBmaWxlcyBjaGFuZ2VkLCA3OSBp bnNlcnRpb25zKCspCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYu aCBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmgKaW5kZXggNzlmMTk3NC4uMzVjZWJk NCAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuaAorKysgYi9kcml2 ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5oCkBAIC0zMzMsNiArMzMzLDEwIEBAIHN0cnVjdCBp OTE1X2hvdHBsdWcgewogI2RlZmluZSBmb3JfZWFjaF9pbnRlbF9jcnRjKGRldiwgaW50ZWxfY3J0 YykgXAogCWxpc3RfZm9yX2VhY2hfZW50cnkoaW50ZWxfY3J0YywgJmRldi0+bW9kZV9jb25maWcu Y3J0Y19saXN0LCBiYXNlLmhlYWQpCiAKKyNkZWZpbmUgZm9yX2VhY2hfaW50ZWxfY3J0Y19tYXNr KGRldiwgaW50ZWxfY3J0YywgY3J0Y19tYXNrKSBcCisJbGlzdF9mb3JfZWFjaF9lbnRyeShpbnRl bF9jcnRjLCAmZGV2LT5tb2RlX2NvbmZpZy5jcnRjX2xpc3QsIGJhc2UuaGVhZCkgXAorCQlmb3Jf ZWFjaF9pZiAoKGNydGNfbWFzaykgJiAoMSA8PCBkcm1fY3J0Y19pbmRleCgmaW50ZWxfY3J0Yy0+ YmFzZSkpKQorCiAjZGVmaW5lIGZvcl9lYWNoX2ludGVsX2VuY29kZXIoZGV2LCBpbnRlbF9lbmNv ZGVyKQkJXAogCWxpc3RfZm9yX2VhY2hfZW50cnkoaW50ZWxfZW5jb2RlciwJCQlcCiAJCQkgICAg JihkZXYpLT5tb2RlX2NvbmZpZy5lbmNvZGVyX2xpc3QsCVwKQEAgLTU4Nyw2ICs1OTEsNyBAQCBz dHJ1Y3QgZHJtX2k5MTVfZGlzcGxheV9mdW5jcyB7CiAJCQkJICAgICAgIHN0cnVjdCBpbnRlbF9j cnRjX3N0YXRlICpuZXdzdGF0ZSk7CiAJdm9pZCAoKmluaXRpYWxfd2F0ZXJtYXJrcykoc3RydWN0 IGludGVsX2NydGNfc3RhdGUgKmNzdGF0ZSk7CiAJdm9pZCAoKm9wdGltaXplX3dhdGVybWFya3Mp KHN0cnVjdCBpbnRlbF9jcnRjX3N0YXRlICpjc3RhdGUpOworCWludCAoKmNvbXB1dGVfZ2xvYmFs X3dhdGVybWFya3MpKHN0cnVjdCBkcm1fYXRvbWljX3N0YXRlICpzdGF0ZSk7CiAJdm9pZCAoKnVw ZGF0ZV93bSkoc3RydWN0IGRybV9jcnRjICpjcnRjKTsKIAlpbnQgKCptb2Rlc2V0X2NhbGNfY2Rj bGspKHN0cnVjdCBkcm1fYXRvbWljX3N0YXRlICpzdGF0ZSk7CiAJdm9pZCAoKm1vZGVzZXRfY29t bWl0X2NkY2xrKShzdHJ1Y3QgZHJtX2F0b21pY19zdGF0ZSAqc3RhdGUpOwpkaWZmIC0tZ2l0IGEv ZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jIGIvZHJpdmVycy9ncHUvZHJtL2k5 MTUvaW50ZWxfZGlzcGxheS5jCmluZGV4IGFiMWZjM2QuLjZiZjJlZGUgMTAwNjQ0Ci0tLSBhL2Ry aXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYworKysgYi9kcml2ZXJzL2dwdS9kcm0v aTkxNS9pbnRlbF9kaXNwbGF5LmMKQEAgLTEzMjMwLDYgKzEzMjMwLDcgQEAgc3RhdGljIGludCBp bnRlbF9tb2Rlc2V0X2NoZWNrcyhzdHJ1Y3QgZHJtX2F0b21pY19zdGF0ZSAqc3RhdGUpCiBzdGF0 aWMgdm9pZCBjYWxjX3dhdGVybWFya19kYXRhKHN0cnVjdCBkcm1fYXRvbWljX3N0YXRlICpzdGF0 ZSkKIHsKIAlzdHJ1Y3QgZHJtX2RldmljZSAqZGV2ID0gc3RhdGUtPmRldjsKKwlzdHJ1Y3QgZHJt X2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSB0b19pOTE1KGRldik7CiAJc3RydWN0IGludGVsX2F0 b21pY19zdGF0ZSAqaW50ZWxfc3RhdGUgPSB0b19pbnRlbF9hdG9taWNfc3RhdGUoc3RhdGUpOwog CXN0cnVjdCBkcm1fY3J0YyAqY3J0YzsKIAlzdHJ1Y3QgZHJtX2NydGNfc3RhdGUgKmNzdGF0ZTsK QEAgLTEzMjU5LDYgKzEzMjYwLDEwIEBAIHN0YXRpYyB2b2lkIGNhbGNfd2F0ZXJtYXJrX2RhdGEo c3RydWN0IGRybV9hdG9taWNfc3RhdGUgKnN0YXRlKQogCQkgICAgcHN0YXRlLT5jcnRjX2ggIT0g cHN0YXRlLT5zcmNfaCA+PiAxNikKIAkJCWludGVsX3N0YXRlLT53bV9jb25maWcuc3ByaXRlc19z Y2FsZWQgPSB0cnVlOwogCX0KKworCS8qIElzIHRoZXJlIHBsYXRmb3JtLXNwZWNpZmljIHdhdGVy bWFyayBpbmZvcm1hdGlvbiB0byBjYWxjdWxhdGU/ICovCisJaWYgKGRldl9wcml2LT5kaXNwbGF5 LmNvbXB1dGVfZ2xvYmFsX3dhdGVybWFya3MpCisJCWRldl9wcml2LT5kaXNwbGF5LmNvbXB1dGVf Z2xvYmFsX3dhdGVybWFya3Moc3RhdGUpOwogfQogCiAvKioKQEAgLTEzNjMxLDYgKzEzNjM2LDE5 IEBAIHN0YXRpYyBpbnQgaW50ZWxfYXRvbWljX2NvbW1pdChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2 LAogCQkJbW9kZXNldF9wdXRfcG93ZXJfZG9tYWlucyhkZXZfcHJpdiwgcHV0X2RvbWFpbnNbaV0p OwogCX0KIAorCS8qCisJICogVGVtcG9yYXJ5IHNhbml0eSBjaGVjazogbWFrZSBzdXJlIG91ciBw cmUtY29tcHV0ZWQgRERCIG1hdGNoZXMgdGhlCisJICogb25lIHdlIGFjdHVhbGx5IHdpbmQgdXAg cHJvZ3JhbW1pbmcuCisJICoKKwkgKiBOb3QgYSBncmVhdCBwbGFjZSB0byBwdXQgdGhpcywgYnV0 IHRoZSBlYXNpZXN0IHBsYWNlIHdlIGhhdmUgYWNjZXNzCisJICogdG8gYm90aCB0aGUgcHJlLWNv bXB1dGVkIGFuZCBmaW5hbCBEREInczsgd2UnbGwgYmUgcmVtb3ZpbmcgdGhpcworCSAqIGNoZWNr IGluIHRoZSBuZXh0IHBhdGNoIGFueXdheS4KKwkgKi8KKwlXQVJOKElTX0dFTjkoZGV2KSAmJgor CSAgICAgbWVtY21wKCZpbnRlbF9zdGF0ZS0+ZGRiLCAmZGV2X3ByaXYtPndtLnNrbF9yZXN1bHRz LmRkYiwKKwkJICAgIHNpemVvZihpbnRlbF9zdGF0ZS0+ZGRiKSksCisJICAgICAiUHJlLWNvbXB1 dGVkIEREQiBkb2VzIG5vdCBtYXRjaCBmaW5hbCBEREIhXG4iKTsKKwogCWlmIChpbnRlbF9zdGF0 ZS0+bW9kZXNldCkKIAkJaW50ZWxfZGlzcGxheV9wb3dlcl9wdXQoZGV2X3ByaXYsIFBPV0VSX0RP TUFJTl9NT0RFU0VUKTsKIApkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxf ZHJ2LmggYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcnYuaAppbmRleCAzYjljMDg0Li40 ODMyNjFjIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcnYuaAorKysg Yi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcnYuaApAQCAtMzAxLDYgKzMwMSw5IEBAIHN0 cnVjdCBpbnRlbF9hdG9taWNfc3RhdGUgewogCSAqIGRvbid0IGJvdGhlciBjYWxjdWxhdGluZyBp bnRlcm1lZGlhdGUgd2F0ZXJtYXJrcy4KIAkgKi8KIAlib29sIHNraXBfaW50ZXJtZWRpYXRlX3dt OworCisJLyogR2VuOSsgb25seSAqLworCXN0cnVjdCBza2xfZGRiX2FsbG9jYXRpb24gZGRiOwog fTsKIAogc3RydWN0IGludGVsX3BsYW5lX3N0YXRlIHsKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1 L2RybS9pOTE1L2ludGVsX3BtLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9wbS5jCmlu ZGV4IGUwY2EyYjkuLjhlMjgzY2YgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2lu dGVsX3BtLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcG0uYwpAQCAtMzczNiw2 ICszNzM2LDU4IEBAIHN0YXRpYyB2b2lkIHNrbF9jbGVhcl93bShzdHJ1Y3Qgc2tsX3dtX3ZhbHVl cyAqd2F0ZXJtYXJrcywgZW51bSBwaXBlIHBpcGUpCiAKIH0KIAorc3RhdGljIGludAorc2tsX2Nv bXB1dGVfZGRiKHN0cnVjdCBkcm1fYXRvbWljX3N0YXRlICpzdGF0ZSkKK3sKKwlzdHJ1Y3QgZHJt X2RldmljZSAqZGV2ID0gc3RhdGUtPmRldjsKKwlzdHJ1Y3QgaW50ZWxfYXRvbWljX3N0YXRlICpp bnRlbF9zdGF0ZSA9IHRvX2ludGVsX2F0b21pY19zdGF0ZShzdGF0ZSk7CisJc3RydWN0IGludGVs X2NydGMgKmludGVsX2NydGM7CisJdW5zaWduZWQgcmVhbGxvY19waXBlcyA9IGludGVsX3N0YXRl LT5hY3RpdmVfY3J0Y3M7CisJaW50IHJldDsKKworCS8qCisJICogSWYgdGhlIG1vZGVzZXQgY2hh bmdlcyB3aGljaCBDUlRDJ3MgYXJlIGFjdGl2ZSwgd2UgbmVlZCB0bworCSAqIHJlY29tcHV0ZSB0 aGUgRERCIGFsbG9jYXRpb24gZm9yICphbGwqIGFjdGl2ZSBwaXBlcywgZXZlbgorCSAqIHRob3Nl IHRoYXQgd2VyZW4ndCBvdGhlcndpc2UgYmVpbmcgbW9kaWZpZWQgaW4gYW55IHdheSBieSB0aGlz CisJICogYXRvbWljIGNvbW1pdC4gIER1ZSB0byB0aGUgc2hyaW5raW5nIG9mIHRoZSBwZXItcGlw ZSBhbGxvY2F0aW9ucworCSAqIHdoZW4gbmV3IGFjdGl2ZSBDUlRDJ3MgYXJlIGFkZGVkLCBpdCdz IHBvc3NpYmxlIGZvciBhIHBpcGUgdGhhdAorCSAqIHdlIHdlcmUgYWxyZWFkeSB1c2luZyBhbmQg YXJlbid0IGNoYW5naW5nIGF0IGFsbCBoZXJlIHRvIHN1ZGRlbmx5CisJICogYmVjb21lIGludmFs aWQgaWYgaXRzIEREQiBuZWVkcyBleGNlZWRzIGl0cyBuZXcgYWxsb2NhdGlvbi4KKwkgKgorCSAq IE5vdGUgdGhhdCBpZiB3ZSB3aW5kIHVwIGRvaW5nIGEgZnVsbCBEREIgcmVjb21wdXRlLCB3ZSBj YW4ndCBsZXQKKwkgKiBhbnkgb3RoZXIgZGlzcGxheSB1cGRhdGVzIHJhY2Ugd2l0aCB0aGlzIHRy YW5zYWN0aW9uLCBzbyB3ZSBuZWVkCisJICogdG8gZ3JhYiB0aGUgbG9jayBvbiAqYWxsKiBDUlRD J3MuCisJICovCisJaWYgKGludGVsX3N0YXRlLT5hY3RpdmVfY3J0Y3MgIT0gdG9faTkxNShkZXYp LT5hY3RpdmVfY3J0Y3MpCisJCXJlYWxsb2NfcGlwZXMgPSB+MDsKKworCWZvcl9lYWNoX2ludGVs X2NydGNfbWFzayhkZXYsIGludGVsX2NydGMsIHJlYWxsb2NfcGlwZXMpIHsKKwkJc3RydWN0IGlu dGVsX2NydGNfc3RhdGUgKmNzdGF0ZTsKKworCQljc3RhdGUgPSBpbnRlbF9hdG9taWNfZ2V0X2Ny dGNfc3RhdGUoc3RhdGUsIGludGVsX2NydGMpOworCQlpZiAoSVNfRVJSKGNzdGF0ZSkpCisJCQly ZXR1cm4gUFRSX0VSUihjc3RhdGUpOworCisJCXJldCA9IHNrbF9hbGxvY2F0ZV9waXBlX2RkYihj c3RhdGUsICZpbnRlbF9zdGF0ZS0+ZGRiKTsKKwkJaWYgKHJldCkKKwkJCXJldHVybiByZXQ7CisJ fQorCisJcmV0dXJuIDA7Cit9CisKK3N0YXRpYyBpbnQKK3NrbF9jb21wdXRlX3dtKHN0cnVjdCBk cm1fYXRvbWljX3N0YXRlICpzdGF0ZSkKK3sKKwlpbnQgcmV0OworCisJcmV0ID0gc2tsX2NvbXB1 dGVfZGRiKHN0YXRlKTsKKwlpZiAocmV0KQorCQlyZXR1cm4gcmV0OworCisJcmV0dXJuIDA7Cit9 CisKIHN0YXRpYyB2b2lkIHNrbF91cGRhdGVfd20oc3RydWN0IGRybV9jcnRjICpjcnRjKQogewog CXN0cnVjdCBpbnRlbF9jcnRjICppbnRlbF9jcnRjID0gdG9faW50ZWxfY3J0YyhjcnRjKTsKQEAg LTcyNTIsNiArNzMwNCw3IEBAIHZvaWQgaW50ZWxfaW5pdF9wbShzdHJ1Y3QgZHJtX2RldmljZSAq ZGV2KQogCWlmIChJTlRFTF9JTkZPKGRldiktPmdlbiA+PSA5KSB7CiAJCXNrbF9zZXR1cF93bV9s YXRlbmN5KGRldik7CiAJCWRldl9wcml2LT5kaXNwbGF5LnVwZGF0ZV93bSA9IHNrbF91cGRhdGVf d207CisJCWRldl9wcml2LT5kaXNwbGF5LmNvbXB1dGVfZ2xvYmFsX3dhdGVybWFya3MgPSBza2xf Y29tcHV0ZV93bTsKIAl9IGVsc2UgaWYgKEhBU19QQ0hfU1BMSVQoZGV2KSkgewogCQlpbGtfc2V0 dXBfd21fbGF0ZW5jeShkZXYpOwogCi0tIAoyLjEuNAoKX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhA bGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxt YW4vbGlzdGluZm8vaW50ZWwtZ2Z4Cg==