From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by gabe.freedesktop.org (Postfix) with ESMTPS id E842C6E0A2 for ; Sun, 2 Aug 2020 15:23:16 +0000 (UTC) From: =?UTF-8?q?Zbigniew=20Kempczy=C5=84ski?= Date: Sun, 2 Aug 2020 17:22:52 +0200 Message-Id: <20200802152309.4826-3-zbigniew.kempczynski@intel.com> In-Reply-To: <20200802152309.4826-1-zbigniew.kempczynski@intel.com> References: <20200802152309.4826-1-zbigniew.kempczynski@intel.com> MIME-Version: 1.0 Subject: [igt-dev] [PATCH i-g-t v22 02/19] lib/intel_bufops: change in hw/sw tiling detection List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Errors-To: igt-dev-bounces@lists.freedesktop.org Sender: "igt-dev" To: igt-dev@lists.freedesktop.org Cc: Chris Wilson List-ID: Tm90IGFsbCBzd2l6emxpbmcgY2FuIGJlIGhhbmRsZWQgYnkgdGhlIHNvZnR3YXJlIChiaXQxNykg c28gZGV0ZWN0Cml0IHByb3Blcmx5IGR1cmluZyBidWZvcHMgY3JlYXRpb24gdGltZSBhbmQgZGlz YWJsZSBpZiBuZWNlc3NhcnkuCgpTaWduZWQtb2ZmLWJ5OiBaYmlnbmlldyBLZW1wY3p5xYRza2kg PHpiaWduaWV3LmtlbXBjenluc2tpQGludGVsLmNvbT4KQ2M6IERvbWluaWsgR3J6ZWdvcnplayA8 ZG9taW5pay5ncnplZ29yemVrQGludGVsLmNvbT4KQ2M6IENocmlzIFdpbHNvbiA8Y2hyaXNAY2hy aXMtd2lsc29uLmNvLnVrPgotLS0KIGxpYi9pbnRlbF9idWZvcHMuYyB8IDQ1ICsrKysrKysrKysr KysrKysrKysrKysrKysrKysrKysrKysrKy0tLS0tLS0tLQogMSBmaWxlIGNoYW5nZWQsIDM2IGlu c2VydGlvbnMoKyksIDkgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvbGliL2ludGVsX2J1Zm9w cy5jIGIvbGliL2ludGVsX2J1Zm9wcy5jCmluZGV4IDA5NDMzYmVkLi4yYmE0ZGJmNiAxMDA2NDQK LS0tIGEvbGliL2ludGVsX2J1Zm9wcy5jCisrKyBiL2xpYi9pbnRlbF9idWZvcHMuYwpAQCAtMTU3 LDcgKzE1Nyw3IEBAIHN0YXRpYyBpbnQgX19nZW1fZ2V0X3RpbGluZyhpbnQgZmQsIHN0cnVjdCBk cm1faTkxNV9nZW1fZ2V0X3RpbGluZyAqYXJnKQogfQogCiBzdGF0aWMgYm9vbCBfX2dldF90aWxp bmcoaW50IGZkLCB1aW50MzJfdCBoYW5kbGUsIHVpbnQzMl90ICp0aWxpbmcsCi0JCQkgdWludDMy X3QgKnN3aXp6bGUpCisJCQkgdWludDMyX3QgKnN3aXp6bGUsIHVpbnQzMl90ICpwaHlzX3N3aXp6 bGUpCiB7CiAJc3RydWN0IGRybV9pOTE1X2dlbV9nZXRfdGlsaW5nIGdldF90aWxpbmcgPSB7IC5o YW5kbGUgPSBoYW5kbGUgfTsKIApAQCAtMTY2LDEyICsxNjYsMTMgQEAgc3RhdGljIGJvb2wgX19n ZXRfdGlsaW5nKGludCBmZCwgdWludDMyX3QgaGFuZGxlLCB1aW50MzJfdCAqdGlsaW5nLAogCiAJ KnRpbGluZyA9IGdldF90aWxpbmcudGlsaW5nX21vZGU7CiAJKnN3aXp6bGUgPSBnZXRfdGlsaW5n LnN3aXp6bGVfbW9kZTsKKwkqcGh5c19zd2l6emxlID0gZ2V0X3RpbGluZy5waHlzX3N3aXp6bGVf bW9kZTsKIAlpZ3RfZGVidWcoImJ1ZiB0aWxpbmc6ICVzLCBzd2l6emxlOiAleCwgcGh5c19zd2l6 emxlOiAleFxuIiwKIAkJICB0aWxpbmdfc3RyKGdldF90aWxpbmcudGlsaW5nX21vZGUpLAogCQkg IGdldF90aWxpbmcuc3dpenpsZV9tb2RlLAogCQkgIGdldF90aWxpbmcucGh5c19zd2l6emxlX21v ZGUpOwogCi0JcmV0dXJuIGdldF90aWxpbmcucGh5c19zd2l6emxlX21vZGUgPT0gZ2V0X3RpbGlu Zy5zd2l6emxlX21vZGU7CisJcmV0dXJuIHRydWU7CiB9CiAKIHN0YXRpYyBpbnQgX19zZXRfdGls aW5nKGludCBmZCwgdWludDMyX3QgaGFuZGxlLCB1aW50MzJfdCB0aWxpbmcsCkBAIC0yMTIsOCAr MjEzLDEwIEBAIHN0YXRpYyB2b2lkIHNldF9od190aWxlZChzdHJ1Y3QgYnVmX29wcyAqYm9wcywg c3RydWN0IGludGVsX2J1ZiAqYnVmKQogCWlmIChidWYtPnRpbGluZyAhPSBJOTE1X1RJTElOR19Y ICYmIGJ1Zi0+dGlsaW5nICE9IEk5MTVfVElMSU5HX1kpCiAJCXJldHVybjsKIAotCWlmICghYnVm X29wc19oYXNfaHdfZmVuY2UoYm9wcywgYnVmLT50aWxpbmcpKQorCWlmICghYnVmX29wc19oYXNf aHdfZmVuY2UoYm9wcywgYnVmLT50aWxpbmcpKSB7CisJCWlndF93YXJuKCJObyBIVyBmZW5jZSBm b3IgdGlsaW5nOiAlZFxuIiwgYnVmLT50aWxpbmcpOwogCQlyZXR1cm47CisJfQogCiAJaWd0X2Fz c2VydF9lcShfX3NldF90aWxpbmcoYm9wcy0+ZmQsCiAJCQkJICAgYnVmLT5oYW5kbGUsIGJ1Zi0+ dGlsaW5nLApAQCAtMTAyOSwxMCArMTAzMiwxMSBAQCBzdHJ1Y3QgYnVmX29wcyBidWZfb3BzX2Fy cltdID0gewogCX0sCiB9OwogCi1zdGF0aWMgYm9vbCBwcm9iZV9od190aWxpbmcoc3RydWN0IGJ1 Zl9vcHMgKmJvcHMsIHVpbnQzMl90IHRpbGluZykKK3N0YXRpYyBib29sIHByb2JlX2h3X3RpbGlu ZyhzdHJ1Y3QgYnVmX29wcyAqYm9wcywgdWludDMyX3QgdGlsaW5nLAorCQkJICAgIGJvb2wgKnN3 aXp6bGluZ19zdXBwb3J0ZWQpCiB7CiAJdWludDY0X3Qgc2l6ZSA9IDI1NiAqIDI1NjsKLQl1aW50 MzJfdCBoYW5kbGUsIGJ1Zl90aWxpbmcsIGJ1Zl9zd2l6emxlOworCXVpbnQzMl90IGhhbmRsZSwg YnVmX3RpbGluZywgYnVmX3N3aXp6bGUsIHBoeXNfc3dpenpsZTsKIAl1aW50MzJfdCBzdHJpZGU7 CiAJaW50IHJldDsKIAlib29sIGlzX3NldCA9IGZhbHNlOwpAQCAtMTA1MSwxMiArMTA1NSwxNSBA QCBzdGF0aWMgYm9vbCBwcm9iZV9od190aWxpbmcoc3RydWN0IGJ1Zl9vcHMgKmJvcHMsIHVpbnQz Ml90IHRpbGluZykKIAlpZiAocmV0KQogCQlnb3RvIGVuZDsKIAotCWlzX3NldCA9IF9fZ2V0X3Rp bGluZyhib3BzLT5mZCwgaGFuZGxlLCAmYnVmX3RpbGluZywgJmJ1Zl9zd2l6emxlKTsKKwlpc19z ZXQgPSBfX2dldF90aWxpbmcoYm9wcy0+ZmQsIGhhbmRsZSwgJmJ1Zl90aWxpbmcsICZidWZfc3dp enpsZSwKKwkJCSAgICAgICZwaHlzX3N3aXp6bGUpOwogCWlmIChpc19zZXQpIHsKIAkJaWYgKHRp bGluZyA9PSBJOTE1X1RJTElOR19YKQogCQkJYm9wcy0+c3dpenpsZV94ID0gYnVmX3N3aXp6bGU7 CiAJCWVsc2UgaWYgKHRpbGluZyA9PSBJOTE1X1RJTElOR19ZKQogCQkJYm9wcy0+c3dpenpsZV95 ID0gYnVmX3N3aXp6bGU7CisKKwkJKnN3aXp6bGluZ19zdXBwb3J0ZWQgPSBidWZfc3dpenpsZSA9 PSBwaHlzX3N3aXp6bGU7CiAJfQogZW5kOgogCWdlbV9jbG9zZShib3BzLT5mZCwgaGFuZGxlKTsK QEAgLTExNzIsMTQgKzExNzksMjEgQEAgc3RhdGljIHN0cnVjdCBidWZfb3BzICpfX2J1Zl9vcHNf Y3JlYXRlKGludCBmZCwgYm9vbCBjaGVja19pZGVtcG90ZW5jeSkKIAkgKgogCSAqIE9rLCB5b3Ug aGF2ZSBiZWVuIHdhcm5lZC4KIAkgKi8KLQlpZiAoYm9wcy0+aW50ZWxfZ2VuID09IDIpIHsKKwlp ZiAoYm9wcy0+aW50ZWxfZ2VuID09IDIgKSB7CiAJCWlndF93YXJuKCJHZW4yIGRldGVjdGVkLiBI VyAoZGUpdGlsaW5nIHN1cHBvcnQgb25seS4iKTsKIAkJcmV0dXJuIGJvcHM7CiAJfQogCiAJLyog TGV0J3MgcHJvYmUgWCBhbmQgWSBodyB0aWxpbmcgc3VwcG9ydCAqLwogCWlmIChpc19od190aWxp bmdfc3VwcG9ydGVkKGJvcHMsIEk5MTVfVElMSU5HX1gpKSB7Ci0JCWJvb2wgc3VwcG9ydGVkID0g cHJvYmVfaHdfdGlsaW5nKGJvcHMsIEk5MTVfVElMSU5HX1gpOworCQlib29sIHN3aXp6bGluZ19z dXBwb3J0ZWQ7CisJCWJvb2wgc3VwcG9ydGVkID0gcHJvYmVfaHdfdGlsaW5nKGJvcHMsIEk5MTVf VElMSU5HX1gsCisJCQkJCQkgJnN3aXp6bGluZ19zdXBwb3J0ZWQpOworCisJCWlmICghc3dpenps aW5nX3N1cHBvcnRlZCkgeworCQkJaWd0X2RlYnVnKCJTd2l6emxpbmcgZm9yIFggaXMgbm90IHN1 cHBvcnRlZFxuIik7CisJCQlib3BzLT5zdXBwb3J0ZWRfdGlsZXMgJj0gflRJTEVfWDsKKwkJfQog CiAJCWlndF9kZWJ1ZygiWCBmZW5jZSBzdXBwb3J0OiAlc1xuIiwgYm9vbF9zdHIoc3VwcG9ydGVk KSk7CiAJCWlmICghc3VwcG9ydGVkKSB7CkBAIC0xMTkwLDcgKzEyMDQsMTQgQEAgc3RhdGljIHN0 cnVjdCBidWZfb3BzICpfX2J1Zl9vcHNfY3JlYXRlKGludCBmZCwgYm9vbCBjaGVja19pZGVtcG90 ZW5jeSkKIAl9CiAKIAlpZiAoaXNfaHdfdGlsaW5nX3N1cHBvcnRlZChib3BzLCBJOTE1X1RJTElO R19ZKSkgewotCQlib29sIHN1cHBvcnRlZCA9IHByb2JlX2h3X3RpbGluZyhib3BzLCBJOTE1X1RJ TElOR19ZKTsKKwkJYm9vbCBzd2l6emxpbmdfc3VwcG9ydGVkOworCQlib29sIHN1cHBvcnRlZCA9 IHByb2JlX2h3X3RpbGluZyhib3BzLCBJOTE1X1RJTElOR19ZLAorCQkJCQkJICZzd2l6emxpbmdf c3VwcG9ydGVkKTsKKworCQlpZiAoIXN3aXp6bGluZ19zdXBwb3J0ZWQpIHsKKwkJCWlndF9kZWJ1 ZygiU3dpenpsaW5nIGZvciBZIGlzIG5vdCBzdXBwb3J0ZWRcbiIpOworCQkJYm9wcy0+c3VwcG9y dGVkX3RpbGVzICY9IH5USUxFX1k7CisJCX0KIAogCQlpZ3RfZGVidWcoIlkgZmVuY2Ugc3VwcG9y dDogJXNcbiIsIGJvb2xfc3RyKHN1cHBvcnRlZCkpOwogCQlpZiAoIXN1cHBvcnRlZCkgewpAQCAt MTMwNyw2ICsxMzI4LDkgQEAgYm9vbCBidWZfb3BzX3NldF9zb2Z0d2FyZV90aWxpbmcoc3RydWN0 IGJ1Zl9vcHMgKmJvcHMsCiAJc3dpdGNoICh0aWxpbmcpIHsKIAljYXNlIEk5MTVfVElMSU5HX1g6 CiAJCWlmICh1c2Vfc29mdHdhcmVfdGlsaW5nKSB7CisJCQlib29sIHN1cHBvcnRlZCA9IGJ1Zl9v cHNfaGFzX3RpbGluZ19zdXBwb3J0KGJvcHMsIHRpbGluZyk7CisJCQlpZ3RfYXNzZXJ0X2Yoc3Vw cG9ydGVkLCAiQ2Fubm90IHN3aXRjaCB0byBYIHNvZnR3YXJlIHRpbGluZ1xuIik7CisKIAkJCWln dF9kZWJ1ZygiLT4gY2hhbmdlIFggdG8gU1dcbiIpOwogCQkJYm9wcy0+bGluZWFyX3RvX3ggPSBj b3B5X2xpbmVhcl90b194OwogCQkJYm9wcy0+eF90b19saW5lYXIgPSBjb3B5X3hfdG9fbGluZWFy OwpAQCAtMTMyNCw2ICsxMzQ4LDkgQEAgYm9vbCBidWZfb3BzX3NldF9zb2Z0d2FyZV90aWxpbmco c3RydWN0IGJ1Zl9vcHMgKmJvcHMsCiAKIAljYXNlIEk5MTVfVElMSU5HX1k6CiAJCWlmICh1c2Vf c29mdHdhcmVfdGlsaW5nKSB7CisJCQlib29sIHN1cHBvcnRlZCA9IGJ1Zl9vcHNfaGFzX3RpbGlu Z19zdXBwb3J0KGJvcHMsIHRpbGluZyk7CisJCQlpZ3RfYXNzZXJ0X2Yoc3VwcG9ydGVkLCAiQ2Fu bm90IHN3aXRjaCB0byBZIHNvZnR3YXJlIHRpbGluZ1xuIik7CisKIAkJCWlndF9kZWJ1ZygiLT4g Y2hhbmdlIFkgdG8gU1dcbiIpOwogCQkJYm9wcy0+bGluZWFyX3RvX3kgPSBjb3B5X2xpbmVhcl90 b195OwogCQkJYm9wcy0+eV90b19saW5lYXIgPSBjb3B5X3lfdG9fbGluZWFyOwotLSAKMi4yNi4w CgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwppZ3QtZGV2 IG1haWxpbmcgbGlzdAppZ3QtZGV2QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3Rz LmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2lndC1kZXYK