From: Maarten Lankhorst Subject: [PATCH 04/23] drm/i915: Handle a few more cases for hw/sw split Date: Fri, 20 Sep 2019 13:42:16 +0200 Message-ID: <20190920114235.22411-4-maarten.lankhorst@linux.intel.com> References: <20190920114235.22411-1-maarten.lankhorst@linux.intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mblankhorst.nl (mblankhorst.nl [IPv6:2a02:2308::216:3eff:fe92:dfa3]) by gabe.freedesktop.org (Postfix) with ESMTPS id A9A786FC99 for ; Fri, 20 Sep 2019 11:42:40 +0000 (UTC) In-Reply-To: <20190920114235.22411-1-maarten.lankhorst@linux.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 V2UgYXJlIHN0aWxsIGxvb2tpbmcgYXQgZHJtX2NydGNfc3RhdGUgaW4gYSBmZXcgcGxhY2VzLCBj b252ZXJ0IHRob3NlCnRvIHVzZSBpbnRlbF9jcnRjX3N0YXRlIGluc3RlYWQuIExvb2sgYXQgdWFw aS9odyB3aGVyZSBhcHByb3ByaWF0ZS4KClNpZ25lZC1vZmYtYnk6IE1hYXJ0ZW4gTGFua2hvcnN0 IDxtYWFydGVuLmxhbmtob3JzdEBsaW51eC5pbnRlbC5jb20+Ci0tLQogZHJpdmVycy9ncHUvZHJt L2k5MTUvZGlzcGxheS9pbnRlbF9kaXNwbGF5LmMgfCAxNCArKysrKysrLS0tLS0tLQogZHJpdmVy cy9ncHUvZHJtL2k5MTUvZGlzcGxheS9pbnRlbF9kcF9tc3QuYyAgfCAgMiArLQogZHJpdmVycy9n cHUvZHJtL2k5MTUvZGlzcGxheS9pbnRlbF9wc3IuYyAgICAgfCAgNCArKy0tCiAzIGZpbGVzIGNo YW5nZWQsIDEwIGluc2VydGlvbnMoKyksIDEwIGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2Ry aXZlcnMvZ3B1L2RybS9pOTE1L2Rpc3BsYXkvaW50ZWxfZGlzcGxheS5jIGIvZHJpdmVycy9ncHUv ZHJtL2k5MTUvZGlzcGxheS9pbnRlbF9kaXNwbGF5LmMKaW5kZXggNjgxOGNiZDAwYWMyLi4zMmJi YjViZjQ4ZjMgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2Rpc3BsYXkvaW50ZWxf ZGlzcGxheS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2Rpc3BsYXkvaW50ZWxfZGlzcGxh eS5jCkBAIC0xNjA4MSw4ICsxNjA4MSw4IEBAIHN0YXRpYyBpbnQgaW50ZWxfaW5pdGlhbF9jb21t aXQoc3RydWN0IGRybV9kZXZpY2UgKmRldikKIHsKIAlzdHJ1Y3QgZHJtX2F0b21pY19zdGF0ZSAq c3RhdGUgPSBOVUxMOwogCXN0cnVjdCBkcm1fbW9kZXNldF9hY3F1aXJlX2N0eCBjdHg7Ci0Jc3Ry dWN0IGRybV9jcnRjICpjcnRjOwotCXN0cnVjdCBkcm1fY3J0Y19zdGF0ZSAqY3J0Y19zdGF0ZTsK KwlzdHJ1Y3QgaW50ZWxfY3J0YyAqY3J0YzsKKwlzdHJ1Y3QgaW50ZWxfY3J0Y19zdGF0ZSAqY3J0 Y19zdGF0ZTsKIAlpbnQgcmV0ID0gMDsKIAogCXN0YXRlID0gZHJtX2F0b21pY19zdGF0ZV9hbGxv YyhkZXYpOwpAQCAtMTYwOTQsMTUgKzE2MDk0LDE1IEBAIHN0YXRpYyBpbnQgaW50ZWxfaW5pdGlh bF9jb21taXQoc3RydWN0IGRybV9kZXZpY2UgKmRldikKIHJldHJ5OgogCXN0YXRlLT5hY3F1aXJl X2N0eCA9ICZjdHg7CiAKLQlkcm1fZm9yX2VhY2hfY3J0YyhjcnRjLCBkZXYpIHsKLQkJY3J0Y19z dGF0ZSA9IGRybV9hdG9taWNfZ2V0X2NydGNfc3RhdGUoc3RhdGUsIGNydGMpOworCWZvcl9lYWNo X2ludGVsX2NydGMoZGV2LCBjcnRjKSB7CisJCWNydGNfc3RhdGUgPSBpbnRlbF9hdG9taWNfZ2V0 X2NydGNfc3RhdGUoc3RhdGUsIGNydGMpOwogCQlpZiAoSVNfRVJSKGNydGNfc3RhdGUpKSB7CiAJ CQlyZXQgPSBQVFJfRVJSKGNydGNfc3RhdGUpOwogCQkJZ290byBvdXQ7CiAJCX0KIAotCQlpZiAo Y3J0Y19zdGF0ZS0+YWN0aXZlKSB7Ci0JCQlyZXQgPSBkcm1fYXRvbWljX2FkZF9hZmZlY3RlZF9w bGFuZXMoc3RhdGUsIGNydGMpOworCQlpZiAoY3J0Y19zdGF0ZS0+aHcuYWN0aXZlKSB7CisJCQly ZXQgPSBkcm1fYXRvbWljX2FkZF9hZmZlY3RlZF9wbGFuZXMoc3RhdGUsICZjcnRjLT5iYXNlKTsK IAkJCWlmIChyZXQpCiAJCQkJZ290byBvdXQ7CiAKQEAgLTE2MTEyLDcgKzE2MTEyLDcgQEAgc3Rh dGljIGludCBpbnRlbF9pbml0aWFsX2NvbW1pdChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KQogCQkJ ICogaGF2aW5nIGEgcHJvcGVyIExVVCBsb2FkZWQuIFJlbW92ZSBvbmNlIHdlCiAJCQkgKiBoYXZl IHJlYWRvdXQgZm9yIHBpcGUgZ2FtbWEgZW5hYmxlLgogCQkJICovCi0JCQljcnRjX3N0YXRlLT5j b2xvcl9tZ210X2NoYW5nZWQgPSB0cnVlOworCQkJY3J0Y19zdGF0ZS0+dWFwaS5jb2xvcl9tZ210 X2NoYW5nZWQgPSB0cnVlOwogCQl9CiAJfQogCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0v aTkxNS9kaXNwbGF5L2ludGVsX2RwX21zdC5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvZGlzcGxh eS9pbnRlbF9kcF9tc3QuYwppbmRleCA3NmYwNjZiMWRmZTUuLjUxMjdlYzAzN2I3YiAxMDA2NDQK LS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvZGlzcGxheS9pbnRlbF9kcF9tc3QuYworKysgYi9k cml2ZXJzL2dwdS9kcm0vaTkxNS9kaXNwbGF5L2ludGVsX2RwX21zdC5jCkBAIC0xODcsNyArMTg3 LDcgQEAgaW50ZWxfZHBfbXN0X2F0b21pY19jaGVjayhzdHJ1Y3QgZHJtX2Nvbm5lY3RvciAqY29u bmVjdG9yLAogCiAJCWlmICghY3J0Y19zdGF0ZSB8fAogCQkgICAgIWRybV9hdG9taWNfY3J0Y19u ZWVkc19tb2Rlc2V0KGNydGNfc3RhdGUpIHx8Ci0JCSAgICBjcnRjX3N0YXRlLT5lbmFibGUpCisJ CSAgICB0b19pbnRlbF9jcnRjX3N0YXRlKGNydGNfc3RhdGUpLT5ody5lbmFibGUpCiAJCQlyZXR1 cm4gMDsKIAl9CiAKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2Rpc3BsYXkvaW50 ZWxfcHNyLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9kaXNwbGF5L2ludGVsX3Bzci5jCmluZGV4 IDg5ODhkYmU4YzE5ZS4uOTc5ZTE2NmY1NjM5IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0v aTkxNS9kaXNwbGF5L2ludGVsX3Bzci5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2Rpc3Bs YXkvaW50ZWxfcHNyLmMKQEAgLTEwNjgsOSArMTA2OCw5IEBAIHN0YXRpYyBpbnQgaW50ZWxfcHNy X2Zhc3RzZXRfZm9yY2Uoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KQogCiAJCWlu dGVsX2NydGNfc3RhdGUgPSB0b19pbnRlbF9jcnRjX3N0YXRlKGNydGNfc3RhdGUpOwogCi0JCWlm IChjcnRjX3N0YXRlLT5hY3RpdmUgJiYgaW50ZWxfY3J0Y19zdGF0ZS0+aGFzX3BzcikgeworCQlp ZiAoaW50ZWxfY3J0Y19zdGF0ZS0+aHcuYWN0aXZlICYmIGludGVsX2NydGNfc3RhdGUtPmhhc19w c3IpIHsKIAkJCS8qIE1hcmsgbW9kZSBhcyBjaGFuZ2VkIHRvIHRyaWdnZXIgYSBwaXBlLT51cGRh dGUoKSAqLwotCQkJY3J0Y19zdGF0ZS0+bW9kZV9jaGFuZ2VkID0gdHJ1ZTsKKwkJCWludGVsX2Ny dGNfc3RhdGUtPnVhcGkubW9kZV9jaGFuZ2VkID0gdHJ1ZTsKIAkJCWJyZWFrOwogCQl9CiAJfQot LSAKMi4yMC4xCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f XwpJbnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcK aHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZng=