From mboxrd@z Thu Jan 1 00:00:00 1970 From: Dave Gordon Subject: [PATCH v5 02/11] drm/i915: consolidate LRC mode HWSP setup & teardown Date: Fri, 5 Feb 2016 18:33:39 +0000 Message-ID: <1454697228-33164-3-git-send-email-david.s.gordon@intel.com> References: <1454697228-33164-1-git-send-email-david.s.gordon@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) by gabe.freedesktop.org (Postfix) with ESMTP id 04E3A6EA4C for ; Fri, 5 Feb 2016 10:34:02 -0800 (PST) In-Reply-To: <1454697228-33164-1-git-send-email-david.s.gordon@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 SW4gbGVnYWN5IHJpbmdidWZmZXIgbW9kZSwgdGhlIEhXU1AgaXMgYSBzZXBhcmF0ZSBHRU0gb2Jq ZWN0IHdpdGggaXRzCm93biBwaW5uaW5nIGFuZCByZWZlcmVuY2UgY291bnRzLiBJbiBMUkMgbW9k ZSwgaG93ZXZlciwgaXQncyBub3Q7Cmluc3RlYWQgaXRzIHBhcnQgb2YgdGhlIGRlZmF1bHQgY29u dGV4dCBvYmplY3QuIFRoZSBMUkMtbW9kZSBzZXR1cCAmCnRlYXJkb3duIGNvZGUgdGhlcmVmb3Jl IG5lZWRzIHRvIGhhbmRsZSB0aGlzIHNwZWNpYWxseTsgdGhlIHByZXNlbmNlCm9mIHRoZSB0d28g YnVncyBmaXhlZCBpbiB0aGlzIHBhdGNoc2V0IHN1Z2dlc3RzIHRoYXQgdGhpcyBjb2RlIGlzIG5v dAp3ZWxsLXVuZGVyc3Rvb2Qgb3IgbWFpbnRhaW5lZCBhdCBwcmVzZW50LgoKU28sIHRoaXMgcGF0 Y2g6CiAgICBtb3ZlcyB0aGUgKG5ld2x5LWZpeGVkISkgTFJDLW1vZGUgSFdTUCB0ZWFyZG93biBj b2RlIHRvIGl0cyBvd24KICAgICAgICAodHJpdmlhbCkgZnVuY3Rpb24gbHJjX3RlYXJkb3duX2hh cmR3YXJlX3N0YXR1c19wYWdlKCksIGFuZAogICAgY2hhbmdlcyB0aGUgY2FsbCBzaWduYXR1cmUg b2YgbHJjX3NldHVwX2hhcmR3YXJlX3N0YXR1c19wYWdlKCkKICAgICAgICB0byBtYXRjaApzbyB0 aGF0IGFsbCBrbm93bGVkZ2Ugb2YgdGhpcyBzcGVjaWFsIGFycmFuZ2VtZW50IGlzIGxvY2FsIHRv IHRoZXNlCnR3byBmdW5jdGlvbnMuCgp2MzogUmViYXNlZAoKU2lnbmVkLW9mZi1ieTogRGF2ZSBH b3Jkb24gPGRhdmlkLnMuZ29yZG9uQGludGVsLmNvbT4KUmV2aWV3ZWQtYnk6IENocmlzIFdpbHNv biA8Y2hyaXNAY2hyaXMtd2lsc29uLmNvLnVrPgotLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2lu dGVsX2xyYy5jIHwgNDEgKysrKysrKysrKysrKysrKysrKysrKystLS0tLS0tLS0tLS0tLS0tLQog MSBmaWxlIGNoYW5nZWQsIDI0IGluc2VydGlvbnMoKyksIDE3IGRlbGV0aW9ucygtKQoKZGlmZiAt LWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2xyYy5jIGIvZHJpdmVycy9ncHUvZHJt L2k5MTUvaW50ZWxfbHJjLmMKaW5kZXggYzU1MWM5Ny4uMTQ4ZDI5MSAxMDA2NDQKLS0tIGEvZHJp dmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfbHJjLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUv aW50ZWxfbHJjLmMKQEAgLTIyNyw5ICsyMjcsOCBAQCBlbnVtIHsKIAogc3RhdGljIGludCBpbnRl bF9scl9jb250ZXh0X3BpbihzdHJ1Y3QgaW50ZWxfY29udGV4dCAqY3R4LAogCQkJCXN0cnVjdCBp bnRlbF9lbmdpbmVfY3MgKmVuZ2luZSk7Ci1zdGF0aWMgdm9pZCBscmNfc2V0dXBfaGFyZHdhcmVf c3RhdHVzX3BhZ2Uoc3RydWN0IGludGVsX2VuZ2luZV9jcyAqcmluZywKLQkJc3RydWN0IGRybV9p OTE1X2dlbV9vYmplY3QgKmRlZmF1bHRfY3R4X29iaik7Ci0KK3N0YXRpYyB2b2lkIGxyY19zZXR1 cF9oYXJkd2FyZV9zdGF0dXNfcGFnZShzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICpyaW5nKTsKK3N0 YXRpYyB2b2lkIGxyY190ZWFyZG93bl9oYXJkd2FyZV9zdGF0dXNfcGFnZShzdHJ1Y3QgaW50ZWxf ZW5naW5lX2NzICpyaW5nKTsKIAogLyoqCiAgKiBpbnRlbF9zYW5pdGl6ZV9lbmFibGVfZXhlY2xp c3RzKCkgLSBzYW5pdGl6ZSBpOTE1LmVuYWJsZV9leGVjbGlzdHMKQEAgLTE1NTUsOCArMTU1NCw3 IEBAIHN0YXRpYyBpbnQgZ2VuOF9pbml0X2NvbW1vbl9yaW5nKHN0cnVjdCBpbnRlbF9lbmdpbmVf Y3MgKnJpbmcpCiAJc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0gZGV2LT5kZXZf cHJpdmF0ZTsKIAl1OCBuZXh0X2NvbnRleHRfc3RhdHVzX2J1ZmZlcl9odzsKIAotCWxyY19zZXR1 cF9oYXJkd2FyZV9zdGF0dXNfcGFnZShyaW5nLAotCQkJCWRldl9wcml2LT5rZXJuZWxfY29udGV4 dC0+ZW5naW5lW3JpbmctPmlkXS5zdGF0ZSk7CisJbHJjX3NldHVwX2hhcmR3YXJlX3N0YXR1c19w YWdlKHJpbmcpOwogCiAJSTkxNV9XUklURV9JTVIocmluZywgfihyaW5nLT5pcnFfZW5hYmxlX21h c2sgfCByaW5nLT5pcnFfa2VlcF9tYXNrKSk7CiAJSTkxNV9XUklURShSSU5HX0hXU1RBTShyaW5n LT5tbWlvX2Jhc2UpLCAweGZmZmZmZmZmKTsKQEAgLTIwMTEsMTAgKzIwMDksNyBAQCB2b2lkIGlu dGVsX2xvZ2ljYWxfcmluZ19jbGVhbnVwKHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKnJpbmcpCiAJ aTkxNV9jbWRfcGFyc2VyX2ZpbmlfcmluZyhyaW5nKTsKIAlpOTE1X2dlbV9iYXRjaF9wb29sX2Zp bmkoJnJpbmctPmJhdGNoX3Bvb2wpOwogCi0JaWYgKHJpbmctPnN0YXR1c19wYWdlLm9iaikgewot CQlrdW5tYXAoa21hcF90b19wYWdlKHJpbmctPnN0YXR1c19wYWdlLnBhZ2VfYWRkcikpOwotCQly aW5nLT5zdGF0dXNfcGFnZS5vYmogPSBOVUxMOwotCX0KKwlscmNfdGVhcmRvd25faGFyZHdhcmVf c3RhdHVzX3BhZ2UocmluZyk7CiAKIAlyaW5nLT5kaXNhYmxlX2xpdGVfcmVzdG9yZV93YSA9IGZh bHNlOwogCXJpbmctPmN0eF9kZXNjX3RlbXBsYXRlID0gMDsKQEAgLTI1MDYsMjQgKzI1MDEsMzYg QEAgdWludDMyX3QgaW50ZWxfbHJfY29udGV4dF9zaXplKHN0cnVjdCBpbnRlbF9lbmdpbmVfY3Mg KnJpbmcpCiAJcmV0dXJuIHJldDsKIH0KIAotc3RhdGljIHZvaWQgbHJjX3NldHVwX2hhcmR3YXJl X3N0YXR1c19wYWdlKHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKnJpbmcsCi0JCXN0cnVjdCBkcm1f aTkxNV9nZW1fb2JqZWN0ICpkZWZhdWx0X2N0eF9vYmopCitzdGF0aWMgdm9pZCBscmNfc2V0dXBf aGFyZHdhcmVfc3RhdHVzX3BhZ2Uoc3RydWN0IGludGVsX2VuZ2luZV9jcyAqcmluZykKIHsKLQlz dHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSByaW5nLT5kZXYtPmRldl9wcml2YXRl OworCXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9IHRvX2k5MTUocmluZy0+ZGV2 KTsKKwlzdHJ1Y3QgaW50ZWxfY29udGV4dCAqZGN0eCA9IGRldl9wcml2LT5rZXJuZWxfY29udGV4 dDsKKwlzdHJ1Y3QgZHJtX2k5MTVfZ2VtX29iamVjdCAqZGN0eF9vYmogPSBkY3R4LT5lbmdpbmVb cmluZy0+aWRdLnN0YXRlOworCXU2NCBkY3R4X2FkZHIgPSBpOTE1X2dlbV9vYmpfZ2d0dF9vZmZz ZXQoZGN0eF9vYmopOwogCXN0cnVjdCBwYWdlICpwYWdlOwogCi0JLyogVGhlIEhXU1AgaXMgcGFy dCBvZiB0aGUgZGVmYXVsdCBjb250ZXh0IG9iamVjdCBpbiBMUkMgbW9kZS4gKi8KLQlyaW5nLT5z dGF0dXNfcGFnZS5nZnhfYWRkciA9IGk5MTVfZ2VtX29ial9nZ3R0X29mZnNldChkZWZhdWx0X2N0 eF9vYmopCi0JCQkrIExSQ19QUEhXU1BfUE4gKiBQQUdFX1NJWkU7Ci0JcGFnZSA9IGk5MTVfZ2Vt X29iamVjdF9nZXRfcGFnZShkZWZhdWx0X2N0eF9vYmosIExSQ19QUEhXU1BfUE4pOworCS8qCisJ ICogVGhlIEhXU1AgaXMgcGFydCBvZiB0aGUgZGVmYXVsdCBjb250ZXh0IG9iamVjdCBpbiBMUkMg bW9kZS4KKwkgKiBOb3RlIHRoYXQgaXQgZG9lc24ndCBjb250cmlidXRlIHRvIHRoZSByZWZjb3Vu dCEKKwkgKi8KKwlwYWdlID0gaTkxNV9nZW1fb2JqZWN0X2dldF9wYWdlKGRjdHhfb2JqLCBMUkNf UFBIV1NQX1BOKTsKIAlyaW5nLT5zdGF0dXNfcGFnZS5wYWdlX2FkZHIgPSBrbWFwKHBhZ2UpOwot CXJpbmctPnN0YXR1c19wYWdlLm9iaiA9IGRlZmF1bHRfY3R4X29iajsKKwlyaW5nLT5zdGF0dXNf cGFnZS5nZnhfYWRkciA9IGRjdHhfYWRkciArIExSQ19QUEhXU1BfUE4gKiBQQUdFX1NJWkU7CisJ cmluZy0+c3RhdHVzX3BhZ2Uub2JqID0gZGN0eF9vYmo7CiAKIAlJOTE1X1dSSVRFKFJJTkdfSFdT X1BHQShyaW5nLT5tbWlvX2Jhc2UpLAogCQkJKHUzMilyaW5nLT5zdGF0dXNfcGFnZS5nZnhfYWRk cik7CiAJUE9TVElOR19SRUFEKFJJTkdfSFdTX1BHQShyaW5nLT5tbWlvX2Jhc2UpKTsKIH0KIAor c3RhdGljIHZvaWQgbHJjX3RlYXJkb3duX2hhcmR3YXJlX3N0YXR1c19wYWdlKHN0cnVjdCBpbnRl bF9lbmdpbmVfY3MgKnJpbmcpCit7CisJaWYgKHJpbmctPnN0YXR1c19wYWdlLm9iaikgeworCQlr dW5tYXAoa21hcF90b19wYWdlKHJpbmctPnN0YXR1c19wYWdlLnBhZ2VfYWRkcikpOworCQlyaW5n LT5zdGF0dXNfcGFnZS5vYmogPSBOVUxMOworCX0KK30KKwogLyoqCiAgKiBpbnRlbF9scl9jb250 ZXh0X2RlZmVycmVkX2FsbG9jKCkgLSBjcmVhdGUgdGhlIExSQyBzcGVjaWZpYyBiaXRzIG9mIGEg Y29udGV4dAogICogQGN0eDogTFIgY29udGV4dCB0byBjcmVhdGUuCi0tIAoxLjkuMQoKX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4IG1haWxp bmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHA6Ly9saXN0cy5mcmVl ZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK