From mboxrd@z Thu Jan  1 00:00:00 1970
From: Chris Wilson <chris@chris-wilson.co.uk>
Subject: [CI 6/8] drm/i915/execlists: Split out CSB processing
Date: Wed, 16 May 2018 19:33:53 +0100
Message-ID: <20180516183355.10553-6-chris@chris-wilson.co.uk>
References: <20180516183355.10553-1-chris@chris-wilson.co.uk>
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 fireflyinternet.com (mail.fireflyinternet.com [109.228.58.192])
 by gabe.freedesktop.org (Postfix) with ESMTPS id 3F8A06E507
 for <intel-gfx@lists.freedesktop.org>; Wed, 16 May 2018 18:34:10 +0000 (UTC)
Received: from haswell.alporthouse.com (unverified [78.156.65.138])
 by fireflyinternet.com (Firefly Internet (M1)) with ESMTP id 11727776-1500050
 for <intel-gfx@lists.freedesktop.org>; Wed, 16 May 2018 19:34:04 +0100
In-Reply-To: <20180516183355.10553-1-chris@chris-wilson.co.uk>
List-Unsubscribe: <https://lists.freedesktop.org/mailman/options/intel-gfx>,
 <mailto:intel-gfx-request@lists.freedesktop.org?subject=unsubscribe>
List-Archive: <https://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: <https://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

