Return-Path: Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) by gabe.freedesktop.org (Postfix) with ESMTPS id 429918940F for ; Thu, 30 Jul 2020 08:52:11 +0000 (UTC) From: =?UTF-8?q?Zbigniew=20Kempczy=C5=84ski?= Date: Thu, 30 Jul 2020 10:51:52 +0200 Message-Id: <20200730085205.16290-3-zbigniew.kempczynski@intel.com> In-Reply-To: <20200730085205.16290-1-zbigniew.kempczynski@intel.com> References: <20200730085205.16290-1-zbigniew.kempczynski@intel.com> MIME-Version: 1.0 Subject: [igt-dev] [PATCH i-g-t v16 02/15] 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 aXMtd2lsc29uLmNvLnVrPgotLS0KIGxpYi9pbnRlbF9idWZvcHMuYyB8IDQxICsrKysrKysrKysr KysrKysrKysrKysrKysrKysrKysrKy0tLS0tLS0tCiAxIGZpbGUgY2hhbmdlZCwgMzMgaW5zZXJ0 aW9ucygrKSwgOCBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9saWIvaW50ZWxfYnVmb3BzLmMg Yi9saWIvaW50ZWxfYnVmb3BzLmMKaW5kZXggMDk0MzNiZWQuLjczMDlkMzA4IDEwMDY0NAotLS0g YS9saWIvaW50ZWxfYnVmb3BzLmMKKysrIGIvbGliL2ludGVsX2J1Zm9wcy5jCkBAIC0xNTcsNyAr MTU3LDcgQEAgc3RhdGljIGludCBfX2dlbV9nZXRfdGlsaW5nKGludCBmZCwgc3RydWN0IGRybV9p OTE1X2dlbV9nZXRfdGlsaW5nICphcmcpCiB9CiAKIHN0YXRpYyBib29sIF9fZ2V0X3RpbGluZyhp bnQgZmQsIHVpbnQzMl90IGhhbmRsZSwgdWludDMyX3QgKnRpbGluZywKLQkJCSB1aW50MzJfdCAq c3dpenpsZSkKKwkJCSB1aW50MzJfdCAqc3dpenpsZSwgdWludDMyX3QgKnBoeXNfc3dpenpsZSkK IHsKIAlzdHJ1Y3QgZHJtX2k5MTVfZ2VtX2dldF90aWxpbmcgZ2V0X3RpbGluZyA9IHsgLmhhbmRs ZSA9IGhhbmRsZSB9OwogCkBAIC0xNjYsMTIgKzE2NiwxMyBAQCBzdGF0aWMgYm9vbCBfX2dldF90 aWxpbmcoaW50IGZkLCB1aW50MzJfdCBoYW5kbGUsIHVpbnQzMl90ICp0aWxpbmcsCiAKIAkqdGls aW5nID0gZ2V0X3RpbGluZy50aWxpbmdfbW9kZTsKIAkqc3dpenpsZSA9IGdldF90aWxpbmcuc3dp enpsZV9tb2RlOworCSpwaHlzX3N3aXp6bGUgPSBnZXRfdGlsaW5nLnBoeXNfc3dpenpsZV9tb2Rl OwogCWlndF9kZWJ1ZygiYnVmIHRpbGluZzogJXMsIHN3aXp6bGU6ICV4LCBwaHlzX3N3aXp6bGU6 ICV4XG4iLAogCQkgIHRpbGluZ19zdHIoZ2V0X3RpbGluZy50aWxpbmdfbW9kZSksCiAJCSAgZ2V0 X3RpbGluZy5zd2l6emxlX21vZGUsCiAJCSAgZ2V0X3RpbGluZy5waHlzX3N3aXp6bGVfbW9kZSk7 CiAKLQlyZXR1cm4gZ2V0X3RpbGluZy5waHlzX3N3aXp6bGVfbW9kZSA9PSBnZXRfdGlsaW5nLnN3 aXp6bGVfbW9kZTsKKwlyZXR1cm4gdHJ1ZTsKIH0KIAogc3RhdGljIGludCBfX3NldF90aWxpbmco aW50IGZkLCB1aW50MzJfdCBoYW5kbGUsIHVpbnQzMl90IHRpbGluZywKQEAgLTEwMjksMTAgKzEw MzAsMTEgQEAgc3RydWN0IGJ1Zl9vcHMgYnVmX29wc19hcnJbXSA9IHsKIAl9LAogfTsKIAotc3Rh dGljIGJvb2wgcHJvYmVfaHdfdGlsaW5nKHN0cnVjdCBidWZfb3BzICpib3BzLCB1aW50MzJfdCB0 aWxpbmcpCitzdGF0aWMgYm9vbCBwcm9iZV9od190aWxpbmcoc3RydWN0IGJ1Zl9vcHMgKmJvcHMs IHVpbnQzMl90IHRpbGluZywKKwkJCSAgICBib29sICpzd2l6emxpbmdfc3VwcG9ydGVkKQogewog CXVpbnQ2NF90IHNpemUgPSAyNTYgKiAyNTY7Ci0JdWludDMyX3QgaGFuZGxlLCBidWZfdGlsaW5n LCBidWZfc3dpenpsZTsKKwl1aW50MzJfdCBoYW5kbGUsIGJ1Zl90aWxpbmcsIGJ1Zl9zd2l6emxl LCBwaHlzX3N3aXp6bGU7CiAJdWludDMyX3Qgc3RyaWRlOwogCWludCByZXQ7CiAJYm9vbCBpc19z ZXQgPSBmYWxzZTsKQEAgLTEwNTEsMTIgKzEwNTMsMTUgQEAgc3RhdGljIGJvb2wgcHJvYmVfaHdf dGlsaW5nKHN0cnVjdCBidWZfb3BzICpib3BzLCB1aW50MzJfdCB0aWxpbmcpCiAJaWYgKHJldCkK IAkJZ290byBlbmQ7CiAKLQlpc19zZXQgPSBfX2dldF90aWxpbmcoYm9wcy0+ZmQsIGhhbmRsZSwg JmJ1Zl90aWxpbmcsICZidWZfc3dpenpsZSk7CisJaXNfc2V0ID0gX19nZXRfdGlsaW5nKGJvcHMt PmZkLCBoYW5kbGUsICZidWZfdGlsaW5nLCAmYnVmX3N3aXp6bGUsCisJCQkgICAgICAmcGh5c19z d2l6emxlKTsKIAlpZiAoaXNfc2V0KSB7CiAJCWlmICh0aWxpbmcgPT0gSTkxNV9USUxJTkdfWCkK IAkJCWJvcHMtPnN3aXp6bGVfeCA9IGJ1Zl9zd2l6emxlOwogCQllbHNlIGlmICh0aWxpbmcgPT0g STkxNV9USUxJTkdfWSkKIAkJCWJvcHMtPnN3aXp6bGVfeSA9IGJ1Zl9zd2l6emxlOworCisJCSpz d2l6emxpbmdfc3VwcG9ydGVkID0gYnVmX3N3aXp6bGUgPT0gcGh5c19zd2l6emxlOwogCX0KIGVu ZDoKIAlnZW1fY2xvc2UoYm9wcy0+ZmQsIGhhbmRsZSk7CkBAIC0xMTcyLDE0ICsxMTc3LDIxIEBA IHN0YXRpYyBzdHJ1Y3QgYnVmX29wcyAqX19idWZfb3BzX2NyZWF0ZShpbnQgZmQsIGJvb2wgY2hl Y2tfaWRlbXBvdGVuY3kpCiAJICoKIAkgKiBPaywgeW91IGhhdmUgYmVlbiB3YXJuZWQuCiAJICov Ci0JaWYgKGJvcHMtPmludGVsX2dlbiA9PSAyKSB7CisJaWYgKGJvcHMtPmludGVsX2dlbiA9PSAy ICkgewogCQlpZ3Rfd2FybigiR2VuMiBkZXRlY3RlZC4gSFcgKGRlKXRpbGluZyBzdXBwb3J0IG9u bHkuIik7CiAJCXJldHVybiBib3BzOwogCX0KIAogCS8qIExldCdzIHByb2JlIFggYW5kIFkgaHcg dGlsaW5nIHN1cHBvcnQgKi8KIAlpZiAoaXNfaHdfdGlsaW5nX3N1cHBvcnRlZChib3BzLCBJOTE1 X1RJTElOR19YKSkgewotCQlib29sIHN1cHBvcnRlZCA9IHByb2JlX2h3X3RpbGluZyhib3BzLCBJ OTE1X1RJTElOR19YKTsKKwkJYm9vbCBzd2l6emxpbmdfc3VwcG9ydGVkOworCQlib29sIHN1cHBv cnRlZCA9IHByb2JlX2h3X3RpbGluZyhib3BzLCBJOTE1X1RJTElOR19YLAorCQkJCQkJICZzd2l6 emxpbmdfc3VwcG9ydGVkKTsKKworCQlpZiAoIXN3aXp6bGluZ19zdXBwb3J0ZWQpIHsKKwkJCWln dF9kZWJ1ZygiU3dpenpsaW5nIGZvciBYIGlzIG5vdCBzdXBwb3J0ZWRcbiIpOworCQkJYm9wcy0+ c3VwcG9ydGVkX3RpbGVzICY9IH5USUxFX1g7CisJCX0KIAogCQlpZ3RfZGVidWcoIlggZmVuY2Ug c3VwcG9ydDogJXNcbiIsIGJvb2xfc3RyKHN1cHBvcnRlZCkpOwogCQlpZiAoIXN1cHBvcnRlZCkg ewpAQCAtMTE5MCw3ICsxMjAyLDE0IEBAIHN0YXRpYyBzdHJ1Y3QgYnVmX29wcyAqX19idWZfb3Bz X2NyZWF0ZShpbnQgZmQsIGJvb2wgY2hlY2tfaWRlbXBvdGVuY3kpCiAJfQogCiAJaWYgKGlzX2h3 X3RpbGluZ19zdXBwb3J0ZWQoYm9wcywgSTkxNV9USUxJTkdfWSkpIHsKLQkJYm9vbCBzdXBwb3J0 ZWQgPSBwcm9iZV9od190aWxpbmcoYm9wcywgSTkxNV9USUxJTkdfWSk7CisJCWJvb2wgc3dpenps aW5nX3N1cHBvcnRlZDsKKwkJYm9vbCBzdXBwb3J0ZWQgPSBwcm9iZV9od190aWxpbmcoYm9wcywg STkxNV9USUxJTkdfWSwKKwkJCQkJCSAmc3dpenpsaW5nX3N1cHBvcnRlZCk7CisKKwkJaWYgKCFz d2l6emxpbmdfc3VwcG9ydGVkKSB7CisJCQlpZ3RfZGVidWcoIlN3aXp6bGluZyBmb3IgWSBpcyBu b3Qgc3VwcG9ydGVkXG4iKTsKKwkJCWJvcHMtPnN1cHBvcnRlZF90aWxlcyAmPSB+VElMRV9ZOwor CQl9CiAKIAkJaWd0X2RlYnVnKCJZIGZlbmNlIHN1cHBvcnQ6ICVzXG4iLCBib29sX3N0cihzdXBw b3J0ZWQpKTsKIAkJaWYgKCFzdXBwb3J0ZWQpIHsKQEAgLTEzMDcsNiArMTMyNiw5IEBAIGJvb2wg YnVmX29wc19zZXRfc29mdHdhcmVfdGlsaW5nKHN0cnVjdCBidWZfb3BzICpib3BzLAogCXN3aXRj aCAodGlsaW5nKSB7CiAJY2FzZSBJOTE1X1RJTElOR19YOgogCQlpZiAodXNlX3NvZnR3YXJlX3Rp bGluZykgeworCQkJYm9vbCBzdXBwb3J0ZWQgPSBidWZfb3BzX2hhc190aWxpbmdfc3VwcG9ydChi b3BzLCB0aWxpbmcpOworCQkJaWd0X2Fzc2VydF9mKHN1cHBvcnRlZCwgIkNhbm5vdCBzd2l0Y2gg dG8gWCBzb2Z0d2FyZSB0aWxpbmdcbiIpOworCiAJCQlpZ3RfZGVidWcoIi0+IGNoYW5nZSBYIHRv IFNXXG4iKTsKIAkJCWJvcHMtPmxpbmVhcl90b194ID0gY29weV9saW5lYXJfdG9feDsKIAkJCWJv cHMtPnhfdG9fbGluZWFyID0gY29weV94X3RvX2xpbmVhcjsKQEAgLTEzMjQsNiArMTM0Niw5IEBA IGJvb2wgYnVmX29wc19zZXRfc29mdHdhcmVfdGlsaW5nKHN0cnVjdCBidWZfb3BzICpib3BzLAog CiAJY2FzZSBJOTE1X1RJTElOR19ZOgogCQlpZiAodXNlX3NvZnR3YXJlX3RpbGluZykgeworCQkJ Ym9vbCBzdXBwb3J0ZWQgPSBidWZfb3BzX2hhc190aWxpbmdfc3VwcG9ydChib3BzLCB0aWxpbmcp OworCQkJaWd0X2Fzc2VydF9mKHN1cHBvcnRlZCwgIkNhbm5vdCBzd2l0Y2ggdG8gWSBzb2Z0d2Fy ZSB0aWxpbmdcbiIpOworCiAJCQlpZ3RfZGVidWcoIi0+IGNoYW5nZSBZIHRvIFNXXG4iKTsKIAkJ CWJvcHMtPmxpbmVhcl90b195ID0gY29weV9saW5lYXJfdG9feTsKIAkJCWJvcHMtPnlfdG9fbGlu ZWFyID0gY29weV95X3RvX2xpbmVhcjsKLS0gCjIuMjYuMAoKX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX18KaWd0LWRldiBtYWlsaW5nIGxpc3QKaWd0LWRldkBs aXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1h bi9saXN0aW5mby9pZ3QtZGV2Cg==