From mboxrd@z Thu Jan 1 00:00:00 1970 From: ville.syrjala@linux.intel.com Subject: [PATCH 7/8] drm/i915: Keep track if we have local memory Date: Thu, 28 Nov 2013 17:15:09 +0200 Message-ID: <1385651710-7768-8-git-send-email-ville.syrjala@linux.intel.com> References: <1385651710-7768-1-git-send-email-ville.syrjala@linux.intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" 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 94854FB599 for ; Thu, 28 Nov 2013 07:15:53 -0800 (PST) In-Reply-To: <1385651710-7768-1-git-send-email-ville.syrjala@linux.intel.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: intel-gfx-bounces@lists.freedesktop.org Errors-To: intel-gfx-bounces@lists.freedesktop.org To: intel-gfx@lists.freedesktop.org List-Id: intel-gfx@lists.freedesktop.org RnJvbTogVmlsbGUgU3lyasOkbMOkIDx2aWxsZS5zeXJqYWxhQGxpbnV4LmludGVsLmNvbT4KCmlu dGVsLWd0dCB3aWxsIHRlbGwgdXMgaWYgd2UgaGF2ZSBsb2NhbCBtZW1vcnkgYXMgb3Bwb3NlZCB0 byBzdG9sZW4KbWVtb3J5LiBNYWtlIGEgbm90ZSBvZiB0aGF0IGluIGRldl9wcml2LT5ndHQuaGFz X2xvY2FsX21lbW9yeS4KCkxvY2FsIG1lbW9yeSBzdGFydHMgYXQgb2Zmc2V0IDAgZnJvbSB0aGUg R1BVJ3MgcG9pbnQgb2Ygdmlldywgc28gd2UKbmVlZCB0byBhZGQgYSBzbWFsbCBleGNlcHRpb24g dG8gY29uc2lkZXIgc3RvbGVuX2Jhc2U9PTAgYXMgdmFsaWQKd2hlbiBsb2NhbCBtZW1vcnkgaXMg cHJlc2VudC4KClRoZSBvdGhlciBwYXJ0IG9mIHRoZSBzdG9yeSBpcyBlbmNvZGluZyB0aGUgUFRF cyBjb3JyZWN0bHkuIFRvIG1ha2UKdGhhdCBoYXBwZW4gc2V0IHRoZSBjYWNoZV9sZXZlbCB0byBJ OTE1X0NBQ0hFX0xPQ0FMIGZvciBhbGwKc3RvbGVuIG9iamVjdHMgd2hlbiBsb2NhbCBtZW1vcnkg aXMgcHJlc2VudC4KClNpZ25lZC1vZmYtYnk6IFZpbGxlIFN5cmrDpGzDpCA8dmlsbGUuc3lyamFs YUBsaW51eC5pbnRlbC5jb20+Ci0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuaCAg ICAgICAgfCAgNiArKysrLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2d0dC5jICAg IHwgMTcgKysrKysrKysrKystLS0tLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX3N0 b2xlbi5jIHwgMTUgKysrKysrKysrKystLS0tCiAzIGZpbGVzIGNoYW5nZWQsIDI2IGluc2VydGlv bnMoKyksIDEyIGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1 L2k5MTVfZHJ2LmggYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5oCmluZGV4IDllZTcy NWYuLjJkOWExYjMgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmgK KysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuaApAQCAtNTg5LDEzICs1ODksMTUg QEAgc3RydWN0IGk5MTVfZ3R0IHsKIAl2b2lkIF9faW9tZW0gKmdzbTsKIAogCWJvb2wgZG9faWRs ZV9tYXBzOworCWJvb2wgaGFzX2xvY2FsX21lbW9yeTsKIAogCWludCBtdHJyOwogCiAJLyogZ2xv YmFsIGd0dCBvcHMgKi8KIAlpbnQgKCpndHRfcHJvYmUpKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYs IHNpemVfdCAqZ3R0X3RvdGFsLAotCQkJICBzaXplX3QgKnN0b2xlbiwgcGh5c19hZGRyX3QgKm1h cHBhYmxlX2Jhc2UsCi0JCQkgIHVuc2lnbmVkIGxvbmcgKm1hcHBhYmxlX2VuZCk7CisJCQkgc2l6 ZV90ICpzdG9sZW4sIHBoeXNfYWRkcl90ICptYXBwYWJsZV9iYXNlLAorCQkJIHVuc2lnbmVkIGxv bmcgKm1hcHBhYmxlX2VuZCwKKwkJCSBib29sICpoYXNfbG9jYWxfbWVtb3J5KTsKIH07CiAjZGVm aW5lIGd0dF90b3RhbF9lbnRyaWVzKGd0dCkgKChndHQpLmJhc2UudG90YWwgPj4gUEFHRV9TSElG VCkKIApkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fZ3R0LmMgYi9k cml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9ndHQuYwppbmRleCAwZWI2MjAzLi5jMTU0ZDgw IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9ndHQuYworKysgYi9k cml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9ndHQuYwpAQCAtMTM0OCw3ICsxMzQ4LDggQEAg c3RhdGljIGludCBnZW44X2dtY2hfcHJvYmUoc3RydWN0IGRybV9kZXZpY2UgKmRldiwKIAkJCSAg IHNpemVfdCAqZ3R0X3RvdGFsLAogCQkJICAgc2l6ZV90ICpzdG9sZW4sCiAJCQkgICBwaHlzX2Fk ZHJfdCAqbWFwcGFibGVfYmFzZSwKLQkJCSAgIHVuc2lnbmVkIGxvbmcgKm1hcHBhYmxlX2VuZCkK KwkJCSAgIHVuc2lnbmVkIGxvbmcgKm1hcHBhYmxlX2VuZCwKKwkJCSAgIGJvb2wgKmhhc19sb2Nh bF9tZW1vcnkpCiB7CiAJc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0gZGV2LT5k ZXZfcHJpdmF0ZTsKIAl1bnNpZ25lZCBpbnQgZ3R0X3NpemU7CkBAIC0xMzU4LDYgKzEzNTksNyBA QCBzdGF0aWMgaW50IGdlbjhfZ21jaF9wcm9iZShzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LAogCS8q IFRPRE86IFdlJ3JlIG5vdCBhd2FyZSBvZiBtYXBwYWJsZSBjb25zdHJhaW50cyBvbiBnZW44IHll dCAqLwogCSptYXBwYWJsZV9iYXNlID0gcGNpX3Jlc291cmNlX3N0YXJ0KGRldi0+cGRldiwgMik7 CiAJKm1hcHBhYmxlX2VuZCA9IHBjaV9yZXNvdXJjZV9sZW4oZGV2LT5wZGV2LCAyKTsKKwkqaGFz X2xvY2FsX21lbW9yeSA9IGZhbHNlOwogCiAJaWYgKCFwY2lfc2V0X2RtYV9tYXNrKGRldi0+cGRl diwgRE1BX0JJVF9NQVNLKDM5KSkpCiAJCXBjaV9zZXRfY29uc2lzdGVudF9kbWFfbWFzayhkZXYt PnBkZXYsIERNQV9CSVRfTUFTSygzOSkpOwpAQCAtMTM4Myw3ICsxMzg1LDggQEAgc3RhdGljIGlu dCBnZW42X2dtY2hfcHJvYmUoc3RydWN0IGRybV9kZXZpY2UgKmRldiwKIAkJCSAgIHNpemVfdCAq Z3R0X3RvdGFsLAogCQkJICAgc2l6ZV90ICpzdG9sZW4sCiAJCQkgICBwaHlzX2FkZHJfdCAqbWFw cGFibGVfYmFzZSwKLQkJCSAgIHVuc2lnbmVkIGxvbmcgKm1hcHBhYmxlX2VuZCkKKwkJCSAgIHVu c2lnbmVkIGxvbmcgKm1hcHBhYmxlX2VuZCwKKwkJCSAgIGJvb2wgKmhhc19sb2NhbF9tZW1vcnkp CiB7CiAJc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0gZGV2LT5kZXZfcHJpdmF0 ZTsKIAl1bnNpZ25lZCBpbnQgZ3R0X3NpemU7CkBAIC0xMzkyLDYgKzEzOTUsNyBAQCBzdGF0aWMg aW50IGdlbjZfZ21jaF9wcm9iZShzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LAogCiAJKm1hcHBhYmxl X2Jhc2UgPSBwY2lfcmVzb3VyY2Vfc3RhcnQoZGV2LT5wZGV2LCAyKTsKIAkqbWFwcGFibGVfZW5k ID0gcGNpX3Jlc291cmNlX2xlbihkZXYtPnBkZXYsIDIpOworCSpoYXNfbG9jYWxfbWVtb3J5ID0g ZmFsc2U7CiAKIAkvKiA2NC81MTJNQiBpcyB0aGUgY3VycmVudCBtaW4vbWF4IHdlIGFjdHVhbGx5 IGtub3cgb2YsIGJ1dCB0aGlzIGlzIGp1c3QKIAkgKiBhIGNvYXJzZSBzYW5pdHkgY2hlY2suCkBA IC0xNDMzLDEwICsxNDM3LDEwIEBAIHN0YXRpYyBpbnQgaTkxNV9nbWNoX3Byb2JlKHN0cnVjdCBk cm1fZGV2aWNlICpkZXYsCiAJCQkgICBzaXplX3QgKmd0dF90b3RhbCwKIAkJCSAgIHNpemVfdCAq c3RvbGVuLAogCQkJICAgcGh5c19hZGRyX3QgKm1hcHBhYmxlX2Jhc2UsCi0JCQkgICB1bnNpZ25l ZCBsb25nICptYXBwYWJsZV9lbmQpCisJCQkgICB1bnNpZ25lZCBsb25nICptYXBwYWJsZV9lbmQs CisJCQkgICBib29sICpoYXNfbG9jYWxfbWVtb3J5KQogewogCXN0cnVjdCBkcm1faTkxNV9wcml2 YXRlICpkZXZfcHJpdiA9IGRldi0+ZGV2X3ByaXZhdGU7Ci0JYm9vbCBoYXNfbG9jYWxfbWVtb3J5 OwogCWludCByZXQ7CiAKIAlyZXQgPSBpbnRlbF9nbWNoX3Byb2JlKGRldl9wcml2LT5icmlkZ2Vf ZGV2LCBkZXZfcHJpdi0+ZGV2LT5wZGV2LCBOVUxMKTsKQEAgLTE0NDUsNyArMTQ0OSw3IEBAIHN0 YXRpYyBpbnQgaTkxNV9nbWNoX3Byb2JlKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsCiAJCXJldHVy biAtRUlPOwogCX0KIAotCWludGVsX2d0dF9nZXQoZ3R0X3RvdGFsLCBzdG9sZW4sIG1hcHBhYmxl X2Jhc2UsIG1hcHBhYmxlX2VuZCwgJmhhc19sb2NhbF9tZW1vcnkpOworCWludGVsX2d0dF9nZXQo Z3R0X3RvdGFsLCBzdG9sZW4sIG1hcHBhYmxlX2Jhc2UsIG1hcHBhYmxlX2VuZCwgaGFzX2xvY2Fs X21lbW9yeSk7CiAKIAlkZXZfcHJpdi0+Z3R0LmRvX2lkbGVfbWFwcyA9IG5lZWRzX2lkbGVfbWFw cyhkZXZfcHJpdi0+ZGV2KTsKIAlkZXZfcHJpdi0+Z3R0LmJhc2UuY2xlYXJfcmFuZ2UgPSBpOTE1 X2dndHRfY2xlYXJfcmFuZ2U7CkBAIC0xNDg3LDcgKzE0OTEsOCBAQCBpbnQgaTkxNV9nZW1fZ3R0 X2luaXQoc3RydWN0IGRybV9kZXZpY2UgKmRldikKIAl9CiAKIAlyZXQgPSBndHQtPmd0dF9wcm9i ZShkZXYsICZndHQtPmJhc2UudG90YWwsICZndHQtPnN0b2xlbl9zaXplLAotCQkJICAgICAmZ3R0 LT5tYXBwYWJsZV9iYXNlLCAmZ3R0LT5tYXBwYWJsZV9lbmQpOworCQkJICAgICAmZ3R0LT5tYXBw YWJsZV9iYXNlLCAmZ3R0LT5tYXBwYWJsZV9lbmQsCisJCQkgICAgICZndHQtPmhhc19sb2NhbF9t ZW1vcnkpOwogCWlmIChyZXQpCiAJCXJldHVybiByZXQ7CiAKZGlmZiAtLWdpdCBhL2RyaXZlcnMv Z3B1L2RybS9pOTE1L2k5MTVfZ2VtX3N0b2xlbi5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkx NV9nZW1fc3RvbGVuLmMKaW5kZXggZDI4NGQ4OS4uMzllNjQwNCAxMDA2NDQKLS0tIGEvZHJpdmVy cy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fc3RvbGVuLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5 MTUvaTkxNV9nZW1fc3RvbGVuLmMKQEAgLTIwNSwxMSArMjA1LDE0IEBAIGludCBpOTE1X2dlbV9p bml0X3N0b2xlbihzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KQogCQlyZXR1cm4gMDsKIAogCWRldl9w cml2LT5tbS5zdG9sZW5fYmFzZSA9IGk5MTVfc3RvbGVuX3RvX3BoeXNpY2FsKGRldik7Ci0JaWYg KGRldl9wcml2LT5tbS5zdG9sZW5fYmFzZSA9PSAwKQorCWlmICghZGV2X3ByaXYtPmd0dC5oYXNf bG9jYWxfbWVtb3J5ICYmCisJICAgIGRldl9wcml2LT5tbS5zdG9sZW5fYmFzZSA9PSAwKQogCQly ZXR1cm4gMDsKIAotCURSTV9ERUJVR19LTVMoImZvdW5kICV6ZCBieXRlcyBvZiBzdG9sZW4gbWVt b3J5IGF0ICUwOGx4XG4iLAotCQkgICAgICBkZXZfcHJpdi0+Z3R0LnN0b2xlbl9zaXplLCBkZXZf cHJpdi0+bW0uc3RvbGVuX2Jhc2UpOworCURSTV9ERUJVR19LTVMoImZvdW5kICV6ZCBieXRlcyBv ZiAlcyBtZW1vcnkgYXQgJTA4bHhcbiIsCisJCSAgICAgIGRldl9wcml2LT5ndHQuc3RvbGVuX3Np emUsCisJCSAgICAgIGRldl9wcml2LT5ndHQuaGFzX2xvY2FsX21lbW9yeSA/ICJsb2NhbCIgOiAi c3RvbGVuIiwKKwkJICAgICAgZGV2X3ByaXYtPm1tLnN0b2xlbl9iYXNlKTsKIAogCWlmIChJU19W QUxMRVlWSUVXKGRldikpCiAJCWJpb3NfcmVzZXJ2ZWQgPSAxMDI0KjEwMjQ7IC8qIHRvcCAxTSBv biBWTFYvQllUICovCkBAIC0yODEsNiArMjg0LDcgQEAgc3RhdGljIHN0cnVjdCBkcm1faTkxNV9n ZW1fb2JqZWN0ICoKIF9pOTE1X2dlbV9vYmplY3RfY3JlYXRlX3N0b2xlbihzdHJ1Y3QgZHJtX2Rl dmljZSAqZGV2LAogCQkJICAgICAgIHN0cnVjdCBkcm1fbW1fbm9kZSAqc3RvbGVuKQogeworCXN0 cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9IGRldi0+ZGV2X3ByaXZhdGU7CiAJc3Ry dWN0IGRybV9pOTE1X2dlbV9vYmplY3QgKm9iajsKIAogCW9iaiA9IGk5MTVfZ2VtX29iamVjdF9h bGxvYyhkZXYpOwpAQCAtMzAwLDcgKzMwNCwxMCBAQCBfaTkxNV9nZW1fb2JqZWN0X2NyZWF0ZV9z dG9sZW4oc3RydWN0IGRybV9kZXZpY2UgKmRldiwKIAlvYmotPnN0b2xlbiA9IHN0b2xlbjsKIAog CW9iai0+YmFzZS5yZWFkX2RvbWFpbnMgPSBJOTE1X0dFTV9ET01BSU5fQ1BVIHwgSTkxNV9HRU1f RE9NQUlOX0dUVDsKLQlvYmotPmNhY2hlX2xldmVsID0gSEFTX0xMQyhkZXYpID8gSTkxNV9DQUNI RV9MTEMgOiBJOTE1X0NBQ0hFX05PTkU7CisJaWYgKGRldl9wcml2LT5ndHQuaGFzX2xvY2FsX21l bW9yeSkKKwkJb2JqLT5jYWNoZV9sZXZlbCA9IEk5MTVfQ0FDSEVfTE9DQUw7CisJZWxzZQorCQlv YmotPmNhY2hlX2xldmVsID0gSEFTX0xMQyhkZXYpID8gSTkxNV9DQUNIRV9MTEMgOiBJOTE1X0NB Q0hFX05PTkU7CiAKIAlyZXR1cm4gb2JqOwogCi0tIAoxLjguMy4yCgpfX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0Cklu dGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cDovL2xpc3RzLmZyZWVkZXNrdG9wLm9y Zy9tYWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeAo=