From: Maarten Lankhorst Subject: [PATCH v2 08/21] drm/i915: Allow mmio updates on all platforms, v2. Date: Tue, 17 May 2016 15:07:51 +0200 Message-ID: <1463490484-19540-9-git-send-email-maarten.lankhorst@linux.intel.com> References: <1463490484-19540-1-git-send-email-maarten.lankhorst@linux.intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mblankhorst.nl (mblankhorst.nl [141.105.120.124]) by gabe.freedesktop.org (Postfix) with ESMTPS id 580226E6D7 for ; Tue, 17 May 2016 13:08:11 +0000 (UTC) In-Reply-To: <1463490484-19540-1-git-send-email-maarten.lankhorst@linux.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 V2l0aCBpbnRlbF9waXBlX3VwZGF0ZSBiZWdpbi9lbmQgd2UgZW5zdXJlIHRoYXQgdGhlIG1taW8g dXBkYXRlcwpkb24ndCBydW4gZHVyaW5nIHZibGFuayBpbnRlcnJ1cHQsIHVzaW5nIHRoZSBodyBj b3VudGVyIHdlIGNhbgpiZSBzdXJlIHRoYXQgd2hlbiBjdXJyZW50IHZibGFuayBjb3VudCAhPSB2 YmxhbmsgY291bnQgYXQgdGhlIHRpbWUKb2YgcGlwZV91cGRhdGVfZW5kIHRoZSBtbWlvIHVwZGF0 ZSBpcyBjb21wbGV0ZS4KClRoaXMgYWxsb3dzIHVzIHRvIHVzZSBtbWlvIHVwZGF0ZXMgb24gYWxs IHBsYXRmb3JtcywgdXNpbmcgdGhlCnVwZGF0ZV9wbGFuZSBjYWxsLgoKV2l0aCBDaHJpcyBXaWxz b24ncyBwYXRjaCB0byBza2lwIHdhaXRpbmcgZm9yIHZibGFua3MgZm9yCmxlZ2FjeV9jdXJzb3Jf dXBkYXRlIHRoaXMgcG90ZW50aWFsbHkgbGVhdmVzIGEgc21hbGwgcmFjZQpjb25kaXRpb24sIGlu IHdoaWNoIHVwZGF0ZV9wbGFuZSBjYW4gYmUgY2FsbGVkIHdpdGggYSBmcmVlZApjcnRjX3N0YXRl LiBCZWNhdXNlIG9mIHRoaXMgY29tbWl0IGFjZjRlODRkNjE2NzMKKCJkcm0vaTkxNTogQXZvaWQg c3RhbGxpbmcgb24gcGVuZGluZyBmbGlwcyBmb3IgbGVnYWN5IGN1cnNvciB1cGRhdGVzIikKaXMg dGVtcG9yYXJpbHkgcmV2ZXJ0ZWQuCgpDaGFuZ2VzIHNpbmNlIHYxOgotIFNwbGl0IG91dCB0aGUg ZmxpcF93b3JrIHJlbmFtZS4KClNpZ25lZC1vZmYtYnk6IE1hYXJ0ZW4gTGFua2hvcnN0IDxtYWFy dGVuLmxhbmtob3JzdEBsaW51eC5pbnRlbC5jb20+Ci0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUv aW50ZWxfZGlzcGxheS5jIHwgOTkgKysrLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t CiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcnYuaCAgICAgfCAgMSAtCiAyIGZpbGVzIGNo YW5nZWQsIDcgaW5zZXJ0aW9ucygrKSwgOTMgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJp dmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUv aW50ZWxfZGlzcGxheS5jCmluZGV4IDY1MjZiYjVhN2FmYi4uNmQyYWY0MmE4NmMxIDEwMDY0NAot LS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMKKysrIGIvZHJpdmVycy9n cHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jCkBAIC0xMTI2OSw5ICsxMTI2OSw2IEBAIHN0YXRp YyBib29sIHVzZV9tbWlvX2ZsaXAoc3RydWN0IGludGVsX2VuZ2luZV9jcyAqZW5naW5lLAogCWlm IChlbmdpbmUgPT0gTlVMTCkKIAkJcmV0dXJuIHRydWU7CiAKLQlpZiAoSU5URUxfR0VOKGVuZ2lu ZS0+aTkxNSkgPCA1KQotCQlyZXR1cm4gZmFsc2U7Ci0KIAlpZiAoaTkxNS51c2VfbW1pb19mbGlw IDwgMCkKIAkJcmV0dXJuIGZhbHNlOwogCWVsc2UgaWYgKGk5MTUudXNlX21taW9fZmxpcCA+IDAp CkBAIC0xMTI4Niw5MiArMTEyODMsMTUgQEAgc3RhdGljIGJvb2wgdXNlX21taW9fZmxpcChzdHJ1 Y3QgaW50ZWxfZW5naW5lX2NzICplbmdpbmUsCiAJCXJldHVybiBlbmdpbmUgIT0gaTkxNV9nZW1f cmVxdWVzdF9nZXRfZW5naW5lKG9iai0+bGFzdF93cml0ZV9yZXEpOwogfQogCi1zdGF0aWMgdm9p ZCBza2xfZG9fbW1pb19mbGlwKHN0cnVjdCBpbnRlbF9jcnRjICppbnRlbF9jcnRjLAotCQkJICAg ICB1bnNpZ25lZCBpbnQgcm90YXRpb24sCi0JCQkgICAgIHN0cnVjdCBpbnRlbF9mbGlwX3dvcmsg KndvcmspCi17Ci0Jc3RydWN0IGRybV9kZXZpY2UgKmRldiA9IGludGVsX2NydGMtPmJhc2UuZGV2 OwotCXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9IGRldi0+ZGV2X3ByaXZhdGU7 Ci0Jc3RydWN0IGRybV9mcmFtZWJ1ZmZlciAqZmIgPSBpbnRlbF9jcnRjLT5iYXNlLnByaW1hcnkt PmZiOwotCWNvbnN0IGVudW0gcGlwZSBwaXBlID0gaW50ZWxfY3J0Yy0+cGlwZTsKLQl1MzIgY3Rs LCBzdHJpZGUsIHRpbGVfaGVpZ2h0OwotCi0JY3RsID0gSTkxNV9SRUFEKFBMQU5FX0NUTChwaXBl LCAwKSk7Ci0JY3RsICY9IH5QTEFORV9DVExfVElMRURfTUFTSzsKLQlzd2l0Y2ggKGZiLT5tb2Rp ZmllclswXSkgewotCWNhc2UgRFJNX0ZPUk1BVF9NT0RfTk9ORToKLQkJYnJlYWs7Ci0JY2FzZSBJ OTE1X0ZPUk1BVF9NT0RfWF9USUxFRDoKLQkJY3RsIHw9IFBMQU5FX0NUTF9USUxFRF9YOwotCQli cmVhazsKLQljYXNlIEk5MTVfRk9STUFUX01PRF9ZX1RJTEVEOgotCQljdGwgfD0gUExBTkVfQ1RM X1RJTEVEX1k7Ci0JCWJyZWFrOwotCWNhc2UgSTkxNV9GT1JNQVRfTU9EX1lmX1RJTEVEOgotCQlj dGwgfD0gUExBTkVfQ1RMX1RJTEVEX1lGOwotCQlicmVhazsKLQlkZWZhdWx0OgotCQlNSVNTSU5H X0NBU0UoZmItPm1vZGlmaWVyWzBdKTsKLQl9Ci0KLQkvKgotCSAqIFRoZSBzdHJpZGUgaXMgZWl0 aGVyIGV4cHJlc3NlZCBhcyBhIG11bHRpcGxlIG9mIDY0IGJ5dGVzIGNodW5rcyBmb3IKLQkgKiBs aW5lYXIgYnVmZmVycyBvciBpbiBudW1iZXIgb2YgdGlsZXMgZm9yIHRpbGVkIGJ1ZmZlcnMuCi0J ICovCi0JaWYgKGludGVsX3JvdGF0aW9uXzkwX29yXzI3MChyb3RhdGlvbikpIHsKLQkJLyogc3Ry aWRlID0gU3VyZmFjZSBoZWlnaHQgaW4gdGlsZXMgKi8KLQkJdGlsZV9oZWlnaHQgPSBpbnRlbF90 aWxlX2hlaWdodChkZXZfcHJpdiwgZmItPm1vZGlmaWVyWzBdLCAwKTsKLQkJc3RyaWRlID0gRElW X1JPVU5EX1VQKGZiLT5oZWlnaHQsIHRpbGVfaGVpZ2h0KTsKLQl9IGVsc2UgewotCQlzdHJpZGUg PSBmYi0+cGl0Y2hlc1swXSAvCi0JCQlpbnRlbF9mYl9zdHJpZGVfYWxpZ25tZW50KGRldl9wcml2 LCBmYi0+bW9kaWZpZXJbMF0sCi0JCQkJCQkgIGZiLT5waXhlbF9mb3JtYXQpOwotCX0KLQotCS8q Ci0JICogQm90aCBQTEFORV9DVEwgYW5kIFBMQU5FX1NUUklERSBhcmUgbm90IHVwZGF0ZWQgb24g dmJsYW5rIGJ1dCBvbgotCSAqIFBMQU5FX1NVUkYgdXBkYXRlcywgdGhlIHVwZGF0ZSBpcyB0aGVu IGd1YXJhbnRlZWQgdG8gYmUgYXRvbWljLgotCSAqLwotCUk5MTVfV1JJVEUoUExBTkVfQ1RMKHBp cGUsIDApLCBjdGwpOwotCUk5MTVfV1JJVEUoUExBTkVfU1RSSURFKHBpcGUsIDApLCBzdHJpZGUp OwotCi0JSTkxNV9XUklURShQTEFORV9TVVJGKHBpcGUsIDApLCB3b3JrLT5ndHRfb2Zmc2V0KTsK LQlQT1NUSU5HX1JFQUQoUExBTkVfU1VSRihwaXBlLCAwKSk7Ci19Ci0KLXN0YXRpYyB2b2lkIGls a19kb19tbWlvX2ZsaXAoc3RydWN0IGludGVsX2NydGMgKmludGVsX2NydGMsCi0JCQkgICAgIHN0 cnVjdCBpbnRlbF9mbGlwX3dvcmsgKndvcmspCi17Ci0Jc3RydWN0IGRybV9kZXZpY2UgKmRldiA9 IGludGVsX2NydGMtPmJhc2UuZGV2OwotCXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJp diA9IGRldi0+ZGV2X3ByaXZhdGU7Ci0Jc3RydWN0IGludGVsX2ZyYW1lYnVmZmVyICppbnRlbF9m YiA9Ci0JCXRvX2ludGVsX2ZyYW1lYnVmZmVyKGludGVsX2NydGMtPmJhc2UucHJpbWFyeS0+ZmIp OwotCXN0cnVjdCBkcm1faTkxNV9nZW1fb2JqZWN0ICpvYmogPSBpbnRlbF9mYi0+b2JqOwotCWk5 MTVfcmVnX3QgcmVnID0gRFNQQ05UUihpbnRlbF9jcnRjLT5wbGFuZSk7Ci0JdTMyIGRzcGNudHI7 Ci0KLQlkc3BjbnRyID0gSTkxNV9SRUFEKHJlZyk7Ci0KLQlpZiAob2JqLT50aWxpbmdfbW9kZSAh PSBJOTE1X1RJTElOR19OT05FKQotCQlkc3BjbnRyIHw9IERJU1BQTEFORV9USUxFRDsKLQllbHNl Ci0JCWRzcGNudHIgJj0gfkRJU1BQTEFORV9USUxFRDsKLQotCUk5MTVfV1JJVEUocmVnLCBkc3Bj bnRyKTsKLQotCUk5MTVfV1JJVEUoRFNQU1VSRihpbnRlbF9jcnRjLT5wbGFuZSksIHdvcmstPmd0 dF9vZmZzZXQpOwotCVBPU1RJTkdfUkVBRChEU1BTVVJGKGludGVsX2NydGMtPnBsYW5lKSk7Ci19 Ci0KIHN0YXRpYyB2b2lkIGludGVsX21taW9fZmxpcF93b3JrX2Z1bmMoc3RydWN0IHdvcmtfc3Ry dWN0ICp3KQogewogCXN0cnVjdCBpbnRlbF9mbGlwX3dvcmsgKndvcmsgPQogCQljb250YWluZXJf b2Yodywgc3RydWN0IGludGVsX2ZsaXBfd29yaywgbW1pb193b3JrKTsKIAlzdHJ1Y3QgaW50ZWxf Y3J0YyAqY3J0YyA9IHRvX2ludGVsX2NydGMod29yay0+Y3J0Yyk7Ci0Jc3RydWN0IGRybV9pOTE1 X3ByaXZhdGUgKmRldl9wcml2ID0gdG9faTkxNShjcnRjLT5iYXNlLmRldik7Ci0Jc3RydWN0IGlu dGVsX2ZyYW1lYnVmZmVyICppbnRlbF9mYiA9Ci0JCXRvX2ludGVsX2ZyYW1lYnVmZmVyKGNydGMt PmJhc2UucHJpbWFyeS0+ZmIpOwotCXN0cnVjdCBkcm1faTkxNV9nZW1fb2JqZWN0ICpvYmogPSBp bnRlbF9mYi0+b2JqOworCXN0cnVjdCBkcm1fZGV2aWNlICpkZXYgPSBjcnRjLT5iYXNlLmRldjsK KwlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSBkZXYtPmRldl9wcml2YXRlOwor CXN0cnVjdCBpbnRlbF9wbGFuZSAqcHJpbWFyeSA9IHRvX2ludGVsX3BsYW5lKGNydGMtPmJhc2Uu cHJpbWFyeSk7CisJc3RydWN0IGRybV9pOTE1X2dlbV9vYmplY3QgKm9iaiA9IGludGVsX2ZiX29i aihwcmltYXJ5LT5iYXNlLnN0YXRlLT5mYik7CiAKIAlpZiAod29yay0+ZmxpcF9xdWV1ZWRfcmVx KQogCQlXQVJOX09OKF9faTkxNV93YWl0X3JlcXVlc3Qod29yay0+ZmxpcF9xdWV1ZWRfcmVxLApA QCAtMTEzODUsMTMgKzExMzA1LDkgQEAgc3RhdGljIHZvaWQgaW50ZWxfbW1pb19mbGlwX3dvcmtf ZnVuYyhzdHJ1Y3Qgd29ya19zdHJ1Y3QgKncpCiAJCQkJCQkJICAgIE1BWF9TQ0hFRFVMRV9USU1F T1VUKSA8IDApOwogCiAJaW50ZWxfcGlwZV91cGRhdGVfc3RhcnQoY3J0Yyk7Ci0KLQlpZiAoSU5U RUxfR0VOKGRldl9wcml2KSA+PSA5KQotCQlza2xfZG9fbW1pb19mbGlwKGNydGMsIHdvcmstPnJv dGF0aW9uLCB3b3JrKTsKLQllbHNlCi0JCS8qIHVzZV9tbWlvX2ZsaXAoKSByZXRyaWN0cyBNTUlP IGZsaXBzIHRvIGlsaysgKi8KLQkJaWxrX2RvX21taW9fZmxpcChjcnRjLCB3b3JrKTsKLQorCXBy aW1hcnktPnVwZGF0ZV9wbGFuZSgmcHJpbWFyeS0+YmFzZSwKKwkJCSAgICAgIGNydGMtPmNvbmZp ZywKKwkJCSAgICAgIHRvX2ludGVsX3BsYW5lX3N0YXRlKHByaW1hcnktPmJhc2Uuc3RhdGUpKTsK IAlpbnRlbF9waXBlX3VwZGF0ZV9lbmQoY3J0Yywgd29yayk7CiB9CiAKQEAgLTExNjE2LDcgKzEx NTMyLDYgQEAgc3RhdGljIGludCBpbnRlbF9jcnRjX3BhZ2VfZmxpcChzdHJ1Y3QgZHJtX2NydGMg KmNydGMsCiAJd29yay0+Z3R0X29mZnNldCA9IGludGVsX3BsYW5lX29ial9vZmZzZXQodG9faW50 ZWxfcGxhbmUocHJpbWFyeSksCiAJCQkJCQkgIG9iaiwgMCk7CiAJd29yay0+Z3R0X29mZnNldCAr PSBpbnRlbF9jcnRjLT5kc3BhZGRyX29mZnNldDsKLQl3b3JrLT5yb3RhdGlvbiA9IGNydGMtPnBy aW1hcnktPnN0YXRlLT5yb3RhdGlvbjsKIAogCWlmIChtbWlvX2ZsaXApIHsKIAkJSU5JVF9XT1JL KCZ3b3JrLT5tbWlvX3dvcmssIGludGVsX21taW9fZmxpcF93b3JrX2Z1bmMpOwpkaWZmIC0tZ2l0 IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHJ2LmggYi9kcml2ZXJzL2dwdS9kcm0vaTkx NS9pbnRlbF9kcnYuaAppbmRleCBmOWEwOWIwZGMwNWUuLmI1MjM1MzczYjFhZCAxMDA2NDQKLS0t IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHJ2LmgKKysrIGIvZHJpdmVycy9ncHUvZHJt L2k5MTUvaW50ZWxfZHJ2LmgKQEAgLTk4Myw3ICs5ODMsNiBAQCBzdHJ1Y3QgaW50ZWxfZmxpcF93 b3JrIHsKIAlzdHJ1Y3QgZHJtX2k5MTVfZ2VtX3JlcXVlc3QgKmZsaXBfcXVldWVkX3JlcTsKIAl1 MzIgZmxpcF9xdWV1ZWRfdmJsYW5rOwogCXUzMiBmbGlwX3JlYWR5X3ZibGFuazsKLQl1bnNpZ25l ZCBpbnQgcm90YXRpb247CiB9OwogCiBzdHJ1Y3QgaW50ZWxfbG9hZF9kZXRlY3RfcGlwZSB7Ci0t IAoyLjUuNQoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18K SW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0 dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4Cg==