From mboxrd@z Thu Jan 1 00:00:00 1970 From: Chris Wilson Subject: [PATCH 3/4] drm/i915: Update rules for writing through the LLC with the cpu Date: Tue, 6 Aug 2013 13:17:04 +0100 Message-ID: <1375791425-14978-3-git-send-email-chris@chris-wilson.co.uk> References: <1375791425-14978-1-git-send-email-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 (s16502780.onlinehome-server.info [87.106.93.118]) by gabe.freedesktop.org (Postfix) with ESMTP id 4E15DE6DCD for ; Tue, 6 Aug 2013 05:17:25 -0700 (PDT) In-Reply-To: <1375791425-14978-1-git-send-email-chris@chris-wilson.co.uk> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: intel-gfx-bounces+gcfxdi-intel-gfx=m.gmane.org@lists.freedesktop.org Errors-To: intel-gfx-bounces+gcfxdi-intel-gfx=m.gmane.org@lists.freedesktop.org To: intel-gfx@lists.freedesktop.org List-Id: intel-gfx@lists.freedesktop.org QXMgbWVudGlvbmVkIGluIHRoZSBwcmV2aW91cyBjb21taXQsIHJlYWRzIGFuZCB3cml0ZXMgZnJv bSBib3RoIHRoZSBDUFUKYW5kIEdQVSBnbyB0aHJvdWdoIHRoZSBMTEMuIFRoaXMgZ2l2ZXMgdXMg Y29oZXJlbmN5IGJldHdlZW4gdGhlIENQVSBhbmQKR1BVIGlycmVzcGVjdGl2ZSBvZiB0aGUgYXR0 cmlidXRlIHNldHRpbmdzIGVpdGhlciBkZXZpY2Ugc2V0cy4gV2UgY2FuCnVzZSB0byBhdm9pZCBo YXZpbmcgdG8gY2xmbHVzaCBldmVuIHVuY2FjaGVkIG1lbW9yeS4KCkV4Y2VwdCBmb3IgdGhlIHNj YW5vdXQuCgpUaGUgc2Nhbm91dCByZXNpZGVzIHdpdGhpbiBhbm90aGVyIGZ1bmN0aW9uYWwgYmxv Y2sgdGhhdCBkb2VzIG5vdCB1c2UKdGhlIExMQyBidXQgcmVhZHMgZGlyZWN0bHkgZnJvbSBtYWlu IG1lbW9yeS4gU28gaW4gb3JkZXIgdG8gbWFpbnRhaW4KY29oZXJlbmN5IHdpdGggdGhlIHNjYW5v dXQsIHdyaXRlcyB0byB1bmNhY2hlZCBtZW1vcnkgbXVzdCBiZSBmbHVzaGVkLgpJbiBvcmRlciB0 byBvcHRpbWl6ZSB3cml0ZXMgZWxzZXdoZXJlLCB3ZSBzdGFydCB0cmFja2luZyB3aGV0aGVyIGFu CmZyYW1lYnVmZmVyIGlzIGF0dGFjaGVkIHRvIGFuIG9iamVjdC4KClNpZ25lZC1vZmYtYnk6IFZp bGxlIFN5cmrDpGzDpCA8dmlsbGUuc3lyamFsYUBsaW51eC5pbnRlbC5jb20+ClNpZ25lZC1vZmYt Ynk6IENocmlzIFdpbHNvbiA8Y2hyaXNAY2hyaXMtd2lsc29uLmNvLnVrPgotLS0KIGRyaXZlcnMv Z3B1L2RybS9pOTE1L2k5MTVfZHJ2LmggICAgICB8ICAzICsrKwogZHJpdmVycy9ncHUvZHJtL2k5 MTUvaTkxNV9nZW0uYyAgICAgIHwgMjcgKysrKysrKysrKysrKysrKystLS0tLS0tLS0tCiBkcml2 ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMgfCAgMyArKysKIDMgZmlsZXMgY2hhbmdl ZCwgMjMgaW5zZXJ0aW9ucygrKSwgMTAgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVy cy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuaCBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2 LmgKaW5kZXggYWExMTczMS4uOTNjNDc4OSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5 MTUvaTkxNV9kcnYuaAorKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5oCkBAIC0x NDA3LDYgKzE0MDcsOSBAQCBzdHJ1Y3QgZHJtX2k5MTVfZ2VtX29iamVjdCB7CiAJLyoqIGZvciBw aHkgYWxsb2NhdGVkIG9iamVjdHMgKi8KIAlzdHJ1Y3QgZHJtX2k5MTVfZ2VtX3BoeXNfb2JqZWN0 ICpwaHlzX29iajsKIAorCS8qKiBUcmFjayBmcmFtZWJ1ZmZlcnMgYXNzb2NpYXRlZCB3aXRoIHRo aXMgb2JqZWN0ICovCisJYXRvbWljX3QgZmJfY291bnQ7CisKIAl1bmlvbiB7CiAJCXN0cnVjdCBp OTE1X2dlbV91c2VycHRyIHsKIAkJCXVpbnRwdHJfdCBwdHI7CmRpZmYgLS1naXQgYS9kcml2ZXJz L2dwdS9kcm0vaTkxNS9pOTE1X2dlbS5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW0u YwppbmRleCA1NjcxZGFiLi45ODA1NjkzIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkx NS9pOTE1X2dlbS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtLmMKQEAgLTY2 LDYgKzY2LDE0IEBAIHN0YXRpYyBib29sIGNwdV9jYWNoZV9pc19jb2hlcmVudChzdHJ1Y3QgZHJt X2RldmljZSAqZGV2LAogCXJldHVybiBIQVNfTExDKGRldikgfHwgbGV2ZWwgIT0gSTkxNV9DQUNI RV9OT05FOwogfQogCitzdGF0aWMgYm9vbCBjcHVfd3JpdGVfbmVlZHNfY2xmbHVzaChzdHJ1Y3Qg ZHJtX2k5MTVfZ2VtX29iamVjdCAqb2JqKQoreworCWlmICghY3B1X2NhY2hlX2lzX2NvaGVyZW50 KG9iai0+YmFzZS5kZXYsIG9iai0+Y2FjaGVfbGV2ZWwpKQorCQlyZXR1cm4gdHJ1ZTsKKworCXJl dHVybiBhdG9taWNfcmVhZCgmb2JqLT5mYl9jb3VudCkgPiAwOworfQorCiBzdGF0aWMgaW5saW5l IHZvaWQgaTkxNV9nZW1fb2JqZWN0X2ZlbmNlX2xvc3Qoc3RydWN0IGRybV9pOTE1X2dlbV9vYmpl Y3QgKm9iaikKIHsKIAlpZiAob2JqLT50aWxpbmdfbW9kZSkKQEAgLTgzMiw4ICs4NDAsNyBAQCBp OTE1X2dlbV9zaG1lbV9wd3JpdGUoc3RydWN0IGRybV9kZXZpY2UgKmRldiwKIAkJICogd3JpdGUg ZG9tYWluIGFuZCBtYW51YWxseSBmbHVzaCBjYWNoZWxpbmVzIChpZiByZXF1aXJlZCkuIFRoaXMK IAkJICogb3B0aW1pemVzIGZvciB0aGUgY2FzZSB3aGVuIHRoZSBncHUgd2lsbCB1c2UgdGhlIGRh dGEKIAkJICogcmlnaHQgYXdheSBhbmQgd2UgdGhlcmVmb3JlIGhhdmUgdG8gY2xmbHVzaCBhbnl3 YXkuICovCi0JCWlmIChvYmotPmNhY2hlX2xldmVsID09IEk5MTVfQ0FDSEVfTk9ORSkKLQkJCW5l ZWRzX2NsZmx1c2hfYWZ0ZXIgPSAxOworCQluZWVkc19jbGZsdXNoX2FmdGVyID0gY3B1X3dyaXRl X25lZWRzX2NsZmx1c2gob2JqKTsKIAkJaWYgKGk5MTVfZ2VtX29ial9nZ3R0X2JvdW5kKG9iaikp IHsKIAkJCXJldCA9IGk5MTVfZ2VtX29iamVjdF9zZXRfdG9fZ3R0X2RvbWFpbihvYmosIHRydWUp OwogCQkJaWYgKHJldCkKQEAgLTEwMDEsOSArMTAwOCw4IEBAIGk5MTVfZ2VtX3B3cml0ZV9pb2N0 bChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LCB2b2lkICpkYXRhLAogCQlnb3RvIG91dDsKIAl9CiAK LQlpZiAob2JqLT5jYWNoZV9sZXZlbCA9PSBJOTE1X0NBQ0hFX05PTkUgJiYKLQkgICAgb2JqLT50 aWxpbmdfbW9kZSA9PSBJOTE1X1RJTElOR19OT05FICYmCi0JICAgIG9iai0+YmFzZS53cml0ZV9k b21haW4gIT0gSTkxNV9HRU1fRE9NQUlOX0NQVSkgeworCWlmIChvYmotPnRpbGluZ19tb2RlID09 IEk5MTVfVElMSU5HX05PTkUgJiYKKwkgICAgIWNwdV93cml0ZV9uZWVkc19jbGZsdXNoKG9iaikp IHsKIAkJcmV0ID0gaTkxNV9nZW1fZ3R0X3B3cml0ZV9mYXN0KGRldiwgb2JqLCBhcmdzLCBmaWxl KTsKIAkJLyogTm90ZSB0aGF0IHRoZSBndHQgcGF0aHMgbWlnaHQgZmFpbCB3aXRoIG5vbi1wYWdl LWJhY2tlZCB1c2VyCiAJCSAqIHBvaW50ZXJzIChlLmcuIGd0dCBtYXBwaW5ncyB3aGVuIG1vdmlu ZyBkYXRhIGJldHdlZW4KQEAgLTMyOTksNyArMzMwNSw3IEBAIGk5MTVfZ2VtX2NsZmx1c2hfb2Jq ZWN0KHN0cnVjdCBkcm1faTkxNV9nZW1fb2JqZWN0ICpvYmopCiAJICogc25vb3BpbmcgYmVoYXZp b3VyIG9jY3VycyBuYXR1cmFsbHkgYXMgdGhlIHJlc3VsdCBvZiBvdXIgZG9tYWluCiAJICogdHJh Y2tpbmcuCiAJICovCi0JaWYgKG9iai0+Y2FjaGVfbGV2ZWwgIT0gSTkxNV9DQUNIRV9OT05FKQor CWlmICghY3B1X3dyaXRlX25lZWRzX2NsZmx1c2gob2JqKSkKIAkJcmV0dXJuOwogCiAJdHJhY2Vf aTkxNV9nZW1fb2JqZWN0X2NsZmx1c2gob2JqKTsKQEAgLTM0NjIsNyArMzQ2OCwxMSBAQCBpbnQg aTkxNV9nZW1fb2JqZWN0X3NldF9jYWNoZV9sZXZlbChzdHJ1Y3QgZHJtX2k5MTVfZ2VtX29iamVj dCAqb2JqLAogCQkJCQkgICAgICAgb2JqLCBjYWNoZV9sZXZlbCk7CiAJfQogCi0JaWYgKGNhY2hl X2xldmVsID09IEk5MTVfQ0FDSEVfTk9ORSkgeworCWxpc3RfZm9yX2VhY2hfZW50cnkodm1hLCAm b2JqLT52bWFfbGlzdCwgdm1hX2xpbmspCisJCXZtYS0+bm9kZS5jb2xvciA9IGNhY2hlX2xldmVs OworCW9iai0+Y2FjaGVfbGV2ZWwgPSBjYWNoZV9sZXZlbDsKKworCWlmIChjcHVfd3JpdGVfbmVl ZHNfY2xmbHVzaChvYmopKSB7CiAJCXUzMiBvbGRfcmVhZF9kb21haW5zLCBvbGRfd3JpdGVfZG9t YWluOwogCiAJCS8qIElmIHdlJ3JlIGNvbWluZyBmcm9tIExMQyBjYWNoZWQsIHRoZW4gd2UgaGF2 ZW4ndApAQCAtMzQ4NSw5ICszNDk1LDYgQEAgaW50IGk5MTVfZ2VtX29iamVjdF9zZXRfY2FjaGVf bGV2ZWwoc3RydWN0IGRybV9pOTE1X2dlbV9vYmplY3QgKm9iaiwKIAkJCQkJCSAgICBvbGRfd3Jp dGVfZG9tYWluKTsKIAl9CiAKLQlsaXN0X2Zvcl9lYWNoX2VudHJ5KHZtYSwgJm9iai0+dm1hX2xp c3QsIHZtYV9saW5rKQotCQl2bWEtPm5vZGUuY29sb3IgPSBjYWNoZV9sZXZlbDsKLQlvYmotPmNh Y2hlX2xldmVsID0gY2FjaGVfbGV2ZWw7CiAJaTkxNV9nZW1fdmVyaWZ5X2d0dChkZXYpOwogCXJl dHVybiAwOwogfQpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxh eS5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jCmluZGV4IDA1ODQ0ODAu LmNjNWVhYmEgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXku YworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMKQEAgLTk0NDMsNiAr OTQ0Myw4IEBAIHN0YXRpYyB2b2lkIGludGVsX3VzZXJfZnJhbWVidWZmZXJfZGVzdHJveShzdHJ1 Y3QgZHJtX2ZyYW1lYnVmZmVyICpmYikKIAlzdHJ1Y3QgaW50ZWxfZnJhbWVidWZmZXIgKmludGVs X2ZiID0gdG9faW50ZWxfZnJhbWVidWZmZXIoZmIpOwogCiAJZHJtX2ZyYW1lYnVmZmVyX2NsZWFu dXAoZmIpOworCisJYXRvbWljX2RlYygmaW50ZWxfZmItPm9iai0+ZmJfY291bnQpOwogCWRybV9n ZW1fb2JqZWN0X3VucmVmZXJlbmNlX3VubG9ja2VkKCZpbnRlbF9mYi0+b2JqLT5iYXNlKTsKIAog CWtmcmVlKGludGVsX2ZiKTsKQEAgLTk1NjgsNiArOTU3MCw3IEBAIGludCBpbnRlbF9mcmFtZWJ1 ZmZlcl9pbml0KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsCiAJCXJldHVybiByZXQ7CiAJfQogCisJ YXRvbWljX2luYygmb2JqLT5mYl9jb3VudCk7CiAJcmV0dXJuIDA7CiB9CiAKLS0gCjEuOC40LnJj MQoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KSW50ZWwt Z2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHA6Ly9s aXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK