From: Maarten Lankhorst Subject: [PATCH 07/19] drm/i915: Allow mmio updates on all platforms, v2. Date: Tue, 19 Apr 2016 09:52:27 +0200 Message-ID: <1461052359-24154-8-git-send-email-maarten.lankhorst@linux.intel.com> References: <1461052359-24154-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 [IPv6:2a02:2308::216:3eff:fe92:dfa3]) by gabe.freedesktop.org (Postfix) with ESMTPS id 52C286E6C7 for ; Tue, 19 Apr 2016 07:52:49 +0000 (UTC) In-Reply-To: <1461052359-24154-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 aW50ZWxfZGlzcGxheS5jIHwgMTA1ICsrKystLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t CiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcnYuaCAgICAgfCAgIDEgLQogMiBmaWxlcyBj aGFuZ2VkLCAxMiBpbnNlcnRpb25zKCspLCA5NCBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9k cml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkx NS9pbnRlbF9kaXNwbGF5LmMKaW5kZXggOGI2MWEwN2M0YzUyLi5kMTE4MTA4OTUxMmEgMTAwNjQ0 Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYworKysgYi9kcml2ZXJz L2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMKQEAgLTExMzI0LDkgKzExMzI0LDYgQEAgc3Rh dGljIGJvb2wgdXNlX21taW9fZmxpcChzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICplbmdpbmUsCiAJ aWYgKGVuZ2luZSA9PSBOVUxMKQogCQlyZXR1cm4gdHJ1ZTsKIAotCWlmIChJTlRFTF9JTkZPKGVu Z2luZS0+ZGV2KS0+Z2VuIDwgNSkKLQkJcmV0dXJuIGZhbHNlOwotCiAJaWYgKGk5MTUudXNlX21t aW9fZmxpcCA8IDApCiAJCXJldHVybiBmYWxzZTsKIAllbHNlIGlmIChpOTE1LnVzZV9tbWlvX2Zs aXAgPiAwKQpAQCAtMTEzNDEsOTIgKzExMzM4LDE1IEBAIHN0YXRpYyBib29sIHVzZV9tbWlvX2Zs aXAoc3RydWN0IGludGVsX2VuZ2luZV9jcyAqZW5naW5lLAogCQlyZXR1cm4gZW5naW5lICE9IGk5 MTVfZ2VtX3JlcXVlc3RfZ2V0X2VuZ2luZShvYmotPmxhc3Rfd3JpdGVfcmVxKTsKIH0KIAotc3Rh dGljIHZvaWQgc2tsX2RvX21taW9fZmxpcChzdHJ1Y3QgaW50ZWxfY3J0YyAqaW50ZWxfY3J0YywK LQkJCSAgICAgdW5zaWduZWQgaW50IHJvdGF0aW9uLAotCQkJICAgICBzdHJ1Y3QgaW50ZWxfZmxp cF93b3JrICp3b3JrKQotewotCXN0cnVjdCBkcm1fZGV2aWNlICpkZXYgPSBpbnRlbF9jcnRjLT5i YXNlLmRldjsKLQlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSBkZXYtPmRldl9w cml2YXRlOwotCXN0cnVjdCBkcm1fZnJhbWVidWZmZXIgKmZiID0gaW50ZWxfY3J0Yy0+YmFzZS5w cmltYXJ5LT5mYjsKLQljb25zdCBlbnVtIHBpcGUgcGlwZSA9IGludGVsX2NydGMtPnBpcGU7Ci0J dTMyIGN0bCwgc3RyaWRlLCB0aWxlX2hlaWdodDsKLQotCWN0bCA9IEk5MTVfUkVBRChQTEFORV9D VEwocGlwZSwgMCkpOwotCWN0bCAmPSB+UExBTkVfQ1RMX1RJTEVEX01BU0s7Ci0Jc3dpdGNoIChm Yi0+bW9kaWZpZXJbMF0pIHsKLQljYXNlIERSTV9GT1JNQVRfTU9EX05PTkU6Ci0JCWJyZWFrOwot CWNhc2UgSTkxNV9GT1JNQVRfTU9EX1hfVElMRUQ6Ci0JCWN0bCB8PSBQTEFORV9DVExfVElMRURf WDsKLQkJYnJlYWs7Ci0JY2FzZSBJOTE1X0ZPUk1BVF9NT0RfWV9USUxFRDoKLQkJY3RsIHw9IFBM QU5FX0NUTF9USUxFRF9ZOwotCQlicmVhazsKLQljYXNlIEk5MTVfRk9STUFUX01PRF9ZZl9USUxF RDoKLQkJY3RsIHw9IFBMQU5FX0NUTF9USUxFRF9ZRjsKLQkJYnJlYWs7Ci0JZGVmYXVsdDoKLQkJ TUlTU0lOR19DQVNFKGZiLT5tb2RpZmllclswXSk7Ci0JfQotCi0JLyoKLQkgKiBUaGUgc3RyaWRl IGlzIGVpdGhlciBleHByZXNzZWQgYXMgYSBtdWx0aXBsZSBvZiA2NCBieXRlcyBjaHVua3MgZm9y Ci0JICogbGluZWFyIGJ1ZmZlcnMgb3IgaW4gbnVtYmVyIG9mIHRpbGVzIGZvciB0aWxlZCBidWZm ZXJzLgotCSAqLwotCWlmIChpbnRlbF9yb3RhdGlvbl85MF9vcl8yNzAocm90YXRpb24pKSB7Ci0J CS8qIHN0cmlkZSA9IFN1cmZhY2UgaGVpZ2h0IGluIHRpbGVzICovCi0JCXRpbGVfaGVpZ2h0ID0g aW50ZWxfdGlsZV9oZWlnaHQoZGV2X3ByaXYsIGZiLT5tb2RpZmllclswXSwgMCk7Ci0JCXN0cmlk ZSA9IERJVl9ST1VORF9VUChmYi0+aGVpZ2h0LCB0aWxlX2hlaWdodCk7Ci0JfSBlbHNlIHsKLQkJ c3RyaWRlID0gZmItPnBpdGNoZXNbMF0gLwotCQkJaW50ZWxfZmJfc3RyaWRlX2FsaWdubWVudChk ZXZfcHJpdiwgZmItPm1vZGlmaWVyWzBdLAotCQkJCQkJICBmYi0+cGl4ZWxfZm9ybWF0KTsKLQl9 Ci0KLQkvKgotCSAqIEJvdGggUExBTkVfQ1RMIGFuZCBQTEFORV9TVFJJREUgYXJlIG5vdCB1cGRh dGVkIG9uIHZibGFuayBidXQgb24KLQkgKiBQTEFORV9TVVJGIHVwZGF0ZXMsIHRoZSB1cGRhdGUg aXMgdGhlbiBndWFyYW50ZWVkIHRvIGJlIGF0b21pYy4KLQkgKi8KLQlJOTE1X1dSSVRFKFBMQU5F X0NUTChwaXBlLCAwKSwgY3RsKTsKLQlJOTE1X1dSSVRFKFBMQU5FX1NUUklERShwaXBlLCAwKSwg c3RyaWRlKTsKLQotCUk5MTVfV1JJVEUoUExBTkVfU1VSRihwaXBlLCAwKSwgd29yay0+Z3R0X29m ZnNldCk7Ci0JUE9TVElOR19SRUFEKFBMQU5FX1NVUkYocGlwZSwgMCkpOwotfQotCi1zdGF0aWMg dm9pZCBpbGtfZG9fbW1pb19mbGlwKHN0cnVjdCBpbnRlbF9jcnRjICppbnRlbF9jcnRjLAotCQkJ ICAgICBzdHJ1Y3QgaW50ZWxfZmxpcF93b3JrICp3b3JrKQotewotCXN0cnVjdCBkcm1fZGV2aWNl ICpkZXYgPSBpbnRlbF9jcnRjLT5iYXNlLmRldjsKLQlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAq ZGV2X3ByaXYgPSBkZXYtPmRldl9wcml2YXRlOwotCXN0cnVjdCBpbnRlbF9mcmFtZWJ1ZmZlciAq aW50ZWxfZmIgPQotCQl0b19pbnRlbF9mcmFtZWJ1ZmZlcihpbnRlbF9jcnRjLT5iYXNlLnByaW1h cnktPmZiKTsKLQlzdHJ1Y3QgZHJtX2k5MTVfZ2VtX29iamVjdCAqb2JqID0gaW50ZWxfZmItPm9i ajsKLQlpOTE1X3JlZ190IHJlZyA9IERTUENOVFIoaW50ZWxfY3J0Yy0+cGxhbmUpOwotCXUzMiBk c3BjbnRyOwotCi0JZHNwY250ciA9IEk5MTVfUkVBRChyZWcpOwotCi0JaWYgKG9iai0+dGlsaW5n X21vZGUgIT0gSTkxNV9USUxJTkdfTk9ORSkKLQkJZHNwY250ciB8PSBESVNQUExBTkVfVElMRUQ7 Ci0JZWxzZQotCQlkc3BjbnRyICY9IH5ESVNQUExBTkVfVElMRUQ7Ci0KLQlJOTE1X1dSSVRFKHJl ZywgZHNwY250cik7Ci0KLQlJOTE1X1dSSVRFKERTUFNVUkYoaW50ZWxfY3J0Yy0+cGxhbmUpLCB3 b3JrLT5ndHRfb2Zmc2V0KTsKLQlQT1NUSU5HX1JFQUQoRFNQU1VSRihpbnRlbF9jcnRjLT5wbGFu ZSkpOwotfQotCiBzdGF0aWMgdm9pZCBpbnRlbF9tbWlvX2ZsaXBfd29ya19mdW5jKHN0cnVjdCB3 b3JrX3N0cnVjdCAqdykKIHsKIAlzdHJ1Y3QgaW50ZWxfZmxpcF93b3JrICp3b3JrID0KIAkJY29u dGFpbmVyX29mKHcsIHN0cnVjdCBpbnRlbF9mbGlwX3dvcmssIG1taW9fd29yayk7CiAJc3RydWN0 IGludGVsX2NydGMgKmNydGMgPSB0b19pbnRlbF9jcnRjKHdvcmstPmNydGMpOwotCXN0cnVjdCBk cm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9IHRvX2k5MTUoY3J0Yy0+YmFzZS5kZXYpOwotCXN0 cnVjdCBpbnRlbF9mcmFtZWJ1ZmZlciAqaW50ZWxfZmIgPQotCQl0b19pbnRlbF9mcmFtZWJ1ZmZl cihjcnRjLT5iYXNlLnByaW1hcnktPmZiKTsKLQlzdHJ1Y3QgZHJtX2k5MTVfZ2VtX29iamVjdCAq b2JqID0gaW50ZWxfZmItPm9iajsKKwlzdHJ1Y3QgZHJtX2RldmljZSAqZGV2ID0gY3J0Yy0+YmFz ZS5kZXY7CisJc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0gZGV2LT5kZXZfcHJp dmF0ZTsKKwlzdHJ1Y3QgaW50ZWxfcGxhbmUgKnByaW1hcnkgPSB0b19pbnRlbF9wbGFuZShjcnRj LT5iYXNlLnByaW1hcnkpOworCXN0cnVjdCBkcm1faTkxNV9nZW1fb2JqZWN0ICpvYmogPSBpbnRl bF9mYl9vYmoocHJpbWFyeS0+YmFzZS5zdGF0ZS0+ZmIpOwogCiAJaWYgKHdvcmstPmZsaXBfcXVl dWVkX3JlcSkKIAkJV0FSTl9PTihfX2k5MTVfd2FpdF9yZXF1ZXN0KHdvcmstPmZsaXBfcXVldWVk X3JlcSwKQEAgLTExNDQwLDEzICsxMTM2MCw5IEBAIHN0YXRpYyB2b2lkIGludGVsX21taW9fZmxp cF93b3JrX2Z1bmMoc3RydWN0IHdvcmtfc3RydWN0ICp3KQogCQkJCQkJCSAgICBNQVhfU0NIRURV TEVfVElNRU9VVCkgPCAwKTsKIAogCWludGVsX3BpcGVfdXBkYXRlX3N0YXJ0KGNydGMpOwotCi0J aWYgKElOVEVMX0dFTihkZXZfcHJpdikgPj0gOSkKLQkJc2tsX2RvX21taW9fZmxpcChjcnRjLCB3 b3JrLT5yb3RhdGlvbiwgd29yayk7Ci0JZWxzZQotCQkvKiB1c2VfbW1pb19mbGlwKCkgcmV0cmlj dHMgTU1JTyBmbGlwcyB0byBpbGsrICovCi0JCWlsa19kb19tbWlvX2ZsaXAoY3J0Yywgd29yayk7 Ci0KKwlwcmltYXJ5LT51cGRhdGVfcGxhbmUoJnByaW1hcnktPmJhc2UsCisJCQkgICAgICBjcnRj LT5jb25maWcsCisJCQkgICAgICB0b19pbnRlbF9wbGFuZV9zdGF0ZShwcmltYXJ5LT5iYXNlLnN0 YXRlKSk7CiAJaW50ZWxfcGlwZV91cGRhdGVfZW5kKGNydGMsIHdvcmspOwogfQogCkBAIC0xMTQ3 OSw2ICsxMTM5NSwxMCBAQCBzdGF0aWMgYm9vbCBfX2ludGVsX3BhZ2VmbGlwX3N0YWxsX2NoZWNr KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsCiAJc21wX21iX19hZnRlcl9hdG9taWMoKTsKIAl2Ymxh bmsgPSBpbnRlbF9jcnRjX2dldF92YmxhbmtfY291bnRlcihpbnRlbF9jcnRjKTsKIAorCWlmIChp c19tbWlvX3dvcmsod29yaykpCisJCS8qIE1NSU8gd29yayBjb21wbGV0ZXMgd2hlbiB2Ymxhbmsg aXMgZGlmZmVyZW50IGZyb20gZmxpcF9xdWV1ZWRfdmJsYW5rLiAqLworCQlyZXR1cm4gdmJsYW5r ICE9IHdvcmstPmZsaXBfcXVldWVkX3ZibGFuazsKKwogCWlmICh3b3JrLT5mbGlwX3JlYWR5X3Zi bGFuayA9PSAwKSB7CiAJCWlmICh3b3JrLT5mbGlwX3F1ZXVlZF9yZXEgJiYKIAkJICAgICFpOTE1 X2dlbV9yZXF1ZXN0X2NvbXBsZXRlZCh3b3JrLT5mbGlwX3F1ZXVlZF9yZXEsIHRydWUpKQpAQCAt MTE1MTksNyArMTE0MzksNyBAQCB2b2lkIGludGVsX2NoZWNrX3BhZ2VfZmxpcChzdHJ1Y3QgZHJt X2RldmljZSAqZGV2LCBpbnQgcGlwZSkKIAlzcGluX2xvY2soJmRldi0+ZXZlbnRfbG9jayk7CiAJ d29yayA9IGludGVsX2NydGMtPmZsaXBfd29yazsKIAlpZiAod29yayAhPSBOVUxMICYmIF9faW50 ZWxfcGFnZWZsaXBfc3RhbGxfY2hlY2soZGV2LCBjcnRjKSkgewotCQlXQVJOX09OQ0UoMSwKKwkJ V0FSTl9PTkNFKCFpc19tbWlvX3dvcmsod29yayksCiAJCQkgICJLaWNraW5nIHN0dWNrIHBhZ2Ug ZmxpcDogcXVldWVkIGF0ICVkLCBub3cgJWRcbiIsCiAJCQkgd29yay0+ZmxpcF9xdWV1ZWRfdmJs YW5rLCBpbnRlbF9jcnRjX2dldF92YmxhbmtfY291bnRlcihpbnRlbF9jcnRjKSk7CiAJCXBhZ2Vf ZmxpcF9jb21wbGV0ZWQoaW50ZWxfY3J0Yyk7CkBAIC0xMTY3NSw3ICsxMTU5NSw2IEBAIHN0YXRp YyBpbnQgaW50ZWxfY3J0Y19wYWdlX2ZsaXAoc3RydWN0IGRybV9jcnRjICpjcnRjLAogCXdvcmst Pmd0dF9vZmZzZXQgPSBpbnRlbF9wbGFuZV9vYmpfb2Zmc2V0KHRvX2ludGVsX3BsYW5lKHByaW1h cnkpLAogCQkJCQkJICBvYmosIDApOwogCXdvcmstPmd0dF9vZmZzZXQgKz0gaW50ZWxfY3J0Yy0+ ZHNwYWRkcl9vZmZzZXQ7Ci0Jd29yay0+cm90YXRpb24gPSBjcnRjLT5wcmltYXJ5LT5zdGF0ZS0+ cm90YXRpb247CiAKIAlpZiAobW1pb19mbGlwKSB7CiAJCUlOSVRfV09SSygmd29yay0+bW1pb193 b3JrLCBpbnRlbF9tbWlvX2ZsaXBfd29ya19mdW5jKTsKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1 L2RybS9pOTE1L2ludGVsX2Rydi5oIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHJ2LmgK aW5kZXggZTEwZTY5NTlmZDQzLi5iYzMxMDUxM2FkYjggMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1 L2RybS9pOTE1L2ludGVsX2Rydi5oCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Ry di5oCkBAIC05NTAsNyArOTUwLDYgQEAgc3RydWN0IGludGVsX2ZsaXBfd29yayB7CiAJc3RydWN0 IGRybV9pOTE1X2dlbV9yZXF1ZXN0ICpmbGlwX3F1ZXVlZF9yZXE7CiAJdTMyIGZsaXBfcXVldWVk X3ZibGFuazsKIAl1MzIgZmxpcF9yZWFkeV92Ymxhbms7Ci0JdW5zaWduZWQgaW50IHJvdGF0aW9u OwogfTsKIAogc3RydWN0IGludGVsX2xvYWRfZGV0ZWN0X3BpcGUgewotLSAKMi4xLjAKCl9fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCkludGVsLWdmeCBtYWls aW5nIGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZy ZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeAo=