From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga17.intel.com (mga17.intel.com [192.55.52.151]) by gabe.freedesktop.org (Postfix) with ESMTPS id C9DE56E267 for ; Mon, 3 Aug 2020 12:43:25 +0000 (UTC) From: =?UTF-8?q?Zbigniew=20Kempczy=C5=84ski?= Date: Mon, 3 Aug 2020 14:42:53 +0200 Message-Id: <20200803124313.31162-3-zbigniew.kempczynski@intel.com> In-Reply-To: <20200803124313.31162-1-zbigniew.kempczynski@intel.com> References: <20200803124313.31162-1-zbigniew.kempczynski@intel.com> MIME-Version: 1.0 Subject: [igt-dev] [PATCH i-g-t v25 02/22] 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 cy5jIGIvbGliL2ludGVsX2J1Zm9wcy5jCmluZGV4IDA5NDMzYmVkLi42NDk5OTliYSAxMDA2NDQK LS0tIGEvbGliL2ludGVsX2J1Zm9wcy5jCisrKyBiL2xpYi9pbnRlbF9idWZvcHMuYwpAQCAtMTU3 LDcgKzE1Nyw3IEBAIHN0YXRpYyBpbnQgX19nZW1fZ2V0X3RpbGluZyhpbnQgZmQsIHN0cnVjdCBk cm1faTkxNV9nZW1fZ2V0X3RpbGluZyAqYXJnKQogfQogCiBzdGF0aWMgYm9vbCBfX2dldF90aWxp bmcoaW50IGZkLCB1aW50MzJfdCBoYW5kbGUsIHVpbnQzMl90ICp0aWxpbmcsCi0JCQkgdWludDMy X3QgKnN3aXp6bGUpCisJCQkgdWludDMyX3QgKnN3aXp6bGUsIHVpbnQzMl90ICpwaHlzX3N3aXp6 bGUpCiB7CiAJc3RydWN0IGRybV9pOTE1X2dlbV9nZXRfdGlsaW5nIGdldF90aWxpbmcgPSB7IC5o YW5kbGUgPSBoYW5kbGUgfTsKIApAQCAtMTY2LDEyICsxNjYsMTMgQEAgc3RhdGljIGJvb2wgX19n ZXRfdGlsaW5nKGludCBmZCwgdWludDMyX3QgaGFuZGxlLCB1aW50MzJfdCAqdGlsaW5nLAogCiAJ KnRpbGluZyA9IGdldF90aWxpbmcudGlsaW5nX21vZGU7CiAJKnN3aXp6bGUgPSBnZXRfdGlsaW5n LnN3aXp6bGVfbW9kZTsKKwkqcGh5c19zd2l6emxlID0gZ2V0X3RpbGluZy5waHlzX3N3aXp6bGVf bW9kZTsKIAlpZ3RfZGVidWcoImJ1ZiB0aWxpbmc6ICVzLCBzd2l6emxlOiAleCwgcGh5c19zd2l6 emxlOiAleFxuIiwKIAkJICB0aWxpbmdfc3RyKGdldF90aWxpbmcudGlsaW5nX21vZGUpLAogCQkg IGdldF90aWxpbmcuc3dpenpsZV9tb2RlLAogCQkgIGdldF90aWxpbmcucGh5c19zd2l6emxlX21v ZGUpOwogCi0JcmV0dXJuIGdldF90aWxpbmcucGh5c19zd2l6emxlX21vZGUgPT0gZ2V0X3RpbGlu Zy5zd2l6emxlX21vZGU7CisJcmV0dXJuIHRydWU7CiB9CiAKIHN0YXRpYyBpbnQgX19zZXRfdGls aW5nKGludCBmZCwgdWludDMyX3QgaGFuZGxlLCB1aW50MzJfdCB0aWxpbmcsCkBAIC0yMTIsOCAr MjEzLDEwIEBAIHN0YXRpYyB2b2lkIHNldF9od190aWxlZChzdHJ1Y3QgYnVmX29wcyAqYm9wcywg c3RydWN0IGludGVsX2J1ZiAqYnVmKQogCWlmIChidWYtPnRpbGluZyAhPSBJOTE1X1RJTElOR19Y ICYmIGJ1Zi0+dGlsaW5nICE9IEk5MTVfVElMSU5HX1kpCiAJCXJldHVybjsKIAotCWlmICghYnVm X29wc19oYXNfaHdfZmVuY2UoYm9wcywgYnVmLT50aWxpbmcpKQorCWlmICghYnVmX29wc19oYXNf aHdfZmVuY2UoYm9wcywgYnVmLT50aWxpbmcpKSB7CisJCWlndF9kZWJ1ZygiTm8gSFcgZmVuY2Ug Zm9yIHRpbGluZzogJWRcbiIsIGJ1Zi0+dGlsaW5nKTsKIAkJcmV0dXJuOworCX0KIAogCWlndF9h c3NlcnRfZXEoX19zZXRfdGlsaW5nKGJvcHMtPmZkLAogCQkJCSAgIGJ1Zi0+aGFuZGxlLCBidWYt PnRpbGluZywKQEAgLTEwMjksMTAgKzEwMzIsMTEgQEAgc3RydWN0IGJ1Zl9vcHMgYnVmX29wc19h cnJbXSA9IHsKIAl9LAogfTsKIAotc3RhdGljIGJvb2wgcHJvYmVfaHdfdGlsaW5nKHN0cnVjdCBi dWZfb3BzICpib3BzLCB1aW50MzJfdCB0aWxpbmcpCitzdGF0aWMgYm9vbCBwcm9iZV9od190aWxp bmcoc3RydWN0IGJ1Zl9vcHMgKmJvcHMsIHVpbnQzMl90IHRpbGluZywKKwkJCSAgICBib29sICpz d2l6emxpbmdfc3VwcG9ydGVkKQogewogCXVpbnQ2NF90IHNpemUgPSAyNTYgKiAyNTY7Ci0JdWlu dDMyX3QgaGFuZGxlLCBidWZfdGlsaW5nLCBidWZfc3dpenpsZTsKKwl1aW50MzJfdCBoYW5kbGUs IGJ1Zl90aWxpbmcsIGJ1Zl9zd2l6emxlLCBwaHlzX3N3aXp6bGU7CiAJdWludDMyX3Qgc3RyaWRl OwogCWludCByZXQ7CiAJYm9vbCBpc19zZXQgPSBmYWxzZTsKQEAgLTEwNTEsMTIgKzEwNTUsMTUg QEAgc3RhdGljIGJvb2wgcHJvYmVfaHdfdGlsaW5nKHN0cnVjdCBidWZfb3BzICpib3BzLCB1aW50 MzJfdCB0aWxpbmcpCiAJaWYgKHJldCkKIAkJZ290byBlbmQ7CiAKLQlpc19zZXQgPSBfX2dldF90 aWxpbmcoYm9wcy0+ZmQsIGhhbmRsZSwgJmJ1Zl90aWxpbmcsICZidWZfc3dpenpsZSk7CisJaXNf c2V0ID0gX19nZXRfdGlsaW5nKGJvcHMtPmZkLCBoYW5kbGUsICZidWZfdGlsaW5nLCAmYnVmX3N3 aXp6bGUsCisJCQkgICAgICAmcGh5c19zd2l6emxlKTsKIAlpZiAoaXNfc2V0KSB7CiAJCWlmICh0 aWxpbmcgPT0gSTkxNV9USUxJTkdfWCkKIAkJCWJvcHMtPnN3aXp6bGVfeCA9IGJ1Zl9zd2l6emxl OwogCQllbHNlIGlmICh0aWxpbmcgPT0gSTkxNV9USUxJTkdfWSkKIAkJCWJvcHMtPnN3aXp6bGVf eSA9IGJ1Zl9zd2l6emxlOworCisJCSpzd2l6emxpbmdfc3VwcG9ydGVkID0gYnVmX3N3aXp6bGUg PT0gcGh5c19zd2l6emxlOwogCX0KIGVuZDoKIAlnZW1fY2xvc2UoYm9wcy0+ZmQsIGhhbmRsZSk7 CkBAIC0xMTcyLDE0ICsxMTc5LDIxIEBAIHN0YXRpYyBzdHJ1Y3QgYnVmX29wcyAqX19idWZfb3Bz X2NyZWF0ZShpbnQgZmQsIGJvb2wgY2hlY2tfaWRlbXBvdGVuY3kpCiAJICoKIAkgKiBPaywgeW91 IGhhdmUgYmVlbiB3YXJuZWQuCiAJICovCi0JaWYgKGJvcHMtPmludGVsX2dlbiA9PSAyKSB7CisJ aWYgKGJvcHMtPmludGVsX2dlbiA9PSAyICkgewogCQlpZ3Rfd2FybigiR2VuMiBkZXRlY3RlZC4g SFcgKGRlKXRpbGluZyBzdXBwb3J0IG9ubHkuIik7CiAJCXJldHVybiBib3BzOwogCX0KIAogCS8q IExldCdzIHByb2JlIFggYW5kIFkgaHcgdGlsaW5nIHN1cHBvcnQgKi8KIAlpZiAoaXNfaHdfdGls aW5nX3N1cHBvcnRlZChib3BzLCBJOTE1X1RJTElOR19YKSkgewotCQlib29sIHN1cHBvcnRlZCA9 IHByb2JlX2h3X3RpbGluZyhib3BzLCBJOTE1X1RJTElOR19YKTsKKwkJYm9vbCBzd2l6emxpbmdf c3VwcG9ydGVkOworCQlib29sIHN1cHBvcnRlZCA9IHByb2JlX2h3X3RpbGluZyhib3BzLCBJOTE1 X1RJTElOR19YLAorCQkJCQkJICZzd2l6emxpbmdfc3VwcG9ydGVkKTsKKworCQlpZiAoIXN3aXp6 bGluZ19zdXBwb3J0ZWQpIHsKKwkJCWlndF9kZWJ1ZygiU3dpenpsaW5nIGZvciBYIGlzIG5vdCBz dXBwb3J0ZWRcbiIpOworCQkJYm9wcy0+c3VwcG9ydGVkX3RpbGVzICY9IH5USUxFX1g7CisJCX0K IAogCQlpZ3RfZGVidWcoIlggZmVuY2Ugc3VwcG9ydDogJXNcbiIsIGJvb2xfc3RyKHN1cHBvcnRl ZCkpOwogCQlpZiAoIXN1cHBvcnRlZCkgewpAQCAtMTE5MCw3ICsxMjA0LDE0IEBAIHN0YXRpYyBz dHJ1Y3QgYnVmX29wcyAqX19idWZfb3BzX2NyZWF0ZShpbnQgZmQsIGJvb2wgY2hlY2tfaWRlbXBv dGVuY3kpCiAJfQogCiAJaWYgKGlzX2h3X3RpbGluZ19zdXBwb3J0ZWQoYm9wcywgSTkxNV9USUxJ TkdfWSkpIHsKLQkJYm9vbCBzdXBwb3J0ZWQgPSBwcm9iZV9od190aWxpbmcoYm9wcywgSTkxNV9U SUxJTkdfWSk7CisJCWJvb2wgc3dpenpsaW5nX3N1cHBvcnRlZDsKKwkJYm9vbCBzdXBwb3J0ZWQg PSBwcm9iZV9od190aWxpbmcoYm9wcywgSTkxNV9USUxJTkdfWSwKKwkJCQkJCSAmc3dpenpsaW5n X3N1cHBvcnRlZCk7CisKKwkJaWYgKCFzd2l6emxpbmdfc3VwcG9ydGVkKSB7CisJCQlpZ3RfZGVi dWcoIlN3aXp6bGluZyBmb3IgWSBpcyBub3Qgc3VwcG9ydGVkXG4iKTsKKwkJCWJvcHMtPnN1cHBv cnRlZF90aWxlcyAmPSB+VElMRV9ZOworCQl9CiAKIAkJaWd0X2RlYnVnKCJZIGZlbmNlIHN1cHBv cnQ6ICVzXG4iLCBib29sX3N0cihzdXBwb3J0ZWQpKTsKIAkJaWYgKCFzdXBwb3J0ZWQpIHsKQEAg LTEzMDcsNiArMTMyOCw5IEBAIGJvb2wgYnVmX29wc19zZXRfc29mdHdhcmVfdGlsaW5nKHN0cnVj dCBidWZfb3BzICpib3BzLAogCXN3aXRjaCAodGlsaW5nKSB7CiAJY2FzZSBJOTE1X1RJTElOR19Y OgogCQlpZiAodXNlX3NvZnR3YXJlX3RpbGluZykgeworCQkJYm9vbCBzdXBwb3J0ZWQgPSBidWZf b3BzX2hhc190aWxpbmdfc3VwcG9ydChib3BzLCB0aWxpbmcpOworCQkJaWd0X2Fzc2VydF9mKHN1 cHBvcnRlZCwgIkNhbm5vdCBzd2l0Y2ggdG8gWCBzb2Z0d2FyZSB0aWxpbmdcbiIpOworCiAJCQlp Z3RfZGVidWcoIi0+IGNoYW5nZSBYIHRvIFNXXG4iKTsKIAkJCWJvcHMtPmxpbmVhcl90b194ID0g Y29weV9saW5lYXJfdG9feDsKIAkJCWJvcHMtPnhfdG9fbGluZWFyID0gY29weV94X3RvX2xpbmVh cjsKQEAgLTEzMjQsNiArMTM0OCw5IEBAIGJvb2wgYnVmX29wc19zZXRfc29mdHdhcmVfdGlsaW5n KHN0cnVjdCBidWZfb3BzICpib3BzLAogCiAJY2FzZSBJOTE1X1RJTElOR19ZOgogCQlpZiAodXNl X3NvZnR3YXJlX3RpbGluZykgeworCQkJYm9vbCBzdXBwb3J0ZWQgPSBidWZfb3BzX2hhc190aWxp bmdfc3VwcG9ydChib3BzLCB0aWxpbmcpOworCQkJaWd0X2Fzc2VydF9mKHN1cHBvcnRlZCwgIkNh bm5vdCBzd2l0Y2ggdG8gWSBzb2Z0d2FyZSB0aWxpbmdcbiIpOworCiAJCQlpZ3RfZGVidWcoIi0+ IGNoYW5nZSBZIHRvIFNXXG4iKTsKIAkJCWJvcHMtPmxpbmVhcl90b195ID0gY29weV9saW5lYXJf dG9feTsKIAkJCWJvcHMtPnlfdG9fbGluZWFyID0gY29weV95X3RvX2xpbmVhcjsKLS0gCjIuMjYu MAoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KaWd0LWRl diBtYWlsaW5nIGxpc3QKaWd0LWRldkBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0 cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pZ3QtZGV2Cg==