From mboxrd@z Thu Jan 1 00:00:00 1970 From: Dave Gordon Subject: [PATCH v2 6/6] drm/i915: consolidate LRC mode HWSP setup & teardown Date: Fri, 22 Jan 2016 23:10:11 +0000 Message-ID: <1453504211-7982-7-git-send-email-david.s.gordon@intel.com> References: <1453504211-7982-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 mga04.intel.com (mga04.intel.com [192.55.52.120]) by gabe.freedesktop.org (Postfix) with ESMTP id 781CB6ECF6 for ; Fri, 22 Jan 2016 15:10:27 -0800 (PST) In-Reply-To: <1453504211-7982-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 ZWN0IHdpdGgKaXRzIG93biBwaW5uaW5nIGFuZCByZWZlcmVuY2UgY291bnRzLiBJbiBMUkMgbW9k ZSwgaG93ZXZlciwgaXQncyBub3Q7Cmluc3RlYWQgaXRzIHBhcnQgb2YgdGhlIGRlZmF1bHQgY29u dGV4dCBvYmplY3QuIFRoZSBMUkMtbW9kZSBzZXR1cCAmCnRlYXJkb3duIGNvZGUgdGhlcmVmb3Jl IG5lZWRzIHRvIGhhbmRsZSB0aGlzIHNwZWNpYWxseTsgdGhlIHByZXNlbmNlCm9mIHRoZSB0d28g YnVncyBqdXN0IGZpeGVkIGluIHRoaXMgYXJlYSBzdWdnZXN0cyB0aGF0IHRoaXMgY29kZSBpcyBu b3QKd2VsbC11bmRlcnN0b29kIG9yIG1haW50YWluZWQgYXQgcHJlc2VudC4KClNvLCB0aGlzIHBh dGNoOgogICAgbW92ZXMgdGhlIChuZXdseS1maXhlZCkgTFJDLW1vZGUgSFdTUCB0ZWFyZG93biBj b2RlIHRvIGl0cyBvd24KICAgICAgICBmdW5jdGlvbiBscmNfdGVhcmRvd25faGFyZHdhcmVfc3Rh dHVzX3BhZ2UoKSwgYW5kCiAgICBjaGFuZ2VzIHRoZSBjYWxsIHNpZ25hdHVyZSBvZiBscmNfc2V0 dXBfaGFyZHdhcmVfc3RhdHVzX3BhZ2UoKQogICAgICAgIHRvIG1hdGNoCnNvIHRoYXQgYWxsIGtu b3dsZWRnZSBvZiB0aGlzIHNwZWNpYWwgYXJyYW5nZW1lbnQgaXMgbG9jYWwgdG8gdGhlc2UKdHdv IGZ1bmN0aW9ucy4KCkl0IHdpbGwgYWxzbyBoZWxwIHdpdGggZWZmb3J0cyBpbiBwcm9ncmVzcyB0 byBlbGltaW5hdGUgc3BlY2lhbCBoYW5kbGluZwpvZiB0aGUgZGVmYXVsdCAoa2VybmVsKSBjb250 ZXh0IGVsc2V3aGVyZSBpbiBMUkMgY29kZSA6KQoKdjI6CiAgICBTcGxpdCBmcm9tICJoYW5kbGUg dGVhcmRvd24gb2YgSFdTUCB3aGVuIGNvbnRleHQgaXMgZnJlZWQiLgoKU2lnbmVkLW9mZi1ieTog RGF2ZSBHb3Jkb24gPGRhdmlkLnMuZ29yZG9uQGludGVsLmNvbT4KQ2M6IE1pa2EgS3VvcHBhbGEg PG1pa2Eua3VvcHBhbGFAbGludXguaW50ZWwuY29tPgotLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1 L2ludGVsX2xyYy5jIHwgNTggKysrKysrKysrKysrKysrKysrKysrKystLS0tLS0tLS0tLS0tLS0t LQogMSBmaWxlIGNoYW5nZWQsIDMzIGluc2VydGlvbnMoKyksIDI1IGRlbGV0aW9ucygtKQoKZGlm ZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2xyYy5jIGIvZHJpdmVycy9ncHUv ZHJtL2k5MTUvaW50ZWxfbHJjLmMKaW5kZXggYzcwMmZjMi4uODNhODQxZSAxMDA2NDQKLS0tIGEv ZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfbHJjLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5 MTUvaW50ZWxfbHJjLmMKQEAgLTIyNiw5ICsyMjYsOCBAQCBlbnVtIHsKICNkZWZpbmUgQ1RYX1JD U19JTkRJUkVDVF9DVFhfT0ZGU0VUX0RFRkFVTFQgIDB4MTcKIAogc3RhdGljIGludCBpbnRlbF9s cl9jb250ZXh0X3BpbihzdHJ1Y3QgZHJtX2k5MTVfZ2VtX3JlcXVlc3QgKnJxKTsKLXN0YXRpYyB2 b2lkIGxyY19zZXR1cF9oYXJkd2FyZV9zdGF0dXNfcGFnZShzdHJ1Y3QgaW50ZWxfZW5naW5lX2Nz ICpyaW5nLAotCQlzdHJ1Y3QgZHJtX2k5MTVfZ2VtX29iamVjdCAqZGVmYXVsdF9jdHhfb2JqKTsK LQorc3RhdGljIHZvaWQgbHJjX3NldHVwX2hhcmR3YXJlX3N0YXR1c19wYWdlKHN0cnVjdCBpbnRl bF9lbmdpbmVfY3MgKnJpbmcpOworc3RhdGljIHZvaWQgbHJjX3RlYXJkb3duX2hhcmR3YXJlX3N0 YXR1c19wYWdlKHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKnJpbmcpOwogCiAvKioKICAqIGludGVs X3Nhbml0aXplX2VuYWJsZV9leGVjbGlzdHMoKSAtIHNhbml0aXplIGk5MTUuZW5hYmxlX2V4ZWNs aXN0cwpAQCAtMTUzNiw4ICsxNTM1LDcgQEAgc3RhdGljIGludCBnZW44X2luaXRfY29tbW9uX3Jp bmcoc3RydWN0IGludGVsX2VuZ2luZV9jcyAqcmluZykKIAlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0 ZSAqZGV2X3ByaXYgPSBkZXYtPmRldl9wcml2YXRlOwogCXU4IG5leHRfY29udGV4dF9zdGF0dXNf YnVmZmVyX2h3OwogCi0JbHJjX3NldHVwX2hhcmR3YXJlX3N0YXR1c19wYWdlKHJpbmcsCi0JCQkJ ZGV2X3ByaXYtPmtlcm5lbF9jb250ZXh0LT5lbmdpbmVbcmluZy0+aWRdLnN0YXRlKTsKKwlscmNf c2V0dXBfaGFyZHdhcmVfc3RhdHVzX3BhZ2UocmluZyk7CiAKIAlJOTE1X1dSSVRFX0lNUihyaW5n LCB+KHJpbmctPmlycV9lbmFibGVfbWFzayB8IHJpbmctPmlycV9rZWVwX21hc2spKTsKIAlJOTE1 X1dSSVRFKFJJTkdfSFdTVEFNKHJpbmctPm1taW9fYmFzZSksIDB4ZmZmZmZmZmYpOwpAQCAtMjQy NywyMiArMjQyNSwxMSBAQCB2b2lkIGludGVsX2xyX2NvbnRleHRfZnJlZShzdHJ1Y3QgaW50ZWxf Y29udGV4dCAqY3R4KQogCQkJY29udGludWU7CiAKIAkJaWYgKGN0eCA9PSBjdHgtPmk5MTUtPmtl cm5lbF9jb250ZXh0KSB7Ci0JCQlzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICpyaW5nID0gcmluZ2J1 Zi0+cmluZzsKLQogCQkJLyoKIAkJCSAqIFRoZSBIV1NQIGlzIHBhcnQgb2YgdGhlIGtlcm5lbCBj b250ZXh0CiAJCQkgKiBvYmplY3QgaW4gTFJDIG1vZGUsIHNvIHRlYXIgaXQgZG93biBub3cuCiAJ CQkgKi8KLQkJCWlmIChyaW5nLT5zdGF0dXNfcGFnZS5vYmopIHsKLQkJCQlzdHJ1Y3QgcGFnZSAq cGFnZTsKLQotCQkJCXBhZ2UgPSBpOTE1X2dlbV9vYmplY3RfZ2V0X3BhZ2UoCi0JCQkJCQlyaW5n LT5zdGF0dXNfcGFnZS5vYmosCi0JCQkJCQlMUkNfUFBIV1NQX1BOKTsKLQkJCQlrdW5tYXAocGFn ZSk7Ci0JCQkJcmluZy0+c3RhdHVzX3BhZ2Uub2JqID0gTlVMTDsKLQkJCX0KLQorCQkJbHJjX3Rl YXJkb3duX2hhcmR3YXJlX3N0YXR1c19wYWdlKHJpbmdidWYtPnJpbmcpOwogCQkJaW50ZWxfdW5w aW5fcmluZ2J1ZmZlcl9vYmoocmluZ2J1Zik7CiAJCQlpOTE1X2dlbV9vYmplY3RfZ2d0dF91bnBp bihjdHhfb2JqKTsKIAkJfQpAQCAtMjQ5MSwyNCArMjQ3OCw0NSBAQCB1aW50MzJfdCBpbnRlbF9s cl9jb250ZXh0X3NpemUoc3RydWN0IGludGVsX2VuZ2luZV9jcyAqcmluZykKIAlyZXR1cm4gcmV0 OwogfQogCi1zdGF0aWMgdm9pZCBscmNfc2V0dXBfaGFyZHdhcmVfc3RhdHVzX3BhZ2Uoc3RydWN0 IGludGVsX2VuZ2luZV9jcyAqcmluZywKLQkJc3RydWN0IGRybV9pOTE1X2dlbV9vYmplY3QgKmRl ZmF1bHRfY3R4X29iaikKK3N0YXRpYyB2b2lkIGxyY19zZXR1cF9oYXJkd2FyZV9zdGF0dXNfcGFn ZShzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICpyaW5nKQogewotCXN0cnVjdCBkcm1faTkxNV9wcml2 YXRlICpkZXZfcHJpdiA9IHJpbmctPmRldi0+ZGV2X3ByaXZhdGU7CisJc3RydWN0IGRybV9pOTE1 X3ByaXZhdGUgKmRldl9wcml2ID0gdG9faTkxNShyaW5nLT5kZXYpOworCXN0cnVjdCBpbnRlbF9j b250ZXh0ICpkY3R4ID0gZGV2X3ByaXYtPmtlcm5lbF9jb250ZXh0OworCXN0cnVjdCBkcm1faTkx NV9nZW1fb2JqZWN0ICpkY3R4X29iaiA9IGRjdHgtPmVuZ2luZVtyaW5nLT5pZF0uc3RhdGU7CisJ dTY0IGRjdHhfYWRkciA9IGk5MTVfZ2VtX29ial9nZ3R0X29mZnNldChkY3R4X29iaik7CiAJc3Ry dWN0IHBhZ2UgKnBhZ2U7CiAKLQkvKiBUaGUgSFdTUCBpcyBwYXJ0IG9mIHRoZSBkZWZhdWx0IGNv bnRleHQgb2JqZWN0IGluIExSQyBtb2RlLiAqLwotCXJpbmctPnN0YXR1c19wYWdlLmdmeF9hZGRy ID0gaTkxNV9nZW1fb2JqX2dndHRfb2Zmc2V0KGRlZmF1bHRfY3R4X29iaikKLQkJCSsgTFJDX1BQ SFdTUF9QTiAqIFBBR0VfU0laRTsKLQlwYWdlID0gaTkxNV9nZW1fb2JqZWN0X2dldF9wYWdlKGRl ZmF1bHRfY3R4X29iaiwgTFJDX1BQSFdTUF9QTik7CisJLyoKKwkgKiBUaGUgSFdTUCBpcyBwYXJ0 IG9mIHRoZSBkZWZhdWx0IGNvbnRleHQgb2JqZWN0IGluIExSQyBtb2RlLgorCSAqIE5vdGUgdGhh dCBpdCBkb2Vzbid0IGNvbnRyaWJ1dGUgdG8gdGhlIHJlZmNvdW50IQorCSAqLworCXBhZ2UgPSBp OTE1X2dlbV9vYmplY3RfZ2V0X3BhZ2UoZGN0eF9vYmosIExSQ19QUEhXU1BfUE4pOwogCXJpbmct PnN0YXR1c19wYWdlLnBhZ2VfYWRkciA9IGttYXAocGFnZSk7Ci0JcmluZy0+c3RhdHVzX3BhZ2Uu b2JqID0gZGVmYXVsdF9jdHhfb2JqOworCXJpbmctPnN0YXR1c19wYWdlLmdmeF9hZGRyID0gZGN0 eF9hZGRyICsgTFJDX1BQSFdTUF9QTiAqIFBBR0VfU0laRTsKKwlyaW5nLT5zdGF0dXNfcGFnZS5v YmogPSBkY3R4X29iajsKIAogCUk5MTVfV1JJVEUoUklOR19IV1NfUEdBKHJpbmctPm1taW9fYmFz ZSksCiAJCQkodTMyKXJpbmctPnN0YXR1c19wYWdlLmdmeF9hZGRyKTsKIAlQT1NUSU5HX1JFQUQo UklOR19IV1NfUEdBKHJpbmctPm1taW9fYmFzZSkpOwogfQogCisvKiBUaGlzIHNob3VsZCBiZSBj YWxsZWQgYmVmb3JlIHRoZSBkZWZhdWx0IGNvbnRleHQgaXMgZGVzdHJveWVkICovCitzdGF0aWMg dm9pZCBscmNfdGVhcmRvd25faGFyZHdhcmVfc3RhdHVzX3BhZ2Uoc3RydWN0IGludGVsX2VuZ2lu ZV9jcyAqcmluZykKK3sKKwlzdHJ1Y3QgZHJtX2k5MTVfZ2VtX29iamVjdCAqZGN0eF9vYmogPSBy aW5nLT5zdGF0dXNfcGFnZS5vYmo7CisJc3RydWN0IHBhZ2UgKnBhZ2U7CisKKwlXQVJOX09OKCFk Y3R4X29iaik7CisKKwlpZiAocmluZy0+c3RhdHVzX3BhZ2UucGFnZV9hZGRyKSB7CisJCXBhZ2Ug PSBpOTE1X2dlbV9vYmplY3RfZ2V0X3BhZ2UoZGN0eF9vYmosIExSQ19QUEhXU1BfUE4pOworCQlr dW5tYXAocGFnZSk7CisJCXJpbmctPnN0YXR1c19wYWdlLnBhZ2VfYWRkciA9IE5VTEw7CisJfQor CisJcmluZy0+c3RhdHVzX3BhZ2Uub2JqID0gTlVMTDsKK30KKwogLyoqCiAgKiBpbnRlbF9scl9j b250ZXh0X2RlZmVycmVkX2FsbG9jKCkgLSBjcmVhdGUgdGhlIExSQyBzcGVjaWZpYyBiaXRzIG9m IGEgY29udGV4dAogICogQGN0eDogTFIgY29udGV4dCB0byBjcmVhdGUuCi0tIAoxLjkuMQoKX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4IG1h aWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHA6Ly9saXN0cy5m cmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK