From mboxrd@z Thu Jan  1 00:00:00 1970
From: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Subject: [PATCH 2/4] drm/i915: Handle a few more cases for hw/sw
 split
Date: Wed, 25 Sep 2019 16:58:59 +0200
Message-ID: <20190925145901.3943-2-maarten.lankhorst@linux.intel.com>
References: <20190925145901.3943-1-maarten.lankhorst@linux.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 mblankhorst.nl (mblankhorst.nl [141.105.120.124])
 by gabe.freedesktop.org (Postfix) with ESMTPS id B4BA76EBD7
 for <intel-gfx@lists.freedesktop.org>; Wed, 25 Sep 2019 14:59:10 +0000 (UTC)
In-Reply-To: <20190925145901.3943-1-maarten.lankhorst@linux.intel.com>
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

V2UgYXJlIHN0aWxsIGxvb2tpbmcgYXQgZHJtX2NydGNfc3RhdGUgaW4gYSBmZXcgcGxhY2VzLCBj
b252ZXJ0IHRob3NlCnRvIHVzZSBpbnRlbF9jcnRjX3N0YXRlIGluc3RlYWQuIExvb2sgYXQgdWFw
aS9odyB3aGVyZSBhcHByb3ByaWF0ZS4KClNpZ25lZC1vZmYtYnk6IE1hYXJ0ZW4gTGFua2hvcnN0
IDxtYWFydGVuLmxhbmtob3JzdEBsaW51eC5pbnRlbC5jb20+ClJldmlld2VkLWJ5OiBNYXR0IFJv
cGVyIDxtYXR0aGV3LmQucm9wZXJAaW50ZWwuY29tPgotLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1
L2Rpc3BsYXkvaW50ZWxfZGlzcGxheS5jIHwgMTQgKysrKysrKy0tLS0tLS0KIGRyaXZlcnMvZ3B1
L2RybS9pOTE1L2Rpc3BsYXkvaW50ZWxfZHBfbXN0LmMgIHwgIDIgKy0KIGRyaXZlcnMvZ3B1L2Ry
bS9pOTE1L2Rpc3BsYXkvaW50ZWxfcHNyLmMgICAgIHwgIDQgKystLQogMyBmaWxlcyBjaGFuZ2Vk
LCAxMCBpbnNlcnRpb25zKCspLCAxMCBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJz
L2dwdS9kcm0vaTkxNS9kaXNwbGF5L2ludGVsX2Rpc3BsYXkuYyBiL2RyaXZlcnMvZ3B1L2RybS9p
OTE1L2Rpc3BsYXkvaW50ZWxfZGlzcGxheS5jCmluZGV4IDZlYzE3OTMyZTBkYy4uMmQ4MDVmMWMx
YzJkIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9kaXNwbGF5L2ludGVsX2Rpc3Bs
YXkuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9kaXNwbGF5L2ludGVsX2Rpc3BsYXkuYwpA
QCAtMTYxMzQsOCArMTYxMzQsOCBAQCBzdGF0aWMgaW50IGludGVsX2luaXRpYWxfY29tbWl0KHN0
cnVjdCBkcm1fZGV2aWNlICpkZXYpCiB7CiAJc3RydWN0IGRybV9hdG9taWNfc3RhdGUgKnN0YXRl
ID0gTlVMTDsKIAlzdHJ1Y3QgZHJtX21vZGVzZXRfYWNxdWlyZV9jdHggY3R4OwotCXN0cnVjdCBk
cm1fY3J0YyAqY3J0YzsKLQlzdHJ1Y3QgZHJtX2NydGNfc3RhdGUgKmNydGNfc3RhdGU7CisJc3Ry
dWN0IGludGVsX2NydGMgKmNydGM7CisJc3RydWN0IGludGVsX2NydGNfc3RhdGUgKmNydGNfc3Rh
dGU7CiAJaW50IHJldCA9IDA7CiAKIAlzdGF0ZSA9IGRybV9hdG9taWNfc3RhdGVfYWxsb2MoZGV2
KTsKQEAgLTE2MTQ3LDE1ICsxNjE0NywxNSBAQCBzdGF0aWMgaW50IGludGVsX2luaXRpYWxfY29t
bWl0KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCiByZXRyeToKIAlzdGF0ZS0+YWNxdWlyZV9jdHgg
PSAmY3R4OwogCi0JZHJtX2Zvcl9lYWNoX2NydGMoY3J0YywgZGV2KSB7Ci0JCWNydGNfc3RhdGUg
PSBkcm1fYXRvbWljX2dldF9jcnRjX3N0YXRlKHN0YXRlLCBjcnRjKTsKKwlmb3JfZWFjaF9pbnRl
bF9jcnRjKGRldiwgY3J0YykgeworCQljcnRjX3N0YXRlID0gaW50ZWxfYXRvbWljX2dldF9jcnRj
X3N0YXRlKHN0YXRlLCBjcnRjKTsKIAkJaWYgKElTX0VSUihjcnRjX3N0YXRlKSkgewogCQkJcmV0
ID0gUFRSX0VSUihjcnRjX3N0YXRlKTsKIAkJCWdvdG8gb3V0OwogCQl9CiAKLQkJaWYgKGNydGNf
c3RhdGUtPmFjdGl2ZSkgewotCQkJcmV0ID0gZHJtX2F0b21pY19hZGRfYWZmZWN0ZWRfcGxhbmVz
KHN0YXRlLCBjcnRjKTsKKwkJaWYgKGNydGNfc3RhdGUtPmh3LmFjdGl2ZSkgeworCQkJcmV0ID0g
ZHJtX2F0b21pY19hZGRfYWZmZWN0ZWRfcGxhbmVzKHN0YXRlLCAmY3J0Yy0+YmFzZSk7CiAJCQlp
ZiAocmV0KQogCQkJCWdvdG8gb3V0OwogCkBAIC0xNjE2NSw3ICsxNjE2NSw3IEBAIHN0YXRpYyBp
bnQgaW50ZWxfaW5pdGlhbF9jb21taXQoc3RydWN0IGRybV9kZXZpY2UgKmRldikKIAkJCSAqIGhh
dmluZyBhIHByb3BlciBMVVQgbG9hZGVkLiBSZW1vdmUgb25jZSB3ZQogCQkJICogaGF2ZSByZWFk
b3V0IGZvciBwaXBlIGdhbW1hIGVuYWJsZS4KIAkJCSAqLwotCQkJY3J0Y19zdGF0ZS0+Y29sb3Jf
bWdtdF9jaGFuZ2VkID0gdHJ1ZTsKKwkJCWNydGNfc3RhdGUtPnVhcGkuY29sb3JfbWdtdF9jaGFu
Z2VkID0gdHJ1ZTsKIAkJfQogCX0KIApkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUv
ZGlzcGxheS9pbnRlbF9kcF9tc3QuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2Rpc3BsYXkvaW50
ZWxfZHBfbXN0LmMKaW5kZXggZmU5MGIxZDZiNGMyLi5kNjZlOWUwYjczMGMgMTAwNjQ0Ci0tLSBh
L2RyaXZlcnMvZ3B1L2RybS9pOTE1L2Rpc3BsYXkvaW50ZWxfZHBfbXN0LmMKKysrIGIvZHJpdmVy
cy9ncHUvZHJtL2k5MTUvZGlzcGxheS9pbnRlbF9kcF9tc3QuYwpAQCAtMTg3LDcgKzE4Nyw3IEBA
IGludGVsX2RwX21zdF9hdG9taWNfY2hlY2soc3RydWN0IGRybV9jb25uZWN0b3IgKmNvbm5lY3Rv
ciwKIAogCQlpZiAoIWNydGNfc3RhdGUgfHwKIAkJICAgICFkcm1fYXRvbWljX2NydGNfbmVlZHNf
bW9kZXNldChjcnRjX3N0YXRlKSB8fAotCQkgICAgY3J0Y19zdGF0ZS0+ZW5hYmxlKQorCQkgICAg
dG9faW50ZWxfY3J0Y19zdGF0ZShjcnRjX3N0YXRlKS0+aHcuZW5hYmxlKQogCQkJcmV0dXJuIDA7
CiAJfQogCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9kaXNwbGF5L2ludGVsX3Bz
ci5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvZGlzcGxheS9pbnRlbF9wc3IuYwppbmRleCA4OTg4
ZGJlOGMxOWUuLjk3OWUxNjZmNTYzOSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUv
ZGlzcGxheS9pbnRlbF9wc3IuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9kaXNwbGF5L2lu
dGVsX3Bzci5jCkBAIC0xMDY4LDkgKzEwNjgsOSBAQCBzdGF0aWMgaW50IGludGVsX3Bzcl9mYXN0
c2V0X2ZvcmNlKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdikKIAogCQlpbnRlbF9j
cnRjX3N0YXRlID0gdG9faW50ZWxfY3J0Y19zdGF0ZShjcnRjX3N0YXRlKTsKIAotCQlpZiAoY3J0
Y19zdGF0ZS0+YWN0aXZlICYmIGludGVsX2NydGNfc3RhdGUtPmhhc19wc3IpIHsKKwkJaWYgKGlu
dGVsX2NydGNfc3RhdGUtPmh3LmFjdGl2ZSAmJiBpbnRlbF9jcnRjX3N0YXRlLT5oYXNfcHNyKSB7
CiAJCQkvKiBNYXJrIG1vZGUgYXMgY2hhbmdlZCB0byB0cmlnZ2VyIGEgcGlwZS0+dXBkYXRlKCkg
Ki8KLQkJCWNydGNfc3RhdGUtPm1vZGVfY2hhbmdlZCA9IHRydWU7CisJCQlpbnRlbF9jcnRjX3N0
YXRlLT51YXBpLm1vZGVfY2hhbmdlZCA9IHRydWU7CiAJCQlicmVhazsKIAkJfQogCX0KLS0gCjIu
MjAuMQoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KSW50
ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBz
Oi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4