UHVsbCB0aGUgQ1NCIGV2ZW50IHByb2Nlc3NpbmcgaW50byBpdHMgb3duIHJvdXRpbmUgc28gdGhh
dCB3ZSBjYW4gcmV1c2UKaXQgZHVyaW5nIHJlc2V0IHRvIGZsdXNoIGFueSBtaXNzZWQgaW50ZXJy
dXB0cy9ldmVudHMuCgpTaWduZWQtb2ZmLWJ5OiBDaHJpcyBXaWxzb24gPGNocmlzQGNocmlzLXdp
bHNvbi5jby51az4KQ2M6IE1pY2hhxYIgV2luaWFyc2tpIDxtaWNoYWwud2luaWFyc2tpQGludGVs
LmNvbT4KQ0M6IE1pY2hlbCBUaGllcnJ5IDxtaWNoZWwudGhpZXJyeUBpbnRlbC5jb20+CkNjOiBK
ZWZmIE1jR2VlIDxqZWZmLm1jZ2VlQGludGVsLmNvbT4KQ2M6IFR2cnRrbyBVcnN1bGluIDx0dnJ0
a28udXJzdWxpbkBpbnRlbC5jb20+ClJldmlld2VkLWJ5OiBUdnJ0a28gVXJzdWxpbiA8dHZydGtv
LnVyc3VsaW5AaW50ZWwuY29tPgotLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2xyYy5j
IHwgOTEgKysrKysrKysrKysrKysrKysrLS0tLS0tLS0tLS0tLS0KIDEgZmlsZSBjaGFuZ2VkLCA1
MiBpbnNlcnRpb25zKCspLCAzOSBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dw
dS9kcm0vaTkxNS9pbnRlbF9scmMuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2xyYy5j
CmluZGV4IGY1ZDc0ZGYwZTBkMC4uZTcwZDhkNjI0ODk5IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dw
dS9kcm0vaTkxNS9pbnRlbF9scmMuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9s
cmMuYwpAQCAtOTU3LDM0ICs5NTcsMTQgQEAgc3RhdGljIHZvaWQgZXhlY2xpc3RzX2NhbmNlbF9y
ZXF1ZXN0cyhzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICplbmdpbmUpCiAJbG9jYWxfaXJxX3Jlc3Rv
cmUoZmxhZ3MpOwogfQogCi0vKgotICogQ2hlY2sgdGhlIHVucmVhZCBDb250ZXh0IFN0YXR1cyBC
dWZmZXJzIGFuZCBtYW5hZ2UgdGhlIHN1Ym1pc3Npb24gb2YgbmV3Ci0gKiBjb250ZXh0cyB0byB0
aGUgRUxTUCBhY2NvcmRpbmdseS4KLSAqLwotc3RhdGljIHZvaWQgZXhlY2xpc3RzX3N1Ym1pc3Np
b25fdGFza2xldCh1bnNpZ25lZCBsb25nIGRhdGEpCitzdGF0aWMgdm9pZCBwcm9jZXNzX2NzYihz
dHJ1Y3QgaW50ZWxfZW5naW5lX2NzICplbmdpbmUpCiB7Ci0Jc3RydWN0IGludGVsX2VuZ2luZV9j
cyAqIGNvbnN0IGVuZ2luZSA9IChzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICopZGF0YTsKIAlzdHJ1
Y3QgaW50ZWxfZW5naW5lX2V4ZWNsaXN0cyAqIGNvbnN0IGV4ZWNsaXN0cyA9ICZlbmdpbmUtPmV4
ZWNsaXN0czsKIAlzdHJ1Y3QgZXhlY2xpc3RfcG9ydCAqcG9ydCA9IGV4ZWNsaXN0cy0+cG9ydDsK
LQlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSBlbmdpbmUtPmk5MTU7CisJc3Ry
dWN0IGRybV9pOTE1X3ByaXZhdGUgKmk5MTUgPSBlbmdpbmUtPmk5MTU7CiAJYm9vbCBmdyA9IGZh
bHNlOwogCi0JLyoKLQkgKiBXZSBjYW4gc2tpcCBhY3F1aXJpbmcgaW50ZWxfcnVudGltZV9wbV9n
ZXQoKSBoZXJlIGFzIGl0IHdhcyB0YWtlbgotCSAqIG9uIG91ciBiZWhhbGYgYnkgdGhlIHJlcXVl
c3QgKHNlZSBpOTE1X2dlbV9tYXJrX2J1c3koKSkgYW5kIGl0IHdpbGwKLQkgKiBub3QgYmUgcmVs
aW5xdWlzaGVkIHVudGlsIHRoZSBkZXZpY2UgaXMgaWRsZSAoc2VlCi0JICogaTkxNV9nZW1faWRs
ZV93b3JrX2hhbmRsZXIoKSkuIEFzIGEgcHJlY2F1dGlvbiwgd2UgbWFrZSBzdXJlCi0JICogdGhh
dCBhbGwgRUxTUCBhcmUgZHJhaW5lZCBpLmUuIHdlIGhhdmUgcHJvY2Vzc2VkIHRoZSBDU0IsCi0J
ICogYmVmb3JlIGFsbG93aW5nIG91cnNlbHZlcyB0byBpZGxlIGFuZCBjYWxsaW5nIGludGVsX3J1
bnRpbWVfcG1fcHV0KCkuCi0JICovCi0JR0VNX0JVR19PTighZGV2X3ByaXYtPmd0LmF3YWtlKTsK
LQotCS8qCi0JICogUHJlZmVyIGRvaW5nIHRlc3RfYW5kX2NsZWFyX2JpdCgpIGFzIGEgdHdvIHN0
YWdlIG9wZXJhdGlvbiB0byBhdm9pZAotCSAqIGltcG9zaW5nIHRoZSBjb3N0IG9mIGEgbG9ja2Vk
IGF0b21pYyB0cmFuc2FjdGlvbiB3aGVuIHN1Ym1pdHRpbmcgYQotCSAqIG5ldyByZXF1ZXN0IChv
dXRzaWRlIG9mIHRoZSBjb250ZXh0LXN3aXRjaCBpbnRlcnJ1cHQpLgotCSAqLwotCXdoaWxlICh0
ZXN0X2JpdChFTkdJTkVfSVJRX0VYRUNMSVNULCAmZW5naW5lLT5pcnFfcG9zdGVkKSkgeworCWRv
IHsKIAkJLyogVGhlIEhXU1AgY29udGFpbnMgYSAoY2FjaGVhYmxlKSBtaXJyb3Igb2YgdGhlIENT
QiAqLwogCQljb25zdCB1MzIgKmJ1ZiA9CiAJCQkmZW5naW5lLT5zdGF0dXNfcGFnZS5wYWdlX2Fk
ZHJbSTkxNV9IV1NfQ1NCX0JVRjBfSU5ERVhdOwpAQCAtOTkyLDI4ICs5NzIsMjcgQEAgc3RhdGlj
IHZvaWQgZXhlY2xpc3RzX3N1Ym1pc3Npb25fdGFza2xldCh1bnNpZ25lZCBsb25nIGRhdGEpCiAK
IAkJaWYgKHVubGlrZWx5KGV4ZWNsaXN0cy0+Y3NiX3VzZV9tbWlvKSkgewogCQkJYnVmID0gKHUz
MiAqIF9fZm9yY2UpCi0JCQkJKGRldl9wcml2LT5yZWdzICsgaTkxNV9tbWlvX3JlZ19vZmZzZXQo
UklOR19DT05URVhUX1NUQVRVU19CVUZfTE8oZW5naW5lLCAwKSkpOwotCQkJZXhlY2xpc3RzLT5j
c2JfaGVhZCA9IC0xOyAvKiBmb3JjZSBtbWlvIHJlYWQgb2YgQ1NCIHB0cnMgKi8KKwkJCQkoaTkx
NS0+cmVncyArIGk5MTVfbW1pb19yZWdfb2Zmc2V0KFJJTkdfQ09OVEVYVF9TVEFUVVNfQlVGX0xP
KGVuZ2luZSwgMCkpKTsKKwkJCWV4ZWNsaXN0cy0+Y3NiX2hlYWQgPSAtMTsgLyogZm9yY2UgbW1p
byByZWFkIG9mIENTQiAqLwogCQl9CiAKIAkJLyogQ2xlYXIgYmVmb3JlIHJlYWRpbmcgdG8gY2F0
Y2ggbmV3IGludGVycnVwdHMgKi8KIAkJY2xlYXJfYml0KEVOR0lORV9JUlFfRVhFQ0xJU1QsICZl
bmdpbmUtPmlycV9wb3N0ZWQpOwogCQlzbXBfbWJfX2FmdGVyX2F0b21pYygpOwogCi0JCWlmICh1
bmxpa2VseShleGVjbGlzdHMtPmNzYl9oZWFkID09IC0xKSkgeyAvKiBmb2xsb3dpbmcgYSByZXNl
dCAqLworCQlpZiAodW5saWtlbHkoZXhlY2xpc3RzLT5jc2JfaGVhZCA9PSAtMSkpIHsgLyogYWZ0
ZXIgYSByZXNldCAqLwogCQkJaWYgKCFmdykgewotCQkJCWludGVsX3VuY29yZV9mb3JjZXdha2Vf
Z2V0KGRldl9wcml2LAotCQkJCQkJCSAgIGV4ZWNsaXN0cy0+ZndfZG9tYWlucyk7CisJCQkJaW50
ZWxfdW5jb3JlX2ZvcmNld2FrZV9nZXQoaTkxNSwgZXhlY2xpc3RzLT5md19kb21haW5zKTsKIAkJ
CQlmdyA9IHRydWU7CiAJCQl9CiAKLQkJCWhlYWQgPSByZWFkbChkZXZfcHJpdi0+cmVncyArIGk5
MTVfbW1pb19yZWdfb2Zmc2V0KFJJTkdfQ09OVEVYVF9TVEFUVVNfUFRSKGVuZ2luZSkpKTsKKwkJ
CWhlYWQgPSByZWFkbChpOTE1LT5yZWdzICsgaTkxNV9tbWlvX3JlZ19vZmZzZXQoUklOR19DT05U
RVhUX1NUQVRVU19QVFIoZW5naW5lKSkpOwogCQkJdGFpbCA9IEdFTjhfQ1NCX1dSSVRFX1BUUiho
ZWFkKTsKIAkJCWhlYWQgPSBHRU44X0NTQl9SRUFEX1BUUihoZWFkKTsKIAkJCWV4ZWNsaXN0cy0+
Y3NiX2hlYWQgPSBoZWFkOwogCQl9IGVsc2UgewogCQkJY29uc3QgaW50IHdyaXRlX2lkeCA9Ci0J
CQkJaW50ZWxfaHdzX2NzYl93cml0ZV9pbmRleChkZXZfcHJpdikgLQorCQkJCWludGVsX2h3c19j
c2Jfd3JpdGVfaW5kZXgoaTkxNSkgLQogCQkJCUk5MTVfSFdTX0NTQl9CVUYwX0lOREVYOwogCiAJ
CQloZWFkID0gZXhlY2xpc3RzLT5jc2JfaGVhZDsKQEAgLTEwMjIsOCArMTAwMSw4IEBAIHN0YXRp
YyB2b2lkIGV4ZWNsaXN0c19zdWJtaXNzaW9uX3Rhc2tsZXQodW5zaWduZWQgbG9uZyBkYXRhKQog
CQl9CiAJCUdFTV9UUkFDRSgiJXMgY3MtaXJxIGhlYWQ9JWQgWyVkJXNdLCB0YWlsPSVkIFslZCVz
XVxuIiwKIAkJCSAgZW5naW5lLT5uYW1lLAotCQkJICBoZWFkLCBHRU44X0NTQl9SRUFEX1BUUihy
ZWFkbChkZXZfcHJpdi0+cmVncyArIGk5MTVfbW1pb19yZWdfb2Zmc2V0KFJJTkdfQ09OVEVYVF9T
VEFUVVNfUFRSKGVuZ2luZSkpKSksIGZ3ID8gIiIgOiAiPyIsCi0JCQkgIHRhaWwsIEdFTjhfQ1NC
X1dSSVRFX1BUUihyZWFkbChkZXZfcHJpdi0+cmVncyArIGk5MTVfbW1pb19yZWdfb2Zmc2V0KFJJ
TkdfQ09OVEVYVF9TVEFUVVNfUFRSKGVuZ2luZSkpKSksIGZ3ID8gIiIgOiAiPyIpOworCQkJICBo
ZWFkLCBHRU44X0NTQl9SRUFEX1BUUihyZWFkbChpOTE1LT5yZWdzICsgaTkxNV9tbWlvX3JlZ19v
ZmZzZXQoUklOR19DT05URVhUX1NUQVRVU19QVFIoZW5naW5lKSkpKSwgZncgPyAiIiA6ICI/IiwK
KwkJCSAgdGFpbCwgR0VOOF9DU0JfV1JJVEVfUFRSKHJlYWRsKGk5MTUtPnJlZ3MgKyBpOTE1X21t
aW9fcmVnX29mZnNldChSSU5HX0NPTlRFWFRfU1RBVFVTX1BUUihlbmdpbmUpKSkpLCBmdyA/ICIi
IDogIj8iKTsKIAogCQl3aGlsZSAoaGVhZCAhPSB0YWlsKSB7CiAJCQlzdHJ1Y3QgaTkxNV9yZXF1
ZXN0ICpycTsKQEAgLTEwMzMsNyArMTAxMiw4IEBAIHN0YXRpYyB2b2lkIGV4ZWNsaXN0c19zdWJt
aXNzaW9uX3Rhc2tsZXQodW5zaWduZWQgbG9uZyBkYXRhKQogCQkJaWYgKCsraGVhZCA9PSBHRU44
X0NTQl9FTlRSSUVTKQogCQkJCWhlYWQgPSAwOwogCi0JCQkvKiBXZSBhcmUgZmx5aW5nIG5lYXIg
ZHJhZ29ucyBhZ2Fpbi4KKwkJCS8qCisJCQkgKiBXZSBhcmUgZmx5aW5nIG5lYXIgZHJhZ29ucyBh
Z2Fpbi4KIAkJCSAqCiAJCQkgKiBXZSBob2xkIGEgcmVmZXJlbmNlIHRvIHRoZSByZXF1ZXN0IGlu
IGV4ZWNsaXN0X3BvcnRbXQogCQkJICogYnV0IG5vIG1vcmUgdGhhbiB0aGF0LiBXZSBhcmUgb3Bl
cmF0aW5nIGluIHNvZnRpcnEKQEAgLTExNDIsMTUgKzExMjIsNDggQEAgc3RhdGljIHZvaWQgZXhl
Y2xpc3RzX3N1Ym1pc3Npb25fdGFza2xldCh1bnNpZ25lZCBsb25nIGRhdGEpCiAJCWlmIChoZWFk
ICE9IGV4ZWNsaXN0cy0+Y3NiX2hlYWQpIHsKIAkJCWV4ZWNsaXN0cy0+Y3NiX2hlYWQgPSBoZWFk
OwogCQkJd3JpdGVsKF9NQVNLRURfRklFTEQoR0VOOF9DU0JfUkVBRF9QVFJfTUFTSywgaGVhZCA8
PCA4KSwKLQkJCSAgICAgICBkZXZfcHJpdi0+cmVncyArIGk5MTVfbW1pb19yZWdfb2Zmc2V0KFJJ
TkdfQ09OVEVYVF9TVEFUVVNfUFRSKGVuZ2luZSkpKTsKKwkJCSAgICAgICBpOTE1LT5yZWdzICsg
aTkxNV9tbWlvX3JlZ19vZmZzZXQoUklOR19DT05URVhUX1NUQVRVU19QVFIoZW5naW5lKSkpOwog
CQl9Ci0JfQorCX0gd2hpbGUgKHRlc3RfYml0KEVOR0lORV9JUlFfRVhFQ0xJU1QsICZlbmdpbmUt
PmlycV9wb3N0ZWQpKTsKIAotCWlmICghZXhlY2xpc3RzX2lzX2FjdGl2ZShleGVjbGlzdHMsIEVY
RUNMSVNUU19BQ1RJVkVfUFJFRU1QVCkpCi0JCWV4ZWNsaXN0c19kZXF1ZXVlKGVuZ2luZSk7CisJ
aWYgKHVubGlrZWx5KGZ3KSkKKwkJaW50ZWxfdW5jb3JlX2ZvcmNld2FrZV9wdXQoaTkxNSwgZXhl
Y2xpc3RzLT5md19kb21haW5zKTsKK30KIAotCWlmIChmdykKLQkJaW50ZWxfdW5jb3JlX2ZvcmNl
d2FrZV9wdXQoZGV2X3ByaXYsIGV4ZWNsaXN0cy0+ZndfZG9tYWlucyk7CisvKgorICogQ2hlY2sg
dGhlIHVucmVhZCBDb250ZXh0IFN0YXR1cyBCdWZmZXJzIGFuZCBtYW5hZ2UgdGhlIHN1Ym1pc3Np
b24gb2YgbmV3CisgKiBjb250ZXh0cyB0byB0aGUgRUxTUCBhY2NvcmRpbmdseS4KKyAqLworc3Rh
dGljIHZvaWQgZXhlY2xpc3RzX3N1Ym1pc3Npb25fdGFza2xldCh1bnNpZ25lZCBsb25nIGRhdGEp
Cit7CisJc3RydWN0IGludGVsX2VuZ2luZV9jcyAqIGNvbnN0IGVuZ2luZSA9IChzdHJ1Y3QgaW50
ZWxfZW5naW5lX2NzICopZGF0YTsKKworCUdFTV9UUkFDRSgiJXMgYXdha2U/PSVkLCBhY3RpdmU9
JXgsIGlycS1wb3N0ZWQ/PSVkXG4iLAorCQkgIGVuZ2luZS0+bmFtZSwKKwkJICBlbmdpbmUtPmk5
MTUtPmd0LmF3YWtlLAorCQkgIGVuZ2luZS0+ZXhlY2xpc3RzLmFjdGl2ZSwKKwkJICB0ZXN0X2Jp
dChFTkdJTkVfSVJRX0VYRUNMSVNULCAmZW5naW5lLT5pcnFfcG9zdGVkKSk7CisKKwkvKgorCSAq
IFdlIGNhbiBza2lwIGFjcXVpcmluZyBpbnRlbF9ydW50aW1lX3BtX2dldCgpIGhlcmUgYXMgaXQg
d2FzIHRha2VuCisJICogb24gb3VyIGJlaGFsZiBieSB0aGUgcmVxdWVzdCAoc2VlIGk5MTVfZ2Vt
X21hcmtfYnVzeSgpKSBhbmQgaXQgd2lsbAorCSAqIG5vdCBiZSByZWxpbnF1aXNoZWQgdW50aWwg
dGhlIGRldmljZSBpcyBpZGxlIChzZWUKKwkgKiBpOTE1X2dlbV9pZGxlX3dvcmtfaGFuZGxlcigp
KS4gQXMgYSBwcmVjYXV0aW9uLCB3ZSBtYWtlIHN1cmUKKwkgKiB0aGF0IGFsbCBFTFNQIGFyZSBk
cmFpbmVkIGkuZS4gd2UgaGF2ZSBwcm9jZXNzZWQgdGhlIENTQiwKKwkgKiBiZWZvcmUgYWxsb3dp
bmcgb3Vyc2VsdmVzIHRvIGlkbGUgYW5kIGNhbGxpbmcgaW50ZWxfcnVudGltZV9wbV9wdXQoKS4K
KwkgKi8KKwlHRU1fQlVHX09OKCFlbmdpbmUtPmk5MTUtPmd0LmF3YWtlKTsKKworCS8qCisJICog
UHJlZmVyIGRvaW5nIHRlc3RfYW5kX2NsZWFyX2JpdCgpIGFzIGEgdHdvIHN0YWdlIG9wZXJhdGlv
biB0byBhdm9pZAorCSAqIGltcG9zaW5nIHRoZSBjb3N0IG9mIGEgbG9ja2VkIGF0b21pYyB0cmFu
c2FjdGlvbiB3aGVuIHN1Ym1pdHRpbmcgYQorCSAqIG5ldyByZXF1ZXN0IChvdXRzaWRlIG9mIHRo
ZSBjb250ZXh0LXN3aXRjaCBpbnRlcnJ1cHQpLgorCSAqLworCWlmICh0ZXN0X2JpdChFTkdJTkVf
SVJRX0VYRUNMSVNULCAmZW5naW5lLT5pcnFfcG9zdGVkKSkKKwkJcHJvY2Vzc19jc2IoZW5naW5l
KTsKKworCWlmICghZXhlY2xpc3RzX2lzX2FjdGl2ZSgmZW5naW5lLT5leGVjbGlzdHMsIEVYRUNM
SVNUU19BQ1RJVkVfUFJFRU1QVCkpCisJCWV4ZWNsaXN0c19kZXF1ZXVlKGVuZ2luZSk7CiAKIAkv
KiBJZiB0aGUgZW5naW5lIGlzIG5vdyBpZGxlLCBzbyBzaG91bGQgYmUgdGhlIGZsYWc7IGFuZCB2
aWNlIHZlcnNhLiAqLwogCUdFTV9CVUdfT04oZXhlY2xpc3RzX2lzX2FjdGl2ZSgmZW5naW5lLT5l
eGVjbGlzdHMsCi0tIAoyLjE3LjAKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f
X19fX19fX19fX19fCkludGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVk
ZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZv
L2ludGVsLWdmeAo=