From mboxrd@z Thu Jan  1 00:00:00 1970
From: Dave Gordon <david.s.gordon@intel.com>
Subject: [PATCH v4 4/6] drm/i915: consolidate LRC mode HWSP
	setup & teardown
Date: Fri, 29 Jan 2016 19:19:29 +0000
Message-ID: <1454095171-22475-5-git-send-email-david.s.gordon@intel.com>
References: <1454095171-22475-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: <intel-gfx-bounces@lists.freedesktop.org>
Received: from mga14.intel.com (mga14.intel.com [192.55.52.115])
 by gabe.freedesktop.org (Postfix) with ESMTP id 161E86EA07
 for <intel-gfx@lists.freedesktop.org>; Fri, 29 Jan 2016 11:19:47 -0800 (PST)
In-Reply-To: <1454095171-22475-1-git-send-email-david.s.gordon@intel.com>
List-Unsubscribe: <http://lists.freedesktop.org/mailman/options/intel-gfx>,
 <mailto:intel-gfx-request@lists.freedesktop.org?subject=unsubscribe>
List-Archive: <http://lists.freedesktop.org/archives/intel-gfx>
List-Post: <mailto:intel-gfx@lists.freedesktop.org>
List-Help: <mailto:intel-gfx-request@lists.freedesktop.org?subject=help>
List-Subscribe: <http://lists.freedesktop.org/mailman/listinfo/intel-gfx>,
 <mailto:intel-gfx-request@lists.freedesktop.org?subject=subscribe>
Errors-To: intel-gfx-bounces@lists.freedesktop.org
Sender: "Intel-gfx" <intel-gfx-bounces@lists.freedesktop.org>
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
IHRoZXNlCnR3byBmdW5jdGlvbnMuCgpJdCB3aWxsIGFsc28gaGVscCB3aXRoIGVmZm9ydHMgaW4g
cHJvZ3Jlc3MgdG8gZWxpbWluYXRlIHNwZWNpYWwKaGFuZGxpbmcgb2YgdGhlIGRlZmF1bHQgKGtl
cm5lbCkgY29udGV4dCBlbHNld2hlcmUgaW4gTFJDIGNvZGUgOikKCnYzOiBSZWJhc2VkCgpTaWdu
ZWQtb2ZmLWJ5OiBEYXZlIEdvcmRvbiA8ZGF2aWQucy5nb3Jkb25AaW50ZWwuY29tPgotLS0KIGRy
aXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2xyYy5jIHwgNDEgKysrKysrKysrKysrKysrKysrKysr
KystLS0tLS0tLS0tLS0tLS0tLQogMSBmaWxlIGNoYW5nZWQsIDI0IGluc2VydGlvbnMoKyksIDE3
IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2xy
Yy5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfbHJjLmMKaW5kZXggMGZhMjQ5Ny4uZmYz
OGU1NyAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfbHJjLmMKKysrIGIv
ZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfbHJjLmMKQEAgLTIyNyw5ICsyMjcsOCBAQCBlbnVt
IHsKIAogc3RhdGljIGludCBpbnRlbF9scl9jb250ZXh0X3BpbihzdHJ1Y3QgaW50ZWxfY29udGV4
dCAqY3R4LAogCQkJCXN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKmVuZ2luZSk7Ci1zdGF0aWMgdm9p
ZCBscmNfc2V0dXBfaGFyZHdhcmVfc3RhdHVzX3BhZ2Uoc3RydWN0IGludGVsX2VuZ2luZV9jcyAq
cmluZywKLQkJc3RydWN0IGRybV9pOTE1X2dlbV9vYmplY3QgKmRlZmF1bHRfY3R4X29iaik7Ci0K
K3N0YXRpYyB2b2lkIGxyY19zZXR1cF9oYXJkd2FyZV9zdGF0dXNfcGFnZShzdHJ1Y3QgaW50ZWxf
ZW5naW5lX2NzICpyaW5nKTsKK3N0YXRpYyB2b2lkIGxyY190ZWFyZG93bl9oYXJkd2FyZV9zdGF0
dXNfcGFnZShzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICpyaW5nKTsKIAogLyoqCiAgKiBpbnRlbF9z
YW5pdGl6ZV9lbmFibGVfZXhlY2xpc3RzKCkgLSBzYW5pdGl6ZSBpOTE1LmVuYWJsZV9leGVjbGlz
dHMKQEAgLTE1NTUsOCArMTU1NCw3IEBAIHN0YXRpYyBpbnQgZ2VuOF9pbml0X2NvbW1vbl9yaW5n
KHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKnJpbmcpCiAJc3RydWN0IGRybV9pOTE1X3ByaXZhdGUg
KmRldl9wcml2ID0gZGV2LT5kZXZfcHJpdmF0ZTsKIAl1OCBuZXh0X2NvbnRleHRfc3RhdHVzX2J1
ZmZlcl9odzsKIAotCWxyY19zZXR1cF9oYXJkd2FyZV9zdGF0dXNfcGFnZShyaW5nLAotCQkJCWRl
dl9wcml2LT5rZXJuZWxfY29udGV4dC0+ZW5naW5lW3JpbmctPmlkXS5zdGF0ZSk7CisJbHJjX3Nl
dHVwX2hhcmR3YXJlX3N0YXR1c19wYWdlKHJpbmcpOwogCiAJSTkxNV9XUklURV9JTVIocmluZywg
fihyaW5nLT5pcnFfZW5hYmxlX21hc2sgfCByaW5nLT5pcnFfa2VlcF9tYXNrKSk7CiAJSTkxNV9X
UklURShSSU5HX0hXU1RBTShyaW5nLT5tbWlvX2Jhc2UpLCAweGZmZmZmZmZmKTsKQEAgLTIwMDUs
MTAgKzIwMDMsNyBAQCB2b2lkIGludGVsX2xvZ2ljYWxfcmluZ19jbGVhbnVwKHN0cnVjdCBpbnRl
bF9lbmdpbmVfY3MgKnJpbmcpCiAJaTkxNV9jbWRfcGFyc2VyX2ZpbmlfcmluZyhyaW5nKTsKIAlp
OTE1X2dlbV9iYXRjaF9wb29sX2ZpbmkoJnJpbmctPmJhdGNoX3Bvb2wpOwogCi0JaWYgKHJpbmct
PnN0YXR1c19wYWdlLm9iaikgewotCQlrdW5tYXAoa21hcF90b19wYWdlKHJpbmctPnN0YXR1c19w
YWdlLnBhZ2VfYWRkcikpOwotCQlyaW5nLT5zdGF0dXNfcGFnZS5vYmogPSBOVUxMOwotCX0KKwls
cmNfdGVhcmRvd25faGFyZHdhcmVfc3RhdHVzX3BhZ2UocmluZyk7CiAKIAlyaW5nLT5kaXNhYmxl
X2xpdGVfcmVzdG9yZV93YSA9IGZhbHNlOwogCXJpbmctPmN0eF9kZXNjX3RlbXBsYXRlID0gMDsK
QEAgLTI1MDAsMjQgKzI0OTUsMzYgQEAgdWludDMyX3QgaW50ZWxfbHJfY29udGV4dF9zaXplKHN0
cnVjdCBpbnRlbF9lbmdpbmVfY3MgKnJpbmcpCiAJcmV0dXJuIHJldDsKIH0KIAotc3RhdGljIHZv
aWQgbHJjX3NldHVwX2hhcmR3YXJlX3N0YXR1c19wYWdlKHN0cnVjdCBpbnRlbF9lbmdpbmVfY3Mg
KnJpbmcsCi0JCXN0cnVjdCBkcm1faTkxNV9nZW1fb2JqZWN0ICpkZWZhdWx0X2N0eF9vYmopCitz
dGF0aWMgdm9pZCBscmNfc2V0dXBfaGFyZHdhcmVfc3RhdHVzX3BhZ2Uoc3RydWN0IGludGVsX2Vu
Z2luZV9jcyAqcmluZykKIHsKLQlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSBy
aW5nLT5kZXYtPmRldl9wcml2YXRlOworCXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJp
diA9IHRvX2k5MTUocmluZy0+ZGV2KTsKKwlzdHJ1Y3QgaW50ZWxfY29udGV4dCAqZGN0eCA9IGRl
dl9wcml2LT5rZXJuZWxfY29udGV4dDsKKwlzdHJ1Y3QgZHJtX2k5MTVfZ2VtX29iamVjdCAqZGN0
eF9vYmogPSBkY3R4LT5lbmdpbmVbcmluZy0+aWRdLnN0YXRlOworCXU2NCBkY3R4X2FkZHIgPSBp
OTE1X2dlbV9vYmpfZ2d0dF9vZmZzZXQoZGN0eF9vYmopOwogCXN0cnVjdCBwYWdlICpwYWdlOwog
Ci0JLyogVGhlIEhXU1AgaXMgcGFydCBvZiB0aGUgZGVmYXVsdCBjb250ZXh0IG9iamVjdCBpbiBM
UkMgbW9kZS4gKi8KLQlyaW5nLT5zdGF0dXNfcGFnZS5nZnhfYWRkciA9IGk5MTVfZ2VtX29ial9n
Z3R0X29mZnNldChkZWZhdWx0X2N0eF9vYmopCi0JCQkrIExSQ19QUEhXU1BfUE4gKiBQQUdFX1NJ
WkU7Ci0JcGFnZSA9IGk5MTVfZ2VtX29iamVjdF9nZXRfcGFnZShkZWZhdWx0X2N0eF9vYmosIExS
Q19QUEhXU1BfUE4pOworCS8qCisJICogVGhlIEhXU1AgaXMgcGFydCBvZiB0aGUgZGVmYXVsdCBj
b250ZXh0IG9iamVjdCBpbiBMUkMgbW9kZS4KKwkgKiBOb3RlIHRoYXQgaXQgZG9lc24ndCBjb250
cmlidXRlIHRvIHRoZSByZWZjb3VudCEKKwkgKi8KKwlwYWdlID0gaTkxNV9nZW1fb2JqZWN0X2dl
dF9wYWdlKGRjdHhfb2JqLCBMUkNfUFBIV1NQX1BOKTsKIAlyaW5nLT5zdGF0dXNfcGFnZS5wYWdl
X2FkZHIgPSBrbWFwKHBhZ2UpOwotCXJpbmctPnN0YXR1c19wYWdlLm9iaiA9IGRlZmF1bHRfY3R4
X29iajsKKwlyaW5nLT5zdGF0dXNfcGFnZS5nZnhfYWRkciA9IGRjdHhfYWRkciArIExSQ19QUEhX
U1BfUE4gKiBQQUdFX1NJWkU7CisJcmluZy0+c3RhdHVzX3BhZ2Uub2JqID0gZGN0eF9vYmo7CiAK
IAlJOTE1X1dSSVRFKFJJTkdfSFdTX1BHQShyaW5nLT5tbWlvX2Jhc2UpLAogCQkJKHUzMilyaW5n
LT5zdGF0dXNfcGFnZS5nZnhfYWRkcik7CiAJUE9TVElOR19SRUFEKFJJTkdfSFdTX1BHQShyaW5n
LT5tbWlvX2Jhc2UpKTsKIH0KIAorc3RhdGljIHZvaWQgbHJjX3RlYXJkb3duX2hhcmR3YXJlX3N0
YXR1c19wYWdlKHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKnJpbmcpCit7CisJaWYgKHJpbmctPnN0
YXR1c19wYWdlLm9iaikgeworCQlrdW5tYXAoa21hcF90b19wYWdlKHJpbmctPnN0YXR1c19wYWdl
LnBhZ2VfYWRkcikpOworCQlyaW5nLT5zdGF0dXNfcGFnZS5vYmogPSBOVUxMOworCX0KK30KKwog
LyoqCiAgKiBpbnRlbF9scl9jb250ZXh0X2RlZmVycmVkX2FsbG9jKCkgLSBjcmVhdGUgdGhlIExS
QyBzcGVjaWZpYyBiaXRzIG9mIGEgY29udGV4dAogICogQGN0eDogTFIgY29udGV4dCB0byBjcmVh
dGUuCi0tIAoxLjkuMQoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f
X19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Au
b3JnCmh0dHA6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1n
ZngK